diff --git a/app-benchmarks/piozone/piozone-1.0.recipe b/app-benchmarks/piozone/piozone-1.0.recipe
index c0761b7a8..ed3b3f28b 100644
--- a/app-benchmarks/piozone/piozone-1.0.recipe
+++ b/app-benchmarks/piozone/piozone-1.0.recipe
@@ -1,20 +1,19 @@
 SUMMARY="Hard disk benchmarking program"
-DESCRIPTION="
-Hard disk benchmarking program
-"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002 Peter Eriksson"
+DESCRIPTION="Piozone - Peter's disk performance benchmarking tool"
 HOMEPAGE="http://www.lysator.se/~pen/piozone/" 
+COPYRIGHT="2002 Peter Eriksson"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz"
 CHECKSUM_SHA256="0b7f880b72b10664a24b712c22c90b4caab4f0cb1a8c99cba0d1a106fd63d15d"
-REVISION="1"
+PATCHES="piozone-1.0.patch"
+
 ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64"
 
 PROVIDES="
 	piozone = $portVersion
 	cmd:piozone = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
@@ -22,14 +21,11 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	"
 
-PATCHES="piozone-1.0.patch"
-
 BUILD()
 {
 	make
diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe
index 329814611..ae61f597a 100644
--- a/app-emulation/oricutron/oricutron-1.1_svn.recipe
+++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Oricutron is an emulator for the Oric series of computers."
+SUMMARY="Oricutron is an emulator for the Oric series of computers"
 DESCRIPTION="
 Oricutron is an emulator for the Oric series of computers.
 "
diff --git a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
index 44bba1787..d379ae0fe 100644
--- a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
+++ b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
@@ -1,51 +1,54 @@
-SUMMARY="A powerful, open source object-relational database system." 
-DESCRIPTION="
-PostgreSQL is a powerful, open source object-relational database system. It has\
- more than 15 years of active development and a proven architecture that has \
-earned it a strong reputation for reliability, data integrity, and correctness.\
- It runs on all major operating systems, including Linux, UNIX (AIX, BSD, HP-UX,\
- SGI IRIX, Mac OS X, Solaris, Tru64), and Windows. It is fully ACID compliant,\
- has full support for foreign keys, joins, views, triggers, and stored\
- procedures (in multiple languages). It includes most SQL:2008 data types,\
- including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and\
- TIMESTAMP. It also supports storage of binary large objects, including\
- pictures, sounds, or video. It has native programming interfaces for C/C++,\
- Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional\
- documentation.
-"
-HOMEPAGE="http://www.postgresql.org/" 
+SUMMARY="A powerful, open source object-relational database system" 
+DESCRIPTION="PostgreSQL is a powerful, open source object-relational \
+database system. It has more than 15 years of active development and a \
+proven architecture that has earned it a strong reputation for reliability, \
+data integrity, and correctness.
+
+It runs on all major operating systems, including Linux, UNIX (AIX, BSD, \
+HP-UX, SGI IRIX, Mac OS X, Solaris, Tru64), and Windows. It is fully ACID \
+compliant, has full support for foreign keys, joins, views, triggers, and \
+stored procedures (in multiple languages). It includes most SQL:2008 data \
+types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, \
+and TIMESTAMP. It also supports storage of binary large objects, including \
+pictures, sounds, or video. It has native programming interfaces for C/C++, \
+Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional \
+documentation."
+HOMEPAGE="http://www.postgresql.org/"
+COPYRIGHT="1996-2014, PostgreSQL Global Development Group"
+LICENSE="PostgreSQL"
+REVISION="1"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2"
 CHECKSUM_SHA256="9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"
-REVISION="1"
+SOURCE_DIR="postgresql-$portVersion"
+PATCHES="postgresql_server-9.3.4.patchset"
+
 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
-LICENSE="PostgreSQL"
-COPYRIGHT="1996-2014, PostgreSQL Global Development Group"
 
 PROVIDES="
-		postgresql_server = $portVersion compat >= 9
-		cmd:clusterdb = $portVersion compat >= 9
-		cmd:createdb = $portVersion compat >= 9
-		cmd:createlang = $portVersion compat >= 9
-		cmd:createuser = $portVersion compat >= 9
-		cmd:dropdb = $portVersion compat >= 9
-		cmd:droplang = $portVersion compat >= 9
-		cmd:dropuser = $portVersion compat >= 9
-		cmd:pg_config = $portVersion compat >= 9
-		cmd:pg_dump = $portVersion compat >= 9
-		cmd:pg_dumpall = $portVersion compat >= 9
-		cmd:pg_isready = $portVersion compat >= 9
-		cmd:pg_restore = $portVersion compat >= 9
-		cmd:psql = $portVersion compat >= 9
-		cmd:reindexdb = $portVersion compat >= 9
-		cmd:vacuumdb = $portVersion compat >= 9
-		cmd:pgsql = $portVersion compat >= 9
-"
-
+	postgresql_server = $portVersion compat >= 9
+	cmd:clusterdb = $portVersion compat >= 9
+	cmd:createdb = $portVersion compat >= 9
+	cmd:createlang = $portVersion compat >= 9
+	cmd:createuser = $portVersion compat >= 9
+	cmd:dropdb = $portVersion compat >= 9
+	cmd:droplang = $portVersion compat >= 9
+	cmd:dropuser = $portVersion compat >= 9
+	cmd:pg_config = $portVersion compat >= 9
+	cmd:pg_dump = $portVersion compat >= 9
+	cmd:pg_dumpall = $portVersion compat >= 9
+	cmd:pg_isready = $portVersion compat >= 9
+	cmd:pg_restore = $portVersion compat >= 9
+	cmd:psql = $portVersion compat >= 9
+	cmd:reindexdb = $portVersion compat >= 9
+	cmd:vacuumdb = $portVersion compat >= 9
+	cmd:pgsql = $portVersion compat >= 9
+	"
 REQUIRES="
 	haiku
 	lib:libreadline
 	lib:libz
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libreadline
@@ -61,10 +64,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="postgresql_server-9.3.4.patchset"
-
-SOURCE_DIR="postgresql-$portVersion"
-
 BUILD()
 {
 	runConfigure ./configure
diff --git a/dev-libs/protobuf/patches/protobuf-2.4.1.patch b/dev-libs/protobuf/patches/protobuf-2.4.1.patch
deleted file mode 100644
index 3a972a8d1..000000000
--- a/dev-libs/protobuf/patches/protobuf-2.4.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN protobuf-2.4.1/gtest/include/gtest/internal/gtest-port.h protobuf-2.4.1-haiku/gtest/include/gtest/internal/gtest-port.h
---- protobuf-2.4.1/gtest/include/gtest/internal/gtest-port.h	2011-04-30 17:22:13.002359296 +0000
-+++ protobuf-2.4.1-haiku/gtest/include/gtest/internal/gtest-port.h	2012-12-31 00:03:23.593756160 +0000
-@@ -198,6 +198,8 @@
- #define GTEST_OS_MAC 1
- #elif defined __linux__
- #define GTEST_OS_LINUX 1
-+#elif defined __HAIKU__
-+#define GTEST_OS_HAIKU 1
- #elif defined __MVS__
- #define GTEST_OS_ZOS 1
- #elif defined(__sun) && defined(__SVR4)
-@@ -205,7 +207,7 @@
- #endif  // __CYGWIN__
- 
- #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
--    GTEST_OS_SOLARIS
-+    GTEST_OS_SOLARIS || GTEST_OS_HAIKU
- 
- // On some platforms, <regex.h> needs someone to define size_t, and
- // won't compile otherwise.  We can #include it here as we already
-@@ -236,7 +238,7 @@
- #define GTEST_USES_SIMPLE_RE 1
- 
- #endif  // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC ||
--        // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS
-+        // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_HAIKU
- 
- // Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0
- // otherwise.
\ No newline at end of file
diff --git a/dev-libs/protobuf/protobuf-2.4.1.recipe b/dev-libs/protobuf/protobuf-2.4.1.recipe
index 38ea61065..dec68cf76 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.recipe
+++ b/dev-libs/protobuf/protobuf-2.4.1.recipe
@@ -6,9 +6,12 @@ then you can use special generated source code to easily write and read your \
 structured data to and from a variety of data streams and using a variety of \
 languages – Java, C++, or Python."
 HOMEPAGE="https://developers.google.com/protocol-buffers/"
+COPYRIGHT="2008 Google"
+LICENSE="Apache v2"
+REVISION="1"
 SOURCE_URI="http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2"
 CHECKSUM_SHA256="cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf"
-REVISION="1"
+PATCHES="protobuf_x86-2.4.1.patchset"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -23,21 +26,32 @@ PROVIDES="
 	lib:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
 	lib:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
 	lib:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
-"
+	"
 
-BUILD_PREREQUIRES="
+PROVIDES_devel="
+	protobuf${secondaryArchSuffix}_devel = $portVersion
+	devel:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
+	"
+REQUIRES_devel="
+	protobuf$secondaryArchSuffix == $portVersion base
+	"
+	
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -60,17 +74,3 @@ TEST()
 {
 	make check
 }
-
-LICENSE="Apache v2"
-COPYRIGHT="2008 Google"
-
-PROVIDES_devel="
-	protobuf${secondaryArchSuffix}_devel = $portVersion
-	devel:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
-	devel:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
-	devel:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
-"
-
-REQUIRES_devel="
-	protobuf$secondaryArchSuffix == $portVersion base
-"
diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe
index f47d63c73..e1b5a0684 100644
--- a/dev-python/ordereddict/ordereddict-1.1.recipe
+++ b/dev-python/ordereddict/ordereddict-1.1.recipe
@@ -1,31 +1,29 @@
-SUMMARY="A substitute for Py2.7's collections.OrderedDict for Python 2.4-2.6."
-DESCRIPTION="
-Drop-in substitute for Py2.7's new collections.OrderedDict. The recipe has \
-big-oh performance that matches regular dictionaries (amortized O(1) \
-insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing).
-"
+SUMMARY="A substitute for Py2.7's collections.OrderedDict for Python 2.4-2.6"
+DESCRIPTION="Drop-in substitute for Py2.7's new collections.OrderedDict. The \
+recipe has big-oh performance that matches regular dictionaries (amortized \
+O(1) insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing)."
 HOMEPAGE="https://pypi.python.org/pypi/ordereddict"
-SOURCE_URI="https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"
-CHECKSUM_SHA256="1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f"
 COPYRIGHT="2009 Raymond Hettinger"
 LICENSE="MIT"
 REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
+SOURCE_URI="https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"
+CHECKSUM_SHA256="1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f"
 
+ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	ordereddict = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:python < 2.7
 	"
 
-BUILD_REQUIRES=""
+BUILD_REQUIRES="
+	haiku_devel
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:python < 2.7
 	"
 
diff --git a/games-arcade/pachi/pachi-1.0.recipe b/games-arcade/pachi/pachi-1.0.recipe
index 3d51005fb..da16bc793 100644
--- a/games-arcade/pachi/pachi-1.0.recipe
+++ b/games-arcade/pachi/pachi-1.0.recipe
@@ -1,24 +1,21 @@
 SUMMARY="Pachi el marciano is a cool 2D platforms game"
 DESCRIPTION="Pachi el marciano is a cool 2D platforms game inspired in games like \
 Manic Miner, Jet set Willy and more from the 80s." 
-HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about" 
+HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about"
+COPYRIGHT="2004 Santiago Radeff, Nicolas Radeff, Peter Hajba"
 LICENSE="GNU GPL v2"
-COPYRIGHT="(c) 2004 Santiago Radeff, Nicolas Radeff, Peter Hajba"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/dragontech/files/Pachi%20el%20marciano/Pachi%20el%20marciano%201.0/pachi_source.tgz"
 CHECKSUM_SHA256="134a51773d5e441dc31aed4e57b3543afdefe2d8efedeaa05acb85cac0fa9c52"
-REVISION="1"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
+SOURCE_DIR="Pachi"
 PATCHES="pachi-$portVersion.patch"
 
-SOURCE_DIR="Pachi"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	pachi = $portVersion
 	app:pachi = $portVersion
 	"
-
 REQUIRES="
 	haiku >= $haikuVersion
 	lib:libsdl
@@ -32,7 +29,6 @@ BUILD_REQUIRES="
 	devel:libsdl_image
 	devel:libsdl_mixer
 	"
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
index 32394cc52..4171cd1b3 100644
--- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
+++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
@@ -1,12 +1,25 @@
-SUMMARY="A platform game in which you play an angry bear whose son has been kidnapped by god."
+SUMMARY="A platform game in which you're a bear whose son has been kidnapped"
+DESCRIPTION="Plee the Bear is a platform game in which you play an angry bear \
+whose son has been kidnapped by god. Here is a guy hard to brave! Jump in \
+this amazing journey to find and rescue your son. Because you want to rescue \
+him, don't you? Or to slap him? Maybe both…
+
+With three levels of the storyline and four mini-games, Plee the Bear \
+received very positive criticisms. The players loved the fun, the graphics and \
+the music; the community around the free software movement appreciated the \
+overall process and the quality of the resources, remarkable for a free game; \
+and the indie gaming community was pleasantly surprised by the technical \
+skills and the details of the game."
 HOMEPAGE="http://www.stuff-o-matic.com/plee-the-bear/"
-LICENSE="GNU GPL v3"
 COPYRIGHT="2012 Stuff O Matic"
+LICENSE="GNU GPL v3"
+REVISION="2"
 SOURCE_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=source"
 CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e"
 SOURCE_FILENAME="plee-the-bear-0.7.0.tgz"
+SOURCE_DIR="plee-the-bear-0.7.0-light"
+PATCHES="plee_the_bear-$portVersion.patchset"
 
-REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -35,7 +48,6 @@ PROVIDES="
 	lib:libbear_universe$secondaryArchSuffix
 	lib:libbear_visual$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -57,6 +69,7 @@ REQUIRES="
 	lib:libboost_regex$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	devel:libsdl2$secondaryArchSuffix
 	devel:libsdl2_mixer$secondaryArchSuffix
@@ -78,11 +91,10 @@ BUILD_PREREQUIRES="
 	cmd:cmake >= 3.0
 	"
 
-SOURCE_DIR="plee-the-bear-0.7.0-light"
-PATCHES="plee_the_bear-$portVersion.patchset"
 BUILD()
 {
-	cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_CXX_FLAGS="-DNDEBUG"
+	cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_CXX_FLAGS="-DNDEBUG"
 	make $jobArgs
 }
 
@@ -93,17 +105,3 @@ INSTALL()
 
 	addAppDeskbarSymlink $binDir/plee-the-bear "Plee the Bear"
 }
-
-# ----- DESCRIPTION -----------------------------------------------------------
-
-DESCRIPTION="Plee the Bear is a platform game in which you play an angry bear whose son has \
-been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey \
-to find and rescue your son. Because you want to rescue him, don't you? Or to \
-slap him? Maybe both…. \
-
-With three levels of the storyline and four mini-games, Plee the Bear \
-received very positive criticisms. The players loved the fun, the graphics and \
-the music; the community around the free software movement appreciated the \
-overall process and the quality of the resources, remarkable for a free game; \
-and the indie gaming community was pleasantly surprised by the technical skills \
-and the details of the game."
diff --git a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
index 57f5b62e1..fd8d378e5 100644
--- a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
+++ b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
@@ -1,15 +1,17 @@
+SUMMARY="An open-source Dropbox client"
 DESCRIPTION="Orphilia is an open-source Dropbox client written in Python. \
 Project's main goal is to provide an open-source desktop Dropbox client for \
 platforms, that  aren't supported (for example, Haiku). Orphilia is \
 script-based which makes it platform-independent. It's written using \
-Dropbox SDK from here, which has been integrated \ 
-into Orphilia's source code and is not required for installation."
-SUMMARY="Open-source Dropbox client."
+Dropbox SDK from here, which has been integrated into Orphilia's source \
+code and is not required for installation."
 HOMEPAGE="https://github.com/ksiazkowicz/orphilia-dropbox"
-SOURCE_URI="git+https://github.com/ksiazkowicz/orphilia-dropbox.git#f692f26793a48e2742f12c20767f0f22a9ff39af"
+COPYRIGHT="2011-2014 Maciej Janiszewski"
+LICENSE="MIT"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SOURCE_URI="git+https://github.com/ksiazkowicz/orphilia-dropbox.git#f692f26793a48e2742f12c20767f0f22a9ff39af"
 
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 # Should be called after activating package
 #POST_INSTALL_SCRIPTS="
 #	\"orphilia.py --configuration\"
@@ -20,7 +22,6 @@ PROVIDES="
 	cmd:orphilia_haiku_notify = $portVersion
 	cmd:orphilia.py = $portVersion
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:gcc
@@ -28,12 +29,10 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-
 BUILD_REQUIRES="
 	haiku_devel
 	python_setuptools
 	"
-
 REQUIRES="
 	pathtools
 	python_setuptools
@@ -42,9 +41,6 @@ REQUIRES="
 	cmd:python
 	"
 
-COPYRIGHT="2011-2014 Maciej Janiszewski"
-LICENSE="MIT"
-
 BUILD()
 {
 	python build.py
diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe
index 1ac870fe1..406485b3c 100644
--- a/haiku-apps/phantomlimb/phantomlimb-1.recipe
+++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe
@@ -1,22 +1,19 @@
-SUMMARY="A program to generate tones, and test your discrimination of frequency deltas"
-DESCRIPTION="
-PhantomLimb is a little program to generate tones, and test your \
-discrimination of frequency deltas. I wrote it for a friend of mine who is \
-suffering from tinnitus ('ringing in the ears') due to an ear infection. \
+SUMMARY="Generate tones and test your discrimination of frequency deltas"
+DESCRIPTION="PhantomLimb is a little program to generate tones, and test \
+your discrimination of frequency deltas. I wrote it for a friend of mine who \
+is suffering from tinnitus ('ringing in the ears') due to an ear infection. \
 (the infection destroyed some nerve cells in his inner ear, and the lack of \
 signals from the destroyed nerve cells is what causes the ringing--similar to \
 the 'phantom limb' sensations experienced by amputees. Hence the name of this \
 program) By practicing discriminating between the sound of the tinnitus and \
 'nearby' sounds, he hopes to be able to train his brain to discriminate \
-between the 'phantom' sound and other, real sounds.
-"
-COPYRIGHT="
-	2001 Ben Loftis
+between the 'phantom' sound and other, real sounds."
+HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb"
+COPYRIGHT="2001 Ben Loftis
 	2013 Jeremy Friesner"
 LICENSE="Public Domain"
-HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb"
-SOURCE_URI="git+git://github.com/HaikuArchives/PhantomLimb.git#5444867ac9"
 REVISION="2"
+SOURCE_URI="git+git://github.com/HaikuArchives/PhantomLimb.git#5444867ac9"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
@@ -24,7 +21,6 @@ PROVIDES="
 	phantomlimb = $portVersion
 	app:PhantomLimb = $portVersion
 	"
-
 BUILD_REQUIRES="
 	haiku_devel
 	"
@@ -33,7 +29,6 @@ BUILD_PREREQUIRES="
 	cmd:g++
 	cmd:xres
 	"
-
 REQUIRES="
 	haiku
 	"
diff --git a/haiku-apps/photograbber/photograbber-2.2.recipe b/haiku-apps/photograbber/photograbber-2.2.recipe
index cab252250..cdeaa9b06 100644
--- a/haiku-apps/photograbber/photograbber-2.2.recipe
+++ b/haiku-apps/photograbber/photograbber-2.2.recipe
@@ -1,11 +1,10 @@
-SUMMARY="An application that downloads/deletes pictures from USB digital cameras"
-DESCRIPTION="
-The first version of PhotoGrabber was called 'BeCam' and started out as a \
-small cli based application which could connect to your camera and download \
-the pictures to the computer. It was available for R5 together with the \
-experimental USB stack. Although it ran well, it was not that stable due to \
-the crappy USB stack. Haiku had no USB stack back then. Over the time you \
-could define the place where the pictures should be saved.
+SUMMARY="An tool to download/delete pictures from digital cameras"
+DESCRIPTION="The first version of PhotoGrabber was called 'BeCam' and \
+started out as a small cli based application which could connect to your \
+camera and download the pictures to the computer. It was available for R5 \
+together with the experimental USB stack. Although it ran well, it was not \
+that stable due to the crappy USB stack. Haiku had no USB stack back then. \
+Over the time you could define the place where the pictures should be saved.
 
 'BeCam' grew from a cli application to a GUI app and was able to use all \
 default BDCP plugins of 'Exposure!'. After some time the development of \
@@ -24,14 +23,12 @@ application into multiple parts (application core, interface, plugins \
 and extensions). With this step it was easier for other developers to \
 write their own plugins and extensions (add-ons) for the application. \
 After he was done with the main parts he opensourced the project and \
-attracted a small crew to help out with the developping.
-
-"
+attracted a small crew to help out with the developping."
 HOMEPAGE="https://github.com/HaikuArchives/PhotoGrabber"
-SOURCE_URI="git://github.com/HaikuArchives/PhotoGrabber#1221b33"
 COPYRIGHT="2010 Jan-Rixt Van Hoye (Jixt)"
 LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="git://github.com/HaikuArchives/PhotoGrabber#1221b33"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
@@ -43,11 +40,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	makefile_engine
diff --git a/media-libs/openimageio/openimageio-1.5.15.recipe b/media-libs/openimageio/openimageio-1.5.15.recipe
index bdfbf8884..87c435886 100644
--- a/media-libs/openimageio/openimageio-1.5.15.recipe
+++ b/media-libs/openimageio/openimageio-1.5.15.recipe
@@ -1,20 +1,20 @@
 SUMMARY="A library to read and write images"
-DESCRIPTION="
-OpenImageIO is a library for reading and writing images, and a bunch of \
-related classes, utilities, and applications.  There is a particular \
+DESCRIPTION="OpenImageIO is a library for reading and writing images, and a \
+bunch of related classes, utilities, and applications. There is a particular \
 emphasis on formats and functionality used in professional, large-scale \
-animation and visual effects work for film.  OpenImageIO is used extensively \
-in animation and VFX studios all over the world, and is also incorporated \
-into several commercial products."
+animation and visual effects work for film.
+OpenImageIO is used extensively in animation and VFX studios all over the \
+world, and is also incorporated into several commercial products."
 HOMEPAGE="http://github.com/OpenImageIO/"
-COPYRIGHT="
-	2008-2015 Larry Gritz et al.
-	"
+COPYRIGHT="2008-2015 Larry Gritz et al."
 LICENSE="BSD (3-clause)"
-SOURCE_URI="https://github.com/OpenImageIO/oiio/archive/Release-$portVersion.tar.gz"
-SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
-CHECKSUM_SHA256="e41e1d94ff2dc6029969b295a9eed83d6817807c741bde8a4f4947b74dc62222"
 REVISION="1"
+SOURCE_URI="https://github.com/OpenImageIO/oiio/archive/Release-$portVersion.tar.gz"
+CHECKSUM_SHA256="e41e1d94ff2dc6029969b295a9eed83d6817807c741bde8a4f4947b74dc62222"
+SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
+SOURCE_DIR="oiio-Release-$portVersion"
+PATCHES="openimageio-1.5.15.patchset"
+
 ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -50,6 +50,16 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	openimageio${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
+	devel:libopenimageio$secondaryArchSuffix = 1.5.15 compat >= 1.5
+	devel:libopenimageio_util$secondaryArchSuffix = 1.5.15 compat >= 1.5
+	"
+REQUIRES_devel="
+	openimageio$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	boost${secondaryArchSuffix}_devel
@@ -67,8 +77,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:cmake
 	"
-	
-SOURCE_DIR="oiio-Release-$portVersion"
 
 BUILD()
 {
@@ -90,14 +98,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	openimageio${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
-	devel:libopenimageio$secondaryArchSuffix = 1.5.15 compat >= 1.5
-	devel:libopenimageio_util$secondaryArchSuffix = 1.5.15 compat >= 1.5
-	"
-REQUIRES_devel="
-	openimageio$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe
index 6debebcb4..7f6aa9af2 100644
--- a/net-proxy/privoxy/privoxy-3.0.21.recipe
+++ b/net-proxy/privoxy/privoxy-3.0.21.recipe
@@ -1,28 +1,30 @@
-SUMMARY="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk."
-DESCRIPTION="
-	Privoxy is a non-caching web proxy with advanced filtering
-	capabilities for enhancing privacy, modifying web page data and
-	HTTP headers, controlling access, and removing ads and other
-	obnoxious Internet junk. Privoxy has a flexible configuration and
-	can be customized to suit individual needs and tastes. It has
-	application for both stand-alone systems and multi-user
-	networks.
-    "
+SUMMARY="A web proxy with advanced filtering capabilities"
+DESCRIPTION="Privoxy is a non-caching web proxy with advanced filtering \
+capabilities for enhancing privacy, modifying web page data and HTTP headers, \
+controlling access, and removing ads and other obnoxious Internet junk.
+Privoxy has a flexible configuration and can be customized to suit individual \
+needs and tastes. It has application for both stand-alone systems and multi-\
+user networks."
 HOMEPAGE="http://www.privoxy.org/"
+COPYRIGHT="2001-2011 Privoxy Developers"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz"
 SOURCE_DIR="privoxy-3.0.21-stable"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 !ppc"
 CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8"
 
+PROVIDES="
+	cmd:privoxy = $portVersion
+	"
 REQUIRES="
 	haiku 
-"
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:autoheader
 	cmd:autoconf
@@ -31,10 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	cmd:g++
 	cmd:find
-"
-
-PROVIDES="
-	cmd:privoxy = $portVersion
 	"
 
 BUILD()
@@ -51,6 +49,3 @@ INSTALL()
 	host_os=haiku
 	make install USER=privoxy
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2011 Privoxy Developers"
diff --git a/sci-libs/proj/proj-4.8.0.recipe b/sci-libs/proj/proj-4.8.0.recipe
index d5d4a5105..7765d0b93 100644
--- a/sci-libs/proj/proj-4.8.0.recipe
+++ b/sci-libs/proj/proj-4.8.0.recipe
@@ -1,15 +1,14 @@
-SUMMARY="Proj.4 cartographic projection software."
-DESCRIPTION="
-Proj.4 is a library for performing conversions between cartographic projections.
-"
+SUMMARY="A cartographic projection software"
+DESCRIPTION="Proj.4 is a library for performing conversions between \
+cartographic projections."
 HOMEPAGE="http://trac.osgeo.org/proj/"
-COPYRIGHT="
-	2000, Frank Warmerdam
-	"
+COPYRIGHT="2000, Frank Warmerdam"
 LICENSE="MIT"
-SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.zip"
-CHECKSUM_SHA256="b502df56db315e358d4e73a268426d7b0a17a7a5644d5339e8c270fa3c6c72ec"
 REVISION="1"
+SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="49635259993aa3ed7d06ae39ed12fac250401e7fc2d1c459d86e28400abbeb44"
+SOURCE_DIR="proj.4-$portVersion"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -22,19 +21,29 @@ if [ $targetArchitecture != x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
+
 PROVIDES="
 	proj$secondaryArchSuffix = $portVersion compat >= 4
 	lib:libproj$secondaryArchSuffix = 0.7.0 compat >= 0.7
-	cmd:cs2cs
-	cmd:geod
-	cmd:invgeod
-	cmd:invproj
-	cmd:nad2bin
-	cmd:proj
+	cmd:cs2cs$secondaryArchSuffix
+	cmd:geod$secondaryArchSuffix
+	cmd:invgeod$secondaryArchSuffix
+	cmd:invproj$secondaryArchSuffix
+	cmd:nad2bin$secondaryArchSuffix
+	cmd:proj$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	proj${secondaryArchSuffix}_devel = $portVersion compat >= 4
+	devel:libproj$secondaryArchSuffix = 0.7.0 compat >= 0.7
+	"
+REQUIRES_devel="
+	proj$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -64,13 +73,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	proj${secondaryArchSuffix}_devel = $portVersion compat >= 4
-	devel:libproj$secondaryArchSuffix = 0.7.0 compat >= 0.7
-	"
-REQUIRES_devel="
-	proj$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sci-mathematics/pari/pari-2.7.0.recipe b/sci-mathematics/pari/pari-2.7.0.recipe
index 79d8377c3..55b23097c 100644
--- a/sci-mathematics/pari/pari-2.7.0.recipe
+++ b/sci-mathematics/pari/pari-2.7.0.recipe
@@ -1,29 +1,26 @@
-SUMMARY="A specialized computer algebra system."
-DESCRIPTION="
-PARI/GP is a specialized computer algebra system, primarily aimed at number \
-theorists, but has been put to good use in many other different fields, from \
-topology or numerical analysis to physics.
+SUMMARY="A specialized computer algebra system"
+DESCRIPTION="PARI/GP is a specialized computer algebra system, primarily \
+aimed at number theorists, but has been put to good use in many other \
+different fields, from topology or numerical analysis to physics.
+
 Although quite an amount of symbolic manipulation is possible, PARI does \
 badly compared to systems like Axiom, Magma, Maple, Mathematica, Maxima, or \
 Reduce on such tasks, e.g.~multivariate polynomials, formal integration, \
 etc. On the other hand, the three main advantages of the system are its \
 speed, the possibility of using directly data types which are familiar to \
 mathematicians, and its extensive algebraic number theory module (from \
-the above-mentioned systems, only Magma provides similar features).
-"
+the above-mentioned systems, only Magma provides similar features)."
 HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+COPYRIGHT="2000-2014 The PARI Group, Bordeaux"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-$portVersion.tar.gz"
 CHECKSUM_SHA256="ffe9940194b4a1274d8aa690d985e11539be36fcdd2215b74c39b30470a567c2"
-LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2000-2014 The PARI Group, Bordeaux
-	"
-REVISION="1"
+PATCHES="$portVersionedName.patchset"
+
 ARCHITECTURES="x86 ?x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
-PATCHES="$portVersionedName.patchset"
-
 PROVIDES="
 	pari$secondaryArchSuffix = $portVersion compat >= 2
 	cmd:gp
@@ -32,19 +29,25 @@ PROVIDES="
 	cmd:tex2mail
 	lib:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	pari${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2
+	"
+REQUIRES_devel="
+	pari$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -70,11 +73,3 @@ INSTALL()
 	fixPkgconfig
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	pari${secondaryArchSuffix}_devel = $portVersion compat >= 2
-	devel:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2
-	"
-REQUIRES_devel="
-	pari$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sys-apps/pciutils/pciutils-3.2.1.recipe b/sys-apps/pciutils/pciutils-3.2.1.recipe
index a739a7aba..da6efb943 100644
--- a/sys-apps/pciutils/pciutils-3.2.1.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1.recipe
@@ -1,11 +1,22 @@
-SUMMARY="Various utilities dealing with the PCI bus"
-DESCRIPTION="Various utilities dealing with the PCI bus"
+SUMMARY="Utilities for inspecting and manipulating PCI devices"
+DESCRIPTION="The PCI Utilities are a collection of programs for inspecting \
+and manipulating configuration of PCI devices, all based on a common \
+portable library libpci which offers access to the PCI configuration space \
+on a variety of operating systems.
+
+The utilities include:
+
+- lspci - displays detailed information about all PCI buses and devices in \
+the system
+- setpci - allows reading from and writing to PCI device configuration \
+registers. For example, you can adjust the latency timers with it."
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/"
+COPYRIGHT="1997-2012 Martin Mares"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.2.1.tar.gz"
 CHECKSUM_SHA256="b31131b721fa26378b4af61b1c49986ff40fe590bc210545b210b6b774337858"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2012 Martin Mares"
+PATCHES="pciutils-3.2.1_git-0001-C89.patch"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -19,6 +30,16 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
+
+PROVIDES_devel="
+	pciutils${secondaryArchSuffix}_devel = $portVersion
+	devel:pciutils$secondaryArchSuffix = $portVersion
+	devel:libpci$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	pciutils$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
@@ -28,8 +49,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc${secondaryArchSuffix}
 	"
 
-PATCHES="pciutils-3.2.1_git-0001-C89.patch"
-
 BUILD()
 {
 	make \
@@ -63,15 +82,3 @@ INSTALL()
         $developDir \
         $manDir/man*/pcilib.*
 }
-
-PROVIDES_devel="
-	pciutils${secondaryArchSuffix}_devel = $portVersion
-	devel:pciutils$secondaryArchSuffix = $portVersion
-	devel:libpci$secondaryArchSuffix
-	"
-
-REQUIRES_devel="
-	pciutils$secondaryArchSuffix == $portVersion base
-	"
-
-
diff --git a/sys-apps/pciutils/pciutils-3.2.1_git.recipe b/sys-apps/pciutils/pciutils-3.2.1_git.recipe
index 72623c51f..a0d863e90 100644
--- a/sys-apps/pciutils/pciutils-3.2.1_git.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1_git.recipe
@@ -1,11 +1,22 @@
-SUMMARY="Various utilities dealing with the PCI bus"
-DESCRIPTION="Various utilities dealing with the PCI bus"
+SUMMARY="Utilities for inspecting and manipulating PCI devices"
+DESCRIPTION="The PCI Utilities are a collection of programs for inspecting \
+and manipulating configuration of PCI devices, all based on a common \
+portable library libpci which offers access to the PCI configuration space \
+on a variety of operating systems.
+
+The utilities include:
+
+- lspci - displays detailed information about all PCI buses and devices in \
+the system
+- setpci - allows reading from and writing to PCI device configuration \
+registers. For example, you can adjust the latency timers with it."
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/"
+COPYRIGHT="1997-2012 Martin Mares"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="git://git.kernel.org/pub/scm/utils/pciutils/pciutils.git"
 #CHECKSUM_MD5=""
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2012 Martin Mares"
+PATCHES="pciutils-3.2.1_git-0001-C89.patch"
 
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
@@ -22,6 +33,16 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
+
+PROVIDES_devel="
+	pciutils${secondaryArchSuffix}_devel = $portVersion
+	devel:pciutils$secondaryArchSuffix = $portVersion
+	devel:libpci$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	pciutils$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
@@ -31,8 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc${secondaryArchSuffix}
 	"
 
-PATCHES="pciutils-3.2.1_git-0001-C89.patch"
-
 BUILD()
 {
 	make \
@@ -66,15 +85,3 @@ INSTALL()
         $developDir \
         $manDir/man*/pcilib.*
 }
-
-PROVIDES_devel="
-	pciutils${secondaryArchSuffix}_devel = $portVersion
-	devel:pciutils$secondaryArchSuffix = $portVersion
-	devel:libpci$secondaryArchSuffix
-	"
-
-REQUIRES_devel="
-	pciutils$secondaryArchSuffix == $portVersion base
-	"
-
-