diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe
index 0f255a046..8bf9fe200 100644
--- a/app-benchmarks/iozone/iozone-3.326.recipe
+++ b/app-benchmarks/iozone/iozone-3.326.recipe
@@ -5,8 +5,8 @@ Iozone is useful for performing a broad filesystem analysis of a vendor’s \
 computer platform. The benchmark tests file I/O performance for the following \
 operations:
 
-Read, write, re-read, re-write, read backwards, read strided, fread, fwrite,\
-random read, pread ,mmap, aio_read, aio_write"
+Read, write, re-read, re-write, read backwards, read strided, fread, fwrite, \
+random read, pread, mmap, aio_read, aio_write"
 
 # NOTE: The author retains the exclusive right to publish derivative works
 # based on this work, including, but not limited to, revised versions of
@@ -17,14 +17,12 @@ SOURCE_URI="http://www.iozone.org/src/current/iozone3_326.tar"
 CHECKSUM_SHA256="bc0a40b2cc7f2e8c6dcfbbff82f1df82ad735f02c9a7db59f8364b76f43f7063"
 LICENSE="iozone"
 COPYRIGHT="
-	1991-2001, William D. Norcott
-	2010, Don Capps
+	1991-2001 William D. Norcott
+	2010 Don Capps
 	"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
  
-PATCHES="iozone-3.326.patch"
- 
 PROVIDES="
 	cmd:iozone = $portVersion
 	cmd:fileop = $portVersion
@@ -42,6 +40,7 @@ BUILD_PREREQUIRES="
 	"
 
 SOURCE_DIR="iozone3_326"
