diff --git a/games-engines/openscenegraph/openscenegraph-3.6.0.recipe b/games-engines/openscenegraph/openscenegraph-3.6.0.recipe
index caa08da85..3067628d0 100644
--- a/games-engines/openscenegraph/openscenegraph-3.6.0.recipe
+++ b/games-engines/openscenegraph/openscenegraph-3.6.0.recipe
@@ -12,14 +12,14 @@ COPYRIGHT="2002-2018 Robert Osfield and others"
 LICENSE="OSGPL"
 REVISION="3"
 SOURCE_URI="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$portVersion.tar.gz"
-CHECKSUM_SHA256='6f57134ea74a39f1c7b24c285e6278cf906c47f6c681573b86d12173a466efed'
+CHECKSUM_SHA256="6f57134ea74a39f1c7b24c285e6278cf906c47f6c681573b86d12173a466efed"
 SOURCE_DIR="OpenSceneGraph-OpenSceneGraph-$portVersion"
 PATCHES="openscenegraph-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion=$portVersion
+libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 libOpenThreadsVersion="3.3.1"
 libOpenThreadsVersionCompat="$libOpenThreadsVersion compat >= ${libOpenThreadsVersion%%.*}"
@@ -54,9 +54,9 @@ REQUIRES="
 	lib:libEGL$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libgdal$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
-	lib:libgif$secondaryArchSuffix
 #	lib:libgstreamer_1.0$secondaryArchSuffix
 	lib:libhalf$secondaryArchSuffix
 	lib:libIlmImf$secondaryArchSuffix
@@ -107,9 +107,9 @@ BUILD_REQUIRES="
 	devel:libEGL$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libgdal$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
-	devel:libgif$secondaryArchSuffix
 #	devel:libgstreamer_1.0$secondaryArchSuffix
 	devel:libhalf$secondaryArchSuffix
 	devel:libIlmImf$secondaryArchSuffix
diff --git a/games-fps/openarena/openarena-0.8.8.recipe b/games-fps/openarena/openarena-0.8.8.recipe
index 73e8a9ac1..118f210d1 100644
--- a/games-fps/openarena/openarena-0.8.8.recipe
+++ b/games-fps/openarena/openarena-0.8.8.recipe
@@ -7,8 +7,8 @@ COPYRIGHT="OpenArena Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/oarena/files/src/openarena-engine-source-$portVersion.tar.bz2"
-SOURCE_DIR="openarena-engine-source-$portVersion"
 CHECKSUM_SHA256="95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77"
+SOURCE_DIR="openarena-engine-source-$portVersion"
 PATCHES="openarena-$portVersion.patchset"
 ADDITIONAL_FILES="openarena.rdef"
 
@@ -28,6 +28,7 @@ REQUIRES="
 	lib:libSDL$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
@@ -46,6 +47,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
 	"
+
 BUILD()
 {
 	make $jobArgs USE_LOCAL_HEADERS=0
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.recipe b/games-puzzle/numptyphysics/numptyphysics-0.3.4.recipe
index 1e95ff16f..de280b501 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.4.recipe
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.4.recipe
@@ -22,28 +22,28 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libBox2D$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libSDL2_image_2.0$secondaryArchSuffix
 	lib:libSDL2_ttf_2.0$secondaryArchSuffix
-	lib:libBox2D$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libBox2D$secondaryArchSuffix
 	devel:libsdl2_2.0$secondaryArchSuffix
 	devel:libSDL2_image_2.0$secondaryArchSuffix
 	devel:libSDL2_ttf_2.0$secondaryArchSuffix
-	devel:libBox2D$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal$secondaryArchSuffix
 	cmd:autoconf$secondaryArchSuffix
 	cmd:automake$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
diff --git a/games-roguelike/nethack/nethack-3.6.0.recipe b/games-roguelike/nethack/nethack-3.6.0.recipe
index 95be7e778..2754af010 100644
--- a/games-roguelike/nethack/nethack-3.6.0.recipe
+++ b/games-roguelike/nethack/nethack-3.6.0.recipe
@@ -15,12 +15,15 @@ PATCHES="nethack-$portVersion.patchset"
 #(it compiles in gcc4, but what is the point if it compiles under gcc2)
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
+GLOBAL_WRITABLE_FILES="
+	settings/nethack directory keep-old
+	"
+
 PROVIDES="
 	nethack = $portVersion
 	cmd:nethack
 	cmd:nethack_bin
 	"
-
 REQUIRES="
 	haiku
 	lib:libncurses >= 6
@@ -30,24 +33,19 @@ BUILD_REQUIRES="
 	haiku_devel
 	devel:libncurses >= 6
 	"
-
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:bison
 	cmd:flex
 	cmd:gcc
-	cmd:install
 	cmd:groff
-	cmd:nroff
+	cmd:install
 	cmd:make
+	cmd:nroff
 	cmd:sed
 	cmd:tbl
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/nethack directory keep-old
-	"
-
 defineDebugInfoPackage nethack \
 	"$binDir"/nethack_bin
 
diff --git a/games-simulation/corsix_th/corsix_th-0.30.recipe b/games-simulation/corsix_th/corsix_th-0.30.recipe
index bb60296ed..7c78d5f86 100644
--- a/games-simulation/corsix_th/corsix_th-0.30.recipe
+++ b/games-simulation/corsix_th/corsix_th-0.30.recipe
@@ -8,45 +8,46 @@ project will serve as a base from which extensions and improvements to the
 original game can be made.
 "
 HOMEPAGE="http://github.com/CorsixTH"
+COPYRIGHT="2005-2013 Corsix"
+LICENSE="MIT"
+REVISION="3"
 SOURCE_URI="https://github.com/CorsixTH/CorsixTH/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4947ebdc50b01fde0aca797250d50b9806b9e6f3f4323872fd914f033f4c92e7"
 SOURCE_FILENAME="CorsixTH-$portVersion.tar.gz"
-REVISION="3"
+SOURCE_DIR="CorsixTH-$portVersion"
+PATCHES="corsix_th-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	corsix_th = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libluajit_5.1$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
-	lib:libavcodec$secondaryArchSuffix
-	lib:libluajit_5.1$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libavcodec$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libluajit_5.1$secondaryArchSuffix
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
-	devel:libavcodec$secondaryArchSuffix
-	devel:libluajit_5.1$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:make
-	cmd:cmake
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-SOURCE_DIR="CorsixTH-$portVersion"
-PATCHES="corsix_th-$portVersion.patchset"
 BUILD()
 {
 	cmake . -DLUA_LIBRARY=/system/$relativeLibDir/libluajit-5.1.so.2.0.2 \
@@ -65,6 +66,3 @@ INSTALL()
 }
 
 # no TEST script available
-
-COPYRIGHT="2005-2013 Corsix"
-LICENSE="MIT"
diff --git a/haiku-apps/sequitur/sequitur-2.1.3.recipe b/haiku-apps/sequitur/sequitur-2.1.3.recipe
index ce7982aad..a94784a01 100644
--- a/haiku-apps/sequitur/sequitur-2.1.3.recipe
+++ b/haiku-apps/sequitur/sequitur-2.1.3.recipe
@@ -19,6 +19,29 @@ slowly rub out MIDI events.
 * Record, edit, and playback note, program change, control change, and pitch \
 bend MIDI data.
 * Read and write standard MIDI files."
+HOMEPAGE="https://github.com/HaikuArchives/Sequitur"
+COPYRIGHT="2001 Eric Hackborn"
+LICENSE="Public Domain"
+REVISION="3"
+SOURCE_URI="https://github.com/HaikuArchives/Sequitur/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="709f4f2d3ec9c251d36deae3ae9041e0183f14fb894c44398a848d791829d094"
+SOURCE_DIR="Sequitur-$portVersion"
+
+ARCHITECTURES="x86_gcc2"
+
+USER_SETTINGS_FILES="
+	settings/Sequitur directory
+	"
+
+PROVIDES="
+	sequitur = $portVersion
+	app:Sequitur = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libpng16
+	lib:libz
+	"
 
 SUMMARY_devices="Legacy device definitions for Sequitur"
 DESCRIPTION_devices="This package contains device definitions for legacy \
@@ -33,27 +56,6 @@ devices for the MIDI sequencer Sequitur. Included are definitions for:
 - Roland MT-32
 - Roland V-Drums TD-8
 - Waldorf MicroQ"
-
-HOMEPAGE="https://github.com/HaikuArchives/Sequitur"
-COPYRIGHT="2001 Eric Hackborn"
-LICENSE="Public Domain"
-REVISION="3"
-SOURCE_URI="https://github.com/HaikuArchives/Sequitur/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="709f4f2d3ec9c251d36deae3ae9041e0183f14fb894c44398a848d791829d094"
-SOURCE_DIR="Sequitur-$portVersion"
-
-ARCHITECTURES="x86_gcc2"
-
-PROVIDES="
-	sequitur = $portVersion
-	app:Sequitur = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libpng16
-	lib:libz
-	"
-
 PROVIDES_devices="
 	sequitur_devices = $portVersion
 	"
@@ -68,8 +70,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 # For the time being the _debuginfo package has to be generated separately, as
@@ -126,10 +128,6 @@ BUILD_PREREQUIRES="
 #	$appsDir/Sequitur/add-ons/Filters/ArpVelocitySplitter \
 #	$appsDir/Sequitur/add-ons/Filters/ArpWipeOut
 
-USER_SETTINGS_FILES="
-	settings/Sequitur directory
-	"
-
 BUILD()
 {
 	cd Sequitur
diff --git a/haiku-apps/thememanager/thememanager-1.0~git.recipe b/haiku-apps/thememanager/thememanager-1.0~git.recipe
index f0c08ecdd..ad485b34c 100644
--- a/haiku-apps/thememanager/thememanager-1.0~git.recipe
+++ b/haiku-apps/thememanager/thememanager-1.0~git.recipe
@@ -4,8 +4,8 @@ with ZETA. Users can choose which part of a theme to apply or save. It can \
 also import BeTheme themes, and to some degree, MS Plus themes. \
 It is add-ons based, so it can be extended."
 HOMEPAGE="https://github.com/mmuman/HaikuThemeManager/"
-LICENSE="MIT"
 COPYRIGHT="2000-2015 François Revol"
+LICENSE="MIT"
 REVISION="3"
 srcGitRev="38a90a92ea0150a4589865e8ce2054e9726f6352"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
@@ -22,6 +22,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 "
+
 #XXX: suggests?
 #thememanager_themes
 BUILD_REQUIRES="
@@ -29,10 +30,10 @@ BUILD_REQUIRES="
 "
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:git
 	cmd:gcc
-	cmd:make
+	cmd:git
 	cmd:ld
+	cmd:make
 "
 
 BUILD()
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.8a.recipe b/haiku-apps/yab_ide/yab_ide-2.2.8a.recipe
index 6b7704ff0..742ce2892 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.8a.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.8a.recipe
@@ -22,11 +22,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	lib:libz
 	yab >= 1.7.5.5
-	devel:libz
+	devel:libz # needed to build and for the BuildFactory to do its work
+	lib:libz
 	"
-# devel:libz is needed both to build and for the BuildFactory to do its work.
 
 BUILD_REQUIRES="
 	haiku_devel
diff --git a/media-video/mpv/mpv-0.29.0.recipe b/media-video/mpv/mpv-0.29.0.recipe
index b0e61d52b..d54e1b651 100644
--- a/media-video/mpv/mpv-0.29.0.recipe
+++ b/media-video/mpv/mpv-0.29.0.recipe
@@ -22,8 +22,8 @@ GLOBAL_WRITABLE_FILES="settings/mpv/encoding-profiles.conf keep-old"
 
 PROVIDES="
 	mpv$secondaryArchSuffix = $portVersion
-	lib:libmpv$secondaryArchSuffix = 1.101.0 compat >= 1
 	cmd:mpv$secondaryArchSuffix = $portVersion compat >= 0.29
+	lib:libmpv$secondaryArchSuffix = 1.101.0 compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -52,8 +52,8 @@ PROVIDES_devel="
 	devel:libmpv$secondaryArchSuffix = 1.101.0 compat >= 1
 	"
 REQUIRES_devel="
-	mpv$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	mpv$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
diff --git a/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe b/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
index 72e85a407..f53ae6f15 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
+++ b/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
@@ -21,17 +21,17 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rtmpdump$secondaryArchSuffix = $portVersion compat >= 2.4
-	lib:librtmp.1$secondaryArchSuffix = 1 compat >= 1
 	cmd:rtmpdump = $portVersion compat >= 2.4
 	cmd:rtmpgw = $portVersion compat >= 2.4
 	cmd:rtmpsrv = $portVersion compat >= 2.4
 	cmd:rtmpsuck = $portVersion compat >= 2.4
+	lib:librtmp.1$secondaryArchSuffix = 1 compat >= 1
 	"
 # commands are provided in /bin regardless
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -45,13 +45,13 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libz$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:awk
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
diff --git a/media-video/vcdgear/vcdgear-1.1.recipe b/media-video/vcdgear/vcdgear-1.1.recipe
index e13fc8a1e..46ae1d49b 100644
--- a/media-video/vcdgear/vcdgear-1.1.recipe
+++ b/media-video/vcdgear/vcdgear-1.1.recipe
@@ -20,9 +20,9 @@ REVISION="1"
 # Looks like we need the cmd from version 1.1 but also the add-on from version 1.0.1
 SOURCE_URI="http://www.vcdgear.com/files/VCDGear_1.1_beos5.zip"
 CHECKSUM_SHA256="21e91fc079e1a7db4c453dd72f92d978eb444f5fc7d09f091bb9834dc8c6c778"
+SOURCE_DIR="VCDGear"
 SOURCE_URI_2="http://www.vcdgear.com/files/VCDGear_f_Be_R5_101.zip"
 CHECKSUM_SHA256_2="a880196b29ca6c2df27c4192c33b0c2de59ceb963c399457af8736aaf1ba4f0c"
-SOURCE_DIR="VCDGear"
 SOURCE_DIR_2="VCDGear_for_BeOS_R5_v1.0.1"
 
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
@@ -30,8 +30,8 @@ DISABLE_SOURCE_PACKAGE="yes"
 
 PROVIDES="
 	vcdgear = $portVersion
-	cmd:VCDGear
 	add_on:vcd_fs
+	cmd:VCDGear
 	"
 REQUIRES="
 	haiku
diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe
index 3277d95d9..c3e553edb 100644
--- a/media-video/vlc/vlc-0.8.6i.recipe
+++ b/media-video/vlc/vlc-0.8.6i.recipe
@@ -23,17 +23,16 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liba52$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix == 53.61.100
-	lib:libdvdcss$secondaryArchSuffix
 #	lib:libdvbpsi$secondaryArchSuffix >= 9
-	lib:libintl$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
+	lib:libdvdcss$secondaryArchSuffix
 	lib:libgnutls$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	vlc${secondaryArchSuffix}_devel = $portVersion
-	devel:libvlc$secondaryArchSuffix
 	devel:libbeos$secondaryArchSuffix
 	devel:libi420_rgb_mmx$secondaryArchSuffix
 	devel:libi420_ymga_mmx$secondaryArchSuffix
@@ -42,12 +41,13 @@ PROVIDES_devel="
 	devel:libmemcpy3dn$secondaryArchSuffix
 	devel:libmemcpymmx$secondaryArchSuffix
 	devel:libmemcpymmxext$secondaryArchSuffix
+	devel:libvlc$secondaryArchSuffix
 	"
 REQUIRES_devel="
 	vlc == $portVersion base
 #	devel:libdvbpsi$secondaryArchSuffix >= 9
-	devel:libintl$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -79,36 +79,35 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libmad$secondaryArchSuffix
 	devel:libmatroska$secondaryArchSuffix
+	devel:libmodplug$secondaryArchSuffix
 	devel:libmp3lame$secondaryArchSuffix
 	devel:libmpcdec$secondaryArchSuffix
 	devel:libmpeg2$secondaryArchSuffix
-	devel:libmodplug$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libpostproc$secondaryArchSuffix
 	devel:libsmbclient$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
-	devel:libvcdinfo$secondaryArchSuffix
 	devel:libtwolame$secondaryArchSuffix
+	devel:libvcdinfo$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 #	We need a recipe for an old version of this that will still build with gcc2.
 #	devel:libx264$secondaryArchSuffix
-
 BUILD_PREREQUIRES="
+	cmd:ar$secondaryArchSuffix
 	cmd:autoconf
 	cmd:bison
 	cmd:gcc$secondaryArchSuffix
-	cmd:ar$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
-	cmd:xargs
 	cmd:which
+	cmd:xargs
 	"
 
 BUILD()
diff --git a/net-libs/libasr/libasr-1.0.2.recipe b/net-libs/libasr/libasr-1.0.2.recipe
index 574dc3aef..9a3ed55fc 100644
--- a/net-libs/libasr/libasr-1.0.2.recipe
+++ b/net-libs/libasr/libasr-1.0.2.recipe
@@ -28,8 +28,8 @@ COPYRIGHT="2001 Jakob Schlyter
 LICENSE="BSD (2-clause)"
 REVISION="5"
 SOURCE_URI="https://github.com/OpenSMTPD/libasr/archive/libasr-$portVersion.tar.gz"
-SOURCE_DIR="libasr-libasr-$portVersion"
 CHECKSUM_SHA256="4ab54264206e255fd6c2de982764bb5ce7857ec8f649ad3ee45771244593b6e1"
+SOURCE_DIR="libasr-libasr-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -58,8 +58,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
 	cmd:libtoolize
+	cmd:make
 	"
 
 BUILD()
diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe
index d887504df..c13b1c766 100644
--- a/net-misc/muscle/muscle-6.00.recipe
+++ b/net-misc/muscle/muscle-6.00.recipe
@@ -13,12 +13,14 @@ In addition to the client-server \
 system, MUSCLE contains classes to support peer-to-peer message streaming \
 connections, as well as some handy miscellaneous utility classes.
 "
+HOMEPAGE="https://public.msli.com/lcs/muscle/index.html"
 COPYRIGHT="2000-2009 Meyer Sound Laboratories Inc."
 LICENSE="BSD (3-clause)"
-HOMEPAGE="https://public.msli.com/lcs/muscle/index.html"
+REVISION="3"
 SOURCE_URI="https://public.msli.com/lcs/muscle/muscle6.00.zip"
 CHECKSUM_SHA256="b12abe12b5cc4aa93126f86ae07a4bcd02ee8d89d692789435debd5becc53437"
-REVISION="3"
+SOURCE_DIR="muscle"
+PATCHES="muscle-6.00.patchset"
 
 #TODO:enable multithreading for the devel package!
 
@@ -33,6 +35,16 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	muscle${secondaryArchSuffix}_devel = $portVersion
+	devel:libmuscle$secondaryArchSuffix = $portVersion
+	devel:muscle$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	muscle$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
@@ -43,10 +55,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="muscle"
-
-PATCHES="muscle-6.00.patchset"
-
 BUILD()
 {
 	if [ $effectiveTargetArchitecture == x86_64 ]; then
@@ -79,12 +87,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir
 }
-
-PROVIDES_devel="
-	muscle${secondaryArchSuffix}_devel = $portVersion
-	devel:muscle$secondaryArchSuffix = $portVersion
-	devel:libmuscle$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	muscle$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-misc/openssh/openssh-7.0p1.recipe b/net-misc/openssh/openssh-7.0p1.recipe
index 1eab3f4c7..ee41e1dc3 100644
--- a/net-misc/openssh/openssh-7.0p1.recipe
+++ b/net-misc/openssh/openssh-7.0p1.recipe
@@ -22,10 +22,24 @@ CHECKSUM_SHA256="fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
+ADDITIONAL_FILES="sshd_keymaker.sh"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-ADDITIONAL_FILES="sshd_keymaker.sh"
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
 
 PROVIDES="
 	openssh = $portVersion compat >= 5
@@ -72,21 +86,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.1p1.recipe b/net-misc/openssh/openssh-7.1p1.recipe
index 2d657cf6c..b675d8932 100644
--- a/net-misc/openssh/openssh-7.1p1.recipe
+++ b/net-misc/openssh/openssh-7.1p1.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad842
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -77,26 +96,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.1p2.recipe b/net-misc/openssh/openssh-7.1p2.recipe
index 8dd8cb5ac..f15ab84d8 100644
--- a/net-misc/openssh/openssh-7.1p2.recipe
+++ b/net-misc/openssh/openssh-7.1p2.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bb
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -77,26 +96,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.2p2.recipe b/net-misc/openssh/openssh-7.2p2.recipe
index e32e00c75..f95a78740 100644
--- a/net-misc/openssh/openssh-7.2p2.recipe
+++ b/net-misc/openssh/openssh-7.2p2.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -76,26 +95,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.4p1.recipe b/net-misc/openssh/openssh-7.4p1.recipe
index ac68eed66..ebf8af56c 100644
--- a/net-misc/openssh/openssh-7.4p1.recipe
+++ b/net-misc/openssh/openssh-7.4p1.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -76,26 +95,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.5p1.recipe b/net-misc/openssh/openssh-7.5p1.recipe
index 0da9437c5..3aa9b7c18 100644
--- a/net-misc/openssh/openssh-7.5p1.recipe
+++ b/net-misc/openssh/openssh-7.5p1.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -76,26 +95,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/openssh/openssh-7.6p1.recipe b/net-misc/openssh/openssh-7.6p1.recipe
index 9cc6b6fa3..390b7c093 100644
--- a/net-misc/openssh/openssh-7.6p1.recipe
+++ b/net-misc/openssh/openssh-7.6p1.recipe
@@ -22,14 +22,33 @@ CHECKSUM_SHA256="a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d2172
 PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	settings/ssh/ssh_config keep-old
+	settings/ssh/sshd_config keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	settings/ssh/ssh_config template data/openssh/ssh_config.default
+	settings/ssh/sshd_config template data/openssh/sshd_config.default
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	$relativePostInstallDir/fix_openssh_config_paths.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
 PROVIDES="
 	openssh = $portVersion compat >= 5
 	cmd:scp = $portVersion compat >= 5
@@ -76,26 +95,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
 PATCH()
 {
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
diff --git a/net-misc/qputty/qputty-506.recipe b/net-misc/qputty/qputty-506.recipe
index 2e8dafef4..5b0846c2f 100644
--- a/net-misc/qputty/qputty-506.recipe
+++ b/net-misc/qputty/qputty-506.recipe
@@ -15,16 +15,15 @@ LICENSE="MIT
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/dsmorozov/qputty-qt5/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="e79e356eb7d04f8ec133ce1094cfb54c7c4b540d6cc05e5f224111909c261973"
 SOURCE_FILENAME="qputty-qt5-$portVersion.tar.gz"
 SOURCE_DIR="qputty-qt5-$portVersion"
-CHECKSUM_SHA256="e79e356eb7d04f8ec133ce1094cfb54c7c4b540d6cc05e5f224111909c261973"
-PATCHES="qputty-$portVersion.patchset"
 puttyVersion="0.70"
 SOURCE_URI_2="http://the.earth.li/~sgtatham/putty/latest/putty-$puttyVersion.tar.gz"
-SOURCE_DIR_2="putty-$puttyVersion"
 CHECKSUM_SHA256_2="bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be"
+SOURCE_DIR_2="putty-$puttyVersion"
+PATCHES="qputty-$portVersion.patchset"
 PATCHES_2="putty-$puttyVersion.patchset"
-
 ADDITIONAL_FILES="qputty.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/net-p2p/transmission/transmission-2.94.recipe b/net-p2p/transmission/transmission-2.94.recipe
index 7aafb685f..298489207 100644
--- a/net-p2p/transmission/transmission-2.94.recipe
+++ b/net-p2p/transmission/transmission-2.94.recipe
@@ -29,6 +29,12 @@ ADDITIONAL_FILES="transmission.rdef.in
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+transmissionUserHomeDir="$dataDir"/transmission/empty
+PACKAGE_USERS="
+	transmissiond real-name \"transmission user\" home \"$transmissionUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="transmissiond"
+
 PROVIDES="
 	transmission$secondaryArchSuffix = $portVersion
 	app:Transmission
@@ -80,9 +86,9 @@ BUILD_PREREQUIRES="
 	cmd:curl
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
 	cmd:make
 	cmd:patch
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:tar
 	"
 
@@ -95,12 +101,6 @@ defineDebugInfoPackage transmission$secondaryArchSuffix \
 	"$binDir"/transmission-remote \
 	"$binDir"/transmission-show
 
-transmissionUserHomeDir="$dataDir"/transmission/empty
-PACKAGE_USERS="
-	transmissiond real-name \"transmission user\" home \"$transmissionUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="transmissiond"
-
 BUILD()
 {
 	mkdir -p build