diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe
index 8e6914415..9d86a3491 100644
--- a/app-arch/libarchive/libarchive-3.1.2.recipe
+++ b/app-arch/libarchive/libarchive-3.1.2.recipe
@@ -1,6 +1,6 @@
-SUMMARY="C library and tools for working with many archive formats."
-DESCRIPTION="
-The libarchive library features:
+SUMMARY="C library and tools for working with many archive formats"
+DESCRIPTION="The libarchive library features:
+
 * Support for a variety of archive and compression formats.
 * Robust automatic format detection, including archive/compression \
 combinations such as tar.gz.
@@ -18,14 +18,15 @@ cab, mtree, rar, and ISO images.
 * Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
 * Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \
 or compress.
-* Unique format conversion feature.
-"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2003-2013 Tim Kientzle"
+* Unique format conversion feature."
 HOMEPAGE="http://www.libarchive.org/"
 SOURCE_URI="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"
 CHECKSUM_SHA256="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
+PATCHES="libarchive-3.1.2.patchset"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2003-2013 Tim Kientzle"
 REVISION="1"
+
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
     # x86_gcc2 is fine as primary target architecture as long as we're building
@@ -50,7 +51,6 @@ PROVIDES="
 	cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0
 	lib:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
@@ -60,7 +60,13 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	"
-
+PROVIDES_devel="
+	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
+	devel:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
+	"
+REQUIRES_devel="
+	libarchive$secondaryArchSuffix == $portVersion
+	"
 BUILD_REQUIRES="
 	devel:liblzma$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
@@ -69,7 +75,6 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
@@ -81,18 +86,6 @@ BUILD_PREREQUIRES="
 	cmd:xml2_config
 	"
 
-PROVIDES_devel="
-	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
-	devel:libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
-	"
-
-REQUIRES_devel="
-	libarchive$secondaryArchSuffix == $portVersion
-	"
-
-PATCHES="libarchive-3.1.2.patchset"
-
-
 BUILD()
 {
 	libtoolize -fci
diff --git a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
index b75036a21..481cea269 100644
--- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
+++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
@@ -1,41 +1,39 @@
-SUMMARY="libmicro - portable microbenchmarks"
-DESCRIPTION="
-LibMicro is a portable set of microbenchmarks that many Solaris
-engineers used during Solaris 10 development to measure the
-performance of various system and library calls. LibMicro was
-developed by Bart Smaalders and Phil Harman as part of their If Linux
-is faster it's a Solaris bug performance campaign. LibMicro is Open
-Source and uses the CDDL license.The libMicro sources include an awk
-script that generates color coded html pages to easily compare
-various OS revs, processors and other differences in a quick manner
-"
-LICENSE="CDDL v1"
-COPYRIGHT="2013 Oracle"
+SUMMARY="Portable microbenchmarks"
+DESCRIPTION="LibMicro is a portable set of microbenchmarks that many Solaris \
+engineers used during Solaris 10 development to measure the performance of \
+various system and library calls. LibMicro was developed by Bart Smaalders \
+and Phil Harman as part of their If Linux is faster it's a Solaris bug \
+performance campaign. LibMicro is Open Source and uses the CDDL license.
+
+The libMicro sources include an awk script that generates color coded html \
+pages to easily compare various OS revs, processors and other differences in \
+a quick manner."
 HOMEPAGE="https://java.net/projects/libmicro"
-SOURCE_URI="hg+https://hg.java.net/hg/libmicro~hg-repo#7dd95b416c3c"
+LICENSE="CDDL v1"
 REVISION="1"
+
 ARCHITECTURES="!x86 x86_gcc2"
 
+SOURCE_URI="hg+https://hg.java.net/hg/libmicro~hg-repo#7dd95b416c3c"
+COPYRIGHT="2013 Oracle"
+PATCHES="libmicro-0.4.2.hg.patchset"
+
 PROVIDES="
 	libmicro = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
-
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc
+	cmd:hg
 	cmd:make
 	"
 
-PATCHES="libmicro-0.4.2.hg.patchset"
-
 BUILD()
 {
 	make
diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe
index 0a0524e47..9d9a27810 100644
--- a/dev-libs/libdwarf/libdwarf-20130729.recipe
+++ b/dev-libs/libdwarf/libdwarf-20130729.recipe
@@ -1,12 +1,12 @@
-SUMMARY="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format"
-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 fantasy \
-complement to ELF that has no official meaning, although the backronym \
-'Debugging With Attributed Record Formats' was later proposed.
-The DWARF Debugging Information Format is of interest to programmers working on \
-compilers and debuggers (and anyone interested in reading or writing DWARF \
+SUMMARY="libdwarf and dwarfdump for working with DWARF"
+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 \
+fantasy complement to ELF that has no official meaning, although the \
+backronym 'Debugging With Attributed Record Formats' was later proposed.
+
+The DWARF Debugging Information Format is of interest to programmers working \
+on compilers and debuggers (and anyone interested in reading or writing DWARF \
 information). DWARF uses a data structure called a Debugging Information Entry \
 (DIE) to represent each variable, type, procedure, etc. It was developed by a \
 committee (known as the PLSIG at the time) starting around 1991. Starting \
@@ -16,13 +16,14 @@ have been shipped (as an executable and archive respectively, not source) with \
 every release of the SGI MIPS/IRIX C compiler. In 1994 (I think the correct \
 year) SGI agreed to open-source libdwarf (and in 1999 to open-source dwarfdump) \
 so anyone could use them.
+
 libdwarf allows reading, creation and manipulation of dwarf data.  dwarfdump \
 (written in C) and dwarfdump2 (written in C++) do the same job, they let you \
 dump out, in readable form, the DWARF2, DWARF3, or DWARF4 data from an object \
 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.
-"
+been patched to make dwarfdump and dwarfgen Haiku compatible as well."
 HOMEPAGE="http://www.prevanders.net/dwarf.html"
 SOURCE_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz"
 CHECKSUM_SHA256="b6455d8616baf2883e2af91f006d6cbd583128fdfff46e3d1fae460bc223bb7b"
@@ -45,17 +46,21 @@ PROVIDES="
 	lib:libdwarf$secondaryArchSuffix = $portVersion
 	cmd:dwarfdump = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
 	"
-
+PROVIDES_devel="
+	libdwarf${secondaryArchSuffix}_devel = $portVersion
+	devel:libdwarf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	lib:libdwarf$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libelf$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -80,12 +85,3 @@ INSTALL()
 	make install mandir=$manDir 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libdwarf${secondaryArchSuffix}_devel = $portVersion
-	devel:libdwarf$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES_devel="
-	lib:libdwarf$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/libebml/libebml-1.3.1.recipe b/dev-libs/libebml/libebml-1.3.1.recipe
index 862342a57..e1733cde8 100644
--- a/dev-libs/libebml/libebml-1.3.1.recipe
+++ b/dev-libs/libebml/libebml-1.3.1.recipe
@@ -1,8 +1,9 @@
-SUMMARY="libebml is a C++ library to parse EBML content (read/write)."
+SUMMARY="A C++ library to parse EBML content (read/write)"
 DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
 HOMEPAGE="http://www.matroska.org/"
 SOURCE_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2"
 CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295"
+PATCHES="libebml-$portVersion.patchset"
 REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2005-2013 CoreCodec, Inc."
@@ -10,7 +11,6 @@ COPYRIGHT="2005-2013 CoreCodec, Inc."
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-
 PROVIDES="
 	libebml$secondaryArchSuffix = $portVersion
 	lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4
@@ -20,19 +20,23 @@ REQUIRES="
 	lib:libstdc++${secondaryArchSuffix}
 	"
 
-PATCHES="
-	libebml-$portVersion.patchset
-"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	REQUIRES+="
 		lib:libgcc_s${secondaryArchSuffix}
 	"
 fi
 
+PROVIDES_devel="
+	libebml${secondaryArchSuffix}_devel = $portVersion
+	devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4
+	"
+REQUIRES_devel="
+	libebml$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -59,11 +63,3 @@ INSTALL()
 	
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libebml${secondaryArchSuffix}_devel = $portVersion
-	devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4
-	"
-REQUIRES_devel="
-	libebml$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/libffi/libffi-3.0.13.recipe b/dev-libs/libffi/libffi-3.0.13.recipe
index b6168f86f..e0346b6d1 100644
--- a/dev-libs/libffi/libffi-3.0.13.recipe
+++ b/dev-libs/libffi/libffi-3.0.13.recipe
@@ -1,7 +1,9 @@
-SUMMARY="A portable, high level programming interface."
-DESCRIPTION="
-A portable, high level programming interface to various calling conventions.
-"
+SUMMARY="A portable, high level programming interface"
+DESCRIPTION="Libffi is a foreign function interface library which gives its \
+user a C programming language interface used to call natively compiled \
+functions. Libffi is typically used as a bridging technology between compiled \
+and interpreted language implementations. It can also be used to implement \
+plugins."
 HOMEPAGE="http://sourceware.org/libffi" 
 LICENSE="MIT"
 REVISION="2"
@@ -18,16 +20,20 @@ PROVIDES="
 	libffi$secondaryArchSuffix = $portVersion compat >= 3
 	lib:libffi$secondaryArchSuffix = 6.0.1 compat >= 6
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libffi${secondaryArchSuffix}_devel = $portVersion
+	devel:libffi$secondaryArchSuffix = 6.0.1 compat >= 6
 	"
-
-BUILD_PREREQUIRES="
+REQUIRES_devel="
+	libffi$secondaryArchSuffix == $portVersion base
+	"
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
@@ -55,12 +61,3 @@ INSTALL()
 		$developDir \
 		$documentationDir
 }
-
-PROVIDES_devel="
-	libffi${secondaryArchSuffix}_devel = $portVersion
-	devel:libffi$secondaryArchSuffix = 6.0.1 compat >= 6
-	"
-
-REQUIRES_devel="
-	libffi$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/libffi/libffi-3.2.1.recipe b/dev-libs/libffi/libffi-3.2.1.recipe
index f31a49e61..a7bbfd1fa 100644
--- a/dev-libs/libffi/libffi-3.2.1.recipe
+++ b/dev-libs/libffi/libffi-3.2.1.recipe
@@ -1,10 +1,9 @@
 SUMMARY="A portable, high level programming interface"
-DESCRIPTION="
-Libffi is a foreign function interface library which gives its user a \
-C programming language interface used to call natively compiled functions. \
-Libffi is typically used as a bridging technology between compiled \
-and interpreted language implementations. It can also be used to \
-implement plugins."
+DESCRIPTION="Libffi is a foreign function interface library which gives its \
+user a C programming language interface used to call natively compiled \
+functions. Libffi is typically used as a bridging technology between compiled \
+and interpreted language implementations. It can also be used to implement \
+plugins."
 HOMEPAGE="http://sourceware.org/libffi" 
 LICENSE="MIT"
 REVISION="2"
@@ -24,10 +23,17 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libffi${secondaryArchSuffix}_devel = $portVersion
+	devel:libffi$secondaryArchSuffix = 6.0.4 compat >= 6
+	"
+REQUIRES_devel="
+	libffi$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
@@ -55,11 +61,3 @@ INSTALL()
 		$developDir \
 		$documentationDir
 }
-
-PROVIDES_devel="
-	libffi${secondaryArchSuffix}_devel = $portVersion
-	devel:libffi$secondaryArchSuffix = 6.0.4 compat >= 6
-	"
-REQUIRES_devel="
-	libffi$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
index af8aaea40..c13780a0d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
@@ -1,39 +1,46 @@
-SUMMARY="GNU's basic cryptographic library."
-DESCRIPTION="
-Libgcrypt is a general purpose crypto library based on the code \
-used in GnuPG.
-"
-LICENSE="GNU LGPL v3"
-COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+SUMMARY="GNU's basic cryptographic library"
+DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
+LICENSE="GNU LGPL v3"
+REVISION="2"
+
+ARCHITECTURES="x86"
+
 SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2"
 CHECKSUM_SHA256="bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1"
-REVISION="2"
-ARCHITECTURES="x86"
+COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+PATCHES="libgcrypt-1.5.3.patch"
 
 PROVIDES="
 	libgcrypt = $portVersion compat >= 1.5
 	lib:libgcrypt = 11.8.2 compat >= 11
 	"
-
 REQUIRES="
 	haiku
 	lib:libgpg_error
 	"
-
+PROVIDES_devel="
+	libgcrypt_devel = $portVersion compat >= 1.5
+	devel:libgcrypt = 11.8.2 compat >= 11
+	cmd:dumpsexp = $portVersion compat >= 1.5
+	cmd:libgcrypt_config = $portVersion compat >= 1.5
+	cmd:hmac256 = $portVersion compat >= 1.5
+	"
+REQUIRES_devel="
+	libgcrypt == $portVersion base
+	libgpg_error_devel
+	"
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libgpg_error
 	"
-
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:make
 	cmd:gcc
 	"
 
-PATCHES="libgcrypt-1.5.3.patch"
-
 BUILD()
 {
 	autoconf
@@ -50,16 +57,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir $binDir
 }
-
-PROVIDES_devel="
-	libgcrypt_devel = $portVersion compat >= 1.5
-	devel:libgcrypt = 11.8.2 compat >= 11
-	cmd:dumpsexp = $portVersion compat >= 1.5
-	cmd:libgcrypt_config = $portVersion compat >= 1.5
-	cmd:hmac256 = $portVersion compat >= 1.5
-	"
-
-REQUIRES_devel="
-	libgcrypt == $portVersion base
-	libgpg_error_devel
-	"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe
index fd4fe1f8e..b546dcba6 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe
@@ -1,34 +1,44 @@
-SUMMARY="GNU's basic cryptographic library."
-DESCRIPTION="
-Libgcrypt is a general purpose crypto library based on the code \
-used in GnuPG.
-"
-LICENSE="GNU LGPL v3"
-COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+SUMMARY="GNU's basic cryptographic library"
+DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
-SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
-CHECKSUM_SHA256="41b4917b93ae34c6a0e2127378d7a4d66d805a2a86a09911d4f9bd871db7025f"
+LICENSE="GNU LGPL v3"
 REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+
+SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
+CHECKSUM_SHA256="41b4917b93ae34c6a0e2127378d7a4d66d805a2a86a09911d4f9bd871db7025f"
+COPYRIGHT="2000-2013 Free Software Foundation, Inc."
 PATCHES="libgcrypt-$portVersion.patchset"
 
 PROVIDES="
 	libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
 	lib:libgcrypt${secondaryArchSuffix} = 20.0.3 compat >= 20
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libgpg_error${secondaryArchSuffix}
 	"
-
+PROVIDES_devel="
+	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	devel:libgcrypt$secondaryArchSuffix = 20.0.3 compat >= 20
+	cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:mpicalc$secondaryArchSuffix = $portVersion compat >= 1.6
+	"
+REQUIRES_devel="
+	libgcrypt${secondaryArchSuffix} == $portVersion base
+	haiku${secondaryArchSuffix}
+	libgpg_error${secondaryArchSuffix}
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgpg_error${secondaryArchSuffix}
 	"
-
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:make
@@ -51,18 +61,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir $binDir
 }
-
-PROVIDES_devel="
-	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	devel:libgcrypt$secondaryArchSuffix = 20.0.3 compat >= 20
-	cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:mpicalc$secondaryArchSuffix = $portVersion compat >= 1.6
-	"
-
-REQUIRES_devel="
-	libgcrypt${secondaryArchSuffix} == $portVersion base
-	haiku${secondaryArchSuffix}
-	libgpg_error${secondaryArchSuffix}
-	"
diff --git a/dev-libs/libpurple/libpurple-2.10.11.recipe b/dev-libs/libpurple/libpurple-2.10.11.recipe
index 55ac160ac..6887e26b8 100644
--- a/dev-libs/libpurple/libpurple-2.10.11.recipe
+++ b/dev-libs/libpurple/libpurple-2.10.11.recipe
@@ -1,14 +1,10 @@
-SUMMARY="A library for IM communication."
+SUMMARY="A library for IM communication"
 DESCRIPTION="libpurple is a library for IM communication used by many open \
-source IM clients. It implements a variety of protocols, for example IRC, Jabber \
-or ICQ."
+source IM clients. It implements a variety of protocols, for example IRC, \
+Jabber or ICQ."
 HOMEPAGE="https://pidgin.im/"
-SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2"
-SOURCE_DIR="pidgin-$portVersion"
-CHECKSUM_SHA256="f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007"
-REVISION="1"
 LICENSE="GNU GPL v2"
-COPYRIGHT="1998-2015 Rob Flynn et al."
+REVISION="1"
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -16,12 +12,16 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
+SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2"
+CHECKSUM_SHA256="f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007"
+COPYRIGHT="1998-2015 Rob Flynn et al."
+SOURCE_DIR="pidgin-$portVersion"
+
 PROVIDES="
 	libpurple$secondaryArchSuffix = $portVersion
 	lib:libpurple$secondaryArchSuffix = $portVersion
 	lib:libgnt$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
@@ -48,7 +48,34 @@ REQUIRES="
 	lib:libpanelw$secondaryArchSuffix
 	lib:libncursesw$secondaryArchSuffix
 	"
-
+PROVIDES_devel="
+	libpurple${secondaryArchSuffix}_devel = $portVersion
+	devel:libpurple$secondaryArchSuffix = $portVersion
+	devel:libgnt$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel
+	libpurple$secondaryArchSuffix == $portVersion base
+	"
+PROVIDES_finch="
+	libpurple${secondaryArchPrefix}_finch = $portVersion
+	cmd:finch$secondaryArchSuffix
+	"
+REQUIRES_finch="
+	haiku${secondaryArchSuffix}
+	libpurple$secondaryArchSuffix == $portVersion base
+	lib:libffi$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgmodule_2.0$secondaryArchSuffix
+	lib:libgobject_2.0$secondaryArchSuffix
+	lib:libgthread_2.0$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libidn$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncurses${secondaryArchSuffix}
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	glib2${secondaryArchSuffix}_devel
@@ -120,37 +147,3 @@ INSTALL()
 	prepareInstalledDevelLib libgnt
 	packageEntries devel $developDir
 }
-
-# ----- devel package ------------------------------------------------------
-
-PROVIDES_devel="
-	libpurple${secondaryArchSuffix}_devel = $portVersion
-	devel:libpurple$secondaryArchSuffix = $portVersion
-	devel:libgnt$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
-	libpurple$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- finch package ------------------------------------------------------
-
-PROVIDES_finch="
-	libpurple${secondaryArchPrefix}_finch = $portVersion
-	cmd:finch$secondaryArchSuffix
-	"
-REQUIRES_finch="
-	haiku${secondaryArchSuffix}
-	libpurple$secondaryArchSuffix == $portVersion base
-	lib:libffi$secondaryArchSuffix
-	lib:libglib_2.0$secondaryArchSuffix
-	lib:libgmodule_2.0$secondaryArchSuffix
-	lib:libgobject_2.0$secondaryArchSuffix
-	lib:libgthread_2.0$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libidn$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libncurses${secondaryArchSuffix}
-	lib:libxml2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
diff --git a/dev-libs/libtar/libtar-1.2.20.recipe b/dev-libs/libtar/libtar-1.2.20.recipe
index 37bf72617..8a5a7ad5f 100644
--- a/dev-libs/libtar/libtar-1.2.20.recipe
+++ b/dev-libs/libtar/libtar-1.2.20.recipe
@@ -1,22 +1,27 @@
-SUMMARY="A C library for manipulating tar files."
-DESCRIPTION="
-libtar is a library for manipulating tar files from within C programs.
-Here are some of its features:
+SUMMARY="A C library for manipulating tar files"
+DESCRIPTION="libtar is a library for manipulating tar files from within C \
+programs. Here are some of its features:
 
-  * Handles both POSIX tar file format and the GNU extensions.
-  * API provides functions for easy use, such as tar_extract_all().
-  * Also provides functions for more granular use, such as \
-tar_append_regfile().
-" 
-HOMEPAGE="http://repo.or.cz/w/libtar.git/" 
-SOURCE_URI="http://repo.or.cz/w/libtar.git/snapshot/0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz"
-SOURCE_FILENAME="$portVersionedName.tar.gz"
-CHECKSUM_SHA256="d1b2660d0af735fed2d2a0c3369dda7bea7445a4b1ef2f2742b352b1e1eec5f8"
+- Handles both POSIX tar file format and the GNU extensions.
+- API provides functions for easy use, such as tar_extract_all().
+- Also provides functions for more granular use, such as \
+tar_append_regfile()." 
+HOMEPAGE="http://repo.or.cz/w/libtar.git/"
+LICENSE="BSD (3-clause)"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="http://repo.or.cz/w/libtar.git/snapshot/0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz"
+SOURCE_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="d1b2660d0af735fed2d2a0c3369dda7bea7445a4b1ef2f2742b352b1e1eec5f8"
+COPYRIGHT="
+	1998-2003  University of Illinois Board of Trustees
+	1998-2003  Mark D. Roth
+	"
+SOURCE_DIR="$portName"
+
 PROVIDES="
 	libtar${secondaryArchSuffix} = $portVersion
 	cmd:libtar
@@ -25,6 +30,13 @@ PROVIDES="
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	"
+PROVIDES_devel="
+	libtar${secondaryArchSuffix}_devel = $portVersion
+	devel:libtar$secondaryArchSuffix = 0.0.0
+	"
+REQUIRES_devel="
+	libtar$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -40,8 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:autoheader
 	"
 
-SOURCE_DIR="$portName"
-
 BUILD()
 {
 	aclocal
@@ -64,18 +74,3 @@ INSTALL()
     packageEntries devel \
         $developDir
 }
-
-PROVIDES_devel="
-	libtar${secondaryArchSuffix}_devel = $portVersion
-	devel:libtar$secondaryArchSuffix = 0.0.0
-	"
-
-REQUIRES_devel="
-	libtar$secondaryArchSuffix == $portVersion base
-	"
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="
-	1998-2003  University of Illinois Board of Trustees
-	1998-2003  Mark D. Roth
-"
diff --git a/dev-libs/libtommath/libtommath-0.42.0.recipe b/dev-libs/libtommath/libtommath-0.42.0.recipe
index 9d50bf45b..61b2d3bb0 100644
--- a/dev-libs/libtommath/libtommath-0.42.0.recipe
+++ b/dev-libs/libtommath/libtommath-0.42.0.recipe
@@ -1,44 +1,41 @@
-SUMMARY="LibTomMath is a theoretic integer library written entirely in C."
+SUMMARY="A theoretic integer library written entirely in C"
 DESCRIPTION="LibTomMath is a free open source portable number theoretic \
 multiple-precision integer library written entirely in C."
 HOMEPAGE="http://libtommath.org"
-SOURCE_URI="https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz"
-CHECKSUM_SHA256="5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8"
-REVISION="1"
 LICENSE="Public Domain"
-COPYRIGHT="2010 Tom St. Denis"
-PATCHES="libtommath-0.42.0.patchset"
+REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 
+SOURCE_URI="https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz"
+CHECKSUM_SHA256="5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8"
+COPYRIGHT="2010 Tom St. Denis"
+PATCHES="libtommath-0.42.0.patchset"
+
 PROVIDES="
-        libtommath$secondaryArchSuffix = $portVersion
-        "
-
+	libtommath$secondaryArchSuffix = $portVersion
+	"
 PROVIDES_devel="
-              libtommath${secondaryArchSuffix}_devel = $portVersion
-              devel:libtommath$secondaryArchSuffix = $portVersion
-              "
-
+	libtommath${secondaryArchSuffix}_devel = $portVersion
+	devel:libtommath$secondaryArchSuffix = $portVersion
+	"
 REQUIRES="
-        haiku$secondaryArchSuffix
-        "
-        
+	haiku$secondaryArchSuffix
+	"  
 REQUIRES_devel="
-              haiku${secondaryArchSuffix}_devel
-              libtommath$secondaryArchSuffix == $portVersion base
-              "
-
+	haiku${secondaryArchSuffix}_devel
+	libtommath$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
-              haiku${secondaryArchSuffix}_devel
-              cmd:make
-              cmd:cc
-              cmd:ar
-              cmd:ranlib
-              cmd:install
-              "
-              
+	haiku${secondaryArchSuffix}_devel
+	cmd:make
+	cmd:cc
+	cmd:ar
+	cmd:ranlib
+	cmd:install
+	"
+
 BUILD()
 {
 	make $jobArgs
diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
index f23f92345..49c659c9e 100644
--- a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
+++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe
@@ -1,20 +1,18 @@
-SUMMARY="A set of C subroutines that is useful for indexing a set of key/value \
-pairs"
-DESCRIPTION="
-AVLDupTree is a set of C subroutines (not C++, so you can use it in drivers) \
-that is useful for indexing a set of key/value pairs, using the key to find \
-a matching value. The standard AVL balanced binary tree algorithm is \
-enhanced to support multiple values for the same key.  It is designed for \
-future use in a file system to support fast attribute indexing and queries, \
-but you can use it for other things. This package also includes the \
-AGMSAVLTest GUI App. It tests the operations on the tree, provided by \
-libavlduptree.
-"
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2001 Alexander G. M. Smith"
+SUMMARY="A set of C subroutines for indexing sets of key/value pairs"
+DESCRIPTION="AVLDupTree is a set of C subroutines (not C++, so you can use it \
+in drivers) that is useful for indexing a set of key/value pairs, using the \
+key to find a matching value.
+The standard AVL balanced binary tree algorithm is enhanced to support \
+multiple values for the same key.  It is designed for future use in a file \
+system to support fast attribute indexing and queries, but you can use it for \
+other things. This package also includes the AGMSAVLTest GUI App. It tests \
+the operations on the tree, provided by libavlduptree."
 HOMEPAGE="https://github.com/HaikuArchives/AVLDupTree"
 SOURCE_URI="git+https://github.com/HaikuArchives/AVLDupTree.git#5969ca7e26e65857a9ade8ed6abee2fda7f1e9d9"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2001 Alexander G. M. Smith"
 REVISION="1"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
@@ -22,19 +20,26 @@ PROVIDES="
 	libavlduptree$secondaryArchSuffix = $portVersion
 	lib:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	"
-
-BUILD_PREREQUIRES="
+PROVIDES_devel="
+	libavlduptree${secondaryArchSuffix}_devel = $portVersion
+	devel:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	libavlduptree${secondaryArchSuffix} == $portVersion base
+	"
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	cmd:mkdir
 	"
 
@@ -54,14 +59,3 @@ INSTALL()
 	# devel package
 	packageEntries devel $developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libavlduptree${secondaryArchSuffix}_devel = $portVersion
-	devel:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1
-	"
-
-REQUIRES_devel="
-	libavlduptree${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/haiku-libs/libmdi/libmdi-0.5.recipe b/haiku-libs/libmdi/libmdi-0.5.recipe
index bec0e4129..2929e0a26 100644
--- a/haiku-libs/libmdi/libmdi-0.5.recipe
+++ b/haiku-libs/libmdi/libmdi-0.5.recipe
@@ -1,35 +1,38 @@
-SUMMARY="Haiku framework to create Windows-style multidocument applications."
+SUMMARY="A framework to create Windows-style multidocument applications"
 DESCRIPTION="BeMDI is a framework to emulate windows inside of other windows \
 using a list of classes that emulate the windows' style. This makes it \
 possible to make programs that weren't possible before."
 HOMEPAGE="https://github.com/HaikuArchives/BeMDI"
-SOURCE_URI="https://github.com/HaikuArchives/BeMDI/archive/d55bec50ba7776d0d62bcfc863f46869fedb70cf.tar.gz"
-CHECKSUM_SHA256="0895dcc6dd191fc56dfed6ea93197a20e239782bda3278db21fc8022be20af2b"
-SOURCE_DIR="BeMDI-d55bec50ba7776d0d62bcfc863f46869fedb70cf"
-REVISION="1"
 LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2000 3rd-evolution"
+REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+SOURCE_URI="https://github.com/HaikuArchives/BeMDI/archive/d55bec50ba7776d0d62bcfc863f46869fedb70cf.tar.gz"
+CHECKSUM_SHA256="0895dcc6dd191fc56dfed6ea93197a20e239782bda3278db21fc8022be20af2b"
+SOURCE_DIR="BeMDI-d55bec50ba7776d0d62bcfc863f46869fedb70cf"
+COPYRIGHT="2000 3rd-evolution"
+
 PROVIDES="
 	bemdi$secondaryArchSuffix = $portVersion
 	lib:libmdi$secondaryArchSuffix = $portVersion
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
 PROVIDES_devel="
 	bemdi${secondaryArchSuffix}_devel = $portVersion
 	devel:libmdi$secondaryArchSuffix = $portVersion
 	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
 	bemdi$secondaryArchSuffix == $portVersion base
 	"
-
+PROVIDES_devel="
+	bemdi${secondaryArchSuffix}_devel = $portVersion
+	devel:libmdi$secondaryArchSuffix = $portVersion
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
diff --git a/media-libs/libaacs/libaacs-0.8.1.recipe b/media-libs/libaacs/libaacs-0.8.1.recipe
index a6acc9189..56662eab0 100644
--- a/media-libs/libaacs/libaacs-0.8.1.recipe
+++ b/media-libs/libaacs/libaacs-0.8.1.recipe
@@ -1,9 +1,10 @@
 SUMMARY="Open implementation of AACS"
-DESCRIPTION="
-libaacs is an open implementation of the Advanced Access Content System (AACS) \
-specification.
-"
+DESCRIPTION="libaacs is an open implementation of the Advanced Access Content \
+System (AACS) specification."
 HOMEPAGE="http://www.videolan.org/developers/libaacs.html"
+SOURCE_URI="http://downloads.videolan.org/pub/videolan/libaacs/$portVersion/libaacs-$portVersion.tar.bz2"
+CHECKSUM_SHA256="95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01bbe8"
+#PATCHES="libaacs-$portVersion.patchset"
 COPYRIGHT="
 	2009-2013  npzacs
 	2010  gates
@@ -14,8 +15,6 @@ COPYRIGHT="
 	2013  Petri Hintukainen
 	"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="http://downloads.videolan.org/pub/videolan/libaacs/$portVersion/libaacs-$portVersion.tar.bz2"
-CHECKSUM_SHA256="95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01bbe8"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -25,8 +24,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-#PATCHES="libaacs-$portVersion.patchset"
-
 PROVIDES="
 	libaacs$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:aacs_info${secondaryArchSuffix}
@@ -37,6 +34,13 @@ REQUIRES="
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libaacs${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libaacs$secondaryArchSuffix = 0.5.1 compat >= 0
+	"
+REQUIRES_devel="
+	libaacs$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
@@ -72,13 +76,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libaacs${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libaacs$secondaryArchSuffix = 0.5.1 compat >= 0
-	"
-REQUIRES_devel="
-	libaacs$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libbdplus/libbdplus-0.1.1.recipe b/media-libs/libbdplus/libbdplus-0.1.1.recipe
index abb9a4381..7ea1abada 100644
--- a/media-libs/libbdplus/libbdplus-0.1.1.recipe
+++ b/media-libs/libbdplus/libbdplus-0.1.1.recipe
@@ -1,17 +1,14 @@
-SUMMARY="Library to handle the BD+ protection scheme on bluray disks."
-DESCRIPTION="
-This library is written for the purpose of playing Blu-ray movies. It is
-intended for software that want to support Blu-ray playback (such as VLC and
-MPlayer).
-"
+SUMMARY="Library to handle the BD+ protection scheme on Blu-ray disks"
+DESCRIPTION="This library is written for the purpose of playing Blu-ray \
+movies. It is intended for software that want to support Blu-ray playback \
+(such as VLC and MPlayer)."
 HOMEPAGE="http://www.videolan.org/developers/libbdplus.html"
-COPYRIGHT="
-	 2011-2013 VideoLAN
-"
-LICENSE="GNU LGPL v2.1"
 SOURCE_URI="http://ftp.videolan.org/pub/videolan/libbdplus/$portVersion/libbdplus-$portVersion.tar.bz2"
 CHECKSUM_SHA256="deb5e64984e625e40e1e0e1b6b1f9c041e7c77101b4b39df0d76ab8a4ec426cf"
+COPYRIGHT="2011-2013 VideoLAN"
+LICENSE="GNU LGPL v2.1"
 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
@@ -29,6 +26,13 @@ REQUIRES="
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libbdplus${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libbdplus$secondaryArchSuffix = 0.0.1 compat >= 0
+	"
+REQUIRES_devel="
+	libbdplus$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
@@ -63,13 +67,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libbdplus${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libbdplus$secondaryArchSuffix = 0.0.1 compat >= 0
-	"
-REQUIRES_devel="
-	libbdplus$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 14bde0456..7a420a281 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -1,22 +1,33 @@
 SUMMARY="The MAD id3tag library"
-DESCRIPTION="The MAD id3tag library"
+DESCRIPTION="libid3tag is a library for reading and writing ID3 tags, both \
+ID3v1 and the various versions of ID3v2."
 HOMEPAGE="http://www.underbit.com/products/mad/"
-SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz"
-CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
+LICENSE="GNU GPL v2"
 REVISION="1"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz"
+CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
+COPYRIGHT="2000-2004 Underbit Technologies, Inc."
+PATCHES="libid3tag-$portVersion.patchset"
+
 PROVIDES="
 	libid3tag$secondaryArchSuffix = $portVersion
 	lib:libid3tag$secondaryArchSuffix = 0.3.0 compat = 0
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-
+PROVIDES_devel="
+	libid3tag${secondaryArchSuffix}_devel = $portVersion
+	devel:libid3tag$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	$portName == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
@@ -28,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	"
 
-PATCHES="libid3tag-$portVersion.patchset"
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -50,15 +60,3 @@ TEST()
 	make test
 	make check
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2004 Underbit Technologies, Inc."
-
-PROVIDES_devel="
-	libid3tag${secondaryArchSuffix}_devel = $portVersion
-	devel:libid3tag$secondaryArchSuffix
-"
-
-REQUIRES_devel="
-	$portName == $portVersion base
-"
diff --git a/media-libs/liblo/liblo-0.28.recipe b/media-libs/liblo/liblo-0.28.recipe
index 17c2729ee..d45a24135 100644
--- a/media-libs/liblo/liblo-0.28.recipe
+++ b/media-libs/liblo/liblo-0.28.recipe
@@ -1,23 +1,23 @@
 SUMMARY="Lightweight OSC (Open Sound Control) Implementation"
-DESCRIPTION="
-liblo is a lightweight library that provides an easy to use implementation of \
-the OSC protocol.
-"
+DESCRIPTION="liblo is a lightweight library that provides an easy to use \
+implementation of the OSC protocol."
 HOMEPAGE="http://plugin.org.uk/liblo"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+SOURCE_URI="http://prdownloads.sourceforge.net/liblo/liblo-$portVersion.tar.gz"
+CHECKSUM_SHA256="da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909"
 COPYRIGHT="
 	2008-2012 Stephen Sinclair 
 	2008 Kentaro Fukuchi
 	2005-2008 Nicholas Humfrey
 	2005 Martin Habets 
-	2005-2006 Steve Harris"
-LICENSE="GNU LGPL v2.1"
-SOURCE_URI="http://prdownloads.sourceforge.net/liblo/liblo-$portVersion.tar.gz"
-CHECKSUM_SHA256="da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PATCHES="liblo-$portVersion.patchset"
+	2005-2006 Steve Harris
+	"
+PATCHES="liblo-$portVersion.patchset"	
 
 PROVIDES="
 	liblo$secondaryArchSuffix = $portVersion compat >= 0
@@ -28,6 +28,13 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	liblo${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:liblo$secondaryArchSuffix = 7.2.0 compat >= 7
+	"
+REQUIRES_devel="
+	liblo$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -62,13 +69,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	liblo${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:liblo$secondaryArchSuffix = 7.2.0 compat >= 7
-	"
-REQUIRES_devel="
-	liblo$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmatroska/libmatroska-1.4.2.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe
index 2295e95ff..a616a66a9 100644
--- a/media-libs/libmatroska/libmatroska-1.4.2.recipe
+++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe
@@ -1,15 +1,16 @@
-SUMMARY="libmatroska is a C++ libary to parse Matroska files."
+SUMMARY="A C++ libary to parse Matroska files"
 DESCRIPTION="libmatroska is a C++ libary to parse Matroska files."
 HOMEPAGE="http://www.matroska.org/"
-SOURCE_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2"
-CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f"
-REVISION="1"
 LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2005-2013 CoreCodec, Inc."
+REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2"
+CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f"
+COPYRIGHT="2005-2013 CoreCodec, Inc."
+
 PROVIDES="
 	libmatroska$secondaryArchSuffix = $portVersion
 	lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6
@@ -28,6 +29,14 @@ else
 		lib:libgcc_s${secondaryArchSuffix}
 	"
 fi
+
+PROVIDES_devel="
+	libmatroska${secondaryArchSuffix}_devel = $portVersion
+	devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6
+	"
+REQUIRES_devel="
+	libmatroska$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	devel:libebml$secondaryArchSuffix
 	"
@@ -60,11 +69,3 @@ INSTALL()
 	
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	libmatroska${secondaryArchSuffix}_devel = $portVersion
-	devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6
-	"
-REQUIRES_devel="
-	libmatroska$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.2.recipe
index 42f9ad794..bb32d09da 100644
--- a/media-libs/libmetalink/libmetalink-0.1.2.recipe
+++ b/media-libs/libmetalink/libmetalink-0.1.2.recipe
@@ -1,20 +1,17 @@
-SUMMARY="A library to read Metalink files."
-DESCRIPTION="
-Libmetalink is a library to read Metalink XML download description \
-format. It supports Metalink version 3 and Metalink version 4 (RFC \
-5854).
-"
+SUMMARY="A library to read Metalink files"
+DESCRIPTION="Libmetalink is a library to read Metalink XML download \
+description format. It supports Metalink version 3 and Metalink version 4 \
+(RFC 5854)."
 HOMEPAGE="http://launchpad.net/libmetalink"
-COPYRIGHT="
-	2008 Tatsuhiro Tsujikawa
-	"
 LICENSE="MIT"
-SOURCE_URI="https://launchpad.net/libmetalink/trunk/packagingfix/+download/libmetalink-$portVersion.tar.bz2"
-CHECKSUM_SHA256="cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6"
 REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="https://launchpad.net/libmetalink/trunk/packagingfix/+download/libmetalink-$portVersion.tar.bz2"
+CHECKSUM_SHA256="cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6"
+COPYRIGHT="2008 Tatsuhiro Tsujikawa"
 PATCHES="libmetalink-$portVersion.patchset"
 
 PROVIDES="
@@ -25,6 +22,13 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libmetalink${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3
+	"
+REQUIRES_devel="
+	libmetalink$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
@@ -65,13 +69,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmetalink${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3
-	"
-REQUIRES_devel="
-	libmetalink$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe
index 39bfb7a5a..c70d619fa 100644
--- a/media-libs/libmng/libmng-1.0.10.recipe
+++ b/media-libs/libmng/libmng-1.0.10.recipe
@@ -1,19 +1,18 @@
-SUMMARY="A PNG-like Image Format Supporting Multiple Image, Animation and Transparent JPEG"
-DESCRIPTION="
-A PNG-like Image Format Supporting Multiple Image, Animation and Transparent \
-JPEG.
-"
-HOMEPAGE="http://www.libmng.com" 
-COPYRIGHT="2000-2007 Gerard Juyn"
+SUMMARY="Reads and writes MNG images"
+DESCRIPTION="LibMNG reads and writes MNG format image files, a PNG-like image \
+format supporting multiple image, animation and transparent JPEG."
+HOMEPAGE="http://www.libmng.com"
 LICENSE="LIBMNG"
-SOURCE_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download"
-CHECKSUM_SHA256="03a79dac9b9316d37227057614a248a946f997c4d1a3437fb569e9a63897f911"
-SOURCE_FILENAME="libmng-1.0.10.tar.gz"
 REVISION="1"
 
 ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
+SOURCE_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download"
+CHECKSUM_SHA256="03a79dac9b9316d37227057614a248a946f997c4d1a3437fb569e9a63897f911"
+COPYRIGHT="2000-2007 Gerard Juyn"
+SOURCE_FILENAME="libmng-1.0.10.tar.gz"
+
 PROVIDES="
 	libpng$secondaryArchSuffix = $portVersion compat >= 1.0
 	lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 1.0
@@ -23,6 +22,16 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libmng${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
+	cmd:libmng_config$secondaryArchSuffix = $portVersion compat >= 1.0
+#	cmd:libmng1_config$secondaryArchSuffix = $portVersion compat >= 1.0
+#	devel:libmng$secondaryArchSuffix = 10.0 compat >= 15
+#	devel:libmng15$secondaryArchSuffix = 10.0 compat >= 15
+	"
+REQUIRES_devel="
+	libmng$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	libpng >= 1.5
@@ -77,16 +86,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmng${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
-	cmd:libmng_config$secondaryArchSuffix = $portVersion compat >= 1.0
-#	cmd:libmng1_config$secondaryArchSuffix = $portVersion compat >= 1.0
-#	devel:libmng$secondaryArchSuffix = 10.0 compat >= 15
-#	devel:libmng15$secondaryArchSuffix = 10.0 compat >= 15
-	"
-REQUIRES_devel="
-	libmng$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmng/libmng-2.0.3.recipe b/media-libs/libmng/libmng-2.0.3.recipe
index 283a11d69..da4aed4e2 100644
--- a/media-libs/libmng/libmng-2.0.3.recipe
+++ b/media-libs/libmng/libmng-2.0.3.recipe
@@ -1,18 +1,17 @@
-SUMMARY="Reads and writes MNG images."
-DESCRIPTION="
-LibMNG reads and writes MNG format image files, a PNG-like image format \
-supporting multiple image, animation and transparent JPEG.
-"
-HOMEPAGE="http://www.libmng.com" 
-COPYRIGHT="2000-2007 Gerard Juyn"
+SUMMARY="Reads and writes MNG images"
+DESCRIPTION="LibMNG reads and writes MNG format image files, a PNG-like image \
+format supporting multiple image, animation and transparent JPEG."
+HOMEPAGE="http://www.libmng.com"
 LICENSE="LIBMNG"
-SOURCE_URI="http://sourceforge.net/projects/libmng/files/libmng-devel/$portVersion/libmng-$portVersion.tar.xz"
-CHECKSUM_SHA256="4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="http://sourceforge.net/projects/libmng/files/libmng-devel/$portVersion/libmng-$portVersion.tar.xz"
+CHECKSUM_SHA256="4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3"
+COPYRIGHT="2000-2007 Gerard Juyn"
+
 PROVIDES="
 	libmng$secondaryArchSuffix = $portVersion compat >= 2.0
 	lib:libmng$secondaryArchSuffix = 2.0.2 compat >= 2
@@ -22,6 +21,13 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libmng${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
+	devel:libmng$secondaryArchSuffix = 2.0.2 compat >= 2
+	"
+REQUIRES_devel="
+	libmng$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
@@ -64,13 +70,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmng${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
-	devel:libmng$secondaryArchSuffix = 2.0.2 compat >= 2
-	"
-REQUIRES_devel="
-	libmng$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
index 5ccc8ddc5..33a0fbcd2 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
@@ -1,13 +1,14 @@
-SUMMARY="A library that provides functions to read, create, and modify mp4 files"
-DESCRIPTION="
-A library that provides functions to read, create, and modify mp4 files.
-"
+SUMMARY="A library to read, create, and modify MP4 files"
+DESCRIPTION="The MP4v2 library provides an API to create and modify mp4 files \
+as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
+This file format is derived from Apple's QuickTime file format that has been \
+used as a multimedia file format in a variety of platforms and applications. \
+It is a very powerful and extensible format that can accommodate practically \
+any type of media."
 HOMEPAGE="https://code.google.com/p/mp4v2/"
 LICENSE="MPL v1.1"
-COPYRIGHT="2008 Kona Blend"
-SOURCE_URI="https://mp4v2.googlecode.com/files/mp4v2-$portVersion.tar.bz2"
-CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338"
 REVISION="2"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
     # x86_gcc2 is fine as primary target architecture as long as we're building
@@ -16,6 +17,10 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
+SOURCE_URI="https://mp4v2.googlecode.com/files/mp4v2-$portVersion.tar.bz2"
+CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338"
+COPYRIGHT="2008 Kona Blend"
+SOURCE_DIR="mp4v2-$portVersion"
 PATCHES="libmp4v2-$portVersion.patchset"
 
 PROVIDES="
@@ -31,15 +36,19 @@ PROVIDES="
 	cmd:mp4track$secondaryArchSuffix
 	cmd:mp4trackdump$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
-
+PROVIDES_devel="
+	libmp4v2${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
+	"
+REQUIRES_devel="
+	libmp4v2$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
@@ -50,8 +59,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-SOURCE_DIR="mp4v2-$portVersion"
-
 BUILD()
 {
 	autoreconf -fi
@@ -70,13 +77,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmp4v2${secondaryArchSuffix}_devel = $portVersion compat >= 2
-	devel:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
-	"
-REQUIRES_devel="
-	libmp4v2$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe
index 19b8bac85..3a306a504 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4.recipe
+++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe
@@ -1,7 +1,6 @@
-SUMMARY="A library to handle Quicktime format files."
-DESCRIPTION="
-libquicktime is a library for reading and writing quicktime files. It \
-is based on the quicktime4linux library, with the following \
+SUMMARY="A library to handle Quicktime format files"
+DESCRIPTION="libquicktime is a library for reading and writing quicktime \
+files. It is based on the quicktime4linux library, with the following \
 extensions:
 
     * Sourcetree upgraded with autoconf/automake/libtool and all the \
@@ -25,17 +24,18 @@ Applications can get important information about the codecs, their \
 settable parameters etc. at runtime.
 "
 HOMEPAGE="http://libquicktime.sourceforge.net"
-COPYRIGHT="
-	2002 Heroine Virtual Ltd.
-	2002-2007 Members of the libquicktime project.
-"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz"
-CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368"
 REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz"
+CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368"
+COPYRIGHT="
+	2002 Heroine Virtual Ltd.
+	2002-2007 Members of the libquicktime project.
+	"
 PATCHES="libquicktime-$portVersion.patchset"
 
 PROVIDES="
@@ -81,6 +81,13 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libquicktime${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
+	devel:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libquicktime$secondaryArchSuffix == $portVersion base
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
@@ -115,13 +122,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libquicktime${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
-	devel:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libquicktime$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index ed34f7d97..46d0de217 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -1,26 +1,25 @@
-SUMMARY="Simple Direct Media Layer is a cross-platform media development library"
-DESCRIPTION="
-Simple Direct Media Layer is a cross-platform development library designed to \
-provide low level access to audio, keyboard, mouse, joystick, and graphics via \
-OpenGL.
-"
-HOMEPAGE="http://www.libsdl.org/" 
-SOURCE_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
-CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
-REVISION="8"
+SUMMARY="A cross-platform media development library"
+DESCRIPTION="Simple Direct Media Layer (SDL) is a cross-platform development library \
+designed to provide low level access to audio, keyboard, mouse, joystick, and \
+graphics via OpenGL."
+HOMEPAGE="http://www.libsdl.org/"
 LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1997-2012 Sam Lantinga"
+REVISION="8"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+SOURCE_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
+CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
+COPYRIGHT="1997-2012 Sam Lantinga"
+SOURCE_DIR="SDL-$portVersion"
 PATCHES="libsdl-1.2.15.patchset"
+
 PROVIDES="
 	libsdl$secondaryArchSuffix = $portVersion
 	lib:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
 	lib:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
@@ -32,11 +31,21 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	"
 fi
 
+PROVIDES_devel="
+	libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2
+	cmd:sdl_config$secondaryArchSuffix = $portVersion compat >= 1.2
+	devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
+	devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
+	devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0
+	"
+REQUIRES_devel="
+	libsdl${secondaryArchSuffix} == $portVersion base
+	devel:libGL$secondaryArchSuffix
+	"
 BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
@@ -48,9 +57,6 @@ BUILD_PREREQUIRES="
 	cmd:nasm
 	"
 
-SOURCE_DIR="SDL-$portVersion"
-
-PATCHES="libsdl-1.2.15.patchset"
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -148,18 +154,3 @@ TEST()
 	echo testlock
 	testlock
 }
-
-# ----- devel package ------------------------
-
-PROVIDES_devel="
-	libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2
-	cmd:sdl_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
-	devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
-	devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0
-	"
-
-REQUIRES_devel="
-	libsdl${secondaryArchSuffix} == $portVersion base
-	devel:libGL$secondaryArchSuffix
-	"
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe b/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
index 414630862..bad05aa79 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
+++ b/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
@@ -1,17 +1,19 @@
-SUMMARY="A library to adjust the sound tempo, pitch and playback rate."
-DESCRIPTION="
-SoundTouch is an open-source audio processing library that allows \
-changing the sound tempo, pitch and playback rate parameters \
-independently from each other, i.e.
-"
+SUMMARY="A library to adjust the sound tempo, pitch and playback rate"
+DESCRIPTION="SoundTouch is an open-source audio processing library for \
+changing the tempo, pitch and playback rates of audio streams or audio files. \
+The library additionally supports estimating stable beats-per-minute rates for \
+audio tracks.
+
+- Tempo (time stretch): Changes the sound to play at faster or slower tempo \
+than originally without affecting the sound pitch.
+- Pitch (key) : Changes the sound pitch or key while keeping the original \
+tempo (speed).
+Playback Rate : Changes both tempo and pitch together as if a vinyl disc was \
+played at different RPM rate."
 HOMEPAGE="http://www.surina.net/soundtouch"
-COPYRIGHT="
-	2001-2014 Olli Parviainen
-	"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="http://www.surina.net/soundtouch/soundtouch-$portVersion.tar.gz"
-CHECKSUM_SHA256="3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"
 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
@@ -20,6 +22,10 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
+SOURCE_URI="http://www.surina.net/soundtouch/soundtouch-$portVersion.tar.gz"
+CHECKSUM_SHA256="3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"
+COPYRIGHT="2001-2014 Olli Parviainen"
+SOURCE_DIR="soundtouch"
 PATCHES="libsoundtouch-$portVersion.patchset"
 
 PROVIDES="
@@ -30,6 +36,13 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libsoundtouch${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libSoundTouch$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libsoundtouch$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -42,8 +55,6 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-	
-SOURCE_DIR="soundtouch"
 
 BUILD()
 {
@@ -66,13 +77,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsoundtouch${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libSoundTouch$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libsoundtouch$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-dns/libidn/libidn-1.30.recipe b/net-dns/libidn/libidn-1.30.recipe
index f78604d75..f7db27096 100644
--- a/net-dns/libidn/libidn-1.30.recipe
+++ b/net-dns/libidn/libidn-1.30.recipe
@@ -1,16 +1,14 @@
-SUMMARY="Internationalized Domain Names (IDN) implementation."
-DESCRIPTION="
-Libidn is a package for internationalized string handling based on the \
-Stringprep, Punycode, IDNA and TLD specifications.
-"
+SUMMARY="Internationalized Domain Names (IDN) implementation"
+DESCRIPTION="Libidn is a package for internationalized string handling based \
+on the Stringprep, Punycode, IDNA and TLD specifications."
 HOMEPAGE="http://www.gnu.org/software/libidn"
-COPYRIGHT="
-	2002-2014 Simon Josefsson
-	"
 LICENSE="GNU LGPL v2.1"
+REVISION="1"
+
 SOURCE_URI="http://ftp.gnu.org/gnu/libidn/libidn-$portVersion.tar.gz"
 CHECKSUM_SHA256="39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053"
-REVISION="1"
+COPYRIGHT="2002-2014 Simon Josefsson"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -24,6 +22,13 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libidn${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libidn$secondaryArchSuffix = 11.6.13 compat >= 11
+	"
+REQUIRES_devel="
+	libidn$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
@@ -59,13 +64,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libidn${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libidn$secondaryArchSuffix = 11.6.13 compat >= 11
-	"
-REQUIRES_devel="
-	libidn$secondaryArchSuffix == $portVersion base
-	"
diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe
index e1cba0387..397f4a280 100644
--- a/net-ftp/lftp/lftp-4.4.16.recipe
+++ b/net-ftp/lftp/lftp-4.4.16.recipe
@@ -1,24 +1,25 @@
-SUMMARY="A sophisticated file transfer program with command line interface."
+SUMMARY="A sophisticated file transfer program with command line interface"
+DESCRIPTION="lftp is sophisticated file transfer program with command line \
+interface. It supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. \
+GNU Readline library is used for input. BitTorrent protocol is supported as \
+built-in torrent command.
+Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \
+fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \
+socks, http/1.1, sftp v3-v6."
 HOMEPAGE="http://lftp.yar.ru"
-COPYRIGHT="1996-2012 by Alexander V. Lukyanov"
-LICENSE="GNU GPL v3"
 SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz"
 CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf2"
+PATCHES="lftp-$portVersion.patchset"
+COPYRIGHT="1996-2012 Alexander V. Lukyanov"
+LICENSE="GNU GPL v3"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
 
-PATCHES="lftp-$portVersion.patchset"
-
-GLOBAL_WRITABLE_FILES="
-	settings/lftp.conf keep-old
-"
-
 PROVIDES="
 	lftp = $portVersion
 	lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
-	
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES
 		cmd:lftp = $portVersion compat >= 4
@@ -33,6 +34,14 @@ REQUIRES="
 	lib:libcrypto$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	lftp${secondaryArchSuffix}_devel = $portVersion
+	devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	lftp$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libreadline$secondaryArchSuffix
@@ -52,6 +61,10 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
+GLOBAL_WRITABLE_FILES="
+	settings/lftp.conf keep-old
+	"
+
 PATCH()
 {
 	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g'
@@ -91,24 +104,3 @@ TEST()
 {
 	make check
 }
-
-DESCRIPTION="
-lftp is sophisticated file transfer program with command line interface. It \
-supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. GNU Readline \
-library is used for input. BitTorrent protocol is supported as built-in \
-torrent command.
-Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \
-fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \
-socks, http/1.1, sftp v3-v6.
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	lftp${secondaryArchSuffix}_devel = $portVersion
-	devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
-	devel:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	lftp$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
index 925f50438..2bfdd57bd 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
@@ -1,15 +1,10 @@
-SUMMARY="Proj.4 cartographic projection software."
-DESCRIPTION="
-Proj.4 is a library for performing conversions between cartographic projections.
-"
+SUMMARY="Proj.4 cartographic projection software"
+DESCRIPTION="Proj.4 is a library for performing conversions between \
+cartographic projections."
 HOMEPAGE="http://trac.osgeo.org/geotiff/"
-COPYRIGHT="
-	2000, Frank Warmerdam
-	"
 LICENSE="GNU GPL v2"
-SOURCE_URI="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz"
-CHECKSUM_SHA256="d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329"
 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
@@ -23,7 +18,11 @@ if [ $targetArchitecture != x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+SOURCE_URI="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz"
+CHECKSUM_SHA256="d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329"
+COPYRIGHT="2000 Frank Warmerdam"
 PATCHES="libgeotiff-$portVersion.patchset"
+
 PROVIDES="
 	libgeotiff$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libgeotiff$secondaryArchSuffix = 2.1.0 compat >= 2.1
@@ -39,6 +38,13 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libproj$secondaryArchSuffix
 	"
+PROVIDES_devel="
+	libgeotiff${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libgeotiff$secondaryArchSuffix = 2.1.0 compat >= 2.1
+	"
+REQUIRES_devel="
+	libgeotiff$secondaryArchSuffix == $portVersion base
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
@@ -80,13 +86,3 @@ INSTALL()
 		$developDir \
 		$manDir/man1
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libgeotiff${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libgeotiff$secondaryArchSuffix = 2.1.0 compat >= 2.1
-	"
-REQUIRES_devel="
-	libgeotiff$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sys-apps/less/less-451.recipe b/sys-apps/less/less-451.recipe
index 91652b810..bf044ef7c 100644
--- a/sys-apps/less/less-451.recipe
+++ b/sys-apps/less/less-451.recipe
@@ -1,14 +1,14 @@
-SUMMARY="Less is a free, open-source file pager."
+SUMMARY="A free, open-source file pager"
 DESCRIPTION="GNU less is a program similar to more, but which allows \
 backward movement in the file as well as forward movement. Also, less \
 does not have to read the entire input file before starting, so with \
 large input files it starts up faster than text editors like vi. Less uses \
 termcap (or terminfo on some systems), so it can run on a variety of \
-terminals. There is even limited support for hardcopy terminals.
-"
+terminals. There is even limited support for hardcopy terminals."
 HOMEPAGE="http://www.gnu.org/software/less/" 
 SOURCE_URI="http://ftp.gnu.org/gnu/less/less-$portVersion.tar.gz"
 CHECKSUM_SHA256="9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57"
+PATCHES="less-451.patch"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1984-2012 Mark Nudelman"
 REVISION="4"
@@ -20,17 +20,14 @@ PROVIDES="
 	cmd:lessecho
 	cmd:lesskey
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
@@ -39,12 +36,10 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	"
 
-PATCHES="less-451.patch"
-
 GLOBAL_WRITABLE_FILES="
 	settings/etc/sysless.src keep-old
 	settings/etc/sysless keep-old
-"
+	"
 
 BUILD()
 {
diff --git a/sys-apps/less/less-458.recipe b/sys-apps/less/less-458.recipe
index 203465dd0..f6fc9924f 100644
--- a/sys-apps/less/less-458.recipe
+++ b/sys-apps/less/less-458.recipe
@@ -1,38 +1,33 @@
-SUMMARY="Less is a free, open-source file pager."
+SUMMARY="A free, open-source file pager"
 DESCRIPTION="GNU less is a program similar to more, but which allows \
 backward movement in the file as well as forward movement. Also, less \
 does not have to read the entire input file before starting, so with \
 large input files it starts up faster than text editors like vi. Less uses \
 termcap (or terminfo on some systems), so it can run on a variety of \
-terminals. There is even limited support for hardcopy terminals.
-"
+terminals. There is even limited support for hardcopy terminals."
 HOMEPAGE="http://www.greenwoodsoftware.com/less/" 
 SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz"
 CHECKSUM_SHA256="e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac"
+PATCHES="less-$portVersion.patchset"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1984-2014 Mark Nudelman"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PATCHES="less-$portVersion.patchset"
-
 PROVIDES="
 	less = $portVersion
 	cmd:less
 	cmd:lessecho
 	cmd:lesskey
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
@@ -44,7 +39,7 @@ BUILD_PREREQUIRES="
 GLOBAL_WRITABLE_FILES="
 	settings/etc/sysless.src keep-old
 	settings/etc/sysless keep-old
-"
+	"
 
 BUILD()
 {
diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe
index 93db367ce..775033e00 100644
--- a/sys-apps/less/less-466.recipe
+++ b/sys-apps/less/less-466.recipe
@@ -4,18 +4,16 @@ backward movement in the file as well as forward movement. Also, less \
 does not have to read the entire input file before starting, so with \
 large input files it starts up faster than text editors like vi. Less uses \
 termcap (or terminfo on some systems), so it can run on a variety of \
-terminals. There is even limited support for hardcopy terminals.
-"
+terminals. There is even limited support for hardcopy terminals."
 HOMEPAGE="http://www.greenwoodsoftware.com/less/" 
 SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz"
 CHECKSUM_SHA256="8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212"
+PATCHES="less-$portVersion.patchset"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1984-2014 Mark Nudelman"
 REVISION="1"
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 
-PATCHES="less-$portVersion.patchset"
-
 PROVIDES="
 	less = $portVersion
 	cmd:less