diff --git a/sys-apps/dbus/dbus-1.12.6.recipe b/sys-apps/dbus/dbus-1.12.6.recipe
index b0a391c3f..9a15eb0a7 100644
--- a/sys-apps/dbus/dbus-1.12.6.recipe
+++ b/sys-apps/dbus/dbus-1.12.6.recipe
@@ -20,14 +20,14 @@ CHECKSUM_SHA256="621b902a07badec16c9e43eda43903cd0e1e69e11b13143da71c1889b062f11
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="3.19.6"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
 GLOBAL_WRITABLE_FILES="
 	settings/dbus-1/session.conf keep-old
 	settings/dbus-1/system.conf keep-old
 	"
 
+libVersion="3.19.6"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	dbus$secondaryArchSuffix = $portVersion
 	cmd:dbus_cleanup_sockets = $portVersion
diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe
index 377a1184f..aa64d9561 100644
--- a/sys-apps/findutils/findutils-4.4.2.recipe
+++ b/sys-apps/findutils/findutils-4.4.2.recipe
@@ -12,9 +12,10 @@ The tools supplied with this package are:
 HOMEPAGE="http://www.gnu.org/software/findutils"
 COPYRIGHT="1994-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz"
 CHECKSUM_SHA256="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a"
-REVISION="5"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
@@ -32,6 +33,7 @@ REQUIRES="
 	cmd:sort
 	cmd:tr
 	"
+
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index a197aba1d..a34ce222d 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -12,9 +12,12 @@ DESCRIPTION="
 	few lines of code.
 	"
 HOMEPAGE="http://www.gnu.org/s/gawk"
+COPYRIGHT="1983-2010 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2"
 CHECKSUM_SHA256="5dbc7b2c4c328711337c2aacd09a122c7313122262e3ff034590f014067412b4"
-REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -25,6 +28,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
@@ -55,6 +59,3 @@ TEST()
 {
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1983-2010 Free Software Foundation, Inc."
diff --git a/sys-apps/gawk/gawk-4.1.4.recipe b/sys-apps/gawk/gawk-4.1.4.recipe
index e539930a7..47918f449 100644
--- a/sys-apps/gawk/gawk-4.1.4.recipe
+++ b/sys-apps/gawk/gawk-4.1.4.recipe
@@ -12,14 +12,15 @@ makes it possible to handle simple data-reformatting jobs with just a \
 few lines of code.
 "
 HOMEPAGE="http://www.gnu.org/s/gawk"
+COPYRIGHT="1983-2013 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/gnu/gawk/gawk-$portVersion.tar.gz"
 CHECKSUM_SHA256="8c03080e2b5a56263e8783f6f1f306398d4591be18254041f3f547efef944d35"
-REVISION="2"
-LICENSE="GNU GPL v3"
-COPYRIGHT="1983-2013 Free Software Foundation, Inc."
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 PATCHES="gawk-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	gawk = $portVersion compat >= 4
 	cmd:awk = $portVersion compat >= 3
@@ -29,6 +30,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-apps/gawk/gawk-4.2.0.recipe b/sys-apps/gawk/gawk-4.2.0.recipe
index 3e63f3da2..6bff89fbd 100644
--- a/sys-apps/gawk/gawk-4.2.0.recipe
+++ b/sys-apps/gawk/gawk-4.2.0.recipe
@@ -12,14 +12,14 @@ makes it possible to handle simple data-reformatting jobs with just a \
 few lines of code.
 "
 HOMEPAGE="http://www.gnu.org/s/gawk"
+COPYRIGHT="1983-2017 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/gawk/gawk-$portVersion.tar.gz"
 CHECKSUM_SHA256="c88046c6e8396ee548bcb941e16def809b7b55b60a1044b5dd254094f347c7d9"
-REVISION="1"
-LICENSE="GNU GPL v3"
-COPYRIGHT="1983-2017 Free Software Foundation, Inc."
+PATCHES="gawk-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
-PATCHES="gawk-$portVersion.patchset"
 
 GLOBAL_WRITABLE_FILES="
 	settings/profile.d/gawk.csh keep-old
@@ -36,6 +36,7 @@ REQUIRES="
 	haiku
 	lib:libintl
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/sys-apps/grep/grep-2.22.recipe b/sys-apps/grep/grep-2.22.recipe
index f819893fe..43cebd52e 100644
--- a/sys-apps/grep/grep-2.22.recipe
+++ b/sys-apps/grep/grep-2.22.recipe
@@ -4,15 +4,15 @@ The grep command searches one or more input files for lines containing a match \
 to a specified pattern. By default, grep prints the matching lines.
 "
 HOMEPAGE="http://www.gnu.org/software/grep/"
-LICENSE="GNU GPL v3"
 COPYRIGHT="1992-2014 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
 CHECKSUM_SHA256="ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
 PATCHES="grep-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	grep = $portVersion compat >= 2
 	cmd:egrep = $portVersion compat >= 2
@@ -24,6 +24,7 @@ REQUIRES="
 	lib:libiconv
 	lib:libintl
 	"
+
 BUILD_REQUIRES="
 	devel:libiconv
 	devel:libintl
@@ -44,7 +45,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage grep \
 	$binDir/grep
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/sys-apps/grep/grep-2.24.recipe b/sys-apps/grep/grep-2.24.recipe
index f33a78c8f..0984b84d7 100644
--- a/sys-apps/grep/grep-2.24.recipe
+++ b/sys-apps/grep/grep-2.24.recipe
@@ -44,7 +44,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage grep \
 	$binDir/grep
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/sys-apps/grep/grep-3.1.recipe b/sys-apps/grep/grep-3.1.recipe
index 66d8991fb..fff12dc12 100644
--- a/sys-apps/grep/grep-3.1.recipe
+++ b/sys-apps/grep/grep-3.1.recipe
@@ -43,7 +43,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage grep \
 	$binDir/grep
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index 229b6cc7c..0dc0824c4 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -37,7 +37,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage sed \
 	$binDir/sed
 
-
 BUILD()
 {
 	# First we bootstrap to generate a really boring sed