diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index c97fc3aae..e369f81e1 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -1,16 +1,14 @@
-SUMMARY="JamVM"
-DESCRIPTION="
-JamVM is a new Java Virtual Machine which conforms to the JVM specification \
-version 2 (blue book). In comparison to most other VM's (free and commercial) \
-it is extremely small.
-"
+SUMMARY="A very small Java Virtual Machine"
+DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM \
+specification version 2 (blue book). In comparison to most other VM's (free \
+and commercial) it is extremely small."
 HOMEPAGE="http://jamvm.sourceforge.net/"
+COPYRIGHT="2003-2010 Robert Lougher"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%20$portVersion/jamvm-$portVersion.tar.gz"
 CHECKSUM_SHA256="7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124"
-REVISION="1"
-DEPEND=""
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2010 Robert Lougher"
+PATCHES="jamvm-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -25,6 +23,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.2.8
@@ -38,9 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:find
 	"
 
-
-PATCHES="jamvm-$portVersion.patchset"
-
 BUILD()
 {
 	autoreconf -fi
diff --git a/dev-java/jamvm/jamvm-2.0.0.recipe b/dev-java/jamvm/jamvm-2.0.0.recipe
index f3ce83638..132ca0c5d 100644
--- a/dev-java/jamvm/jamvm-2.0.0.recipe
+++ b/dev-java/jamvm/jamvm-2.0.0.recipe
@@ -1,16 +1,14 @@
-SUMMARY="JamVM"
-DESCRIPTION="
-JamVM is a new Java Virtual Machine which conforms to the JVM specification \
-version 2 (blue book). In comparison to most other VM's (free and commercial) \
-it is extremely small.
-"
+SUMMARY="A very small Java Virtual Machine"
+DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM \
+specification version 2 (blue book). In comparison to most other VM's (free \
+and commercial) it is extremely small."
 HOMEPAGE="http://jamvm.sourceforge.net/"
+COPYRIGHT="2003-2010 Robert Lougher"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%20$portVersion/jamvm-$portVersion.tar.gz"
 CHECKSUM_SHA256="76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da"
-REVISION="1"
-DEPEND=""
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2010 Robert Lougher"
+PATCHES="jamvm-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -25,6 +23,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.2.8
@@ -38,9 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:find
 	"
 
-
-PATCHES="jamvm-$portVersion.patchset"
-
 BUILD()
 {
 	mkdir -p m4
diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe
index 4cdac1768..2cfc199e7 100644
--- a/dev-libs/libdwarf/libdwarf-20130729.recipe
+++ b/dev-libs/libdwarf/libdwarf-20130729.recipe
@@ -1,4 +1,4 @@
-SUMMARY="libdwarf and dwarfdump for working with DWARF"
+SUMMARY="Libraries to dump and manipulate DWARF data"
 DESCRIPTION="DWARF is a widely used, standardized debugging data format. \
 DWARF was originally designed along with Executable and Linkable Format (ELF),\
 although it is independent of object file formats. The name is a medieval \
@@ -25,23 +25,20 @@ file, but dwarfdump2 does a better job in some respects.
 This package includes dwarfdump2 and libdwarf, although the source package has \
 been patched to make dwarfdump and dwarfgen Haiku compatible as well."
 HOMEPAGE="http://www.prevanders.net/dwarf.html"
+COPYRIGHT="2000,2002,2004,2005 Silicon Graphics, Inc.
+	2007-2010 David Anderson
+	2007-2010 Sun Microsystems, Inc."
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz"
 CHECKSUM_SHA256="b6455d8616baf2883e2af91f006d6cbd583128fdfff46e3d1fae460bc223bb7b"
-LICENSE="
-	GNU GPL v2
-	GNU LGPL v2.1
-	"
-COPYRIGHT="
-	2000,2002,2004,2005 Silicon Graphics, Inc.  All Rights Reserved.
-	2007-2010 David Anderson. All Rights Reserved.
-	2007-2010 Sun Microsystems, Inc. All rights reserved
-	"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 SOURCE_DIR="dwarf-$portVersion"
 PATCHES="libdwarf-20130729.patch"
 
+ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	lib:libdwarf$secondaryArchSuffix = $portVersion
 	cmd:dwarfdump = $portVersion
@@ -50,6 +47,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	libdwarf${secondaryArchSuffix}_devel = $portVersion
 	devel:libdwarf$secondaryArchSuffix = $portVersion
@@ -57,6 +55,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	lib:libdwarf$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libelf$secondaryArchSuffix
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index 2f1c4cd07..bd21418c2 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -1,21 +1,22 @@
 SUMMARY="An event notification library"
-DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a \
-specific event occurs on a file descriptor or after a timeout has been \
-reached. Furthermore, libevent also support callbacks due to signals or \
-regular timeouts.\
+DESCRIPTION="The libevent API provides a mechanism to execute a callback \
+function when a specific event occurs on a file descriptor or after a timeout \
+has been reached. Furthermore, libevent also support callbacks due to signals \
+or regular timeouts.
+
 libevent is meant to replace the event loop found in event driven network \
 servers. An application just needs to call event_dispatch() and then add or \
 remove events dynamically without having to change the event loop."
 HOMEPAGE="http://www.libevent.org/"
+COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and others"
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz"
 CHECKSUM_SHA256="afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301"
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
-
-REVISION="1"
+SOURCE_DIR="libevent-${portVersion}-stable"
+PATCHES="libevent-1.4.14b.patch"
 
 ARCHITECTURES="x86_gcc2 x86"
-
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -30,11 +31,29 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-BUILD_REQUIRES="
+
+PROVIDES_devel="
+	cmd:event_rpcgen.py
+	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	"
+REQUIRES_devel="
+	libevent$secondaryArchSuffix  == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -43,9 +62,6 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-SOURCE_DIR="libevent-${portVersion}-stable"
-
-PATCHES="libevent-1.4.14b.patch"
 
 BUILD()
 {
@@ -85,24 +101,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cmd:event_rpcgen.py
-	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
-	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
-	devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
-	"
-
-REQUIRES_devel="
-	libevent$secondaryArchSuffix  == $portVersion base
-	"
diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe
index 8c5a099b3..574b9224c 100644
--- a/dev-util/indent/indent-2.2.10.recipe
+++ b/dev-util/indent/indent-2.2.10.recipe
@@ -1,35 +1,31 @@
-SUMMARY="Indent program source files"
-DESCRIPTION="The indent program can be used to make code easier to read.
-	It can also convert from one style of writing C to another. indent
-	understands a substantial amount about the syntax of C, but it also
-	attempts to cope with incomplete and misformed syntax.
-	"
+SUMMARY="A tool to indent source files"
+DESCRIPTION="The indent program can be used to make code easier to read.\
+It can also convert from one style of writing C to another. indent \
+understands a substantial amount about the syntax of C, but it also	attempts \
+to cope with incomplete and misformed syntax."
 HOMEPAGE="https://www.gnu.org/software/indent/"
-REVISION="2"
-ARCHITECTURES="x86 x86_gcc2"
-LICENSE="GNU GPL v3"
 COPYRIGHT="1999-2000 Carlo Wood
 	1994, 1996-1997 Joseph Arceneaux
 	1992, 2002, 2008 Free Software Foundation, Inc.
 	1980 The Regents of the University of California
 	1976 Board of Trustees of the University of Illinois
 	1985 Sun Microsystems, Inc.
-	1998-2000 The Santa Cruz Operation
-	"
-
+	1998-2000 The Santa Cruz Operation"
+LICENSE="GNU GPL v3"
+REVISION="2"
 SOURCE_URI="http://mirror.keystealth.org/gnu/indent/indent-2.2.10.tar.gz"
 CHECKSUM_SHA256="8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639"
 
-ARCHITECTURES="x86 x86_64 arm ppc"
+ARCHITECTURES="x86 x86_gcc2 ?x86_64 ?arm ?ppc"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	indent = $portVersion
-	cmd:indent = $portVersion
-	cmd:texinfo2man = $portVersion
+	cmd:indent$secondaryArchSuffix = $portVersion
+	cmd:texinfo2man$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
     lib:libiconv$secondaryArchSuffix
     lib:libintl$secondaryArchSuffix
     "
@@ -38,9 +34,7 @@ BUILD_REQUIRES="
     haiku${secondaryArchSuffix}_devel
 	gettext$secondaryArchSuffix
     "
-
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
index d3920cdf7..d530ec0a4 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
@@ -1,6 +1,6 @@
-SUMMARY="KDiff3 is a diff and merge program"
-DESCRIPTION="
-KDiff3 is a diff and merge program that:
+SUMMARY="A diff and merge tool"
+DESCRIPTION="KDiff3 is a diff and merge program that:
+
 * compares or merges two or three text input files or directories,
 * shows the differences line by line and character by character (!),
 * provides an automatic merge-facility and
@@ -11,14 +11,15 @@ KDiff3 is a diff and merge program that:
 * Printing of differences,
 * Manual alignment of lines,
 * Automatic merging of version control history ($Log$),
-* and has an intuitive graphical user interface.
-"
+* and has an intuitive graphical user interface."
 HOMEPAGE="http://kdiff3.sourceforge.net/"
-SOURCE_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz"
-CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a"
 COPYRIGHT="2002-2012 by Joachim Eibl"
 LICENSE="GNU GPL v2"
 REVISION="1"
+PATCHES="kdiff3-0.9.97.patchset"
+SOURCE_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz"
+CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a"
+
 ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -26,7 +27,6 @@ PROVIDES="
 	kdiff3$secondaryArchSuffix = $portVersion
 	cmd:kdiff3$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libQtGui$secondaryArchSuffix
@@ -36,15 +36,12 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:qmake$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	"
 
-PATCHES="kdiff3-0.9.97.patchset"
-
 BUILD()
 {
 	mkdir build
diff --git a/media-fonts/inconsolata/inconsolata-1.0.recipe b/media-fonts/inconsolata/inconsolata-1.0.recipe
index 088e9a576..8ca343c13 100644
--- a/media-fonts/inconsolata/inconsolata-1.0.recipe
+++ b/media-fonts/inconsolata/inconsolata-1.0.recipe
@@ -1,21 +1,21 @@
-SUMMARY="Inconsolata Programmer's font"
+SUMMARY="A monospace font designed for programmers"
 DESCRIPTION="Inconsolata is a monospace font, designed for code listings \
 and the like, in print. There are a great many 'programmer fonts,' designed \
 primarily for use on the screen, but in most cases do not have the attention \
 to detail for high resolution rendering."
 HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html"
+COPYRIGHT="2006 Raph Levien
+	2009 David Zhou
+	2010-2012 Dimosthenis Kaponis"
+LICENSE="SIL Open Font License v1.1"
+REVISION="3"
 SOURCE_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip"
 CHECKSUM_SHA256="002fed4b8c1e5417c03f9b55e009acc682da08b13cdbf8f601f52efaf5324d58"
 SOURCE_URI_2="http://levien.com/type/myfonts/Inconsolata.otf#noarchive"
 CHECKSUM_SHA256_2="1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a"
 SOURCE_URI_3="http://www.cosmix.org/software/files/InconsolataHellenic.zip"
 CHECKSUM_SHA256_3="415f6cd9badb1eefa90be8b10e6316e87f9824856b5e407213334bf5a77873e7"
-REVISION="3"
-LICENSE="SIL Open Font License v1.1"
-COPYRIGHT="2006 Raph Levien
-	2009 David Zhou
-	2010-2012 Dimosthenis Kaponis
-"
+SOURCE_DIR=""
 
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
@@ -25,8 +25,6 @@ REQUIRES=""
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="coreutils"
 
-SOURCE_DIR=""
-
 BUILD()
 {
 	true
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
index 29b769555..437e13de8 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
+++ b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
@@ -1,10 +1,8 @@
-SUMMARY="HarfBuzz is an OpenType text shaping engine"
+SUMMARY="An OpenType text shaping engine"
 DESCRIPTION="HarfBuzz is an OpenType text shaping engine. It is used to \
 layout complex text such as the Indic and Arabic alphabets."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
-LICENSE="MIT"
-COPYRIGHT="
-	2010,2011,2012 Google, Inc.
+COPYRIGHT="2010,2011,2012 Google, Inc.
 	2012 Mozilla Foundation
 	2011 Codethink Limited
 	2008,2010 Nokia Corporation and/or its subsidiary(-ies)
@@ -14,16 +12,16 @@ COPYRIGHT="
 	2006 Behdad Esfahbod
 	2005 David Turner
 	2004,2007,2008,2009,2010 Red Hat, Inc.
-	1998-2004 David Turner and Werner Lemberg
-	"
+	1998-2004 David Turner and Werner Lemberg"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2"
 CHECKSUM_SHA256="1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f"
-REVISION="1"
+PATCHES="harfbuzz-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="harfbuzz-$portVersion.patchset"
-
 PROVIDES="
 	harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9
 	lib:libharfbuzz$secondaryArchSuffix = 0.940.0 compat >= 0
@@ -41,6 +39,7 @@ REQUIRES="
 	lib:libbz2$secondaryArchSuffix
 	lib:libgraphite2$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9
 	devel:libharfbuzz$secondaryArchSuffix = 0.940.0 compat >= 0
@@ -48,7 +47,9 @@ PROVIDES_devel="
 REQUIRES_devel="
 	harfbuzz$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
@@ -59,7 +60,6 @@ BUILD_REQUIRES="
 	devel:libgraphite2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe
index 9805ddc77..fdaf2aad7 100644
--- a/media-libs/jgmod/jgmod-0.99.recipe
+++ b/media-libs/jgmod/jgmod-0.99.recipe
@@ -1,17 +1,17 @@
-SUMMARY="jgmod is a MOD music playing add-on library for Allegro"
-DESCRIPTION="
-JGMOD is a mod library for MOD musics. It is built on top of Allegro lower
-level digital sound routines. Currently supports MOD, S3M, XM, Unreal
-S3M (in UMX extension), and JGM under DJGPP, Mingw32, MSVC, Linux and BEOS.
-"
-
+SUMMARY="A MOD music playing add-on library for Allegro"
+DESCRIPTION="JGMOD is a mod library for MOD musics. It is built on top of \
+Allegro lower level digital sound routines. Currently supports MOD, S3M, XM, \
+Unreal S3M (in UMX extension), and JGM under DJGPP, Mingw32, MSVC, Linux,\
+BeOS and Haiku."
 HOMEPAGE="http://guan.is-a-geek.com/jgmod/jgmod.html"
 COPYRIGHT="1997-2002 Guan Foo Wah"
 LICENSE="JGMOD"
+REVISION="2"
 SOURCE_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip"
 CHECKSUM_SHA256="5d34c446904ddf2c6e3ee2272e6d4a9e6b1b4e59701237c5f4c961999623c77a"
+SOURCE_DIR="jgmod"
 SOURCE_FILENAME="jgmod-$portVersion.zip"
-REVISION="2"
+
 ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
@@ -22,6 +22,13 @@ REQUIRES="
 	lib:liballeg >= 4.4
 	"
 
+PROVIDES_devel="
+	devel:libjgmod
+	"
+REQUIRES_devel="
+	jgmod == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:liballeg
@@ -32,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="jgmod"
 BUILD()
 {
 	chmod 777 ./fixbe.sh
@@ -50,11 +56,3 @@ INSTALL()
 	prepareInstalledDevelLib libjgmod
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	devel:libjgmod
-	"
-
-REQUIRES_devel="
-	jgmod == $portVersion base
-	"
diff --git a/media-libs/jpeg/jpeg-8d.recipe b/media-libs/jpeg/jpeg-8d.recipe
index ef469d7f8..46914b006 100644
--- a/media-libs/jpeg/jpeg-8d.recipe
+++ b/media-libs/jpeg/jpeg-8d.recipe
@@ -1,25 +1,24 @@
-SUMMARY="JPEG image compression library and tools"
-DESCRIPTION="
-This package contains C software to implement JPEG image encoding, decoding, \
-and transcoding. JPEG is a standardized compression method for full-color and \
-gray-scale images.
+SUMMARY="An image compression library and tools for JPEGs"
+DESCRIPTION="This package contains C software to implement JPEG image \
+encoding, decoding, and transcoding. JPEG is a standardized compression \
+method for full-color and gray-scale images.
+
 The distributed programs provide conversion between JPEG "JFIF" format and \
 image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \
 compression and decompression library can easily be reused in other programs, \
 such as image viewers. The package is highly portable C code; we have tested \
-it on many machines ranging from PCs to Crays.
-"
+it on many machines ranging from PCs to Crays."
 HOMEPAGE="http://www.ijg.org"
+COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding"
 LICENSE="JPEG"
-COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
+REVISION="2"
 SOURCE_URI="http://www.ijg.org/files/jpegsrc.v8d.tar.gz"
 CHECKSUM_SHA256="00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
-REVISION="2"
+PATCHES="jpeg-8d.patch"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-PATCHES="jpeg-8d.patch"
-
 PROVIDES="
 	jpeg$secondaryArchSuffix = $portVersion compat >= 8
 	lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 8
@@ -27,10 +26,35 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 8
+	devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 8
+	"
+REQUIRES_devel="
+	jpeg$secondaryArchSuffix == $portVersion base
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The JPEG tools"
+	PROVIDES_tools="
+		jpeg_tools = $portVersion compat >= 8
+		cmd:cjpeg = $portVersion compat >= 8
+		cmd:djpeg = $portVersion compat >= 8
+		cmd:jpegtran = $portVersion compat >= 8
+		cmd:rdjpgcom = $portVersion compat >= 8
+		cmd:wrjpgcom = $portVersion compat >= 8
+		"
+	REQUIRES_tools="
+		haiku
+		jpeg == $portVersion base
+		"
+fi
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -77,31 +101,3 @@ INSTALL()
 		rm -rf $documentationDir
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 8
-	devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 8
-	"
-REQUIRES_devel="
-	jpeg$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- tools package -------------------------------------------------------
-
-if [ -z "$secondaryArchSuffix" ]; then
-	SUMMARY_tools="The JPEG tools"
-	PROVIDES_tools="
-		jpeg_tools = $portVersion compat >= 8
-		cmd:cjpeg = $portVersion compat >= 8
-		cmd:djpeg = $portVersion compat >= 8
-		cmd:jpegtran = $portVersion compat >= 8
-		cmd:rdjpgcom = $portVersion compat >= 8
-		cmd:wrjpgcom = $portVersion compat >= 8
-		"
-	REQUIRES_tools="
-		haiku
-		jpeg == $portVersion base
-		"
-fi
diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe
index 0150defd7..baad4b159 100644
--- a/media-libs/jpeg/jpeg-9.recipe
+++ b/media-libs/jpeg/jpeg-9.recipe
@@ -1,25 +1,24 @@
-SUMMARY="JPEG image compression library and tools"
-DESCRIPTION="
-This package contains C software to implement JPEG image encoding, decoding, \
-and transcoding. JPEG is a standardized compression method for full-color and \
-gray-scale images.
+SUMMARY="An image compression library and tools for JPEGs"
+DESCRIPTION="This package contains C software to implement JPEG image \
+encoding, decoding, and transcoding. JPEG is a standardized compression \
+method for full-color and gray-scale images.
+
 The distributed programs provide conversion between JPEG "JFIF" format and \
 image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \
 compression and decompression library can easily be reused in other programs, \
 such as image viewers. The package is highly portable C code; we have tested \
-it on many machines ranging from PCs to Crays.
-"
+it on many machines ranging from PCs to Crays."
 HOMEPAGE="http://www.ijg.org"
+COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding."
 LICENSE="JPEG"
-COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
+REVISION="3"
 SOURCE_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz"
 CHECKSUM_SHA256="c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535"
-REVISION="3"
+PATCHES="jpeg-9.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="jpeg-9.patchset"
-
 PROVIDES="
 	jpeg$secondaryArchSuffix = $portVersion compat >= 9
 	lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
@@ -27,10 +26,35 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9
+	devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
+	"
+REQUIRES_devel="
+	jpeg$secondaryArchSuffix == $portVersion base
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The JPEG tools"
+	PROVIDES_tools="
+		jpeg_tools = $portVersion compat >= 9
+		cmd:cjpeg = $portVersion compat >= 9
+		cmd:djpeg = $portVersion compat >= 9
+		cmd:jpegtran = $portVersion compat >= 9
+		cmd:rdjpgcom = $portVersion compat >= 9
+		cmd:wrjpgcom = $portVersion compat >= 9
+		"
+	REQUIRES_tools="
+		haiku
+		jpeg == $portVersion base
+		"
+fi
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -75,31 +99,3 @@ INSTALL()
 		rm -rf $documentationDir
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9
-	devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
-	"
-REQUIRES_devel="
-	jpeg$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- tools package -------------------------------------------------------
-
-if [ -z "$secondaryArchSuffix" ]; then
-	SUMMARY_tools="The JPEG tools"
-	PROVIDES_tools="
-		jpeg_tools = $portVersion compat >= 9
-		cmd:cjpeg = $portVersion compat >= 9
-		cmd:djpeg = $portVersion compat >= 9
-		cmd:jpegtran = $portVersion compat >= 9
-		cmd:rdjpgcom = $portVersion compat >= 9
-		cmd:wrjpgcom = $portVersion compat >= 9
-		"
-	REQUIRES_tools="
-		haiku
-		jpeg == $portVersion base
-		"
-fi
diff --git a/media-libs/jpeg/jpeg-9a.recipe b/media-libs/jpeg/jpeg-9a.recipe
index 0806a0e30..2c464ea7e 100644
--- a/media-libs/jpeg/jpeg-9a.recipe
+++ b/media-libs/jpeg/jpeg-9a.recipe
@@ -1,25 +1,24 @@
-SUMMARY="JPEG image compression library and tools"
-DESCRIPTION="
-This package contains C software to implement JPEG image encoding, decoding, \
-and transcoding. JPEG is a standardized compression method for full-color and \
-gray-scale images.
+SUMMARY="An image compression library and tools for JPEGs"
+DESCRIPTION="This package contains C software to implement JPEG image \
+encoding, decoding, and transcoding. JPEG is a standardized compression \
+method for full-color and gray-scale images.
+
 The distributed programs provide conversion between JPEG "JFIF" format and \
 image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \
 compression and decompression library can easily be reused in other programs, \
 such as image viewers. The package is highly portable C code; we have tested \
-it on many machines ranging from PCs to Crays.
-"
+it on many machines ranging from PCs to Crays."
 HOMEPAGE="http://www.ijg.org"
+COPYRIGHT="1991-2014, Thomas G. Lane, Guido Vollbeding"
 LICENSE="JPEG"
-COPYRIGHT="1991-2014, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
+REVISION="1"
 SOURCE_URI="http://www.ijg.org/files/jpegsrc.v$portVersion.tar.gz"
 CHECKSUM_SHA256="3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"
-REVISION="1"
+PATCHES="jpeg-9.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="jpeg-9.patchset"
-
 PROVIDES="
 	jpeg$secondaryArchSuffix = $portVersion compat >= 9
 	lib:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9
@@ -27,10 +26,35 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9
+	devel:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9
+	"
+REQUIRES_devel="
+	jpeg$secondaryArchSuffix == $portVersion base
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The JPEG tools"
+	PROVIDES_tools="
+		jpeg_tools = $portVersion compat >= 9
+		cmd:cjpeg = $portVersion compat >= 9
+		cmd:djpeg = $portVersion compat >= 9
+		cmd:jpegtran = $portVersion compat >= 9
+		cmd:rdjpgcom = $portVersion compat >= 9
+		cmd:wrjpgcom = $portVersion compat >= 9
+		"
+	REQUIRES_tools="
+		haiku
+		jpeg == $portVersion base
+		"
+fi
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -72,31 +96,3 @@ INSTALL()
 		rm -rf $documentationDir
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9
-	devel:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9
-	"
-REQUIRES_devel="
-	jpeg$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- tools package -------------------------------------------------------
-
-if [ -z "$secondaryArchSuffix" ]; then
-	SUMMARY_tools="The JPEG tools"
-	PROVIDES_tools="
-		jpeg_tools = $portVersion compat >= 9
-		cmd:cjpeg = $portVersion compat >= 9
-		cmd:djpeg = $portVersion compat >= 9
-		cmd:jpegtran = $portVersion compat >= 9
-		cmd:rdjpgcom = $portVersion compat >= 9
-		cmd:wrjpgcom = $portVersion compat >= 9
-		"
-	REQUIRES_tools="
-		haiku
-		jpeg == $portVersion base
-		"
-fi
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index 34e9d228d..a00a55b37 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -1,34 +1,39 @@
-SUMMARY="libdvdcss"
-DESCRIPTION="
-libdvdcss is a simple library designed for accessing DVDs like a block device \
-without having to bother about the decryption.
-"
+SUMMARY="A library to access DVDs"
+DESCRIPTION="libdvdcss is a simple library designed for accessing DVDs like a \
+block device without having to bother about the decryption."
 HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2008 VideoLAN"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://download.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2"
 CHECKSUM_SHA256="72465395d494f609b180cab23f9679acf6083fb821bd84979a8e70f7b795db5d"
-REVISION="2"
+SOURCE_DIR="libdvdcss-${portVersion}"
+PATCHES="libdvdcss-${portVersion}.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-PATCHES="libdvdcss-${portVersion}.patch"
-
 PROVIDES="
 	libdvdcss$secondaryArchSuffix = $portVersion
 	lib:libdvdcss$secondaryArchSuffix
 	cmd:dvdcss_config$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libdvdcss${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdcss$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libdvdcss$secondaryArchSuffix == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -37,8 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-SOURCE_DIR="libdvdcss-${portVersion}"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -60,13 +63,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdcss${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdcss$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libdvdcss$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
index 896c278f2..a1eb64167 100644
--- a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
@@ -1,33 +1,38 @@
-SUMMARY="libdvdcss"
-DESCRIPTION="
-libdvdcss is a simple library designed for accessing DVDs like a block device \
-without having to bother about the decryption.
-"
+SUMMARY="A library to access DVDs"
+DESCRIPTION="libdvdcss is a simple library designed for accessing DVDs like a \
+block device without having to bother about the decryption."
 HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2008 VideoLAN"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395"
-REVISION="1"
+SOURCE_DIR="libdvdcss-${portVersion}"
+PATCHES="libdvdcss-${portVersion}.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-PATCHES="libdvdcss-${portVersion}.patchset"
-
 PROVIDES="
 	libdvdcss$secondaryArchSuffix = $portVersion
 	lib:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libdvdcss${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
+	"
+REQUIRES_devel="
+	libdvdcss$secondaryArchSuffix == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -36,8 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-SOURCE_DIR="libdvdcss-${portVersion}"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -59,13 +62,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdcss${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
-	"
-REQUIRES_devel="
-	libdvdcss$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe
index 47ad795ca..c296695a2 100644
--- a/media-video/gnash/gnash-0.8.10.recipe
+++ b/media-video/gnash/gnash-0.8.10.recipe
@@ -1,13 +1,15 @@
-SUMMARY="Gnash"
-DESCRIPTION="
-Gnash is a player for the Adobe Flash technology.
-"
+SUMMARY="A player for Adobe Flash"
+DESCRIPTION="GNU Gnash is the GNU Flash movie player — Flash is an animation \
+file format pioneered by Macromedia which continues to be supported by their \
+successor company, Adobe. Flash has been extended to include audio and video \
+content, and programs written in ActionScript, an ECMAScript-compatible language."
 HOMEPAGE="http://www.gnu.org/software/gnash/"
-SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
-CHECKSUM_SHA256="9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224"
 COPYRIGHT="2005-2012 Free Software Foundation"
 LICENSE="GNU GPL v3"
 REVISION="2"
+SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
+CHECKSUM_SHA256="9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224"
+PATCHES="gnash-0.8.10.patchset"
 
 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
@@ -15,7 +17,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 PROVIDES="
 	gnash$secondaryArchSuffix = $portVersion
 	app:Gnash = $portVersion
-"
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
@@ -42,7 +44,8 @@ REQUIRES="
 	#lib:libfontconfig$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-"
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
@@ -70,7 +73,7 @@ BUILD_REQUIRES="
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -85,14 +88,12 @@ BUILD_PREREQUIRES="
 	cmd:sdl_config$secondaryArchSuffix
 	cmd:xargs
 	cmd:grep
-"
-
-PATCHES="gnash-0.8.10.patchset"
+	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/gnashpluginrc auto-merge
 	settings/gnashrc auto-merge
-"
+	"
 
 BUILD()
 {
diff --git a/net-libs/libdom/libdom-0.1.0.recipe b/net-libs/libdom/libdom-0.1.0.recipe
index e4cdcdcc9..c7fae1298 100644
--- a/net-libs/libdom/libdom-0.1.0.recipe
+++ b/net-libs/libdom/libdom-0.1.0.recipe
@@ -1,23 +1,33 @@
-SUMMARY="LibDOM is an implementation of the W3C DOM"
+SUMMARY="An implementation of the W3C DOM"
 DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-LICENSE="MIT"
 COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-0.1.0-src.tar.gz"
 CHECKSUM_SHA256="235fde8bcfcf71e325c1344acfb995d5d59e1d8ebfcb9c87c1aefd1a08c8fae6"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libdom-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libdom = $portVersion
 	lib:libdom = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	"
+
+PROVIDES_devel="
+	libdom_devel = $portVersion
+	devel:libdom = $portVersion
+	"
+REQUIRES_devel="
+	libdom == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libexpat
 	devel:libhubbub
 	devel:libparserutils
@@ -25,9 +35,7 @@ BUILD_REQUIRES="
 	netsurf_buildsystem
 	xml_parser
 	"
-
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
@@ -53,13 +61,3 @@ TEST()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdom_devel = $portVersion
-	devel:libdom = $portVersion
-"
-REQUIRES_devel="
-	libdom$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-libs/libdom/libdom-0.1.1.recipe b/net-libs/libdom/libdom-0.1.1.recipe
index 5b1859485..8a85a84ad 100644
--- a/net-libs/libdom/libdom-0.1.1.recipe
+++ b/net-libs/libdom/libdom-0.1.1.recipe
@@ -1,40 +1,46 @@
-SUMMARY="LibDOM is an implementation of the W3C DOM"
+SUMMARY="An implementation of the W3C DOM"
 DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-LICENSE="MIT"
 COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="e86c11e313cdfbbe9674ad14125093240e23a2fa9e6f05b996d6b655e40c2dd4"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libdom-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libdom = $portVersion
 	lib:libdom = $portVersion
-"
-
+	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
+	"
+
+PROVIDES_devel="
+	libdom_devel = $portVersion
+	devel:libdom = $portVersion
+	"
+REQUIRES_devel="
+	libdom == $portVersion base
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libexpat
 	devel:libhubbub
 	devel:libparserutils
 	devel:libwapcaplet
 	netsurf_buildsystem
 	xml_parser
-"
-
+	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
@@ -55,13 +61,3 @@ TEST()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdom_devel = $portVersion
-	devel:libdom = $portVersion
-"
-REQUIRES_devel="
-	libdom$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-libs/libdom/libdom-0.1.2.recipe b/net-libs/libdom/libdom-0.1.2.recipe
index 85197a6b6..d9e0c8e28 100644
--- a/net-libs/libdom/libdom-0.1.2.recipe
+++ b/net-libs/libdom/libdom-0.1.2.recipe
@@ -1,40 +1,46 @@
-SUMMARY="LibDOM is an implementation of the W3C DOM"
+SUMMARY="An implementation of the W3C DOM"
 DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-LICENSE="MIT"
 COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="9cd3cf4487735c3cc5d63c5fdee05384eee65318476105646767b34d6e07e9e8"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libdom-0.1.1.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libdom = $portVersion
 	lib:libdom = $portVersion
-"
-
+	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
+	"
+
+PROVIDES_devel="
+	libdom_devel = $portVersion
+	devel:libdom = $portVersion
+	"
+REQUIRES_devel="
+	libdom == $portVersion base
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libexpat
 	devel:libhubbub
 	devel:libparserutils
 	devel:libwapcaplet
 	netsurf_buildsystem
 	xml_parser
-"
-
+	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
-"
+	"
 
 BUILD()
 {
@@ -55,13 +61,3 @@ TEST()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdom_devel = $portVersion
-	devel:libdom = $portVersion
-"
-REQUIRES_devel="
-	libdom$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-misc/gophernicus/gophernicus-1.5.recipe b/net-misc/gophernicus/gophernicus-1.5.recipe
index b5090c732..4d4456deb 100644
--- a/net-misc/gophernicus/gophernicus-1.5.recipe
+++ b/net-misc/gophernicus/gophernicus-1.5.recipe
@@ -1,24 +1,20 @@
-SUMMARY="Gophernicus is a modern full-featured gopher server"
-DESCRIPTION="
-	Gophernicus is a modern full-featured (and hopefully) secure gopher \
-	daemon for inetd. It is licensed under the BSD license.
-"
+SUMMARY="A modern full-featured gopher server"
+DESCRIPTION="Gophernicus is a modern full-featured (and hopefully) secure \
+gopher daemon for inetd. It is licensed under the BSD license."
+HOMEPAGE="gopher://gophernicus.org/1/software/gophernicus/"
 COPYRIGHT="2009-2014 Kim Holviala"
 LICENSE="BSD (2-clause)"
-HOMEPAGE="gopher://gophernicus.org/1/software/gophernicus/"
+REVISION="1"
 SOURCE_URI="http://gophernicus.org/software/gophernicus/gophernicus-1.5.tar.gz"
 CHECKSUM_SHA256="eeea761604a1b1277e74a673d0250f10024f99ced0889712e099093a651c232a"
-REVISION="1"
 
 #TODO:enable multithreading for the devel package!
-
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	gophernicus$secondaryArchSuffix = $portVersion
 	cmd:in.gophernicus$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
@@ -26,7 +22,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe
index aabda1f65..891c34224 100644
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -1,16 +1,21 @@
-SUMMARY="inputproto"
-DESCRIPTION="
-inputproto.
-"
+SUMMARY="X.Org input extension protocol"
+DESCRIPTION="XI2's intent is to replace both core input processing and prior \
+versions of the X Input Extension. Historically, the majority of applications \
+employed the core protocol requests and events to handle user input. The core \
+protocol does not provide information about which device generated the event.
+
+The X Input Extension version up to 1.5 requires the differentiation between \
+core and extended devices. Extended devices may not be core devices and thus \
+cannot be used on applications employing the core protocol. XI2 addresses both \
+of these issues by enabling devices to be both extended and core devices and \
+providing device information in each event (with the exception of core events)."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/"
+COPYRIGHT="1989, 1998  The Open Group
+	1989 by Hewlett-Packard Company, Palo Alto, California"
+LICENSE="MIT (no promotion)"
+REVISION="1"
 SOURCE_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz"
 CHECKSUM_SHA256="cd89a1e95745875e66947ba28587c720c91aec63836ac6548ca12fd525c0a2ee"
-REVISION="1"
-COPYRIGHT="1989, 1998  The Open Group
-	1989 by Hewlett-Packard Company, Palo Alto, California.
-	"
-LICENSE="MIT (no promotion)"
-
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -24,10 +29,10 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe
index 29d9ca76a..a621e37a5 100644
--- a/x11-proto/kbproto/kbproto-1.0.4.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -1,13 +1,11 @@
-SUMMARY="kbproto"
-DESCRIPTION="
-kbproto.
-"
+SUMMARY="X.Org KB protocol headers"
+DESCRIPTION="Headers for the X11 KB protocol."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz"
-CHECKSUM_SHA256="d7fcd4fa4332109b05f0d5e238e4aa0ef2ca1a51b45ab9fcf8affd7ee021cfe7"
-REVISION="1"
 COPYRIGHT="1993 by Silicon Graphics Computer Systems, Inc."
 LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz"
+CHECKSUM_SHA256="d7fcd4fa4332109b05f0d5e238e4aa0ef2ca1a51b45ab9fcf8affd7ee021cfe7"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -21,10 +19,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool