x11-*: reorder sections.

2026-04-09 05:10:05 +02:00 · 2018-08-08 17:34:16 +02:00
parent 0d782eba67
commit fea5770921
42 changed files with 137 additions and 139 deletions
--- a/x11-base/xorg-proto/xorgproto-2018.4.recipe
+++ b/x11-base/xorg-proto/xorgproto-2018.4.recipe
@@ -88,14 +88,14 @@ CONFLICTS="

 BUILD_REQUIRES="
 	haiku_devel
-	devel:util_macros
-	devel:xorg_sgml_doctools
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
+	devel:util_macros
+	devel:xorg_sgml_doctools
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
 	cmd:aclocal
+	cmd:autoconf
 	cmd:awk
 	cmd:gcc
 	cmd:make
--- a/x11-doc/xorg_sgml_doctools/xorg_sgml_doctools-1.11.recipe
+++ b/x11-doc/xorg_sgml_doctools/xorg_sgml_doctools-1.11.recipe
@@ -29,11 +29,11 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config
+	devel:util_macros
 	"

 BUILD()
--- a/x11-libs/agg/agg-2.5.recipe
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -23,10 +23,10 @@ PROVIDES="
 "
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 "

 PROVIDES_devel="
@@ -48,28 +48,28 @@ PROVIDES_sdl="
 REQUIRES_sdl="
 	agg$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
-	lib:libsdl_1.2$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libsdl_1.2$secondaryArchSuffix
 "

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 	devel:libsdl_1.2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libbz2$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
 	cmd:autoconf
 	cmd:autoheader
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:sed
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 "

 BUILD()
--- a/x11-libs/cairo/cairo-1.12.18.recipe
+++ b/x11-libs/cairo/cairo-1.12.18.recipe
@@ -34,14 +34,13 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix # required by fontconfig
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libpixman_1$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	# required by fontconfig
-	lib:libbz2$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix # required by fontconfig
+	lib:libz$secondaryArchSuffix # required by fontconfig
 	"

 PROVIDES_devel="
@@ -57,14 +56,13 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix # required by fontconfig
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libpixman_1$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	# required by fontconfig
-	devel:libbz2$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix # required by fontconfig
+	devel:libz$secondaryArchSuffix # required by fontconfig
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.12.recipe
+++ b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.12.recipe
@@ -53,12 +53,12 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libjpeg$secondaryArchSuffix
+	shared_mime_info$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix >= 0.4800
+	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	shared_mime_info$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -66,8 +66,8 @@ BUILD_PREREQUIRES="
 	cmd:autoheader
 	cmd:automake
 	cmd:awk
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
 	"
--- a/x11-libs/libxcursor/libxcursor-1.1.15.recipe
+++ b/x11-libs/libxcursor/libxcursor-1.1.15.recipe
@@ -45,11 +45,10 @@ BUILD_REQUIRES="
 	devel:xextproto$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
-	cmd:automake
 	cmd:autoheader
+	cmd:automake
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
@@ -58,6 +57,7 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
+	devel:util_macros$secondaryArchSuffix
 	"

 defineDebugInfoPackage libxcursor$secondaryArchSuffix \
--- a/x11-libs/libxfont/libxfont-1.5.4.recipe
+++ b/x11-libs/libxfont/libxfont-1.5.4.recipe
@@ -28,8 +28,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
 	lib:libfontenc$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

--- a/x11-libs/libxi/libxi-1.7.9.recipe
+++ b/x11-libs/libxi/libxi-1.7.9.recipe
@@ -42,8 +42,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
-	devel:inputproto
 	devel:fixesproto
+	devel:inputproto
 	devel:kbproto
 	devel:libpthread_stubs
 	devel:libx11$secondaryArchSuffix
@@ -52,15 +52,15 @@ BUILD_REQUIRES="
 	devel:libxdmcp$secondaryArchSuffix
 	devel:libxext$secondaryArchSuffix
 	devel:libxfixes$secondaryArchSuffix
+	devel:util_macros
 	devel:xextproto
 	devel:xorg_sgml_doctools
 	devel:xproto
-	devel:util_macros
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
 	cmd:aclocal
 	#cmd:asciidoc
+	cmd:autoconf
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
--- a/x11-libs/libxmu/libxmu-1.1.2.recipe
+++ b/x11-libs/libxmu/libxmu-1.1.2.recipe
@@ -51,14 +51,14 @@ BUILD_REQUIRES="
 	devel:libpthread_stubs
 	devel:libSM$secondaryArchSuffix
 	devel:libX11$secondaryArchSuffix
-	devel:libXext$secondaryArchSuffix
 	devel:libXau$secondaryArchSuffix
 	devel:libXcb$secondaryArchSuffix
 	devel:libXdmcp$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
 	devel:libXt$secondaryArchSuffix
 	devel:util_macros
-	devel:xorg_sgml_doctools
 	devel:xextproto
+	devel:xorg_sgml_doctools
 	devel:xproto
 	devel:xtrans
 	"
--- a/x11-libs/libxrandr/libxrandr-1.5.1.recipe
+++ b/x11-libs/libxrandr/libxrandr-1.5.1.recipe
@@ -55,13 +55,13 @@ BUILD_REQUIRES="
 	devel:xtrans$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	devel:util_macros$secondaryArchSuffix
 	"

 defineDebugInfoPackage libxrandr$secondaryArchSuffix \
--- a/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe
+++ b/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe
@@ -49,8 +49,8 @@ BUILD_REQUIRES="
 	devel:libxdmcp$secondaryArchSuffix
 	devel:libxext$secondaryArchSuffix
 	devel:scrnsaverproto
-	devel:xextproto
 	devel:util_macros
+	devel:xextproto
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/x11-libs/libxt/libxt-1.1.5.recipe
+++ b/x11-libs/libxt/libxt-1.1.5.recipe
@@ -27,12 +27,12 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libICE$secondaryArchSuffix
+	lib:libSM$secondaryArchSuffix
 	lib:libX11$secondaryArchSuffix
 	lib:libXau$secondaryArchSuffix
 	lib:libXcb$secondaryArchSuffix
 	lib:libXdmcp$secondaryArchSuffix
-	lib:libICE$secondaryArchSuffix
-	lib:libSM$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -47,16 +47,16 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
+	devel:kbproto
 	devel:libglib_2.0$secondaryArchSuffix
+	devel:libICE$secondaryArchSuffix
+	devel:libpthread_stubs
+	devel:libSM$secondaryArchSuffix
 	devel:libX11$secondaryArchSuffix
 	devel:libXau$secondaryArchSuffix
 	devel:libXcb$secondaryArchSuffix
 	devel:libXdmcp$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
-	devel:libICE$secondaryArchSuffix
-	devel:libpthread_stubs
-	devel:libSM$secondaryArchSuffix
-	devel:kbproto
 	devel:util_macros
 	devel:xorg_sgml_doctools
 	devel:xproto
--- a/x11-libs/pango/pango-1.40.14.recipe
+++ b/x11-libs/pango/pango-1.40.14.recipe
@@ -33,8 +33,8 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcairo$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -56,20 +56,20 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcairo$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
-	devel:libharfbuzz$secondaryArchSuffix
 	devel:libgraphite2$secondaryArchSuffix
+	devel:libharfbuzz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
+	cmd:gtkdocize
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:gtkdocize
-	cmd:find
 	"

 BUILD()
--- a/x11-libs/qscintilla/qscintilla-2.10.1.recipe
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.recipe
@@ -39,11 +39,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libgl$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libgl$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -63,8 +63,8 @@ BUILD_REQUIRES="
 	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:g++$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/x11-libs/scintilla/scintilla-4.1.0.recipe
+++ b/x11-libs/scintilla/scintilla-4.1.0.recipe
@@ -45,8 +45,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:ar
-	cmd:make
 	cmd:g++$secondaryArchSuffix
+	cmd:make
 	"

 BUILD()
--- a/x11-libs/xtrans/xtrans-1.3.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.3.5.recipe
@@ -27,10 +27,10 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku_devel
-	devel:util_macros
-	devel:xorg_sgml_doctools
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
+	devel:util_macros
+	devel:xorg_sgml_doctools
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe
+++ b/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe
@@ -21,12 +21,12 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	pcmanfm_qt$secondaryArchSuffix = $portVersion
-	cmd:pcmanfm_qt$secondaryArchSuffix = $portVersion
 	app:PCManFM$secondaryArchSuffix = $portVersion
+	cmd:pcmanfm_qt$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	dbus$secondaryArchSuffix
 	haiku$secondaryArchSuffix
+	dbus$secondaryArchSuffix
 	lib:libexif$secondaryArchSuffix
 	lib:libfm$secondaryArchSuffix
 	lib:libfm_qt$secondaryArchSuffix
--- a/x11-misc/shared_mime_info/shared_mime_info-1.9.recipe
+++ b/x11-misc/shared_mime_info/shared_mime_info-1.9.recipe
@@ -22,23 +22,23 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libglib_2.0$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
+	cmd:g++$secondaryArchSuffix
 	cmd:intltool_update
 	cmd:make
-	cmd:g++$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:xmllint
 	"
--- a/x11-misc/util_macros/util_macros-1.19.2.recipe
+++ b/x11-misc/util_macros/util_macros-1.19.2.recipe
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:awk
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"

 BUILD()
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.recipe
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.recipe
@@ -23,14 +23,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/x11-proto/compositeproto/compositeproto-0.4.2.recipe
+++ b/x11-proto/compositeproto/compositeproto-0.4.2.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/x11-proto/damageproto/damageproto-1.2.1.recipe
+++ b/x11-proto/damageproto/damageproto-1.2.1.recipe
@@ -25,14 +25,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/x11-proto/fixesproto/fixesproto-5.0.recipe
+++ b/x11-proto/fixesproto/fixesproto-5.0.recipe
@@ -25,14 +25,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/x11-proto/fontsproto/fontsproto-2.1.3.recipe
+++ b/x11-proto/fontsproto/fontsproto-2.1.3.recipe
@@ -23,10 +23,10 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:util_macros
-	devel:xorg_sgml_doctools
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
+	devel:util_macros
+	devel:xorg_sgml_doctools
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
--- a/x11-proto/glproto/glproto-1.4.17.recipe
+++ b/x11-proto/glproto/glproto-1.4.17.recipe
@@ -22,12 +22,12 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	devel:util_macros$secondaryArchSuffix
 	"

 BUILD()
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -32,14 +32,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/x11-proto/inputproto/inputproto-2.3.2.recipe
+++ b/x11-proto/inputproto/inputproto-2.3.2.recipe
@@ -32,14 +32,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/x11-proto/kbproto/kbproto-1.0.7.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.7.recipe
@@ -22,14 +22,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/x11-proto/presentproto/presentproto-1.1.recipe
+++ b/x11-proto/presentproto/presentproto-1.1.recipe
@@ -25,14 +25,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/x11-proto/randrproto/randrproto-1.5.0.recipe
+++ b/x11-proto/randrproto/randrproto-1.5.0.recipe
@@ -27,14 +27,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/x11-proto/recordproto/recordproto-1.14.2.recipe
+++ b/x11-proto/recordproto/recordproto-1.14.2.recipe
@@ -23,14 +23,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/x11-proto/renderproto/renderproto-0.11.1.recipe
+++ b/x11-proto/renderproto/renderproto-0.11.1.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/x11-proto/resourceproto/resourceproto-1.2.0.recipe
+++ b/x11-proto/resourceproto/resourceproto-1.2.0.recipe
@@ -23,14 +23,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/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.recipe
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.recipe
@@ -23,14 +23,14 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:automake
 	cmd:autoreconf
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	devel:util_macros$secondaryArchSuffix
 	"

 BUILD()
--- a/x11-proto/videoproto/videoproto-2.3.3.recipe
+++ b/x11-proto/videoproto/videoproto-2.3.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/x11-proto/xcb_proto/xcb_proto-1.13.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.13.recipe
@@ -21,14 +21,14 @@ REQUIRES="

 BUILD_REQUIRES="
 	haiku_devel
-	devel:util_macros
 	devel:libxml2
+	devel:util_macros
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
 	cmd:aclocal
-	cmd:make
+	cmd:autoconf
 	cmd:gcc
+	cmd:make
 	cmd:pkg_config
 	cmd:python
 	"
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2.recipe
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2.recipe
@@ -23,14 +23,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/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -41,14 +41,14 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix >= 1.7.0
-	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 >= 1.7.0
 	"

 BUILD()
--- a/x11-proto/xextproto/xextproto-7.3.0.recipe
+++ b/x11-proto/xextproto/xextproto-7.3.0.recipe
@@ -41,14 +41,14 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix >= 1.7.0
-	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 >= 1.7.0
 	"

 BUILD()
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1.recipe
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1.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/x11-proto/xproto/xproto-7.0.23_git.recipe
+++ b/x11-proto/xproto/xproto-7.0.23_git.recipe
@@ -27,14 +27,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/x11-proto/xproto/xproto-7.0.31.recipe
+++ b/x11-proto/xproto/xproto-7.0.31.recipe
@@ -28,14 +28,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()