diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe
index cb52216af..81160dc07 100644
--- a/x11-libs/agg/agg-2.5.recipe
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -4,11 +4,12 @@ Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, \
 written in industrially standard C++.
 "
 HOMEPAGE="https://en.wikipedia.org/wiki/Anti-Grain_Geometry"
+COPYRIGHT="2002-2006 Maxim Shemanarev"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://gnashdev.org/tools/ltib/agg-2.5.tar.gz"
 CHECKSUM_SHA256="ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f"
-REVISION="2"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002-2006 Maxim Shemanarev"
+PATCHES="agg-2.5.patchset"
 
 ARCHITECTURES="!x86_gcc2 !x86"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
@@ -27,6 +28,30 @@ REQUIRES="
 	lib:libpng$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 "
+
+PROVIDES_devel="
+	agg${secondaryArchSuffix}_devel = $portVersion
+	devel:libagg$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggfontfreetype$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libagggpc$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
+"
+REQUIRES_devel="
+	agg$secondaryArchSuffix == $portVersion base
+"
+
+PROVIDES_sdl="
+	agg${secondaryArchSuffix}_sdl = $portVersion
+	lib:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
+"
+REQUIRES_sdl="
+	agg$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libsdl_1.2$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl_1.2$secondaryArchSuffix
@@ -46,7 +71,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	cmd:pkg_config$secondaryArchSuffix
 "
-PATCHES="agg-2.5.patchset"
 
 BUILD()
 {
@@ -80,26 +104,3 @@ INSTALL()
 	packageEntries devel $developDir $dataRootDir/aclocal
 	packageEntries sdl $libDir/libaggplatformsdl*
 }
-
-PROVIDES_devel="
-	agg${secondaryArchSuffix}_devel = $portVersion
-	devel:libagg$secondaryArchSuffix = 2.0.4 compat >= 2
-	devel:libaggfontfreetype$secondaryArchSuffix = 2.0.4 compat >= 2
-	devel:libagggpc$secondaryArchSuffix = 2.0.4 compat >= 2
-	devel:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2
-	devel:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
-"
-REQUIRES_devel="
-	agg$secondaryArchSuffix == $portVersion base
-"
-
-PROVIDES_sdl="
-	agg${secondaryArchSuffix}_sdl = $portVersion
-	lib:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
-"
-REQUIRES_sdl="
-	agg$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix
-	lib:libsdl_1.2$secondaryArchSuffix
-	lib:libGL$secondaryArchSuffix
-"
diff --git a/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe b/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe
index 461f16b05..d55d948fe 100644
--- a/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe
+++ b/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe
@@ -14,8 +14,8 @@ COPYRIGHT="
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/lxde/libfm/archive/$portVersion.tar.gz"
-SOURCE_DIR="libfm-$portVersion"
 CHECKSUM_SHA256="2247e1a19ed24bcd0fcafd989b8c4d29458523399c856798705d6b579fd9565d"
+SOURCE_DIR="libfm-$portVersion"
 
 ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/x11-libs/libfm/libfm-1.3.0.2.recipe b/x11-libs/libfm/libfm-1.3.0.2.recipe
index e65333685..01939b59f 100644
--- a/x11-libs/libfm/libfm-1.3.0.2.recipe
+++ b/x11-libs/libfm/libfm-1.3.0.2.recipe
@@ -19,6 +19,10 @@ CHECKSUM_SHA256="2247e1a19ed24bcd0fcafd989b8c4d29458523399c856798705d6b579fd9565
 ARCHITECTURES="x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/libfm/libfm.conf keep-old
+	"
+
 PROVIDES="
 	libfm$secondaryArchSuffix = $portVersion
 	lib:libfm$secondaryArchSuffix = $portVersion
@@ -62,10 +66,6 @@ BUILD_PREREQUIRES="
 	cmd:which
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/libfm/libfm.conf keep-old
-	"
-
 BUILD()
 {
 	./autogen.sh
diff --git a/x11-libs/scintilla/scintilla-4.1.0.recipe b/x11-libs/scintilla/scintilla-4.1.0.recipe
index afd0b9c1a..d1df83de1 100644
--- a/x11-libs/scintilla/scintilla-4.1.0.recipe
+++ b/x11-libs/scintilla/scintilla-4.1.0.recipe
@@ -16,9 +16,9 @@ LICENSE="Scintilla"
 REVISION="2"
 SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla410.tgz"
 CHECKSUM_SHA256="3b070bd73f612ee91b3251036257c2bfd0c0cd32821e00874faec44d90d9c594"
+SOURCE_DIR="scintilla"
 SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku410.tgz"
 CHECKSUM_SHA256_2="822bdf86af3ac72ee2d88a96412bb0c43b709c52472c354bf36d87eb32165db6"
-SOURCE_DIR="scintilla"
 PATCHES="scintilla-4.1.0.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe b/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe
index aa5dc4347..222c1989f 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe
+++ b/x11-misc/pcmanfm-qt/pcmanfm_qt-0.13.0.recipe
@@ -12,9 +12,9 @@ LICENSE="GNU GPL v2"
 REVISION="2"
 SOURCE_URI="https://github.com/lxqt/pcmanfm-qt/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="3fbb3814780b283d7e27c1858f7f7157ec5d829a09c8b859b21c87c496c16c1b"
-ADDITIONAL_FILES="pcmanfm-qt.rdef.in"
 SOURCE_DIR="pcmanfm-qt-$portVersion"
 PATCHES="pcmanfm_qt-$portVersion.patchset"
+ADDITIONAL_FILES="pcmanfm-qt.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/x11-misc/synergy/synergy-1.5.0.recipe b/x11-misc/synergy/synergy-1.5.0.recipe
index 12edcd8de..28b4ff411 100644
--- a/x11-misc/synergy/synergy-1.5.0.recipe
+++ b/x11-misc/synergy/synergy-1.5.0.recipe
@@ -8,17 +8,17 @@ and open source cross-platform software for sharing one mouse and keyboard \
 between multiple computers on your desk. It works on Windows, Mac OS X and \
 Linux allowing you to seamlessly move your mouse cursor between computers."
 HOMEPAGE="https://symless.com/synergy/"
-REVISION="1"
-LICENSE="GNU GPL v2"
-ARCHITECTURES="x86_gcc2"
 COPYRIGHT="2002 Chris Schoeneman
 2012 Bolton Software Ltd."
-
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="https://github.com/symless/synergy-core/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="91b5bcb17f9337a81ee49fe31e0a32e8d1e38c75325ed76634b39bca96637d8e"
 SOURCE_DIR="synergy-core-$portVersion"
 PATCHES="synergy-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2"
+
 PROVIDES="
 	synergy = $portVersion
 	"
@@ -26,7 +26,6 @@ PROVIDES="
 BUILD_REQUIRES="
 	devel:libcurl
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:cmake