diff --git a/sys-apps/dbus/dbus-1.10.22.recipe b/sys-apps/dbus/dbus-1.10.22.recipe
index 254c1323f..b5d44bb67 100644
--- a/sys-apps/dbus/dbus-1.10.22.recipe
+++ b/sys-apps/dbus/dbus-1.10.22.recipe
@@ -41,9 +41,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libexpat$secondaryArchSuffix
 	glib2$secondaryArchSuffix
 	lib:libexecinfo$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -59,9 +59,9 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	devel:libexpat$secondaryArchSuffix
 	glib2${secondaryArchSuffix}_devel
 	devel:libexecinfo$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -69,10 +69,10 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
-	cmd:pkg_config$secondaryArchSuffix
 	cmd:find
-	cmd:make
 	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
 	"
 
diff --git a/sys-apps/diffutils/diffutils-3.5.recipe b/sys-apps/diffutils/diffutils-3.5.recipe
index 054508025..77867bd1f 100644
--- a/sys-apps/diffutils/diffutils-3.5.recipe
+++ b/sys-apps/diffutils/diffutils-3.5.recipe
@@ -25,8 +25,8 @@ ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	diffutils = $portVersion
-	cmd:diff = $portVersion
 	cmd:cmp = $portVersion
+	cmd:diff = $portVersion
 	cmd:diff3 = $portVersion
 	cmd:sdiff = $portVersion
 	"
@@ -38,9 +38,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
 	cmd:awk
+	cmd:gcc
+	cmd:make
 	cmd:perl
 	"
 
diff --git a/sys-apps/diffutils/diffutils-3.6.recipe b/sys-apps/diffutils/diffutils-3.6.recipe
index cc86cb371..1c38610c8 100644
--- a/sys-apps/diffutils/diffutils-3.6.recipe
+++ b/sys-apps/diffutils/diffutils-3.6.recipe
@@ -25,8 +25,8 @@ ARCHITECTURES="?x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	diffutils = $portVersion
-	cmd:diff = $portVersion
 	cmd:cmp = $portVersion
+	cmd:diff = $portVersion
 	cmd:diff3 = $portVersion
 	cmd:sdiff = $portVersion
 	"
@@ -38,9 +38,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
 	cmd:awk
+	cmd:gcc
+	cmd:make
 	cmd:perl
 	"
 
diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe
index f9113a78e..dd794a321 100644
--- a/sys-apps/dmidecode/dmidecode-2.12.recipe
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -23,8 +23,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-apps/dmidecode/dmidecode-3.1.recipe b/sys-apps/dmidecode/dmidecode-3.1.recipe
index 63ef95190..f708d02d0 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.recipe
+++ b/sys-apps/dmidecode/dmidecode-3.1.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-apps/fxload/fxload-20120810.recipe b/sys-apps/fxload/fxload-20120810.recipe
index 33a1a70c9..fc5378d4c 100644
--- a/sys-apps/fxload/fxload-20120810.recipe
+++ b/sys-apps/fxload/fxload-20120810.recipe
@@ -44,11 +44,11 @@ BUILD_REQUIRES="
 	devel:libusb_1.0${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
 	cmd:install
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sys-apps/help2man/help2man-1.47.5.recipe b/sys-apps/help2man/help2man-1.47.5.recipe
index b84ba842b..df81716b1 100644
--- a/sys-apps/help2man/help2man-1.47.5.recipe
+++ b/sys-apps/help2man/help2man-1.47.5.recipe
@@ -29,11 +29,11 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
-	cmd:awk
 	"
 
 BUILD()
diff --git a/sys-apps/less/less-487.recipe b/sys-apps/less/less-487.recipe
index 751d32dfb..154440e80 100644
--- a/sys-apps/less/less-487.recipe
+++ b/sys-apps/less/less-487.recipe
@@ -37,11 +37,11 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:ld$secondaryArchSuffix
-	cmd:autoconf
 	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-apps/less/less-531.recipe b/sys-apps/less/less-531.recipe
index 8dbb01aa0..b76a85711 100644
--- a/sys-apps/less/less-531.recipe
+++ b/sys-apps/less/less-531.recipe
@@ -37,11 +37,11 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:ld$secondaryArchSuffix
-	cmd:autoconf
 	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-apps/qdirstat/qdirstat-1.4.recipe b/sys-apps/qdirstat/qdirstat-1.4.recipe
index 9cbb42979..f4459bd6b 100644
--- a/sys-apps/qdirstat/qdirstat-1.4.recipe
+++ b/sys-apps/qdirstat/qdirstat-1.4.recipe
@@ -46,8 +46,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
 	cmd:make
+	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
 BUILD()
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index 0dc0824c4..a33b4bb36 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -27,11 +27,11 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
+	cmd:grep
 	cmd:ld
 	cmd:make
-	cmd:awk
-	cmd:grep
 	"
 
 defineDebugInfoPackage sed \
diff --git a/sys-apps/texinfo/texinfo-6.1.recipe b/sys-apps/texinfo/texinfo-6.1.recipe
index 1b673c441..f54ed5653 100644
--- a/sys-apps/texinfo/texinfo-6.1.recipe
+++ b/sys-apps/texinfo/texinfo-6.1.recipe
@@ -14,15 +14,15 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 PROVIDES="
 	texinfo = $portVersion compat >= 4
 	cmd:info = $portVersion compat >= 4
-	cmd:makeinfo = $portVersion compat >= 4
-	cmd:install_info = $portVersion compat >= 4
-	cmd:texi2dvi = $portVersion compat >= 4
-	cmd:texi2pdf = $portVersion compat >= 4
-	cmd:texindex = $portVersion compat >= 4
 	cmd:infokey = $portVersion compat >= 4
+	cmd:install_info = $portVersion compat >= 4
+	cmd:makeinfo = $portVersion compat >= 4
 	cmd:pdftexi2dvi = $portVersion compat >= 4
 	cmd:pod2texi = $portVersion compat >= 6
 	cmd:texi2any = $portVersion compat >= 6
+	cmd:texi2dvi = $portVersion compat >= 4
+	cmd:texi2pdf = $portVersion compat >= 4
+	cmd:texindex = $portVersion compat >= 4
 	"
 REQUIRES="
 	haiku
@@ -37,16 +37,16 @@ BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
 	cmd:gcc
+	cmd:gettext
+	cmd:grep
 	cmd:ld
 	cmd:make
-	cmd:grep
-	cmd:sed
 	cmd:perl
-	cmd:awk
-	cmd:autoconf
-	cmd:aclocal
-	cmd:gettext
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-apps/texinfo/texinfo-6.5.recipe b/sys-apps/texinfo/texinfo-6.5.recipe
index 2687c60f1..2516fdd61 100644
--- a/sys-apps/texinfo/texinfo-6.5.recipe
+++ b/sys-apps/texinfo/texinfo-6.5.recipe
@@ -14,15 +14,15 @@ ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
 PROVIDES="
 	texinfo = $portVersion compat >= 4
 	cmd:info = $portVersion compat >= 4
-	cmd:makeinfo = $portVersion compat >= 4
-	cmd:install_info = $portVersion compat >= 4
-	cmd:texi2dvi = $portVersion compat >= 4
-	cmd:texi2pdf = $portVersion compat >= 4
-	cmd:texindex = $portVersion compat >= 4
 	cmd:infokey = $portVersion compat >= 4
+	cmd:install_info = $portVersion compat >= 4
+	cmd:makeinfo = $portVersion compat >= 4
 	cmd:pdftexi2dvi = $portVersion compat >= 4
 	cmd:pod2texi = $portVersion compat >= 6
 	cmd:texi2any = $portVersion compat >= 6
+	cmd:texi2dvi = $portVersion compat >= 4
+	cmd:texi2pdf = $portVersion compat >= 4
+	cmd:texindex = $portVersion compat >= 4
 	"
 REQUIRES="
 	haiku
@@ -37,16 +37,16 @@ BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
 	cmd:gcc
+	cmd:gettext
+	cmd:grep
 	cmd:ld
 	cmd:make
-	cmd:grep
-	cmd:sed
 	cmd:perl
-	cmd:awk
-	cmd:autoconf
-	cmd:aclocal
-	cmd:gettext
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-apps/texinfo/texinfo4-4.13a.recipe b/sys-apps/texinfo/texinfo4-4.13a.recipe
index dcf250543..b3f3a34b9 100644
--- a/sys-apps/texinfo/texinfo4-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo4-4.13a.recipe
@@ -15,13 +15,13 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 PROVIDES="
 	texinfo4 = $portVersion compat >= 4
 	cmd:info_4.13 = $portVersion compat >= 4
-	cmd:makeinfo_4.13 = $portVersion compat >= 4
+	cmd:infokey_4.13 = $portVersion compat >= 4
 	cmd:install_info_4.13 = $portVersion compat >= 4
+	cmd:makeinfo_4.13 = $portVersion compat >= 4
+	cmd:pdftexi2dvi_4.13 = $portVersion compat >= 4
 	cmd:texi2dvi_4.13 = $portVersion compat >= 4
 	cmd:texi2pdf_4.13 = $portVersion compat >= 4
 	cmd:texindex_4.13 = $portVersion compat >= 4
-	cmd:infokey_4.13 = $portVersion compat >= 4
-	cmd:pdftexi2dvi_4.13 = $portVersion compat >= 4
 	"
 REQUIRES="
 	haiku
@@ -34,10 +34,10 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
+	cmd:grep
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	cmd:grep
 	cmd:sed
 	"
 
diff --git a/sys-apps/which/which-2.21.recipe b/sys-apps/which/which-2.21.recipe
index e88b4fd1c..f36c81ebc 100644
--- a/sys-apps/which/which-2.21.recipe
+++ b/sys-apps/which/which-2.21.recipe
@@ -23,11 +23,11 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
+	cmd:grep
 	cmd:make
 	cmd:sed
-	cmd:grep
-	cmd:awk
 	"
 
 defineDebugInfoPackage which \
diff --git a/sys-auth/libfprint/libfprint-0.7.0.recipe b/sys-auth/libfprint/libfprint-0.7.0.recipe
index ac8e0292e..13d81aac5 100644
--- a/sys-auth/libfprint/libfprint-0.7.0.recipe
+++ b/sys-auth/libfprint/libfprint-0.7.0.recipe
@@ -29,10 +29,10 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
-	lib:libnss3$secondaryArchSuffix
-	lib:libplc4$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:libnss3$secondaryArchSuffix
 	lib:libpixman_1$secondaryArchSuffix
+	lib:libplc4$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	"
 
diff --git a/sys-auth/libyubikey/libyubikey-1.13.recipe b/sys-auth/libyubikey/libyubikey-1.13.recipe
index 6d03866fa..8889b256e 100644
--- a/sys-auth/libyubikey/libyubikey-1.13.recipe
+++ b/sys-auth/libyubikey/libyubikey-1.13.recipe
@@ -14,8 +14,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	libyubikey$secondaryArchSuffix = $portVersion
 	cmd:modhex$secondaryArchSuffix = $portVersion
-	cmd:ykparse$secondaryArchSuffix = $portVersion
 	cmd:ykgenerate$secondaryArchSuffix = $portVersion
+	cmd:ykparse$secondaryArchSuffix = $portVersion
 	lib:libyubikey$secondaryArchSuffix = 0.1.7 compat >= 0
 	"
 REQUIRES="
diff --git a/sys-auth/pam_yubico/pam_yubico-2.24.recipe b/sys-auth/pam_yubico/pam_yubico-2.24.recipe
index da0bfe464..633fdb757 100644
--- a/sys-auth/pam_yubico/pam_yubico-2.24.recipe
+++ b/sys-auth/pam_yubico/pam_yubico-2.24.recipe
@@ -37,17 +37,17 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
+	cmd:asciidoc
 	cmd:autoconf
 	cmd:automake
-	cmd:asciidoc
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:help2man
 	cmd:grep
+	cmd:help2man
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:sed
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-auth/ykclient/ykclient-2.15.recipe b/sys-auth/ykclient/ykclient-2.15.recipe
index c86b25d13..b8e77f172 100644
--- a/sys-auth/ykclient/ykclient-2.15.recipe
+++ b/sys-auth/ykclient/ykclient-2.15.recipe
@@ -40,8 +40,8 @@ BUILD_PREREQUIRES="
 	cmd:help2man
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:sed
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-auth/yubikey-personalization/libykpers-1.18.0.recipe b/sys-auth/yubikey-personalization/libykpers-1.18.0.recipe
index 4c1d1c165..3aefce21d 100644
--- a/sys-auth/yubikey-personalization/libykpers-1.18.0.recipe
+++ b/sys-auth/yubikey-personalization/libykpers-1.18.0.recipe
@@ -48,8 +48,8 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:sed
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-block/hxcfloppyemulator_cmdline/hxcfloppyemulator_cmdline-2.0.0.0.recipe b/sys-block/hxcfloppyemulator_cmdline/hxcfloppyemulator_cmdline-2.0.0.0.recipe
index ad0df15ce..f3baa1dd5 100644
--- a/sys-block/hxcfloppyemulator_cmdline/hxcfloppyemulator_cmdline-2.0.0.0.recipe
+++ b/sys-block/hxcfloppyemulator_cmdline/hxcfloppyemulator_cmdline-2.0.0.0.recipe
@@ -30,8 +30,8 @@ BUILD_REQUIRES="
 	devel:libusbhxcfe$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-block/libhxcfe/libhxcfe-2.4.6.0.recipe b/sys-block/libhxcfe/libhxcfe-2.4.6.0.recipe
index 4d6a27980..603e4f84b 100644
--- a/sys-block/libhxcfe/libhxcfe-2.4.6.0.recipe
+++ b/sys-block/libhxcfe/libhxcfe-2.4.6.0.recipe
@@ -32,8 +32,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	libhxcfe${secondaryArchSuffix}_devel = $portVersion
-	devel:libhxcfe$secondaryArchSuffix
 	devel:libhxcadaptor$secondaryArchSuffix
+	devel:libhxcfe$secondaryArchSuffix
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -45,8 +45,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:dos2unix
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-block/libusbhxcfe/libusbhxcfe-2.0.0.4.recipe b/sys-block/libusbhxcfe/libusbhxcfe-2.0.0.4.recipe
index 85a67377a..a37a00e97 100644
--- a/sys-block/libusbhxcfe/libusbhxcfe-2.0.0.4.recipe
+++ b/sys-block/libusbhxcfe/libusbhxcfe-2.0.0.4.recipe
@@ -37,8 +37,8 @@ BUILD_REQUIRES="
 	devel:libhxcfe$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe b/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe
index 063bf4823..adf56f6fe 100644
--- a/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe
+++ b/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe
@@ -61,14 +61,14 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
 	lib:libkpmcore$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.45
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
@@ -88,14 +88,14 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:libkpmcore$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:cmake$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index ecd35282b..8b8032b66 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -27,9 +27,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5
 	cmd:sh
diff --git a/sys-devel/autoconf/autoconf213-2.13.recipe b/sys-devel/autoconf/autoconf213-2.13.recipe
index 0d64ec8a8..6a69961e3 100644
--- a/sys-devel/autoconf/autoconf213-2.13.recipe
+++ b/sys-devel/autoconf/autoconf213-2.13.recipe
@@ -31,9 +31,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:autoconf
 	"
 
 BUILD()
diff --git a/sys-devel/autoconf/autoconf264-2.64.recipe b/sys-devel/autoconf/autoconf264-2.64.recipe
index 3a2c4612f..cca4cfe27 100644
--- a/sys-devel/autoconf/autoconf264-2.64.recipe
+++ b/sys-devel/autoconf/autoconf264-2.64.recipe
@@ -30,9 +30,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5
 	cmd:sh
@@ -45,8 +45,8 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:autoreconf
 	cmd:make
-	cmd:sed
 	cmd:makeinfo
+	cmd:sed
 	"
 
 BUILD()
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index 5986e1406..72da053fd 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -15,16 +15,16 @@ ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.11
-	cmd:automake = $portVersion compat >= 1.11
-	cmd:automake_1.11 = $portVersion compat >= 1.11
 	cmd:aclocal = $portVersion compat >= 1.11
 	cmd:aclocal_1.11 = $portVersion compat >= 1.11
+	cmd:automake = $portVersion compat >= 1.11
+	cmd:automake_1.11 = $portVersion compat >= 1.11
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5.8
 	cmd:sh
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
index 7c553b03c..dbd836734 100644
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -15,16 +15,16 @@ ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.12
-	cmd:automake = $portVersion compat >= 1.12
-	cmd:automake_1.12 = $portVersion compat >= 1.12
 	cmd:aclocal = $portVersion compat >= 1.12
 	cmd:aclocal_1.12 = $portVersion compat >= 1.12
+	cmd:automake = $portVersion compat >= 1.12
+	cmd:automake_1.12 = $portVersion compat >= 1.12
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5.8
 	cmd:sh
diff --git a/sys-devel/automake/automake-1.15.1.recipe b/sys-devel/automake/automake-1.15.1.recipe
index dcba4073d..44f6cdcf3 100644
--- a/sys-devel/automake/automake-1.15.1.recipe
+++ b/sys-devel/automake/automake-1.15.1.recipe
@@ -14,16 +14,16 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.13
-	cmd:automake = $portVersion compat >= 1.13
-	cmd:automake_1.15 = $portVersion compat >= 1.15
 	cmd:aclocal = $portVersion compat >= 1.13
 	cmd:aclocal_1.15 = $portVersion compat >= 1.15
+	cmd:automake = $portVersion compat >= 1.13
+	cmd:automake_1.15 = $portVersion compat >= 1.15
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5.8
 	cmd:sh
diff --git a/sys-devel/automake/automake113-1.13.1.recipe b/sys-devel/automake/automake113-1.13.1.recipe
index a6a9508de..716c385c2 100644
--- a/sys-devel/automake/automake113-1.13.1.recipe
+++ b/sys-devel/automake/automake113-1.13.1.recipe
@@ -15,14 +15,14 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	automake113 = $portVersion compat >= 1.13
-	cmd:automake_1.13 = $portVersion compat >= 1.13
 	cmd:aclocal_1.13 = $portVersion compat >= 1.13
+	cmd:automake_1.13 = $portVersion compat >= 1.13
 	"
 REQUIRES="
 	haiku
-	cmd:awk
 	coreutils
 	diffutils
+	cmd:awk
 	cmd:m4 >= 1.4
 	cmd:perl >= 5.8
 	cmd:sh
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index 046c3435b..94d6997b1 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -28,10 +28,10 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
 	cmd:gcc
 	cmd:make
-	cmd:flex
-	cmd:bison
 	"
 
 BUILD()
diff --git a/sys-devel/bison/bison-3.0.5.recipe b/sys-devel/bison/bison-3.0.5.recipe
index a804b9d57..d3311c080 100644
--- a/sys-devel/bison/bison-3.0.5.recipe
+++ b/sys-devel/bison/bison-3.0.5.recipe
@@ -36,12 +36,12 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:awk
 	cmd:diff
 	cmd:flex
+	cmd:gcc$secondaryArchSuffix
 	cmd:help2man
+	cmd:ld$secondaryArchSuffix
 	cmd:m4
 	cmd:make
 	cmd:perl
diff --git a/sys-devel/bmake/bmake-20171118.recipe b/sys-devel/bmake/bmake-20171118.recipe
index 0032c7cd6..e8258bceb 100644
--- a/sys-devel/bmake/bmake-20171118.recipe
+++ b/sys-devel/bmake/bmake-20171118.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
+	cmd:diff
 	cmd:gcc
 	cmd:make
-	cmd:diff
 	cmd:sed
 	"
 
diff --git a/sys-devel/bmake/bmake-20180512.recipe b/sys-devel/bmake/bmake-20180512.recipe
index b6a886b72..8ce9d7891 100644
--- a/sys-devel/bmake/bmake-20180512.recipe
+++ b/sys-devel/bmake/bmake-20180512.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
+	cmd:diff
 	cmd:gcc
 	cmd:make
-	cmd:diff
 	cmd:sed
 	"
 
diff --git a/sys-devel/distcc/distcc-3.2~rc1.recipe b/sys-devel/distcc/distcc-3.2~rc1.recipe
index 404681ffa..708d81827 100644
--- a/sys-devel/distcc/distcc-3.2~rc1.recipe
+++ b/sys-devel/distcc/distcc-3.2~rc1.recipe
@@ -49,14 +49,12 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
 	cmd:g++
+	cmd:gcc
+	#cmd:gdb # for testing
 	cmd:libtoolize
 	cmd:make
 	cmd:which
-
-	# for testing
-	#cmd:gdb
 	"
 
 BUILD()
diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe
index 2a5389ce3..50ccdc7a6 100644
--- a/sys-devel/flex/flex-2.5.39.recipe
+++ b/sys-devel/flex/flex-2.5.39.recipe
@@ -16,10 +16,10 @@ PROVIDES="
 	flex = $portVersion compat >= 2.5
 	cmd:flex = $portVersion compat >= 2.5
 	cmd:flex++ = $portVersion compat >= 2.5
-	lib:libfl = 2.0.0 compat >= 2
-	lib:libfl_pic = 2.0.0 compat >= 2
 	devel:libfl = 2.0.0 compat >= 2
 	devel:libfl_pic = 2.0.0 compat >= 2
+	lib:libfl = 2.0.0 compat >= 2
+	lib:libfl_pic = 2.0.0 compat >= 2
 	"
 REQUIRES="
 	haiku
@@ -33,13 +33,13 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc
 	cmd:gettext
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
 	cmd:makeinfo
-	cmd:find
 	"
 
 BUILD()
diff --git a/sys-devel/ham/ham-0.1.recipe b/sys-devel/ham/ham-0.1.recipe
index f42667ad0..e6d6a7543 100644
--- a/sys-devel/ham/ham-0.1.recipe
+++ b/sys-devel/ham/ham-0.1.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc${secondaryArchSuffix}
 	cmd:jam
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe
index 0e5656046..13ab3c058 100644
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -36,8 +36,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:make
 	cmd:ld
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe
index fbeb56176..aeb37431c 100644
--- a/sys-devel/libtool/libtool-2.4.2.recipe
+++ b/sys-devel/libtool/libtool-2.4.2.recipe
@@ -24,9 +24,9 @@ REQUIRES="
 	libtool_libltdl$secondaryArchSuffix == $portVersion base
 	cmd:aclocal
 	cmd:automake
+	cmd:find
 	cmd:sed
 	cmd:tar
-	cmd:find
 	cmd:xargs
 	"
 
diff --git a/sys-devel/libtool/libtool-2.4.6.recipe b/sys-devel/libtool/libtool-2.4.6.recipe
index 2b0f7455c..dd17356fe 100644
--- a/sys-devel/libtool/libtool-2.4.6.recipe
+++ b/sys-devel/libtool/libtool-2.4.6.recipe
@@ -23,9 +23,9 @@ REQUIRES="
 	libtool${secondaryArchSuffix}_libltdl == $portVersion base
 	cmd:aclocal
 	cmd:automake
+	cmd:find
 	cmd:sed
 	cmd:tar
-	cmd:find
 	cmd:xargs
 	"
 
diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe
index 626c53eb8..58d6d3a82 100644
--- a/sys-devel/llvm/llvm-3.2.recipe
+++ b/sys-devel/llvm/llvm-3.2.recipe
@@ -41,9 +41,9 @@ PROVIDES="
 	cmd:macho_dump
 	cmd:opt
 	lib:BugpointPasses
-	lib:LLVMHello
 	lib:libLTO
 	lib:libprofile_rt
+	lib:LLVMHello
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe
index 4d8e22fd1..fc390d646 100644
--- a/sys-devel/llvm/llvm-3.4.1.recipe
+++ b/sys-devel/llvm/llvm-3.4.1.recipe
@@ -42,9 +42,6 @@ PROVIDES="
 	cmd:llvm_tblgen
 	cmd:macho_dump
 	cmd:opt
-	lib:BugpointPasses
-	lib:LLVMHello
-	lib:libLTO
 	devel:libLLVMAArch64AsmParser
 	devel:libLLVMAArch64AsmPrinter
 	devel:libLLVMAArch64CodeGen
@@ -52,13 +49,13 @@ PROVIDES="
 	devel:libLLVMAArch64Disassembler
 	devel:libLLVMAArch64Info
 	devel:libLLVMAArch64Utils
+	devel:libLLVMAnalysis
 	devel:libLLVMARMAsmParser
 	devel:libLLVMARMAsmPrinter
 	devel:libLLVMARMCodeGen
 	devel:libLLVMARMDesc
 	devel:libLLVMARMDisassembler
 	devel:libLLVMARMInfo
-	devel:libLLVMAnalysis
 	devel:libLLVMAsmParser
 	devel:libLLVMAsmPrinter
 	devel:libLLVMBitReader
@@ -73,27 +70,29 @@ PROVIDES="
 	devel:libLLVMHexagonCodeGen
 	devel:libLLVMHexagonDesc
 	devel:libLLVMHexagonInfo
-	devel:libLLVMIRReader
 	devel:libLLVMInstCombine
 	devel:libLLVMInstrumentation
 	devel:libLLVMInterpreter
+	devel:libLLVMipa
+	devel:libLLVMipo
+	devel:libLLVMIRReader
 	devel:libLLVMJIT
-	devel:libLLVMLTO
 	devel:libLLVMLinker
+	devel:libLLVMLTO
 	devel:libLLVMMC
 	devel:libLLVMMCDisassembler
 	devel:libLLVMMCJIT
 	devel:libLLVMMCParser
-	devel:libLLVMMSP430AsmPrinter
-	devel:libLLVMMSP430CodeGen
-	devel:libLLVMMSP430Desc
-	devel:libLLVMMSP430Info
 	devel:libLLVMMipsAsmParser
 	devel:libLLVMMipsAsmPrinter
 	devel:libLLVMMipsCodeGen
 	devel:libLLVMMipsDesc
 	devel:libLLVMMipsDisassembler
 	devel:libLLVMMipsInfo
+	devel:libLLVMMSP430AsmPrinter
+	devel:libLLVMMSP430CodeGen
+	devel:libLLVMMSP430Desc
+	devel:libLLVMMSP430Info
 	devel:libLLVMNVPTXAsmPrinter
 	devel:libLLVMNVPTXCodeGen
 	devel:libLLVMNVPTXDesc
@@ -139,9 +138,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc
 	devel:libLLVMXCoreDisassembler
 	devel:libLLVMXCoreInfo
-	devel:libLLVMipa
-	devel:libLLVMipo
 	devel:libLTO
+	lib:BugpointPasses
+	lib:libLTO
+	lib:LLVMHello
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -156,13 +156,12 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:find
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.4.2.recipe b/sys-devel/llvm/llvm-3.4.2.recipe
index b9b2365c5..487e7e337 100644
--- a/sys-devel/llvm/llvm-3.4.2.recipe
+++ b/sys-devel/llvm/llvm-3.4.2.recipe
@@ -42,9 +42,6 @@ PROVIDES="
 	cmd:llvm_tblgen
 	cmd:macho_dump
 	cmd:opt
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -52,13 +49,13 @@ PROVIDES="
 	devel:libLLVMAArch64Disassembler$secondaryArchSuffix
 	devel:libLLVMAArch64Info$secondaryArchSuffix
 	devel:libLLVMAArch64Utils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBitReader$secondaryArchSuffix
@@ -73,27 +70,29 @@ PROVIDES="
 	devel:libLLVMHexagonCodeGen$secondaryArchSuffix
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMJIT$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -139,9 +138,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -156,13 +156,12 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:find
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe
index 8a4a13c56..662327fee 100644
--- a/sys-devel/llvm/llvm-3.5.0.recipe
+++ b/sys-devel/llvm/llvm-3.5.0.recipe
@@ -17,6 +17,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -43,13 +45,8 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
+	cmd:opt
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -57,13 +54,13 @@ PROVIDES="
 	devel:libLLVMAArch64Disassembler$secondaryArchSuffix
 	devel:libLLVMAArch64Info$secondaryArchSuffix
 	devel:libLLVMAArch64Utils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBitReader$secondaryArchSuffix
@@ -78,29 +75,31 @@ PROVIDES="
 	devel:libLLVMHexagonCodeGen$secondaryArchSuffix
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMJIT$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCAnalysis$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -151,9 +150,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
@@ -168,13 +168,12 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:find
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.5.1.recipe b/sys-devel/llvm/llvm-3.5.1.recipe
index ef4013d5d..518c801e8 100644
--- a/sys-devel/llvm/llvm-3.5.1.recipe
+++ b/sys-devel/llvm/llvm-3.5.1.recipe
@@ -23,6 +23,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -49,14 +51,8 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:opt
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -64,13 +60,13 @@ PROVIDES="
 	devel:libLLVMAArch64Disassembler$secondaryArchSuffix
 	devel:libLLVMAArch64Info$secondaryArchSuffix
 	devel:libLLVMAArch64Utils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBitReader$secondaryArchSuffix
@@ -85,29 +81,31 @@ PROVIDES="
 	devel:libLLVMHexagonCodeGen$secondaryArchSuffix
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMJIT$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCAnalysis$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -158,9 +156,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
@@ -168,6 +167,7 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
 	cmd:clang++ = $portVersion
 	cmd:clang_apply_replacements = $portVersion
@@ -177,15 +177,13 @@ PROVIDES_clang="
 	cmd:clang_query = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:pp_trace = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -211,6 +209,7 @@ PROVIDES_clang="
 	devel:libclangtidymiscmodule$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libmodernizecore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -234,13 +233,13 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.5.2.recipe b/sys-devel/llvm/llvm-3.5.2.recipe
index 20d4b2782..0a1808963 100644
--- a/sys-devel/llvm/llvm-3.5.2.recipe
+++ b/sys-devel/llvm/llvm-3.5.2.recipe
@@ -48,6 +48,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -74,14 +76,8 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:opt
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -89,13 +85,13 @@ PROVIDES="
 	devel:libLLVMAArch64Disassembler$secondaryArchSuffix
 	devel:libLLVMAArch64Info$secondaryArchSuffix
 	devel:libLLVMAArch64Utils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBitReader$secondaryArchSuffix
@@ -110,29 +106,31 @@ PROVIDES="
 	devel:libLLVMHexagonCodeGen$secondaryArchSuffix
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMJIT$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCAnalysis$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -183,9 +181,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -193,6 +192,7 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
 	cmd:clang++ = $portVersion
 	cmd:clang_apply_replacements = $portVersion
@@ -202,15 +202,13 @@ PROVIDES_clang="
 	cmd:clang_query = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:pp_trace = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -236,6 +234,7 @@ PROVIDES_clang="
 	devel:libclangtidymiscmodule$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libmodernizecore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -259,13 +258,13 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.7.0.recipe b/sys-devel/llvm/llvm-3.7.0.recipe
index 73c45f0cf..d5de299d8 100644
--- a/sys-devel/llvm/llvm-3.7.0.recipe
+++ b/sys-devel/llvm/llvm-3.7.0.recipe
@@ -48,6 +48,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -77,17 +79,11 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:obj2yaml
+	cmd:opt
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -101,21 +97,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDesc$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCppBackendCodeGen$secondaryArchSuffix
@@ -127,29 +123,31 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -198,9 +196,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -219,13 +218,12 @@ PROVIDES_clang="
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
 	cmd:pp_trace = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -255,6 +253,7 @@ PROVIDES_clang="
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libmodernizecore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -278,13 +277,13 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.7.1.recipe b/sys-devel/llvm/llvm-3.7.1.recipe
index 52edcfdd8..350bb180a 100644
--- a/sys-devel/llvm/llvm-3.7.1.recipe
+++ b/sys-devel/llvm/llvm-3.7.1.recipe
@@ -48,6 +48,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -77,17 +79,11 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:obj2yaml
+	cmd:opt
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -101,21 +97,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDesc$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCppBackendCodeGen$secondaryArchSuffix
@@ -127,29 +123,31 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipa$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -198,9 +196,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipa$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -208,6 +207,7 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
 	cmd:clang++ = $portVersion
 	cmd:clang_apply_replacements = $portVersion
@@ -218,15 +218,13 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:pp_trace = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -256,6 +254,7 @@ PROVIDES_clang="
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libmodernizecore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -280,13 +279,13 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.8.0.recipe b/sys-devel/llvm/llvm-3.8.0.recipe
index 2c5b71ac9..e347e0a86 100644
--- a/sys-devel/llvm/llvm-3.8.0.recipe
+++ b/sys-devel/llvm/llvm-3.8.0.recipe
@@ -50,6 +50,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -84,18 +86,12 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
+	cmd:obj2yaml
+	cmd:opt
 	cmd:sancov
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -109,21 +105,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDesc$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCppBackendCodeGen$secondaryArchSuffix
@@ -137,29 +133,30 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -209,8 +206,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -219,9 +218,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clang_3.8 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_3.8 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_check = $portVersion
 	cmd:clang_cl = $portVersion
@@ -231,16 +231,14 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -273,6 +271,7 @@ PROVIDES_clang="
 	devel:libclangtidyutils$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -300,12 +299,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.8.1.recipe b/sys-devel/llvm/llvm-3.8.1.recipe
index b8930bf7b..f64dd164b 100644
--- a/sys-devel/llvm/llvm-3.8.1.recipe
+++ b/sys-devel/llvm/llvm-3.8.1.recipe
@@ -53,6 +53,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:llc
 	cmd:lli
 	cmd:lli_child_target
@@ -87,18 +89,12 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
+	cmd:obj2yaml
+	cmd:opt
 	cmd:sancov
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -112,21 +108,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDesc$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCppBackendCodeGen$secondaryArchSuffix
@@ -140,29 +136,30 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -212,8 +209,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -222,9 +221,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clang_3.8 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_3.8 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_check = $portVersion
 	cmd:clang_cl = $portVersion
@@ -234,16 +234,14 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -276,6 +274,7 @@ PROVIDES_clang="
 	devel:libclangtidyutils$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -303,12 +302,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.9.0.recipe b/sys-devel/llvm/llvm-3.9.0.recipe
index 44039db88..618699f29 100644
--- a/sys-devel/llvm/llvm-3.9.0.recipe
+++ b/sys-devel/llvm/llvm-3.9.0.recipe
@@ -53,6 +53,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:find_all_symbols
 	cmd:llc
 	cmd:lli
@@ -88,19 +90,13 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
+	cmd:obj2yaml
+	cmd:opt
 	cmd:sancov
 	cmd:sanstats
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libfindAllSymbols$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
@@ -116,21 +112,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCoverage$secondaryArchSuffix
@@ -146,29 +142,30 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -219,8 +216,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -229,9 +228,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clang_3.9 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_3.9 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_check = $portVersion
 	cmd:clang_cl = $portVersion
@@ -242,16 +242,14 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -287,6 +285,7 @@ PROVIDES_clang="
 	devel:libclangtidyutils$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -314,12 +313,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-3.9.1.recipe b/sys-devel/llvm/llvm-3.9.1.recipe
index 56cfed038..d6176604d 100644
--- a/sys-devel/llvm/llvm-3.9.1.recipe
+++ b/sys-devel/llvm/llvm-3.9.1.recipe
@@ -53,6 +53,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
 	cmd:bugpoint
+	cmd:count
+	cmd:FileCheck
 	cmd:find_all_symbols
 	cmd:llc
 	cmd:lli
@@ -88,19 +90,13 @@ PROVIDES="
 	cmd:llvm_symbolizer
 	cmd:llvm_tblgen
 	cmd:macho_dump
-	cmd:verify_uselistorder
-	cmd:obj2yaml
-	cmd:yaml2obj
-	cmd:opt
-	cmd:FileCheck
-	cmd:count
 	cmd:not
+	cmd:obj2yaml
+	cmd:opt
 	cmd:sancov
 	cmd:sanstats
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-	lib:libLTO$secondaryArchSuffix
-
+	cmd:verify_uselistorder
+	cmd:yaml2obj
 	devel:libfindAllSymbols$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
@@ -116,21 +112,21 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCoverage$secondaryArchSuffix
@@ -146,29 +142,30 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -219,8 +216,10 @@ PROVIDES="
 	devel:libLLVMXCoreDesc$secondaryArchSuffix
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:libLTO$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -229,9 +228,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clang_3.9 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_3.9 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_check = $portVersion
 	cmd:clang_cl = $portVersion
@@ -242,16 +242,14 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_tblgen = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
 	devel:libclangdriver$secondaryArchSuffix = $portVersion
@@ -287,6 +285,7 @@ PROVIDES_clang="
 	devel:libclangtidyutils$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -314,12 +313,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-4.0.1.recipe b/sys-devel/llvm/llvm-4.0.1.recipe
index 204d5d87d..d29a17145 100644
--- a/sys-devel/llvm/llvm-4.0.1.recipe
+++ b/sys-devel/llvm/llvm-4.0.1.recipe
@@ -105,13 +105,10 @@ PROVIDES="
 	cmd:verify_uselistorder
 	cmd:yaml2obj
 	cmd:yaml_bench
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-
 	devel:libfindAllSymbols$secondaryArchSuffix
+	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVM_$portVersion$secondaryArchSuffix
 	devel:libLLVM_4.0$secondaryArchSuffix
-	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -126,22 +123,22 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
+	devel:libLLVMBitReader$secondaryArchSuffix
+	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMBPFAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBPFCodeGen$secondaryArchSuffix
 	devel:libLLVMBPFDesc$secondaryArchSuffix
 	devel:libLLVMBPFDisassembler$secondaryArchSuffix
 	devel:libLLVMBPFInfo$secondaryArchSuffix
-	devel:libLLVMBitReader$secondaryArchSuffix
-	devel:libLLVMBitWriter$secondaryArchSuffix
 	devel:libLLVMCodeGen$secondaryArchSuffix
 	devel:libLLVMCore$secondaryArchSuffix
 	devel:libLLVMCoroutines$secondaryArchSuffix
@@ -158,35 +155,36 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLanaiAsmParser$secondaryArchSuffix
 	devel:libLLVMLanaiCodeGen$secondaryArchSuffix
 	devel:libLLVMLanaiDesc$secondaryArchSuffix
 	devel:libLLVMLanaiDisassembler$secondaryArchSuffix
 	devel:libLLVMLanaiInfo$secondaryArchSuffix
 	devel:libLLVMLanaiInstPrinter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -241,8 +239,9 @@ PROVIDES="
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
 	devel:libLLVMXRay$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -252,9 +251,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clang_4.0 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_4.0 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_change_namespace = $portVersion
 	cmd:clang_check = $portVersion
@@ -268,16 +268,14 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_reorder_fields = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangchangenamespace$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
@@ -319,6 +317,7 @@ PROVIDES_clang="
 	devel:libclangtidyutils$secondaryArchSuffix = $portVersion
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -357,12 +356,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-5.0.0.recipe b/sys-devel/llvm/llvm-5.0.0.recipe
index 5d0c60368..06220484b 100644
--- a/sys-devel/llvm/llvm-5.0.0.recipe
+++ b/sys-devel/llvm/llvm-5.0.0.recipe
@@ -110,13 +110,10 @@ PROVIDES="
 	cmd:verify_uselistorder
 	cmd:yaml2obj
 	cmd:yaml_bench
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-
 	devel:libfindAllSymbols$secondaryArchSuffix
+	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVM_$portVersion$secondaryArchSuffix
 	devel:libLLVM_5.0$secondaryArchSuffix
-	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -131,13 +128,13 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
 	devel:libLLVMARMDesc$secondaryArchSuffix
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBinaryFormat$secondaryArchSuffix
@@ -165,10 +162,11 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLanaiAsmParser$secondaryArchSuffix
 	devel:libLLVMLanaiAsmPrinter$secondaryArchSuffix
 	devel:libLLVMLanaiCodeGen$secondaryArchSuffix
@@ -176,25 +174,25 @@ PROVIDES="
 	devel:libLLVMLanaiDisassembler$secondaryArchSuffix
 	devel:libLLVMLanaiInfo$secondaryArchSuffix
 	devel:libLLVMLanaiInstPrinter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -249,8 +247,9 @@ PROVIDES="
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
 	devel:libLLVMXRay$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -260,10 +259,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clangd = $portVersion
-	cmd:clang_5.0 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_5.0 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_change_namespace = $portVersion
 	cmd:clang_check = $portVersion
@@ -277,16 +276,15 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_reorder_fields = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
+	cmd:clangd = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangchangenamespace$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
@@ -333,6 +331,7 @@ PROVIDES_clang="
 	devel:libclangtooling$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -371,12 +370,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/llvm/llvm-6.0.0~git.recipe b/sys-devel/llvm/llvm-6.0.0~git.recipe
index f89bf814c..7473c96c2 100644
--- a/sys-devel/llvm/llvm-6.0.0~git.recipe
+++ b/sys-devel/llvm/llvm-6.0.0~git.recipe
@@ -114,13 +114,10 @@ PROVIDES="
 	cmd:sanstats
 	cmd:verify_uselistorder
 	cmd:yaml2obj
-	lib:BugpointPasses$secondaryArchSuffix
-	lib:LLVMHello$secondaryArchSuffix
-
 	devel:libfindAllSymbols$secondaryArchSuffix
+	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVM_6.0.0svn$secondaryArchSuffix
 	devel:libLLVM_6.0svn$secondaryArchSuffix
-	devel:libLLVM$secondaryArchSuffix
 	devel:libLLVMAArch64AsmParser$secondaryArchSuffix
 	devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix
 	devel:libLLVMAArch64CodeGen$secondaryArchSuffix
@@ -135,6 +132,7 @@ PROVIDES="
 	devel:libLLVMAMDGPUDisassembler$secondaryArchSuffix
 	devel:libLLVMAMDGPUInfo$secondaryArchSuffix
 	devel:libLLVMAMDGPUUtils$secondaryArchSuffix
+	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMARMAsmParser$secondaryArchSuffix
 	devel:libLLVMARMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMARMCodeGen$secondaryArchSuffix
@@ -142,7 +140,6 @@ PROVIDES="
 	devel:libLLVMARMDisassembler$secondaryArchSuffix
 	devel:libLLVMARMInfo$secondaryArchSuffix
 	devel:libLLVMARMUtils$secondaryArchSuffix
-	devel:libLLVMAnalysis$secondaryArchSuffix
 	devel:libLLVMAsmParser$secondaryArchSuffix
 	devel:libLLVMAsmPrinter$secondaryArchSuffix
 	devel:libLLVMBinaryFormat$secondaryArchSuffix
@@ -172,10 +169,11 @@ PROVIDES="
 	devel:libLLVMHexagonDesc$secondaryArchSuffix
 	devel:libLLVMHexagonDisassembler$secondaryArchSuffix
 	devel:libLLVMHexagonInfo$secondaryArchSuffix
-	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMInstCombine$secondaryArchSuffix
 	devel:libLLVMInstrumentation$secondaryArchSuffix
 	devel:libLLVMInterpreter$secondaryArchSuffix
+	devel:libLLVMipo$secondaryArchSuffix
+	devel:libLLVMIRReader$secondaryArchSuffix
 	devel:libLLVMLanaiAsmParser$secondaryArchSuffix
 	devel:libLLVMLanaiAsmPrinter$secondaryArchSuffix
 	devel:libLLVMLanaiCodeGen$secondaryArchSuffix
@@ -183,25 +181,25 @@ PROVIDES="
 	devel:libLLVMLanaiDisassembler$secondaryArchSuffix
 	devel:libLLVMLanaiInfo$secondaryArchSuffix
 	devel:libLLVMLanaiInstPrinter$secondaryArchSuffix
-	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMLibDriver$secondaryArchSuffix
 	devel:libLLVMLineEditor$secondaryArchSuffix
 	devel:libLLVMLinker$secondaryArchSuffix
+	devel:libLLVMLTO$secondaryArchSuffix
 	devel:libLLVMMC$secondaryArchSuffix
 	devel:libLLVMMCDisassembler$secondaryArchSuffix
 	devel:libLLVMMCJIT$secondaryArchSuffix
 	devel:libLLVMMCParser$secondaryArchSuffix
-	devel:libLLVMMIRParser$secondaryArchSuffix
-	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
-	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
-	devel:libLLVMMSP430Desc$secondaryArchSuffix
-	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMMipsAsmParser$secondaryArchSuffix
 	devel:libLLVMMipsAsmPrinter$secondaryArchSuffix
 	devel:libLLVMMipsCodeGen$secondaryArchSuffix
 	devel:libLLVMMipsDesc$secondaryArchSuffix
 	devel:libLLVMMipsDisassembler$secondaryArchSuffix
 	devel:libLLVMMipsInfo$secondaryArchSuffix
+	devel:libLLVMMIRParser$secondaryArchSuffix
+	devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix
+	devel:libLLVMMSP430CodeGen$secondaryArchSuffix
+	devel:libLLVMMSP430Desc$secondaryArchSuffix
+	devel:libLLVMMSP430Info$secondaryArchSuffix
 	devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix
 	devel:libLLVMNVPTXCodeGen$secondaryArchSuffix
 	devel:libLLVMNVPTXDesc$secondaryArchSuffix
@@ -257,8 +255,9 @@ PROVIDES="
 	devel:libLLVMXCoreDisassembler$secondaryArchSuffix
 	devel:libLLVMXCoreInfo$secondaryArchSuffix
 	devel:libLLVMXRay$secondaryArchSuffix
-	devel:libLLVMipo$secondaryArchSuffix
 	devel:libLTO$secondaryArchSuffix
+	lib:BugpointPasses$secondaryArchSuffix
+	lib:LLVMHello$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -268,10 +267,10 @@ REQUIRES="
 
 PROVIDES_clang="
 	llvm${secondaryArchSuffix}_clang = $portVersion
+	cmd:c_index_test = $portVersion
 	cmd:clang = $portVersion
-	cmd:clangd = $portVersion
-	cmd:clang_6.0 = $portVersion
 	cmd:clang++ = $portVersion
+	cmd:clang_6.0 = $portVersion
 	cmd:clang_apply_replacements = $portVersion
 	cmd:clang_change_namespace = $portVersion
 	cmd:clang_check = $portVersion
@@ -286,16 +285,15 @@ PROVIDES_clang="
 	cmd:clang_rename = $portVersion
 	cmd:clang_reorder_fields = $portVersion
 	cmd:clang_tidy = $portVersion
-	cmd:c_index_test = $portVersion
+	cmd:clangd = $portVersion
 	cmd:git_clang_format = $portVersion
 	cmd:modularize = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersion
+	devel:libclanganalysis$secondaryArchSuffix = $portVersion
+	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangarcmigrate$secondaryArchSuffix = $portVersion
 	devel:libclangast$secondaryArchSuffix = $portVersion
 	devel:libclangastmatchers$secondaryArchSuffix = $portVersion
-	devel:libclanganalysis$secondaryArchSuffix = $portVersion
-	devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion
 	devel:libclangbasic$secondaryArchSuffix = $portVersion
 	devel:libclangchangenamespace$secondaryArchSuffix = $portVersion
 	devel:libclangcodegen$secondaryArchSuffix = $portVersion
@@ -343,6 +341,7 @@ PROVIDES_clang="
 	devel:libclangtoolingastdiff$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
@@ -381,12 +380,12 @@ BUILD_PREREQUIRES="
 	cmd:diff
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:groff
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:grep
 	"
 
 BUILD()
diff --git a/sys-devel/m4/m4-1.4.18.recipe b/sys-devel/m4/m4-1.4.18.recipe
index 53bf508d6..a6829c337 100644
--- a/sys-devel/m4/m4-1.4.18.recipe
+++ b/sys-devel/m4/m4-1.4.18.recipe
@@ -35,10 +35,10 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
 	cmd:grep
+	cmd:help2man
 	cmd:ld
 	cmd:make
 	cmd:sed
-	cmd:help2man
 	"
 
 TEST_REQUIRES="
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index 43066a137..268cb768d 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -28,10 +28,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
+	cmd:grep
 	cmd:ld
 	cmd:libtoolize
 	cmd:sed
-	cmd:grep
 	"
 
 defineDebugInfoPackage make \
diff --git a/sys-devel/make/make-4.1.recipe b/sys-devel/make/make-4.1.recipe
index 10bb96b7e..36feaf3d4 100644
--- a/sys-devel/make/make-4.1.recipe
+++ b/sys-devel/make/make-4.1.recipe
@@ -28,10 +28,10 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
+	cmd:grep
 	cmd:ld
 	cmd:libtoolize
 	cmd:sed
-	cmd:grep
 	"
 
 defineDebugInfoPackage make \
diff --git a/sys-devel/patch/patch-2.7.5.recipe b/sys-devel/patch/patch-2.7.5.recipe
index a2d22683c..625861f7e 100644
--- a/sys-devel/patch/patch-2.7.5.recipe
+++ b/sys-devel/patch/patch-2.7.5.recipe
@@ -24,9 +24,9 @@ REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:awk
-	cmd:make
 	cmd:gcc
 	cmd:git
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-fs/dmg2img/dmg2img-1.6.7.recipe b/sys-fs/dmg2img/dmg2img-1.6.7.recipe
index 7bc36a2f4..8e9f6e06b 100644
--- a/sys-fs/dmg2img/dmg2img-1.6.7.recipe
+++ b/sys-fs/dmg2img/dmg2img-1.6.7.recipe
@@ -24,16 +24,16 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	lib:libz
 	lib:libbz2
 	lib:libcrypto
+	lib:libz
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libz
 	devel:libbz2
 	devel:libcrypto
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/sys-fs/dosfstools/dosfstools-4.1.recipe b/sys-fs/dosfstools/dosfstools-4.1.recipe
index f1ab8d81c..fcd08e9af 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.recipe
+++ b/sys-fs/dosfstools/dosfstools-4.1.recipe
@@ -34,8 +34,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-fs/gphotofs/gphotofs-1.0git.recipe b/sys-fs/gphotofs/gphotofs-1.0git.recipe
index 4b13b4014..ba075bfe8 100644
--- a/sys-fs/gphotofs/gphotofs-1.0git.recipe
+++ b/sys-fs/gphotofs/gphotofs-1.0git.recipe
@@ -30,17 +30,17 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	userland_fs
 	devel:libglib_2.0$secondaryArchSuffix >= 0.38
-	devel:libiconv$secondaryArchSuffix
 	devel:libgphoto2$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpopt$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
diff --git a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
index e7c851753..c90b60d0e 100644
--- a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
+++ b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	userland_fs
-	lib:libglib_2.0$secondaryArchSuffix >= 0.38
 	cmd:ssh
+	lib:libglib_2.0$secondaryArchSuffix >= 0.38
 	"
 
 BUILD_REQUIRES="
@@ -38,12 +38,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	userland_fs
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:ssh
-	userland_fs
 	"
 
 BUILD()
diff --git a/sys-libs/gdbm/gdbm-1.13.recipe b/sys-libs/gdbm/gdbm-1.13.recipe
index 182a26027..2e6dfd7e0 100644
--- a/sys-libs/gdbm/gdbm-1.13.recipe
+++ b/sys-libs/gdbm/gdbm-1.13.recipe
@@ -26,8 +26,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
 	"
@@ -43,15 +43,15 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libintl$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:awk
 	cmd:aclocal
 	cmd:autoconf
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe
index 3151b5f8e..deff828d9 100644
--- a/sys-libs/glu/glu-9.0.0.recipe
+++ b/sys-libs/glu/glu-9.0.0.recipe
@@ -34,9 +34,9 @@ BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:awk
 	cmd:make
 	cmd:sed
 	"
diff --git a/sys-libs/hwloc/hwloc-1.11.8.recipe b/sys-libs/hwloc/hwloc-1.11.8.recipe
index b20ab51a5..75ff215d4 100644
--- a/sys-libs/hwloc/hwloc-1.11.8.recipe
+++ b/sys-libs/hwloc/hwloc-1.11.8.recipe
@@ -40,7 +40,6 @@ libVersionCompat="$libVersion compat >= 5"
 
 PROVIDES="
 	hwloc$secondaryArchSuffix = $portVersion
-	lib:libhwloc$secondaryArchSuffix = $libVersionCompat
 	cmd:hwloc_annotate$secondaryArchSuffix = $portVersion
 	cmd:hwloc_assembler$secondaryArchSuffix = $portVersion
 	cmd:hwloc_assembler_remote$secondaryArchSuffix = $portVersion
@@ -58,11 +57,12 @@ PROVIDES="
 	cmd:hwloc_ps$secondaryArchSuffix = $portVersion
 	cmd:lstopo$secondaryArchSuffix = $portVersion
 	cmd:lstopo_no_graphics$secondaryArchSuffix = $portVersion
+	lib:libhwloc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
 	lib:libltdl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
diff --git a/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe
index c92f336fa..3545cef3b 100644
--- a/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe
+++ b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe
@@ -57,8 +57,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.45
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
diff --git a/sys-libs/libatomic_ops/libatomic_ops-7.4.4.recipe b/sys-libs/libatomic_ops/libatomic_ops-7.4.4.recipe
index 611e091ac..00e60623d 100644
--- a/sys-libs/libatomic_ops/libatomic_ops-7.4.4.recipe
+++ b/sys-libs/libatomic_ops/libatomic_ops-7.4.4.recipe
@@ -34,13 +34,13 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:gawk
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool$secondaryArchSuffix
 	cmd:make
 	cmd:sed
-	cmd:libtool$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sys-libs/mtdev/mtdev-1.1.5.recipe b/sys-libs/mtdev/mtdev-1.1.5.recipe
index bb0fe40c6..d5facd37d 100644
--- a/sys-libs/mtdev/mtdev-1.1.5.recipe
+++ b/sys-libs/mtdev/mtdev-1.1.5.recipe
@@ -34,10 +34,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:pkg_config$secondaryArchSuffix
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:awk
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe
index 2d727d0ce..614a352c3 100644
--- a/sys-libs/slang/slang-2.2.4.recipe
+++ b/sys-libs/slang/slang-2.2.4.recipe
@@ -25,14 +25,14 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	slang = $portVersion compat >= 2.2
-	lib:libslang = $portVersion compat >= 2.2
 	cmd:slsh = $portVersion compat >= 2.2
+	lib:libslang = $portVersion compat >= 2.2
 	"
 REQUIRES="
 	haiku
+	lib:libiconv
 	lib:libncurses
 	lib:libpcre
-	lib:libiconv
 	lib:libpng16
 	lib:libz
 	"
@@ -47,9 +47,9 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku_devel
+	devel:libiconv
 	devel:libncurses
 	devel:libpcre
-	devel:libiconv
 	devel:libpng16
 	devel:libz
 	"
diff --git a/sys-libs/slang/slang-2.3.1a.recipe b/sys-libs/slang/slang-2.3.1a.recipe
index ef1f63733..e86306b31 100644
--- a/sys-libs/slang/slang-2.3.1a.recipe
+++ b/sys-libs/slang/slang-2.3.1a.recipe
@@ -26,14 +26,14 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	slang$secondaryArchSuffix = $portVersion compat >= 2.3
-	lib:libslang$secondaryArchSuffix = $portVersion compat >= 2.3
 	cmd:slsh$secondaryArchSuffix = $portVersion compat >= 2.3
+	lib:libslang$secondaryArchSuffix = $portVersion compat >= 2.3
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -48,9 +48,9 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
diff --git a/sys-libs/tinygl/tinygl-0.4.recipe b/sys-libs/tinygl/tinygl-0.4.recipe
index 19f47c490..31edd1db0 100644
--- a/sys-libs/tinygl/tinygl-0.4.recipe
+++ b/sys-libs/tinygl/tinygl-0.4.recipe
@@ -44,8 +44,8 @@ SECONDARY_ARCHITECTURES=""
 
 PROVIDES="
 	tinygl = $portVersion
-	devel:libtinygl = $portVersion
 	devel:libglview = $portVersion
+	devel:libtinygl = $portVersion
 	"
 REQUIRES="
 	haiku
diff --git a/sys-process/cronie/cronie-1.5.1.recipe b/sys-process/cronie/cronie-1.5.1.recipe
index 051cf2fd4..415af2768 100644
--- a/sys-process/cronie/cronie-1.5.1.recipe
+++ b/sys-process/cronie/cronie-1.5.1.recipe
@@ -30,9 +30,9 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoreconf
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
diff --git a/sys-process/dcron/dcron-4.5.recipe b/sys-process/dcron/dcron-4.5.recipe
index d7793283b..dc40bf3a0 100644
--- a/sys-process/dcron/dcron-4.5.recipe
+++ b/sys-process/dcron/dcron-4.5.recipe
@@ -40,8 +40,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
 	cmd:as
+	cmd:gcc
 	cmd:make
 	"
 
diff --git a/sys-process/htop/htop-2.0.2.recipe b/sys-process/htop/htop-2.0.2.recipe
index 82d375224..b5b77081d 100644
--- a/sys-process/htop/htop-2.0.2.recipe
+++ b/sys-process/htop/htop-2.0.2.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoreconf
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
 	"