Adjust recipes to separation of buildhost and target packages

app-arch/bzip2/bzip2-1.0.6.recipe

@@ -27,15 +27,15 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:ar
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

app-arch/p7zip/p7zip-9.13.recipe

@@ -18,12 +18,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 SOURCE_DIR="p7zip_9.13"

app-arch/p7zip/p7zip-9.20.1.recipe

@@ -18,12 +18,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 SOURCE_DIR="p7zip_9.20.1"

app-arch/tar/tar-1.26.recipe

@@ -27,7 +27,6 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
@@ -36,6 +35,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
+	cmd:sed
 	"
 
 defineDebugInfoPackage tar \

app-arch/xz_utils/xz_utils-5.0.1.recipe

@@ -42,14 +42,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="xz-5.0.1"
 

app-cdr/cdrtools/cdrtools-3.01~a07.recipe

@@ -52,14 +52,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/cdrecord keep-old

app-editors/nano/nano-2.2.6.recipe

@@ -21,16 +21,16 @@ REQUIRES="
 	lib:libncurses
 	"
 BUILD_REQUIRES="
+	devel:libncurses
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:autoreconf
 	cmd:gcc
 	cmd:groff
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libncurses
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

app-text/asciidoc/asciidoc-8.6.8.recipe

@@ -21,14 +21,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

app-text/htmldoc/htmldoc-1.8.27.recipe

@@ -25,17 +25,17 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:sed
 	devel:libjpeg
 	devel:libpng
 	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

app-text/rman/rman-3.2.recipe

@@ -22,12 +22,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:make
-	cmd:ld
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:ld
 	"
 
 BUILD()

app-text/texi2html/texi2html-1.82.recipe

@@ -22,6 +22,9 @@ REQUIRES="
 	cmd:perl
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -29,9 +32,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:perl
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-db/sqlite/sqlite-3.7.13.recipe

@@ -25,6 +25,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -33,9 +36,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="sqlite-autoconf-3071300"
 

dev-db/sqlite/sqlite-3.7.16.1.recipe

@@ -11,14 +11,18 @@ PROVIDES="sqlite = $portVersion compat >= 3
 	lib:libsqlite = $portVersion compat >= 3
 	lib:libsqlite3 = $portVersion compat >= 3"
 REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:aclocal
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion"
+	cmd:make
+	"
 
 SOURCE_DIR="sqlite-autoconf-3071601"
 

dev-db/sqlite/sqlite-3.7.5.recipe

@@ -23,6 +23,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -31,9 +34,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="sqlite-autoconf-3070500"
 

dev-lang/perl/perl-5.10.1.recipe

@@ -70,13 +70,13 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
+	cmd:sed
 	"
 
 GLOBAL_WRITABLE_FILES="

dev-lang/python/python-2.6.8.recipe

@@ -38,7 +38,6 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:nano
 	devel:libbz2
 	devel:libncurses
 	devel:libssl
@@ -55,6 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:nano
 	"
 
 SOURCE_DIR="Python-2.6.8"

dev-lang/yasm/yasm-1.1.0.recipe

@@ -22,14 +22,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-lang/yasm/yasm-1.2.0.recipe

@@ -24,14 +24,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/apr/apr-1.4.2.recipe

@@ -16,6 +16,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -23,9 +26,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/apr/apr-1.4.6.recipe

@@ -17,6 +17,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -24,9 +27,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/apr_util/apr_util-1.3.10.recipe

@@ -19,6 +19,9 @@ REQUIRES="
 	"
 BUILD_REQUIRES="
 	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
@@ -27,9 +30,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/apr_util/apr_util-1.4.1.recipe

@@ -19,8 +19,11 @@ REQUIRES="
 	lib:libexpat
 	"
 BUILD_REQUIRES="
-	apr_devel >= 1.4.6
-	expat_devel >= 2.0
+	devel:libapr_1 >= 0.4.6
+	devel:libexpat >= 1.5.2
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
@@ -29,9 +32,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/expat/expat-2.0.1.recipe

@@ -20,6 +20,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -27,9 +30,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/icu/icu-4.8.1.1.recipe

@@ -24,15 +24,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="icu"
 

dev-libs/libedit/libedit-2012_06_01_3.0.recipe

@@ -19,6 +19,10 @@ REQUIRES="
 	lib:libncurses
 	"
 BUILD_REQUIRES="
+	devel:libncurses
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:gcc
@@ -26,10 +30,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:sed
-	devel:libncurses
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="libedit-20120601-3.0"

dev-libs/libiconv/libiconv-1.13.1.recipe

@@ -22,6 +22,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
@@ -30,9 +33,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-libs/libpcre/libpcre-8.21.recipe

@@ -31,6 +31,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -39,9 +42,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="pcre-$portVersion"
 

dev-libs/libxml2/libxml2-2.8.0.recipe

@@ -20,6 +20,10 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -27,10 +31,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

dev-libs/openssl/openssl-1.0.0d.recipe

@@ -39,16 +39,15 @@ REQUIRES="
 	zlib >= 1.2.3
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	zlib_devel >= 1.2.3
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:perl >= 5
 	cmd:sed
-	zlib_devel >= 1.2.3
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

dev-libs/openssl/openssl-1.0.0j.recipe

@@ -39,15 +39,15 @@ REQUIRES="
 	lib:libz >= 1.2.3
 	"
 BUILD_REQUIRES="
+	devel:libz >= 1.2.3
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:perl >= 5
 	cmd:sed
-	devel:libz >= 1.2.3
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

dev-util/cmake/cmake-2.8.5.recipe

@@ -20,6 +20,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:grep
 	cmd:ld
@@ -27,9 +30,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-util/ctags/ctags-5.8.recipe

@@ -16,14 +16,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-util/pkgconfig/pkgconfig-0.27.1.recipe

@@ -19,6 +19,10 @@ REQUIRES="
 	lib:libiconv
 	"
 BUILD_REQUIRES="
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -27,10 +31,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libiconv
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="pkg-config-0.27.1"

dev-vcs/cvs/cvs-1.12.13.1.recipe

@@ -34,7 +34,6 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:nano
 	devel:libz >= 1.1.4
 	"
 BUILD_PREREQUIRES="
@@ -43,6 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:nano
 	"
 
 SOURCE_DIR="$portVersionedName"

dev-vcs/git/git-1.7.10.2.recipe

@@ -93,6 +93,14 @@ REQUIRES_svn="
 	"
 	
 BUILD_REQUIRES="
+	devel:libcurl
+	devel:libexpat
+	devel:libssl
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	perl
 	python
 	cmd:gcc
@@ -102,14 +110,6 @@ BUILD_REQUIRES="
 	cmd:nano
 	cmd:sed
 	cmd:tar
-	devel:libcurl
-	devel:libexpat
-	devel:libssl
-	devel:libz
-	"
-
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 BUILD()

dev-vcs/mercurial/mercurial-2.2.2.recipe

@@ -21,15 +21,14 @@ REQUIRES="
 	lib:libintl
 	"
 BUILD_REQUIRES="
-	python
-	cmd:gettext
-	cmd:nano
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	python
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
+	cmd:gettext
 	cmd:ld
 	cmd:libtoolize
 	cmd:make

dev-vcs/subversion/subversion-1.6.15.recipe

@@ -53,6 +53,9 @@ REQUIRES="
 	"
 BUILD_REQUIRES="
 	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -60,9 +63,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

dev-vcs/subversion/subversion-1.6.18.recipe

@@ -57,14 +57,7 @@ BUILD_REQUIRES="
 	expat_devel >= 2.0
 	libiconv_devel >= 1.13
 	neon_devel >= 0.29
-	python
 	sqlite_devel >= 3.4
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
 	devel:libapr_1 >= 0.3
 	devel:libaprutil_1 >= 0.3
 	devel:libcrypto
@@ -74,6 +67,13 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	python
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
 	"
 
 USER_SETTINGS_FILES="

haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe

@@ -24,15 +24,15 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:jam
 	cmd:htmldoc
 	cmd:ld
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe

@@ -14,14 +14,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:mkdepend
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	makefile_engine
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
 	"
 
 SOURCE_DIR="$portVersionedName"

haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe

@@ -14,15 +14,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:mkdepend
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	makefile_engine
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
 	"
 
 SOURCE_DIR="$portVersionedName"

haiku-apps/mkdepend/mkdepend-1.7.recipe

@@ -17,11 +17,11 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
 	"
 
 SOURCE_DIR="$portVersionedName"

haiku-apps/pe/pe-2.4.3_hg602.recipe

@@ -27,16 +27,16 @@ REQUIRES="
 	lib:libpcreposix
 	"
 BUILD_REQUIRES="
-	cmd:bison
-	cmd:flex
-	cmd:gcc
-	cmd:jam
-	cmd:ld
 	devel:libpcre >= 0.0.1
 	devel:libpcreposix >= 0.0.1
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
 	"
 
 USER_SETTINGS_FILES="

haiku-apps/vision/vision-0.9.7.r944.recipe

@@ -18,12 +18,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 USER_SETTINGS_FILES="

haiku-data/be_book/be_book-2008_10_26.recipe

@@ -13,6 +13,8 @@ PROVIDES="
 	be_book = $portVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
 	coreutils
 	"
 

haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe

@@ -20,10 +20,10 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	coreutils
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	coreutils
 	"
 
 INSTALL()

haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe

@@ -15,9 +15,9 @@ PROVIDES="
 REQUIRES="
 	"
 BUILD_REQUIRES="
-	cmd:cp
 	"
 BUILD_PREREQUIRES="
+	cmd:cp
 	"
 
 BUILD()

media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe

@@ -20,10 +20,8 @@ PROVIDES="
 	wqy_microhei = $portVersion
 	"
 REQUIRES=""
-BUILD_REQUIRES="
-	coreutils
-	"
-BUILD_PREREQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="coreutils"
 
 SOURCE_DIR="wqy-microhei"
 

media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe

@@ -16,8 +16,10 @@ PROVIDES="
 	"
 REQUIRES=""
 BUILD_REQUIRES="
-	coreutils"
-BUILD_PREREQUIRES=""
+	"
+BUILD_PREREQUIRES="
+	coreutils
+	"
 
 SOURCE_DIR="wqy-zenhei"
 

media-gfx/graphviz/graphviz-2.26.3.recipe

@@ -23,7 +23,9 @@ REQUIRES="
 	lib:libfreetype
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc
@@ -31,9 +33,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

media-libs/freetype/freetype-2.4.9.recipe

@@ -17,6 +17,10 @@ REQUIRES="
 	lib:libz >= 1
 	"
 BUILD_REQUIRES="
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -24,10 +28,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/jpeg/jpeg-9.recipe

@@ -26,7 +26,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -36,9 +38,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

media-libs/libogg/libogg-1.3.0.recipe

@@ -24,6 +24,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -32,9 +35,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

media-libs/libpng/libpng-1.5.12.recipe

@@ -24,6 +24,10 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libz >= 1.0.4
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -31,10 +35,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libz >= 1.0.4
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libtheora/libtheora-1.1.1.recipe

@@ -25,6 +25,12 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+	# Note: The build system also looks for libvorbis and SDL, but that seems
+	# to be needed only for building the sample player, which we don't need.
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -32,12 +38,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-	# Note: The build system also looks for libvorbis and SDL, but that seems
-	# to be needed only for building the sample player, which we don't need.
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libvorbis/libvorbis-1.3.2.recipe

@@ -23,6 +23,10 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -31,10 +35,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libvpx/libvpx-1.0.0.recipe

@@ -27,16 +27,16 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:perl
-	cmd:yasm
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:perl
+	cmd:yasm
 	"
 
 SOURCE_DIR="libvpx-v1.0.0"

media-libs/speex/speex-1.2~rc1.recipe

@@ -30,6 +30,10 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -38,10 +42,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="speex-1.2rc1"

media-video/ffmpeg/ffmpeg-0.10.2.recipe

@@ -41,13 +41,6 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:perl
-	cmd:pkg_config
-	cmd:texi2html
-	cmd:yasm
 	devel:libogg
 	devel:libspeex
 	devel:libtheora
@@ -57,6 +50,13 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	cmd:texi2html
+	cmd:yasm
 	"
 
 GLOBAL_WRITABLE_FILES="

net-misc/curl/curl-7.26.0.recipe

@@ -21,16 +21,16 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:autoconf
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
 	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
 	"
 
 SOURCE_DIR="$portVersionedName"

net-misc/neon/neon-0.29.6.recipe

@@ -39,12 +39,6 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:libtoolize
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	devel:libncurses
 	devel:libssl >= 1.0.0
 	devel:libxml2 >= 2.7.8
@@ -52,6 +46,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 SOURCE_DIR="$portVersionedName"

net-misc/openssh/openssh-5.8p2.recipe

@@ -35,8 +35,10 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	$REQUIRES
 	openssl
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -45,9 +47,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

net-misc/openssh/openssh-6.0p1.recipe

@@ -35,14 +35,6 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
 	devel:libcrypto
 	devel:libedit
 	devel:libncurses
@@ -51,6 +43,14 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
 	"
 
 GLOBAL_WRITABLE_FILES="

net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe

@@ -21,13 +21,13 @@ REQUIRES="
 	openssl >= 1.0.0
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	openssl >= 1.0.0
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 SOURCE_DIR="$portVersionedName/wpa_supplicant"

net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe

@@ -22,13 +22,13 @@ REQUIRES="
 	lib:libssl
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	devel:libssl >= 1.0.0
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-apps/gawk/gawk-3.1.8.recipe

@@ -26,14 +26,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-    cmd:libtoolize
-    cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
+    cmd:libtoolize
 	cmd:make
+    cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-apps/grep/grep-2.14.recipe

@@ -25,6 +25,11 @@ REQUIRES="
 	lib:libintl
 	"
 BUILD_REQUIRES="
+	devel:libiconv
+	devel:libintl
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -33,11 +38,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libiconv
-	devel:libintl
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 defineDebugInfoPackage grep \

sys-apps/groff/groff-1.20.1.recipe

@@ -56,6 +56,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -64,9 +67,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

sys-apps/man/man-1.6g.recipe

@@ -28,6 +28,9 @@ REQUIRES="
 	cmd:zcat
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:groff
 	cmd:gunzip
 	cmd:bzip2
@@ -37,9 +40,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/man.conf keep-old

sys-devel/autoconf/autoconf-2.68.recipe

@@ -35,13 +35,13 @@ REQUIRES="
 	cmd:sh
 	"
 BUILD_REQUIRES="
-	cmd:automake >= 1.11
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:automake >= 1.11
 	cmd:autoreconf >= 2.60
 	cmd:make
+	cmd:sed
 	"
 
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL

sys-devel/autoconf/autoconf-2.69.recipe

@@ -11,8 +11,8 @@ LICENSE="
 	GNU GPL v2
 	GNU GPL v3
 	"
-SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz"
-CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e"
+SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
+CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
@@ -36,14 +36,15 @@ REQUIRES="
 	cmd:sh
 	"
 BUILD_REQUIRES="
-	cmd:automake >= 1.13.1
-	cmd:makeinfo
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:automake >= 1.13.1
 	cmd:autoreconf >= 2.60
-	cmd:make"
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	"
 
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 SOURCE_DIR="$portVersionedName"

sys-devel/automake/automake-1.11.1.recipe

@@ -30,13 +30,13 @@ REQUIRES="
 	cmd:sh
 	"
 BUILD_REQUIRES="
-	cmd:perl >= 5.8
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf >= 2.60
 	cmd:make
+	cmd:perl >= 5.8
+	cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-devel/automake/automake-1.13.1.recipe

@@ -30,14 +30,14 @@ REQUIRES="
 	cmd:sh
 	"
 BUILD_REQUIRES="
-	cmd:perl >= 5.8
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf >= 2.60
 	cmd:make
 	cmd:makeinfo
+	cmd:perl >= 5.8
+	cmd:sed
     "
 
 SOURCE_DIR="$portVersionedName"

sys-devel/binutils/binutils-2.17_2013_04_21.recipe

@@ -1,6 +1,6 @@
 SUMMARY="The GNU assembler, linker and binary utilities"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72"
+SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 LICENSE="

sys-devel/bison/bison-2.4.3.recipe

@@ -29,15 +29,15 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:m4
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

sys-devel/flex/flex-2.5.35.recipe

@@ -22,17 +22,17 @@ REQUIRES="
 	cmd:m4
 	"
 BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:libtoolize
-	cmd:make
-	cmd:makeinfo
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
 	cmd:gcc
 	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:makeinfo
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe

@@ -7,8 +7,8 @@ LICENSE="
 	"
 COPYRIGHT="1988-2000 Free Software Foundation, Inc."
 SRC_URI="
-	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72
-	git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72
+	git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#b1ef802
+	git+git://github.com/haiku/BuildtoolsPM.git#b1ef802
 	"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
@@ -29,9 +29,9 @@ PROVIDES="
 
 REQUIRES="
 	haiku >= $haikuVersion
+	binutils
 	"
 BUILD_REQUIRES="
-	binutils
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion

sys-devel/gettext/gettext-0.18.1.1.recipe

@@ -53,6 +53,11 @@ REQUIRES="
 	lib:libncurses
 	"
 BUILD_REQUIRES="
+	devel:libiconv
+	devel:libncurses
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -61,11 +66,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:makeinfo
-	devel:libiconv
-	devel:libncurses
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-devel/jam/jam-2.5_2012_10_12.recipe

@@ -34,12 +34,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:make
-	cmd:ld
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:ld
 	"
 
 SOURCE_DIR="$portVersionedName/jam"

sys-devel/libtool/libtool-2.4.recipe

@@ -31,11 +31,10 @@ REQUIRES="
 	cmd:tar
 	"
 BUILD_REQUIRES="
-	cmd:aclocal
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:aclocal
 	cmd:autoconf >= 2.62
 	cmd:autoheader >= 2.62
 	cmd:gcc
@@ -43,6 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:nm
 	cmd:ranlib
+	cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-devel/m4/m4-1.4.16.recipe

@@ -32,13 +32,13 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
+	cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-devel/make/make-3.82.recipe

@@ -25,13 +25,13 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:sed
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
+	cmd:sed
 	"
 
 SOURCE_DIR="$portVersionedName"

sys-libs/glu/glu-9.0.0.recipe

@@ -16,15 +16,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

sys-libs/mesa/mesa-7.8.2.recipe

@@ -25,15 +25,15 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="Mesa-$portVersion"
 

sys-libs/ncurses/ncurses-5.9.recipe

@@ -36,14 +36,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:libtool
-	cmd:make
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
 	cmd:grep
+	cmd:ld
+	cmd:libtool
+	cmd:make
 	cmd:sed
 	"
 

sys-libs/zlib/zlib-1.2.8.recipe

@@ -16,7 +16,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:cmake
 	cmd:gcc
 	cmd:grep
@@ -24,9 +26,6 @@ BUILD_REQUIRES="
 	cmd:make
 	cmd:sed
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"