diff --git a/app-arch/snappy/snappy-1.1.2.recipe b/app-arch/snappy/snappy-1.1.2.recipe
index c397def54..ca487d065 100644
--- a/app-arch/snappy/snappy-1.1.2.recipe
+++ b/app-arch/snappy/snappy-1.1.2.recipe
@@ -1,17 +1,17 @@
-SUMMARY="A fast compressor/decompressor."
+SUMMARY="A fast compressor/decompressor"
 DESCRIPTION="Snappy is a compression/decompression library. It does not aim \
 for maximum compression, or compatibility with any other compression library;\
  instead, it aims for very high speeds and reasonable compression. For instance,\
 compared to the fastest mode of zlib, Snappy is an order of magnitude faster \
 for most inputs, but the resulting compressed files are anywhere from 20% to \
-100% bigger.
-"
+100% bigger."
 HOMEPAGE="https://code.google.com/p/snappy/"
+COPYRIGHT="2005-2014 Google Inc"
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="http://mirror.pistoncloud.com/source/snappy-$portVersion.tar.gz"
 CHECKSUM_SHA256="f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4"
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2005-2014 Google Inc"
-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
@@ -26,12 +26,20 @@ PROVIDES="
 	snappy$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libsnappy$secondaryArchSuffix = 1.2.1 compat >= 1
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	snappy${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libsnappy$secondaryArchSuffix = 1.2.1 compat >= 1
+	"
+
+REQUIRES_devel="
+	snappy$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -61,12 +69,3 @@ TEST()
 {
 	make check
 }
-
-PROVIDES_devel="
-	snappy${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libsnappy$secondaryArchSuffix = 1.2.1 compat >= 1
-	"
-
-REQUIRES_devel="
-	snappy$secondaryArchSuffix == $portVersion base
-	"
diff --git a/app-emulation/simh/simh-4.0.0_git.recipe b/app-emulation/simh/simh-4.0.0_git.recipe
index 45340acd6..f95e792ef 100644
--- a/app-emulation/simh/simh-4.0.0_git.recipe
+++ b/app-emulation/simh/simh-4.0.0_git.recipe
@@ -1,10 +1,10 @@
-SUMMARY="SIMH is a simulator for historical computers, such as Vax & PDP-11"
-DESCRIPTION="
-SIMH is a highly portable, multi-system simulator.
+SUMMARY="A simulator for historical computers, such as Vax & PDP-11"
+DESCRIPTION="SIMH is a highly portable, multi-system simulator.
 
 SIMH implements simulators for:
 - Data General Nova, Eclipse
-- Digital Equipment Corporation PDP-1, PDP-4, PDP-7, PDP-8, PDP-9, PDP-10, PDP-11, PDP-15, VAX
+- Digital Equipment Corporation PDP-1, PDP-4, PDP-7, PDP-8, PDP-9, PDP-10, \
+PDP-11, PDP-15, VAX
 - GRI Corporation GRI-909, GRI-99
 - IBM 1401, 1620, 1130,  7090/7094, System 3
 - Interdata (Perkin-Elmer) 16b and 32b systems
@@ -13,16 +13,16 @@ SIMH implements simulators for:
 - MITS Altair 8800, with both 8080 and Z80
 - Royal-Mcbee LGP-30, LGP-21
 - Scientific Data Systems SDS 940
-- SWTP 6800
-"
+- SWTP 6800"
 HOMEPAGE="http://simh.trailing-edge.com/"
 COPYRIGHT="1993-2008 Robert M Supnik"
 LICENSE="MIT"
+REVISION="3"
 SOURCE_URI="https://github.com/simh/simh/archive/18175040523db4d6195d1d32696d4c2178490c11.tar.gz"
 CHECKSUM_SHA256="4f6b475188039e209b930b76a58013f14e41da65a1895be0a8714b33d8519070"
 SOURCE_DIR="simh-18175040523db4d6195d1d32696d4c2178490c11"
 #PATCHES="simh-4.0.0_git.patchset"
-REVISION="3"
+
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -71,7 +71,6 @@ PROVIDES="
 	cmd:vax780 = $portVersion
 	cmd:vax8600 = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
@@ -84,7 +83,6 @@ BUILD_REQUIRES="
 	devel:libSDL2$secondaryArchSuffix
 	#TODO:pcap
 	"
-
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.recipe b/dev-java/rxtx/rxtx-2.2_pre2.recipe
index df7bc84ae..d167d73cf 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2.recipe
+++ b/dev-java/rxtx/rxtx-2.2_pre2.recipe
@@ -1,18 +1,19 @@
-SUMMARY="RXTX is a native serial library for java serial communication that runs on many OS."
-DESCRIPTION="
-RXTX is a Java library, using a native implementation (via JNI), providing serial \
-and parallel communication for the Java Development Toolkit (JDK). All deliverables \
-are under the GNU LGPL license. It is based on the specification for Sun Java \
-Communications API, though while many of the class descriptions are the same the \
-package used it not, since gnu.io is used instead. A certain amount of compatibility \
-is intended with API, though this project should be considered as a fork and \
-therefore compatible in spirit, but not in implementation."
-
+SUMMARY="A native serial library for java serial communication"
+DESCRIPTION="RXTX is a Java library, using a native implementation (via JNI), \
+providing serial and parallel communication for the Java Development Toolkit \
+(JDK). All deliverables are under the GNU LGPL license. It is based on the \
+specification for Sun Java Communications API, though while many of the class \
+descriptions are the same the package used it not, since gnu.io is used \
+instead. A certain amount of compatibility is intended with API, though this \
+project should be considered as a fork and therefore compatible in spirit, \
+but not in implementation."
 HOMEPAGE="http://rxtx.qbang.org"
-COPYRIGHT="(c) 1998-2006 Keane Jarvi"
+COPYRIGHT="1998-2006 Keane Jarvi"
 LICENSE="GNU GPL v2"
-SOURCE_URI="git+https://github.com/arduino/RXTX#84a009c"
 REVISION="1"
+SOURCE_URI="git+https://github.com/arduino/RXTX#84a009c"
+PATCHES="rxtx-2.2_haiku-support.patch"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -23,8 +24,6 @@ else
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="rxtx-2.2_haiku-support.patch"
-
 PROVIDES="
 	rxtx$secondaryArchSuffix = $portVersion
 	lib:librxtxSerial$secondaryArchSuffix = 0.0.0 compat >= 0
@@ -33,6 +32,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	openjdk${secondaryArchSuffix}
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	openjdk${secondaryArchSuffix}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
index 241237d79..0cf77c1a7 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
@@ -1,30 +1,37 @@
-SUMMARY="A Javascript engine written in C/C++."
-DESCRIPTION="
-Spidermonkey is a Javascript engine written in C/C++ used in various products \
-from Mozilla.
-" 
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey" 
+SUMMARY="A Javascript engine written in C/C++"
+DESCRIPTION="Spidermonkey is a Javascript engine written in C/C++ used in \
+various products from Mozilla." 
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey"
+COPYRIGHT="1998-1999 Netscape Communications Corporation"
+LICENSE="NPL v1.1"
+REVISION="1"
 SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz"
 CHECKSUM_SHA256="5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"
-LICENSE="NPL v1.1"
-COPYRIGHT="1998-1999 Netscape Communications Corporation."
-REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
-
+SOURCE_DIR="js-$portVersion/"
 PATCHES="spidermonkey-${portVersion}.patchset"
 
+ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
+
 PROVIDES="
 	spidermonkey$secondaryArchSuffix = $portVersion compat >= 1.8
 	lib:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
-	
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-BUILD_REQUIRES=""
 
-BUILD_PREREQUIRES="
+PROVIDES_devel="
+	spidermonkey${secondaryArchSuffix}_devel = $portVersion
+	devel:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	spidermonkey$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -36,8 +43,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="js-$portVersion/"
-
 BUILD()
 {
 	cd js/src
@@ -61,12 +66,3 @@ INSTALL()
 		$developDir
 
 }
-
-PROVIDES_devel="
-	spidermonkey${secondaryArchSuffix}_devel = $portVersion
-	devel:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
-	"
-
-REQUIRES_devel="
-	spidermonkey$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-util/rebar/rebar-2.5.1.recipe b/dev-util/rebar/rebar-2.5.1.recipe
index 56cb1c715..92c92e095 100644
--- a/dev-util/rebar/rebar-2.5.1.recipe
+++ b/dev-util/rebar/rebar-2.5.1.recipe
@@ -1,4 +1,4 @@
-SUMMARY="build tool that makes it easy to compile and test Erlang applications."
+SUMMARY="Build tool to easily compile and test Erlang applications"
 DESCRIPTION="rebar is an Erlang build tool that makes it easy to compile and \
 test Erlang applications, port drivers and releases.
 
@@ -7,25 +7,30 @@ embed directly in a project. Where possible, rebar uses standard Erlang/OTP \
 conventions for project structures, thus minimizing the amount of build \
 configuration work. rebar also provides dependency management, enabling \
 application writers to easily re-use common libraries from a variety of \
-locations (git, hg, etc).
-"
+locations (git, hg, etc)."
 HOMEPAGE="https://github.com/rebar/rebar"
-ARCHITECTURES="!x86_gcc2"
+COPYRIGHT="2011 Joe Williams"
 LICENSE="Apache v2"
 REVISION="1"
-COPYRIGHT="2011 Joe Williams"
-
 SOURCE_URI="https://github.com/rebar/rebar/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="rebar-$portVersion.tar.gz"
 
+ARCHITECTURES="!x86_gcc2"
+
 PROVIDES="
 	rebar = $portVersion
 	cmd:rebar
-"
+	"
+REQUIRES="
+	haiku
+	"
 
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:escript
-"
+	"
 
 BUILD()
 {
diff --git a/games-action/sdl_bomber/sdl_bomber-1.0.4.recipe b/games-action/sdl_bomber/sdl_bomber-1.0.4.recipe
index 88f5d6109..3478a2b0d 100644
--- a/games-action/sdl_bomber/sdl_bomber-1.0.4.recipe
+++ b/games-action/sdl_bomber/sdl_bomber-1.0.4.recipe
@@ -1,39 +1,35 @@
-SUMMARY="SDL Bomber."
-DESCRIPTION="The same old bomber game. /
-It's just that Mr.Bomberman looks meh."
+SUMMARY="The classic Bomber game"
+DESCRIPTION="The same old bomber game. It's just that Mr.Bomberman looks meh."
 HOMEPAGE="http://www.linuxmotors.com/SDL_bomber/"
+COPYRIGHT="1999-2008 Dave Ashley"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://www.linuxmotors.com/SDL_bomber/downloads/SDL_bomber-1.0.4.tgz"
 CHECKSUM_SHA256="b811e69b077b0f9bc97b1405dec8bb3e8020a178c1609b5ddad6b8cc07e5df07"
 SOURCE_DIR="SDL_bomber-1.0.4"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1999-2008 Dave Ashley"
- 
+PATCHES="sdl_bomber-1.0.4.patch" 
+
 ARCHITECTURES="x86 x86_gcc2"
  
 PROVIDES="
 	SDL_Bomber= $portVersion
 	app:SDL_Bomber= $portVersion
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libsdl
 	lib:libsdl_mixer
-"
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
-"
-
-PATCHES="sdl_bomber-1.0.4.patch" 
+	"
 
 BUILD()
 {	
@@ -46,4 +42,4 @@ INSTALL()
 	cp bomber matcher $appsDir/SDL_bomber
 	cp -r data $appsDir/SDL_bomber
 	addAppDeskbarSymlink $appsDir/SDL_bomber/bomber SDL_bomber
-}
\ No newline at end of file
+}
diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe
index c82956e20..c7e5a23e5 100644
--- a/haiku-apps/rename/rename-3.9.0.recipe
+++ b/haiku-apps/rename/rename-3.9.0.recipe
@@ -1,20 +1,18 @@
-SUMMARY="A Tracker add-on that provides you with a way to rename multiple files at once."
-DESCRIPTION="
-ReName! is a Tracker Add-On for HAIKU users. It provides you with a way to\
-rename multiple files at once. ReName! allows you to add, remove or change file\
-extensions. It also allows you to change the capitialization of your files, and\
-do a search and replace on your file names. ReName! also allows you to prepend\
-or append text to multiple file names!
-"
+SUMMARY="A Tracker add-on to rename multiple files at once"
+DESCRIPTION="ReName! is a Tracker Add-On for HAIKU users. It provides you \
+with a way to rename multiple files at once. ReName! allows you to add, \
+remove or change file extensions. It also allows you to change the \
+capitialization of your files, and do a search and replace on your file \
+names. ReName! also allows you to prepend or append text to multiple file \
+names!"
 HOMEPAGE="https://github.com/bbjimmy/ReName_for_HAIKU"
+COPYRIGHT="2000 FlipSide Software"
+LICENSE="Public Domain"
+REVISION="1"
 SOURCE_URI="https://github.com/bbjimmy/ReName_for_HAIKU/archive/1.0.tar.gz"
 CHECKSUM_SHA512="f13f3a022dab3305c35af0a149711e9e304b00082835115aea3ca8eafa7026cf15613e8f932466e16050dc8282fdcdc16ea3b0d4dc257db09442e16a69c939ae"
 SOURCE_DIR="ReName_for_HAIKU-1.0"
-REVISION="1"
-LICENSE="Public Domain"
-COPYRIGHT="
-	 2000 FlipSide Software
-	"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
@@ -24,14 +22,15 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
 	makefile_engine
 	"
-BUILD_REQUIRES="
-	haiku_devel
-	"
 
 BUILD()
 {
diff --git a/haiku-apps/scrittore/scrittore-git.recipe b/haiku-apps/scrittore/scrittore-git.recipe
index caea1e2a2..55c08a0a7 100644
--- a/haiku-apps/scrittore/scrittore-git.recipe
+++ b/haiku-apps/scrittore/scrittore-git.recipe
@@ -1,26 +1,32 @@
-SUMMARY="A Scintilla-based text editor."
-DESCRIPTION="Based on the popular framework for code highlighting, Scrittore provides a simplistic programmer's text editor."
+SUMMARY="A Scintilla-based text editor"
+DESCRIPTION="Based on the popular framework for code highlighting, \
+Scrittore provides a simplistic programmer's text editor."
+HOMEPAGE="https://github.com/HaikuArchives/Scrittore"
+COPYRIGHT="1998-2003 Scintilla authors.
+       2011-2013 Haiku authors.
+       "
 REVISION="1"
 LICENSE="Scintilla"
 SOURCE_URI="git+https://github.com/HaikuArchives/Scrittore.git"
-COPYRIGHT="
-       1998-2003 Scintilla authors.
-       2011-2013 Haiku authors.
-       "
-
-HOMEPAGE="https://github.com/HaikuArchives/Scrittore"
-PROVIDES="
-       Scrittore
-       app:Scrittore
-       "
 
 ARCHITECTURES="x86 !x86_64 ?arm ?ppc"
 
+PROVIDES="
+	Scrittore
+	app:Scrittore
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
-       cmd:make
-       cmd:g++
-       haiku_devel
-       "
+	cmd:make
+	cmd:g++
+	haiku_devel
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/shredder/shredder-1.0.0.recipe b/haiku-apps/shredder/shredder-1.0.0.recipe
index 4fbd4ffbb..d64c59650 100644
--- a/haiku-apps/shredder/shredder-1.0.0.recipe
+++ b/haiku-apps/shredder/shredder-1.0.0.recipe
@@ -1,13 +1,11 @@
-SUMMARY="Safely delete files."
-DESCRIPTION="
-Shredder is a plugin for tracker, which allows to safely delete files by \
-overwriting them multiple times.
-"
+SUMMARY="Safely delete files"
+DESCRIPTION="Shredder is a plugin for tracker, which allows to safely delete \
+files by overwriting them multiple times."
 HOMEPAGE="https://github.com/HaikuArchives/Shredder"
-SOURCE_URI="git+https://github.com/HaikuArchives/Shredder.git#c6311845fee6e51b347a9eff2c79fbf9548316a6"
-REVISION="1"
-LICENSE="MIT"
 COPYRIGHT="2009 Jason Grenier"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="git+https://github.com/HaikuArchives/Shredder.git#c6311845fee6e51b347a9eff2c79fbf9548316a6"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -15,13 +13,14 @@ PROVIDES="
 	shredder = $portVersion
 	app:Shredder = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
 	cmd:gcc
diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe
index 4e51e1a0c..212cfc424 100644
--- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe
+++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe
@@ -1,8 +1,8 @@
-SUMMARY="Arabic script font."
-DESCRIPTION="\
-Scheherazade, named after the heroine of the classic Arabian Nights tale, \
-is designed in a similar style to traditional typefaces such as Monotype Naskh, \
-extended to cover the full Unicode Arabic repertoire
+SUMMARY="Arabic script font"
+DESCRIPTION="Scheherazade, named after the heroine of the classic Arabian \
+Nights tale, is designed in a similar style to traditional typefaces such \
+as Monotype Naskh, extended to cover the full Unicode Arabic repertoire.
+
 The goal for this product was to provide a single Unicode-based font family \
 that would contain a comprehensive inventory of glyphs needed for almost any \
 Arabic-based writing system. This font makes use of state-of-the-art font \
@@ -13,29 +13,34 @@ or contextual alternates (only the required lam-alef ligatures). This \
 simplified style is often preferred for clarity, especially in non-Arabic \
 languages, but may be considered unattractive in more traditional and \
 literate communities.
+
 One font from this typeface family is included in this release:
-     * Scheherazade Regular
+- Scheherazade Regular
 This release supports virtually all of the Unicode 5.0 Arabic character \
 repertoire (excluding the Arabic Presentation Forms blocks, which are not \
 recommended for normal use). Font smarts are implemented using OpenType \
-technology.
-"
+technology."
 HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download"
+COPYRIGHT="2004-2011 SIL International"
+LICENSE="SIL Open Font License v1.1"
+REVISION="3"
 SOURCE_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip"
 CHECKSUM_SHA256="5d621578fb946473492c3bd1f1a59fe55080dd7949e3bf28af01fa4fe2859e8b"
-REVISION="3"
-LICENSE="SIL Open Font License v1.1"
-COPYRIGHT="2004-2011 SIL International"
 
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
 
-PROVIDES="scheherazade_font = $portVersion"
-REQUIRES=""
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
-
-SOURCE_DIR=""
+PROVIDES="
+	scheherazade_font = $portVersion
+	"
+REQUIRES="
+	"
+	
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	coreutils
+	"
 
 BUILD()
 {
@@ -48,4 +53,3 @@ INSTALL()
 	mkdir -p ${FONTDIR}
 	cp *.ttf ${FONTDIR}	
 }
-
diff --git a/media-sound/redoflacs/redoflacs-0.30.recipe b/media-sound/redoflacs/redoflacs-0.30.recipe
index 9266a92f3..1491b81e8 100644
--- a/media-sound/redoflacs/redoflacs-0.30.recipe
+++ b/media-sound/redoflacs/redoflacs-0.30.recipe
@@ -1,16 +1,13 @@
-SUMMARY="Parallel BASH commandline FLAC tool."
-DESCRIPTION="
-redoflacs is a parallel BASH commandline FLAC compressor, verifier, \
-organizer, analyzer, and retagger
-"
-HOMEPAGE="http://github.com/sirjaren/redoflacs/" 
+SUMMARY="Parallel BASH commandline FLAC tool"
+DESCRIPTION="redoflacs is a parallel BASH commandline FLAC compressor, \
+verifier, organizer, analyzer, and retagger."
+HOMEPAGE="http://github.com/sirjaren/redoflacs/"
+COPYRIGHT="2010-2014 Jaren Stangret"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://github.com/sirjaren/redoflacs/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="redoflacs-$portVersion.tar.gz"
 CHECKSUM_SHA256="96e6b92d6211469181da7f065510984423ee4d5a059265ffb7fc38e81ae4de3f"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2010-2014  Jaren Stangret"
-
 PATCHES="redoflacs-$portVersion.patchset"
 
 ARCHITECTURES="any"
@@ -19,7 +16,6 @@ PROVIDES="
 	redoflacs = $portVersion compat >= 0
 	cmd:redoflacs$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:bash$secondaryArchSuffix
@@ -28,7 +24,6 @@ REQUIRES="
 	
 BUILD_REQUIRES="
 	"
-
 BUILD_PREREQUIRES="
 	"
 
diff --git a/media-video/rtmpdump/rtmpdump-2.4_git.recipe b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
index 9ac730dd6..61a33ab2e 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_git.recipe
+++ b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
@@ -1,20 +1,19 @@
-SUMMARY="Open source command-line RTMP client intended to stream audio of video flash content"
+SUMMARY="Open source command-line RTMP client"
 DESCRIPTION="rtmpdump is an open-source command-line RTMP client intended \
 to stream audio of video flash content."
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
-LICENSE="
-	GNU LGPL v2.1
-	GNU GPL v2
-	"
-COPYRIGHT="
-	2009 Andrej Stepanchuk
+COPYRIGHT="2009 Andrej Stepanchuk
 	2009-2011 Howard Chu
 	2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
 	2011 33ae1ce77301f4b4494faaa5f609f3c48b9dcf82
 	"
-SOURCE_URI="git://git.ffmpeg.org/rtmpdump#a1900c3e152085406ecb87c1962c55ec9c6e4016"
-#CHECKSUM_SHA256=""
+LICENSE="GNU LGPL v2.1
+	GNU GPL v2
+	"
 REVISION="1"
+SOURCE_URI="git://git.ffmpeg.org/rtmpdump#a1900c3e152085406ecb87c1962c55ec9c6e4016"
+PATCHES="rtmpdump-2.4_git.patch"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
     # x86_gcc2 is fine as primary target architecture as long as we're building
@@ -25,8 +24,6 @@ else
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="rtmpdump-2.4_git.patch"
-
 PROVIDES="
 	rtmpdump$secondaryArchSuffix = $portVersion compat >= 2.4
 	lib:librtmp$secondaryArchSuffix = 1 compat >= 1
@@ -37,20 +34,27 @@ PROVIDES="
 	cmd:rtmpsuck = $portVersion compat >= 2.4
 	"
 # commands are provided in /bin regardless
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	rtmpdump${secondaryArchSuffix}_devel = $portVersion compat >= 2.4
+	devel:librtmp$secondaryArchSuffix = 1 compat >= 1
+	devel:librtmp.1$secondaryArchSuffix = 1 compat >= 1
+	"
+REQUIRES_devel="
+	rtmpdump$secondaryArchSuffix == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
@@ -90,14 +94,3 @@ INSTALL()
 		$developDir
 
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	rtmpdump${secondaryArchSuffix}_devel = $portVersion compat >= 2.4
-	devel:librtmp$secondaryArchSuffix = 1 compat >= 1
-	devel:librtmp.1$secondaryArchSuffix = 1 compat >= 1
-	"
-REQUIRES_devel="
-	rtmpdump$secondaryArchSuffix == $portVersion
-	"
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
index ea8280115..a920b0567 100644
--- a/net-misc/rdesktop/rdesktop-1.8.0.recipe
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -1,41 +1,38 @@
-SUMMARY="An open source client for Windows Remote Desktop Services."
-DESCRIPTION="
-rdesktop is an open source client for Windows Remote Desktop Services, capable \
-of natively speaking Remote Desktop Protocol (RDP) in order to present the \
-user's Windows desktop. rdesktop is known to work with Windows versions such \
-as NT 4 Terminal Server, 2000, XP, 2003, 2003 R2, Vista, 2008, 7, and 2008 R2.
-"
-HOMEPAGE="http://rdesktop.org" 
-SOURCE_URI="http://prdownloads.sourceforge.net/rdesktop/rdesktop-$portVersion.tar.gz"
-CHECKSUM_SHA256="1f12562c0dc1c599d1c3d2ac4829d229763744fe7aef879c8eaaa5abae8edcb3"
+SUMMARY="An open source client for Windows Remote Desktop Services"
+DESCRIPTION="rdesktop is an open source client for Windows Remote Desktop \
+Services, capable of natively speaking Remote Desktop Protocol (RDP) in order \
+to present the user's Windows desktop. rdesktop is known to work with Windows \
+versions such as NT 4 Terminal Server, 2000, XP, 2003, 2003 R2, Vista, 2008,\
+ 7, and 2008 R2."
+HOMEPAGE="http://rdesktop.org"
 COPYRIGHT="1999-2013 Matthew Chapman"
 LICENSE="GNU GPL v3"
 REVISION="2"
+SOURCE_URI="http://prdownloads.sourceforge.net/rdesktop/rdesktop-$portVersion.tar.gz"
+CHECKSUM_SHA256="1f12562c0dc1c599d1c3d2ac4829d229763744fe7aef879c8eaaa5abae8edcb3"
+PATCHES="rdesktop-1.8.0.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	rdesktop = $portVersion
 	cmd:rdesktop = $portVersion
 	"
-
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:gcc
-	cmd:make
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libssl
-	"
-
 REQUIRES="
 	haiku
 	lib:libcrypto
 	lib:libssl
 	"
 
-PATCHES="rdesktop-1.8.0.patchset"
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libssl
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	"
 
 BUILD()
 {