dev-*: reorder sections.

2026-04-22 19:50: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-libs/atk/atk-2.23.4.recipe
+++ b/dev-libs/atk/atk-2.23.4.recipe
@@ -23,11 +23,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
+	lib:gtk_doc$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
-	lib:gtk_doc$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-	cmd:gettext$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -35,8 +35,8 @@ PROVIDES_devel="
 	devel:libatk_1.0 = 0.22313.1 compat >= 0
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	atk$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}_devel
 	"

 BUILD_REQUIRES="
--- a/dev-libs/atk/atk-2.28.1.recipe
+++ b/dev-libs/atk/atk-2.28.1.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-	cmd:gettext$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -36,8 +36,8 @@ PROVIDES_devel="
 	devel:libatk_1.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
 	atk$secondaryArchSuffix == $portVersion base
+	haiku${secondaryArchSuffix}_devel
 	"

 BUILD_REQUIRES="
--- a/dev-libs/cereal/cereal-1.2.2.recipe
+++ b/dev-libs/cereal/cereal-1.2.2.recipe
@@ -27,9 +27,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/confuse/confuse-2.7.recipe
+++ b/dev-libs/confuse/confuse-2.7.recipe
@@ -45,13 +45,13 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	gettext$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autom4te
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:autom4te
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
 	cmd:make
 	"

--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -56,13 +56,13 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:m4
 	cmd:make
 	"
--- a/dev-libs/glib/glib2-2.48.2.recipe
+++ b/dev-libs/glib/glib2-2.48.2.recipe
@@ -55,11 +55,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -81,18 +81,18 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
--- a/dev-libs/glib/glib2-2.53.1.recipe
+++ b/dev-libs/glib/glib2-2.53.1.recipe
@@ -56,11 +56,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -82,18 +82,18 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
--- a/dev-libs/glib/glib2-2.53.5.recipe
+++ b/dev-libs/glib/glib2-2.53.5.recipe
@@ -50,11 +50,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -73,13 +73,13 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	cmd:perl
 	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	cmd:perl
-	haiku$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -88,18 +88,18 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix >= 1
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
--- a/dev-libs/glib/glib2-2.54.3.recipe
+++ b/dev-libs/glib/glib2-2.54.3.recipe
@@ -52,11 +52,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -77,15 +77,15 @@ REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	cmd:perl
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libffi$secondaryArchSuffix
-	lib:libpcre$secondaryArchSuffix
+	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:libffi$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
--- a/dev-libs/glib/glib2-2.57.1.recipe
+++ b/dev-libs/glib/glib2-2.57.1.recipe
@@ -52,11 +52,11 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix >= 1
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -77,15 +77,15 @@ REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	cmd:perl
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libffi$secondaryArchSuffix
-	lib:libpcre$secondaryArchSuffix
+	devel:libffi$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:libffi$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	lib:libffi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
--- a/dev-libs/gmp/gmp-5.1.3.recipe
+++ b/dev-libs/gmp/gmp-5.1.3.recipe
@@ -40,10 +40,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"

--- a/dev-libs/gmp/gmp-6.0.0.recipe
+++ b/dev-libs/gmp/gmp-6.0.0.recipe
@@ -40,10 +40,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"

--- a/dev-libs/gmp/gmp-6.1.2.recipe
+++ b/dev-libs/gmp/gmp-6.1.2.recipe
@@ -42,10 +42,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtool
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	"

--- a/dev-libs/grantlee/grantlee-5.1.0.recipe
+++ b/dev-libs/grantlee/grantlee-5.1.0.recipe
@@ -41,8 +41,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/hidapi/hidapi-20160919.recipe
+++ b/dev-libs/hidapi/hidapi-20160919.recipe
@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libusb_1.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -42,8 +42,8 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libusb_1.0$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/dev-libs/jansson/jansson-2.11.recipe
+++ b/dev-libs/jansson/jansson-2.11.recipe
@@ -40,8 +40,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:automake
 	cmd:autoheader
+	cmd:automake
 	cmd:awk
 	cmd:cmp
 	cmd:diff
--- a/dev-libs/kdiagram/kdiagram-2.6.0.recipe
+++ b/dev-libs/kdiagram/kdiagram-2.6.0.recipe
@@ -35,8 +35,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/kproperty/kproperty-3.1.0.recipe
+++ b/dev-libs/kproperty/kproperty-3.1.0.recipe
@@ -36,8 +36,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix
--- a/dev-libs/kreport/kreport-3.1.0.recipe
+++ b/dev-libs/kreport/kreport-3.1.0.recipe
@@ -42,8 +42,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.46
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.46
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix
--- a/dev-libs/libbson/libbson-1.1.10.recipe
+++ b/dev-libs/libbson/libbson-1.1.10.recipe
@@ -35,13 +35,13 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
+	pkgconfig$secondaryArchSuffix
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
-	pkgconfig$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/libclaw/libclaw-1.7.4.recipe
+++ b/dev-libs/libclaw/libclaw-1.7.4.recipe
@@ -28,6 +28,7 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	libclaw$secondaryArchSuffix = $portVersion
+	cmd:claw_config
 	lib:libclaw_application$secondaryArchSuffix
 	lib:libclaw_configuration_file$secondaryArchSuffix
 	lib:libclaw_dynamic_library$secondaryArchSuffix
@@ -35,7 +36,6 @@ PROVIDES="
 	lib:libclaw_logger$secondaryArchSuffix
 	lib:libclaw_net$secondaryArchSuffix
 	lib:libclaw_tween$secondaryArchSuffix
