diff --git a/app-admin/testdisk/testdisk-7.0_git.recipe b/app-admin/testdisk/testdisk-7.0_git.recipe
index f22d9f13a..8d5eb011d 100644
--- a/app-admin/testdisk/testdisk-7.0_git.recipe
+++ b/app-admin/testdisk/testdisk-7.0_git.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+SUMMARY="Checks and undeletes partitions and a signature based recovery tool"
 DESCRIPTION="TestDisk is powerful free data recovery software\! \
 It was primarily designed to help recover lost partitions and/or \
 make non-booting disks bootable again when these symptoms are caused \
@@ -6,7 +6,7 @@ by faulty software: certain types of viruses or human error \
 (such as accidentally deleting a Partition Table). \
 Partition table recovery using TestDisk is really easy. \
 
-TestDisk can: \
+TestDisk features:
 
 - Fix partition table, recover deleted partition
 - Recover FAT32 boot sector from its backup
@@ -19,22 +19,20 @@ TestDisk can: \
 - Undelete files from FAT, exFAT, NTFS and ext2 filesystem
 - Copy files from deleted FAT, exFAT, NTFS and ext2/ext3/ext4 partitions.
 
-TestDisk has features for both novices and experts. \
+TestDisk has features for both novices and experts.
 For those who know little or nothing about data recovery techniques, \
 TestDisk can be used to collect detailed information about a \
 non-booting drive which can then be sent to a tech for further analysis. \
 Those more familiar with such procedures should find TestDisk a handy \
-tool in performing onsite recovery.
-"
+tool in performing onsite recovery."
 HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+COPYRIGHT="1998-2008 Christophe GRENIER"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="git+http://git.cgsecurity.org/testdisk.git#c603941b7fd2323a4d8631ac05688b7b4460e088"
 #CHECKSUM_SHA256=""
-REVISION="1"
-ARCHITECTURES="?x86 x86_gcc2 ?x86_64"
-COPYRIGHT="1998-2008 Christophe GRENIER
-	"
 
-LICENSE="GNU GPL v2"
+ARCHITECTURES="?x86 x86_gcc2 ?x86_64"
 
 #TODO: separate package for qphotorec?
 
@@ -44,7 +42,6 @@ PROVIDES="
 	cmd:photorec$secondaryArchSuffix = $portVersion
 	cmd:fidentify$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -62,7 +59,6 @@ BUILD_REQUIRES="
 	devel:libuuid$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
diff --git a/app-arch/tar/tar-1.28.recipe b/app-arch/tar/tar-1.28.recipe
index e4afe87f7..7967c8c89 100644
--- a/app-arch/tar/tar-1.28.recipe
+++ b/app-arch/tar/tar-1.28.recipe
@@ -1,25 +1,24 @@
-SUMMARY="Saves and restores files to/from a tape or disk archive."
-DESCRIPTION="
-The Tar program provides the ability to create tar archives, as well as \
-various other kinds of manipulation. For example, you can use Tar on \
-previously created archives to extract files, to store additional files, or to \
-update or list files which were already stored.
+SUMMARY="Saves and restores files to/from a tape or disk archive"
+DESCRIPTION="The Tar program provides the ability to create tar archives, as \
+well as various other kinds of manipulation. For example, you can use Tar on \
+previously created archives to extract files, to store additional files, or \
+to update or list files which were already stored.
+
 Initially, tar archives were used to store files conveniently on magnetic \
 tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \
 the utility's name, Tar can direct its output to available devices, files, or \
 other programs (using pipes), it can even access remote devices or files (as \
-archives).
-"
+archives)."
 HOMEPAGE="http://www.gnu.org/software/tar/"
 COPYRIGHT="1990-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
 CHECKSUM_SHA256="60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
-
 PATCHES="tar-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
+
 PROVIDES="
 	tar = $portVersion compat >= 1
 	cmd:tar = $portVersion compat >= 1
@@ -28,9 +27,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:automake
 	cmd:autoreconf
 	cmd:gcc
@@ -39,9 +38,7 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-defineDebugInfoPackage tar \
-	$binDir/tar
-
+defineDebugInfoPackage tar $binDir/tar
 
 BUILD()
 {
diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe
index 8f8b00850..ad65370c0 100644
--- a/app-arch/unzip/unzip-6.0.recipe
+++ b/app-arch/unzip/unzip-6.0.recipe
@@ -1,19 +1,18 @@
-SUMMARY="Extraction utility for zip archives."
-DESCRIPTION="
-UnZip is an extraction utility for archives compressed in \
+SUMMARY="Extraction utility for zip archives"
+DESCRIPTION="UnZip is an extraction utility for archives compressed in \
 .zip format (zipfiles). UnZip can list or extract files from an archive \
-or test its integrity.
-"
+or test its integrity."
 HOMEPAGE="http://www.info-zip.org/UnZip.html"
-LICENSE="Info-ZIP"
 COPYRIGHT="1995-2014 Greg Roelofs"
+LICENSE="Info-ZIP"
+REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
 CHECKSUM_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
+SOURCE_DIR="unzip60"
 PATCHES="unzip-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	unzip = $portVersion
 	cmd:funzip
@@ -22,7 +21,6 @@ PROVIDES="
 	cmd:zipgrep
 	cmd:zipinfo
 	"
-
 REQUIRES="
 	haiku
 	"
@@ -35,8 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="unzip60"
-
 BUILD()
 {
 	make -f unix/Makefile haiku MANDIR=$manDir 
diff --git a/app-arch/unzip/unzip-6.10c11.recipe b/app-arch/unzip/unzip-6.10c11.recipe
index 4d269d086..cbf7c111c 100644
--- a/app-arch/unzip/unzip-6.10c11.recipe
+++ b/app-arch/unzip/unzip-6.10c11.recipe
@@ -1,18 +1,18 @@
-SUMMARY="Extraction utility for zip archives."
-DESCRIPTION="
-UnZip is an extraction utility for archives compressed in \
+SUMMARY="Extraction utility for zip archives"
+DESCRIPTION="UnZip is an extraction utility for archives compressed in \
 .zip format (zipfiles). UnZip can list or extract files from an archive \
-or test its integrity.
-"
+or test its integrity."
 HOMEPAGE="http://www.info-zip.org/UnZip.html"
+COPYRIGHT="1995-2014 Greg Roelofs"
+LICENSE="Info-ZIP"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
-
 SOURCE_URI="http://antinode.info/ftp/info-zip/unzip610c11.zip"
 CHECKSUM_SHA256="13d92580d89e7c4199ba9a883957cc3676f0235dcac6f701f8f951b015c8d4c8"
 SOURCE_DIR="unzip610c11"
 PATCHES="unzip-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2"
+
 PROVIDES="
 	unzip = $portVersion
 	cmd:funzip
@@ -20,22 +20,20 @@ PROVIDES="
 	cmd:unzipsfx
 	cmd:zipgrep
 	cmd:zipinfo
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libiconv
-"
+	"
 
 BUILD_REQUIRES="
-	devel:libiconv
-"
-
-BUILD_PREREQUIRES="
 	haiku_devel
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -51,6 +49,3 @@ INSTALL()
 	make -f beos/Makefile install \
 		prefix=$prefix MANDIR=$manDir BINDIR=$binDir
 }
-
-LICENSE="Info-ZIP"
-COPYRIGHT="1995-2014 Greg Roelofs"
diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.7.0.recipe
index 5c1e606cd..cc8e70d9a 100644
--- a/app-text/tree/tree-1.7.0.recipe
+++ b/app-text/tree/tree-1.7.0.recipe
@@ -1,22 +1,17 @@
-SUMMARY="Lists directories and files recursively."
-DESCRIPTION="
-Lists directories recursively, and produces an indented listing of files.
-"
-
+SUMMARY="Lists directories and files recursively"
+DESCRIPTION="Lists directories recursively, and produces an indented listing \
+of files."
 HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+COPYRIGHT="1996-2011 Steve Baker"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://mama.indstate.edu/users/ice/tree/src/tree-$portVersion.tgz"
 CHECKSUM_SHA256="6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12"
-
-REVISION="1"
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1996-2011 Steve Baker"
+PATCHES="tree-1.7.0.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
-PATCHES="tree-1.7.0.patchset"
-
 PROVIDES="
 	tree = $portVersion
 	cmd:tree$secondaryArchSuffix = $portVersion
@@ -24,6 +19,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
diff --git a/dev-python/urllib3/urllib3-1.9.1.recipe b/dev-python/urllib3/urllib3-1.9.1.recipe
index ff7e380a8..ad14cd03f 100644
--- a/dev-python/urllib3/urllib3-1.9.1.recipe
+++ b/dev-python/urllib3/urllib3-1.9.1.recipe
@@ -1,36 +1,32 @@
-SUMMARY="HTTP library with thread-safe connection pooling, file post, and more."
-DESCRIPTION="
-- Re-use the same socket connection for multiple requests
-  (HTTPConnectionPool and HTTPSConnectionPool)
-  (with optional client-side certificate verification).
+SUMMARY="HTTP library with thread-safe connection pooling, file post, and more"
+DESCRIPTION="- Re-use the same socket connection for multiple requests \
+(HTTPConnectionPool and HTTPSConnectionPool) with optional client-side \
+certificate verification.
 - File posting (encode_multipart_formdata).
 - Built-in redirection and retries (optional).
 - Supports gzip and deflate decoding.
 - Thread-safe and sanity-safe.
 - Works with AppEngine, gevent, and eventlib.
 - Tested on Python 2.6+, Python 3.2+, and PyPy, with 100% unit test coverage.
-- Small and easy to understand codebase perfect for extending and building upon.
-  For a more comprehensive solution, have a look at \
-  Requests <http://python-requests.org/> which is also powered by urllib3
-"
-HOMEPAGE="
-	http://urllib3.readthedocs.org/
-	https://pypi.python.org/pypi/urllib3
-	"
+- Small and easy to understand codebase perfect for extending and building \
+upon.
+
+For a more comprehensive solution, have a look at \
+Requests <http://python-requests.org/> which is also powered by urllib3"
+HOMEPAGE="http://urllib3.readthedocs.org/
+	https://pypi.python.org/pypi/urllib3"
+COPYRIGHT="2008-2014 Andrey Petrov and contributors"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/shazow/urllib3/archive/1.9.1.tar.gz"
 CHECKSUM_SHA256="baf4dbc6d78f4a7bb28a44d3772cd8f3b24df5282f5cb72f3d85106aa06cf2a3"
-LICENSE="MIT"
-COPYRIGHT="2008-2014 Andrey Petrov and contributors"
-REVISION="1"
+SOURCE_DIR="urllib3-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
-SOURCE_DIR="urllib3-$portVersion"
-
 PROVIDES="
 	urllib3 = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:python
@@ -39,7 +35,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:python
 	cmd:gcc
diff --git a/games-strategy/uqm/uqm-0.7.0.recipe b/games-strategy/uqm/uqm-0.7.0.recipe
index d4d7a37cf..925603742 100644
--- a/games-strategy/uqm/uqm-0.7.0.recipe
+++ b/games-strategy/uqm/uqm-0.7.0.recipe
@@ -1,16 +1,18 @@
-SUMMARY="a port of Star Control II for modern personal computers and operating systems"
-DESCRIPTION="
-The project started in August 2002, when Toys For Bob released the partially
-ported sources of Star Control 2 3DO version to the fan community. Our goal is
-to port this wonderful game to current personal computers and operating systems.
-It is and will remain 100% free of charge, and anyone can contribute to the
-project and thus help make it even better. For more information, look at our
-info page.
-"
+SUMMARY="A port of Star Control II"
+DESCRIPTION="The project started in August 2002, when Toys For Bob released \
+the partially ported sources of Star Control 2 3DO version to the fan \
+community. Our goal is to port this wonderful game to current personal \
+computers and operating systems.
+It is and will remain 100% free of charge, and anyone can contribute to the \
+project and thus help make it even better. For more information, look at \ ourinfo page."
 HOMEPAGE="http://sc2.sourceforge.net/"
+COPYRIGHT="2005-2013 VCMI Team"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://prdownloads.sourceforge.net/sc2/uqm-0.7.0-source.tgz"
 CHECKSUM_SHA256="a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"
-REVISION="1"
+PATCHES="uqm-$portVersion.patchset"
+
 ARCHITECTURES="!x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -19,11 +21,9 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-#PATCHES="vcmi-0.94.patchset"
 PROVIDES="
 	uqm$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
@@ -46,8 +46,7 @@ BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	devel:libmikmod$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
@@ -55,9 +54,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:tr
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
-PATCHES="uqm-$portVersion.patchset"
 BUILD()
 {
 	sed -i -e"s!PREFIX_HERE!$prefix!" config.state
@@ -69,6 +67,3 @@ INSTALL()
 {
 	./build.sh uqm install
 }
-
-COPYRIGHT="2005-2013 VCMI Team"
-LICENSE="GNU GPL v2"
diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe
index c36a63a86..149043624 100644
--- a/haiku-apps/torrentor/torrentor-0.0.5.recipe
+++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe
@@ -1,15 +1,14 @@
-DESCRIPTION="
-Torrentor is a torrent client for the Haiku operating system. \
-BitTorrent protocol is created for relieving servers and speed up \
-downloading files. Users are not downloading data directly from \
-server, but they are sending to and receiving it from themselves.
-"
-SUMMARY="Torrentor is a torrent client for the haiku operating system."
+SUMMARY="A torrent client"
+DESCRIPTION="Torrentor is a torrent client for the Haiku operating system. \
+BitTorrent protocol is created for relieving servers and speed up downloading \
+files. Users are not downloading data directly from server, but they are \
+sending to and receiving it from themselves."
 HOMEPAGE="https://github.com/HaikuArchives/Torrentor"
-SOURCE_URI="git+https://github.com/HaikuArchives/Torrentor.git#a04c10fba39c8ba39ffb8ef16c5e67d217231ac6"
 COPYRIGHT="2012 Guido Pola"
 LICENSE="MIT"
 REVISION="2"
+SOURCE_URI="git+https://github.com/HaikuArchives/Torrentor.git#a04c10fba39c8ba39ffb8ef16c5e67d217231ac6"
+
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -24,7 +23,6 @@ PROVIDES="
 	torrentor${secondaryArchSuffix} = $portVersion
 	app:Torrentor = $portVersion
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libssl${secondaryArchSuffix}
@@ -40,7 +38,6 @@ BUILD_REQUIRES="
 	devel:libcurl${secondaryArchSuffix}
 	devel:libz${secondaryArchSuffix}
 	"
-	
 BUILD_PREREQUIRES="
 	makefile_engine
 	curl${secondaryArchSuffix}
diff --git a/haiku-apps/trackergrep/trackergrep-5.2.recipe b/haiku-apps/trackergrep/trackergrep-5.2.recipe
index e16827de8..443b44ee2 100644
--- a/haiku-apps/trackergrep/trackergrep-5.2.recipe
+++ b/haiku-apps/trackergrep/trackergrep-5.2.recipe
@@ -1,18 +1,18 @@
-SUMMARY="A simple Tracker add-on that lets you search through text files."
+SUMMARY="A simple Tracker add-on that lets you search through text files"
 DESCRIPTION="TrackerGrep is a simple Tracker add-on that lets you search \
 through text files. Haiku already comes with a tool that lets you do that \
 (grep) but you need to use it from a Terminal window. Gone are those days \
 of command-line trouble, because from now on TrackerGrep lets you run grep \
 directly from Tracker."
 HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep"
+COPYRIGHT="	1998-2006 Matthijs Hollemans
+	2007 Jonas Sundström."
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/HaikuArchives/TrackerGrep/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="7b19601d48ae26bc54345c26914892ea6a8e54f131c5049ee5bb52523a950d81"
 SOURCE_DIR="TrackerGrep-$portVersion"
-LICENSE="MIT"
-COPYRIGHT="
-	1998-2006 Matthijs Hollemans
-	2007 Jonas Sundström."
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
index 95c9e5eac..8c855ff1b 100644
--- a/net-p2p/transmission/transmission-2.82.recipe
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -1,14 +1,14 @@
 SUMMARY="Transmission is a cross-platform open source BitTorrent client"
-DESCRIPTION="
-Transmission is an open source, volunteer-based project. Unlike some \
-BitTorrent clients, Transmission doesn't play games with its users to make \
-money:
+DESCRIPTION="Transmission is an open source, volunteer-based project. Unlike \
+some BitTorrent clients, Transmission doesn't play games with its users to \
+make money:
 - Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, \
 or anything else.
 - It doesn't hold some feaures back for a payware version.
 - Its source code is available for anyone to review.
 - They don't track our users, and their website and forums have no third-party \
 ads or analytics.
+
 Transmission is designed for easy, powerful use. They've set the defaults to \
 Just Work and it only takes a few clicks to configure advanced features like \
 watch directories, bad peer blocklists, and the web interface.
@@ -17,6 +17,7 @@ to use less CPU than any other GUI client. It even used less CPU than some \
 non-GUI clients.
 Transmission also has the lowest memory footprint of any major BitTorrent \
 client.
+
 Imageshack chose Transmission for its BitTorrent farms because the competition \
 requires amounts of memory several times greater than Transmission.
 Transmission's small footprint is one reason why many home device \
@@ -26,16 +27,20 @@ let people who ran Vuze and owned a Belkin router keep sharing files even when \
 Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router.
 Unlike many cross-platform applications, Transmission integrates seamlessly \
 with your operating system.
+
 Transmission has the features you want from a BitTorrent client: encryption, a \
 web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port \
 forwarding, webseed support, watch directories, tracker editing, global and \
-per-torrent speed limits, and more.
-"
+per-torrent speed limits, and more."
 HOMEPAGE="http://www.transmissionbt.com/"
+COPYRIGHT="2005-2013 By the respective authors"
+LICENSE="Transmission
+	MIT
+	GNU GPL v2"
+REVISION="1"
 SOURCE_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz"
 CHECKSUM_SHA256="3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522"
-
-REVISION="1"
+PATCHES="transmission-2.82.patch"
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -48,56 +53,49 @@ fi
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
-    transmission = $portVersion
-    cmd:transmission_cli$secondaryArchSuffix
-    cmd:transmission_create$secondaryArchSuffix
-    cmd:transmission_daemon$secondaryArchSuffix
-    cmd:transmission_edit$secondaryArchSuffix
-    cmd:transmission_remote$secondaryArchSuffix
-    cmd:transmission_show$secondaryArchSuffix
-    "
+	transmission = $portVersion
+	cmd:transmission_cli$secondaryArchSuffix
+	cmd:transmission_create$secondaryArchSuffix
+	cmd:transmission_daemon$secondaryArchSuffix
+	cmd:transmission_edit$secondaryArchSuffix
+	cmd:transmission_remote$secondaryArchSuffix
+	cmd:transmission_show$secondaryArchSuffix
+	"
 REQUIRES="
-    haiku$secondaryArchSuffix
-    lib:libssl$secondaryArchSuffix
-    lib:libcrypto$secondaryArchSuffix
-    lib:libcurl$secondaryArchSuffix
-    lib:libevent$secondaryArchSuffix
-    lib:libiconv$secondaryArchSuffix
-    lib:libintl$secondaryArchSuffix
-    lib:libz$secondaryArchSuffix
-    "
+	haiku$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libevent$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel
-    devel:libssl$secondaryArchSuffix
-    devel:libcurl$secondaryArchSuffix
-    devel:libz$secondaryArchSuffix
-    devel:libevent$secondaryArchSuffix
-    devel:libiconv$secondaryArchSuffix
-    devel:libgettextlib$secondaryArchSuffix >= 0.14.1
-    intltool >= 0.40
-    "
+	haiku${secondaryArchSuffix}_devel
+	devel:libssl$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libevent$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
+	intltool >= 0.40
+	"
 BUILD_PREREQUIRES="
-    cmd:gcc$secondaryArchSuffix
-    cmd:ld$secondaryArchSuffix
-    cmd:pkg_config$secondaryArchSuffix
-    cmd:make
-    "
-
-LICENSE="Transmission
-        MIT
-        GNU GPL v2
-        "
-COPYRIGHT="2005-2013. All code is copyrighted by the respective authors."
-
-PATCHES="transmission-2.82.patch"
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:make
+	"
 
 BUILD()
 {
-    runConfigure ./configure --without-gtk --datadir=$dataDir
-    make
+	runConfigure ./configure --without-gtk --datadir=$dataDir
+	make
 }
 
 INSTALL()
 {
-    make install
+	make install
 }
diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe
index 08dddb696..c3fd91974 100644
--- a/net-p2p/transmission/transmission-2.84.recipe
+++ b/net-p2p/transmission/transmission-2.84.recipe
@@ -1,19 +1,17 @@
 SUMMARY="Transmission is a cross-platform open source BitTorrent client"
-DESCRIPTION="
-Transmission has the features you want from a BitTorrent client: encryption, a \
-web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port \
-forwarding, webseed support, watch directories, tracker editing, global and \
-per-torrent speed limits, and more.
-"
+DESCRIPTION="Transmission has the features you want from a BitTorrent client: \
+encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and \
+NAT-PMP port forwarding, webseed support, watch directories, tracker editing, \
+global and per-torrent speed limits, and more."
 HOMEPAGE="http://www.transmissionbt.com/"
+COPYRIGHT="2005-2013 By the respective authors"
 LICENSE="Transmission
-        MIT
-        GNU GPL v2
-        "
-COPYRIGHT="2005-2013. All code is copyrighted by the respective authors."
+	MIT
+	GNU GPL v2"
+REVISION="4"
 SOURCE_URI="https://transmission.cachefly.net/transmission-$portVersion.tar.xz"
 CHECKSUM_SHA256="a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb"
-REVISION="4"
+PATCHES="transmission-$portVersion.patchset"
 
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -25,56 +23,55 @@ else
 fi
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
-PATCHES="transmission-$portVersion.patchset"
-
 PROVIDES="
-    transmission$secondaryArchSuffix = $portVersion
-    cmd:transmission_cli$secondaryArchSuffix
-    cmd:transmission_create$secondaryArchSuffix
-    cmd:transmission_daemon$secondaryArchSuffix
-    cmd:transmission_edit$secondaryArchSuffix
-    cmd:transmission_remote$secondaryArchSuffix
-    cmd:transmission_show$secondaryArchSuffix
-    "
+	transmission$secondaryArchSuffix = $portVersion
+	cmd:transmission_cli$secondaryArchSuffix
+	cmd:transmission_create$secondaryArchSuffix
+	cmd:transmission_daemon$secondaryArchSuffix
+	cmd:transmission_edit$secondaryArchSuffix
+	cmd:transmission_remote$secondaryArchSuffix
+	cmd:transmission_show$secondaryArchSuffix
+	"
 REQUIRES="
-    haiku$secondaryArchSuffix
-    lib:libcrypto$secondaryArchSuffix
-    lib:libcurl$secondaryArchSuffix
-    lib:libevent$secondaryArchSuffix
-    lib:libgcc_s$secondaryArchSuffix
-    lib:libiconv$secondaryArchSuffix
-    lib:libintl$secondaryArchSuffix
-    lib:libssl$secondaryArchSuffix
-    lib:libz$secondaryArchSuffix
-    "
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libevent$secondaryArchSuffix
+	lib:libgcc_s$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel
-    devel:libssl$secondaryArchSuffix
-    devel:libcurl$secondaryArchSuffix
-    devel:libz$secondaryArchSuffix
-    devel:libevent$secondaryArchSuffix
-    devel:libiconv$secondaryArchSuffix
-    devel:libgettextlib$secondaryArchSuffix >= 0.14.1
-    intltool >= 0.40
-    "
+	haiku${secondaryArchSuffix}_devel
+	devel:libssl$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libevent$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
+	intltool >= 0.40
+	"
 BUILD_PREREQUIRES="
-    cmd:gcc$secondaryArchSuffix
-    cmd:ld$secondaryArchSuffix
-    cmd:pkg_config$secondaryArchSuffix
-    cmd:make
-    cmd:awk
-    "
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:make
+	cmd:awk
+	"
 
 BUILD()
 {
-    export CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
-    export CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
-    export LDFLAGS="-lposix_error_mapper"
-    runConfigure ./configure --without-gtk --datadir=$dataDir
-    make
+	export CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
+	export CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
+	export LDFLAGS="-lposix_error_mapper"
+	runConfigure ./configure --without-gtk --datadir=$dataDir
+	make
 }
 
 INSTALL()
 {
-    make install
+	make install
 }
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
index b32293eb3..5ab11054d 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
@@ -1,19 +1,17 @@
-SUMMARY="A code-searching tool similar to ack, but faster."
-DESCRIPTION="
-A code-searching tool similar to ack, but faster.
+SUMMARY="A code-searching tool similar to ack, but faster"
+DESCRIPTION="A code-searching tool similar to ack, but faster.
 * It searches code about 3–5× faster than ack.
 * It ignores file patterns from your .gitignore and .hgignore.
 * If there are files in your source repo you don't want to search, just add \
 their patterns to a .agignore file.
 * Ag uses Pthreads to take advantage of multiple CPU cores and search files in \
-parallel.
-"
+parallel."
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher/"
-SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#ae5f4417d1"
-CHECKSUM_MD5=""
 COPYRIGHT="2013 Geoff Greer"
 LICENSE="Apache v2"
 REVISION="1"
+SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#ae5f4417d1"
+
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ];then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
@@ -21,7 +19,6 @@ else
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"
-SOURCE_DIR=""
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
@@ -35,7 +32,6 @@ PROVIDES="
 	the_silver_searcher$secondaryArchSuffix = $portVersion
 	cmd:ag$commandSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liblzma${secondaryArchSuffix}
@@ -48,7 +44,6 @@ BUILD_REQUIRES="
 	devel:libpcre${secondaryArchSuffix}
 	devel:libz${secondaryArchSuffix}
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
index 7602751b6..9f6bd49b2 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
@@ -1,19 +1,17 @@
-SUMMARY="A code-searching tool similar to ack, but faster."
-DESCRIPTION="
-A code-searching tool similar to ack, but faster.
+SUMMARY="A code-searching tool similar to ack, but faster"
+DESCRIPTION="A code-searching tool similar to ack, but faster.
 * It searches code about 3–5× faster than ack.
 * It ignores file patterns from your .gitignore and .hgignore.
 * If there are files in your source repo you don't want to search, just add \
 their patterns to a .agignore file.
 * Ag uses Pthreads to take advantage of multiple CPU cores and search files in \
-parallel.
-"
+parallel."
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher/"
-SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#0.26.0"
-CHECKSUM_MD5=""
 COPYRIGHT="2013 Geoff Greer"
 LICENSE="Apache v2"
 REVISION="1"
+SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#0.26.0"
+
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ];then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
@@ -21,7 +19,6 @@ else
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"
-SOURCE_DIR=""
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
@@ -35,7 +32,6 @@ PROVIDES="
 	the_silver_searcher$secondaryArchSuffix = $portVersion
 	cmd:ag$commandSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liblzma${secondaryArchSuffix}
@@ -48,7 +44,6 @@ BUILD_REQUIRES="
 	devel:libpcre${secondaryArchSuffix}
 	devel:libz${secondaryArchSuffix}
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal