diff --git a/app-arch/exomizer/exomizer-2.0.7.recipe b/app-arch/exomizer/exomizer-2.0.7.recipe
index 0f6dc5bb5..47943822e 100644
--- a/app-arch/exomizer/exomizer-2.0.7.recipe
+++ b/app-arch/exomizer/exomizer-2.0.7.recipe
@@ -47,13 +47,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:flex
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/app-benchmarks/vttest/vttest-20140305.recipe b/app-benchmarks/vttest/vttest-20140305.recipe
index 585813716..732000e96 100644
--- a/app-benchmarks/vttest/vttest-20140305.recipe
+++ b/app-benchmarks/vttest/vttest-20140305.recipe
@@ -29,7 +29,7 @@ BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe
index cf8835653..ca2e164d5 100644
--- a/app-crypt/gnupg/gnupg-1.4.11.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.11.recipe
@@ -15,7 +15,8 @@ PATCHES="gnupg-1.4.11.patch"
 
 ARCHITECTURES="x86  x86_gcc2"
 
-PROVIDES="gnupg = $portVersion
+PROVIDES="
+	gnupg = $portVersion
 	cmd:gpg = $portVersion compat >= 1.4
 	cmd:gpg_zip = $portVersion compat >= 1.4
 	cmd:gpgsplit = $portVersion compat >= 1.4
diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe
index 04b53d89b..5ec0b216e 100644
--- a/app-crypt/gnupg/gnupg-1.4.16.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.16.recipe
@@ -15,7 +15,8 @@ PATCHES="gnupg-1.4.16.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PROVIDES="gnupg = $portVersion
+PROVIDES="
+	gnupg = $portVersion
 	cmd:gpg = $portVersion compat >= 1.4
 	cmd:gpg_zip = $portVersion compat >= 1.4
 	cmd:gpgsplit = $portVersion compat >= 1.4
diff --git a/app-crypt/gnupg/gnupg-1.4.20.recipe b/app-crypt/gnupg/gnupg-1.4.20.recipe
index 7e3852c3d..d11f5cfea 100644
--- a/app-crypt/gnupg/gnupg-1.4.20.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.20.recipe
@@ -15,7 +15,8 @@ PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PROVIDES="gnupg = $portVersion
+PROVIDES="
+	gnupg = $portVersion
 	cmd:gpg = $portVersion compat >= 1.4
 	cmd:gpg_zip = $portVersion compat >= 1.4
 	cmd:gpgsplit = $portVersion compat >= 1.4
diff --git a/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe b/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
index ef23a4d60..a18da399a 100644
--- a/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
+++ b/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
@@ -45,13 +45,13 @@ BUILD_REQUIRES="
 	devel:libgcrypt
 	devel:libspectrum
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
diff --git a/app-emulation/fuse/fuse-1.1.1.recipe b/app-emulation/fuse/fuse-1.1.1.recipe
index a367cb277..f7586992b 100644
--- a/app-emulation/fuse/fuse-1.1.1.recipe
+++ b/app-emulation/fuse/fuse-1.1.1.recipe
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	devel:libspectrum
 	devel:libxml2
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:bison
@@ -58,7 +58,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
diff --git a/app-emulation/libspectrum/libspectrum-1.1.1.recipe b/app-emulation/libspectrum/libspectrum-1.1.1.recipe
index 676e9a9af..705e233f1 100644
--- a/app-emulation/libspectrum/libspectrum-1.1.1.recipe
+++ b/app-emulation/libspectrum/libspectrum-1.1.1.recipe
@@ -36,14 +36,14 @@ BUILD_REQUIRES="
 	devel:libbz2
 	devel:libgcrypt
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
diff --git a/app-emulation/uade/uade-2.13.recipe b/app-emulation/uade/uade-2.13.recipe
index 9c4948dc6..13e849155 100644
--- a/app-emulation/uade/uade-2.13.recipe
+++ b/app-emulation/uade/uade-2.13.recipe
@@ -47,13 +47,13 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libao
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config
 	cmd:which
-"
+	"
 
 BUILD()
 {
diff --git a/app-mobilephone/dfu-util/dfu_util-0.8.recipe b/app-mobilephone/dfu-util/dfu_util-0.8.recipe
index e72ac2e35..6b219813a 100644
--- a/app-mobilephone/dfu-util/dfu_util-0.8.recipe
+++ b/app-mobilephone/dfu-util/dfu_util-0.8.recipe
@@ -28,14 +28,14 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	devel:libusb_1.0
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/app-office/abiword/abiword-2.4.recipe b/app-office/abiword/abiword-2.4.recipe
index 12bd5ffcc..54317b2a9 100644
--- a/app-office/abiword/abiword-2.4.recipe
+++ b/app-office/abiword/abiword-2.4.recipe
@@ -38,13 +38,13 @@ BUILD_REQUIRES="
 	devel:libpsiconv
 	devel:libxml2
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
-"
+	"
 
 BUILD()
 {
diff --git a/app-shells/mksh/mksh-r50c.recipe b/app-shells/mksh/mksh-r50c.recipe
index c3f0f873b..729a40d1d 100644
--- a/app-shells/mksh/mksh-r50c.recipe
+++ b/app-shells/mksh/mksh-r50c.recipe
@@ -37,7 +37,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:nroff
 	cmd:perl
-"
+	"
 
 BUILD()
 {
diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe
index 454fd1895..0aaa07f00 100644
--- a/app-text/libpaper/libpaper-1.1.24.recipe
+++ b/app-text/libpaper/libpaper-1.1.24.recipe
@@ -28,7 +28,7 @@ PROVIDES_devel="
 	devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1
 	"
 REQUIRES_devel="
-	libpaper$secondaryArchSuffix  == $portVersion base
+	libpaper$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
diff --git a/app-text/xmlroff/xmlroff-0.6.2.recipe b/app-text/xmlroff/xmlroff-0.6.2.recipe
index 66d287cd7..f7411bd34 100644
--- a/app-text/xmlroff/xmlroff-0.6.2.recipe
+++ b/app-text/xmlroff/xmlroff-0.6.2.recipe
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libpango_1.0$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	docbook_xsl_stylesheets
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
@@ -68,7 +68,7 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/dev-cpp/mxml/mxml-2.6.recipe b/dev-cpp/mxml/mxml-2.6.recipe
index ba4d3d839..f64d351cd 100644
--- a/dev-cpp/mxml/mxml-2.6.recipe
+++ b/dev-cpp/mxml/mxml-2.6.recipe
@@ -32,7 +32,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
@@ -40,7 +40,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
-"
+	"
 
 BUILD()
 {
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.3.recipe b/dev-cpp/sparsehash/sparsehash-2.0.3.recipe
index 3c528eb57..f28f762cd 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.3.recipe
+++ b/dev-cpp/sparsehash/sparsehash-2.0.3.recipe
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe b/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
index 7edc0eb66..ddb65c59f 100644
--- a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
+++ b/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
-"
+	"
 
 BUILD()
 {
diff --git a/dev-dotnet/pnet/pnet-0.8.0.recipe b/dev-dotnet/pnet/pnet-0.8.0.recipe
index e4328b0a8..1e8bf6a44 100644
--- a/dev-dotnet/pnet/pnet-0.8.0.recipe
+++ b/dev-dotnet/pnet/pnet-0.8.0.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	lib:libpnet = $portVersion
 	cmd:al
 	cmd:cli_unknown_ar
-    cmd:cli_unknown_cpp
+	cmd:cli_unknown_cpp
 	cmd:cli_unknown_gcc
 	cmd:cli_unknown_ranlib
 	cmd:cli_unknown_size
diff --git a/dev-embedded/avra/avra-1.3.0.recipe b/dev-embedded/avra/avra-1.3.0.recipe
index e4b8c5a19..01da27808 100644
--- a/dev-embedded/avra/avra-1.3.0.recipe
+++ b/dev-embedded/avra/avra-1.3.0.recipe
@@ -25,7 +25,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-embedded/cpcsdk/cpctools-0.3.0.recipe b/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
index 71af0f872..8c3951068 100644
--- a/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
+++ b/dev-embedded/cpcsdk/cpctools-0.3.0.recipe
@@ -47,12 +47,12 @@ BUILD_REQUIRES="
 	devel:libdsk
 	devel:libpng
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-embedded/d52/d52-3.4.1.recipe b/dev-embedded/d52/d52-3.4.1.recipe
index 9763e921e..1c27f883a 100644
--- a/dev-embedded/d52/d52-3.4.1.recipe
+++ b/dev-embedded/d52/d52-3.4.1.recipe
@@ -31,11 +31,11 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-games/box2d/box2d-2.1.2.recipe b/dev-games/box2d/box2d-2.1.2.recipe
index 244c996a5..11d988e1d 100644
--- a/dev-games/box2d/box2d-2.1.2.recipe
+++ b/dev-games/box2d/box2d-2.1.2.recipe
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	devel:libgl
 	devel:libglu
-"
+	"
 
 BUILD()
 {
diff --git a/dev-games/fifechan/fifechan-0.1.2.recipe b/dev-games/fifechan/fifechan-0.1.2.recipe
index 09740b69a..5c6244416 100644
--- a/dev-games/fifechan/fifechan-0.1.2.recipe
+++ b/dev-games/fifechan/fifechan-0.1.2.recipe
@@ -39,14 +39,14 @@ BUILD_REQUIRES="
 	devel:libgl
 	devel:libsdl
 	devel:libsdl_image
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:make
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
-"
+	"
 
 BUILD()
 {
diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
index 75e01ac10..79979cd12 100644
--- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
+++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
@@ -32,7 +32,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
@@ -41,7 +41,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	# at least one java VM, for now just use jamvm
 	cmd:jamvm$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/dev-lang/tcc/tcc-0.9.26.recipe b/dev-lang/tcc/tcc-0.9.26.recipe
index 976216d21..e7686eb9a 100644
--- a/dev-lang/tcc/tcc-0.9.26.recipe
+++ b/dev-lang/tcc/tcc-0.9.26.recipe
@@ -48,7 +48,7 @@ BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-lang/tcl/tcl-8.5.18.recipe b/dev-lang/tcl/tcl-8.5.18.recipe
index d3d021cc9..96a72fb4c 100644
--- a/dev-lang/tcl/tcl-8.5.18.recipe
+++ b/dev-lang/tcl/tcl-8.5.18.recipe
@@ -35,7 +35,7 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:autoconf
diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe
index 41d6c61bd..690b33acd 100644
--- a/dev-lang/tcl/tcl-8.5.9.recipe
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -35,7 +35,7 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:autoconf
diff --git a/dev-lang/vasm/vasm-1.7c.recipe b/dev-lang/vasm/vasm-1.7c.recipe
index 203711b35..43e2364fc 100644
--- a/dev-lang/vasm/vasm-1.7c.recipe
+++ b/dev-lang/vasm/vasm-1.7c.recipe
@@ -61,11 +61,11 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-lang/vlink/vlink-0.15.recipe b/dev-lang/vlink/vlink-0.15.recipe
index 0734baed8..e64d35056 100644
--- a/dev-lang/vlink/vlink-0.15.recipe
+++ b/dev-lang/vlink/vlink-0.15.recipe
@@ -60,11 +60,11 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index bd21418c2..0b9d4ef95 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -47,7 +47,7 @@ PROVIDES_devel="
 	devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
 	"
 REQUIRES_devel="
-	libevent$secondaryArchSuffix  == $portVersion base
+	libevent$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
index 386ff069b..4c223771e 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
@@ -32,7 +32,7 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-libs/libparserutils/libparserutils-0.2.0.recipe b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
index 870f4fbf4..5fbfef0e9 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.0.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
@@ -30,7 +30,6 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv${secondaryArchSuffix}
-
 	lib:libiconv${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/libparserutils/libparserutils-0.2.1.recipe b/dev-libs/libparserutils/libparserutils-0.2.1.recipe
index 433d7688e..5ac26556e 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.1.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.2.1.recipe
@@ -30,7 +30,6 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv${secondaryArchSuffix}
-
 	lib:libiconv${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.recipe b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
index 587fcfab8..b45a5fa26 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.recipe
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
@@ -33,13 +33,13 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
index 9e6f90bbe..3aa1a0f3a 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
@@ -8,17 +8,22 @@ SOURCE_URI="git+git://github.com/weinhold/libsolv.git#85dcb683b0c705c1789a3f688b
 
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="libsolv = $portVersion
+PROVIDES="
+	libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion
 	"
-REQUIRES="haiku
+REQUIRES="
+	haiku
 	lib:libexpat >= 1.5
 	lib:libz
 	"
 
-BUILD_REQUIRES="$REQUIRES"
-BUILD_PREREQUIRES="haiku_devel
+BUILD_REQUIRES="
+	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
index 480aa22bc..3ef4ebbd3 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
@@ -8,17 +8,22 @@ SOURCE_URI="git+git://github.com/weinhold/libsolv.git#162ae79ad078caa7bb9c3ca44a
 
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="libsolv = $portVersion
+PROVIDES="
+	libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion
 	"
-REQUIRES="haiku
+REQUIRES="
+	haiku
 	lib:libexpat >= 1.5
 	lib:libz
 	"
 
-BUILD_REQUIRES="$REQUIRES"
-BUILD_PREREQUIRES="haiku_devel
+BUILD_REQUIRES="
+	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
diff --git a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
index 967fcd534..1a3c359da 100644
--- a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
+++ b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
@@ -8,8 +8,7 @@ LICENSE="GNU LGPL v2"
 REVISION="3"
 SOURCE_URI="ftp://sourceforge.mirrorservice.org/sites/downloads.sourceforge.net/l/li/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2"
 CHECKSUM_SHA256="404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
-SOURCE_DIR=libusb-compat-$portVersion
-PATCHES="libusb_compat-0.1.5.patchset"
+SOURCE_DIR=libusb-compat-$portVersionPATCHES="libusb_compat-0.1.5.patchset"
 
 ARCHITECTURES="x86 x86_64 x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86"
diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe
index f03674bad..fb17340df 100644
--- a/dev-libs/libuv/libuv-1.2.0.recipe
+++ b/dev-libs/libuv/libuv-1.2.0.recipe
@@ -31,7 +31,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -41,7 +41,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:libtoolize
 	cmd:gyp
-"
+	"
 
 BUILD()
 {
diff --git a/dev-libs/udis86/udis86-1.7.2.recipe b/dev-libs/udis86/udis86-1.7.2.recipe
index ee4d7008d..5151f3843 100644
--- a/dev-libs/udis86/udis86-1.7.2.recipe
+++ b/dev-libs/udis86/udis86-1.7.2.recipe
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	cmd:python
 	cmd:sh
 	cmd:yasm
-"
+	"
 
 BUILD()
 {
diff --git a/dev-python/imaging/python_imaging-1.1.7.recipe b/dev-python/imaging/python_imaging-1.1.7.recipe
index 90c63f3fe..4f6ab0def 100644
--- a/dev-python/imaging/python_imaging-1.1.7.recipe
+++ b/dev-python/imaging/python_imaging-1.1.7.recipe
@@ -32,12 +32,12 @@ REQUIRES="
 BUILD_REQUIRES="
 	devel:libjpeg
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel$secondaryArchSuffix
 	cmd:gcc
 	cmd:python
-"
+	"
 
 BUILD()
 {
diff --git a/dev-util/byacc/byacc-20150711.recipe b/dev-util/byacc/byacc-20150711.recipe
index 5b6ce4793..015115c9a 100644
--- a/dev-util/byacc/byacc-20150711.recipe
+++ b/dev-util/byacc/byacc-20150711.recipe
@@ -22,14 +22,14 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:cmp
-"
+	"
 
 BUILD()
 {
diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe
index 71615dea4..d8296283e 100644
--- a/dev-util/indent/indent-2.2.10.recipe
+++ b/dev-util/indent/indent-2.2.10.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-    lib:libiconv$secondaryArchSuffix
-    lib:libintl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel
+	haiku${secondaryArchSuffix}_devel
 	gettext$secondaryArchSuffix
-    "
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-util/premake/premake-4.4.beta5.recipe b/dev-util/premake/premake-4.4.beta5.recipe
index a0318365a..ebb9c6e84 100644
--- a/dev-util/premake/premake-4.4.beta5.recipe
+++ b/dev-util/premake/premake-4.4.beta5.recipe
@@ -25,12 +25,12 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 PATCH()
 {
diff --git a/dev-util/radare2/radare2-0.9.9.recipe b/dev-util/radare2/radare2-0.9.9.recipe
index 0386131a6..1867b8a8f 100644
--- a/dev-util/radare2/radare2-0.9.9.recipe
+++ b/dev-util/radare2/radare2-0.9.9.recipe
@@ -73,14 +73,14 @@ BUILD_REQUIRES="
 	devel:liblua$secondaryArchSuffix
 	devel:libmagic$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/dev-vcs/hub/hub-1.12.4.recipe b/dev-vcs/hub/hub-1.12.4.recipe
index 05a2b5fba..5daf2da95 100644
--- a/dev-vcs/hub/hub-1.12.4.recipe
+++ b/dev-vcs/hub/hub-1.12.4.recipe
@@ -22,7 +22,7 @@ REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:ruby
 	cmd:rake
-"
+	"
 
 PATCH()
 {
diff --git a/games-action/barrage/barrage-1.0.4.recipe b/games-action/barrage/barrage-1.0.4.recipe
index 5a62298f6..ac9b7a1f5 100644
--- a/games-action/barrage/barrage-1.0.4.recipe
+++ b/games-action/barrage/barrage-1.0.4.recipe
@@ -29,13 +29,13 @@ BUILD_REQUIRES="
 	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-"
+	"
 
 BUILD()
 {
diff --git a/games-arcade/freegish/freegish-1.0.recipe b/games-arcade/freegish/freegish-1.0.recipe
index 279dcbaa0..e0a783a22 100644
--- a/games-arcade/freegish/freegish-1.0.recipe
+++ b/games-arcade/freegish/freegish-1.0.recipe
@@ -39,7 +39,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/games-board/dreamchess/dreamchess-0.2.0.recipe b/games-board/dreamchess/dreamchess-0.2.0.recipe
index aac0758bc..d5e8192da 100644
--- a/games-board/dreamchess/dreamchess-0.2.0.recipe
+++ b/games-board/dreamchess/dreamchess-0.2.0.recipe
@@ -42,13 +42,13 @@ BUILD_REQUIRES="
 	devel:libsdl
 	devel:libsdl_image
 	devel:mxml
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:find
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/games-board/gnuchess/gnuchess-6.2.1.recipe b/games-board/gnuchess/gnuchess-6.2.1.recipe
index 3a7f5ca41..c402db329 100644
--- a/games-board/gnuchess/gnuchess-6.2.1.recipe
+++ b/games-board/gnuchess/gnuchess-6.2.1.recipe
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:awk
-"
+	"
 
 BUILD()
 {
diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe
index 192ad57cd..75060a666 100644
--- a/games-emulation/dosbox/dosbox-0.74.recipe
+++ b/games-emulation/dosbox/dosbox-0.74.recipe
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	devel:libsdl_net$secondaryArchSuffix
 	devel:libsdl_sound$secondaryArchSuffix
 	libsdl${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:libtoolize
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
index fd836234d..9a60a9ff2 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
@@ -11,7 +11,7 @@ PATCHES="
 	Util.patch
 	Makefile.am.patch
 	configure.in.patch
-"
+	"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	devel:libsdl_mixer$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:nasm
 	cmd:make
@@ -44,7 +44,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:aclocal
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-emulation/z26/z26-2.16.00s.recipe b/games-emulation/z26/z26-2.16.00s.recipe
index 8b0f8a706..d8c591bc8 100644
--- a/games-emulation/z26/z26-2.16.00s.recipe
+++ b/games-emulation/z26/z26-2.16.00s.recipe
@@ -25,13 +25,13 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl${secondaryArchSuffix}
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:nasm
 	cmd:ld$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/fife/fife-0.4.0~20150801.recipe b/games-engines/fife/fife-0.4.0~20150801.recipe
index 6d4fbd10d..d57bf2ea6 100644
--- a/games-engines/fife/fife-0.4.0~20150801.recipe
+++ b/games-engines/fife/fife-0.4.0~20150801.recipe
@@ -49,13 +49,13 @@ BUILD_REQUIRES="
 	devel:libsdl_ttf
 	devel:libvorbisfile
 	devel:libz
-"
+	"
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
 	cmd:scons
 	cmd:swig
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe
index 01762afcd..db1c5908e 100644
--- a/games-engines/gemrb/gemrb-0.8.1.recipe
+++ b/games-engines/gemrb/gemrb-0.8.1.recipe
@@ -30,7 +30,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl_1.2$secondaryArchSuffix
- 	devel:libz$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/games-engines/hugo/hugo-3.1.03.recipe b/games-engines/hugo/hugo-3.1.03.recipe
index 5c6468cbe..7f937fbdc 100644
--- a/games-engines/hugo/hugo-3.1.03.recipe
+++ b/games-engines/hugo/hugo-3.1.03.recipe
@@ -29,12 +29,12 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
index eefee632f..aeb4057e1 100644
--- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
+++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
@@ -86,14 +86,14 @@ BUILD_REQUIRES="
 	devel:libcurl$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:cmake
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe
index 632d4c9cd..5235e81e9 100644
--- a/games-engines/openscenegraph/openscenegraph-git.recipe
+++ b/games-engines/openscenegraph/openscenegraph-git.recipe
@@ -87,14 +87,14 @@ BUILD_REQUIRES="
 	devel:libcurl$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:cmake
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
index 2d5b3a75f..b28b33dc7 100644
--- a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
+++ b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
@@ -51,14 +51,14 @@ BUILD_REQUIRES="
 	devel:libfreetype
 	devel:libiconv
 	devel:libbz2
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:ld
 	cmd:pkg_config
 	cmd:libtoolize
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index 3900dfce2..fd7e0ff69 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
@@ -59,7 +59,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:nasm
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe
index 855e19770..7e99154eb 100644
--- a/games-engines/scummvm/scummvm-1.7.0.recipe
+++ b/games-engines/scummvm/scummvm-1.7.0.recipe
@@ -54,7 +54,7 @@ BUILD_REQUIRES="
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
@@ -63,7 +63,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:nasm
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe
index 5cfcd9eb7..e7a5b66cf 100644
--- a/games-engines/solarus/solarus-1.1.1.recipe
+++ b/games-engines/solarus/solarus-1.1.1.recipe
@@ -39,14 +39,14 @@ BUILD_REQUIRES="
 	devel:liblua$secondaryArchSuffix == 5.1.4
 	devel:libopenal$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-"
+	"
 
 BUILD()
 {
diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
index e62a78574..ef3105223 100644
--- a/games-puzzle/neverball/neverball-1.5.4.recipe
+++ b/games-puzzle/neverball/neverball-1.5.4.recipe
@@ -37,7 +37,6 @@ BUILD_REQUIRES="
 	devel:libsdl_mixer$secondaryArchSuffix
 	devel:libsdl_ttf$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
-
 	devel:libpng$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
diff --git a/games-rpg/kqlives/kqlives-0.99.recipe b/games-rpg/kqlives/kqlives-0.99.recipe
index a4f2ad400..4c5535c12 100644
--- a/games-rpg/kqlives/kqlives-0.99.recipe
+++ b/games-rpg/kqlives/kqlives-0.99.recipe
@@ -32,14 +32,14 @@ BUILD_REQUIRES="
 	devel:liballeg
 	devel:libdumb
 	devel:liblua >= 5.1
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
diff --git a/games-sports/xut/xut-0.2.1.recipe b/games-sports/xut/xut-0.2.1.recipe
index 12fc8c182..6182bc78d 100644
--- a/games-sports/xut/xut-0.2.1.recipe
+++ b/games-sports/xut/xut-0.2.1.recipe
@@ -42,13 +42,13 @@ BUILD_REQUIRES="
 	devel:libopenal$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/games-strategy/netpanzer/netpanzer-0.8.6.recipe b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
index 56e47bc56..8d894c2ee 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.6.recipe
+++ b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
@@ -39,12 +39,12 @@ BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
 	devel:libphysfs$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:scons
 	cmd:svnversion
-"
+	"
 
 BUILD()
 {
diff --git a/games-strategy/unknown_horizons/unknown_horizons-2014.1.recipe b/games-strategy/unknown_horizons/unknown_horizons-2014.1.recipe
index 3cf28318c..0b1bff31f 100644
--- a/games-strategy/unknown_horizons/unknown_horizons-2014.1.recipe
+++ b/games-strategy/unknown_horizons/unknown_horizons-2014.1.recipe
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 	cmd:python
 	cmd:intltool_merge
 	cmd:msgfmt
-"
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
index 0e97ffba3..409e12bbb 100644
--- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe
+++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
@@ -8,8 +8,10 @@ LICENSE="Artistic"
 REVISION="2"
 SOURCE_URI="svn://pulkomandy.tk/APlayer/trunk"
 SOURCE_DIR="trunk"
-PATCHES="aplayer.patch
-	aplayer_2.patch"
+PATCHES="
+	aplayer.patch
+	aplayer_2.patch
+	"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe
index 2f9cddbc0..326334de6 100644
--- a/haiku-apps/beae/beae-1.2.recipe
+++ b/haiku-apps/beae/beae-1.2.recipe
@@ -6,9 +6,7 @@ COPYRIGHT="2003 Xentronix"
 LICENSE="BSD (3-clause)"
 REVISION="3"
 SOURCE_URI="git+https://github.com/HaikuArchives/BeAE.git#a90a987"
-SOURCE_DIR=beae-1.2
-
-ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
+SOURCE_DIR=beae-1.2ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
 SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe
index ad1acbe63..f8bdf3cbc 100644
--- a/haiku-apps/ftppositive/ftppositive-1.0.recipe
+++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe
@@ -22,7 +22,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:jam"
+	cmd:jam
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe
index 667a23cab..44f7fc7e4 100644
--- a/haiku-apps/mrpeeps/mrpeeps-1.2.recipe
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe
@@ -34,7 +34,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel"
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
diff --git a/haiku-apps/seeker/seeker-1.0.recipe b/haiku-apps/seeker/seeker-1.0.recipe
index 1b50ed9a7..463fea569 100644
--- a/haiku-apps/seeker/seeker-1.0.recipe
+++ b/haiku-apps/seeker/seeker-1.0.recipe
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
 	haiku_devel
 	makefile_engine
 	cmd:gcc
-    cmd:ld
+	cmd:ld
 	cmd:make
 	"
 
diff --git a/haiku-apps/sortsave/sortsave-1.1.recipe b/haiku-apps/sortsave/sortsave-1.1.recipe
index 8cb86eaeb..9a6fc406f 100644
--- a/haiku-apps/sortsave/sortsave-1.1.recipe
+++ b/haiku-apps/sortsave/sortsave-1.1.recipe
@@ -10,9 +10,7 @@ LICENSE="SortSave"
 REVISION="1"
 SOURCE_URI="https://github.com/bbjimmy/Sort-Save/archive/1.1.tar.gz"
 CHECKSUM_SHA256="cf86c6e650d6313d496a7dce49ebd99377d2b94d6835257881664a30a39ecac6"
-SOURCE_DIR=Sort-Save-1.1
-
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SOURCE_DIR=Sort-Save-1.1ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	sortsave = $portVersion
diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe
index 9758442d3..6e60ef607 100644
--- a/haiku-apps/systeminfo/systeminfo-2.recipe
+++ b/haiku-apps/systeminfo/systeminfo-2.recipe
@@ -19,7 +19,7 @@ CHECKSUM_SHA256="cfe6443148eebf4cdc651a6a6f8e23e384e261800245643ae00fce996da4e30
 SOURCE_DIR="SystemInfo-ae36df9999e7f209c4d0e9484f1156656c5731f4"
 PATCHES="
 	systeminfo-2-2.patchset
-"
+	"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
diff --git a/haiku-games/superfreecell/superfreecell-0.1.0.recipe b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
index 6840730fc..8f79e47b5 100644
--- a/haiku-games/superfreecell/superfreecell-0.1.0.recipe
+++ b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
@@ -21,13 +21,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:cmake
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe
index e166bc3a2..511b8db63 100644
--- a/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe
+++ b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe
@@ -13,7 +13,8 @@ SOURCE_DIR="liberation-fonts-ttf-$portVersion"
 
 ARCHITECTURES="any"
 
-PROVIDES="liberation_fonts = $portVersion
+PROVIDES="
+	liberation_fonts = $portVersion
 	"
 REQUIRES="
 	"
@@ -21,7 +22,7 @@ REQUIRES="
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
 	coreutils
-"
+	"
 
 BUILD()
 {
diff --git a/media-fonts/libertine/libertine-5.3.0_2012_07_02.recipe b/media-fonts/libertine/libertine-5.3.0_2012_07_02.recipe
index f25047035..67eb225c7 100644
--- a/media-fonts/libertine/libertine-5.3.0_2012_07_02.recipe
+++ b/media-fonts/libertine/libertine-5.3.0_2012_07_02.recipe
@@ -15,7 +15,8 @@ SOURCE_DIR=""
 
 ARCHITECTURES="any"
 
-PROVIDES="libertine = $portVersion
+PROVIDES="
+	libertine = $portVersion
 	"
 REQUIRES="
 	"
@@ -23,7 +24,7 @@ REQUIRES="
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
 	coreutils
-"
+	"
 
 BUILD()
 {
diff --git a/media-fonts/monoid/monoid-0.61.recipe b/media-fonts/monoid/monoid-0.61.recipe
index e700fbff5..ffa7af44d 100644
--- a/media-fonts/monoid/monoid-0.61.recipe
+++ b/media-fonts/monoid/monoid-0.61.recipe
@@ -15,7 +15,8 @@ SOURCE_DIR=""
 
 ARCHITECTURES="any"
 
-PROVIDES="monoid = $portVersion
+PROVIDES="
+	monoid = $portVersion
 	"
 REQUIRES="
 	"
@@ -23,7 +24,7 @@ REQUIRES="
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
 	coreutils
-"
+	"
 
 BUILD()
 {
diff --git a/media-gfx/grafx2/grafx2-2.5.recipe b/media-gfx/grafx2/grafx2-2.5.recipe
index f97a36446..185c7d5da 100644
--- a/media-gfx/grafx2/grafx2-2.5.recipe
+++ b/media-gfx/grafx2/grafx2-2.5.recipe
@@ -39,12 +39,12 @@ BUILD_REQUIRES="
 	devel:libjpeg
 	devel:libz
 	devel:libfreetype
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
 	cmd:svnversion
-"
+	"
 
 BUILD()
 {
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe
index d2a8d4762..c15920cac 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe
@@ -19,7 +19,8 @@ SOURCE_DIR="GraphicsMagick-1.3.20"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-PROVIDES="graphicsmagick$secondaryArchSuffix = $portVersion
+PROVIDES="
+	graphicsmagick$secondaryArchSuffix = $portVersion
 	cmd:gm$secondaryArchSuffix
 	cmd:GraphicsMagick++_config$secondaryArchSuffix
 	cmd:GraphicsMagick_config$secondaryArchSuffix
@@ -52,13 +53,13 @@ BUILD_REQUIRES="
 	devel:libpng$secondaryArchSuffix
 	devel:liblcms2$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/audiofile/audiofile-0.3.6.recipe b/media-libs/audiofile/audiofile-0.3.6.recipe
index fed994765..63d5f5f35 100644
--- a/media-libs/audiofile/audiofile-0.3.6.recipe
+++ b/media-libs/audiofile/audiofile-0.3.6.recipe
@@ -56,13 +56,13 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe
index 860af8116..6113f9b6c 100644
--- a/media-libs/faad2/faad2-2.7.recipe
+++ b/media-libs/faad2/faad2-2.7.recipe
@@ -17,7 +17,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	faad2$secondaryArchSuffix = $portVersion compat >= 2.0
-	lib:libfaad$secondaryArchSuffix  = 2.0.0 compat >= 2
+	lib:libfaad$secondaryArchSuffix = 2.0.0 compat >= 2
 	cmd:faad$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
@@ -34,8 +34,8 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
- 	haiku${secondaryArchSuffix}_devel
-  	"
+	haiku${secondaryArchSuffix}_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:aclocal
diff --git a/media-libs/gd/gd-2.1.1.recipe b/media-libs/gd/gd-2.1.1.recipe
index 0f3af1438..e88e30721 100644
--- a/media-libs/gd/gd-2.1.1.recipe
+++ b/media-libs/gd/gd-2.1.1.recipe
@@ -46,7 +46,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gd${secondaryArchSuffix}_devel = $portVersion
-	devel:libgd$secondaryArchSuffix  = 3.0.0. compat >= 3
+	devel:libgd$secondaryArchSuffix = 3.0.0. compat >= 3
 	cmd:gdlib_config$secondaryArchSuffix
 	"
 REQUIRES_devel="
diff --git a/media-libs/glm/glm-0.9.6.1.recipe b/media-libs/glm/glm-0.9.6.1.recipe
index b6e997a58..15756fff8 100644
--- a/media-libs/glm/glm-0.9.6.1.recipe
+++ b/media-libs/glm/glm-0.9.6.1.recipe
@@ -31,7 +31,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgl$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES=""
+BUILD_PREREQUIRES="
+	"
 
 BUILD()
 {
diff --git a/media-libs/gst_ffmpeg/gst_ffmpeg-0.10.13.recipe b/media-libs/gst_ffmpeg/gst_ffmpeg-0.10.13.recipe
index f09704fcc..aaaece323 100644
--- a/media-libs/gst_ffmpeg/gst_ffmpeg-0.10.13.recipe
+++ b/media-libs/gst_ffmpeg/gst_ffmpeg-0.10.13.recipe
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	devel:libgstreamer$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:libglib_2.0$secondaryArchSuffix	
+	devel:libglib_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
-	cmd:libtoolize	
+	cmd:libtoolize
 	cmd:make
 	cmd:grep
 	cmd:bison
diff --git a/media-libs/gst_plugins_bad/gst_plugins_bad-0.10.23.recipe b/media-libs/gst_plugins_bad/gst_plugins_bad-0.10.23.recipe
index 798e3c7f0..9a3c4db62 100644
--- a/media-libs/gst_plugins_bad/gst_plugins_bad-0.10.23.recipe
+++ b/media-libs/gst_plugins_bad/gst_plugins_bad-0.10.23.recipe
@@ -41,7 +41,7 @@ PROVIDES_devel="
 	gst_plugins_bad${secondaryArchSuffix}_devel = $portVersion
 	"
 REQUIRES_devel="
-	haiku$secondaryArchSuffix	
+	haiku$secondaryArchSuffix
 	gst_plugins_bad${secondaryArchSuffix}
 	"
 
diff --git a/media-libs/gst_plugins_ugly/gst_plugins_ugly-0.10.19.recipe b/media-libs/gst_plugins_ugly/gst_plugins_ugly-0.10.19.recipe
index a55cfdfde..11b53bc6c 100644
--- a/media-libs/gst_plugins_ugly/gst_plugins_ugly-0.10.19.recipe
+++ b/media-libs/gst_plugins_ugly/gst_plugins_ugly-0.10.19.recipe
@@ -28,7 +28,7 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix	
+	lib:libintl$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:liba52$secondaryArchSuffix
 	lib:libmad$secondaryArchSuffix
@@ -68,7 +68,7 @@ BUILD_PREREQUIRES="
 	cmd:flex
 	cmd:python
 	cmd:orcc
-	cmd:which	
+	cmd:which
 	"
 
 BUILD()
diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe
index 1097fe5f5..8b2b4eee0 100644
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -32,7 +32,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
@@ -44,7 +44,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 PATCH()
 {
diff --git a/media-libs/libcuefile/libcuefile-r475.recipe b/media-libs/libcuefile/libcuefile-r475.recipe
index 82a62b190..c8499dc00 100644
--- a/media-libs/libcuefile/libcuefile-r475.recipe
+++ b/media-libs/libcuefile/libcuefile-r475.recipe
@@ -32,7 +32,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/libfpx/libfpx-1.3.1.recipe b/media-libs/libfpx/libfpx-1.3.1.recipe
index d684846ae..b733df115 100644
--- a/media-libs/libfpx/libfpx-1.3.1.recipe
+++ b/media-libs/libfpx/libfpx-1.3.1.recipe
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	cmd:awk
 	cmd:g++
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
index 7935f43c4..b5bf14719 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -63,7 +63,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
diff --git a/media-libs/paragui/paragui-1.1.8.recipe b/media-libs/paragui/paragui-1.1.8.recipe
index 57fc23892..71ee3e636 100644
--- a/media-libs/paragui/paragui-1.1.8.recipe
+++ b/media-libs/paragui/paragui-1.1.8.recipe
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	devel:libfreetype$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libphysfs$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:autoconf
@@ -54,7 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/media-libs/sdl2_image/sdl2_image-2.0.1.recipe b/media-libs/sdl2_image/sdl2_image-2.0.1.recipe
index 147a48d99..45e642bf0 100644
--- a/media-libs/sdl2_image/sdl2_image-2.0.1.recipe
+++ b/media-libs/sdl2_image/sdl2_image-2.0.1.recipe
@@ -45,12 +45,12 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl2${secondaryArchSuffix}
-    devel:libjpeg$secondaryArchSuffix
-    devel:libpng$secondaryArchSuffix
-    devel:libtiff$secondaryArchSuffix
-    devel:libgif$secondaryArchSuffix
-    devel:libwebp$secondaryArchSuffix
-    devel:libz$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:libtoolize
diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.1.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.1.recipe
index d43b93143..fae898540 100644
--- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.1.recipe
+++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.1.recipe
@@ -51,7 +51,7 @@ BUILD_REQUIRES="
 	devel:libvorbis$secondaryArchSuffix
 	devel:libmikmod$secondaryArchSuffix # requires libSDL
 	devel:libsmpeg$secondaryArchSuffix	# requires libSDL
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
@@ -62,7 +62,7 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe
index bd0a90c5f..f8a1aa00a 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2.recipe
+++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe
@@ -11,7 +11,7 @@ SOURCE_URI="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/bladeenc-0.94.2-src-stable
 CHECKSUM_SHA256="c5e9dd180f28d1865599d0755e36fa1a4c146bb5e1b7ba9ad099955261fc1164"
 PATCHES="
 	bladeenc-0.94.2.patch
-"
+	"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -25,7 +25,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:automake
 	cmd:autoconf
-"
+	"
 
 BUILD()
 {
diff --git a/media-sound/schismtracker/schismtracker-20120105.recipe b/media-sound/schismtracker/schismtracker-20120105.recipe
index 87d88c6a5..214091313 100644
--- a/media-sound/schismtracker/schismtracker-20120105.recipe
+++ b/media-sound/schismtracker/schismtracker-20120105.recipe
@@ -35,7 +35,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
@@ -44,7 +44,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:python
-"
+	"
 
 BUILD()
 {
diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe
index 1cc6d3af2..ced1d5739 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.recipe
+++ b/media-video/vcdimager/vcdimager-0.7.24.recipe
@@ -47,11 +47,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-    vcdimager${secondaryArchSuffix}_devel = $portVersion
-    devel:libvcdinfo$secondaryArchSuffix = $portVersion
+	vcdimager${secondaryArchSuffix}_devel = $portVersion
+	devel:libvcdinfo$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
-    vcdimager$secondaryArchSuffix == $portVersion base
+	vcdimager$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
diff --git a/net-misc/axel/axel-2.4.recipe b/net-misc/axel/axel-2.4.recipe
index 612f12c3c..f5652c972 100644
--- a/net-misc/axel/axel-2.4.recipe
+++ b/net-misc/axel/axel-2.4.recipe
@@ -11,26 +11,26 @@ REVISION="1"
 SOURCE_URI="http://pkgs.fedoraproject.org/repo/pkgs/axel/axel-2.4.tar.gz/a2a762fce0c96781965c8f9786a3d09d/axel-2.4.tar.gz"
 CHECKSUM_SHA256="359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036"
 PATCHES="
-		axel-2.4.patch
-"
+	axel-2.4.patch
+	"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
-		axel = $portVersion
-		cmd:axel = $portVersion
+	axel = $portVersion
+	cmd:axel = $portVersion
 	"
 REQUIRES="
-		haiku
+	haiku
 	"
 
 BUILD_REQUIRES="
-"
+	"
 BUILD_PREREQUIRES="
-		haiku_devel
-		cmd:gcc
-		cmd:make
-"
+	haiku_devel
+	cmd:gcc
+	cmd:make
+	"
 
 BUILD()
 {
diff --git a/net-misc/mosh/mosh-1.2.4.recipe b/net-misc/mosh/mosh-1.2.4.recipe
index b10c60deb..77023b3c0 100644
--- a/net-misc/mosh/mosh-1.2.4.recipe
+++ b/net-misc/mosh/mosh-1.2.4.recipe
@@ -39,7 +39,7 @@ BUILD_REQUIRES="
 	devel:libprotoc$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
@@ -49,7 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/net-p2p/retroshare/retroshare-0.6.0.recipe b/net-p2p/retroshare/retroshare-0.6.0.recipe
index 138b630c6..c5da3523e 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.recipe
+++ b/net-p2p/retroshare/retroshare-0.6.0.recipe
@@ -28,8 +28,8 @@ REQUIRES="
 	qt5base${secondaryArchSuffix}
 	lib:libbz2$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
-	lib:libcurl$secondaryArchSuffix	
-	lib:libgl$secondaryArchSuffix	
+	lib:libcurl$secondaryArchSuffix
+	lib:libgl$secondaryArchSuffix
 	lib:libgpgme$secondaryArchSuffix
 	lib:libmicrohttpd$secondaryArchSuffix
 #	lib:linopencv$secondaryArchSuffix
@@ -39,7 +39,7 @@ REQUIRES="
 	lib:libssl$secondaryArchSuffix
 	lib:libupnp$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
-	lib:libxslt$secondaryArchSuffix	
+	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -48,8 +48,8 @@ BUILD_REQUIRES="
 	qt5base${secondaryArchSuffix}
 	devel:libbz2$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
-	devel:libcurl$secondaryArchSuffix	
-	devel:libgl$secondaryArchSuffix	
+	devel:libcurl$secondaryArchSuffix
+	devel:libgl$secondaryArchSuffix
 	devel:libgpgme$secondaryArchSuffix
 	devel:libmicrohttpd$secondaryArchSuffix
 #	devel:linopencv$secondaryArchSuffix
@@ -59,7 +59,7 @@ BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix
 	devel:libupnp$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix	
+	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
index ea2aa2263..7c553b03c 100644
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -41,7 +41,7 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:perl >= 5.8
 	cmd:sed
-    "
+	"
 
 BUILD()
 {
diff --git a/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe b/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe
index dafd4c99d..cbb7a599b 100644
--- a/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe
+++ b/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe
@@ -13,36 +13,36 @@ ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-       libatomic_ops$secondaryArchSuffix = $portVersion
-       lib:libatomic_ops$secondaryArchSuffix = 1.0.3 compat >= 1
-       lib:libatomic_ops_gpl$secondaryArchSuffix = 1.0.3 compat >= 1
+	libatomic_ops$secondaryArchSuffix = $portVersion
+	lib:libatomic_ops$secondaryArchSuffix = 1.0.3 compat >= 1
+	lib:libatomic_ops_gpl$secondaryArchSuffix = 1.0.3 compat >= 1
 	"
 REQUIRES="
-       haiku$secondaryArchSuffix
+	haiku$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-       libatomic_ops$secondaryArchSuffix_devel = $portVersion
-       devel:libatomic_ops$secondaryArchSuffix = 1.0.3 compat >= 1
-       devel:libatomic_ops_gpl$secondaryArchSuffix = 1.0.3 compat >= 1
+	libatomic_ops$secondaryArchSuffix_devel = $portVersion
+	devel:libatomic_ops$secondaryArchSuffix = 1.0.3 compat >= 1
+	devel:libatomic_ops_gpl$secondaryArchSuffix = 1.0.3 compat >= 1
 	"
 REQUIRES_devel="
-       libatomic_ops$secondaryArchSuffix == $portVersion base
+	libatomic_ops$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
-       haiku${secondaryArchSuffix}_devel
-       "
+	haiku${secondaryArchSuffix}_devel
+	"
 BUILD_PREREQUIRES="
-       haiku${secondaryArchSuffix}_devel
-       cmd:gcc$secondaryArchSuffix
-       cmd:ld$secondaryArchSuffix
-       cmd:gawk
-       cmd:grep
-       cmd:make
-       cmd:sed
-       cmd:libtool
-       "
+	haiku${secondaryArchSuffix}_devel
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:gawk
+	cmd:grep
+	cmd:make
+	cmd:sed
+	cmd:libtool
+	"
 
 BUILD()
 {
diff --git a/sys-libs/tinygl/tinygl-0.4.recipe b/sys-libs/tinygl/tinygl-0.4.recipe
index c051718a2..829a4ac8f 100644
--- a/sys-libs/tinygl/tinygl-0.4.recipe
+++ b/sys-libs/tinygl/tinygl-0.4.recipe
@@ -53,11 +53,11 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {