dev-*: reorder sections.

dev-cpp/eigen/eigen-3.3.4.recipe

@@ -48,9 +48,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 

dev-cpp/libcmis/libcmis-0.5.1.recipe

@@ -25,8 +25,8 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libboost_date_time$secondaryArchSuffix
 	lib:libboost_program_options$secondaryArchSuffix
-	lib:libcurl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
@@ -46,8 +46,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_date_time$secondaryArchSuffix
 	devel:libboost_program_options$secondaryArchSuffix
-	devel:libcurl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix

dev-cpp/luabind/luabind-0.9.1.recipe

@@ -45,8 +45,8 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:liblua5.1$secondaryArchSuffix
 	devel:libboost_config$secondaryArchSuffix >= 1.66
+	devel:liblua5.1$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:bjam

dev-cpp/tbb/tbb-2018.5.recipe

@@ -39,9 +39,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 defineDebugInfoPackage tbb$secondaryArchSuffix \

dev-cpp/yaml_cpp/yaml_cpp-0.5.3.recipe

@@ -35,9 +35,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
+	cmd:make
 	"
 
 BUILD()

dev-db/db/db-4.8.30.recipe

@@ -26,16 +26,16 @@ PROVIDES="
 	cmd:db_load${secondaryArchSuffix}
 	cmd:db_printlog${secondaryArchSuffix}
 	cmd:db_recover${secondaryArchSuffix}
-	cmd:db_stat${secondaryArchSuffix}
 	cmd:db_sql${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
 	cmd:db_upgrade${secondaryArchSuffix}
 	cmd:db_verify${secondaryArchSuffix}
-	lib:libdb_4.8${secondaryArchSuffix}
-	lib:libdb_4${secondaryArchSuffix}
 	lib:libdb${secondaryArchSuffix}
+	lib:libdb_4${secondaryArchSuffix}
+	lib:libdb_4.8${secondaryArchSuffix}
 	lib:libdb_cxx${secondaryArchSuffix}
-	lib:libdb_cxx_4.8${secondaryArchSuffix}
 	lib:libdb_cxx_4${secondaryArchSuffix}
+	lib:libdb_cxx_4.8${secondaryArchSuffix}
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}

dev-db/db/db-5.3.28.recipe

@@ -33,12 +33,12 @@ PROVIDES="
 	cmd:db_tuner${secondaryArchSuffix}
 	cmd:db_upgrade${secondaryArchSuffix}
 	cmd:db_verify${secondaryArchSuffix}
-	lib:libdb_5.3${secondaryArchSuffix}
-	lib:libdb_5${secondaryArchSuffix}
 	lib:libdb${secondaryArchSuffix}
+	lib:libdb_5${secondaryArchSuffix}
+	lib:libdb_5.3${secondaryArchSuffix}
 	lib:libdb_cxx${secondaryArchSuffix}
-	lib:libdb_cxx_5.3${secondaryArchSuffix}
 	lib:libdb_cxx_5${secondaryArchSuffix}
+	lib:libdb_cxx_5.3${secondaryArchSuffix}
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}

dev-db/db/db-6.0.30.recipe

@@ -33,12 +33,12 @@ PROVIDES="
 	cmd:db_tuner${secondaryArchSuffix}
 	cmd:db_upgrade${secondaryArchSuffix}
 	cmd:db_verify${secondaryArchSuffix}
-	lib:libdb_6.0${secondaryArchSuffix}
-	lib:libdb_6${secondaryArchSuffix}
 	lib:libdb${secondaryArchSuffix}
+	lib:libdb_6${secondaryArchSuffix}
+	lib:libdb_6.0${secondaryArchSuffix}
 	lib:libdb_cxx${secondaryArchSuffix}
-	lib:libdb_cxx_6.0${secondaryArchSuffix}
 	lib:libdb_cxx_6${secondaryArchSuffix}
+	lib:libdb_cxx_6.0${secondaryArchSuffix}
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}

dev-db/db/db61-6.1.23.recipe

@@ -33,12 +33,12 @@ PROVIDES="
 	cmd:db_tuner${secondaryArchSuffix}
 	cmd:db_upgrade${secondaryArchSuffix}
 	cmd:db_verify${secondaryArchSuffix}
-	lib:libdb_6.1${secondaryArchSuffix}
-	lib:libdb_6${secondaryArchSuffix}
 	lib:libdb${secondaryArchSuffix}
+	lib:libdb_6${secondaryArchSuffix}
+	lib:libdb_6.1${secondaryArchSuffix}
 	lib:libdb_cxx${secondaryArchSuffix}
-	lib:libdb_cxx_6.1${secondaryArchSuffix}
 	lib:libdb_cxx_6${secondaryArchSuffix}
+	lib:libdb_cxx_6.1${secondaryArchSuffix}
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}

dev-db/libmysqlclient/libmysqlclient-6.1.6.recipe

@@ -17,10 +17,10 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3
-	lib:libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3
 	cmd:my_print_defaults$secondaryArchSuffix
 	cmd:mysql_config$secondaryArchSuffix
 	cmd:perror$secondaryArchSuffix
+	lib:libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3
 	lib:libmysqlclient_r$secondaryArchSuffix = 18.3.0 compat >= 18.3
 	"
 REQUIRES="
@@ -42,9 +42,9 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"
 

dev-db/postgresql/postgresql-9.3.5.recipe

@@ -64,12 +64,12 @@ REQUIRES="
 
 PROVIDES_devel="
 	postgresql${secondaryArchSuffix}_devel = $portVersion
-	devel:libpgport$secondaryArchSuffix = $portVersion
-	devel:libpgcommon$secondaryArchSuffix = $portVersion
 	devel:libecpg$secondaryArchSuffix = $portVersion
+	devel:libecpg_compat$secondaryArchSuffix = $portVersion
+	devel:libpgcommon$secondaryArchSuffix = $portVersion
+	devel:libpgport$secondaryArchSuffix = $portVersion
 	devel:libpgtypes$secondaryArchSuffix = $portVersion
 	devel:libpq$secondaryArchSuffix = $portVersion
-	devel:libecpg_compat$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	postgresql${secondaryArchSuffix} == $portVersion base
@@ -81,12 +81,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:aclocal
 	cmd:awk
 	cmd:bison
 	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"

dev-db/postgresql_server/postgresql_server-9.3.4.recipe

@@ -38,10 +38,10 @@ PROVIDES="
 	cmd:pg_dumpall = $portVersion compat >= 9
 	cmd:pg_isready = $portVersion compat >= 9
 	cmd:pg_restore = $portVersion compat >= 9
+	cmd:pgsql = $portVersion compat >= 9
 	cmd:psql = $portVersion compat >= 9
 	cmd:reindexdb = $portVersion compat >= 9
 	cmd:vacuumdb = $portVersion compat >= 9
-	cmd:pgsql = $portVersion compat >= 9
 	"
 REQUIRES="
 	haiku

dev-db/redis/redis-3.2.9.recipe

@@ -33,8 +33,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 

dev-db/unixODBC/unixodbc-2.3.4.recipe

@@ -21,10 +21,10 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	unixodbc${secondaryArchSuffix} = $portVersion
-	cmd:odbcinst${secondaryArchSuffix}
 	cmd:dltest${secondaryArchSuffix}
 	cmd:isql${secondaryArchSuffix}
 	cmd:iusql${secondaryArchSuffix}
+	cmd:odbcinst${secondaryArchSuffix}
 	cmd:slencheck${secondaryArchSuffix}
 	lib:libodbc${secondaryArchSuffix} = 2.0.0 compat >= 2
 	lib:libodbccr${secondaryArchSuffix} = 2.0.0 compat >= 2

dev-dotnet/pnet/pnet-0.8.0.recipe

@@ -18,7 +18,6 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	pnet = $portVersion
-	lib:libpnet = $portVersion
 	cmd:al
 	cmd:cli_unknown_ar
 	cmd:cli_unknown_cpp
@@ -49,6 +48,7 @@ PROVIDES="
 	cmd:ilstrip
 	cmd:ilverify
 	cmd:resgen
+	lib:libpnet = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -74,16 +74,16 @@ BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:make
-	cmd:ld
-	cmd:find
-	cmd:flex
-	cmd:awk
-	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoconf
+	cmd:awk
+	cmd:find
+	cmd:flex
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
 	cmd:treecc
 	"
 

dev-embedded/arduino/arduino-1.0.6.recipe

@@ -21,12 +21,12 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	avr_binutils$secondaryArchSuffix
+	avr_gcc$secondaryArchSuffix
+	avr_libc$secondaryArchSuffix
 	openjdk$secondaryArchSuffix
 	rxtx$secondaryArchSuffix
 	cmd:avrdude$secondaryArchSuffix
-	avr_libc$secondaryArchSuffix
-	avr_gcc$secondaryArchSuffix
-	avr_binutils$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

dev-embedded/arduino/arduino-1.7.11.recipe

@@ -34,11 +34,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	avr_binutils$secondaryArchSuffix
+	avr_gcc$secondaryArchSuffix
+	avr_libc$secondaryArchSuffix
 	openjdk$secondaryArchSuffix
 	cmd:avrdude$secondaryArchSuffix
-	avr_libc$secondaryArchSuffix
-	avr_gcc$secondaryArchSuffix
-	avr_binutils$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -47,11 +47,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
+	cmd:jar
 	cmd:java
 	cmd:java_config
 	cmd:javac
-	cmd:jar
+	cmd:make
 	"
 
 BUILD()

dev-embedded/arduino/arduino-1.7.4.recipe

@@ -28,11 +28,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	avr_binutils$secondaryArchSuffix
+	avr_gcc$secondaryArchSuffix
+	avr_libc$secondaryArchSuffix
 	openjdk$secondaryArchSuffix
 	cmd:avrdude$secondaryArchSuffix
-	avr_libc$secondaryArchSuffix
-	avr_gcc$secondaryArchSuffix
-	avr_binutils$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -41,11 +41,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
+	cmd:jar
 	cmd:java
 	cmd:java_config
 	cmd:javac
-	cmd:jar
+	cmd:make
 	"
 
 BUILD()

dev-embedded/arduino/arduino-1.7.7.recipe

@@ -34,11 +34,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	avr_binutils$secondaryArchSuffix
+	avr_gcc$secondaryArchSuffix
+	avr_libc$secondaryArchSuffix
 	openjdk$secondaryArchSuffix
 	cmd:avrdude$secondaryArchSuffix
-	avr_libc$secondaryArchSuffix
-	avr_gcc$secondaryArchSuffix
-	avr_binutils$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -47,11 +47,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
+	cmd:jar
 	cmd:java
 	cmd:java_config
 	cmd:javac
-	cmd:jar
+	cmd:make
 	"
 
 BUILD()

dev-embedded/avrdude/avrdude-6.3.recipe

@@ -19,32 +19,32 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	avrdude$secondaryArchSuffix = $portVersion
-	lib:libavrdude$secondaryArchSuffix = $portVersion
 	cmd:avrdude$secondaryArchSuffix = $portVersion
+	lib:libavrdude$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libusb_1.0$secondaryArchSuffix
-	lib:libftdi1$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
+	lib:libftdi1$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libusb_1.0$secondaryArchSuffix
-	devel:libftdi1$secondaryArchSuffix
 	devel:libelf$secondaryArchSuffix
+	devel:libftdi1$secondaryArchSuffix
+	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:automake
+	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:automake
-	cmd:autoconf
 	cmd:libtool
 	cmd:make
-	cmd:yacc
-	cmd:flex
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:yacc
 	"
 
 BUILD()

dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe

@@ -37,8 +37,8 @@ BUILD_REQUIRES="
 	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:automake
 	cmd:autoconf
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-embedded/libftdi/libftdi-1.0.recipe

@@ -19,16 +19,16 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libftdi$secondaryArchSuffix = $portVersion
-	lib:libftdi1$secondaryArchSuffix = $portVersion
-	lib:libftdipp1$secondaryArchSuffix = $portVersion
 	cmd:ftdi_eeprom$secondaryArchSuffix
 	cmd:libftdi1_config$secondaryArchSuffix
+	lib:libftdi1$secondaryArchSuffix = $portVersion
+	lib:libftdipp1$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libboost_unit_test_framework$secondaryArchSuffix
 	lib:libconfuse$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
-	lib:libboost_unit_test_framework$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -42,14 +42,14 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libboost_unit_test_framework$secondaryArchSuffix
 	devel:libconfuse$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
-	devel:libboost_unit_test_framework$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"
 

dev-embedded/sdcc/sdcc-3.6.0.recipe

@@ -19,7 +19,6 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	sdcc$secondaryArchSuffix = $portVersion
-	cmd:sdcc = $portVersion
 	cmd:as2gbmap
 	cmd:makebin
 	cmd:packihx
@@ -34,6 +33,7 @@ PROVIDES="
 	cmd:sdasstm8
 	cmd:sdastlcs90
 	cmd:sdasz80
+	cmd:sdcc = $portVersion
 	cmd:sdcclib
 	cmd:sdcdb
 	cmd:sdcdb.el
@@ -62,12 +62,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:automake
 	cmd:autoconf
+	cmd:automake
 	cmd:bison
 	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:makeinfo
 	"

dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe

@@ -14,8 +14,8 @@ ARCHITECTURES="x86_gcc2 x86_64"
 
 PROVIDES="
 	u_boot_tools = $portVersion
-	cmd:mkimage
 	cmd:mkenvimage
+	cmd:mkimage
 	"
 REQUIRES="
 	haiku

dev-games/box2d/box2d-2.3.1.recipe

@@ -35,9 +35,9 @@ BUILD_REQUIRES="
 	devel:libGLU$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-games/fifechan/fifechan-0.1.2.recipe

@@ -44,10 +44,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-games/ode/ode-0.12.recipe

@@ -27,8 +27,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	ode${secondaryArchSuffix}_devel = $portVersion
-	devel:libode$secondaryArchSuffix = $portVersion
 	cmd:ode_config$secondaryArchSuffix = $portVersion
+	devel:libode$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
@@ -39,11 +39,11 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:mkdepend
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:awk
+	cmd:make
+	cmd:mkdepend
 	"
 
 BUILD()

dev-games/physfs/physfs-2.0.3.recipe

@@ -21,8 +21,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	physfs$secondaryArchSuffix = $portVersion compat >= 2.0
-	lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
 	cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0
+	lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 PATCH()

dev-java/gnu_classpath/gnu_classpath-0.98.recipe

@@ -36,11 +36,10 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:libtoolize
 	cmd:gcc$secondaryArchSuffix
+	cmd:jamvm$secondaryArchSuffix # at least one java VM, for now just use jamvm
+	cmd:libtoolize
 	cmd:make
-	# at least one java VM, for now just use jamvm
-	cmd:jamvm$secondaryArchSuffix
 	"
 
 BUILD()

dev-java/jamvm/jamvm-1.5.4.recipe

@@ -16,8 +16,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	jamvm$secondaryArchSuffix = $portVersion
 	cmd:jamvm$secondaryArchSuffix = $portVersion
-	lib:libjvm$secondaryArchSuffix
 	devel:libjvm$secondaryArchSuffix
+	lib:libjvm$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -29,12 +29,12 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	"
 BUILD_PREREQUIRES="
-	cmd:autoreconf
 	cmd:aclocal
+	cmd:autoreconf
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:find
 	"
 
 BUILD()

dev-java/jamvm/jamvm-2.0.0.recipe

@@ -16,8 +16,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	jamvm$secondaryArchSuffix = $portVersion
 	cmd:jamvm$secondaryArchSuffix = $portVersion
-	lib:libjvm$secondaryArchSuffix
 	devel:libjvm$secondaryArchSuffix
+	lib:libjvm$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -29,12 +29,12 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	"
 BUILD_PREREQUIRES="
-	cmd:autoreconf
 	cmd:aclocal
+	cmd:autoreconf
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:find
 	"
 
 BUILD()

dev-java/rxtx/rxtx-2.2_pre2.recipe

@@ -36,13 +36,13 @@ BUILD_PREREQUIRES="
 	openjdk${secondaryArchSuffix}
 	cmd:aclocal
 	cmd:autoconf
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:javac
 	cmd:javah
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-	cmd:find
 	"
 
 BUILD()

dev-lang/camlp5/camlp5-6.12.recipe

@@ -30,9 +30,9 @@ REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:make
-	cmd:gcc
 	ocaml
+	cmd:gcc
+	cmd:make
 	"
 
 BUILD()

dev-lang/camlp5/camlp5-7.05.recipe

@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:ocaml
 	"
 

dev-lang/erlang/erlang-20.1.recipe

@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:libtool
 	cmd:gcc
+	cmd:libtool
 	cmd:perl
 	#cmd:wx_config
 	lib:libcrypto

dev-lang/fpc_bootstrap/fpc_bin-2.6.4.recipe

@@ -14,8 +14,6 @@ DISABLE_SOURCE_PACKAGE="YES"
 
 PROVIDES="
 	fpc_bin = $portVersion
-	cmd:fpc = $portVersion
-	cmd:ppc386 = $portVersion
 	cmd:bin2obj = $portVersion
 	cmd:chmcmd = $portVersion
 	cmd:chmls = $portVersion
@@ -23,6 +21,7 @@ PROVIDES="
 	cmd:delp = $portVersion
 	cmd:fd2pascal = $portVersion
 	cmd:fp = $portVersion
+	cmd:fpc = $portVersion
 	cmd:fpcjres = $portVersion
 	cmd:fpclasschart = $portVersion
 	cmd:fpcmake = $portVersion
@@ -44,6 +43,7 @@ PROVIDES="
 	cmd:pas2ut = $portVersion
 	cmd:plex = $portVersion
 	cmd:postw32 = $portVersion
+	cmd:ppc386 = $portVersion
 	cmd:ppdep = $portVersion
 	cmd:ppudump = $portVersion
 	cmd:ppufiles = $portVersion

dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe

@@ -14,15 +14,18 @@ DISABLE_SOURCE_PACKAGE="YES"
 
 PROVIDES="
 	fpc_bin = $portVersion
-	cmd:fpc = $portVersion
-	cmd:ppc386 = $portVersion
 	cmd:bin2obj = $portVersion
 	cmd:chmcmd = $portVersion
 	cmd:chmls = $portVersion
+	cmd:cvsco.tdf = $portVersion
+	cmd:cvsdiff.tdf = $portVersion
+	cmd:cvsup.tdf = $portVersion
 	cmd:data2inc = $portVersion
 	cmd:delp = $portVersion
 	cmd:fd2pascal = $portVersion
 	cmd:fp = $portVersion
+	cmd:fp.ans = $portVersion
+	cmd:fpc = $portVersion
 	cmd:fpcjres = $portVersion
 	cmd:fpclasschart = $portVersion
 	cmd:fpcmake = $portVersion
@@ -32,10 +35,14 @@ PROVIDES="
 	cmd:fpdoc = $portVersion
 	cmd:fppkg = $portVersion
 	cmd:fprcp = $portVersion
+	cmd:gplprog.pt = $portVersion
+	cmd:gplunit.pt = $portVersion
+	cmd:grep.tdf = $portVersion
 	cmd:h2pas = $portVersion
 	cmd:h2paspp = $portVersion
 	cmd:instantfpc = $portVersion
 	cmd:makeskel = $portVersion
+	cmd:makeskel.rsj = $portVersion
 	cmd:mkarmins = $portVersion
 	cmd:mkinsadd = $portVersion
 	cmd:mkx86ins = $portVersion
@@ -44,27 +51,20 @@ PROVIDES="
 	cmd:pas2ut = $portVersion
 	cmd:plex = $portVersion
 	cmd:postw32 = $portVersion
+	cmd:ppc386 = $portVersion
 	cmd:ppdep = $portVersion
 	cmd:ppudump = $portVersion
 	cmd:ppufiles = $portVersion
 	cmd:ppumove = $portVersion
+	cmd:program.pt = $portVersion
 	cmd:ptop = $portVersion
+	cmd:ptop.rsj = $portVersion
 	cmd:pyacc = $portVersion
 	cmd:rmcvsdir = $portVersion
 	cmd:rstconv = $portVersion
-	cmd:unitdiff = $portVersion
-	cmd:cvsco.tdf = $portVersion
-	cmd:cvsdiff.tdf = $portVersion
-	cmd:cvsup.tdf = $portVersion
-	cmd:fp.ans = $portVersion
-	cmd:gplprog.pt = $portVersion
-	cmd:gplunit.pt = $portVersion
-	cmd:grep.tdf = $portVersion
-	cmd:makeskel.rsj = $portVersion
-	cmd:program.pt = $portVersion
-	cmd:ptop.rsj = $portVersion
 	cmd:tpgrep.tdf = $portVersion
 	cmd:unit.pt = $portVersion
+	cmd:unitdiff = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix

dev-lang/fpc_bootstrap/fpc_bin-3.0.2.recipe

@@ -26,15 +26,18 @@ POST_INSTALL_SCRIPTS="
 
 PROVIDES="
 	fpc_bin = $portVersion
-	cmd:fpc = $portVersion
-	cmd:ppc386 = $portVersion
 	cmd:bin2obj = $portVersion
 	cmd:chmcmd = $portVersion
 	cmd:chmls = $portVersion
+	cmd:cvsco.tdf = $portVersion
+	cmd:cvsdiff.tdf = $portVersion
+	cmd:cvsup.tdf = $portVersion
 	cmd:data2inc = $portVersion
 	cmd:delp = $portVersion
 	cmd:fd2pascal = $portVersion
 	cmd:fp = $portVersion
+	cmd:fp.ans = $portVersion
+	cmd:fpc = $portVersion
 	cmd:fpcjres = $portVersion
 	cmd:fpclasschart = $portVersion
 	cmd:fpcmake = $portVersion
@@ -44,10 +47,14 @@ PROVIDES="
 	cmd:fpdoc = $portVersion
 	cmd:fppkg = $portVersion
 	cmd:fprcp = $portVersion
+	cmd:gplprog.pt = $portVersion
+	cmd:gplunit.pt = $portVersion
+	cmd:grep.tdf = $portVersion
 	cmd:h2pas = $portVersion
 	cmd:h2paspp = $portVersion
 	cmd:instantfpc = $portVersion
 	cmd:makeskel = $portVersion
+	cmd:makeskel.rsj = $portVersion
 	cmd:mkarmins = $portVersion
 	cmd:mkinsadd = $portVersion
 	cmd:mkx86ins = $portVersion
@@ -56,27 +63,20 @@ PROVIDES="
 	cmd:pas2ut = $portVersion
 	cmd:plex = $portVersion
 	cmd:postw32 = $portVersion
+	cmd:ppc386 = $portVersion
 	cmd:ppdep = $portVersion
 	cmd:ppudump = $portVersion
 	cmd:ppufiles = $portVersion
 	cmd:ppumove = $portVersion
+	cmd:program.pt = $portVersion
 	cmd:ptop = $portVersion
+	cmd:ptop.rsj = $portVersion
 	cmd:pyacc = $portVersion
 	cmd:rmcvsdir = $portVersion
 	cmd:rstconv = $portVersion
-	cmd:unitdiff = $portVersion
-	cmd:cvsco.tdf = $portVersion
-	cmd:cvsdiff.tdf = $portVersion
-	cmd:cvsup.tdf = $portVersion
-	cmd:fp.ans = $portVersion
-	cmd:gplprog.pt = $portVersion
-	cmd:gplunit.pt = $portVersion
-	cmd:grep.tdf = $portVersion
-	cmd:makeskel.rsj = $portVersion
-	cmd:program.pt = $portVersion
-	cmd:ptop.rsj = $portVersion
 	cmd:tpgrep.tdf = $portVersion
 	cmd:unit.pt = $portVersion
+	cmd:unitdiff = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix

dev-lang/lua/lua51-5.1.5.recipe

@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc${secondaryArchSuffix}
+	cmd:make
 	"
 
 BUILD()

dev-lang/lua/lua52-5.2.4.recipe

@@ -40,8 +40,8 @@ CONFLICTS_devel="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-lang/luajit/luajit-2.0.4.recipe

@@ -16,9 +16,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	luajit$secondaryArchSuffix = $portVersion
-	lib:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2
-	cmd:luajit_$portVersion$secondaryArchSuffix
 	cmd:luajit$secondaryArchSuffix
+	cmd:luajit_$portVersion$secondaryArchSuffix
+	lib:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,8 +36,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-lang/luajit/luajit-2.1.0~beta3.recipe

@@ -15,9 +15,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	luajit$secondaryArchSuffix = $portVersion
-	lib:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2
-	cmd:luajit_${portVersion/\~/_}$secondaryArchSuffix
 	cmd:luajit$secondaryArchSuffix
+	cmd:luajit_${portVersion/\~/_}$secondaryArchSuffix
+	lib:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,8 +35,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-lang/nasm/nasm-2.11.02.recipe

@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:sed

dev-lang/nasm/nasm-2.11.08.recipe

@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:sed

dev-lang/nasm/nasm-2.12.01.recipe

@@ -31,9 +31,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:sed
 	"

dev-lang/nhc98/nhc98-1.22.recipe

@@ -53,8 +53,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:diff
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:xargs
 	"
 

dev-lang/orc/orc-0.4.27.recipe

@@ -36,8 +36,8 @@ PROVIDES_devel="
 	devel:liborc_test_0.4$secondaryArchSuffix = 0.27.0 compat >= 0
 	"
 REQUIRES_devel="
-	orc$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	orc$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="

dev-lang/php/php-5.6.33.recipe

@@ -32,31 +32,31 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	lib:libicuuc
-	lib:libxml2
-	lib:libz
 	lib:libbz2
-	lib:libssl
 	lib:libcrypto
 	lib:libcurl
+	lib:libfreetype
+	lib:libicuuc
+	lib:libjpeg
 	lib:libpcre
 	lib:libpng16
-	lib:libjpeg
-	lib:libfreetype
+	lib:libssl
+	lib:libxml2
+	lib:libz
 	"
 
 BUILD_REQUIRES="
-	devel:libicuuc
-	devel:libxml2
-	devel:libz
 	devel:libbz2
-	devel:libssl
 	devel:libcrypto
 	devel:libcurl
+	devel:libfreetype
+	devel:libicuuc
+	devel:libjpeg
 	devel:libpcre
 	devel:libpng16
-	devel:libjpeg
-	devel:libfreetype
+	devel:libssl
+	devel:libxml2
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
@@ -64,12 +64,12 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:bison
 	cmd:dos2unix
+	cmd:freetype_config
 	cmd:gcc
+	cmd:icu_config
 	cmd:make
 	cmd:pkg_config
-	cmd:freetype_config
 	cmd:xml2_config
-	cmd:icu_config
 	"
 
 PATCH()

dev-lang/python/python-2.7.12.recipe

@@ -30,9 +30,9 @@ PROVIDES="
 	cmd:pydoc = $portVersion compat >= 2.7
 	cmd:python = $portVersion compat >= 2.7
 	cmd:python2 = $portVersion compat >= 2.7
-	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python2.7 = $portVersion compat >= 2.7
 	cmd:python2.7_config = $portVersion compat >= 2.7
+	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python_config = $portVersion compat >= 2.7
 	cmd:smtpd.py = $portVersion compat >= 2.7
 	devel:libpython2.7 = 1.0
@@ -41,21 +41,21 @@ PROVIDES="
 REQUIRES="
 	haiku
 	lib:libbz2
+	lib:libffi
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
-	lib:libffi
 	"
 
 BUILD_REQUIRES="
 	devel:libbz2
 	devel:libffi
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="

dev-lang/python/python-2.7.13.recipe

@@ -30,9 +30,9 @@ PROVIDES="
 	cmd:pydoc = $portVersion compat >= 2.7
 	cmd:python = $portVersion compat >= 2.7
 	cmd:python2 = $portVersion compat >= 2.7
-	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python2.7 = $portVersion compat >= 2.7
 	cmd:python2.7_config = $portVersion compat >= 2.7
+	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python_config = $portVersion compat >= 2.7
 	cmd:smtpd.py = $portVersion compat >= 2.7
 	devel:libpython2.7 = 1.0
@@ -41,21 +41,21 @@ PROVIDES="
 REQUIRES="
 	haiku
 	lib:libbz2
+	lib:libffi
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
-	lib:libffi
 	"
 
 BUILD_REQUIRES="
 	devel:libbz2
 	devel:libffi
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="

dev-lang/python/python-2.7.14.recipe

@@ -30,9 +30,9 @@ PROVIDES="
 	cmd:pydoc = $portVersion compat >= 2.7
 	cmd:python = $portVersion compat >= 2.7
 	cmd:python2 = $portVersion compat >= 2.7
-	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python2.7 = $portVersion compat >= 2.7
 	cmd:python2.7_config = $portVersion compat >= 2.7
+	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python_config = $portVersion compat >= 2.7
 	cmd:smtpd.py = $portVersion compat >= 2.7
 	devel:libpython2.7 = 1.0
@@ -41,21 +41,21 @@ PROVIDES="
 REQUIRES="
 	haiku
 	lib:libbz2
+	lib:libffi
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
-	lib:libffi
 	"
 
 BUILD_REQUIRES="
 	devel:libbz2
 	devel:libffi
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="

dev-lang/python/python3-3.4.3.recipe

@@ -33,16 +33,16 @@ PROVIDES="
 	cmd:pydoc3 = $portVersion compat >= 3.4
 	cmd:pydoc3.4 = $portVersion compat >= 3.4
 	cmd:python3 = $portVersion compat >= 3.4
-	cmd:python3_config = $portVersion compat >= 3.4
 	cmd:python3.4 = $portVersion compat >= 3.4
 	cmd:python3.4_config = $portVersion compat >= 3.4
 	cmd:python3.4m = $portVersion compat >= 3.4
 	cmd:python3.4m_config = $portVersion compat >= 3.4
+	cmd:python3_config = $portVersion compat >= 3.4
 	cmd:pyvenv = $portVersion compat >= 3.4
 	cmd:pyvenv_3.4 = $portVersion compat >= 3.4
 	devel:libpython3.4m = 1.0
-	lib:libpython3.4m = 1.0
 	lib:libpython3 = 3.4
+	lib:libpython3.4m = 1.0
 	"
 REQUIRES="
 	haiku
@@ -50,9 +50,9 @@ REQUIRES="
 	lib:libbz2
 	lib:libexpat
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
 	"
 
@@ -60,9 +60,9 @@ BUILD_REQUIRES="
 	devel:libbz2
 	devel:libexpat
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="
@@ -73,8 +73,8 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:pkg_config
 	cmd:make
+	cmd:pkg_config
 	cmd:python
 	"
 

dev-lang/r/r-3.4.3.recipe

@@ -28,6 +28,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:less
 	lib:libbz2$secondaryArchSuffix
 #	lib:libcairo$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -53,7 +54,6 @@ REQUIRES="
 	lib:libtcl8.5$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	cmd:less
 	"
 
 BUILD_REQUIRES="
@@ -102,8 +102,8 @@ BUILD_PREREQUIRES="
 	cmd:pwd
 	cmd:sed
 	cmd:texi2any
-	cmd:yacc
 	cmd:which
+	cmd:yacc
 	"
 
 BUILD()

dev-lang/ruby/ruby-2.2.10.recipe

@@ -63,13 +63,12 @@ BUILD_REQUIRES="
 	devel:libncursesw$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:bison
-	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.10.0.recipe

@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -42,19 +42,19 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
+	cmd:rustc == 1.9.0
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
-	cmd:rustc == 1.9.0
 	"
 
 BUILD()

dev-lang/rust/rust-1.11.0.recipe

@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -43,20 +43,20 @@ BUILD_REQUIRES="
 	binutils${secondaryArchSuffix} == 2.26.1_2016_07_22 # version 2.28.1 will crash when building llvm
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
+	cmd:rustc == 1.10.0
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
-	cmd:rustc == 1.10.0
-	cmd:cmake
 	"
 
 BUILD()

dev-lang/rust/rust-1.12.1.recipe

@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -43,20 +43,20 @@ BUILD_REQUIRES="
 	binutils${secondaryArchSuffix} == 2.26.1_2016_07_22 # version 2.28.1 will crash when building llvm
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
+	cmd:rustc == 1.11.0
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
-	cmd:rustc == 1.11.0
-	cmd:cmake
 	"
 
 BUILD()

dev-lang/rust/rust-1.13.0.recipe

@@ -32,9 +32,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -45,20 +45,20 @@ BUILD_REQUIRES="
 	binutils${secondaryArchSuffix} == 2.26.1_2016_07_22 # version 2.28.1 will crash when building llvm
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
+	cmd:rustc == 1.12.1
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
-	cmd:rustc == 1.12.1
-	cmd:cmake
 	"
 
 BUILD()

dev-lang/rust/rust-1.14.0.recipe

@@ -32,9 +32,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -45,20 +45,20 @@ BUILD_REQUIRES="
 	binutils${secondaryArchSuffix} == 2.26.1_2016_07_22 # version 2.28.1 will crash when building llvm
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
+	cmd:rustc == 1.13.0
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
-	cmd:rustc == 1.13.0
-	cmd:cmake
 	"
 
 BUILD()

dev-lang/rust/rust-1.16.0.recipe

@@ -37,10 +37,10 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -63,8 +63,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.17.0.recipe

@@ -46,11 +46,11 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -72,8 +72,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.18.0.recipe

@@ -53,12 +53,12 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rls$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -80,8 +80,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.19.0.recipe

@@ -51,11 +51,11 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -77,8 +77,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.20.0.recipe

@@ -50,11 +50,11 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -76,8 +76,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.21.0.recipe

@@ -51,12 +51,12 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rls = $rlsVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -78,8 +78,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.27.0.recipe

@@ -78,13 +78,13 @@ SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:cargo_fmt = $cargoVersion
 	cmd:rls = $rlsVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	cmd:rustfmt = $rustfmtVersion
 	"
 REQUIRES="
@@ -107,8 +107,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.28.0.recipe

@@ -18,13 +18,13 @@ SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:cargo_fmt = $cargoVersion
 	cmd:rls = $rlsVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	cmd:rustfmt = $rustfmtVersion
 	"
 REQUIRES="
@@ -47,8 +47,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-lang/rust/rust-1.9.0.recipe

@@ -36,9 +36,9 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -48,16 +48,16 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
 	"

dev-lang/spidermonkey/spidermonkey-1.8.5.recipe

@@ -34,16 +34,16 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
-	cmd:awk
-	cmd:python
-	cmd:xargs
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:python
 	cmd:sed
+	cmd:xargs
 	cmd:zip
 	"
 

dev-lang/squirrel/squirrel-3.1.recipe

@@ -25,8 +25,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	squirrel${secondaryArchSuffix}_devel = $portVersion
-	devel:libsquirrel$secondaryArchSuffix = $portVersion
 	devel:libsqstdlib$secondaryArchSuffix = $portVersion
+	devel:libsquirrel$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	squirrel$secondaryArchSuffix == $portVersion base
@@ -34,8 +34,8 @@ REQUIRES_devel="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-lang/swi_prolog/swi_prolog-6.2.0.recipe

@@ -22,27 +22,27 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	swi_prolog$secondaryArchSuffix = $portVersion
 	cmd:swipl$secondaryArchSuffix
-	cmd:swipl_rc$secondaryArchSuffix
 	cmd:swipl_ld$secondaryArchSuffix
+	cmd:swipl_rc$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
-	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix >= 6
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 6
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:autoreconf
 	cmd:make
 	"
 

dev-lang/swi_prolog/swi_prolog-6.6.6.recipe

@@ -22,27 +22,27 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	swi_prolog$secondaryArchSuffix = $portVersion
 	cmd:swipl$secondaryArchSuffix
-	cmd:swipl_rc$secondaryArchSuffix
 	cmd:swipl_ld$secondaryArchSuffix
+	cmd:swipl_rc$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
-	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix >= 6
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 6
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:autoreconf
 	cmd:make
 	"
 

dev-lang/swift_lang/swift_lang-3.1.recipe

@@ -37,8 +37,12 @@ SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
 	swift_lang$secondaryArchSuffix = $portVersion
+	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
+	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
+	cmd:sil_nm$secondaryArchSuffix = $portVersion
+	cmd:sil_opt$secondaryArchSuffix = $portVersion
+	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
 	cmd:swift$secondaryArchSuffix = $portVersion
-	cmd:swiftc$secondaryArchSuffix = $portVersion
 	cmd:swift_api_digester$secondaryArchSuffix = $portVersion
 	cmd:swift_autolink_extract$secondaryArchSuffix = $portVersion
 	cmd:swift_demangle$secondaryArchSuffix = $portVersion
@@ -47,14 +51,11 @@ PROVIDES="
 	cmd:swift_llvm_opt$secondaryArchSuffix = $portVersion
 	cmd:swift_reflection_dump$secondaryArchSuffix = $portVersion
 	cmd:swift_remoteast_test$secondaryArchSuffix = $portVersion
-	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
-	cmd:sil_opt$secondaryArchSuffix = $portVersion
-	cmd:sil_nm$secondaryArchSuffix = $portVersion
-	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
-	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
+	cmd:swiftc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	llvm$secondaryArchSuffix >= 3.7.0 base
 	lib:libcharset$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
 	lib:libexecinfo$secondaryArchSuffix
@@ -62,7 +63,6 @@ REQUIRES="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	llvm$secondaryArchSuffix >= 3.7.0 base
 	lib:libncurses$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libuuid$secondaryArchSuffix
@@ -72,10 +72,10 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libcharset$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
-	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libgcc$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicudata$secondaryArchSuffix
@@ -100,8 +100,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
-	cmd:swig
 	cmd:sed
+	cmd:swig
 	cmd:which
 	"
 

dev-lang/swift_lang/swift_lang-4.1.0~git.recipe

@@ -39,14 +39,13 @@ SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
 	swift_lang$secondaryArchSuffix = $portVersion
+	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
 	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
 	cmd:sil_llvm_gen$secondaryArchSuffix = $portVersion
-	cmd:sil_opt$secondaryArchSuffix = $portVersion
 	cmd:sil_nm$secondaryArchSuffix = $portVersion
+	cmd:sil_opt$secondaryArchSuffix = $portVersion
 	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
-	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
 	cmd:swift$secondaryArchSuffix = $portVersion
-	cmd:swiftc$secondaryArchSuffix = $portVersion
 	cmd:swift_api_digester$secondaryArchSuffix = $portVersion
 	cmd:swift_api_dump.py$secondaryArchSuffix = $portVersion
 	cmd:swift_autolink_extract$secondaryArchSuffix = $portVersion
@@ -59,9 +58,11 @@ PROVIDES="
 	cmd:swift_reflection_test_haiku_x86_64$secondaryArchSuffix = $portVersion
 	cmd:swift_remoteast_test$secondaryArchSuffix = $portVersion
 	cmd:swift_syntax_test$secondaryArchSuffix = $portVersion
+	cmd:swiftc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	llvm$secondaryArchSuffix >= 5.0.0
 	lib:libatomic$secondaryArchSuffix
 	lib:libcharset$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
@@ -70,7 +71,6 @@ REQUIRES="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	llvm$secondaryArchSuffix >= 5.0.0
 	lib:libncurses$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libuuid$secondaryArchSuffix
@@ -80,10 +80,10 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libcharset$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
-	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libgcc$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicudata$secondaryArchSuffix
@@ -108,8 +108,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
-	cmd:swig
 	cmd:sed
+	cmd:swig
 	cmd:which
 	"
 

dev-lang/swig/swig-3.0.12.recipe

@@ -29,8 +29,8 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	swig${secondaryArchSuffix} = $portVersion
-	cmd:swig$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:ccache_swig$secondaryArchSuffix = $portVersion
+	cmd:swig$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -44,12 +44,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	cmd:bison
+	cmd:g++$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:bison
 	"
 
 BUILD()

dev-lang/tcl/tcl-8.5.9.recipe

@@ -39,12 +39,12 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:autoconf
-	cmd:make
-	cmd:gcc
-	cmd:ld
 	cmd:find
-	cmd:sed
+	cmd:gcc
 	cmd:grep
+	cmd:ld
+	cmd:make
+	cmd:sed
 	"
 
 BUILD()

dev-lang/yab/yab-1.7.5.6.recipe

@@ -17,8 +17,8 @@ ARCHITECTURES="x86_gcc2 !x86 x86_64"
 PROVIDES="
 	yab = $portVersion
 	cmd:yab = $portVersion
-	lib:libyab = $portVersion
 	devel:libyab = $portVersion
+	lib:libyab = $portVersion
 	"
 REQUIRES="
 	haiku

dev-libs/atk/atk-2.23.4.recipe

@@ -23,11 +23,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
+	lib:gtk_doc$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
-	lib:gtk_doc$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-	cmd:gettext$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -35,8 +35,8 @@ PROVIDES_devel="
 	devel:libatk_1.0 = 0.22313.1 compat >= 0
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	atk$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="

dev-libs/atk/atk-2.28.1.recipe

@@ -25,10 +25,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-	cmd:gettext$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -36,8 +36,8 @@ PROVIDES_devel="
 	devel:libatk_1.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	atk$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="

dev-libs/cereal/cereal-1.2.2.recipe

@@ -27,9 +27,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-libs/confuse/confuse-2.7.recipe

@@ -45,13 +45,13 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	gettext$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autom4te
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:autom4te
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
 	cmd:make
 	"
 

dev-libs/glib/glib-1.2.10.recipe

@@ -56,13 +56,13 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:m4
 	cmd:make
 	"

dev-libs/glib/glib2-2.48.2.recipe

@@ -55,11 +55,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -81,18 +81,18 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python

dev-libs/glib/glib2-2.53.1.recipe

@@ -56,11 +56,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -82,18 +82,18 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python

dev-libs/glib/glib2-2.53.5.recipe

@@ -50,11 +50,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -73,13 +73,13 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	cmd:perl
 	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	cmd:perl
-	haiku$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -88,18 +88,18 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python

dev-libs/glib/glib2-2.54.3.recipe

@@ -52,11 +52,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -77,15 +77,15 @@ REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	cmd:perl
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libffi$secondaryArchSuffix
-	lib:libpcre$secondaryArchSuffix
+	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:libffi$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

dev-libs/glib/glib2-2.57.1.recipe

@@ -52,11 +52,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -77,15 +77,15 @@ REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	cmd:perl
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libffi$secondaryArchSuffix
-	lib:libpcre$secondaryArchSuffix
+	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:libffi$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

dev-libs/gmp/gmp-5.1.3.recipe

@@ -40,10 +40,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"
 

dev-libs/gmp/gmp-6.0.0.recipe

@@ -40,10 +40,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"
 

dev-libs/gmp/gmp-6.1.2.recipe

@@ -42,10 +42,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"
 

dev-libs/grantlee/grantlee-5.1.0.recipe

@@ -41,8 +41,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="

dev-libs/hidapi/hidapi-20160919.recipe

@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libusb_1.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -42,8 +42,8 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libusb_1.0$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal

dev-libs/jansson/jansson-2.11.recipe

@@ -40,8 +40,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:automake
 	cmd:autoheader
+	cmd:automake
 	cmd:awk
 	cmd:cmp
 	cmd:diff

dev-libs/kdiagram/kdiagram-2.6.0.recipe

@@ -35,8 +35,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="

dev-libs/kproperty/kproperty-3.1.0.recipe

@@ -36,8 +36,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix

dev-libs/kreport/kreport-3.1.0.recipe

@@ -42,8 +42,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.46
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.46
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix

dev-libs/libbson/libbson-1.1.10.recipe

@@ -35,13 +35,13 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
+	pkgconfig$secondaryArchSuffix
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
-	pkgconfig$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()

dev-libs/libclaw/libclaw-1.7.4.recipe

@@ -28,6 +28,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libclaw$secondaryArchSuffix = $portVersion
+	cmd:claw_config
 	lib:libclaw_application$secondaryArchSuffix
 	lib:libclaw_configuration_file$secondaryArchSuffix
 	lib:libclaw_dynamic_library$secondaryArchSuffix
@@ -35,7 +36,6 @@ PROVIDES="
 	lib:libclaw_logger$secondaryArchSuffix
 	lib:libclaw_net$secondaryArchSuffix
 	lib:libclaw_tween$secondaryArchSuffix
-	cmd:claw_config
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -61,16 +61,16 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	boost${secondaryArchSuffix}_devel
+	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libintl$secondaryArchSuffix
-	boost${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake >= 3.0
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake >= 3.0
 	cmd:make
 	"
 

dev-libs/libcroco/libcroco-0.6.12.recipe

@@ -22,10 +22,9 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	#required by glib
-	lib:libiconv$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix # required by glib
 	lib:libintl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -36,8 +35,8 @@ PROVIDES_devel="
 	devel:libcroco_0.6$secondaryArchSuffix = 3.0.1 compat >= 3
 	"
 REQUIRES_devel="
-	libcroco$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	libcroco$secondaryArchSuffix == $portVersion base
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
@@ -53,10 +52,10 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
+	cmd:gtkdocize
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:gtkdocize
 	cmd:pkg_config$secondaryArchSuffix
 	"
 

dev-libs/libcss/libcss-0.7.0.recipe

@@ -30,17 +30,17 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libiconv
 	devel:libparserutils${secondaryArchSuffix} >= 0.2.3
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.3.1
-	devel:libiconv
 	"
 BUILD_PREREQUIRES="
+	netsurf_buildsystem >= 1.6
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	netsurf_buildsystem >= 1.6
 	"
 
 BUILD()