-	cmd:claw_config
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -61,16 +61,16 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	boost${secondaryArchSuffix}_devel
+	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libintl$secondaryArchSuffix
-	boost${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake >= 3.0
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake >= 3.0
 	cmd:make
 	"

--- a/dev-libs/libcroco/libcroco-0.6.12.recipe
+++ b/dev-libs/libcroco/libcroco-0.6.12.recipe
@@ -22,10 +22,9 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	#required by glib
-	lib:libiconv$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix # required by glib
 	lib:libintl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

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

--- a/dev-libs/libcss/libcss-0.7.0.recipe
+++ b/dev-libs/libcss/libcss-0.7.0.recipe
@@ -30,17 +30,17 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libiconv
 	devel:libparserutils${secondaryArchSuffix} >= 0.2.3
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.3.1
-	devel:libiconv
 	"
 BUILD_PREREQUIRES="
+	netsurf_buildsystem >= 1.6
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	netsurf_buildsystem >= 1.6
 	"

 BUILD()
--- a/dev-libs/libelf/libelf-0.8.13.recipe
+++ b/dev-libs/libelf/libelf-0.8.13.recipe
@@ -36,10 +36,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:autoreconf
 	cmd:make
 	"

--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -22,12 +22,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 PROVIDES="
 	libevent${secondaryArchSuffix} = ${portVersion}
 	cmd:event_rpcgen.py
-	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,17 +35,17 @@ REQUIRES="

 PROVIDES_devel="
 	cmd:event_rpcgen.py
-	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
 	devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	"
 REQUIRES_devel="
 	libevent$secondaryArchSuffix == $portVersion base
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -23,51 +23,51 @@ PROVIDES="
 	cmd:event_rpcgen.py$secondaryArchSuffix
 	lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:python
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-	cmd:python
 	"

 PROVIDES_devel="
 	libevent${secondaryArchSuffix}_devel = $portVersion
+	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent$secondaryArchSuffix = $portVersion
 	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	"
 REQUIRES_devel="
 	libevent$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	devel:libz
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/libevent/libevent21-2.1.8.recipe
+++ b/dev-libs/libevent/libevent21-2.1.8.recipe
@@ -29,28 +29,28 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	cmd:python
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-	cmd:python
 	"

 PROVIDES_devel="
 	libevent21${secondaryArchSuffix}_devel = ${portVersion}
-	devel:libevent_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
-	devel:libevent_core_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
-	devel:libevent_extra_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
-	devel:libevent_pthreads_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
-	devel:libevent_openssl_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
 	devel:libevent$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
 	devel:libevent_core$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_core_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
 	devel:libevent_extra$secondaryArchSuffix = 6.0.2 compat >= 6
-	devel:libevent_pthreads$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_extra_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
 	devel:libevent_openssl$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_openssl_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_pthreads$secondaryArchSuffix = 6.0.2 compat >= 6
+	devel:libevent_pthreads_2.1$secondaryArchSuffix = 6.0.2 compat >= 6
 	"
 REQUIRES_devel="
 	libevent21$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	"
 CONFLICTS_devel="
 	libevent${secondaryArchSuffix}_devel
@@ -58,8 +58,8 @@ CONFLICTS_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	devel:libz
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/libffi/libffi-3.0.13.recipe
+++ b/dev-libs/libffi/libffi-3.0.13.recipe
@@ -35,9 +35,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:awk
 	"

 BUILD()
--- a/dev-libs/libffi/libffi-3.2.1.recipe
+++ b/dev-libs/libffi/libffi-3.2.1.recipe
@@ -35,9 +35,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:awk
 	"

 BUILD()
--- a/dev-libs/libfilezilla/libfilezilla-0.11.1.recipe
+++ b/dev-libs/libfilezilla/libfilezilla-0.11.1.recipe
@@ -36,8 +36,8 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.recipe
@@ -26,17 +26,17 @@ REQUIRES="

 PROVIDES_devel="
 	libgcrypt${secondaryArchSuffix}_devel = $portVersion
-	devel:libgcrypt$secondaryArchSuffix = $libVersion
 	cmd:dumpsexp$secondaryArchSuffix = $portVersion
 	cmd:hmac256$secondaryArchSuffix = $portVersion
 	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion
 	cmd:mpicalc$secondaryArchSuffix = $portVersion
+	devel:libgcrypt$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
-	libgcrypt$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
+	libgcrypt$secondaryArchSuffix == $portVersion base
 	devel:libgpg_error$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
--- a/dev-libs/libiodbc/libiodbc-3.52.12.recipe
+++ b/dev-libs/libiodbc/libiodbc-3.52.12.recipe
@@ -40,10 +40,10 @@ REQUIRES_devel="

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

--- a/dev-libs/libksba/libksba-1.3.5.recipe
+++ b/dev-libs/libksba/libksba-1.3.5.recipe
@@ -24,8 +24,8 @@ REQUIRES="

 PROVIDES_devel="
 	libksba${secondaryArchSuffix}_devel = $portVersion
-	devel:libksba$secondaryArchSuffix = 8.11.6 compat >= 8
 	cmd:ksba_config$secondaryArchSuffix = $portVersion
+	devel:libksba$secondaryArchSuffix = 8.11.6 compat >= 8
 	"
 REQUIRES_devel="
 	libksba$secondaryArchSuffix == $portVersion base
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8.recipe
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8.recipe
@@ -28,8 +28,8 @@ REQUIRES="

 PROVIDES_devel="
 	libmcrypt${secondaryArchSuffix}_devel = $portVersion
-	devel:libmcrypt$secondaryArchSuffix = $libVersion
 	cmd:libmcrypt_config$secondaryArchSuffix = $portVersion
+	devel:libmcrypt$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
 	libmcrypt$secondaryArchSuffix == $portVersion base
--- a/dev-libs/libpcre/libpcre0-8.21.recipe
+++ b/dev-libs/libpcre/libpcre0-8.21.recipe
@@ -34,9 +34,9 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/libpcre2/libpcre2-10.30.recipe
+++ b/dev-libs/libpcre2/libpcre2-10.30.recipe
@@ -19,26 +19,26 @@ SECONDARY_ARCHITECTURES="x86 x86_gcc2"

 PROVIDES="
 	libpcre2$secondaryArchSuffix = $portVersion compat >= 10
-	lib:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_16$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_32$secondaryArchSuffix = 0.6.0 compat >= 0
-	lib:libpcre2_posix$secondaryArchSuffix = 2.0.0 compat >= 2
 	cmd:pcre2grep$secondaryArchSuffix
 	cmd:pcre2test$secondaryArchSuffix
+	lib:libpcre2_16$secondaryArchSuffix = 0.6.0 compat >= 0
+	lib:libpcre2_32$secondaryArchSuffix = 0.6.0 compat >= 0
+	lib:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
+	lib:libpcre2_posix$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	libpcre2${secondaryArchSuffix}_devel = $portVersion compat >= 10
 	cmd:pcre2_config$secondaryArchSuffix = $portVersion compat >= 10
-	devel:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
 	devel:libpcre2_16$secondaryArchSuffix = 0.6.0 compat >= 0
 	devel:libpcre2_32$secondaryArchSuffix = 0.6.0 compat >= 0
+	devel:libpcre2_8$secondaryArchSuffix = 0.6.0 compat >= 0
 	devel:libpcre2_posix$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
 REQUIRES_devel="
@@ -47,9 +47,9 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libedit$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -24,14 +24,14 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
-	cmd:autoconf
-	cmd:libtool
 	cmd:aclocal
-	cmd:make
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	devel:util_macros$secondaryArchSuffix
 	"

 BUILD()
--- a/dev-libs/libpurple/libpurple-2.12.0.recipe
+++ b/dev-libs/libpurple/libpurple-2.12.0.recipe
@@ -15,42 +15,42 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	libpurple$secondaryArchSuffix = $portVersion
-	lib:libpurple$secondaryArchSuffix = $portVersion
 	lib:libgnt$secondaryArchSuffix = $portVersion
+	lib:libpurple$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libglib_2.0$secondaryArchSuffix
-	lib:libgobject_2.0$secondaryArchSuffix
-	lib:libgmodule_2.0$secondaryArchSuffix
-	lib:libgthread_2.0$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libidn$secondaryArchSuffix
-	lib:libnss3$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libnspr4$secondaryArchSuffix
+	lib:libffi$secondaryArchSuffix
 	lib:libfreebl3$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgmodule_2.0$secondaryArchSuffix
+	lib:libgobject_2.0$secondaryArchSuffix
+	lib:libgthread_2.0$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libidn$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	lib:libnspr4$secondaryArchSuffix
+	lib:libnss3$secondaryArchSuffix
 	lib:libnss3$secondaryArchSuffix
 	lib:libnssckbi$secondaryArchSuffix
 	lib:libnssdbm3$secondaryArchSuffix
 	lib:libnssutil3$secondaryArchSuffix
-	lib:libsmime3$secondaryArchSuffix
-	lib:libsoftokn3$secondaryArchSuffix
-	lib:libssl3$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libffi$secondaryArchSuffix
 	lib:libpanelw$secondaryArchSuffix
-	lib:libncursesw$secondaryArchSuffix
 	lib:libperl$secondaryArchSuffix
 	lib:libpython2.7$secondaryArchSuffix
+	lib:libsmime3$secondaryArchSuffix
+	lib:libsoftokn3$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libssl3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	libpurple${secondaryArchSuffix}_devel = $portVersion
-	devel:libpurple$secondaryArchSuffix = $portVersion
 	devel:libgnt$secondaryArchSuffix = $portVersion
+	devel:libpurple$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -80,24 +80,24 @@ REQUIRES_finch="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libglib_2.0$secondaryArchSuffix
-	devel:libgobject_2.0$secondaryArchSuffix
-	devel:libgmodule_2.0$secondaryArchSuffix
-	devel:libgthread_2.0$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	devel:libidn$secondaryArchSuffix
-	devel:libnss3$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libnspr4$secondaryArchSuffix
 	devel:libfreebl3$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix
+	devel:libgmodule_2.0$secondaryArchSuffix
+	devel:libgobject_2.0$secondaryArchSuffix
+	devel:libgthread_2.0$secondaryArchSuffix
+	devel:libidn$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libnspr4$secondaryArchSuffix
+	devel:libnss3$secondaryArchSuffix
 	devel:libnss3$secondaryArchSuffix
 	devel:libnssckbi$secondaryArchSuffix
 	devel:libnssdbm3$secondaryArchSuffix
 	devel:libnssutil3$secondaryArchSuffix
 	devel:libsmime3$secondaryArchSuffix
 	devel:libsoftokn3$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	devel:libssl3$secondaryArchSuffix
-	devel:libncurses$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/dev-libs/librevenge/librevenge-0.0.0.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.0.recipe
@@ -45,10 +45,10 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:awk
 	cmd:pkg_config$secondaryArchSuffix
 	"

--- a/dev-libs/librevenge/librevenge-0.0.1.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.1.recipe
@@ -46,15 +46,15 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal
+	cmd:autoconf
 	cmd:autoheader
 	cmd:automake
-	cmd:autoconf
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:awk
 	cmd:pkg_config$secondaryArchSuffix
 	"

--- a/dev-libs/librevenge/librevenge-0.0.4.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.4.recipe
@@ -40,8 +40,8 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libboost_system$secondaryArchSuffix
 	devel:libboost_serialization$secondaryArchSuffix
+	devel:libboost_system$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
--- a/dev-libs/libsmdev/libsmdev-20170225.recipe
+++ b/dev-libs/libsmdev/libsmdev-20170225.recipe
@@ -12,8 +12,8 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	libsmdev${secondaryArchSuffix} = $portVersion
-	lib:libsmdev${secondaryArchSuffix} = 1.0.0 compat >= 1
 	cmd:smdevinfo${secondaryArchSuffix}
+	lib:libsmdev${secondaryArchSuffix} = 1.0.0 compat >= 1
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
--- a/dev-libs/libtar/libtar-1.2.20.recipe
+++ b/dev-libs/libtar/libtar-1.2.20.recipe
@@ -43,8 +43,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:automake
 	cmd:autoheader
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
--- a/dev-libs/libunibreak/libunibreak-4.0.recipe
+++ b/dev-libs/libunibreak/libunibreak-4.0.recipe
@@ -25,8 +25,8 @@ REQUIRES="

 PROVIDES_devel="
 	libunibreak${secondaryArchSuffix}_devel = $portVersion
-	devel:libunibreak$secondaryArchSuffix = $libVersionCompat
 	devel:liblinebreak$secondaryArchSuffix = $libVersionCompat
+	devel:libunibreak$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libunibreak$secondaryArchSuffix == $portVersion base
--- a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
+++ b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
@@ -16,9 +16,9 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	libusb_compat$secondaryArchSuffix = $portVersion
-	lib:libusb_0.1$secondaryArchSuffix = $portVersion
-	lib:libusb$secondaryArchSuffix = $portVersion
 	cmd:libusb_config$secondaryArchSuffix = $portVersion
+	lib:libusb$secondaryArchSuffix = $portVersion
+	lib:libusb_0.1$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,8 +27,8 @@ REQUIRES="

 PROVIDES_devel="
 	libusb_compat${secondaryArchSuffix}_devel = $portVersion
-	devel:libusb_0.1${secondaryArchSuffix} = $portVersion
 	devel:libusb$secondaryArchSuffix = $portVersion
+	devel:libusb_0.1${secondaryArchSuffix} = $portVersion
 	"
 REQUIRES_devel="
 	libusb_compat${secondaryArchSuffix} == $portVersion base
@@ -42,9 +42,9 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:libtool
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtool
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
--- a/dev-libs/libvterm/libvterm-0.0.681.recipe
+++ b/dev-libs/libvterm/libvterm-0.0.681.recipe
@@ -27,14 +27,14 @@ REQUIRES="

 PROVIDES_devel="
 	libvterm${secondaryArchSuffix}_devel = $portVersion
-	devel:libvterm$secondaryArchSuffix = 0.0.0 compat >= 0
 	cmd:unterm$secondaryArchSuffix
 	cmd:vterm_ctrl$secondaryArchSuffix
 	cmd:vterm_dump$secondaryArchSuffix
+	devel:libvterm$secondaryArchSuffix = 0.0.0 compat >= 0
 "
 REQUIRES_devel="
-	libvterm$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	libvterm$secondaryArchSuffix == $portVersion base
 "

 BUILD_REQUIRES="
--- a/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe
@@ -31,8 +31,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
-	lib:libcheck
 	devel:libcheck
+	lib:libcheck
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
@@ -31,8 +31,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
-	lib:libcheck$secondaryArchSuffix
 	devel:libcheck$secondaryArchSuffix
+	lib:libcheck$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
--- a/dev-libs/libxdg_basedir/libxdg_basedir-1.2.0.recipe
+++ b/dev-libs/libxdg_basedir/libxdg_basedir-1.2.0.recipe
@@ -35,8 +35,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"

--- a/dev-libs/libxslt/libxslt-1.1.32.recipe
+++ b/dev-libs/libxslt/libxslt-1.1.32.recipe
@@ -17,10 +17,10 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libxslt$secondaryArchSuffix = $portVersion
-	lib:libxslt$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libexslt$secondaryArchSuffix = 0.8.20 compat >= 0
 	cmd:xslt_config$secondaryArchSuffix = $portVersion
 	cmd:xsltproc$secondaryArchSuffix = $portVersion
+	lib:libexslt$secondaryArchSuffix = 0.8.20 compat >= 0
+	lib:libxslt$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -30,8 +30,8 @@ REQUIRES="

 PROVIDES_devel="
 	libxslt${secondaryArchSuffix}_devel = $portVersion
-	devel:libxslt$secondaryArchSuffix = $portVersion compat >= 1
 	devel:libexslt$secondaryArchSuffix = 0.8.20 compat >= 0
+	devel:libxslt$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES_devel="
 	libxslt$secondaryArchSuffix == $portVersion base
@@ -47,9 +47,9 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
 	cmd:gawk
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
--- a/dev-libs/libzip/libzip-0.10.1.recipe
+++ b/dev-libs/libzip/libzip-0.10.1.recipe
@@ -13,10 +13,10 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libzip${secondaryArchSuffix} = $portVersion
-	lib:libzip${secondaryArchSuffix} = $portVersion
 	cmd:zipcmp${secondaryArchSuffix}
 	cmd:zipmerge${secondaryArchSuffix}
 	cmd:ziptorrent${secondaryArchSuffix}
+	lib:libzip${secondaryArchSuffix} = $portVersion
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -37,9 +37,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/libzip/libzip-0.11.2.recipe
+++ b/dev-libs/libzip/libzip-0.11.2.recipe
@@ -13,10 +13,10 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libzip${secondaryArchSuffix} = $portVersion
-	lib:libzip${secondaryArchSuffix} = $portVersion
 	cmd:zipcmp${secondaryArchSuffix}
 	cmd:zipmerge${secondaryArchSuffix}
 	cmd:ziptorrent${secondaryArchSuffix}
+	lib:libzip${secondaryArchSuffix} = $portVersion
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -37,9 +37,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/lzo/lzo-2.10.recipe
+++ b/dev-libs/lzo/lzo-2.10.recipe
@@ -49,9 +49,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:awk
 	"

 BUILD()
--- a/dev-libs/mini-xml/mini_xml-2.6.recipe
+++ b/dev-libs/mini-xml/mini_xml-2.6.recipe
@@ -21,8 +21,8 @@ libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 PROVIDES="
 	mini_xml$secondaryArchSuffix = $portVersion
 	cmd:mxmldoc$secondaryArchSuffix
-	lib:mxml$secondaryArchSuffix = $libVersionCompat
 	lib:libmxml$secondaryArchSuffix = $libVersionCompat
+	lib:mxml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,8 +30,8 @@ REQUIRES="

 PROVIDES_devel="
 	mini_xml${secondaryArchSuffix}_devel = $portVersion
-	devel:mxml$secondaryArchSuffix = $libVersionCompat
 	devel:libmxml$secondaryArchSuffix = $libVersionCompat
+	devel:mxml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	mini_xml$secondaryArchSuffix == $portVersion base
--- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.1.5.recipe
+++ b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.1.5.recipe
@@ -36,8 +36,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_chrono$secondaryArchSuffix
 	devel:libboost_context$secondaryArchSuffix
-	devel:libboost_timer$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
+	devel:libboost_timer$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.0.recipe
+++ b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.0.recipe
@@ -36,8 +36,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_chrono$secondaryArchSuffix
 	devel:libboost_context$secondaryArchSuffix
-	devel:libboost_timer$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
+	devel:libboost_timer$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.1.recipe
+++ b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.1.recipe
@@ -39,8 +39,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_chrono$secondaryArchSuffix
 	devel:libboost_context$secondaryArchSuffix
-	devel:libboost_timer$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
+	devel:libboost_timer$secondaryArchSuffix
 	devel:libgtest$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
--- a/dev-libs/npth/npth-1.6.recipe
+++ b/dev-libs/npth/npth-1.6.recipe
@@ -28,8 +28,8 @@ REQUIRES="

 PROVIDES_devel="
 	npth${secondaryArchSuffix}_devel = $portVersion
-	devel:libnpth$secondaryArchSuffix = $libVersionCompat
 	cmd:npth_config$secondaryArchSuffix = $portVersion
+	devel:libnpth$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	npth$secondaryArchSuffix == $portVersion
@@ -39,12 +39,12 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:autoconf
 	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	"

 BUILD()
--- a/dev-libs/nsgenbind/nsgenbind-0.5.recipe
+++ b/dev-libs/nsgenbind/nsgenbind-0.5.recipe
@@ -24,10 +24,10 @@ BUILD_REQUIRES="
 	netsurf_buildsystem
 	"
 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	cmd:bison
 	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/dev-libs/oniguruma/oniguruma-6.2.0.recipe
+++ b/dev-libs/oniguruma/oniguruma-6.2.0.recipe
@@ -36,8 +36,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"

--- a/dev-libs/protobuf/protobuf-2.4.1.recipe
+++ b/dev-libs/protobuf/protobuf-2.4.1.recipe
@@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	protobuf$secondaryArchSuffix =$portVersion
 	cmd:protoc$secondaryArchSuffix
-	lib:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
 	lib:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
+	lib:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
 	lib:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
 	"
 REQUIRES="
@@ -29,8 +29,8 @@ REQUIRES="

 PROVIDES_devel="
 	protobuf${secondaryArchSuffix}_devel = $portVersion
-	devel:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
 	devel:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
 	devel:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
 	"
 REQUIRES_devel="
--- a/dev-libs/protobuf/protobuf-3.3.2.recipe
+++ b/dev-libs/protobuf/protobuf-3.3.2.recipe
@@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	protobuf$secondaryArchSuffix =$portVersion
 	cmd:protoc$secondaryArchSuffix
-	lib:libprotobuf_lite$secondaryArchSuffix = 13.0.2 compat >= 13
 	lib:libprotobuf$secondaryArchSuffix = 13.0.2 compat >= 13
+	lib:libprotobuf_lite$secondaryArchSuffix = 13.0.2 compat >= 13
 	lib:libprotoc$secondaryArchSuffix = 13.0.2 compat >= 13
 	"
 REQUIRES="
@@ -29,8 +29,8 @@ REQUIRES="

 PROVIDES_devel="
 	protobuf${secondaryArchSuffix}_devel = $portVersion
-	devel:libprotobuf_lite$secondaryArchSuffix = 13.0.2 compat >= 13
 	devel:libprotobuf$secondaryArchSuffix = 13.0.2 compat >= 13
+	devel:libprotobuf_lite$secondaryArchSuffix = 13.0.2 compat >= 13
 	devel:libprotoc$secondaryArchSuffix = 13.0.2 compat >= 13
 	"
 REQUIRES_devel="
--- a/dev-libs/protobuf/protobuf-3.5.1.1.recipe
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.recipe
@@ -22,8 +22,8 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 PROVIDES="
 	protobuf$secondaryArchSuffix = $portVersion
 	cmd:protoc$secondaryArchSuffix = $portVersion
-	lib:libprotobuf_lite$secondaryArchSuffix = $libVersionCompat
 	lib:libprotobuf$secondaryArchSuffix = $libVersionCompat
+	lib:libprotobuf_lite$secondaryArchSuffix = $libVersionCompat
 	lib:libprotoc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -33,8 +33,8 @@ REQUIRES="

 PROVIDES_devel="
 	protobuf${secondaryArchSuffix}_devel = $portVersion
-	devel:libprotobuf_lite$secondaryArchSuffix = $libVersionCompat
 	devel:libprotobuf$secondaryArchSuffix = $libVersionCompat
+	devel:libprotobuf_lite$secondaryArchSuffix = $libVersionCompat
 	devel:libprotoc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
--- a/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe
+++ b/dev-libs/psqlodbc/psqlodbc-09.03.0400.recipe
@@ -38,10 +38,10 @@ BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:autoconf
 	"

 BUILD()
--- a/dev-libs/pugixml/pugixml-1.8.1.recipe
+++ b/dev-libs/pugixml/pugixml-1.8.1.recipe
@@ -37,9 +37,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
 	"

--- a/dev-libs/rasqal/rasqal-0.9.33.recipe
+++ b/dev-libs/rasqal/rasqal-0.9.33.recipe
@@ -28,13 +28,12 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix # needed by mpfr
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libmpfr$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
 	lib:libraptor2$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
-	# needed by mpfr
-	lib:libgmp$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -49,8 +48,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
-	devel:libgpg_error$secondaryArchSuffix
 	devel:libgmp$secondaryArchSuffix
+	devel:libgpg_error$secondaryArchSuffix
 	devel:libmpfr$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
 	devel:libraptor2$secondaryArchSuffix
--- a/dev-libs/redland/redland-1.0.17.recipe
+++ b/dev-libs/redland/redland-1.0.17.recipe
@@ -29,9 +29,9 @@ PROVIDES="
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libiconv$secondaryArchSuffix
+	lib:libiodbcinst$secondaryArchSuffix
 	lib:libltdl$secondaryArchSuffix
 	lib:libodbc$secondaryArchSuffix
-	lib:libiodbcinst$secondaryArchSuffix
 	lib:libraptor2$secondaryArchSuffix
 	lib:librasqal$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
@@ -50,6 +50,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libglib_2.0$secondaryArchSuffix 	# for gtkdoc-scangobj (with pkg-config glib-2.0.pc)
 	devel:libiconv$secondaryArchSuffix
 	devel:libltdl$secondaryArchSuffix
 	devel:libodbc$secondaryArchSuffix
@@ -57,8 +58,6 @@ BUILD_REQUIRES="
 	devel:librasqal$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
-	# for gtkdoc-scangobj (with pkg-config glib-2.0.pc)
-	devel:libglib_2.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
--- a/dev-libs/serd/serd-0.26.0.recipe
+++ b/dev-libs/serd/serd-0.26.0.recipe
@@ -32,9 +32,9 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:python2
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:python2
 	"

 BUILD()
--- a/dev-libs/unibilium/unibilium-1.2.1.recipe
+++ b/dev-libs/unibilium/unibilium-1.2.1.recipe
@@ -37,8 +37,8 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:sed
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"

 PATCH()
--- a/dev-libs/xerces_c/xerces_c-3.1.4.recipe
+++ b/dev-libs/xerces_c/xerces_c-3.1.4.recipe
@@ -16,7 +16,6 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"

 PROVIDES="
 	xerces_c$secondaryArchSuffix = $portVersion compat >= 3.1
-	lib:libxerces_c_3.1$secondaryArchSuffix = 3.1
 	cmd:CreateDOMDocument$secondaryArchSuffix
 	cmd:DOMCount$secondaryArchSuffix
 	cmd:DOMPrint$secondaryArchSuffix
@@ -33,6 +32,7 @@ PROVIDES="
 	cmd:SEnumVal$secondaryArchSuffix
 	cmd:StdInParse$secondaryArchSuffix
 	cmd:XInclude$secondaryArchSuffix
+	lib:libxerces_c_3.1$secondaryArchSuffix = 3.1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -44,8 +44,8 @@ REQUIRES="

 PROVIDES_devel="
 	xerces_c${secondaryArchSuffix}_devel = $portVersion compat >= 3.1
-	devel:libxerces_c_3.1$secondaryArchSuffix = 3.1
 	devel:libxerces_c$secondaryArchSuffix = 3.1
+	devel:libxerces_c_3.1$secondaryArchSuffix = 3.1
 	"
 REQUIRES_devel="
 	xerces_c$secondaryArchSuffix == $portVersion base
--- a/dev-libs/xmlsec/xmlsec-1.2.26.recipe
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.recipe
@@ -28,23 +28,23 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libltdl$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
-	lib:libltdl$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	xmlsec${secondaryArchSuffix}_devel = $portVersion
 	devel:libxmlsec1$secondaryArchSuffix = $libVersionCompat
-	devel:libxmlsec1_openssl$secondaryArchSuffix = $libVersionCompat
-	devel:libxmlsec1_nss$secondaryArchSuffix = $libVersionCompat
 	devel:libxmlsec1_gcrypt$secondaryArchSuffix = $libVersionCompat
+	devel:libxmlsec1_nss$secondaryArchSuffix = $libVersionCompat
+	devel:libxmlsec1_openssl$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	xmlsec$secondaryArchSuffix == $portVersion base
-	xmlsec${secondaryArchSuffix}_nss == $portVersion
 	xmlsec${secondaryArchSuffix}_gcrypt == $portVersion
+	xmlsec${secondaryArchSuffix}_nss == $portVersion
 	"

 COPYRIGHT_nss="2002-2016 Aleksey Sanin
@@ -56,9 +56,9 @@ PROVIDES_nss="
 REQUIRES_nss="
 	xmlsec$secondaryArchSuffix == $portVersion base
 	lib:libnspr4$secondaryArchSuffix
-	lib:libplds4$secondaryArchSuffix
-	lib:libplc4$secondaryArchSuffix
 	lib:libnss3$secondaryArchSuffix
+	lib:libplc4$secondaryArchSuffix
+	lib:libplds4$secondaryArchSuffix
 	lib:libsmime3$secondaryArchSuffix
 "

@@ -73,17 +73,17 @@ REQUIRES_gcrypt="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libxml2$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix
-	devel:libnspr4$secondaryArchSuffix
-	devel:libplds4$secondaryArchSuffix
-	devel:libplc4$secondaryArchSuffix
-	devel:libnss3$secondaryArchSuffix
-	devel:libsmime3$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libgcrypt$secondaryArchSuffix
 #	devel:libgnutls$secondaryArchSuffix
 	devel:libltdl$secondaryArchSuffix
+	devel:libnspr4$secondaryArchSuffix
+	devel:libnss3$secondaryArchSuffix
+	devel:libplc4$secondaryArchSuffix
+	devel:libplds4$secondaryArchSuffix
+	devel:libsmime3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
--- a/dev-libs/zziplib/zziplib-0.13.67.recipe
+++ b/dev-libs/zziplib/zziplib-0.13.67.recipe
@@ -56,8 +56,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
--- a/dev-libs/zziplib/zziplib-0.13.69.recipe
+++ b/dev-libs/zziplib/zziplib-0.13.69.recipe
@@ -59,8 +59,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix