diff --git a/haiku-apps/3dmov/3dmov-0.2.recipe b/haiku-apps/3dmov/3dmov-0.2.recipe
index 35759be08..823ce61a3 100644
--- a/haiku-apps/3dmov/3dmov-0.2.recipe
+++ b/haiku-apps/3dmov/3dmov-0.2.recipe
@@ -31,8 +31,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
index 5e3f8f9ba..990c29a8c 100644
--- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
+++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	devel:libaa
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	makefile_engine
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
index 8b4780aa9..b5907ea47 100644
--- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe
+++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
@@ -16,8 +16,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 PROVIDES="
 	aplayer$secondaryArchSuffix = $portVersion
 	app:APlayer = $portVersion
-	lib:PolyKit = $portVersion
 	lib:APlayerKit = $portVersion
+	lib:PolyKit = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe
index a1d2950bf..c90e13f25 100644
--- a/haiku-apps/armyknife/armyknife-4.3.0.recipe
+++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe
@@ -23,19 +23,19 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libtag$secondaryArchSuffix
 	lib:libsanta$secondaryArchSuffix
+	lib:libtag$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	taglib${secondaryArchSuffix}_devel
 	libsanta${secondaryArchSuffix}_devel
+	taglib${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:find
 	cmd:make
 	cmd:unzip
 	cmd:xargs
diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index 4eccda347..54c5e0a3b 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe
index 01a4d2103..c197c52ad 100644
--- a/haiku-apps/beae/beae-1.2.recipe
+++ b/haiku-apps/beae/beae-1.2.recipe
@@ -25,10 +25,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/beam/beam-1.2.recipe b/haiku-apps/beam/beam-1.2.recipe
index d53d4cc38..3e8b4bea4 100644
--- a/haiku-apps/beam/beam-1.2.recipe
+++ b/haiku-apps/beam/beam-1.2.recipe
@@ -33,10 +33,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:jam
-	cmd:gcc
 	cmd:bison
 	cmd:flex
+	cmd:gcc
+	cmd:jam
 	"
 
 BUILD()
diff --git a/haiku-apps/becasso/becasso-2.0.recipe b/haiku-apps/becasso/becasso-2.0.recipe
index 8b6c837b9..438d1a2db 100644
--- a/haiku-apps/becasso/becasso-2.0.recipe
+++ b/haiku-apps/becasso/becasso-2.0.recipe
@@ -33,9 +33,9 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	cmd:nasm
 	cmd:gcc
 	cmd:jam
+	cmd:nasm
 	"
 
 BUILD()
diff --git a/haiku-apps/befar/befar-4.2_beta.recipe b/haiku-apps/befar/befar-4.2_beta.recipe
index b429fb451..76269d9ab 100644
--- a/haiku-apps/befar/befar-4.2_beta.recipe
+++ b/haiku-apps/befar/befar-4.2_beta.recipe
@@ -24,9 +24,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:g++
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe
index 8dab66194..c88146e99 100644
--- a/haiku-apps/beget/beget-1.2.3.recipe
+++ b/haiku-apps/beget/beget-1.2.3.recipe
@@ -32,9 +32,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/beostilink/beostilink-0~git.recipe b/haiku-apps/beostilink/beostilink-0~git.recipe
index 11ee52762..97d2829ad 100644
--- a/haiku-apps/beostilink/beostilink-0~git.recipe
+++ b/haiku-apps/beostilink/beostilink-0~git.recipe
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc
 	cmd:g++
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe b/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe
index f45dd5e35..54405f483 100644
--- a/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe
+++ b/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe
@@ -30,8 +30,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bepodder/bepodder-1.4.0.recipe b/haiku-apps/bepodder/bepodder-1.4.0.recipe
index c3f596dca..ae9d720d0 100644
--- a/haiku-apps/bepodder/bepodder-1.4.0.recipe
+++ b/haiku-apps/bepodder/bepodder-1.4.0.recipe
@@ -45,9 +45,9 @@ BUILD_REQUIRES="
 	devel:libxml2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
index 3739dcfa1..c26e9bb07 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
index 341a5c912..70f31dc9a 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
index 16c3daf3e..177829001 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-2.0.recipe b/haiku-apps/bescreencapture/bescreencapture-2.0.recipe
index eb89ed25f..c7591dc4a 100644
--- a/haiku-apps/bescreencapture/bescreencapture-2.0.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-2.0.recipe
@@ -34,8 +34,8 @@ PROVIDES_inputfilter="
 	app:BeScreenCaptureInputFilter = $portVersion
 	"
 REQUIRES_inputfilter="
-	haiku
 	bescreencapture == $portVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
@@ -43,8 +43,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-2.1.recipe b/haiku-apps/bescreencapture/bescreencapture-2.1.recipe
index 61088ac79..4381c99f7 100644
--- a/haiku-apps/bescreencapture/bescreencapture-2.1.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-2.1.recipe
@@ -32,8 +32,8 @@ PROVIDES_inputfilter="
 	app:BeScreenCaptureInputFilter = $portVersion
 	"
 REQUIRES_inputfilter="
-	haiku
 	bescreencapture == $portVersion base
+	haiku
 	"
 
 BUILD_REQUIRES="
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-2.2.1.recipe b/haiku-apps/bescreencapture/bescreencapture-2.2.1.recipe
index 03cd26016..5bec231ee 100644
--- a/haiku-apps/bescreencapture/bescreencapture-2.2.1.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-2.2.1.recipe
@@ -33,8 +33,8 @@ PROVIDES_inputfilter="
 	app:BeScreenCaptureInputFilter = $portVersion
 	"
 REQUIRES_inputfilter="
-	haiku
 	bescreencapture == $portVersion base
+	haiku
 	"
 
 BUILD_REQUIRES="
@@ -42,8 +42,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-2.3.2.recipe b/haiku-apps/bescreencapture/bescreencapture-2.3.2.recipe
index 41071e00c..2204d173b 100644
--- a/haiku-apps/bescreencapture/bescreencapture-2.3.2.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-2.3.2.recipe
@@ -32,8 +32,8 @@ PROVIDES_inputfilter="
 	app:BeScreenCaptureInputFilter = $portVersion
 	"
 REQUIRES_inputfilter="
-	haiku
 	bescreencapture == $portVersion base
+	haiku
 	"
 
 BUILD_REQUIRES="
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bescreencapture/bescreencapture-2.3.3.recipe b/haiku-apps/bescreencapture/bescreencapture-2.3.3.recipe
index bffce215a..869f67959 100644
--- a/haiku-apps/bescreencapture/bescreencapture-2.3.3.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-2.3.3.recipe
@@ -32,8 +32,8 @@ PROVIDES_inputfilter="
 	app:BeScreenCaptureInputFilter = $portVersion
 	"
 REQUIRES_inputfilter="
-	haiku
 	bescreencapture == $portVersion base
+	haiku
 	"
 
 BUILD_REQUIRES="
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/beshare/beshare-2.32.recipe b/haiku-apps/beshare/beshare-2.32.recipe
index b005c0db9..7494c09a4 100644
--- a/haiku-apps/beshare/beshare-2.32.recipe
+++ b/haiku-apps/beshare/beshare-2.32.recipe
@@ -45,10 +45,10 @@ BUILD_REQUIRES="
 #	devel:muscle$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/betex/betex-20141221.recipe b/haiku-apps/betex/betex-20141221.recipe
index 8893ccf9f..6af6b0590 100644
--- a/haiku-apps/betex/betex-20141221.recipe
+++ b/haiku-apps/betex/betex-20141221.recipe
@@ -23,8 +23,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/binaryclock/binaryclock-20141223.recipe b/haiku-apps/binaryclock/binaryclock-20141223.recipe
index c0b3eb146..b892da739 100644
--- a/haiku-apps/binaryclock/binaryclock-20141223.recipe
+++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe
@@ -48,8 +48,8 @@ USER_SETTINGS_FILES="
 
 PROVIDES="
 	binaryclock = $portVersion
-	app:BinaryClock = $portVersion
 	add_on:BinaryClock = $portVersion
+	app:BinaryClock = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -60,9 +60,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
index 033bc810d..f0eeac1f5 100644
--- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
@@ -20,15 +20,15 @@ PROVIDES="
 	app:blogpositive = $portVersion
 	"
 REQUIRES="
+	haiku
 	lib:libcurl
 	lib:libz
-	haiku
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libcurl
 	devel:libz
-	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
index eaa0deb78..0dd964104 100644
--- a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
@@ -20,15 +20,15 @@ PROVIDES="
 	app:blogpositive = $portVersion
 	"
 REQUIRES="
+	haiku
 	lib:libcurl
 	lib:libz
-	haiku
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libcurl
 	devel:libz
-	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
index 77806ffe4..74765a3f0 100644
--- a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
@@ -20,15 +20,15 @@ PROVIDES="
 	app:blogpositive = $portVersion
 	"
 REQUIRES="
+	haiku
 	lib:libcurl
 	lib:libz
-	haiku
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libcurl
 	devel:libz
-	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
index ba4182e9a..5a7b4f765 100644
--- a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
+++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	makefile_engine
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/bsnow/bsnow-1.0.0.recipe b/haiku-apps/bsnow/bsnow-1.0.0.recipe
index 73d4b4326..1161f164f 100644
--- a/haiku-apps/bsnow/bsnow-1.0.0.recipe
+++ b/haiku-apps/bsnow/bsnow-1.0.0.recipe
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe
index 7b40a27bb..b32e2d97a 100644
--- a/haiku-apps/capitalbe/capitalbe-1.1.recipe
+++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	devel:libsqlite3
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe
index d9e30e314..0f4b3927e 100644
--- a/haiku-apps/chat/chat-20100903.recipe
+++ b/haiku-apps/chat/chat-20100903.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libssl$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/clipdinger/clipdinger-1.0.1.recipe b/haiku-apps/clipdinger/clipdinger-1.0.1.recipe
index a22ee8988..e6b32f042 100644
--- a/haiku-apps/clipdinger/clipdinger-1.0.1.recipe
+++ b/haiku-apps/clipdinger/clipdinger-1.0.1.recipe
@@ -34,8 +34,8 @@ USER_SETTINGS_FILES="
 
 PROVIDES="
 	clipdinger = $portVersion
-	app:Clipdinger = $portVersion
 	add_on:ClipdingerInputDevice = $portVersion
+	app:Clipdinger = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/clipdinger/clipdinger-1.0.recipe b/haiku-apps/clipdinger/clipdinger-1.0.recipe
index 20095b11d..7c7cbbce0 100644
--- a/haiku-apps/clipdinger/clipdinger-1.0.recipe
+++ b/haiku-apps/clipdinger/clipdinger-1.0.recipe
@@ -34,8 +34,8 @@ USER_SETTINGS_FILES="
 
 PROVIDES="
 	clipdinger = $portVersion
-	app:Clipdinger = $portVersion
 	add_on:ClipdingerInputDevice = $portVersion
+	app:Clipdinger = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/clipup/clipup-2.0.3.recipe b/haiku-apps/clipup/clipup-2.0.3.recipe
index c466bc654..8fc20d024 100644
--- a/haiku-apps/clipup/clipup-2.0.3.recipe
+++ b/haiku-apps/clipup/clipup-2.0.3.recipe
@@ -33,8 +33,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:xres
 	"
 
diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
index f855eb6b5..5296ebeca 100644
--- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -27,9 +27,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"
 
diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
index b5efd6a53..76904754d 100644
--- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
+++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:svn
 	cmd:xres
 	"
diff --git a/haiku-apps/dengon/dengon-20140804.recipe b/haiku-apps/dengon/dengon-20140804.recipe
index 94d1987ec..4c82a7015 100644
--- a/haiku-apps/dengon/dengon-20140804.recipe
+++ b/haiku-apps/dengon/dengon-20140804.recipe
@@ -17,14 +17,14 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libssl$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/desknotes/desknotes-1.1.recipe b/haiku-apps/desknotes/desknotes-1.1.recipe
index 93c85544d..9deae0ce4 100644
--- a/haiku-apps/desknotes/desknotes-1.1.recipe
+++ b/haiku-apps/desknotes/desknotes-1.1.recipe
@@ -29,8 +29,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
index 630f30ebf..92b3e73ad 100644
--- a/haiku-apps/digiclock/digiclock-1.0.recipe
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -23,9 +23,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
index 5705ed614..5870128a0 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
@@ -20,28 +20,28 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libdjvulibre$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libmupdf$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libopenjp2$secondaryArchSuffix
 	lib:libjbig2dec$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libmupdf$secondaryArchSuffix
+	lib:libopenjp2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libdjvulibre$secondaryArchSuffix
-	devel:libmupdf$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libopenjp2$secondaryArchSuffix
 	devel:libjbig2dec$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libmupdf$secondaryArchSuffix
+	devel:libopenjp2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:find
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/drive_encryption/drive_encryption-1.0.recipe b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe
index 604aa9880..98cdf78c5 100644
--- a/haiku-apps/drive_encryption/drive_encryption-1.0.recipe
+++ b/haiku-apps/drive_encryption/drive_encryption-1.0.recipe
@@ -18,10 +18,10 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	drive_encryption = $portVersion
-	cmd:encrypted_drive_control = $portVersion
+	add_on:encrypted_drive = $portVersion
 	app:DriveEncryption = $portVersion
 	app:Login = $portVersion
-	add_on:encrypted_drive = $portVersion
+	cmd:encrypted_drive_control = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:mkdepend
 	"
 
diff --git a/haiku-apps/einsteinium/einsteinium-1.2.recipe b/haiku-apps/einsteinium/einsteinium-1.2.recipe
index cd8db93db..37afffced 100644
--- a/haiku-apps/einsteinium/einsteinium-1.2.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.2.recipe
@@ -19,8 +19,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.0.recipe b/haiku-apps/einsteinium/einsteinium-1.3.0.recipe
index ce64f9661..68cf5cc80 100644
--- a/haiku-apps/einsteinium/einsteinium-1.3.0.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.3.0.recipe
@@ -18,8 +18,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.1.recipe b/haiku-apps/einsteinium/einsteinium-1.3.1.recipe
index f634695e1..7a37bb371 100644
--- a/haiku-apps/einsteinium/einsteinium-1.3.1.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.3.1.recipe
@@ -18,8 +18,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.2.recipe b/haiku-apps/einsteinium/einsteinium-1.3.2.recipe
index a9a338180..5e2dc8621 100644
--- a/haiku-apps/einsteinium/einsteinium-1.3.2.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.3.2.recipe
@@ -18,8 +18,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/einsteinium/einsteinium-1.4.1.recipe b/haiku-apps/einsteinium/einsteinium-1.4.1.recipe
index bc5c41845..dd904975a 100644
--- a/haiku-apps/einsteinium/einsteinium-1.4.1.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.4.1.recipe
@@ -19,8 +19,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/einsteinium/einsteinium-1.4.1a.recipe b/haiku-apps/einsteinium/einsteinium-1.4.1a.recipe
index 7ac1198db..c27c7e5f5 100644
--- a/haiku-apps/einsteinium/einsteinium-1.4.1a.recipe
+++ b/haiku-apps/einsteinium/einsteinium-1.4.1a.recipe
@@ -18,8 +18,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
 PROVIDES="
 	einsteinium = $portVersion
 	app:Einsteinium = $portVersion
-	cmd:einsteinium_engine = $portVersion
 	cmd:einsteinium_daemon = $portVersion
+	cmd:einsteinium_engine = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe b/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe
index 9af25d8cb..f6af8655d 100644
--- a/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe
+++ b/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe
@@ -29,8 +29,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/filer/filer-1.1.0.recipe b/haiku-apps/filer/filer-1.1.0.recipe
index c6b3a3a75..a92f7fdaa 100644
--- a/haiku-apps/filer/filer-1.1.0.recipe
+++ b/haiku-apps/filer/filer-1.1.0.recipe
@@ -31,8 +31,8 @@ USER_SETTINGS_FILES="
 
 PROVIDES="
 	filer = $portVersion
-	app:Filer = $portVersion
 	app:AutoFiler = $portVersion
+	app:Filer = $portVersion
 	cmd:Filer = $portVersion
 	"
 REQUIRES="
diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe
index ab2301f83..4a89b721a 100644
--- a/haiku-apps/finance/finance-1.0.0.recipe
+++ b/haiku-apps/finance/finance-1.0.0.recipe
@@ -36,10 +36,10 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:xres
+	cmd:awk
 	cmd:gcc
 	cmd:jam
-	cmd:awk
+	cmd:xres
 	"
 
 BUILD()
diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe
index 1040da844..41b70b12c 100644
--- a/haiku-apps/foldershaper/foldershaper-1.0.recipe
+++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe
@@ -17,8 +17,8 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	foldershaper = $portVersion
-	app:FolderShaper = $portVersion
 	addon:foldershaper = $portVersion
+	app:FolderShaper = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe
index b30bff12b..16c17bd73 100644
--- a/haiku-apps/fontboy/fontboy-0.9.7.recipe
+++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe
@@ -33,8 +33,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:g++
-	cmd:xres
 	cmd:make
+	cmd:xres
 	"
 
 BUILD()
diff --git a/haiku-apps/genesis_commander/genesis_commander-0.42.recipe b/haiku-apps/genesis_commander/genesis_commander-0.42.recipe
index 63ea6542c..f70d608fb 100644
--- a/haiku-apps/genesis_commander/genesis_commander-0.42.recipe
+++ b/haiku-apps/genesis_commander/genesis_commander-0.42.recipe
@@ -23,9 +23,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/haikuplot/haikuplot-1.0.0.recipe b/haiku-apps/haikuplot/haikuplot-1.0.0.recipe
index 4c982f3cb..8b81dad17 100644
--- a/haiku-apps/haikuplot/haikuplot-1.0.0.recipe
+++ b/haiku-apps/haikuplot/haikuplot-1.0.0.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/haikuplot/haikuplot-1.0.1.recipe b/haiku-apps/haikuplot/haikuplot-1.0.1.recipe
index 6f3ec3083..513df4f88 100644
--- a/haiku-apps/haikuplot/haikuplot-1.0.1.recipe
+++ b/haiku-apps/haikuplot/haikuplot-1.0.1.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe
index 00e704a6f..cf138d2a2 100644
--- a/haiku-apps/hare/hare-1.1.1.recipe
+++ b/haiku-apps/hare/hare-1.1.1.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:lame
-	cmd:oggenc
 	cmd:flac
 	cmd:gogo_enc
+	cmd:lame
+	cmd:oggenc
 	lib:libtag
 	"
 
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	devel:libtag
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	cmd:cmake
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-apps/helios/helios-1.7.2.recipe b/haiku-apps/helios/helios-1.7.2.recipe
index 42228f8a8..df6ef4a6c 100644
--- a/haiku-apps/helios/helios-1.7.2.recipe
+++ b/haiku-apps/helios/helios-1.7.2.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe
index e77a87f48..28eeee5b0 100644
--- a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe
+++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	cmd:awk
+	cmd:gcc
 	cmd:jam
 	cmd:ld
 	"
diff --git a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
index 298b4b921..fbb8815a0 100644
--- a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
+++ b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
@@ -31,8 +31,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe b/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe
index c021ce0fe..57df97d9d 100644
--- a/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe
+++ b/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe
@@ -19,8 +19,8 @@ USER_SETTINGS_FILES="
 
 PROVIDES="
 	joystickutilizer = $portVersion
-	app:JoystickUtilizer = $portVersion
 	add_on:JoystickUtilizerDevice = $portVersion
+	app:JoystickUtilizer = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/koder/koder-0.3.0.recipe b/haiku-apps/koder/koder-0.3.0.recipe
index 10c6ff583..83718a69b 100644
--- a/haiku-apps/koder/koder-0.3.0.recipe
+++ b/haiku-apps/koder/koder-0.3.0.recipe
@@ -30,8 +30,8 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libyaml_cpp$secondaryArchSuffix
 	devel:libscintilla$secondaryArchSuffix
+	devel:libyaml_cpp$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/kovel/kovel-1.0.0.recipe b/haiku-apps/kovel/kovel-1.0.0.recipe
index 374688396..26cd1bf84 100644
--- a/haiku-apps/kovel/kovel-1.0.0.recipe
+++ b/haiku-apps/kovel/kovel-1.0.0.recipe
@@ -33,9 +33,9 @@ BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"
 
diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe
index da4de11d6..5e6bae847 100644
--- a/haiku-apps/masterpiece/masterpiece-r742.recipe
+++ b/haiku-apps/masterpiece/masterpiece-r742.recipe
@@ -23,15 +23,15 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libsqlite3$secondaryArchSuffix
 	lib:liblayout
 	lib:libpython2.7
+	lib:libsqlite3$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libsqlite3$secondaryArchSuffix
 	devel:libpython2.7
+	devel:libsqlite3$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/microbe/microbe-20130728.recipe b/haiku-apps/microbe/microbe-20130728.recipe
index 6cc2d5c6b..faf99f43b 100644
--- a/haiku-apps/microbe/microbe-20130728.recipe
+++ b/haiku-apps/microbe/microbe-20130728.recipe
@@ -24,8 +24,8 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe b/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe
index c5e482f34..21f8d2036 100644
--- a/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe
+++ b/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/niue/niue-20140701.recipe b/haiku-apps/niue/niue-20140701.recipe
index da3db76f6..e9da49f88 100644
--- a/haiku-apps/niue/niue-20140701.recipe
+++ b/haiku-apps/niue/niue-20140701.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe
index 15e32db79..cb4e0f269 100644
--- a/haiku-apps/organizer/organizer-0.1.recipe
+++ b/haiku-apps/organizer/organizer-0.1.recipe
@@ -27,10 +27,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	devel:libGL
 	makefile_engine
 	cmd:gcc
 	cmd:make
+	devel:libGL
 	"
 
 BUILD()
diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe
index 446a4acba..3a3e61594 100644
--- a/haiku-apps/paladin/paladin-1.3.recipe
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -19,21 +19,21 @@ USER_SETTINGS_FILES="settings/Paladin_settings"
 
 PROVIDES="
 	paladin = $portVersion
-	app:paladin = $portVersion
-	paledit = $portVersion
-	app:paledit = $portVersion
-	symbolfinder = $portVersion
-	app:symbolfinder = $portVersion
 	libhekkel = $portVersion
-	lib:libhekkel = $portVersion
+	paledit = $portVersion
 	rez = $portVersion
+	symbolfinder = $portVersion
+	app:paladin = $portVersion
+	app:paledit = $portVersion
+	app:symbolfinder = $portVersion
 	cmd:rez = $portVersion
+	lib:libhekkel = $portVersion
 "
 REQUIRES="
 	haiku
-	lib:libpcre
-	cmd:fastdep
 	cmd:ccache
+	cmd:fastdep
+	lib:libpcre
 "
 
 BUILD_REQUIRES="
@@ -41,9 +41,9 @@ BUILD_REQUIRES="
 "
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:make
 	cmd:gcc
 	cmd:ld
+	cmd:make
 "
 
 BUILD()
diff --git a/haiku-apps/paladin/paladin-1.4~git.recipe b/haiku-apps/paladin/paladin-1.4~git.recipe
index a0525b13e..5f73e43f8 100644
--- a/haiku-apps/paladin/paladin-1.4~git.recipe
+++ b/haiku-apps/paladin/paladin-1.4~git.recipe
@@ -42,9 +42,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:lua
 	lib:libpcre$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	cmd:lua
 	"
 
 BUILD_REQUIRES="
@@ -53,11 +53,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
+	makefile_engine
 	cmd:find
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/pecorename/pecorename-2.0.recipe b/haiku-apps/pecorename/pecorename-2.0.recipe
index 05987007d..93523aa4b 100644
--- a/haiku-apps/pecorename/pecorename-2.0.recipe
+++ b/haiku-apps/pecorename/pecorename-2.0.recipe
@@ -33,8 +33,8 @@ ARCHITECTURES="x86_gcc2 x86_64"
 
 PROVIDES="
 	pecorename = $portVersion
-	app:PecoRename = $portVersion
 	add_on:PecoRename = $portVersion
+	app:PecoRename = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe
index ec1d4ab34..46284a05f 100644
--- a/haiku-apps/peek/peek-20140206.recipe
+++ b/haiku-apps/peek/peek-20140206.recipe
@@ -22,9 +22,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
-	cmd:gcc
 	cmd:g++
+	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/photograbber/photograbber-2.3.3.recipe b/haiku-apps/photograbber/photograbber-2.3.3.recipe
index 530ff886f..17ae7086b 100644
--- a/haiku-apps/photograbber/photograbber-2.3.3.recipe
+++ b/haiku-apps/photograbber/photograbber-2.3.3.recipe
@@ -25,19 +25,19 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	lib:libiconv
 	lib:libexif
+	lib:libiconv
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libiconv
 	devel:libexif
+	devel:libiconv
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:g++
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe
index 3d349bad7..291521e22 100644
--- a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe
+++ b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
index ce4664d62..de320ab60 100644
--- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
+++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
@@ -23,8 +23,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
index 3e67d503a..aab2a3eb2 100644
--- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
+++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	makefile_engine
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-apps/rawaes/rawaes-1.1.recipe b/haiku-apps/rawaes/rawaes-1.1.recipe
index 443a0ef5c..2d8eaaae0 100644
--- a/haiku-apps/rawaes/rawaes-1.1.recipe
+++ b/haiku-apps/rawaes/rawaes-1.1.recipe
@@ -26,9 +26,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
index 229d4cc87..eec923be1 100644
--- a/haiku-apps/recibe/recibe-1.0b1.recipe
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -38,8 +38,8 @@ BUILD_REQUIRES="
 	devel:libsqlite3
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	makefile_engine
+	cmd:gcc
 	cmd:make
 	cmd:xres
 	"
diff --git a/haiku-apps/remember/remember-1.0.0.recipe b/haiku-apps/remember/remember-1.0.0.recipe
index 724c3b5b4..b4e45443e 100644
--- a/haiku-apps/remember/remember-1.0.0.recipe
+++ b/haiku-apps/remember/remember-1.0.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
index f65da6adb..83d6c1812 100644
--- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -17,10 +17,10 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	remotecontrol = $portVersion
-	cmd:rcserver = $portVersion
-	cmd:rcclient = $portVersion
-	addon:rcinputfilter = $portVersion
 	addon:rcinputdevice = $portVersion
+	addon:rcinputfilter = $portVersion
+	cmd:rcclient = $portVersion
+	cmd:rcserver = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:g++
-	cmd:xres
 	cmd:make
+	cmd:xres
 	"
 
 BUILD()
diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe
index c2aa15445..5071a064d 100644
--- a/haiku-apps/rename/rename-3.9.0.recipe
+++ b/haiku-apps/rename/rename-3.9.0.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe
index 25763c212..3eccd7247 100644
--- a/haiku-apps/resourcer/resourcer-1.0.recipe
+++ b/haiku-apps/resourcer/resourcer-1.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/rez/rez-108.recipe b/haiku-apps/rez/rez-108.recipe
index 71dd5c7a4..a18be169f 100644
--- a/haiku-apps/rez/rez-108.recipe
+++ b/haiku-apps/rez/rez-108.recipe
@@ -22,14 +22,14 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	haiku
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:flex
 	cmd:bison
 	cmd:cc
+	cmd:flex
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/sanity/sanity-0.6.recipe b/haiku-apps/sanity/sanity-0.6.recipe
index df514cc2b..1c6a47647 100644
--- a/haiku-apps/sanity/sanity-0.6.recipe
+++ b/haiku-apps/sanity/sanity-0.6.recipe
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe
index c63f2247c..1a8e41a8a 100644
--- a/haiku-apps/sawteeth/sawteeth-1.3.recipe
+++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe
@@ -24,9 +24,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:cmake
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
index 37a7ad91a..f64ff963c 100644
--- a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
+++ b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
@@ -21,19 +21,19 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	icu$secondaryArchSuffix
 	cmd:awk
-	cmd:wget
 	cmd:unzip
+	cmd:wget
 	lib:libsword$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	icu$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	icu${secondaryArchSuffix}_devel
 	devel:libsword$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	icu${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/shredder/shredder-1.0.0.recipe b/haiku-apps/shredder/shredder-1.0.0.recipe
index 2f84ef29f..5d5950253 100644
--- a/haiku-apps/shredder/shredder-1.0.0.recipe
+++ b/haiku-apps/shredder/shredder-1.0.0.recipe
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe
index bb300d773..946013835 100644
--- a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe
+++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe
@@ -38,8 +38,8 @@ BUILD_REQUIRES="
 	devel:libvorbisenc
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/sortsave/sortsave-1.1.recipe b/haiku-apps/sortsave/sortsave-1.1.recipe
index 55bae7f6f..792e16373 100644
--- a/haiku-apps/sortsave/sortsave-1.1.recipe
+++ b/haiku-apps/sortsave/sortsave-1.1.recipe
@@ -26,10 +26,10 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:unzip
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/superprefs/superprefs-1.0.recipe b/haiku-apps/superprefs/superprefs-1.0.recipe
index b64637967..f698b3863 100644
--- a/haiku-apps/superprefs/superprefs-1.0.recipe
+++ b/haiku-apps/superprefs/superprefs-1.0.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/tesseracttranslator/tesseracttranslator-1.0.1.recipe b/haiku-apps/tesseracttranslator/tesseracttranslator-1.0.1.recipe
index e5ecb33ee..27b916b0d 100644
--- a/haiku-apps/tesseracttranslator/tesseracttranslator-1.0.1.recipe
+++ b/haiku-apps/tesseracttranslator/tesseracttranslator-1.0.1.recipe
@@ -21,13 +21,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libtesseract$secondaryArchSuffix
 	devel:liblept$secondaryArchSuffix
+	devel:libtesseract$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe
index bfd8cea38..9e9f4a971 100644
--- a/haiku-apps/textsaver/textsaver-1.0.recipe
+++ b/haiku-apps/textsaver/textsaver-1.0.recipe
@@ -23,9 +23,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:gcc
 	cmd:make
-	makefile_engine
 	"
 
 BUILD()
diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe
index c10373d5b..f6e6acbfa 100644
--- a/haiku-apps/timecop/timecop-0.61.recipe
+++ b/haiku-apps/timecop/timecop-0.61.recipe
@@ -17,8 +17,8 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	timecop = $portVersion
-	cmd:TimeCop_daemon = $portVersion
 	app:TimeCop = $portVersion
+	cmd:TimeCop_daemon = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe
index f4cf6b4b8..5a2f32357 100644
--- a/haiku-apps/torrentor/torrentor-0.0.5.recipe
+++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe
@@ -21,23 +21,23 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
-	lib:libssl${secondaryArchSuffix}
 	lib:libcurl${secondaryArchSuffix}
 	lib:libevent${secondaryArchSuffix}
+	lib:libssl${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libcurl${secondaryArchSuffix}
 	devel:libevent${secondaryArchSuffix}
 	devel:libssl${secondaryArchSuffix}
-	devel:libcurl${secondaryArchSuffix}
 	devel:libz${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
 	curl${secondaryArchSuffix}
-	cmd:jam
 	cmd:gcc${secondaryArchSuffix}
+	cmd:jam
 	cmd:make
 	"
 
diff --git a/haiku-apps/transplus/transplus-0.6.recipe b/haiku-apps/transplus/transplus-0.6.recipe
index 4eadf908d..cc5244333 100644
--- a/haiku-apps/transplus/transplus-0.6.recipe
+++ b/haiku-apps/transplus/transplus-0.6.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/ultradv/ultradv-0.0.1.recipe b/haiku-apps/ultradv/ultradv-0.0.1.recipe
index bd441dd33..c391b844c 100644
--- a/haiku-apps/ultradv/ultradv-0.0.1.recipe
+++ b/haiku-apps/ultradv/ultradv-0.0.1.recipe
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:jam
 	cmd:gcc
+	cmd:jam
 	cmd:ld
 	cmd:which
 	"
diff --git a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
index 0186f3b36..7aea3d5eb 100644
--- a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
+++ b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
@@ -22,10 +22,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
-	cmd:xres
 	cmd:grep
+	cmd:make
+	cmd:xres
 	"
 
 BUILD()
diff --git a/haiku-apps/vision/vision-0.10.1.recipe b/haiku-apps/vision/vision-0.10.1.recipe
index 37cccff27..be857ae2c 100644
--- a/haiku-apps/vision/vision-0.10.1.recipe
+++ b/haiku-apps/vision/vision-0.10.1.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/vision/vision-0.10.2.recipe b/haiku-apps/vision/vision-0.10.2.recipe
index 073ce33fb..77b636d4c 100644
--- a/haiku-apps/vision/vision-0.10.2.recipe
+++ b/haiku-apps/vision/vision-0.10.2.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/vncserver/vncserver-1.27.recipe b/haiku-apps/vncserver/vncserver-1.27.recipe
index 140937215..7cbb40056 100644
--- a/haiku-apps/vncserver/vncserver-1.27.recipe
+++ b/haiku-apps/vncserver/vncserver-1.27.recipe
@@ -32,9 +32,9 @@ ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 PROVIDES="
 	vncserver = $portVersion
-	cmd:vncserver = $portVersion
-	cmd:vncpasswd = $portVersion
 	add_on:InputEventInjector = 1.4 compatible >= 1.0
+	cmd:vncpasswd = $portVersion
+	cmd:vncserver = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/haiku-apps/vwget/vwget-20141229.recipe b/haiku-apps/vwget/vwget-20141229.recipe
index 3fc92066a..70bbcd600 100644
--- a/haiku-apps/vwget/vwget-20141229.recipe
+++ b/haiku-apps/vwget/vwget-20141229.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/webwatch/webwatch-1.0~git.recipe b/haiku-apps/webwatch/webwatch-1.0~git.recipe
index c124edd5f..f3c14ce8a 100644
--- a/haiku-apps/webwatch/webwatch-1.0~git.recipe
+++ b/haiku-apps/webwatch/webwatch-1.0~git.recipe
@@ -35,9 +35,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:g++
 	makefile_engine
+	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/whereismymouse/whereismymouse-1.0.recipe b/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
index e529ee6b0..0d311b2cd 100644
--- a/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
+++ b/haiku-apps/whereismymouse/whereismymouse-1.0.recipe
@@ -40,8 +40,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
index 8577c2a6f..ac5958aed 100644
--- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
+++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
@@ -42,8 +42,8 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= r1~alpha3_pm-1
 	lib:libfreetype$secondaryArchSuffix >= 6
-	lib:libz$secondaryArchSuffix >= 1
 	lib:liblayout$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix >= 1
 	"
 
 BUILD_REQUIRES="
diff --git a/haiku-games/besol/besol-2.0.5.recipe b/haiku-games/besol/besol-2.0.5.recipe
index 073014422..a75085289 100644
--- a/haiku-games/besol/besol-2.0.5.recipe
+++ b/haiku-games/besol/besol-2.0.5.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:find
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-games/bespider/bespider-0.1.0.recipe b/haiku-games/bespider/bespider-0.1.0.recipe
index e88c8c99f..6462e1ecb 100644
--- a/haiku-games/bespider/bespider-0.1.0.recipe
+++ b/haiku-games/bespider/bespider-0.1.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	makefile_engine
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-games/bespider/bespider-0.1.1.recipe b/haiku-games/bespider/bespider-0.1.1.recipe
index 00fceb66f..5f3e99552 100644
--- a/haiku-games/bespider/bespider-0.1.1.recipe
+++ b/haiku-games/bespider/bespider-0.1.1.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	makefile_engine
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/haiku-games/hexvexed/hexvexed-1.0.0.recipe b/haiku-games/hexvexed/hexvexed-1.0.0.recipe
index 95bd7261a..83d2cb7db 100644
--- a/haiku-games/hexvexed/hexvexed-1.0.0.recipe
+++ b/haiku-games/hexvexed/hexvexed-1.0.0.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-games/minesweeper/minesweeper-20150109.recipe b/haiku-games/minesweeper/minesweeper-20150109.recipe
index fa636b7a6..2ade4c8e4 100644
--- a/haiku-games/minesweeper/minesweeper-20150109.recipe
+++ b/haiku-games/minesweeper/minesweeper-20150109.recipe
@@ -30,8 +30,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
index 2b7c730e2..08038f2ce 100644
--- a/haiku-games/puri/puri-0.3.9.1.recipe
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:stockfish
 	lib:lib3ds$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
-	cmd:stockfish
+	lib:libpng16$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -37,9 +37,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	gcc$secondaryArchSuffix
-	cmd:jam
 	cmd:ar$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
+	cmd:jam
 	cmd:ld$secondaryArchSuffix
 	cmd:ranlib$secondaryArchSuffix
 	"
diff --git a/haiku-games/superfreecell/superfreecell-0.1.0.recipe b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
index d07c5d9cd..52339e7bd 100644
--- a/haiku-games/superfreecell/superfreecell-0.1.0.recipe
+++ b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
@@ -26,9 +26,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"
 
diff --git a/haiku-games/w6/w6-1.7.recipe b/haiku-games/w6/w6-1.7.recipe
index 193b48e43..3b97dd100 100644
--- a/haiku-games/w6/w6-1.7.recipe
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -31,8 +31,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe
index a11c510d4..43466a50e 100644
--- a/haiku-libs/ale/ale-0.9.1.recipe
+++ b/haiku-libs/ale/ale-0.9.1.recipe
@@ -29,8 +29,8 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	ale = $portVersion
-	lib:libale = $portVersion
 	app:ALEditor = $portVersion
+	lib:libale = $portVersion
 	"
 REQUIRES="
 	haiku
@@ -40,9 +40,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc
 	cmd:ld
-	cmd:cmake
 	cmd:make
 	"
 
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
index ee0f1911c..1bbc5b653 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
@@ -23,22 +23,22 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion
-	lib:libWebKit$secondaryArchSuffix = $portVersion
-	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:jsc
+	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libwebp$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	lib:libexecinfo$secondaryArchSuffix
-	lib:libgnutls$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -55,21 +55,21 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
+	devel:libexecinfo$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libexecinfo$secondaryArchSuffix
-	devel:libgnutls$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:pkg_config
-	cmd:flex
 	cmd:bison
+	cmd:cmake >= 3.0.0
+	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:gperf
 	cmd:ld$secondaryArchSuffix
@@ -77,8 +77,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:ninja
 	cmd:perl
+	cmd:pkg_config
 	cmd:python
-	cmd:cmake >= 3.0.0
 	cmd:ruby
 	cmd:which
 	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe
index 62a31e370..efc175ae8 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.4.recipe
@@ -23,23 +23,23 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion
-	lib:libWebKitLegacy$secondaryArchSuffix = $portVersion
-	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:jsc
+	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libWebKitLegacy$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libwebp$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	lib:libexecinfo$secondaryArchSuffix
-	lib:libgcrypt$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -56,22 +56,22 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
+	devel:libexecinfo$secondaryArchSuffix
+	devel:libgcrypt$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix >= 7
 	devel:libsqlite3$secondaryArchSuffix
+	devel:libtasn1$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix >= 7
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libexecinfo$secondaryArchSuffix
-	devel:libgcrypt$secondaryArchSuffix
-	devel:libtasn1$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:pkg_config
-	cmd:flex
 	cmd:bison
+	cmd:cmake >= 3.0.0
+	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:gperf
 	cmd:ld$secondaryArchSuffix
@@ -79,8 +79,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:ninja
 	cmd:perl
+	cmd:pkg_config
 	cmd:python
-	cmd:cmake >= 3.0.0
 	cmd:ruby
 	cmd:which
 	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.5.recipe
index 5452baffa..60fe81e85 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.5.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.5.recipe
@@ -23,23 +23,23 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion
-	lib:libWebKitLegacy$secondaryArchSuffix = $portVersion
-	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:jsc
+	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libWebKitLegacy$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libwebp$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
+	lib:libtasn1$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	lib:libexecinfo$secondaryArchSuffix
-	lib:libgcrypt$secondaryArchSuffix
-	lib:libtasn1$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -56,22 +56,22 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
+	devel:libexecinfo$secondaryArchSuffix
+	devel:libgcrypt$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix >= 7
 	devel:libsqlite3$secondaryArchSuffix
+	devel:libtasn1$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix >= 7
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libexecinfo$secondaryArchSuffix
-	devel:libgcrypt$secondaryArchSuffix
-	devel:libtasn1$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:pkg_config
-	cmd:flex
 	cmd:bison
+	cmd:cmake >= 3.0.0
+	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:gperf
 	cmd:ld$secondaryArchSuffix
@@ -79,8 +79,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:ninja
 	cmd:perl
+	cmd:pkg_config
 	cmd:python
-	cmd:cmake >= 3.0.0
 	cmd:ruby
 	cmd:which
 	"
diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
index e97ab8073..49f31a247 100644
--- a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
+++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
@@ -22,9 +22,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 PROVIDES_devel="
diff --git a/haiku-libs/libmdi/libmdi-0.5.recipe b/haiku-libs/libmdi/libmdi-0.5.recipe
index 00584eefb..b88eea8e1 100644
--- a/haiku-libs/libmdi/libmdi-0.5.recipe
+++ b/haiku-libs/libmdi/libmdi-0.5.recipe
@@ -35,8 +35,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe
index 806647848..5d6e0bcba 100644
--- a/haiku-libs/libprefs/libprefs-1.2.5.recipe
+++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 	cmd:gcc
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-libs/libwalter/libwalter-97.recipe b/haiku-libs/libwalter/libwalter-97.recipe
index 782ba8804..d3f5ebe66 100644
--- a/haiku-libs/libwalter/libwalter-97.recipe
+++ b/haiku-libs/libwalter/libwalter-97.recipe
@@ -32,10 +32,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
+	cmd:jam
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
-	cmd:jam
 	"
 
 BUILD()
diff --git a/haiku-libs/sockhop/sockhop-1.13.recipe b/haiku-libs/sockhop/sockhop-1.13.recipe
index cddc2643b..a54be9958 100644
--- a/haiku-libs/sockhop/sockhop-1.13.recipe
+++ b/haiku-libs/sockhop/sockhop-1.13.recipe
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:mkdepend
 	"
 
diff --git a/haiku-misc/brainwash/brainwash-1.0.0.recipe b/haiku-misc/brainwash/brainwash-1.0.0.recipe
index 86cd57ccb..01586bd9b 100644
--- a/haiku-misc/brainwash/brainwash-1.0.0.recipe
+++ b/haiku-misc/brainwash/brainwash-1.0.0.recipe
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/iff_catalog/iff_catalog-0.2.recipe b/haiku-misc/iff_catalog/iff_catalog-0.2.recipe
index bde108b61..472f16422 100644
--- a/haiku-misc/iff_catalog/iff_catalog-0.2.recipe
+++ b/haiku-misc/iff_catalog/iff_catalog-0.2.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/iff_ilbm_translator/iff_ilbm_translator-2.0.2.recipe b/haiku-misc/iff_ilbm_translator/iff_ilbm_translator-2.0.2.recipe
index 6cb861a2e..6afd83a3c 100644
--- a/haiku-misc/iff_ilbm_translator/iff_ilbm_translator-2.0.2.recipe
+++ b/haiku-misc/iff_ilbm_translator/iff_ilbm_translator-2.0.2.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/neonlights/neonlights-0.2.recipe b/haiku-misc/neonlights/neonlights-0.2.recipe
index 0fbfd1b84..3f44605d2 100644
--- a/haiku-misc/neonlights/neonlights-0.2.recipe
+++ b/haiku-misc/neonlights/neonlights-0.2.recipe
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/padblocker/padblocker-1.0.recipe b/haiku-misc/padblocker/padblocker-1.0.recipe
index fa74ee5d0..7591b0422 100644
--- a/haiku-misc/padblocker/padblocker-1.0.recipe
+++ b/haiku-misc/padblocker/padblocker-1.0.recipe
@@ -46,8 +46,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:g++
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/pdfwriter/pdfwriter-1.0.recipe b/haiku-misc/pdfwriter/pdfwriter-1.0.recipe
index d9c1202a5..dced4c7b0 100644
--- a/haiku-misc/pdfwriter/pdfwriter-1.0.recipe
+++ b/haiku-misc/pdfwriter/pdfwriter-1.0.recipe
@@ -27,9 +27,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/haiku-misc/substrate/substrate-1.0b.recipe b/haiku-misc/substrate/substrate-1.0b.recipe
index 6c50ef0c3..a30933875 100644
--- a/haiku-misc/substrate/substrate-1.0b.recipe
+++ b/haiku-misc/substrate/substrate-1.0b.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()