diff --git a/gnome-base/gnome_common/gnome_common-3.18.0.recipe b/gnome-base/gnome_common/gnome_common-3.18.0.recipe
index dcb08719c..933fdb192 100644
--- a/gnome-base/gnome_common/gnome_common-3.18.0.recipe
+++ b/gnome-base/gnome_common/gnome_common-3.18.0.recipe
@@ -24,10 +24,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:automake
 	cmd:autoconf
+	cmd:automake
 	cmd:autoreconf
+	cmd:make
 	"
 
 BUILD()
diff --git a/lxde-base/menu_cache/menu_cache-1.1.0.recipe b/lxde-base/menu_cache/menu_cache-1.1.0.recipe
index 747960c56..17c6af963 100644
--- a/lxde-base/menu_cache/menu_cache-1.1.0.recipe
+++ b/lxde-base/menu_cache/menu_cache-1.1.0.recipe
@@ -24,8 +24,8 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	menu_cache$secondaryArchSuffix = $portVersion
-	lib:libmenu_cache$secondaryArchSuffix = $portVersion
 	cmd:menu_cached$secondaryArchSuffix = $portVersion
+	lib:libmenu_cache$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/sci-astronomy/celestia/celestia-1.6.1.recipe b/sci-astronomy/celestia/celestia-1.6.1.recipe
index 64d9ad189..95ef7775e 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.recipe
+++ b/sci-astronomy/celestia/celestia-1.6.1.recipe
@@ -29,29 +29,29 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lua$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	lib:libglut$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	lua${secondaryArchSuffix}_devel
-	devel:libintl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	devel:libglut$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize
 	cmd:gettext
+	cmd:libtoolize
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
diff --git a/sci-electronics/fritzing/fritzing-0.9.3b.recipe b/sci-electronics/fritzing/fritzing-0.9.3b.recipe
index 77d58c803..9ddc39119 100644
--- a/sci-electronics/fritzing/fritzing-0.9.3b.recipe
+++ b/sci-electronics/fritzing/fritzing-0.9.3b.recipe
@@ -34,12 +34,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgit2$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libminizip$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Svg$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libminizip$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -48,17 +48,17 @@ BUILD_REQUIRES="
 	devel:libboost_system$secondaryArchSuffix
 	devel:libgit2$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
+	devel:libminizip$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5PrintSupport$secondaryArchSuffix
 	devel:libQt5Svg$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libminizip$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:g++$secondaryArchSuffix
 	cmd:find
+	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:qmake$secondaryArchSuffix >= 5
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.6.recipe b/sci-electronics/qelectrotech/qelectrotech-0.6.recipe
index 507b12321..87592d456 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.6.recipe
+++ b/sci-electronics/qelectrotech/qelectrotech-0.6.recipe
@@ -41,25 +41,25 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Svg$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Sql$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5Sql$secondaryArchSuffix
+	lib:libQt5Svg$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:find
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:qmake$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sci-electronics/verilator/verilator-3.864.recipe b/sci-electronics/verilator/verilator-3.864.recipe
index 6322b45f1..1464fd76d 100644
--- a/sci-electronics/verilator/verilator-3.864.recipe
+++ b/sci-electronics/verilator/verilator-3.864.recipe
@@ -31,12 +31,12 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:perl
+	cmd:awk
 	cmd:bison
 	cmd:flex
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:awk
+	cmd:perl
 	"
 
 BUILD()
diff --git a/sci-libs/arpack/arpack-3.5.0.recipe b/sci-libs/arpack/arpack-3.5.0.recipe
index 4ccd6e94a..39605e52d 100644
--- a/sci-libs/arpack/arpack-3.5.0.recipe
+++ b/sci-libs/arpack/arpack-3.5.0.recipe
@@ -56,9 +56,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
-	cmd:gfortran$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
+	cmd:make
 	"
 
 defineDebugInfoPackage arpack$secondaryArchSuffix \
diff --git a/sci-libs/arpack/arpack-3.6.2.recipe b/sci-libs/arpack/arpack-3.6.2.recipe
index 1d185d55f..691777eba 100644
--- a/sci-libs/arpack/arpack-3.6.2.recipe
+++ b/sci-libs/arpack/arpack-3.6.2.recipe
@@ -56,9 +56,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
-	cmd:gfortran$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
+	cmd:make
 	"
 
 defineDebugInfoPackage arpack$secondaryArchSuffix \
diff --git a/sci-libs/cblas_reference/cblas_reference-20110120.recipe b/sci-libs/cblas_reference/cblas_reference-20110120.recipe
index 6ec85a78e..1ec197189 100644
--- a/sci-libs/cblas_reference/cblas_reference-20110120.recipe
+++ b/sci-libs/cblas_reference/cblas_reference-20110120.recipe
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	devel:libopenblas$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gfortran$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
 	cmd:make
 	cmd:strip$secondaryArchSuffix
 	"
diff --git a/sci-libs/fftw/fftw-3.3.7.recipe b/sci-libs/fftw/fftw-3.3.7.recipe
index ed486c425..0eac0f69b 100644
--- a/sci-libs/fftw/fftw-3.3.7.recipe
+++ b/sci-libs/fftw/fftw-3.3.7.recipe
@@ -26,11 +26,11 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	fftw$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:fftw_wisdom$secondaryArchSuffix
+	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
+	cmd:fftwf_wisdom$secondaryArchSuffix
 	lib:libfftw3$secondaryArchSuffix = 3.5.7 compat >= 3
 	lib:libfftw3f$secondaryArchSuffix = 3.5.7 compat >= 3
-	cmd:fftw_wisdom$secondaryArchSuffix
-	cmd:fftwf_wisdom$secondaryArchSuffix
-	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -49,10 +49,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:awk
 	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
diff --git a/sci-libs/fftw/fftw-3.3.8.recipe b/sci-libs/fftw/fftw-3.3.8.recipe
index 199423c5c..a5202c88e 100644
--- a/sci-libs/fftw/fftw-3.3.8.recipe
+++ b/sci-libs/fftw/fftw-3.3.8.recipe
@@ -28,11 +28,11 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	fftw$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:fftw_wisdom$secondaryArchSuffix
+	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
+	cmd:fftwf_wisdom$secondaryArchSuffix
 	lib:libfftw3$secondaryArchSuffix = $libVersionCompat
 	lib:libfftw3f$secondaryArchSuffix = $libVersionCompat
-	cmd:fftw_wisdom$secondaryArchSuffix
-	cmd:fftwf_wisdom$secondaryArchSuffix
-	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -52,12 +52,12 @@ BUILD_REQUIRES="
 	devel:libgfortran$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:awk
 	cmd:cmp
 	cmd:diff
 	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	"
diff --git a/sci-libs/geos/geos-3.4.2.recipe b/sci-libs/geos/geos-3.4.2.recipe
index c2891d728..9b294cf74 100644
--- a/sci-libs/geos/geos-3.4.2.recipe
+++ b/sci-libs/geos/geos-3.4.2.recipe
@@ -31,8 +31,8 @@ REQUIRES="
 PROVIDES_devel="
 	geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.4
 	cmd:geos_config$secondaryArchSuffix
-	devel:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4
 	devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.4
+	devel:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4
 	devel:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1
 	"
 REQUIRES_devel="
@@ -46,11 +46,11 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-	cmd:find
 	"
 
 BUILD()
diff --git a/sci-libs/geos/geos-3.6.2.recipe b/sci-libs/geos/geos-3.6.2.recipe
index a7bbfdf34..8b75bf174 100644
--- a/sci-libs/geos/geos-3.6.2.recipe
+++ b/sci-libs/geos/geos-3.6.2.recipe
@@ -31,8 +31,8 @@ REQUIRES="
 PROVIDES_devel="
 	geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.6
 	cmd:geos_config$secondaryArchSuffix
-	devel:libgeos_3.6.2$secondaryArchSuffix = $portVersion compat >= 3.6
 	devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.6
+	devel:libgeos_3.6.2$secondaryArchSuffix = $portVersion compat >= 3.6
 	devel:libgeos_c$secondaryArchSuffix = 1.10.2 compat >= 1
 	"
 REQUIRES_devel="
@@ -46,11 +46,11 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-	cmd:find
 	"
 
 BUILD()
diff --git a/sci-libs/gsl/gsl-1.16.recipe b/sci-libs/gsl/gsl-1.16.recipe
index 689d85476..38280b78a 100644
--- a/sci-libs/gsl/gsl-1.16.recipe
+++ b/sci-libs/gsl/gsl-1.16.recipe
@@ -90,7 +90,6 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:find
 	"
 
 defineDebugInfoPackage gsl$secondaryArchSuffix \