+PATCHES="iozone-3.326.patch"
 
 BUILD()
 {
diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe
index c552b29b3..0f27ead0d 100644
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	lib:libtidy_0.99
 	lib:libtidy
 	"
-PROVIDES_devel="
-	devel:libtidy
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	devel:libtidy
+	"
 REQUIRES_devel="
 	htmltidy == $portVersion base
 	"
diff --git a/dev-libs/isl/isl-0.13.recipe b/dev-libs/isl/isl-0.13.recipe
index 0d3ac94ce..43d393d91 100644
--- a/dev-libs/isl/isl-0.13.recipe
+++ b/dev-libs/isl/isl-0.13.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	isl$secondaryArchSuffix = $portVersion compat >= 0.12
 	lib:libisl$secondaryArchSuffix = 13.0.0 compat >= 13
 	"
-PROVIDES_devel="
-	isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12
-	devel:libisl$secondaryArchSuffix = 13.0.0 compat >= 13
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10.1.3
 	"
+PROVIDES_devel="
+	isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12
+	devel:libisl$secondaryArchSuffix = 13.0.0 compat >= 13
+	"
 REQUIRES_devel="
 	isl$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-libs/isl/isl-0.14.recipe b/dev-libs/isl/isl-0.14.recipe
index 17906323b..91d6fea82 100644
--- a/dev-libs/isl/isl-0.14.recipe
+++ b/dev-libs/isl/isl-0.14.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	isl$secondaryArchSuffix = $portVersion compat >= 0.12
 	lib:libisl$secondaryArchSuffix = 13.1.0 compat >= 13
 	"
-PROVIDES_devel="
-	isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12
-	devel:libisl$secondaryArchSuffix = 13.1.0 compat >= 13
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10.1.3
 	"
+PROVIDES_devel="
+	isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12
+	devel:libisl$secondaryArchSuffix = 13.1.0 compat >= 13
+	"
 REQUIRES_devel="
 	isl$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
index f5bfeb94a..238666b12 100644
--- a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
+++ b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
@@ -65,6 +65,26 @@ PROVIDES="
 	lib:libsolid$secondaryArchSuffix = $portVersion compat >= 4.13
 	lib:libthreadweaver$secondaryArchSuffix = $portVersion compat >= 4.13
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	libqt4$secondaryArchSuffix >= 4.8
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libqca$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
+	lib:libattica$secondaryArchSuffix
+	lib:libdbusmenu_qt$secondaryArchSuffix
+	shared_mime_info$secondaryArchSuffix
+	strigi$secondaryArchSuffix
+	"
 PROVIDES_devel="
 	kdelibs4${secondaryArchSuffix}_devel = $portVersion compat >= 4.13
 	cmd:checkXML$secondaryArchSuffix = $portVersion compat >= 4.13
@@ -101,26 +121,6 @@ PROVIDES_devel="
 	devel:libsolid$secondaryArchSuffix = $portVersion compat >= 4.13
 	devel:libthreadweaver$secondaryArchSuffix = $portVersion compat >= 4.13
 	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	libqt4$secondaryArchSuffix >= 4.8
-	lib:libz$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
-	lib:liblzma$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libqca$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libpcre$secondaryArchSuffix
-	lib:libgif$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libjasper$secondaryArchSuffix
-	lib:libattica$secondaryArchSuffix
-	lib:libdbusmenu_qt$secondaryArchSuffix
-	shared_mime_info$secondaryArchSuffix
-	strigi$secondaryArchSuffix
-	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	libqt4${secondaryArchSuffix}_devel >= 4.8
diff --git a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
index fe891d83a..1e993c8e9 100644
--- a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
+++ b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Homeworld is a real-time strategy computer game, set and played \
 in a 3D space environment. Developed by Relic Entertainment, it was released \
 for the PC in 1998 to worldwide acclaim, winning multiple awards for its \
 novel gameplay and strong single-player story. Relic Entertainment later \
-released the source code to the public under licence. "
+released the source code to the public under license. "
 HOMEPAGE="http://www.homeworldsdl.org/"
 COPYRIGHT="1999-2000 Sierra On-Line, Inc."
 LICENSE="RE-INC-EULA"
diff --git a/haiku-apps/hdialog/hdialog-0.2.recipe b/haiku-apps/hdialog/hdialog-0.2.recipe
index 3441cc6ca..6614d93ef 100644
--- a/haiku-apps/hdialog/hdialog-0.2.recipe
+++ b/haiku-apps/hdialog/hdialog-0.2.recipe
@@ -22,7 +22,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gc++
+	cmd:g++
 	"
 
 BUILD()
diff --git a/media-libs/ftgl/ftgl-2.1.3~rc5.recipe b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe
index 5a6afb576..23c1936e3 100644
--- a/media-libs/ftgl/ftgl-2.1.3~rc5.recipe
+++ b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe
@@ -19,16 +19,16 @@ PROVIDES="
 	ftgl$secondaryArchSuffix = $portVersion compat >= 2
 	lib:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2
 	"
-PROVIDES_devel="
-	ftgl${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	ftgl${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2
+	"
 REQUIRES_devel="
 	ftgl$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
index 022e5bdbe..bd0661b0a 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
+++ b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
@@ -35,10 +35,6 @@ PROVIDES="
 	cmd:hb_ot_shape_closure$secondaryArchSuffix
 	cmd:hb_shape$secondaryArchSuffix
 	"
-PROVIDES_devel="
-	harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9
-	devel:libharfbuzz$secondaryArchSuffix = 0.940.0 compat >= 0
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -51,6 +47,10 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgraphite2$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9
+	devel:libharfbuzz$secondaryArchSuffix = 0.940.0 compat >= 0
+	"
 REQUIRES_devel="
 	harfbuzz$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/im/im-3.8.recipe b/media-libs/im/im-3.8.recipe
index 363f872a4..5314c51f2 100644
--- a/media-libs/im/im-3.8.recipe
+++ b/media-libs/im/im-3.8.recipe
@@ -48,6 +48,10 @@ PROVIDES="
 	lib:libimlua_process52$secondaryArchSuffix = $portVersion
 	lib:libimlua_process_omp52$secondaryArchSuffix = $portVersion
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
 PROVIDES_devel="
 	im${secondaryArchSuffix}_devel = $portVersion
 	devel:libim$secondaryArchSuffix = $portVersion
@@ -68,10 +72,6 @@ PROVIDES_devel="
 	devel:libimlua_process52$secondaryArchSuffix = $portVersion
 	devel:libimlua_process_omp52$secondaryArchSuffix = $portVersion
 	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
 REQUIRES_devel="
 	im$secondaryArchSuffix == $portVersion base
 	"
diff --git a/net-libs/gnutls/gnutls-2.8.6.recipe b/net-libs/gnutls/gnutls-2.8.6.recipe
index e7b6a20e9..d9cfd4df7 100644
--- a/net-libs/gnutls/gnutls-2.8.6.recipe
+++ b/net-libs/gnutls/gnutls-2.8.6.recipe
@@ -8,6 +8,7 @@ efficient with focus on security and interoperability."
 HOMEPAGE="http://www.gnutls.org/"
 SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.6.tar.bz2"
 CHECKSUM_SHA256="d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
+PATCHES="gnutls-2.8.6.patch"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="
 	2009-2010 Free Software Fundation Inc.
@@ -30,6 +31,11 @@ PROVIDES="
 	lib:libgnutls = 26.14.12 compat = 26
 	lib:libgnutlsxx = 26.14.12 compat = 26
 	"
+REQUIRES="
+	haiku
+	lib:libgcrypt
+	lib:libgpg_error
+	"
 PROVIDES_devel="
 	gnutls_devel = $portVersion
 	devel:libgnutls_extra = 26.14.12 compat = 26
@@ -37,11 +43,6 @@ PROVIDES_devel="
 	devel:libgnutls = 26.14.12 compat = 26
 	devel:libgnutlsxx = 26.14.12 compat = 26
 	"
-REQUIRES="
-	haiku
-	lib:libgcrypt
-	lib:libgpg_error
-	"
 REQUIRES_devel="
 	gnutls == $portVersion base
 	"
@@ -58,8 +59,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="gnutls-2.8.6.patch"
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
index b80a9509c..2a54b893b 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
@@ -6,6 +6,8 @@ REVISION="1"
 ARCHITECTURES="!x86_gcc2"
 HOMEPAGE="http://www.rodsbooks.com/gdisk/"
 SOURCE_URI="http://sourceforge.net/projects/gptfdisk/files/gptfdisk/0.8.10/gptfdisk-0.8.10.tar.gz"
+CHECKSUM_SHA256="73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b"
+PATCHES="gptfdisk-0.8.10.patchset"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2013 Rod Smith"
 
@@ -22,8 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="gptfdisk-0.8.10.recipe"
-
 BUILD()
 {
 	make $jobArgs
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
index 99cd8e98d..2c2c50de2 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
@@ -1,5 +1,5 @@
 SUMMARY="C/C++ compiler"
-DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with \
+DESCRIPTION="The standard compiler for x86_gcc2 platform, ABI-compatible with \
 BeOS R5."
 HOMEPAGE="http://gcc.gnu.org"
 LICENSE="
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
index ede45fea3..1612bc377 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
@@ -1,5 +1,5 @@
 SUMMARY="C/C++ compiler"
-DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with \
+DESCRIPTION="The standard compiler for x86_gcc2 platform, ABI-compatible with \
 BeOS R5."
 HOMEPAGE="http://gcc.gnu.org"
 LICENSE="
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
index 23fd7aa5f..816b65f97 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
@@ -1,7 +1,7 @@
 SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}"
-DESCRIPTION="Standard compiler for x86 platform."
+DESCRIPTION="The standard compiler for the ${effectiveTargetMachineTriple} \
+platform."
 HOMEPAGE="http://gcc.gnu.org"
-
 srcGitRev="3ad9ac2317f63b65937473c4fbe37c9e93e3a116"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="85499c650421b68f9830d3fb2ddfafb8789a3e1ffce75e8dd27aaed678135df0"
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
index 293a4442b..24f12587c 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
@@ -1,5 +1,5 @@
 SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}"
-DESCRIPTION="Standard compiler for non-legacy Haiku (i.e. for all \
+DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="http://gcc.gnu.org"
 
diff --git a/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
index 3a5157773..d4b602dd4 100644
--- a/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
+++ b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
@@ -1,5 +1,5 @@
 SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}"
-DESCRIPTION="Standard compiler for non-legacy Haiku (i.e. for all \
+DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="http://gcc.gnu.org"
 
diff --git a/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe b/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
index 26bbe5865..aa7a347cf 100644
--- a/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
+++ b/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
@@ -1,5 +1,5 @@
 SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}"
-DESCRIPTION="Standard compiler for non-legacy Haiku (i.e. for all \
+DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="http://gcc.gnu.org"
 
diff --git a/x11-libs/iup/iup-3.8.recipe b/x11-libs/iup/iup-3.8.recipe
index 1a2457cb2..48a89ef05 100644
--- a/x11-libs/iup/iup-3.8.recipe
+++ b/x11-libs/iup/iup-3.8.recipe
@@ -50,6 +50,15 @@ PROVIDES="
 	lib:libiuptuio$secondaryArchSuffix = $portVersion
 	lib:libiupweb$secondaryArchSuffix = $portVersion
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
+	lib:libcd$secondaryArchSuffix >= 5.6
+	lib:libim$secondaryArchSuffix >= 3.8
+	lib:libfreetype$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
 PROVIDES_devel="
 	devel:libiup$secondaryArchSuffix = $portVersion
 	devel:libiup_mglplot$secondaryArchSuffix = $portVersion
@@ -80,15 +89,6 @@ PROVIDES_devel="
 	devel:libiuptuio$secondaryArchSuffix = $portVersion
 	devel:libiupweb$secondaryArchSuffix = $portVersion
 	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:liblua$secondaryArchSuffix
-	lib:libcd$secondaryArchSuffix >= 5.6
-	lib:libim$secondaryArchSuffix >= 3.8
-	lib:libfreetype$secondaryArchSuffix
-	lib:libGLU$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
 BUILD_REQUIRES="
 	devel:libcd$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix