diff --git a/app-accessibility/festival/festival-2.4.recipe b/app-accessibility/festival/festival-2.4.recipe
index e13c5c182..89e8fe821 100644
--- a/app-accessibility/festival/festival-2.4.recipe
+++ b/app-accessibility/festival/festival-2.4.recipe
@@ -1,34 +1,28 @@
-SUMMARY="Text-to-speech engine"
+SUMMARY="A text-to-speech engine"
 DESCRIPTION="Festival is a text-to-speech engine co-developed by the \
 University of Edinburgh, UK, and Carnegie Mellon University. It is designed to \
 support multiple languages and to be easy to extend, both in terms of voices \
 and new languages."
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival"
-SOURCE_URI="
-	http://festvox.org/packed/festival/$portVersion/festival-${portVersion}-release.tar.gz
-	"
-CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84"
-SOURCE_DIR="festival"
-REVISION="1"
-
 # Only including the licenses that cover the files that are actually used
 # and/or installed
-LICENSE="
-	Festival
-	"
-COPYRIGHT="
-	1996 Alan W. Black
+COPYRIGHT="1996 Alan W. Black
 	1996-2004 University of Edinburgh, UK
-	1997 Jacques H. de Villiers <jacques@cse.ogi.edu>
-	1997 Kevin A. Lenzo <lenzo@cs.cmu.edu>
+	1997 Jacques H. de Villiers
+	1997 Kevin A. Lenzo
 	1997 Center for Spoken Language Understanding, Oregon Graduate \
 	Institute of Science & Technology
 	1999-2004 Language Technologies Institute, Carnegie Mellon University
 	2001-2008 Tokyo Institute of Technology
 	2001-2012 Nagoya Institute of Technology
 	2012 The Department of Arts and Culture, The Government of the \
-	Republic of South Africa
-	"
+	Republic of South Africa"
+LICENSE="Festival"
+REVISION="1"
+SOURCE_URI="http://festvox.org/packed/festival/$portVersion/festival-${portVersion}-release.tar.gz"
+CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84"
+SOURCE_DIR="festival"
+PATCHES="festival-${portVersion}.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -46,10 +40,6 @@ PROVIDES="
 	cmd:festival_client = $portVersion
 	cmd:text2wave = $portVersion
 	"
-PROVIDES_devel="
-	festival${secondaryArchSuffix}_devel = $portVersion
-	devel:libFestival$secondaryArchSuffix = $portVersion
-	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	speech_tools$secondaryArchSuffix >= 2.4
@@ -57,12 +47,18 @@ REQUIRES="
 	lib:libncurses$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	festival${secondaryArchSuffix}_devel = $portVersion
+	devel:libFestival$secondaryArchSuffix = $portVersion
+	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
 	festival$secondaryArchSuffix == $portVersion base
 	speech_tools${secondaryArchSuffix}_devel >= 2.4
 	devel:libncurses$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	speech_tools${secondaryArchSuffix}_devel >= 2.4
@@ -76,8 +72,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-PATCHES="festival-${portVersion}.patchset"
-
 BUILD()
 {
 	binDir=$prefix/bin
diff --git a/app-i18n/becjk/becjk-1.0.1.recipe b/app-i18n/becjk/becjk-1.0.1.recipe
index 6b0c3701d..41dc39146 100644
--- a/app-i18n/becjk/becjk-1.0.1.recipe
+++ b/app-i18n/becjk/becjk-1.0.1.recipe
@@ -1,14 +1,12 @@
 SUMMARY="An input method for Chinese, Japanese and Korean"
-DESCRIPTION="
-BeCJK was an input method for legacy BeOS, now works on Haiku.
-" 
-
+DESCRIPTION="BeCJK was an input method for legacy BeOS, now works on Haiku." 
 HOMEPAGE="https://bitbucket.org/Haiku-cn/becjk"
-SOURCE_URI="hg+https://bitbucket.org/Haiku-cn/becjk"
-
-COPYRIGHT="2001-2002 Anthony Lee <anthonylee@eLong.com>"
+COPYRIGHT="2001-2002 Anthony Lee"
 LICENSE="GNU LGPL v2"
 REVISION="2"
+SOURCE_URI="hg+https://bitbucket.org/Haiku-cn/becjk"
+PATCHES="becjk-1.0.1.patchset"
+
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
@@ -16,10 +14,10 @@ PROVIDES="
 	addon:BeCJK = $portVersion
 	lib:libbesavager = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
@@ -30,8 +28,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-PATCHES="becjk-1.0.1.patchset"
-
 BUILD()
 {
 	scons -Q
@@ -45,5 +41,6 @@ INSTALL()
 
 	cp generated/lib/besavager/*.so $libDir/
 	cp generated/data/BeCJK/dicts/* $dataDir/BeCJK/dicts/
-	cp generated/add-ons/input_server/methods/BeCJK $addOnsDir/input_server/methods/
+	cp generated/add-ons/input_server/methods/BeCJK \
+		$addOnsDir/input_server/methods/
 }
diff --git a/app-text/libabw/libabw-0.1.0.recipe b/app-text/libabw/libabw-0.1.0.recipe
index 3841398c6..242e9da36 100644
--- a/app-text/libabw/libabw-0.1.0.recipe
+++ b/app-text/libabw/libabw-0.1.0.recipe
@@ -1,17 +1,11 @@
 SUMMARY="AbiWord import library"
-DESCRIPTION="
-libabw is a library that parses the file format of AbiWord documents.
-"
+DESCRIPTION="libabw is a library that parses the file format of AbiWord \
+documents."
 HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libabw"
-SOURCE_URI="http://dev-www.libreoffice.org/src/libabw/libabw-$portVersion.tar.bz2"
-LICENSE="
-MPL v2.0
-"
-COPYRIGHT="
-Fridrich Strba <fridrich.strba@bluewin.ch>
-David Tardon <dtardon@redhat.com>
-"
+COPYRIGHT="Fridrich Strba, David Tardon"
+LICENSE="MPL v2.0"
 REVISION="2"
+SOURCE_URI="http://dev-www.libreoffice.org/src/libabw/libabw-$portVersion.tar.bz2"
 CHECKSUM_SHA256="49380c24e04e8d2a4824adc9b1b8f5026ad759bc335497e05f0983412821f8d9"
 
 ARCHITECTURES="x86 ?x86_64"
@@ -40,7 +34,17 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libabw${secondaryArchSuffix}_devel = $portVersion
+	devel:libabw_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	libabw$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:librevenge_0.0$secondaryArchSuffix
 	devel:librevenge_generators_0.0$secondaryArchSuffix
@@ -49,7 +53,6 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
@@ -82,11 +85,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libabw${secondaryArchSuffix}_devel = $portVersion
-	devel:libabw_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
-	"
-REQUIRES_devel="
-	libabw$secondaryArchSuffix == $portVersion base
-	"
diff --git a/app-text/libebook/libebook-0.1.1.recipe b/app-text/libebook/libebook-0.1.1.recipe
index 96ce1b41f..33cd30e67 100644
--- a/app-text/libebook/libebook-0.1.1.recipe
+++ b/app-text/libebook/libebook-0.1.1.recipe
@@ -1,18 +1,13 @@
-SUMMARY="A library for import of many e-book formats"
-DESCRIPTION="
-libe-book is a library and set of tools for reading and converting various \
-reflowable e-book formats.
-"
+SUMMARY="A library to import many e-book formats"
+DESCRIPTION="libe-book is a library and set of tools for reading and \
+converting various reflowable e-book formats."
 HOMEPAGE="http://sourceforge.net/projects/libebook/"
-SOURCE_URI="http://prdownloads.sourceforge.net/libebook/libe-book-$portVersion.tar.bz2"
-LICENSE="
-MPL v2.0
-"
-COPYRIGHT="
-David Tardon <dtardon@redhat.com>
-"
+COPYRIGHT="David Tardon"
+LICENSE="MPL v2.0"
 REVISION="2"
+SOURCE_URI="http://prdownloads.sourceforge.net/libebook/libe-book-$portVersion.tar.bz2"
 CHECKSUM_SHA256="90353fc60827a33b391d0b63ecfe5239229d489af99ff6ea014ede3b39fa32b5"
+SOURCE_DIR="libe-book-$portVersion"
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -22,8 +17,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-SOURCE_DIR="libe-book-$portVersion"
-
 PROVIDES="
 	libebook$secondaryArchSuffix = $portVersion
 	cmd:ebook2html$secondaryArchSuffix
@@ -45,6 +38,15 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libebook${secondaryArchSuffix}_devel = $portVersion
+	devel:libe_book_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
+	"
+REQUIRES_devel="
+	libebook$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	devel:libboost_system$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
@@ -91,11 +93,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libebook${secondaryArchSuffix}_devel = $portVersion
-	devel:libe_book_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
-	"
-REQUIRES_devel="
-	libebook$secondaryArchSuffix == $portVersion base
-	"
diff --git a/app-text/libetonyek/libetonyek-0.1.2.recipe b/app-text/libetonyek/libetonyek-0.1.2.recipe
index 513422c9b..87f967bff 100644
--- a/app-text/libetonyek/libetonyek-0.1.2.recipe
+++ b/app-text/libetonyek/libetonyek-0.1.2.recipe
@@ -1,18 +1,11 @@
 SUMMARY="Apple Keynote import library"
-DESCRIPTION="
-libetonyek is a library that parses the file format of Apple Keynote \
-documents. It supports Keynote versions 2-5.
-"
+DESCRIPTION="libetonyek is a library that parses the file format of Apple \
+Keynote documents. It supports Keynote versions 2-5."
 HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-SOURCE_URI="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.bz2"
-LICENSE="
-MPL v2.0
-"
-COPYRIGHT="
-Fridrich Strba <fridrich.strba@bluewin.ch>
-David Tardon <dtardon@redhat.com>
-"
+COPYRIGHT="Fridrich Strba, David Tardon"
+LICENSE="MPL v2.0"
 REVISION="1"
+SOURCE_URI="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f3f9342a34514a02c8a8c6d2a7957ee29cdb94ee69c67fe37b214fba50f49abf"
 
 ARCHITECTURES="x86 x86_64"
@@ -47,7 +40,17 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libetonyek${secondaryArchSuffix}_devel = $portVersion
+	devel:libetonyek_0.1$secondaryArchSuffix = 1.0.2 compat >= 1
+	"
+REQUIRES_devel="
+	libetonyek$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
 	devel:librevenge_0.0$secondaryArchSuffix
@@ -58,7 +61,6 @@ BUILD_REQUIRES="
 	glm_devel$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
@@ -94,11 +96,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libetonyek${secondaryArchSuffix}_devel = $portVersion
-	devel:libetonyek_0.1$secondaryArchSuffix = 1.0.2 compat >= 1
-	"
-REQUIRES_devel="
-	libetonyek$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe
index 755b58013..733f54a3a 100644
--- a/dev-embedded/avrdude/avrdude-6.0.1.recipe
+++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe
@@ -1,14 +1,15 @@
 SUMMARY="AVR Downloader/UploaDEr"
-DESCRIPTION="
-AVRDUDE is an utility to download/upload/manipulate the ROM and EEPROM contents \
-of AVR microcontrollers using the in-system programming technique (ISP).
-"
+DESCRIPTION="AVRDUDE is an utility to download/upload/manipulate the ROM and \
+EEPROM contents of AVR microcontrollers using the in-system programming \
+technique (ISP)."
 HOMEPAGE="http://www.nongnu.org/avrdude/"
+COPYRIGHT="2003-2013 Brian S. Dean"
 LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2013 Brian S. Dean <bsd@bdmicro.com>"
+REVISION="2"
 SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz"
 CHECKSUM_SHA256="c6804668dfa96b23185dfe2e8239089af4e4ae0b11aa7435bebb28c3260ede41"
-REVISION="2"
+PATCHES="avrdude-6.0.1.patch"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -16,7 +17,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"
-PATCHES="avrdude-6.0.1.patch"
 
 GLOBAL_WRITABLE_FILES="
 	settings/avrdude.conf keep-old
@@ -32,13 +32,14 @@ REQUIRES="
 	lib:libftdi1$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libusb_1.0$secondaryArchSuffix
 	devel:libftdi1$secondaryArchSuffix
 	devel:libelf$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:automake
diff --git a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
index 85d61018d..1a6a213fa 100644
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
@@ -1,28 +1,25 @@
 SUMMARY="A Device Firmware Update based USB programmer for Atmel chips"
-DESCRIPTION="
-dfu-programmer is an implementation of the Device Firmware Upgrade class
-USB driver that enables firmware upgrades for various USB enabled (with the
-correct bootloader) Atmel chips.  This program was created because the
-Atmel "FLIP" program for flashing devices does not support flashing via USB
-on Linux, and because standard DFU loaders do not work for Atmel's chips.
+DESCRIPTION="dfu-programmer is an implementation of the Device Firmware \
+Upgrade class USB driver that enables firmware upgrades for various USB \
+enabled (with the correct bootloader) Atmel chips.  This program was created \
+because the Atmel "FLIP" program for flashing devices does not support \
+flashing via USB on Linux, and because standard DFU loaders do not work for \
+Atmel's chips.
 
-Check out the Atmel website for more information.  They are kind enough to
+Check out the Atmel website for more information.  They are kind enough to \
 provide generally correct specifications this implementation is based on.
 
-The project website is http://dfu-programmer.sourceforge.net and you can
-use that to check for updates.
-"
+The project website is http://dfu-programmer.sourceforge.net and you can use \
+that to check for updates."
 HOMEPAGE="http://dfu-programmer.sourceforge.net"
-LICENSE="
-	GNU GPL v2
-"
-COPYRIGHT="
-    Weston Schmidt <weston_schmidt@alumni.purdue.edu>
-"
+COPYRIGHT="Weston Schmidt"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.6.2/dfu-programmer-0.6.2.tar.gz" 
 SOURCE_DIR="dfu-programmer-0.6.2"
 CHECKSUM_SHA256="0120966a424dd98124962055750e90cbd6c7b6b0fbf5b187bf435daa0a24af65"
-REVISION="1"
+PATCHES="dfu-programmer-0.6.2.patch"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -31,31 +28,27 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="dfu-programmer-0.6.2.patch"
-
 PROVIDES="
 	dfu_programmer = $portVersion
 	cmd:dfu_programmer$secondaryArchSuffix = $portVersion
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
-"
+	"
 
 BUILD_REQUIRES="
-	devel:libusb_1.0$secondaryArchSuffix
-"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libusb_1.0$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:automake
 	cmd:autoconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/bafx/bafx-0.2.3.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe
index ad3a76de5..84e118fdf 100644
--- a/haiku-apps/bafx/bafx-0.2.3.recipe
+++ b/haiku-apps/bafx/bafx-0.2.3.recipe
@@ -1,24 +1,27 @@
 SUMMARY="A file manager for Haiku"
 DESCRIPTION="BAfx is a file manager for BeOS/Haiku. It uses a single window \
-with two panes for source and destination folder. \
-The file manager is still in early stages of development. \
-A built-in text and image viewer are planned for future releases."
+with two panes for source and destination folder.
+The file manager is still in early stages of development. A built-in text and \
+image viewer are planned for future releases."
 HOMEPAGE="https://github.com/marbocub/BAfx"
-SOURCE_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22"
-COPYRIGHT="2012 @marbocub"
+COPYRIGHT="2012 marbocub"
 LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	bafx = $portVersion
 	app:BAfx = $portVersion
 	"
+REQUIRES="
+	haiku
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
diff --git a/haiku-apps/becasso/becasso-2.0.recipe b/haiku-apps/becasso/becasso-2.0.recipe
index 3c54e371f..211b69f3c 100644
--- a/haiku-apps/becasso/becasso-2.0.recipe
+++ b/haiku-apps/becasso/becasso-2.0.recipe
@@ -1,11 +1,16 @@
-SUMMARY="Paint and imaging software for Haiku"
-DESCRIPTION="
-BeCasso - Paint and imaging software for Haiku, originally written for BeOS by \
-Sum Software.
-"
+SUMMARY="A paint and imaging software"
+DESCRIPTION="BeCasso is a paint and imaging software for Haiku, originally \
+written for BeOS by Sum Software.
+It features alpha channel support, layering, multi-level undo/redo, add-on \
+architecture for external filters, transformators and generators, an \
+orthogonal user interface, and import/export of numerous file formats \
+via the Translation Kit."
 HOMEPAGE="https://github.com/orangejua/Becasso"
-SOURCE_URI="git+https://github.com/orangejua/Becasso"
+COPYRIGHT="1997-2003 Sum Software
+	2013 Julian Harnath"
+LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="git+https://github.com/orangejua/Becasso"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -13,26 +18,23 @@ PROVIDES="
 	becasso = $portVersion
 	app:BeCasso = $portVersion
 	"
+REQUIRES="
+	haiku
+	"
 
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libz
+	"
 BUILD_PREREQUIRES="
 	cmd:nasm
 	cmd:gcc
-	cmd:jam"
+	cmd:jam
+	"
 	
-BUILD_REQUIRES="
-	haiku
-	haiku_devel
-	devel:libz"
-		
 USER_SETTINGS_FILES="
 	settings/Becasso directory"
 
-COPYRIGHT="
-	1997-2003 Sum Software <sander@stoks.nl>
-	2013 Julian Harnath <julian.harnath@rwth-aachen.de>"
-
-LICENSE="MIT"
-
 BUILD()
 {
 	jam -q
diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
index 0b0dd458e..cddaf8eb2 100644
--- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -1,16 +1,12 @@
-SUMMARY="Cmake GUI with Haiku Native Widgets"
-DESCRIPTION="
-cmake_haiku is a native GUI frontend for Cmake with features like configuring \
-a project and generating files for other build systems like Makefiles, Ninja \
-etc.
-"
+SUMMARY="A cmake GUI with Haiku native widgets"
+DESCRIPTION="cmake_haiku is a native GUI frontend for Cmake with features \
+like configuring a project and generating files for other build systems like \
+Makefiles, Ninja etc."
 HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku"
-SOURCE_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b"
-
+COPYRIGHT="2012-2013 Adrián Arroyo Calle"
 LICENSE="BSD (3-clause)"
-COPYRIGHT="2012-2013 Adrián Arroyo Calle <adrian.arroyocalle@gmail.com>"
-
 REVISION="1"
+SOURCE_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
@@ -23,6 +19,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:cmake
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
index 763741522..ea0d549d6 100644
--- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
+++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
@@ -4,13 +4,14 @@ flexibly customizable. It works on Windows, BeOS, and Haiku. In this \
 application the word \"cover\" means a set of files for its design, \
 instead of the commonly used word \"skin\"."
 HOMEPAGE="https://code.google.com/p/coveredcalc"
+COPYRIGHT="2008 hiron"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI_1="svn+http://coveredcalc.googlecode.com/svn/trunk@72"
 SOURCE_URI_2="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip"
 CHECKSUM_SHA256_2="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669"
-REVISION="1"
-LICENSE="MIT"
+
 ARCHITECTURES="x86_gcc2 ?x86"
-COPYRIGHT="2008 hiron@with.memail.jp"
 
 PROVIDES="
 	coveredcalc = $portVersion
@@ -19,6 +20,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/media-fonts/dejavu/dejavu-2.34.recipe b/media-fonts/dejavu/dejavu-2.34.recipe
index 37e835adb..5fd6ab228 100644
--- a/media-fonts/dejavu/dejavu-2.34.recipe
+++ b/media-fonts/dejavu/dejavu-2.34.recipe
@@ -1,28 +1,29 @@
-SUMMARY="DejaVu font family with improved Vera fonts"
+SUMMARY="The DejaVu font family with improved Vera fonts"
 DESCRIPTION="This package includes the DejaVu Serif, Sans (proportional), and \
 DejaVu Sans Mono (monospaced) fonts. 
 The fonts are based on the Vera fonts open-sourced by Bitstream, and the Arev \
 fonts."
-HOMEPAGE="http://dejavu-fonts.org/" 
+HOMEPAGE="http://dejavu-fonts.org/"
+COPYRIGHT="2003 Bitstream, Inc.
+	2006 Tavmjong Bah"
+LICENSE="Bitstream Vera
+	Arev Fonts"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/dejavu/files/dejavu/$portVersion/dejavu-fonts-ttf-$portVersion.tar.bz2"
 CHECKSUM_SHA256="d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d"
-LICENSE="Bitstream Vera
-	Arev Fonts
-"
-COPYRIGHT="2003 Bitstream, Inc.
-2006 Tavmjong Bah <tavmjong@free.fr>.
-"
-REVISION="2"
+SOURCE_DIR="dejavu-fonts-ttf-$portVersion/ttf"
 
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
 
-PROVIDES="dejavu = $portVersion"
+PROVIDES="
+	dejavu = $portVersion
+	"
 REQUIRES=""
 BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
-
-SOURCE_DIR="dejavu-fonts-ttf-$portVersion/ttf"
+BUILD_PREREQUIRES="
+	coreutils
+	"
 
 BUILD()
 {
diff --git a/media-fonts/lato_fonts/lato_fonts-2.010.recipe b/media-fonts/lato_fonts/lato_fonts-2.010.recipe
index ce61cdd0d..b5a9c70cc 100644
--- a/media-fonts/lato_fonts/lato_fonts-2.010.recipe
+++ b/media-fonts/lato_fonts/lato_fonts-2.010.recipe
@@ -6,22 +6,24 @@ License by his foundry tyPoland, with support from Google. Lato consists of \
 nine weights (plus corresponding italics), including a beautiful hairline \
 style."
 HOMEPAGE="http://www.latofonts.com/lato-free-fonts/"
+COPYRIGHT="2010-2014 Łukasz Dziedzic, with Reserved Font Name Lato"
+LICENSE="SIL Open Font License v1.1"
+REVISION="1"
 SOURCE_URI="http://www.latofonts.com/download/Lato2OFL.zip"
 CHECKSUM_SHA256="367c730f64f4d1731e4d3ef7da2dd27635999e4a2f7cab24cfdcaf42488644a4"
-LICENSE="SIL Open Font License v1.1"
-COPYRIGHT="2010-2014 Łukasz Dziedzic <dziednic@typoland.com>, with Reserved \
-Font Name Lato"
-REVISION="1"
+SOURCE_DIR="Lato2OFL"
+
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
+
 PROVIDES="
 	lato_fonts=$portVersion
 	"
+REQUIRES=""
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
 	coreutils
 	"
-SOURCE_DIR="Lato2OFL"
 
 BUILD() 
 {
@@ -35,4 +37,3 @@ INSTALL()
 	
 	cp *.ttf $FONTDIR
 }
-
diff --git a/media-gfx/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe
index 89a2b0dd8..7e1c951af 100644
--- a/media-gfx/exiv2/exiv2-0.24.recipe
+++ b/media-gfx/exiv2/exiv2-0.24.recipe
@@ -3,14 +3,14 @@ DESCRIPTION="Exiv2 provides fast and easy read and write access to the Exif, \
 IPTC and XMP metadata of images in various formats. Exiv2 is available as \
 free software and with a commercial license, and is used in many projects."
 HOMEPAGE="http://www.exiv2.org/"
+COPYRIGHT="2004-2013 Andreas Huggel
+	2009 Brad Schick"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://www.exiv2.org/exiv2-0.24.tar.gz"
 CHECKSUM_SHA256="f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2004-2013 Andreas Huggel <ahuggel@gmx.net>
-	2009 Brad Schick <schickb@gmail.com>
-	"
+PATCHES="exiv2-0.24.patch"
+
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
@@ -19,7 +19,6 @@ else
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="exiv2-0.24.patch"
 
 PROVIDES="
 	exiv2$secondaryArchSuffix = $portVersion
@@ -31,6 +30,15 @@ REQUIRES="
 	lib:libexpat$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	exiv2${secondaryArchSuffix}_devel = $portVersion
+	devel:libexiv2${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES_devel="
+	exiv2$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
@@ -65,14 +73,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	exiv2${secondaryArchSuffix}_devel = $portVersion
-	devel:libexiv2${secondaryArchSuffix} = $portVersion
-	"
-REQUIRES_devel="
-	exiv2$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libaubio/libaubio-0.4.1.recipe b/media-libs/libaubio/libaubio-0.4.1.recipe
index fb190a99e..cd6b551d1 100644
--- a/media-libs/libaubio/libaubio-0.4.1.recipe
+++ b/media-libs/libaubio/libaubio-0.4.1.recipe
@@ -1,28 +1,23 @@
 SUMMARY="A library to label music and sounds"
-DESCRIPTION="
-aubio is a library to label music and sounds. It listens to audio signals and \
-attempts to detect events. For instance, when a drum is hit, at which frequency \
-is a note, or at what tempo is a rhythmic melody.
+DESCRIPTION="aubio is a library to label music and sounds. It listens to \
+audio signals and attempts to detect events. For instance, when a drum is \
+hit, at which frequency is a note, or at what tempo is a rhythmic melody.
 
 Its features include segmenting a sound file before each of its attacks, \
 performing pitch detection, tapping the beat and producing midi streams from \
-live audio.
-"
+live audio."
 HOMEPAGE="http://aubio.org"
-COPYRIGHT="
-	2003-2013 Paul Brossier <piem@aubio.org>
-	"
+COPYRIGHT="2003-2013 Paul Brossier"
 LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://aubio.org/pub/aubio-$portVersion.tar.bz2"
 CHECKSUM_SHA256="25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695"
-REVISION="1"
+SOURCE_DIR="aubio-$portVersion"
+PATCHES="libaubio-$portVersion.patchset"
+
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
-SOURCE_DIR="aubio-$portVersion"
-
-PATCHES="libaubio-$portVersion.patchset"
-
 PROVIDES="
 	libaubio$secondaryArchSuffix = $portVersion compat >= 0
 	lib:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
@@ -42,6 +37,15 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 #	lib:libsamplerate$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libaubio${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
+	"
+REQUIRES_devel="
+	libaubio$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 #	devel:libsamplerate$secondaryArchSuffix
@@ -77,13 +81,3 @@ INSTALL()
 		rm -rf $prefix/bin
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libaubio${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
-	"
-REQUIRES_devel="
-	libaubio$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libcaca/libcaca-0.99.beta19.recipe b/media-libs/libcaca/libcaca-0.99.beta19.recipe
index 518de2db1..ab2b80a3d 100644
--- a/media-libs/libcaca/libcaca-0.99.beta19.recipe
+++ b/media-libs/libcaca/libcaca-0.99.beta19.recipe
@@ -1,31 +1,23 @@
-SUMMARY="libcaca ASCII art rendering library"
-DESCRIPTION="
-libcaca is a software library which allows applications to automatically \
-convert still and moving images into colored ASCII art.
-"
+SUMMARY="An ASCII art rendering library"
+DESCRIPTION="libcaca is a software library which allows applications to \
+automatically convert still and moving images into colored ASCII art."
 HOMEPAGE="http://caca.zoy.org/wiki/libcaca"
-
 # FIXME: the offical website is down right now. Using mirror provided by the
 #        MXE project.
-SOURCE_URI="
-	http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-$portVersion.tar.gz
-	http://s3.amazonaws.com/mxe-pkg/libcaca-$portVersion.tar.gz
-	"
+COPYRIGHT="1998, 1999, 2001 Jan Hubicka
+	2003-2008 Sam Hocevar
+	2003-2008 Jean-Yves Lamoureux
+	2004-2005 John Beppu
+	2006-2007 Ben Wiley Sittler
+	2007-2008 Pascal Terjan"
+LICENSE="WTFPL
+	GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-$portVersion.tar.gz
+	http://s3.amazonaws.com/mxe-pkg/libcaca-$portVersion.tar.gz"
 CHECKSUM_SHA256="128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4"
 SOURCE_DIR="libcaca-$portVersion"
-REVISION="1"
-LICENSE="
-	WTFPL
-	GNU GPL v2
-	"
-COPYRIGHT="
-	1998, 1999, 2001 Jan Hubicka <hubicka@freesoft.cz>
-	2003-2008 Sam Hocevar <sam@zoy.org>
-	2003-2008 Jean-Yves Lamoureux <jylam@lnxscene.org>
-	2004-2005 John Beppu <beppu@lbox.org>
-	2006-2007 Ben Wiley Sittler <bsittler@gmail.com>
-	2007-2008 Pascal Terjan <pterjan@linuxfr.org>
-	"
+PATCHES="libcaca-${portVersion}.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -42,7 +34,6 @@ PROVIDES="
 	cmd:cacaplay$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:img2txt$secondaryArchSuffix = $portVersion compat >= 0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libncursesw$secondaryArchSuffix
@@ -56,12 +47,24 @@ if [ "$effectiveTargetArchitecture" != 'x86_gcc2' ]; then
 		"
 fi
 
+PROVIDES_devel="
+	libcaca${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libcaca$secondaryArchSuffix = $portVersion compat >= 0
+	devel:libcaca++$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:caca_config$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES_devel="
+	haiku$secondaryArchSuffix
+	libcaca$secondaryArchSuffix == $portVersion base
+	lib:libncursesw$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libncursesw$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
@@ -76,8 +79,6 @@ BUILD_PREREQUIRES="
 	cmd:ranlib
 	"
 
-PATCHES="libcaca-${portVersion}.patchset"
-
 PATCH()
 {
         sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
@@ -106,19 +107,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libcaca${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libcaca$secondaryArchSuffix = $portVersion compat >= 0
-	devel:libcaca++$secondaryArchSuffix = $portVersion compat >= 0
-	cmd:caca_config$secondaryArchSuffix = $portVersion compat >= 0
-	"
-
-REQUIRES_devel="
-	haiku$secondaryArchSuffix
-	libcaca$secondaryArchSuffix == $portVersion base
-	lib:libncursesw$secondaryArchSuffix
-	devel:libncursesw$secondaryArchSuffix
-	"
diff --git a/media-libs/libcdr/libcdr-0.1.1.recipe b/media-libs/libcdr/libcdr-0.1.1.recipe
index fe6887481..30bc31948 100644
--- a/media-libs/libcdr/libcdr-0.1.1.recipe
+++ b/media-libs/libcdr/libcdr-0.1.1.recipe
@@ -1,18 +1,11 @@
-SUMMARY="Corel Draw import library"
-DESCRIPTION="
-libcdr is a library that parses the file format of CorelDRAW documents of all \
-versions.
-"
+SUMMARY="A Corel Draw import library"
+DESCRIPTION="libcdr is a library that parses the file format of CorelDRAW \
+documents of all versions."
 HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-SOURCE_URI="http://dev-www.libreoffice.org/src/libcdr/libcdr-$portVersion.tar.bz2"
-LICENSE="
-MPL v2.0
-"
-COPYRIGHT="
-Fridrich Strba <fridrich.strba@bluewin.ch>
-David Tardon <dtardon@redhat.com>
-"
+COPYRIGHT="Fridrich Strba, David Tardon"
+LICENSE="MPL v2.0"
 REVISION="1"
+SOURCE_URI="http://dev-www.libreoffice.org/src/libcdr/libcdr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49"
 
 ARCHITECTURES="x86 ?x86_64"
@@ -47,7 +40,17 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libcdr${secondaryArchSuffix}_devel = $portVersion
+	devel:libcdr_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
+	"
+REQUIRES_devel="
+	libcdr$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:libicudata$secondaryArchSuffix
 	devel:libicui18n$secondaryArchSuffix
@@ -59,7 +62,6 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
@@ -91,11 +93,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libcdr${secondaryArchSuffix}_devel = $portVersion
-	devel:libcdr_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
-	"
-REQUIRES_devel="
-	libcdr$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libdca/libdca-0.0.5.recipe b/media-libs/libdca/libdca-0.0.5.recipe
index 2034a4280..faf8a4e97 100644
--- a/media-libs/libdca/libdca-0.0.5.recipe
+++ b/media-libs/libdca/libdca-0.0.5.recipe
@@ -1,15 +1,19 @@
-SUMMARY="a free DTS Coherent Acoustics decoder"
+SUMMARY="A free DTS Coherent Acoustics decoder"
 DESCRIPTION="libdca is a free library for decoding DTS Coherent Acoustics \
 streams. The code is written by Gildas Bazin and was based on the a52dec \
 project. It is released under the terms of the GPL license.
 
 The DTS Coherent Acoustics standard (ETSI 102 114 v1.2.1), as published by the \
-ETSI, is available here (look for DTS Coherent Acoustics).
-"
-HOMEPAGE="http://www.videolan.org/developers/libdca.html" 
+ETSI, is available here (look for DTS Coherent Acoustics)."
+HOMEPAGE="http://www.videolan.org/developers/libdca.html"
+COPYRIGHT="2004 Gildas Bazin
+	2000-2003 Michel Lespinasse
+	1999-2000 Aaron Holtzman"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://download.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2"
 CHECKSUM_SHA256="dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642"
-REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -20,33 +24,30 @@ PROVIDES="
 	cmd:extract_dca$secondaryArchSuffix
 	cmd:extract_dts$secondaryArchSuffix
 	lib:libdca$secondaryArchSuffix = 0.0.0 compat = 0
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-"
+	"
+
+PROVIDES_devel="
+	libdca_devel = $portVersion
+	devel:libdca$secondaryArchSuffix
+	devel:libdts$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	libdca$secondaryArchSuffix == $portVersion base
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-"
-
-PROVIDES_devel="
-	libdca_devel = $portVersion
-	devel:libdca$secondaryArchSuffix
-	devel:libdts$secondaryArchSuffix
-"
-
-REQUIRES_devel="
-	libdca$secondaryArchSuffix == $portVersion base
-"
+	"
 
 BUILD()
 {
@@ -64,8 +65,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2004 Gildas Bazin <gbazin@videolan.org>
-	2000-2003 Michel Lespinasse <walken@zoy.org>
-	1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>"
diff --git a/media-libs/libdv/libdv-1.0.0.recipe b/media-libs/libdv/libdv-1.0.0.recipe
index be823826e..8c501eee9 100644
--- a/media-libs/libdv/libdv-1.0.0.recipe
+++ b/media-libs/libdv/libdv-1.0.0.recipe
@@ -1,22 +1,21 @@
-SUMMARY="a GPL codec for DV video"
-DESCRIPTION="
-The Quasar DV codec (libdv) is a software codec for DV video, the encoding format \
-used by most digital camcorders, typically those that support the IEEE 1394 \
-(a.k.a FireWire or i.Link) interface. Libdv was developed according to the \
-official standards for DV video: IEC 61834 and SMPTE 314M."
+SUMMARY="A GPL codec for DV video"
+DESCRIPTION="The Quasar DV codec (libdv) is a software codec for DV video, \
+the encoding format used by most digital camcorders, typically those that \
+support the IEEE 1394 (a.k.a FireWire or i.Link) interface. Libdv was \
+developed according to the official standards for DV video: IEC 61834 and \
+SMPTE 314M."
 HOMEPAGE="http://libdv.sourceforge.net"
-COPYRIGHT="
-	1999 Erik Walthinsen <omega@cse.ogi.edu>
-	1999 Charles 'Buck' Krasic <krasic@acm.org>"
+COPYRIGHT="1999 Erik Walthinsen
+	1999 Charles 'Buck' Krasic"
 LICENSE="GNU LGPL v2.1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/libdv/files/libdv/$portVersion/libdv-$portVersion.tar.gz"
 CHECKSUM_SHA256="a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba"
-REVISION="2"
+PATCHES="libdv-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libdv-$portVersion.patchset"
-
 PROVIDES="
 	libdv$secondaryArchSuffix = $portVersion compat >= 1.0
 	lib:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
@@ -28,6 +27,15 @@ REQUIRES="
 	lib:libsdl_1.2$secondaryArchSuffix
 	lib:libpopt$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libdv${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
+	devel:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
+	"
+REQUIRES_devel="
+	libdv$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl_1.2$secondaryArchSuffix
@@ -65,13 +73,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdv${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
-	devel:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
-	"
-REQUIRES_devel="
-	libdv$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-misc/curl/curl-7.42.0.recipe b/net-misc/curl/curl-7.42.0.recipe
index ed0b62696..c7cc8fb6e 100644
--- a/net-misc/curl/curl-7.42.0.recipe
+++ b/net-misc/curl/curl-7.42.0.recipe
@@ -1,15 +1,20 @@
 SUMMARY="A commandline-tool and library for downloading data from URLs"
+DESCRIPTION="Curl is a command line tool for transferring data with URL \
+syntax, supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, \
+LDAP, LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form \
+based upload, proxies, cookies, user+password authentication (Basic, Digest, \
+NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a \
+busload of other useful tricks."
 HOMEPAGE="http://curl.haxx.se"
-COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+COPYRIGHT="1996-2014, Daniel Stenberg"
 LICENSE="Curl"
+REVISION="2"
 SOURCE_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2"
 CHECKSUM_SHA256="32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f"
-REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES=""
-
 PROVIDES="
 	curl$secondaryArchSuffix = $portVersion
 	lib:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
@@ -19,19 +24,30 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:curl = $portVersion compat >= 7.16
 		"
 fi
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	ca_root_certificates
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
+	"
+REQUIRES_devel="
+	curl$secondaryArchSuffix == $portVersion base
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -94,26 +110,3 @@ TEST()
 {
 	make check
 }
-
-DESCRIPTION="
-Curl is a command line tool for transferring data with URL syntax, supporting \
-DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \
-POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \
-certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \
-proxies, cookies, user+password authentication (Basic, Digest, NTLM, \
-Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \
-of other useful tricks.
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	curl${secondaryArchSuffix}_devel = $portVersion
-	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
-	devel:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
-	"
-REQUIRES_devel="
-	curl$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
diff --git a/net-misc/curl/curl-7.42.1.recipe b/net-misc/curl/curl-7.42.1.recipe
index 08781e908..e0a2534ca 100644
--- a/net-misc/curl/curl-7.42.1.recipe
+++ b/net-misc/curl/curl-7.42.1.recipe
@@ -1,15 +1,20 @@
 SUMMARY="A commandline-tool and library for downloading data from URLs"
+DESCRIPTION="Curl is a command line tool for transferring data with URL \
+syntax, supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, \
+LDAP, LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form \
+based upload, proxies, cookies, user+password authentication (Basic, Digest, \
+NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a \
+busload of other useful tricks."
 HOMEPAGE="http://curl.haxx.se"
-COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+COPYRIGHT="1996-2014, Daniel Stenberg"
 LICENSE="Curl"
+REVISION="1"
 SOURCE_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2"
 CHECKSUM_SHA256="e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES=""
-
 PROVIDES="
 	curl$secondaryArchSuffix = $portVersion
 	lib:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
@@ -27,11 +32,23 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
+	"
+REQUIRES_devel="
+	curl$secondaryArchSuffix == $portVersion base
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -95,26 +112,3 @@ TEST()
 {
 	make check
 }
-
-DESCRIPTION="
-Curl is a command line tool for transferring data with URL syntax, supporting \
-DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \
-POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \
-certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \
-proxies, cookies, user+password authentication (Basic, Digest, NTLM, \
-Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \
-of other useful tricks.
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	curl${secondaryArchSuffix}_devel = $portVersion
-	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
-	devel:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4
-	"
-REQUIRES_devel="
-	curl$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
diff --git a/sci-libs/geos/geos-3.4.2.recipe b/sci-libs/geos/geos-3.4.2.recipe
index 1b3a6485f..8730dab50 100644
--- a/sci-libs/geos/geos-3.4.2.recipe
+++ b/sci-libs/geos/geos-3.4.2.recipe
@@ -1,28 +1,24 @@
 SUMMARY="Geometry Engine Open Source"
-DESCRIPTION="
-GEOS is a C++ port of the Java Topology Suite (JTS). As such, it aims to \
-contain the complete functionality of JTS in C++. This includes all the \
-OpenGIS Simple Features for SQL spatial predicate functions and spatial \
-operators, as well as specific JTS enhanced topology functions.
-"
+DESCRIPTION="GEOS is a C++ port of the Java Topology Suite (JTS). As such, \
+it aims to contain the complete functionality of JTS in C++. This includes \
+all the OpenGIS Simple Features for SQL spatial predicate functions and \
+spatial operators, as well as specific JTS enhanced topology functions."
 HOMEPAGE="http://trac.osgeo.org/geos"
-COPYRIGHT="
-	2006 Refractions Research Inc.
+COPYRIGHT="2006 Refractions Research Inc.
 	2012 Excensus LLC.
 	2001-2002 Vivid Solutions Inc.
-	2009-2012 Sandro Santilli <strk@keybit.net>
+	2009-2012 Sandro Santilli
 	2008-2010 Safe Software Inc.
-	2008 Sean Gillies
-	"
+	2008 Sean Gillies"
 LICENSE="GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://download.osgeo.org/geos/geos-$portVersion.tar.bz2"
 CHECKSUM_SHA256="15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53"
-REVISION="1"
+PATCHES="geos-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="geos-$portVersion.patchset"
-
 PROVIDES="
 	geos$secondaryArchSuffix = $portVersion compat >= 3.4
 	lib:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4
@@ -32,6 +28,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.4
+	cmd:geos_config$secondaryArchSuffix
+	devel:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4
+	devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.4
+	devel:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1
+	"
+REQUIRES_devel="
+	geos$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -65,16 +73,3 @@ INSTALL()
 		$binDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.4
-	cmd:geos_config$secondaryArchSuffix
-	devel:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4
-	devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.4
-	devel:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1
-	"
-REQUIRES_devel="
-	geos$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sci-libs/gsl/gsl-1.16.recipe b/sci-libs/gsl/gsl-1.16.recipe
index 3cf579c62..db9d3fa5a 100644
--- a/sci-libs/gsl/gsl-1.16.recipe
+++ b/sci-libs/gsl/gsl-1.16.recipe
@@ -1,11 +1,8 @@
 SUMMARY="GNU Scientific Library"
-DESCRIPTION="
-This is GSL, the GNU Scientific Library, a collection of numerical \
-routines for scientific computing.
-"
+DESCRIPTION="This is GSL, the GNU Scientific Library, a collection of \
+numerical routines for scientific computing."
 HOMEPAGE="http://www.gnu.org/software/gsl/"
-COPYRIGHT="
-	1996-2007, 2009, 2010 Gerard Jungman
+COPYRIGHT="1996-2007, 2009, 2010 Gerard Jungman
 	1996-2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2013 Brian Gough
 	1996-2000, 2007, 2010 Jim Davies
 	2002, 2004, 2009 Ivo Alxneit
@@ -20,7 +17,7 @@ COPYRIGHT="
 	2003 Heiko Bauke
 	2001, 2003, 2007 Carlo Perassi
 	2003 Olaf Lenz
-	2002 Gavin E. Crooks <gec@compbio.berkeley.edu>
+	2002 Gavin E. Crooks
 	2000, 2001, 2004 David Morrison
 	2005 Jochen Voss
 	2006 Charles Karney
@@ -51,12 +48,12 @@ COPYRIGHT="
 	2001 Rodney Sparapani
 	2002 Achim Gaedke
 	1996, 1997, 1998, 1999, 2000, 2007 Jorma Olavi Ttinen
-	2002-2004 Jason H. Stover
-	"
+	2002-2004 Jason H. Stover	"
 LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/gsl/gsl-$portVersion.tar.gz"
 CHECKSUM_SHA256="73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53"
-REVISION="1"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -65,7 +62,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-
 PROVIDES="
 	gsl$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:gsl_histogram$secondaryArchSuffix
@@ -76,6 +72,17 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	gsl${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	cmd:gsl_config$secondaryArchSuffix
+	devel:libgsl$secondaryArchSuffix = 0.17.0 compat >= 0
+	devel:libgslcblas$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	gsl$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -112,15 +119,3 @@ INSTALL()
 		$manDir/man3 \
 		$dataDir/aclocal
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	gsl${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	cmd:gsl_config$secondaryArchSuffix
-	devel:libgsl$secondaryArchSuffix = 0.17.0 compat >= 0
-	devel:libgslcblas$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	gsl$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sys-apps/fxload/fxload-20120810.recipe b/sys-apps/fxload/fxload-20120810.recipe
index 658366e10..ca4c4e0e0 100644
--- a/sys-apps/fxload/fxload-20120810.recipe
+++ b/sys-apps/fxload/fxload-20120810.recipe
@@ -1,45 +1,46 @@
-SUMMARY="fxload - utility for EZ-USB firmware installation"
-DESCRIPTION="
-This program is conveniently able to download firmware into FX, FX2, and FX2LP \
-EZ-USB devices, as well as the original AnchorChips EZ-USB.
-Primarily as an aid for developers, this can also be used to update firmware on \
-devices which boot from I2C serial EEPROMs.  For that use, as well as \
+SUMMARY="A utility for EZ-USB firmware installation"
+DESCRIPTION="This program is conveniently able to download firmware into FX, \
+FX2, and FX2LP EZ-USB devices, as well as the original AnchorChips EZ-USB.
+Primarily as an aid for developers, this can also be used to update firmware \
+on devices which boot from I2C serial EEPROMs.  For that use, as well as \
 downloading firmware to all other off-chip memory, a second stage loader must \
 first be downloaded.
+
 The distribution includes a3load.hex, which is a simple second stage loader \
 that works with all the EZ-USB products listed above.  If you want to write to \
 an EEPROM, you can use the appropriate version of the Vend_Ax code provided \
 with the Cypress developer kit.
+
 This program was modified from the original version available from \
 http://linux-hotplug.sourceforge.net to use libusbx [http://libusbx.org]. The \
 aim is to integrate this program into the libusbx samples directory.
 Besides Linux, use of libusbx as the USB backend allows fxload to be used on \
 Windows, OS-X as well as any other platform supported by libusbx.
-You are invited to post any bug reports or patches to the libusbx-devel mailing \
-list.
-"
-LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2001 Stephen Williams <steve@icarus.com>
-	2001-2002 David Brownell <dbrownell@users.sourceforge.net>
-	2008 Roger Williams <rawqux@users.sourceforge.net>
-	2012 Pete Batard <pete@akeo.ie>
-	"
+You are invited to post any bug reports or patches to the libusbx-devel \
+mailing list."
 HOMEPAGE="https://github.com/pbatard/fxload"
-SOURCE_URI="git+git://github.com/pbatard/fxload#cd1c1a062579b921d7694a3244cdefc60fd3325f"
+COPYRIGHT="2001 Stephen Williams
+	2001-2002 David Brownell
+	2008 Roger Williams
+	2012 Pete Batard"
+LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="git+git://github.com/pbatard/fxload#cd1c1a062579b921d7694a3244cdefc60fd3325f"
+
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	cmd:fxload$secondaryArchSuffix
 	"
 REQUIRES="
-	lib:libusb_1.0$secondaryArchSuffix
 	haiku$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
 	"
+	
 BUILD_REQUIRES="
-	devel:libusb_1.0${secondaryArchSuffix}
 	haiku${secondaryArchSuffix}_devel
+	devel:libusb_1.0${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/sys-devel/bmake/bmake-20140214.recipe b/sys-devel/bmake/bmake-20140214.recipe
index 80c2c5495..46f03bc14 100644
--- a/sys-devel/bmake/bmake-20140214.recipe
+++ b/sys-devel/bmake/bmake-20140214.recipe
@@ -1,19 +1,20 @@
 SUMMARY="Portable version of NetBSD make"
-DESCRIPTION="
-Bmake is derived from NetBSD's make(1), its goal is to be a portable version \
-of same, so new features are added via imports of NetBSD's make (I'm one of \
-the contributors to NetBSD). Thus bmake is kept in sync with NetBSD's make.
+DESCRIPTION="Bmake is derived from NetBSD's make(1), its goal is to be a \
+portable version of same, so new features are added via imports of NetBSD's \
+make (I'm one of the contributors to NetBSD). Thus bmake is kept in sync with \
+NetBSD's make.
 
 This version of Make features several extensions that are not in GNU Make, and \
 does not has all of GNU Make extensions. Some projects explicitly require one \
-or the other.
-"
+or the other."
 HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
+COPYRIGHT="1990-2014 NetBSD and sjg"
 LICENSE="BSD (3-clause)"
-COPYRIGHT="1990-2014 NetBSD and sjg@crufty.net"
-SOURCE_URI="http://www.crufty.net/ftp/pub/sjg/bmake-20140214.tar.gz"
-CHECKSUM_SHA256="2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de"
 REVISION="1"
+SOURCE_URI="http://www.crufty.net/ftp/pub/sjg/bmake-20140214.tar.gz"
+SOURCE_DIR="bmake"
+CHECKSUM_SHA256="2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de"
+
 ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
@@ -23,17 +24,16 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+	
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
 	"
 
-SOURCE_DIR="bmake"
-
 BUILD()
 {
 	runConfigure ./configure --with-default-sys-path=$dataDir/mk
diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
index 2f0f944b5..d2d1d758d 100644
--- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
+++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
@@ -2,40 +2,38 @@ SUMMARY="A C library for embedded systems"
 DESCRIPTION="Newlib is a C library intended for use on embedded systems. It \
 is a conglomeration of several library parts, all under free software \
 licenses that make them easily usable on embedded products."
-LICENSE="
-	BSD (3-clause)
-	GNU LGPL v2.1
-"
 HOMEPAGE="http://www.sourceware.org/newlib/"
-
 # This lists copyrights only for the parts used in this ARM compilation, other
 # targets may need more or less. Please update this if making a recipe for
 # another arch.
-COPYRIGHT="
-1994-2009  Red Hat, Inc
-1981-2000 The Regents of the University of California.
-1991 by AT&T.
-1998-2001 by Lucent Technologies
-1989, 1990 Advanced Micro Devices, Inc.
-1993 by Sun Microsystems, Inc.
-1986 HEWLETT-PACKARD COMPANY
-2001 Hans-Peter Nilsson
-2001 Christopher G. Demetriou
-2002 SuperH, Inc.
-1999 Kungliga Tekniska Högskolan
-2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
-1997 by Andrey A. Chernov, Moscow, Russia.
-1997-2002 FreeBSD Project.
-1984,2000 S.L. Moshier
-1999 Citrus Project
-1998 Todd C. Miller <Todd.Miller@courtesan.com>
-1991 DJ Delorie
-1990-1999, 2000, 2001    Free Software Foundation, Inc.
-2001 Mike Barcroft <mike@FreeBSD.org>
-2009 ARM Ltd
-2008 Ed Schouten <ed@FreeBSD.org>
-"
+COPYRIGHT="1994-2009  Red Hat, Inc
+	1981-2000 The Regents of the University of California
+	1991 by AT&T
+	1998-2001 by Lucent Technologies
+	1989, 1990 Advanced Micro Devices, Inc.
+	1993 by Sun Microsystems, Inc.
+	1986 HEWLETT-PACKARD COMPANY
+	2001 Hans-Peter Nilsson
+	2001 Christopher G. Demetriou
+	2002 SuperH, Inc.
+	1999 Kungliga Tekniska Högskolan
+	2000, 2001 Alexey Zelkin
+	1997 by Andrey A. Chernov, Moscow, Russia.
+	1997-2002 FreeBSD Project.
+	1984,2000 S.L. Moshier
+	1999 Citrus Project
+	1998 Todd C. Miller
+	1991 DJ Delorie
+	1990-1999, 2000, 2001 Free Software Foundation, Inc.
+	2001 Mike Barcroft
+	2009 ARM Ltd
+	2008 Ed Schouten"
+LICENSE="BSD (3-clause)
+	GNU LGPL v2.1"
 REVISION="2"
+SOURCE_URI="ftp://sourceware.org/pub/newlib/newlib-2.1.0.tar.gz"
+CHECKSUM_SHA256="3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48"
+SOURCE_DIR="newlib-$portVersion"
 
 ARCHITECTURES=""
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -45,26 +43,27 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-SOURCE_URI="ftp://sourceware.org/pub/newlib/newlib-2.1.0.tar.gz"
-SOURCE_DIR="newlib-$portVersion"
-CHECKSUM_SHA256="3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48"
-
 targetArch="arm-none-eabi"
 targetU="arm_none_eabi"
 
 PROVIDES="
 	${targetU}_newlib$secondaryArchSuffix = $portVersion
-"
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:makeinfo
 	cmd:${targetU}_ld$secondaryArchSuffix
 	${targetU}_gcc_nolibc$secondaryArchSuffix
-"
+	"
 
 sourceDir=$(pwd)
 installDir="$prefix/$relativeInstallDir/develop/tools/"