diff --git a/sci-libs/hdf5/hdf5-1.10.1.recipe b/sci-libs/hdf5/hdf5-1.10.1.recipe
index 324ec8b28..fd505383c 100644
--- a/sci-libs/hdf5/hdf5-1.10.1.recipe
+++ b/sci-libs/hdf5/hdf5-1.10.1.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	cmd:h52gif$secondaryArchSuffix
 	cmd:h5c++$secondaryArchSuffix
 	cmd:h5cc$secondaryArchSuffix
-	cmd:h5copy$secondaryArchSuffix
 	cmd:h5clear$secondaryArchSuffix
+	cmd:h5copy$secondaryArchSuffix
 	cmd:h5debug$secondaryArchSuffix
-	cmd:h5format_convert$secondaryArchSuffix
 	cmd:h5diff$secondaryArchSuffix
 	cmd:h5dump$secondaryArchSuffix
 	cmd:h5fc$secondaryArchSuffix
+	cmd:h5format_convert$secondaryArchSuffix
 	cmd:h5import$secondaryArchSuffix
 	cmd:h5jam$secondaryArchSuffix
 	cmd:h5ls$secondaryArchSuffix
@@ -92,10 +92,10 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:awk
+	cmd:g++$secondaryArchSuffix
 	cmd:gettext$secondaryArchSuffix
 	cmd:gfortran$secondaryArchSuffix
 	cmd:grep
-	cmd:g++$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
diff --git a/sci-libs/lapack/lapack-3.8.0.recipe b/sci-libs/lapack/lapack-3.8.0.recipe
index f1bf4b2a8..a65a4f36f 100644
--- a/sci-libs/lapack/lapack-3.8.0.recipe
+++ b/sci-libs/lapack/lapack-3.8.0.recipe
@@ -41,8 +41,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:gfortran$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
diff --git a/sci-libs/libsvm/libsvm-v321.recipe b/sci-libs/libsvm/libsvm-v321.recipe
index c2997d6f9..bec33d0bf 100644
--- a/sci-libs/libsvm/libsvm-v321.recipe
+++ b/sci-libs/libsvm/libsvm-v321.recipe
@@ -34,13 +34,13 @@ REQUIRES_devel="
 
 PROVIDES_tools="
 	libsvm_tools = $portVersion
-	cmd:svm_train
-	cmd:svm_predict
-	cmd:svm_scale
 	cmd:svm_checkdata
-	cmd:svm_subset
 	cmd:svm_easy
 	cmd:svm_grid
+	cmd:svm_predict
+	cmd:svm_scale
+	cmd:svm_subset
+	cmd:svm_train
 	"
 REQUIRES_tools="
 	haiku
@@ -52,9 +52,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku
-	cmd:make
-	cmd:gcc
 	cmd:g++
+	cmd:gcc
+	cmd:make
 	cmd:sed
 	"
 
diff --git a/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe b/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
index 56fc742ad..909ad154f 100644
--- a/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
+++ b/sci-mathematics/gmp_ecm/gmp_ecm-7.0.4.recipe
@@ -33,8 +33,8 @@ PROVIDES_devel="
 	devel:libecm$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	gmp_ecm$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
diff --git a/sci-mathematics/octave/octave-4.2.1.recipe b/sci-mathematics/octave/octave-4.2.1.recipe
index 7430a9e95..dc6c38f64 100644
--- a/sci-mathematics/octave/octave-4.2.1.recipe
+++ b/sci-mathematics/octave/octave-4.2.1.recipe
@@ -23,8 +23,8 @@ PROVIDES="
 	cmd:octave_cli_$portVersion$secondaryArchSuffix = $portVersion
 	cmd:octave_config$secondaryArchSuffix = $portVersion
 	cmd:octave_config_$portVersion$secondaryArchSuffix = $portVersion
-	lib:liboctinterp$secondaryArchSuffix = $portVersion
 	lib:liboctave$secondaryArchSuffix = $portVersion
+	lib:liboctinterp$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	lib:libpcre$secondaryArchSuffix
 #	lib:libQt5Core$secondaryArchSuffix
 #	lib:libQt5Gui$secondaryArchSuffix
-#	lib:libQt5OpenGL$secondaryArchSuffix
 #	lib:libQt5Network$secondaryArchSuffix
+#	lib:libQt5OpenGL$secondaryArchSuffix
 #	lib:libQt5PrintSupport$secondaryArchSuffix
 #	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
@@ -60,8 +60,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	octave${secondaryArchSuffix}_devel = $portVersion
-	devel:liboctinterp$secondaryArchSuffix = $portVersion
 	devel:liboctave$secondaryArchSuffix = $portVersion
+	devel:liboctinterp$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	octave$secondaryArchSuffix == $portVersion base
@@ -88,8 +88,8 @@ BUILD_REQUIRES="
 	devel:libpcre$secondaryArchSuffix
 #	devel:libQt5Core$secondaryArchSuffix
 #	devel:libQt5Gui$secondaryArchSuffix
-#	devel:libQt5OpenGL$secondaryArchSuffix
 #	devel:libQt5Network$secondaryArchSuffix
+#	devel:libQt5OpenGL$secondaryArchSuffix
 #	devel:libQt5PrintSupport$secondaryArchSuffix
 #	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
@@ -101,12 +101,12 @@ BUILD_PREREQUIRES="
 	cmd:bison >= 3
 	cmd:find
 #	cmd:flex
+	cmd:g++$secondaryArchSuffix
 	cmd:gfortran$secondaryArchSuffix
 	cmd:gnuplot$secondaryArchSuffix
 #	cmd:gperf
 	cmd:grep
 	cmd:gs
-	cmd:g++$secondaryArchSuffix
 	cmd:less
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
diff --git a/sci-physics/bullet/bullet-2.87.recipe b/sci-physics/bullet/bullet-2.87.recipe
index 51d551d9d..52299739f 100644
--- a/sci-physics/bullet/bullet-2.87.recipe
+++ b/sci-physics/bullet/bullet-2.87.recipe
@@ -20,12 +20,12 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	bullet$secondaryArchSuffix = $portVersion
+	lib:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
 	lib:libBullet3Collision$secondaryArchSuffix = $libVersionCompat
 	lib:libBullet3Common$secondaryArchSuffix = $libVersionCompat
 	lib:libBullet3Dynamics$secondaryArchSuffix = $libVersionCompat
 	lib:libBullet3Geometry$secondaryArchSuffix = $libVersionCompat
 	lib:libBullet3OpenCL_clew$secondaryArchSuffix = $libVersionCompat
-	lib:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
 	lib:libBulletCollision$secondaryArchSuffix = $libVersionCompat
 	lib:libBulletDynamics$secondaryArchSuffix = $libVersionCompat
 	lib:libBulletInverseDynamics$secondaryArchSuffix = $libVersionCompat
@@ -34,20 +34,20 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libgl$secondaryArchSuffix
-	lib:libglu$secondaryArchSuffix
-	lib:libglew$secondaryArchSuffix
 	cmd:python
+	lib:libgl$secondaryArchSuffix
+	lib:libglew$secondaryArchSuffix
+	lib:libglu$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	bullet${secondaryArchSuffix}_devel = $portVersion
+	devel:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
 	devel:libBullet3Collision$secondaryArchSuffix = $libVersionCompat
 	devel:libBullet3Common$secondaryArchSuffix = $libVersionCompat
 	devel:libBullet3Dynamics$secondaryArchSuffix = $libVersionCompat
 	devel:libBullet3Geometry$secondaryArchSuffix = $libVersionCompat
 	devel:libBullet3OpenCL_clew$secondaryArchSuffix = $libVersionCompat
-	devel:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
 	devel:libBulletCollision$secondaryArchSuffix = $libVersionCompat
 	devel:libBulletDynamics$secondaryArchSuffix = $libVersionCompat
 	devel:libBulletInverseDynamics$secondaryArchSuffix = $libVersionCompat
@@ -61,8 +61,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgl$secondaryArchSuffix
-	devel:libglu$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
diff --git a/sci-visualization/gri/gri-2.12.23.recipe b/sci-visualization/gri/gri-2.12.23.recipe
index f050be705..e4c752758 100644
--- a/sci-visualization/gri/gri-2.12.23.recipe
+++ b/sci-visualization/gri/gri-2.12.23.recipe
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:make
 	cmd:ld
+	cmd:make
 	cmd:perl
 	devel:libreadline
 	"