diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
index f8a059a11..1a3535fc2 100644
--- a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
+++ b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
@@ -1,42 +1,36 @@
 SUMMARY="Python-based continuous integration testing framework"
-DESCRIPTION="
-Buildbot is a continuous integration system designed to automate the \
-build/test cycle. By automatically rebuilding and testing the tree each time \
-something has changed, build problems are pinpointed quickly, before other \
-developers are inconvenienced by the failure. Main features are:
+DESCRIPTION="Buildbot is a continuous integration system designed to automate \
+the build/test cycle. By automatically rebuilding and testing the tree each \
+time something has changed, build problems are pinpointed quickly, before \
+other developers are inconvenienced by the failure.
+The main features are:
 
-* Buildbot is easy to set up, but very extensible and customizable.  It \
-  supports arbitrary build processes, and is not limited to common build \
-  processes for particular languages (e.g., autotools or ant)
-
-* Buildbot supports building and testing on a variety of platforms. \
-  Developers, who do not have the facilities to test their changes everywhere \
-  before committing, will know shortly afterwards whether they have broken the \
-  build or not.
-
-* Buildbot has minimal requirements for slaves: using virtualenv, only a \
-  Python installation is required.
-
-* Slaves can be run behind a NAT firewall and communicate with the master
-
-* Buildbot has a variety of status-reporting tools to get information about \
-  builds in front of developers in a timely manner.
+- Buildbot is easy to set up, but very extensible and customizable.  It \
+supports arbitrary build processes, and is not limited to common build \
+processes for particular languages (e.g., autotools or ant)
+- Buildbot supports building and testing on a variety of platforms. \
+Developers, who do not have the facilities to test their changes everywhere \
+before committing, will know shortly afterwards whether they have broken the \
+build or not.
+- Buildbot has minimal requirements for slaves: using virtualenv, only a \
+Python installation is required.
+- Slaves can be run behind a NAT firewall and communicate with the master.
+- Buildbot has a variety of status-reporting tools to get information about \
+builds in front of developers in a timely manner.
 
 This package contains the slave implementation, i.e. the part that is \
-executing builds and/or tests.
-"
+executing builds and/or tests."
 HOMEPAGE="http://www.buildbot.net"
+COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members"
+LICENSE="GNU GPL v2"
+REVISION="4"
 SOURCE_URI="https://buildbot.googlecode.com/files/buildbot-slave-0.8.8.tar.gz"
 CHECKSUM_SHA256="8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc"
+SOURCE_DIR="buildbot-slave-$portVersion"
 PATCHES="buildbot_slave-0.8.8.patchset"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members"
-REVISION="4"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
-SOURCE_DIR="buildbot-slave-$portVersion"
-
 PROVIDES="
 	buildbot_slave = $portVersion
 	cmd:buildslave = $portVersion
@@ -46,10 +40,11 @@ REQUIRES="
 	cmd:python
 	python_twisted
 	"
-BUILD_REQUIRES=""
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:python
 	"
 
diff --git a/dev-util/ccache/ccache-3.2.2.recipe b/dev-util/ccache/ccache-3.2.2.recipe
index 4ee50c298..fda7c7e40 100644
--- a/dev-util/ccache/ccache-3.2.2.recipe
+++ b/dev-util/ccache/ccache-3.2.2.recipe
@@ -1,18 +1,14 @@
 SUMMARY="A fast compiler cache"
-DESCRIPTION="
-ccache is a compiler cache. It speeds up recompilation by caching previous \
+DESCRIPTION="ccache speeds up recompilation by caching previous \
 compilations and detecting when same compilation is being done again. \
-Supported languages are C, C++, Objective-C and Objective-C++.
-"
+Supported languages are C, C++, Objective-C and Objective-C++."
 HOMEPAGE="http://ccache.samba.org/"
-SOURCE_URI="http://samba.org/ftp/ccache/ccache-$portVersion.tar.bz2"
-CHECKSUM_SHA256="440f5e15141cc72d2bfff467c977020979810eb800882e3437ad1a7153cce7b2"
-REVISION="1"
-
-LICENSE="GNU GPL v3"
 COPYRIGHT="2002-2007 Andrew Tridgell
 	2009-2013 Joel Rosdahl"
-
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="http://samba.org/ftp/ccache/ccache-$portVersion.tar.bz2"
+CHECKSUM_SHA256="440f5e15141cc72d2bfff467c977020979810eb800882e3437ad1a7153cce7b2"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -20,7 +16,6 @@ PROVIDES="
 	ccache = $portVersion
 	cmd:ccache
 	"
-
 REQUIRES="
 	haiku
 	lib:libz >= 1
@@ -30,7 +25,6 @@ BUILD_REQUIRES="
 	haiku_devel
 	devel:libz
 	"
-
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe
index e2a1eb6c0..4220707fd 100644
--- a/dev-util/cmake/cmake-2.8.11.2.recipe
+++ b/dev-util/cmake/cmake-2.8.11.2.recipe
@@ -1,17 +1,17 @@
-SUMMARY="Cross platform Make"
-DESCRIPTION="
-CMake is a cross-platform, open-source build system. It is a family of tools \
-designed to build, test and package software. CMake is used to control the \
-software compilation process using simple platform and compiler independent \
-configuration files. CMake generates native makefiles and workspaces that can \
-be used in the compiler environment of your choice.
-"
+SUMMARY="A cross-platform build system"
+DESCRIPTION="CMake is a family of tools designed to build, test and package \
+software. It is used to control the software compilation process using \
+simple platform and compiler independent configuration files. CMake generates \
+native makefiles and workspaces that can be used in the compiler environment \
+of your choice."
 HOMEPAGE="http://www.cmake.org"
+COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
-COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
+REVISION="7"
 SOURCE_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz"
 CHECKSUM_SHA256="b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
-REVISION="7"
+PATCHES="cmake-2.8.11.2.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -25,11 +25,12 @@ REQUIRES="
 	haiku
 	lib:libncurses
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
@@ -37,7 +38,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:sed
 	"
-PATCHES="cmake-2.8.11.2.patchset"
 
 BUILD()
 {
diff --git a/dev-util/cmake/cmake-3.0.0.recipe b/dev-util/cmake/cmake-3.0.0.recipe
index eb9a93de8..2128aa4bc 100644
--- a/dev-util/cmake/cmake-3.0.0.recipe
+++ b/dev-util/cmake/cmake-3.0.0.recipe
@@ -1,9 +1,9 @@
 SUMMARY="A cross-platform build system"
-DESCRIPTION="CMake is a cross-platform, open-source build system. It is a \
-family of tools designed to build, test and package software. CMake is used \
-to control the software compilation process using simple platform and \
-compiler independent configuration files. CMake generates native makefiles \
-and workspaces that can be used in the compiler environment of your choice."
+DESCRIPTION="CMake is a family of tools designed to build, test and package \
+software. It is used to control the software compilation process using \
+simple platform and compiler independent configuration files. CMake generates \
+native makefiles and workspaces that can be used in the compiler environment \
+of your choice."
 HOMEPAGE="http://www.cmake.org"
 COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
diff --git a/dev-util/cmake/cmake-3.2.3.recipe b/dev-util/cmake/cmake-3.2.3.recipe
index cb3786c1a..2444496b7 100644
--- a/dev-util/cmake/cmake-3.2.3.recipe
+++ b/dev-util/cmake/cmake-3.2.3.recipe
@@ -1,9 +1,9 @@
 SUMMARY="A cross-platform build system"
-DESCRIPTION="CMake is a cross-platform, open-source build system. It is a \
-family of tools designed to build, test and package software. CMake is used \
-to control the software compilation process using simple platform and \
-compiler independent configuration files. CMake generates native makefiles \
-and workspaces that can be used in the compiler environment of your choice."
+DESCRIPTION="CMake is a family of tools designed to build, test and package \
+software. It is used to control the software compilation process using \
+simple platform and compiler independent configuration files. CMake generates \
+native makefiles and workspaces that can be used in the compiler environment \
+of your choice."
 HOMEPAGE="http://www.cmake.org"
 COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
@@ -27,11 +27,11 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-util/cmake/cmake-3.3.1.recipe b/dev-util/cmake/cmake-3.3.1.recipe
index 2add965f6..ddd597206 100644
--- a/dev-util/cmake/cmake-3.3.1.recipe
+++ b/dev-util/cmake/cmake-3.3.1.recipe
@@ -1,9 +1,9 @@
 SUMMARY="A cross-platform build system"
-DESCRIPTION="CMake is a cross-platform, open-source build system. It is a \
-family of tools designed to build, test and package software. CMake is used \
-to control the software compilation process using simple platform and \
-compiler independent configuration files. CMake generates native makefiles \
-and workspaces that can be used in the compiler environment of your choice."
+DESCRIPTION="CMake is a family of tools designed to build, test and package \
+software. It is used to control the software compilation process using \
+simple platform and compiler independent configuration files. CMake generates \
+native makefiles and workspaces that can be used in the compiler environment \
+of your choice."
 HOMEPAGE="http://www.cmake.org"
 COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe
index 4b25d63ab..84bbed407 100644
--- a/dev-util/intltool/intltool-0.40.6.recipe
+++ b/dev-util/intltool/intltool-0.40.6.recipe
@@ -1,22 +1,21 @@
 SUMMARY="A set of tools to centralize translation of file formats"
-DESCRIPTION="
-intltool is a set of tools to centralize translation of many different file \
-formats using GNU gettext-compatible PO files.
+DESCRIPTION="intltool is a set of tools to centralize translation of many \
+different file formats using GNU gettext-compatible PO files.
 
-The intltool collection can be used to do these things:
-* Extract translatable strings from various source files (.xml.in, glade, \
+The intltool collection can:
+- Extract translatable strings from various source files (.xml.in, glade, \
 .desktop.in, .server.in, .oaf.in).
-* Collect the extracted strings together with messages from traditional source \
+- Collect the extracted strings together with messages from traditional source \
 files (.c, .h) in po/PACKAGE.pot.
-* Merge back the translations from .po files into .xml, .desktop and oaf \
-files. This merge step will happen at build resp. installation time.
-"
+- Merge back the translations from .po files into .xml, .desktop and oaf \
+files. This merge step will happen at build resp. installation time."
 HOMEPAGE="http://freedesktop.org/wiki/Software/intltool"
+COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."
+LICENSE="GNU GPL v2"
+REVISION="4"
 SOURCE_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
 CHECKSUM_SHA256="36cd8fe249d0cc20918b6d4583267208bf74c8d541c67a5fe63316846344f9f7"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."
-REVISION="4"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -34,6 +33,7 @@ REQUIRES="
 	cmd:perl
 	xml_parser
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	xml_parser
diff --git a/dev-util/itstool/itstool-2.0.2.recipe b/dev-util/itstool/itstool-2.0.2.recipe
index 52dcf1355..21c5f8ba1 100644
--- a/dev-util/itstool/itstool-2.0.2.recipe
+++ b/dev-util/itstool/itstool-2.0.2.recipe
@@ -1,8 +1,7 @@
 SUMMARY="Translate your XML documents with PO files"
-DESCRIPTION="
-ITS Tool allows you to translate your XML documents with PO files, using rules \
-from the W3C Internationalization Tag Set (ITS) to determine what to translate \
-and how to separate it into PO file messages.
+DESCRIPTION="ITS Tool allows you to translate your XML documents with PO \
+files, using rules from the W3C Internationalization Tag Set (ITS) to \
+determine what to translate and how to separate it into PO file messages.
 
 PO files are the standard translation format for GNU and other Unix-like \
 systems. They present translatable information as discrete messages, allowing \
@@ -16,31 +15,34 @@ ITS Tool is designed to make XML documents translatable through PO files by \
 applying standard ITS rules, as well as extension rules specific to ITS Tool. \
 ITS also provides an industry standard way for authors to override translation \
 information in their documents, such as whether a particular element should be \
-translated.
-"
+translated."
 HOMEPAGE="http://itstool.org/"
+COPYRIGHT="2010-2014 Shaun McCance"
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://files.itstool.org/itstool/itstool-$portVersion.tar.bz2"
 CHECKSUM_SHA256="bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	itstool = $portVersion
 	cmd:itstool
-"
-
+	"
 REQUIRES="
+	haiku
 	libxml2_python
-"
+	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	libxml2_python
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:make
 	cmd:python
-"
+	"
 
 BUILD()
 {
@@ -53,5 +55,3 @@ INSTALL()
 	make install
 }
 
-LICENSE="GNU GPL v3"
-COPYRIGHT="2010-2014 Shaun McCance"
diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe
index ce797f897..8930353b8 100644
--- a/dev-util/patchutils/patchutils-0.3.3.recipe
+++ b/dev-util/patchutils/patchutils-0.3.3.recipe
@@ -1,29 +1,30 @@
 SUMMARY="A small collection of programs that operate on patch files"
-DESCRIPTION="
-*Interdiff generates an incremental patch from two patches against a common \
+DESCRIPTION="The collection of tools include:
+
+- Interdiff generates an incremental patch from two patches against a common \
 source.
-*Combinediff generates a single patch from two incremental patches, allowing \
+- Combinediff generates a single patch from two incremental patches, allowing \
 you to merge patches together.
-*Filterdiff will select the portions of a patch file that apply to files \
+- Filterdiff will select the portions of a patch file that apply to files \
 matching (or, alternatively, not matching) a shell wildcard.
-*Fixcvsdiff is for correcting the output of ‘cvs diff’.
-*Rediff corrects hand-edited patches, by comparing the original patch with the \
+- Fixcvsdiff is for correcting the output of ‘cvs diff’.
+- Rediff corrects hand-edited patches, by comparing the original patch with the \
 modified one and adjusting the offsets and counts.
-*Lsdiff displays a short listing of affected files in a patch file, along with \
+- Lsdiff displays a short listing of affected files in a patch file, along with \
 (optionally) the line numbers of the start of each patch.
-*Splitdiff separates out patches from a patch file so that each new patch file \
+- Splitdiff separates out patches from a patch file so that each new patch file \
 only alters any given file once.
-*Grepdiff displays a list of the files modified by a patch where the patch \
+- Grepdiff displays a list of the files modified by a patch where the patch \
 contains a given regular expression.
-*Recountdiff fixes up counts and offsets in a unified diff.
-*Unwrapdiff fixes word-wrapped unified diffs.
-"
+- Recountdiff fixes up counts and offsets in a unified diff.
+- Unwrapdiff fixes word-wrapped unified diffs."
 HOMEPAGE="http://cyberelk.net/tim/patchutils/"
+COPYRIGHT="2001-2013 Tim Waugh"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz"
 CHECKSUM_SHA256="91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2013 Tim Waugh"
+
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
@@ -43,7 +44,6 @@ PROVIDES="
 	cmd:espdiff = $portVersion compat >= 0
 	cmd:editdiff = $portVersion compat >= 0
 	"
-
 REQUIRES="
 	haiku
 	cmd:perl
@@ -51,9 +51,10 @@ REQUIRES="
 	cmd:patch
 	"
 
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
 	cmd:perl
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
index 836c59bbe..b9489fe23 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -1,23 +1,21 @@
 SUMMARY="Helper tool for compiling applications and libraries"
-DESCRIPTION="
-pkg-config is a helper tool used when compiling applications and libraries. It \
-helps you insert the correct compiler options on the command line so an \
-application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for \
-instance, rather than hard-coding values on where to find glib (or other \
-libraries). It is language-agnostic, so it can be used for defining the \
-location of documentation tools, for instance.
-"
+DESCRIPTION="pkg-config helps you insert the correct compiler options on the \
+command line so an application can use 'gcc -o test test.cpkg-config --libs \
+--cflags glib-2.0' for instance, rather than hard-coding values on where to \
+find glib (or other libraries). It is language-agnostic, so it can be used \
+for defining the location of documentation tools, for instance."
 HOMEPAGE="http://pkg-config.freedesktop.org/wiki/"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1998, 2001-2006 Red Hat Inc."
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
 CHECKSUM_SHA256="4f63d0df3035101b12949250da5231af49e3c3afcd8fb18554fa7c3cb92d8c17"
-REVISION="2"
+SOURCE_DIR="pkg-config-0.27.1"
+PATCHES="pkgconfig-0.27.1.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="pkgconfig-0.27.1.patchset"
-
 PROVIDES="
 	pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27
 	cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27
@@ -26,11 +24,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -44,8 +43,6 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="pkg-config-0.27.1"
-
 BUILD()
 {
 	cd glib
diff --git a/dev-util/pkgconfig/pkgconfig-0.28.recipe b/dev-util/pkgconfig/pkgconfig-0.28.recipe
index d44ff3366..0713b7a5e 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.28.recipe
@@ -1,10 +1,9 @@
 SUMMARY="Helper tool for compiling applications and libraries"
-DESCRIPTION="pkg-config is a helper tool used when compiling applications and libraries. It \
-helps you insert the correct compiler options on the command line so an \
-application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for \
-instance, rather than hard-coding values on where to find glib (or other \
-libraries). It is language-agnostic, so it can be used for defining the \
-location of documentation tools, for instance."
+DESCRIPTION="pkg-config helps you insert the correct compiler options on the \
+command line so an application can use 'gcc -o test test.cpkg-config --libs \
+--cflags glib-2.0' for instance, rather than hard-coding values on where to \
+find glib (or other libraries). It is language-agnostic, so it can be used \
+for defining the location of documentation tools, for instance."
 HOMEPAGE="http://pkg-config.freedesktop.org/wiki/"
 COPYRIGHT="1998, 2001-2006 Red Hat Inc."
 LICENSE="GNU GPL v2"
@@ -13,8 +12,6 @@ SOURCE_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"
 CHECKSUM_SHA256="6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845"
 SOURCE_DIR="pkg-config-0.28"
 PATCHES="pkgconfig-0.28.patch"
-STATUS_HAIKU="stable"
-DEPEND=""
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -27,11 +24,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe
index 54322d26b..1420bf2a3 100644
--- a/dev-util/scons/scons-2.2.0.recipe
+++ b/dev-util/scons/scons-2.2.0.recipe
@@ -1,21 +1,19 @@
-SUMMARY="Open Source software construction tool"
-DESCRIPTION="
-SCons is an Open Source software construction tool—that is, a next-generation \
-build tool. Think of SCons as an improved, cross-platform substitute for the \
-classic Make utility with integrated functionality similar to \
-autoconf/automake and compiler caches such as ccache. In short, SCons is an \
-easier, more reliable and faster way to build software.
-"
+SUMMARY="A software construction tool"
+DESCRIPTION="SCons is an open-source software construction tool - that is, a \
+next-generation build tool. Think of SCons as an improved, cross-platform \
+substitute for the classic Make utility with integrated functionality similar \
+to autoconf/automake and compiler caches such as ccache. In short, SCons is \
+an easier, more reliable and faster way to build software."
 HOMEPAGE="http://www.scons.org/"
-LICENSE="MIT"
 COPYRIGHT="2001-2012 The SCons Foundation"
+LICENSE="MIT"
+REVISION="4"
 SOURCE_URI="http://sourceforge.net/projects/scons/files/scons/2.2.0/scons-2.2.0.tar.gz"
 CHECKSUM_SHA256="f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64bf078454a9856ec0ab465b9"
-REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="scons-2.2.0.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	scons = $portVersion compat >= 2.2
 	cmd:scons = $portVersion compat >= 2.2
@@ -29,7 +27,9 @@ REQUIRES="
 	haiku
 	cmd:python
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:python
diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe
index 689ecd91d..816f6fec1 100644
--- a/dev-util/scons/scons-2.3.1.recipe
+++ b/dev-util/scons/scons-2.3.1.recipe
@@ -1,21 +1,19 @@
-SUMMARY="Open Source software construction tool"
-DESCRIPTION="
-SCons is an Open Source software construction tool—that is, a next-generation \
-build tool. Think of SCons as an improved, cross-platform substitute for the \
-classic Make utility with integrated functionality similar to \
-autoconf/automake and compiler caches such as ccache. In short, SCons is an \
-easier, more reliable and faster way to build software.
-"
+SUMMARY="A software construction tool"
+DESCRIPTION="SCons is an open-source software construction tool - that is, a \
+next-generation build tool. Think of SCons as an improved, cross-platform \
+substitute for the classic Make utility with integrated functionality similar \
+to autoconf/automake and compiler caches such as ccache. In short, SCons is \
+an easier, more reliable and faster way to build software."
 HOMEPAGE="http://www.scons.org/"
-LICENSE="MIT"
 COPYRIGHT="2001-2012 The SCons Foundation"
+LICENSE="MIT"
+REVISION="4"
 SOURCE_URI="http://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz"
 CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201"
-REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="scons-2.3.1.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	scons = $portVersion compat >= 2.3
 	cmd:scons = $portVersion compat >= 2.3
@@ -29,7 +27,9 @@ REQUIRES="
 	haiku
 	cmd:python
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:python
diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe
index a5567faf9..343fa49dc 100644
--- a/dev-vcs/bzr/bzr-2.6.0.recipe
+++ b/dev-vcs/bzr/bzr-2.6.0.recipe
@@ -1,17 +1,19 @@
-SUMMARY="A friendly powerful distributed version control system"
-DESCRIPTION="
-Bazaar is a version control system that helps you track project history over \
-time and to collaborate easily with others. Whether you're a single developer, \
-a co-located team or a community of developers scattered across the world, \
-Bazaar scales and adapts to meet your needs. Part of the GNU Project, Bazaar \
-is free software sponsored by Canonical.
-"
+SUMMARY="A powerful distributed version control system"
+DESCRIPTION="Bazaar (bzr) is a version control system that helps you track \
+project history over time and to collaborate easily with others. Whether \
+you're a single developer, a co-located team or a community of developers \
+scattered across the world, Bazaar scales and adapts to meet your needs.
+Part of the GNU Project, Bazaar is free software sponsored by Canonical."
 HOMEPAGE="http://bazaar.canonical.com"
+COPYRIGHT="2005-2013 Canonical"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="https://launchpadlibrarian.net/145980211/bzr-2.6.0.tar.gz"
 CHECKSUM_SHA256="0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0"
-REVISION="2"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2013 Canonical"
+SOURCE_DIR="bzr-$portVersion"
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+	PATCHES="bzr-2.6.0_gcc2.patchset"
+fi
 
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="!x86"
@@ -20,17 +22,16 @@ PROVIDES="
 	bzr = $portVersion compat >= 2.6.0
 	cmd:bzr = $portVersion compat >= 2.6.0
 	"
-
 REQUIRES="
 	haiku
 	lib:libpython2.7$secondaryArchSuffix
 	cmd:python
 	"
-S="
+
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libpython2.7$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:python
 	cmd:gcc$secondaryArchSuffix
@@ -38,12 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:msgfmt
 	"
 
-SOURCE_DIR="bzr-$portVersion"
-
-if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-	PATCHES="bzr-2.6.0_gcc2.patchset"
-fi
-
 BUILD()
 {
 	python setup.py build