diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.recipe b/media-libs/libdvdnav/libdvdnav-5.0.3.recipe
index de0c2f7f6..3a4d4b9b3 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.recipe
+++ b/media-libs/libdvdnav/libdvdnav-5.0.3.recipe
@@ -1,39 +1,43 @@
 SUMMARY="Easy use of sophisticated DVD navigation features"
-DESCRIPTION="
-libdvdnav allows easy use of sophisticated DVD navigation features such as \
-DVD menus, multiangle playback and even interactive DVD games.
-"
+DESCRIPTION="libdvdnav allows easy use of sophisticated DVD navigation \
+features such as DVD menus, multiangle playback and even interactive DVD \
+games."
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
+LICENSE="GNU GPL v2"
+REVISION="3"
 SOURCE_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/$portVersion/libdvdnav-$portVersion.tar.bz2"
 CHECKSUM_SHA256="5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"
-REVISION="3"
+PATCHES="libdvdnav-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libdvdnav-$portVersion.patchset"
-
 PROVIDES="
 	libdvdnav$secondaryArchSuffix = $portVersion
 	lib:libdvdnav$secondaryArchSuffix = 4.2.0 compat >= 4
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	libdvdread$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	libdvdnav${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdnav$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+REQUIRES_devel="
+	libdvdnav$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	libdvdread${secondaryArchSuffix}_devel
 	# required by libdvdread
 	libdvdcss${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -66,13 +70,3 @@ INSTALL()
 		$docDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdnav${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdnav$secondaryArchSuffix = 4.2.0 compat >= 4
-	"
-REQUIRES_devel="
-	libdvdnav$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libdvdread/libdvdread-5.0.3.recipe b/media-libs/libdvdread/libdvdread-5.0.3.recipe
index 0fa3863af..f9a31f79c 100644
--- a/media-libs/libdvdread/libdvdread-5.0.3.recipe
+++ b/media-libs/libdvdread/libdvdread-5.0.3.recipe
@@ -1,39 +1,42 @@
 SUMMARY="A simple foundation for reading DVD video disks"
-DESCRIPTION="
-libdvdread provides a simple foundation for reading DVD video disks. It \
-provides the functionality that is required to access many DVDs. libdvdread \
-parses IFO files, reads NAV-blocks, and performs CSS authentication and \
-descrambling (if an external libdvdcss library is installed).
-"
+DESCRIPTION="libdvdread provides the functionality that is required to \
+access many DVDs. It parses IFO files, reads NAV-blocks, and performs CSS \
+authentication and descrambling (if an external libdvdcss library is \
+installed)."
 HOMEPAGE="http://dvdnav.mplayerhq.hu"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1998-1999 Eric Smith
 	2000-2002 Björn Englund
 	2000-2003 Håkan Hjort, et al."
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://downloads.videolan.org/pub/videolan/libdvdread/$portVersion/libdvdread-$portVersion.tar.bz2"
 CHECKSUM_SHA256="321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b"
-REVISION="2"
+PATCHES="libdvdread-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libdvdread-$portVersion.patchset"
-
 PROVIDES="
 	libdvdread$secondaryArchSuffix = $portVersion
 	lib:libdvdread$secondaryArchSuffix = 4.2.0 compat >= 4
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
-	devel:libdvdcss$secondaryArchSuffix
+PROVIDES_devel="
+	libdvdread${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdread$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+REQUIRES_devel="
+	libdvdread$secondaryArchSuffix == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libdvdcss$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -67,13 +70,3 @@ INSTALL()
 		$docDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdread${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdread$secondaryArchSuffix = 4.2.0 compat >= 4
-	"
-REQUIRES_devel="
-	libdvdread$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libicns/libicns-0.8.1.recipe b/media-libs/libicns/libicns-0.8.1.recipe
index a839febd0..caedad996 100644
--- a/media-libs/libicns/libicns-0.8.1.recipe
+++ b/media-libs/libicns/libicns-0.8.1.recipe
@@ -1,23 +1,19 @@
-SUMMARY="A library for the translation of the icns format"
-DESCRIPTION="
-libicns is a library for manipulation of the Mac OS icns resource format, also \
-known as the IconFamily resource type. It can read and write files from the \
-Mac OS X icns format, as well as read from Mac OS resource files and macbinary \
-encoded Mac OS resource forks.
-"
+SUMMARY="A library for the Mac OS 'icns' format"
+DESCRIPTION="libicns is a library for manipulation of the Mac OS 'icns' \
+resource format, also known as the IconFamily resource type. It can read \
+and write files from the Mac OS X icns format, as well as read from Mac OS \
+resource files and macbinary encoded Mac OS resource forks."
 HOMEPAGE="http://sourceforge.net/projects/icns"
-COPYRIGHT="
-	2001-2012 Matthew Eis
-"
+COPYRIGHT="2001-2012 Matthew Eis"
 LICENSE="GNU LGPL v2.1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/icns/files/libicns-$portVersion.tar.gz"
 CHECKSUM_SHA256="335f10782fc79855cf02beac4926c4bf9f800a742445afbbf7729dab384555c2"
-REVISION="2"
+PATCHES="libicns-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libicns-$portVersion.patchset"
-
 PROVIDES="
 	libicns$secondaryArchSuffix = $portVersion compat >= 0.8
 	lib:libicns$secondaryArchSuffix = 1.2.0 compat >= 1
@@ -35,6 +31,15 @@ REQUIRES="
 	lib:libpng15$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libicns${secondaryArchSuffix}_devel = $portVersion compat >= 0.8
+	devel:libicns$secondaryArchSuffix = 1.2.0 compat >= 1
+	"
+REQUIRES_devel="
+	libicns$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libjasper$secondaryArchSuffix
@@ -74,13 +79,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libicns${secondaryArchSuffix}_devel = $portVersion compat >= 0.8
-	devel:libicns$secondaryArchSuffix = 1.2.0 compat >= 1
-	"
-REQUIRES_devel="
-	libicns$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 7a420a281..5803ecb4a 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -2,17 +2,16 @@ SUMMARY="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/"
+COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz"
+CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
+PATCHES="libid3tag-$portVersion.patchset"
 
 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
@@ -21,6 +20,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	libid3tag${secondaryArchSuffix}_devel = $portVersion
 	devel:libid3tag$secondaryArchSuffix
@@ -28,6 +28,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	$portName == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
index 0781791d2..bd14ff745 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
@@ -1,20 +1,19 @@
 SUMMARY="Library for IPTC metadata manipulation"
-DESCRIPTION="
-libiptcdata is a library, written in C, for manipulating the International \
-Press Telecommunications Council (IPTC) metadata stored within multimedia \
-files such as images. This metadata can include captions and keywords, often \
-used by popular photo management applications. The library provides routines \
-for parsing, viewing, modifying, and saving this metadata.
-"
+DESCRIPTION="libiptcdata is a library, written in C, for manipulating the \
+International Press Telecommunications Council (IPTC) metadata stored within \
+multimedia files such as images. This metadata can include captions and \
+keywords, often used by popular photo management applications.
+The library provides routines for parsing, viewing, modifying, and saving \
+this metadata."
 HOMEPAGE="http://libiptcdata.sourceforge.net/"
-COPYRIGHT="
-	2005 David Moore
-	"
+COPYRIGHT="2005 David Moore"
 LICENSE="GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz?download"
 CHECKSUM_SHA256="79f63b8ce71ee45cefd34efbb66e39a22101443f4060809b8fc29c5eebdcee0e"
 SOURCE_FILENAME="libiptcdata-1.0.4.tar.gz"
-REVISION="1"
+PATCHES="libiptcdata-1.0.4.patch"
+
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
@@ -27,6 +26,15 @@ REQUIRES="
 	lib:libiconv
 	lib:libintl
 	"
+
+PROVIDES_devel="
+	libiptcdata_devel = $portVersion
+	devel:libiptcdata = 0.3.3
+	"
+REQUIRES_devel="
+	libiptcdata == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libiconv
@@ -39,7 +47,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	"
-PATCHES="libiptcdata-1.0.4.patch"
 
 BUILD()
 {
@@ -62,13 +69,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libiptcdata_devel = $portVersion
-	devel:libiptcdata = 0.3.3
-	"
-REQUIRES_devel="
-	libiptcdata == $portVersion base
-	"
diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe
index 8279c0e28..3e7a96996 100644
--- a/media-libs/libmad/libmad-0.15.1b.recipe
+++ b/media-libs/libmad/libmad-0.15.1b.recipe
@@ -1,16 +1,14 @@
-SUMMARY="Mpeg Audio Decoder library"
-DESCRIPTION="
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the \
-MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG \
-2.5 format. All three audio layers -- Layer I, Layer II, and Layer III (i.e. \
-MP3) -- are fully implemented.
-"
+SUMMARY="MPEG Audio Decoder library"
+DESCRIPTION="MAD is a high-quality MPEG audio decoder. It currently supports \
+MPEG-1 and the MPEG-2 extension to lower sampling frequencies, as well as the \
+de facto MPEG 2.5 format. All three audio layers -- Layer I, Layer II, and \
+Layer III (i.e. MP3) -- are fully implemented."
 HOMEPAGE="http://mad.sourceforge.net/"
+COPYRIGHT="2000-2004 Underbit Technologies, Inc."
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz"
 CHECKSUM_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2004 Underbit Technologies, Inc."
-REVISION="2"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -19,16 +17,22 @@ PROVIDES="
 	libmad$secondaryArchSuffix = $portVersion
 	lib:libmad$secondaryArchSuffix = 0.2.1 compat >= 0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libmad${secondaryArchSuffix}_devel = $portVersion
+	devel:libmad$secondaryArchSuffix = 0.2.1 compat >= 0
+	"
+REQUIRES_devel="
+	libmad$secondaryArchSuffix == $portVersion
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -60,13 +64,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir
 }
-
-# ----- devel package ------------------------------------
-
-PROVIDES_devel="
-		libmad${secondaryArchSuffix}_devel = $portVersion
-		devel:libmad$secondaryArchSuffix = 0.2.1 compat >= 0
-		"
-REQUIRES_devel="
-		libmad$secondaryArchSuffix == $portVersion
-		"
diff --git a/media-libs/libmatroska/libmatroska-1.4.2.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe
index 84c3c52ad..2ae121473 100644
--- a/media-libs/libmatroska/libmatroska-1.4.2.recipe
+++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe
@@ -1,16 +1,20 @@
-SUMMARY="A C++ libary to parse Matroska files"
+SUMMARY="A libary to parse Matroska files"
 DESCRIPTION="libmatroska is a C++ libary to parse Matroska files."
 HOMEPAGE="http://www.matroska.org/"
+COPYRIGHT="2005-2013 CoreCodec, Inc."
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
+SOURCE_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2"
+CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f"
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+	PATCHES="
+		libmatroska-$portVersion.patchset
+		"
+fi
 
 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
@@ -19,11 +23,6 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libebml$secondaryArchSuffix
 	"
-if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-	PATCHES="
-		libmatroska-$portVersion.patchset
-	"
-fi
 
 PROVIDES_devel="
 	libmatroska${secondaryArchSuffix}_devel = $portVersion
@@ -32,11 +31,12 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libmatroska$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libebml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libmikmod/libmikmod-3.3.7.recipe b/media-libs/libmikmod/libmikmod-3.3.7.recipe
index e9df14819..f3a81cc41 100644
--- a/media-libs/libmikmod/libmikmod-3.3.7.recipe
+++ b/media-libs/libmikmod/libmikmod-3.3.7.recipe
@@ -1,6 +1,5 @@
 SUMMARY="A library for playing MOD files"
-DESCRIPTION="libmikmod is a library supporting many formats, including mod, \
-s3m, it, and xm."
+DESCRIPTION="libmikmod supports many formats, including mod, s3m, it, and xm."
 HOMEPAGE="http://mikmod.sourceforge.net"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve \
 McIntyre, Peter Amstutz, and Miodrag Vallat."
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe
index 16728b107..74b9f201c 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.recipe
+++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe
@@ -1,14 +1,15 @@
-SUMMARY="A lightweight Matroska muxer written for HandBrake"
-DESCRIPTION="
-A lightweight Matroska muxer written for HandBrake.
-"
+SUMMARY="A lightweight Matroska muxer"
+DESCRIPTION="libmkv is a lightweight Matroska muxer originally written for \
+HandBrake. The library is meant to be an alternative to the official \
+libmatroska library. It is written in plain C, and intended to be very \
+portable."
 HOMEPAGE="https://github.com/saintdev/libmkv"
 COPYRIGHT="2007 libmkv"
 LICENSE="GNU GPL v2"
+REVISION="3"
 SOURCE_URI="https://github.com/saintdev/libmkv/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="41f08a08bab354f9834fda1dcdd1dcf4a0c67ad18021eb980f808654464cef00"
 SOURCE_FILENAME="libmkv-$portVersion.tar.gz"
-REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -17,16 +18,22 @@ PROVIDES="
 	libmkv$secondaryArchSuffix = $portVersion
 	lib:libmkv$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libmkv${secondaryArchSuffix}_devel = $portVersion
+	devel:libmkv$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libmkv$secondaryArchSuffix == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -55,13 +62,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmkv${secondaryArchSuffix}_devel = $portVersion
-	devel:libmkv$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libmkv$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
index 21510f828..1297fc546 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
@@ -2,7 +2,8 @@ SUMMARY="A library for playing MOD files"
 DESCRIPTION="Olivier Lapicque, author of Modplug, which is arguably the best \
 quality MOD-playing software available, has placed his sound rendering code \
 in the public domain. This library and plugin is based on that code.
-Plays 22 different mod formats, zip, rar, gzip, and bzip2 compressed mods."
+It plays 22 different MOD formats as well as zip, rar, gzip, and bzip2 \
+compressed MODs."
 HOMEPAGE="http://modplug-xmms.sourceforge.net"
 COPYRIGHT="Public Domain"
 LICENSE="Public Domain"
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
index 4ad847a21..4e31a548f 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
@@ -6,18 +6,17 @@ 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/"
+COPYRIGHT="2008 Kona Blend"
 LICENSE="MPL v1.1"
 REVISION="2"
+SOURCE_URI="https://mp4v2.googlecode.com/files/mp4v2-$portVersion.tar.bz2"
+CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338"
+SOURCE_DIR="mp4v2-$portVersion"
+PATCHES="libmp4v2-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 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="
 	libmp4v2$secondaryArchSuffix = $portVersion compat >= 2
 	lib:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
@@ -34,6 +33,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	libmp4v2${secondaryArchSuffix}_devel = $portVersion compat >= 2
 	devel:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
@@ -41,10 +41,11 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libmp4v2$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
index 766d02b59..3eaac24ac 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
@@ -1,16 +1,29 @@
-SUMMARY="A library for decoding mpeg-2 and mpeg-1 video"
-DESCRIPTION="
-A library for decoding mpeg-2 and mpeg-1 video.
-"
+SUMMARY="A library for decoding MPEG-2 and MPEG-1 video"
+DESCRIPTION="libmpeg2 is a library for decoding MPEG-2 and MPEG-1 video. Its \
+main development goals are:
+
+- Conformance: libmpeg2 is able to decode all MPEG streams that conform to \
+certain restrictions: 'Constrained Parameters' for MPEG-1, and 'Main Profile' \
+for MPEG-2.
+- Speed: With typical video streams as found on DVD's, and doing only decoding \
+with no display, you should be able to get less than 20 cycles per output \
+pixel. In a real player program, the display routines will probably take as \
+much time as the actual decoding!
+- Portability: Most of the code is written in C, and when we use platform-\
+specific optimizations (typically assembly routines, currently used for the \
+motion compensation and the inverse cosine transform stages) we always have a \
+generic C routine to fall back on.
+- Reuseability: libmpeg2 doesn't include any project-specific code, but it \
+should still include enough features to be used by very diverse projects."
 HOMEPAGE="http://libmpeg2.sourceforge.net"
+COPYRIGHT="2000-2003 Michel Lespinasse
+	1999-2000 Aaron Holtzman"
 LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2000-2003 Michel Lespinasse
-	1999-2000 Aaron Holtzman
-	"
+REVISION="3"
 SOURCE_URI="http://libmpeg2.sourceforge.net/files/libmpeg2-$portVersion.tar.gz"
 CHECKSUM_SHA256="dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
-REVISION="3"
+PATCHES="libmpeg2-${portVersion}.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -31,11 +44,19 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	"
 
-BUILD_REQUIRES="
+PROVIDES_devel="
+	libmpeg2${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
+	devel:libmpeg2${secondaryArchSuffix} = 0.1.0 compat >= 0
+	devel:libmpeg2convert${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libmpeg2${secondaryArchSuffix} == $portVersion base
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
@@ -44,8 +65,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-PATCHES="libmpeg2-${portVersion}.patch"
-
 BUILD()
 {
 	./bootstrap
@@ -68,14 +87,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmpeg2${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
-	devel:libmpeg2${secondaryArchSuffix} = 0.1.0 compat >= 0
-	devel:libmpeg2convert${secondaryArchSuffix} = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libmpeg2${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/media-libs/libogg/libogg-1.3.2.recipe b/media-libs/libogg/libogg-1.3.2.recipe
index 303f457ca..a0ac4519e 100644
--- a/media-libs/libogg/libogg-1.3.2.recipe
+++ b/media-libs/libogg/libogg-1.3.2.recipe
@@ -4,12 +4,13 @@ Ogg is a multimedia container format, and the native file and stream format \
 for the Xiph.org multimedia codecs. As with all Xiph.org technology is it an \
 open format free for anyone to use.
 As with most container formats it encapsulates raw compressed data and allows \
-the interleaving of audio and video data inside a single convient format. \
+the interleaving of audio and video data inside a single convenient format. \
 Other examples of container formats are Quicktime .mov, the MPEG program \
 stream, and AVI.
+
 In addition to encapsulation and interleave of multiple data streams, Ogg \
 provides packet framing, error detection, and periodic timestamps for seeking, \
-and in a small, bounded percentage bitrate overhead.
+all in a small, bounded percentage bitrate overhead.
 Ogg is a stream oriented container, meaning it can be written and read in one \
 pass, making it a natural fit for internet streaming and use in processing \
 pipelines. This stream orientation is the major design difference over other \
diff --git a/media-libs/libpng/libpng12-1.2.53.recipe b/media-libs/libpng/libpng12-1.2.53.recipe
index 10fc5e719..77dbf25d5 100644
--- a/media-libs/libpng/libpng12-1.2.53.recipe
+++ b/media-libs/libpng/libpng12-1.2.53.recipe
@@ -1,22 +1,21 @@
 SUMMARY="Portable Network Graphics library (BeOS compatibility version)"
-DESCRIPTION="
-libpng is the official PNG reference library. It supports almost all PNG \
-features, is extensible, and has been extensively tested for over 17 years.
+DESCRIPTION="libpng is the official PNG reference library. It supports almost \
+all PNG features, is extensible, and has been extensively tested for over 17 \
+years.
 
-This is libpng 1.2, an olderversion which may be needed for compatibility with \
-BeOS application. For new developments please use the current libpng package.
-"
+This is libpng 1.2, an older version which may be needed for compatibility \
+with BeOS application. For new developments please use the current libpng \
+package."
 HOMEPAGE="http://www.libpng.org"
-COPYRIGHT="
-	1998-2011 Glenn Randers-Pehrson
+COPYRIGHT="1998-2011 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
-	1995-1996 Guy Eric Schalnat, Group 42, Inc.
-	"
+	1995-1996 Guy Eric Schalnat, Group 42, Inc."
 LICENSE="LibPNG"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/libpng/files/libpng12/$portVersion/libpng-$portVersion.tar.bz2"
 CHECKSUM_SHA256="57405e667b3c64c490f5ef03cc8bb7b5a89ded7292f84ba1a2f54c2412f4d5fb"
 SOURCE_DIR="libpng-$portVersion"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 
@@ -29,6 +28,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
+	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2
+	cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2
+	devel:libpng$secondaryArchSuffix = 3.53.0 compat >= 3
+	devel:libpng12$secondaryArchSuffix = 3.53.0 compat >= 3
+	"
+REQUIRES_devel="
+	libpng12$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
@@ -65,16 +76,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	devel:libpng$secondaryArchSuffix = 3.53.0 compat >= 3
-	devel:libpng12$secondaryArchSuffix = 3.53.0 compat >= 3
-	"
-REQUIRES_devel="
-	libpng12$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libpng/libpng16-1.6.18.recipe b/media-libs/libpng/libpng16-1.6.18.recipe
index 7ca6e483d..fa36b7818 100644
--- a/media-libs/libpng/libpng16-1.6.18.recipe
+++ b/media-libs/libpng/libpng16-1.6.18.recipe
@@ -1,19 +1,17 @@
 SUMMARY="Portable Network Graphics library"
-DESCRIPTION="
-libpng is the official PNG reference library. It supports almost all PNG \
-features, is extensible, and has been extensively tested for over 17 years
-"
+DESCRIPTION="libpng is the official PNG reference library. It supports almost \
+all PNG features, is extensible, and has been extensively tested for over 17 \
+years."
 HOMEPAGE="http://www.libpng.org"
-COPYRIGHT="
-	1998-2014 Glenn Randers-Pehrson
+COPYRIGHT="1998-2014 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
-	1995-1996 Guy Eric Schalnat, Group 42, Inc.
-	"
+	1995-1996 Guy Eric Schalnat, Group 42, Inc."
 LICENSE="LibPNG"
+REVISION="1"
 SOURCE_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
 CHECKSUM_SHA256="593d9216270dca1ab1fc2f0e4383a9ac99394c349392fb0f65043f0e6fbfdac6"
 SOURCE_DIR="libpng-$portVersion"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -26,6 +24,25 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libpng16${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
+	devel:libpng$secondaryArchSuffix = 16.18.0 compat >= 16
+	devel:libpng16$secondaryArchSuffix = 16.18.0 compat >= 16
+	"
+REQUIRES_devel="
+	libpng16$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+CONFLICTS_devel="
+	libpng${secondaryArchSuffix}_devel
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
@@ -60,23 +77,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libpng16${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
-	devel:libpng$secondaryArchSuffix = 16.18.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.18.0 compat >= 16
-	"
-REQUIRES_devel="
-	libpng16$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-CONFLICTS_devel="
-	libpng${secondaryArchSuffix}_devel
-	"
diff --git a/media-libs/libreplaygain/libreplaygain-r475.recipe b/media-libs/libreplaygain/libreplaygain-r475.recipe
index 73dbd69bd..93381555a 100644
--- a/media-libs/libreplaygain/libreplaygain-r475.recipe
+++ b/media-libs/libreplaygain/libreplaygain-r475.recipe
@@ -1,42 +1,41 @@
 SUMMARY="Replay Gain library from Musepack"
 DESCRIPTION="libreplaygain calculates the perceived loudness of audio and \
-suggests dB adjustments according to the ReplayGain standard.
-"
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-REVISION="1"
+suggests dB adjustments according to the ReplayGain standard."
 HOMEPAGE="https://www.musepack.net"
-LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2011 Musepack Project"
-
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://files.musepack.net/source/libreplaygain_r475.tar.gz"
 SOURCE_DIR="libreplaygain_r475"
 CHECKSUM_SHA256="8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482"
 
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	libreplaygain$secondaryArchSuffix = $portVersion
 	lib:libreplaygain$secondaryArchSuffix = 1.0.0 compat = 1
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-"
+	"
 
 PROVIDES_devel="
 	libreplaygain${secondaryArchSuffix}_devel = $portVersion
 	devel:libreplaygain$secondaryArchSuffix
-"
-
+	"
 REQUIRES_devel="
 	libreplaygain$secondaryArchSuffix == $portVersion base
-"
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
 
 BUILD()
 {
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
index 118316336..bc921a162 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
@@ -1,8 +1,8 @@
 SUMMARY="Samplerate converter for audio"
-DESCRIPTION=" Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter \
-for audio. One example of where such a thing would be useful is converting \
-audio from the CD sample rate of 44.1kHz to the 48kHz sample rate used by \
-DAT players.
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a samplerate \
+converter for audio. One example of where such a thing would be useful is \
+converting audio from the CD sample rate of 44.1kHz to the 48kHz sample rate \
+used by DAT players.
 
 SRC is capable of arbitrary and time varying conversions, from downsampling \
 by a factor of 256 to upsampling by the same factor. Arbitrary in this case \
@@ -12,13 +12,14 @@ slowing down effects."
 HOMEPAGE="http://www.mega-nerd.com/SRC/"
 COPYRIGHT="2002-2011 Erik de Castro Lopo"
 LICENSE="GNU GPL v2"
+REVISION="3"
 SOURCE_URI="http://www.mega-nerd.com/SRC/libsamplerate-$portVersion.tar.gz"
 CHECKSUM_SHA256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06"
-REVISION="3"
+PATCHES="libsamplerate-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="libsamplerate-$portVersion.patchset"
 
 PROVIDES="
 	libsamplerate$secondaryArchSuffix = $portVersion compat >= 0
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index c82370d0e..6bcf48231 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -1,20 +1,19 @@
 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."
+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/"
+COPYRIGHT="1997-2012 Sam Lantinga"
 LICENSE="GNU LGPL v2.1"
 REVISION="8"
+SOURCE_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
+CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
+SOURCE_DIR="SDL-$portVersion"
+PATCHES="libsdl-1.2.15.patchset"
 
 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
@@ -37,12 +36,13 @@ REQUIRES_devel="
 	libsdl${secondaryArchSuffix} == $portVersion base
 	devel:libGL$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/media-libs/libsdl2/libsdl2-2.0.3.recipe b/media-libs/libsdl2/libsdl2-2.0.3.recipe
index 4a746b903..ee436f289 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.3.recipe
@@ -1,16 +1,16 @@
 SUMMARY="Simple Direct Media Layer 2.0"
-DESCRIPTION="
-Simple DirectMedia Layer is a cross-platform development library designed to \
-provide low level access to audio, keyboard, mouse, joystick, and graphics \
-hardware via OpenGL and Direct3D. It is used by video playback software, \
-emulators, and popular games.
-"
+DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library \
+designed to provide low level access to audio, keyboard, mouse, joystick, and \
+graphics hardware via OpenGL and Direct3D. It is used by video playback \
+software, emulators, and popular games."
 HOMEPAGE="http://www.libsdl.org/"
+COPYRIGHT="1997-2014 Sam Lantinga"
+LICENSE="Zlib"
+REVISION="2"
 SOURCE_URI="http://www.libsdl.org/release/SDL2-$portVersion.tar.gz"
 CHECKSUM_SHA256="a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c"
-REVISION="2"
-LICENSE="Zlib"
-COPYRIGHT="1997-2014 Sam Lantinga"
+SOURCE_DIR="SDL2-$portVersion"
+PATCHES="libsdl2-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -20,19 +20,29 @@ PROVIDES="
 	lib:libSDL2$secondaryArchSuffix = 0.2.1 compat >= 0
 	lib:libSDL2_2.0$secondaryArchSuffix = 0.2.1 compat >= 0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
+	cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0
+	devel:libSDL2$secondaryArchSuffix = 0.2.1 compat >= 0
+	devel:libSDL2main$secondaryArchSuffix = 0.2.1 compat >= 0
+	devel:libSDL2_test$secondaryArchSuffix = 0.2.1 compat >= 0
+	devel:libSDL2_2.0$secondaryArchSuffix = 0.2.1 compat >= 0
+	"
+REQUIRES_devel="
+	libsdl2$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgl$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:libtool
@@ -45,10 +55,6 @@ BUILD_PREREQUIRES="
 	cmd:gettext
 	"
 
-SOURCE_DIR="SDL2-$portVersion"
-
-PATCHES="libsdl2-$portVersion.patchset"
-
 PATCH()
 {
 	if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
@@ -78,19 +84,5 @@ INSTALL()
 	fixDevelopLibDirReferences $binDir/sdl2-config
 
 	packageEntries devel \
-			$developDir $binDir/sdl2-config $dataDir
+		$developDir $binDir/sdl2-config $dataDir
 }
-
-# ----- devel package -------------------------------------
-PROVIDES_devel="
-	libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
-	cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0
-	devel:libSDL2$secondaryArchSuffix = 0.2.1 compat >= 0
-	devel:libSDL2main$secondaryArchSuffix = 0.2.1 compat >= 0
-	devel:libSDL2_test$secondaryArchSuffix = 0.2.1 compat >= 0
-	devel:libSDL2_2.0$secondaryArchSuffix = 0.2.1 compat >= 0
-	"
-
-REQUIRES_devel="
-	libsdl2$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe
index 0a3e40baa..74d3e075e 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -1,21 +1,17 @@
-SUMMARY="C library for reading and writing files containing sampled sound"
-DESCRIPTION="
-libsndfile is a library of C routines for reading and writing \
-files containing sampled audio data.
-"
+SUMMARY="C library for reading and writing of sampled sound"
+DESCRIPTION="libsndfile is a library of C routines for reading and writing \
+files containing sampled audio data."
 HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-COPYRIGHT="
-	1999-2011 Erik de Castro Lopo
-"
+COPYRIGHT="1999-2011 Erik de Castro Lopo"
 LICENSE="GNU LGPL v2.1"
+REVISION="3"
 SOURCE_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
 CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
-REVISION="3"
+PATCHES="libsndfile-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libsndfile-$portVersion.patchset"
-
 PROVIDES="
 	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:sndfile_cmp$secondaryArchSuffix
@@ -37,6 +33,17 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libsndfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	libsndfile$secondaryArchSuffix == $portVersion base
+	devel:libflac$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libflac$secondaryArchSuffix
@@ -93,15 +100,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsndfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	libsndfile$secondaryArchSuffix == $portVersion base
-	devel:libflac$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
-	"
diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe
index 82f4fd1a4..9ba5552ca 100644
--- a/media-libs/libtheora/libtheora-1.1.1.recipe
+++ b/media-libs/libtheora/libtheora-1.1.1.recipe
@@ -1,28 +1,28 @@
 SUMMARY="Theora video compression format library"
-DESCRIPTION="
-Theora is a free and open video compression format from the Xiph.org \
-Foundation. Like all our multimedia technology it can be used to distribute \
-film and video online and on disc without the licensing and royalty fees or \
-vendor lock-in associated with other formats.
+DESCRIPTION="Theora is a free and open video compression format from the \
+Xiph.org Foundation. Like all Xiph.org media technology it can be used to \
+distribute film and video online and on disc without the licensing and \
+royalty fees or vendor lock-in associated with other formats.
+
 Theora scales from postage stamp to HD resolution, and is considered \
 particularly competitive at low bitrates. It is in the same class as \
 MPEG-4/DiVX, and like the Vorbis audio codec it has lots of room for \
 improvement as encoder technology develops.
+
 Theora is in full public release as of November 3, 2008. The bitstream format \
 for Theora I was frozen Thursday, 2004 July 1. All bitstreams encoded since \
-that date will remain compatible with future releases.
-"
+that date will remain compatible with future releases."
 HOMEPAGE="http://www.theora.org/"
-LICENSE="BSD (3-clause)"
 COPYRIGHT="2002-2009 Xiph.Org Foundation"
+LICENSE="BSD (3-clause)"
+REVISION="3"
 SOURCE_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2"
 CHECKSUM_SHA256="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
-REVISION="3"
+PATCHES="libtheora-1.1.1.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libtheora-1.1.1.patchset"
-
 PROVIDES="
 	libtheora$secondaryArchSuffix = $portVersion
 	lib:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0
@@ -33,13 +33,24 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libtheora${secondaryArchSuffix}_devel = $portVersion
+	devel:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0
+	devel:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1
+	devel:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1
+	"
+REQUIRES_devel="
+	libtheora$secondaryArchSuffix == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libogg$secondaryArchSuffix
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
@@ -72,15 +83,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libtheora${secondaryArchSuffix}_devel = $portVersion
-	devel:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0
-	devel:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1
-	devel:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1
-	"
-REQUIRES_devel="
-	libtheora$secondaryArchSuffix == $portVersion
-	"
diff --git a/media-libs/libvorbis/libvorbis-1.3.5.recipe b/media-libs/libvorbis/libvorbis-1.3.5.recipe
index 8e8d4a96a..370720e08 100644
--- a/media-libs/libvorbis/libvorbis-1.3.5.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.5.recipe
@@ -1,26 +1,26 @@
 SUMMARY="Ogg Vorbis audio compression format library"
-DESCRIPTION="
-Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, \
-general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, \
-16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to \
-128 kbps/channel. This places Vorbis in the same competitive class as audio \
-representations such as MPEG-4 (AAC), and similar to, but higher performance \
-than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC.
+DESCRIPTION="Ogg Vorbis is a fully open, non-proprietary, \
+patent-and-royalty-free, general-purpose compressed audio format for mid to \
+high quality (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and \
+variable bitrates from 16 to 128 kbps/channel. This places Vorbis in the same \
+competitive class as audio representations such as MPEG-4 (AAC), and similar \
+to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio \
+(TwinVQ), WMA and PAC.
+
 The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All \
 bitstreams encoded since will remain compatible with all future releases of \
-Vorbis.
-"
+Vorbis."
 HOMEPAGE="http://www.xiph.org/vorbis/"
-LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
+LICENSE="BSD (3-clause)"
+REVISION="2"
 SOURCE_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz"
 CHECKSUM_SHA256="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce"
-REVISION="2"
+PATCHES="libvorbis-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libvorbis-$portVersion.patchset"
-
 PROVIDES="
 	libvorbis$secondaryArchSuffix = $portVersion
 	lib:libvorbis$secondaryArchSuffix = 0.4.8 compat >= 0
@@ -31,11 +31,23 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libvorbis${secondaryArchSuffix}_devel = $portVersion
+	devel:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
+	devel:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
+	devel:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
+	"
+REQUIRES_devel="
+	libvorbis$secondaryArchSuffix == $portVersion
+	devel:libogg$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libogg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -72,16 +84,3 @@ INSTALL()
 		$dataDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libvorbis${secondaryArchSuffix}_devel = $portVersion
-	devel:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
-	devel:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
-	devel:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
-	"
-REQUIRES_devel="
-	libvorbis$secondaryArchSuffix == $portVersion
-	devel:libogg$secondaryArchSuffix
-	"
diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe
index 5379a18c1..2b01ab18c 100644
--- a/media-libs/libvpx/libvpx-1.0.0.recipe
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -1,25 +1,25 @@
 SUMMARY="WebM VP8 video codec library"
-DESCRIPTION="
-The WebM VP8 SDK allows you to integrate your applications with the VP8 video \
-codec, a high quality, royalty free, open source codec deployed on millions of \
-computers and devices worldwide.
+DESCRIPTION="The WebM VP8 SDK allows you to integrate your applications with \
+the VP8 video codec, a high quality, royalty free, open source codec deployed \
+on millions of computers and devices worldwide.
+
 This distribution of the WebM VP8 Codec SDK includes the following support:
-* WebM VP8 Encoder
-* WebM VP8 Decoder
-"
+- WebM VP8 Encoder
+- WebM VP8 Decoder"
 HOMEPAGE="http://www.webmproject.org"
-LICENSE="BSD (3-clause)"
 COPYRIGHT="2009-2012 Google Inc.,
-           The Mozilla Foundation and
-           The Xiph.Org Foundation"
+	The Mozilla Foundation and
+	The Xiph.Org Foundation"
+LICENSE="BSD (3-clause)"
+REVISION="2"
 SOURCE_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2"
 CHECKSUM_SHA256="07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21"
-REVISION="2"
+SOURCE_DIR="libvpx-v1.0.0"
+PATCHES="libvpx-1.0.0.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libvpx-1.0.0.patchset"
-
 PROVIDES="
 	libvpx$secondaryArchSuffix = $portVersion
 	lib:libvpx$secondaryArchSuffix = $portVersion compat >= 1
@@ -35,12 +35,21 @@ fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libvpx${secondaryArchSuffix}_devel = $portVersion
+	devel:libvpx$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	libvpx$secondaryArchSuffix == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
@@ -49,8 +58,6 @@ BUILD_PREREQUIRES="
 	cmd:yasm
 	"
 
-SOURCE_DIR="libvpx-v1.0.0"
-
 BUILD()
 {
 	# not an auto tools configure
@@ -84,13 +91,3 @@ INSTALL()
 		rm -rf $prefix/bin
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libvpx${secondaryArchSuffix}_devel = $portVersion
-	devel:libvpx$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	libvpx$secondaryArchSuffix == $portVersion
-	"
diff --git a/media-libs/libwebp/libwebp-0.4.1.recipe b/media-libs/libwebp/libwebp-0.4.1.recipe
index 560b00c85..d60378948 100644
--- a/media-libs/libwebp/libwebp-0.4.1.recipe
+++ b/media-libs/libwebp/libwebp-0.4.1.recipe
@@ -1,13 +1,19 @@
 SUMMARY="A library for encoding and decoding WebP image files"
-DESCRIPTION="
-A library for encoding and decoding WebP image files.
-"
+DESCRIPTION="WebP is an image format that provides lossless and lossy \
+compression for images on the web. WebP lossless images are 26% smaller \
+in size compared to PNGs. WebP lossy images are 25-34% smaller in size \
+compared to JPEG images at equivalent SSIM index.
+WebP supports lossless transparency (also known as alpha channel) with \
+just 22% additional bytes. Transparency is also supported with lossy \
+compression and typically provides 3x smaller file sizes compared to \
+PNG when lossy compression is acceptable for the red/green/blue color \
+channels."
 HOMEPAGE="https://developers.google.com/speed/webp"
+COPYRIGHT="2011 Google Inc."
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="http://downloads.webmproject.org/releases/webp/libwebp-$portVersion.tar.gz"
 CHECKSUM_SHA256="00b646e6f66550a8faa998711fe70aabee9ed3bc562a8437c89042901674d027"
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2011 Google Inc."
-REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -25,14 +31,23 @@ REQUIRES="
 	lib:libpng$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.4
+	devel:libwebp$secondaryArchSuffix = 5.0.1 compat >= 5
+	"
+REQUIRES_devel="
+	libwebp$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:autoconf
@@ -61,11 +76,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-PROVIDES_devel="
-	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.4
-	devel:libwebp$secondaryArchSuffix = 5.0.1 compat >= 5
-	"
-REQUIRES_devel="
-	libwebp$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe
index fecc9a1be..8af8ae8b0 100644
--- a/media-libs/openjpeg/openjpeg-2.1.0.recipe
+++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe
@@ -1,13 +1,15 @@
 SUMMARY="An open-source C-Library for JPEG 2000"
-DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \
-It has been developed in order to promote the use of JPEG 2000, the new \
-still-image compression standard from the Joint Photographic Experts Group \
-(JPEG). In addition to the basic codec, various other features are under \
-development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \
-indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \
-a Java-viewer for j2k-images."
+DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written \
+in C language. It has been developed in order to promote the use of JPEG \
+2000, the new still-image compression standard from the Joint Photographic \
+Experts Group (JPEG).
+In addition to the basic codec, various other features are under development, \
+among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool \
+useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer \
+for j2k-images."
 HOMEPAGE="http://www.openjpeg.org/"
-COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, \
+Universite catholique de Louvain (UCL), Belgium
 	2002-2012 Professor Benoit Macq
  	2003-2012 Antonin Descampe
  	2003-2009 Francois-Olivier Devaux
@@ -29,37 +31,34 @@ PROVIDES="
 	cmd:opj_dump = $portVersion
 	lib:libopenjp2$secondaryArchSuffix = 7 compat >= 7
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
-"
-
-BUILD_REQUIRES="
-	devel:libz$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	"
-#needs devel:libtiff too but that isn't provided by anything
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:cmake
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	openjpeg${secondaryArchSuffix}_devel = $portVersion
 	devel:libopenjp2$secondaryArchSuffix = $portVersion compat >= 7
 	"
-
 REQUIRES_devel="
 	openjpeg$secondaryArchSuffix == $portVersion
 	"
 
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	"
+#needs devel:libtiff too but that isn't provided by anything
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
 BUILD()
 {
 	mkdir -p build