dev-*: reorder sections.

2026-04-23 04:00:05 +02:00 · 2018-08-08 16:18:18 +02:00
parent 2942715422
commit 0d782eba67
215 changed files with 765 additions and 770 deletions
--- a/dev-lang/camlp5/camlp5-6.12.recipe
+++ b/dev-lang/camlp5/camlp5-6.12.recipe
@@ -30,9 +30,9 @@ REQUIRES="

 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:make
-	cmd:gcc
 	ocaml
+	cmd:gcc
+	cmd:make
 	"

 BUILD()
--- a/dev-lang/camlp5/camlp5-7.05.recipe
+++ b/dev-lang/camlp5/camlp5-7.05.recipe
@@ -32,8 +32,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
+	cmd:make
 	cmd:ocaml
 	"

--- a/dev-lang/erlang/erlang-20.1.recipe
+++ b/dev-lang/erlang/erlang-20.1.recipe
@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:libtool
 	cmd:gcc
+	cmd:libtool
 	cmd:perl
 	#cmd:wx_config
 	lib:libcrypto
--- a/dev-lang/fpc_bootstrap/fpc_bin-2.6.4.recipe
+++ b/dev-lang/fpc_bootstrap/fpc_bin-2.6.4.recipe
@@ -14,8 +14,6 @@ DISABLE_SOURCE_PACKAGE="YES"

 PROVIDES="
 	fpc_bin = $portVersion
-	cmd:fpc = $portVersion
-	cmd:ppc386 = $portVersion
 	cmd:bin2obj = $portVersion
 	cmd:chmcmd = $portVersion
 	cmd:chmls = $portVersion
@@ -23,6 +21,7 @@ PROVIDES="
 	cmd:delp = $portVersion
 	cmd:fd2pascal = $portVersion
 	cmd:fp = $portVersion
+	cmd:fpc = $portVersion
 	cmd:fpcjres = $portVersion
 	cmd:fpclasschart = $portVersion
 	cmd:fpcmake = $portVersion
@@ -44,6 +43,7 @@ PROVIDES="
 	cmd:pas2ut = $portVersion
 	cmd:plex = $portVersion
 	cmd:postw32 = $portVersion
+	cmd:ppc386 = $portVersion
 	cmd:ppdep = $portVersion
 	cmd:ppudump = $portVersion
 	cmd:ppufiles = $portVersion
--- a/dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe
+++ b/dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe
@@ -14,15 +14,18 @@ DISABLE_SOURCE_PACKAGE="YES"

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

 PROVIDES="
 	fpc_bin = $portVersion
-	cmd:fpc = $portVersion
-	cmd:ppc386 = $portVersion
 	cmd:bin2obj = $portVersion
 	cmd:chmcmd = $portVersion
 	cmd:chmls = $portVersion
+	cmd:cvsco.tdf = $portVersion
+	cmd:cvsdiff.tdf = $portVersion
+	cmd:cvsup.tdf = $portVersion
 	cmd:data2inc = $portVersion
 	cmd:delp = $portVersion
 	cmd:fd2pascal = $portVersion
 	cmd:fp = $portVersion
+	cmd:fp.ans = $portVersion
+	cmd:fpc = $portVersion
 	cmd:fpcjres = $portVersion
 	cmd:fpclasschart = $portVersion
 	cmd:fpcmake = $portVersion
@@ -44,10 +47,14 @@ PROVIDES="
 	cmd:fpdoc = $portVersion
 	cmd:fppkg = $portVersion
 	cmd:fprcp = $portVersion
+	cmd:gplprog.pt = $portVersion
+	cmd:gplunit.pt = $portVersion
+	cmd:grep.tdf = $portVersion
 	cmd:h2pas = $portVersion
 	cmd:h2paspp = $portVersion
 	cmd:instantfpc = $portVersion
 	cmd:makeskel = $portVersion
+	cmd:makeskel.rsj = $portVersion
 	cmd:mkarmins = $portVersion
 	cmd:mkinsadd = $portVersion
 	cmd:mkx86ins = $portVersion
@@ -56,27 +63,20 @@ PROVIDES="
 	cmd:pas2ut = $portVersion
 	cmd:plex = $portVersion
 	cmd:postw32 = $portVersion
+	cmd:ppc386 = $portVersion
 	cmd:ppdep = $portVersion
 	cmd:ppudump = $portVersion
 	cmd:ppufiles = $portVersion
 	cmd:ppumove = $portVersion
+	cmd:program.pt = $portVersion
 	cmd:ptop = $portVersion
+	cmd:ptop.rsj = $portVersion
 	cmd:pyacc = $portVersion
 	cmd:rmcvsdir = $portVersion
 	cmd:rstconv = $portVersion
-	cmd:unitdiff = $portVersion
-	cmd:cvsco.tdf = $portVersion
-	cmd:cvsdiff.tdf = $portVersion
-	cmd:cvsup.tdf = $portVersion
-	cmd:fp.ans = $portVersion
-	cmd:gplprog.pt = $portVersion
-	cmd:gplunit.pt = $portVersion
-	cmd:grep.tdf = $portVersion
-	cmd:makeskel.rsj = $portVersion
-	cmd:program.pt = $portVersion
-	cmd:ptop.rsj = $portVersion
 	cmd:tpgrep.tdf = $portVersion
 	cmd:unit.pt = $portVersion
+	cmd:unitdiff = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
--- a/dev-lang/lua/lua51-5.1.5.recipe
+++ b/dev-lang/lua/lua51-5.1.5.recipe
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc${secondaryArchSuffix}
+	cmd:make
 	"

 BUILD()
--- a/dev-lang/lua/lua52-5.2.4.recipe
+++ b/dev-lang/lua/lua52-5.2.4.recipe
@@ -40,8 +40,8 @@ CONFLICTS_devel="

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-lang/luajit/luajit-2.0.4.recipe
+++ b/dev-lang/luajit/luajit-2.0.4.recipe
@@ -16,9 +16,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/luajit/luajit-2.1.0~beta3.recipe
+++ b/dev-lang/luajit/luajit-2.1.0~beta3.recipe
@@ -15,9 +15,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/nasm/nasm-2.11.02.recipe
+++ b/dev-lang/nasm/nasm-2.11.02.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:sed
--- a/dev-lang/nasm/nasm-2.11.08.recipe
+++ b/dev-lang/nasm/nasm-2.11.08.recipe
@@ -28,9 +28,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:sed
--- a/dev-lang/nasm/nasm-2.12.01.recipe
+++ b/dev-lang/nasm/nasm-2.12.01.recipe
@@ -31,9 +31,9 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc
 	cmd:ld
-	cmd:awk
 	cmd:make
 	cmd:sed
 	"
--- a/dev-lang/nhc98/nhc98-1.22.recipe
+++ b/dev-lang/nhc98/nhc98-1.22.recipe
@@ -53,8 +53,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:diff
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:xargs
 	"

--- a/dev-lang/orc/orc-0.4.27.recipe
+++ b/dev-lang/orc/orc-0.4.27.recipe
@@ -36,8 +36,8 @@ PROVIDES_devel="
 	devel:liborc_test_0.4$secondaryArchSuffix = 0.27.0 compat >= 0
 	"
 REQUIRES_devel="
-	orc$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	orc$secondaryArchSuffix == $portVersion base
 	"

 BUILD_REQUIRES="
--- a/dev-lang/php/php-5.6.33.recipe
+++ b/dev-lang/php/php-5.6.33.recipe
@@ -32,31 +32,31 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	lib:libicuuc
-	lib:libxml2
-	lib:libz
 	lib:libbz2
-	lib:libssl
 	lib:libcrypto
 	lib:libcurl
+	lib:libfreetype
+	lib:libicuuc
+	lib:libjpeg
 	lib:libpcre
 	lib:libpng16
-	lib:libjpeg
-	lib:libfreetype
+	lib:libssl
+	lib:libxml2
+	lib:libz
 	"

 BUILD_REQUIRES="
-	devel:libicuuc
-	devel:libxml2
-	devel:libz
 	devel:libbz2
-	devel:libssl
 	devel:libcrypto
 	devel:libcurl
+	devel:libfreetype
+	devel:libicuuc
+	devel:libjpeg
 	devel:libpcre
 	devel:libpng16
-	devel:libjpeg
-	devel:libfreetype
+	devel:libssl
+	devel:libxml2
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
@@ -64,12 +64,12 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:bison
 	cmd:dos2unix
+	cmd:freetype_config
 	cmd:gcc
+	cmd:icu_config
 	cmd:make
 	cmd:pkg_config
-	cmd:freetype_config
 	cmd:xml2_config
-	cmd:icu_config
 	"

 PATCH()
--- a/dev-lang/python/python-2.7.12.recipe
+++ b/dev-lang/python/python-2.7.12.recipe
@@ -30,9 +30,9 @@ PROVIDES="
 	cmd:pydoc = $portVersion compat >= 2.7
 	cmd:python = $portVersion compat >= 2.7
 	cmd:python2 = $portVersion compat >= 2.7
-	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python2.7 = $portVersion compat >= 2.7
 	cmd:python2.7_config = $portVersion compat >= 2.7
+	cmd:python2_config = $portVersion compat >= 2.7
 	cmd:python_config = $portVersion compat >= 2.7
 	cmd:smtpd.py = $portVersion compat >= 2.7
 	devel:libpython2.7 = 1.0
@@ -41,21 +41,21 @@ PROVIDES="
 REQUIRES="
 	haiku
 	lib:libbz2
+	lib:libffi
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
-	lib:libffi
 	"

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

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

 BUILD_REQUIRES="
 	devel:libbz2
 	devel:libffi
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="
--- a/dev-lang/python/python3-3.4.3.recipe
+++ b/dev-lang/python/python3-3.4.3.recipe
@@ -33,16 +33,16 @@ PROVIDES="
 	cmd:pydoc3 = $portVersion compat >= 3.4
 	cmd:pydoc3.4 = $portVersion compat >= 3.4
 	cmd:python3 = $portVersion compat >= 3.4
-	cmd:python3_config = $portVersion compat >= 3.4
 	cmd:python3.4 = $portVersion compat >= 3.4
 	cmd:python3.4_config = $portVersion compat >= 3.4
 	cmd:python3.4m = $portVersion compat >= 3.4
 	cmd:python3.4m_config = $portVersion compat >= 3.4
+	cmd:python3_config = $portVersion compat >= 3.4
 	cmd:pyvenv = $portVersion compat >= 3.4
 	cmd:pyvenv_3.4 = $portVersion compat >= 3.4
 	devel:libpython3.4m = 1.0
-	lib:libpython3.4m = 1.0
 	lib:libpython3 = 3.4
+	lib:libpython3.4m = 1.0
 	"
 REQUIRES="
 	haiku
@@ -50,9 +50,9 @@ REQUIRES="
 	lib:libbz2
 	lib:libexpat
 	lib:libncurses
-	lib:libssl
 	lib:libreadline
 	lib:libsqlite3
+	lib:libssl
 	lib:libz
 	"

@@ -60,9 +60,9 @@ BUILD_REQUIRES="
 	devel:libbz2
 	devel:libexpat
 	devel:libncurses
-	devel:libssl
 	devel:libreadline
 	devel:libsqlite3
+	devel:libssl
 	devel:libz
 	"
 BUILD_PREREQUIRES="
@@ -73,8 +73,8 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:pkg_config
 	cmd:make
+	cmd:pkg_config
 	cmd:python
 	"

--- a/dev-lang/r/r-3.4.3.recipe
+++ b/dev-lang/r/r-3.4.3.recipe
@@ -28,6 +28,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:less
 	lib:libbz2$secondaryArchSuffix
 #	lib:libcairo$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -53,7 +54,6 @@ REQUIRES="
 	lib:libtcl8.5$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	cmd:less
 	"

 BUILD_REQUIRES="
@@ -102,8 +102,8 @@ BUILD_PREREQUIRES="
 	cmd:pwd
 	cmd:sed
 	cmd:texi2any
-	cmd:yacc
 	cmd:which
+	cmd:yacc
 	"

 BUILD()
--- a/dev-lang/ruby/ruby-2.2.10.recipe
+++ b/dev-lang/ruby/ruby-2.2.10.recipe
@@ -63,13 +63,12 @@ BUILD_REQUIRES="
 	devel:libncursesw$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:bison
-	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.10.0.recipe
+++ b/dev-lang/rust/rust-1.10.0.recipe
@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/rust/rust-1.11.0.recipe
+++ b/dev-lang/rust/rust-1.11.0.recipe
@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/rust/rust-1.12.1.recipe
+++ b/dev-lang/rust/rust-1.12.1.recipe
@@ -30,9 +30,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/rust/rust-1.13.0.recipe
+++ b/dev-lang/rust/rust-1.13.0.recipe
@@ -32,9 +32,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/rust/rust-1.14.0.recipe
+++ b/dev-lang/rust/rust-1.14.0.recipe
@@ -32,9 +32,9 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/rust/rust-1.16.0.recipe
+++ b/dev-lang/rust/rust-1.16.0.recipe
@@ -37,10 +37,10 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -63,8 +63,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.17.0.recipe
+++ b/dev-lang/rust/rust-1.17.0.recipe
@@ -46,11 +46,11 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -72,8 +72,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.18.0.recipe
+++ b/dev-lang/rust/rust-1.18.0.recipe
@@ -53,12 +53,12 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rls$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -80,8 +80,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.19.0.recipe
+++ b/dev-lang/rust/rust-1.19.0.recipe
@@ -51,11 +51,11 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -77,8 +77,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.20.0.recipe
+++ b/dev-lang/rust/rust-1.20.0.recipe
@@ -50,11 +50,11 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rust_gdb = $portVersion
 	cmd:rust_lldb = $portVersion
-	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -76,8 +76,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.21.0.recipe
+++ b/dev-lang/rust/rust-1.21.0.recipe
@@ -51,12 +51,12 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:rls = $rlsVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -78,8 +78,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.27.0.recipe
+++ b/dev-lang/rust/rust-1.27.0.recipe
@@ -78,13 +78,13 @@ SECONDARY_ARCHITECTURES="?x86"

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

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
-	cmd:rustc = $portVersion
-	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
-	cmd:rust_lldb = $portVersion
 	cmd:cargo$secondaryArchSuffix = $cargoVersion
 	cmd:cargo_fmt = $cargoVersion
 	cmd:rls = $rlsVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
 	cmd:rustfmt = $rustfmtVersion
 	"
 REQUIRES="
@@ -47,8 +47,8 @@ BUILD_PREREQUIRES="
 	cmd:cmp
 	cmd:file
 	cmd:find
-	cmd:git
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
--- a/dev-lang/rust/rust-1.9.0.recipe
+++ b/dev-lang/rust/rust-1.9.0.recipe
@@ -36,9 +36,9 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	rust$secondaryArchSuffix = $portVersion
+	cmd:rust_gdb = $portVersion
 	cmd:rustc = $portVersion
 	cmd:rustdoc = $portVersion
-	cmd:rust_gdb = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -48,16 +48,16 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:file
+	cmd:find
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	cmd:sed
-	cmd:find
-	cmd:grep
-	cmd:file
-	cmd:git
 	cmd:tar
 	cmd:which
 	"
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
@@ -34,16 +34,16 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
-	cmd:awk
-	cmd:python
-	cmd:xargs
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:python
 	cmd:sed
+	cmd:xargs
 	cmd:zip
 	"

--- a/dev-lang/squirrel/squirrel-3.1.recipe
+++ b/dev-lang/squirrel/squirrel-3.1.recipe
@@ -25,8 +25,8 @@ REQUIRES="

 PROVIDES_devel="
 	squirrel${secondaryArchSuffix}_devel = $portVersion
-	devel:libsquirrel$secondaryArchSuffix = $portVersion
 	devel:libsqstdlib$secondaryArchSuffix = $portVersion
+	devel:libsquirrel$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	squirrel$secondaryArchSuffix == $portVersion base
@@ -34,8 +34,8 @@ REQUIRES_devel="

 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
+++ b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
@@ -22,27 +22,27 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	swi_prolog$secondaryArchSuffix = $portVersion
 	cmd:swipl$secondaryArchSuffix
-	cmd:swipl_rc$secondaryArchSuffix
 	cmd:swipl_ld$secondaryArchSuffix
+	cmd:swipl_rc$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
-	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix >= 6
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 6
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:autoreconf
 	cmd:make
 	"

--- a/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe
+++ b/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe
@@ -22,27 +22,27 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	swi_prolog$secondaryArchSuffix = $portVersion
 	cmd:swipl$secondaryArchSuffix
-	cmd:swipl_rc$secondaryArchSuffix
 	cmd:swipl_ld$secondaryArchSuffix
+	cmd:swipl_rc$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
-	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix >= 6
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 6
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:autoreconf
 	cmd:make
 	"

--- a/dev-lang/swift_lang/swift_lang-3.1.recipe
+++ b/dev-lang/swift_lang/swift_lang-3.1.recipe
@@ -37,8 +37,12 @@ SECONDARY_ARCHITECTURES="!x86"

 PROVIDES="
 	swift_lang$secondaryArchSuffix = $portVersion
+	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
+	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
+	cmd:sil_nm$secondaryArchSuffix = $portVersion
+	cmd:sil_opt$secondaryArchSuffix = $portVersion
+	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
 	cmd:swift$secondaryArchSuffix = $portVersion
-	cmd:swiftc$secondaryArchSuffix = $portVersion
 	cmd:swift_api_digester$secondaryArchSuffix = $portVersion
 	cmd:swift_autolink_extract$secondaryArchSuffix = $portVersion
 	cmd:swift_demangle$secondaryArchSuffix = $portVersion
@@ -47,14 +51,11 @@ PROVIDES="
 	cmd:swift_llvm_opt$secondaryArchSuffix = $portVersion
 	cmd:swift_reflection_dump$secondaryArchSuffix = $portVersion
 	cmd:swift_remoteast_test$secondaryArchSuffix = $portVersion
-	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
-	cmd:sil_opt$secondaryArchSuffix = $portVersion
-	cmd:sil_nm$secondaryArchSuffix = $portVersion
-	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
-	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
+	cmd:swiftc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	llvm$secondaryArchSuffix >= 3.7.0 base
 	lib:libcharset$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
 	lib:libexecinfo$secondaryArchSuffix
@@ -62,7 +63,6 @@ REQUIRES="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	llvm$secondaryArchSuffix >= 3.7.0 base
 	lib:libncurses$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libuuid$secondaryArchSuffix
@@ -72,10 +72,10 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libcharset$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
-	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libgcc$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicudata$secondaryArchSuffix
@@ -100,8 +100,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
-	cmd:swig
 	cmd:sed
+	cmd:swig
 	cmd:which
 	"

--- a/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe
+++ b/dev-lang/swift_lang/swift_lang-4.1.0~git.recipe
@@ -39,14 +39,13 @@ SECONDARY_ARCHITECTURES="!x86"

 PROVIDES="
 	swift_lang$secondaryArchSuffix = $portVersion
+	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
 	cmd:sil_func_extractor$secondaryArchSuffix = $portVersion
 	cmd:sil_llvm_gen$secondaryArchSuffix = $portVersion
-	cmd:sil_opt$secondaryArchSuffix = $portVersion
 	cmd:sil_nm$secondaryArchSuffix = $portVersion
+	cmd:sil_opt$secondaryArchSuffix = $portVersion
 	cmd:sil_passpipeline_dumper$secondaryArchSuffix = $portVersion
-	cmd:lldb_moduleimport_test$secondaryArchSuffix = $portVersion
 	cmd:swift$secondaryArchSuffix = $portVersion
-	cmd:swiftc$secondaryArchSuffix = $portVersion
 	cmd:swift_api_digester$secondaryArchSuffix = $portVersion
 	cmd:swift_api_dump.py$secondaryArchSuffix = $portVersion
 	cmd:swift_autolink_extract$secondaryArchSuffix = $portVersion
@@ -59,9 +58,11 @@ PROVIDES="
 	cmd:swift_reflection_test_haiku_x86_64$secondaryArchSuffix = $portVersion
 	cmd:swift_remoteast_test$secondaryArchSuffix = $portVersion
 	cmd:swift_syntax_test$secondaryArchSuffix = $portVersion
+	cmd:swiftc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	llvm$secondaryArchSuffix >= 5.0.0
 	lib:libatomic$secondaryArchSuffix
 	lib:libcharset$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
@@ -70,7 +71,6 @@ REQUIRES="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	llvm$secondaryArchSuffix >= 5.0.0
 	lib:libncurses$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libuuid$secondaryArchSuffix
@@ -80,10 +80,10 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libcharset$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
-	gcc_syslibs$secondaryArchSuffix_devel
 	devel:libgcc$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicudata$secondaryArchSuffix
@@ -108,8 +108,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
-	cmd:swig
 	cmd:sed
+	cmd:swig
 	cmd:which
 	"

--- a/dev-lang/swig/swig-3.0.12.recipe
+++ b/dev-lang/swig/swig-3.0.12.recipe
@@ -29,8 +29,8 @@ SECONDARY_ARCHITECTURES="x86"

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

 BUILD()
--- a/dev-lang/tcl/tcl-8.5.9.recipe
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -39,12 +39,12 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:autoconf
-	cmd:make
-	cmd:gcc
-	cmd:ld
 	cmd:find
-	cmd:sed
+	cmd:gcc
 	cmd:grep
+	cmd:ld
+	cmd:make
+	cmd:sed
 	"

 BUILD()
--- a/dev-lang/yab/yab-1.7.5.6.recipe
+++ b/dev-lang/yab/yab-1.7.5.6.recipe
@@ -17,8 +17,8 @@ ARCHITECTURES="x86_gcc2 !x86 x86_64"
 PROVIDES="
 	yab = $portVersion
 	cmd:yab = $portVersion
-	lib:libyab = $portVersion
 	devel:libyab = $portVersion
+	lib:libyab = $portVersion
 	"
 REQUIRES="
 	haiku