diff --git a/dev-libs/libcss/libcss-0.4.0.recipe b/dev-libs/libcss/libcss-0.4.0.recipe
index 5470ab652..d51db2d15 100644
--- a/dev-libs/libcss/libcss-0.4.0.recipe
+++ b/dev-libs/libcss/libcss-0.4.0.recipe
@@ -1,36 +1,38 @@
 SUMMARY="A CSS parser and selection engine"
-DESCRIPTION="
-LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
-"
+DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine. \
+It was developed as part of the NetSurf project"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
 COPYRIGHT="2007-2014 J-M Bell"
 LICENSE="MIT"
+REVISION="2"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="0be9509d9d352abdeec87764c1f8ba13950d9dc4f63acade0477209b7fd21748"
-REVISION="2"
+PATCHES="libcss-0.3.0.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libcss-0.3.0.patchset"
-
 PROVIDES="
 	libcss$secondaryArchSuffix = $portVersion
 	lib:libcss$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libparserutils${secondaryArchSuffix}
 	lib:libwapcaplet${secondaryArchSuffix}
 	"
 
+PROVIDES_devel="
+	libcss${secondaryArchSuffix}_devel = $portVersion
+	devel:libcss$secondaryArchSuffix = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libparserutils${secondaryArchSuffix} >= 0.2.0
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.2.1
 	devel:libiconv
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -64,10 +66,3 @@ TEST()
 	make test PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		LDFLAGS="-liconv -lwapcaplet -lparserutils"
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libcss${secondaryArchSuffix}_devel = $portVersion
-	devel:libcss$secondaryArchSuffix = $portVersion
-"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
index 6772483b6..e9f0af310 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
@@ -1,20 +1,18 @@
 SUMMARY="Open source web browser engine"
-DESCRIPTION="
-WebKit is an open source web browser engine. WebKit is also the name of the \
+DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the \
 Mac OS X system framework version of the engine that's used by Safari, \
 Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
-JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
-"
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
-LICENSE="
-	GNU LGPL v2
-	GNU LGPL v2.1
-	MIT
-	"
+LICENSE="GNU LGPL v2
+	 GNU LGPL v2.1
+	 MIT"
+REVISION="1"
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.0-Source.tar.bz2"
 CHECKSUM_SHA256="b840d22eaf76f4b8fb14aa18e140a80abc0d58fa3c14694c978374c8fb4383d7"
-REVISION="1"
+SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -33,6 +31,17 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libwebkit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
@@ -60,8 +69,6 @@ BUILD_PREREQUIRES="
 	cmd:ruby
 	"
 
-SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
-
 BUILD()
 {
 	#cmake -DPORT=Haiku  \
@@ -82,16 +89,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
-	devel:libwebcore$secondaryArchSuffix = $portVersion
-	devel:libwebkit$secondaryArchSuffix = $portVersion
-	devel:libwtf$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haikuwebkit$secondaryArchSuffix == $portVersion base
-	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
index 46ba206d2..b2dc9fb6b 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
@@ -1,20 +1,18 @@
 SUMMARY="Open source web browser engine"
-DESCRIPTION="
-WebKit is an open source web browser engine. WebKit is also the name of the \
+DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the \
 Mac OS X system framework version of the engine that's used by Safari, \
 Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
-JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
-"
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
-LICENSE="
-	GNU LGPL v2
-	GNU LGPL v2.1
-	MIT
-	"
+LICENSE="GNU LGPL v2
+	 GNU LGPL v2.1
+	 MIT"
+REVISION="1"
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.1-Source.tar.bz2"
 CHECKSUM_MD5="9b5624345b633693ec90a95a1e9e52bf"
-REVISION="1"
+SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -33,6 +31,17 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
@@ -59,8 +68,6 @@ BUILD_PREREQUIRES="
 	cmd:ruby
 	"
 
-SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
-
 BUILD()
 {
 	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
@@ -80,16 +87,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
-	devel:libwebcore$secondaryArchSuffix = $portVersion
-	devel:libWebKit$secondaryArchSuffix = $portVersion
-	devel:libwtf$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haikuwebkit$secondaryArchSuffix == $portVersion base
-	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
index 24eb6150c..12a44804b 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
@@ -1,25 +1,22 @@
 SUMMARY="Open source web browser engine"
-DESCRIPTION="
-WebKit is an open source web browser engine. WebKit is also the name of the \
+DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the \
 Mac OS X system framework version of the engine that's used by Safari, \
 Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
-JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
-"
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
-LICENSE="
-	GNU LGPL v2
-	GNU LGPL v2.1
-	MIT
-	"
+LICENSE="GNU LGPL v2
+	 GNU LGPL v2.1
+	 MIT"
+REVISION="1"
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.2-Source.tar.bz2"
 CHECKSUM_SHA256="50688a5f78cbcc80dc2ec512effbcde36295560d2bbec0efaa9e0c679f303a42"
-REVISION="1"
+SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
+PATCHES="haikuwebkit-1.2.2.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="haikuwebkit-1.2.2.patchset"
-
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion
 	lib:libWebKit$secondaryArchSuffix = $portVersion
@@ -35,6 +32,17 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
@@ -61,8 +69,6 @@ BUILD_PREREQUIRES="
 	cmd:ruby
 	"
 
-SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
-
 BUILD()
 {
 	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
@@ -82,16 +88,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
-	devel:libwebcore$secondaryArchSuffix = $portVersion
-	devel:libWebKit$secondaryArchSuffix = $portVersion
-	devel:libwtf$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haikuwebkit$secondaryArchSuffix == $portVersion base
-	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
index f973dbe8d..b49b383f3 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
@@ -1,21 +1,19 @@
 SUMMARY="Open source web browser engine"
-DESCRIPTION="
-WebKit is an open source web browser engine. WebKit is also the name of the \
+DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the \
 Mac OS X system framework version of the engine that's used by Safari, \
 Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
-JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
-"
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
-LICENSE="
-	GNU LGPL v2
+LICENSE="GNU LGPL v2
 	GNU LGPL v2.1
-	MIT
-	"
+	MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/haiku/webkit/archive/1.2.3.tar.gz"
 CHECKSUM_SHA256="4784781c36dfbf7d09fb41bedbe3777bdd216c5a25ed77463c49a8120c1777a1"
+SOURCE_DIR="webkit-$portVersion"
 SOURCE_FILENAME="haikuwebkit-1.2.3.tar.gz"
-REVISION="1"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -34,6 +32,17 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	haiku_devel
@@ -60,8 +69,6 @@ BUILD_PREREQUIRES="
 	cmd:ruby
 	"
 
-SOURCE_DIR="webkit-$portVersion"
-
 BUILD()
 {
 	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
@@ -81,16 +88,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
-	devel:libwebcore$secondaryArchSuffix = $portVersion
-	devel:libWebKit$secondaryArchSuffix = $portVersion
-	devel:libwtf$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haikuwebkit$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index b77bb96a4..66268974d 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -1,37 +1,42 @@
 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"
+	   2001-2004 the dvdnav project"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2"
 CHECKSUM_SHA256="8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550"
-REVISION="1"
+SOURCE_DIR="libdvdnav-${portVersion}"
+PATCHES="libdvdnav-${portVersion}.patch"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-PATCHES="libdvdnav-${portVersion}.patch"
-
 PROVIDES="
 	libdvdnav${secondaryArchSuffix} = $portVersion
 	lib:libdvdnav
 	cmd:dvdnav_config
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	libdvdread${secondaryArchSuffix}
 	libdvdcss${secondaryArchSuffix}
 	"
 
+PROVIDES_devel="
+	libdvdnav${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdnav$secondaryArchSuffix = $portVersion
+	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libdvdnav$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libdvdread${secondaryArchSuffix}_devel
@@ -44,8 +49,6 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-SOURCE_DIR="libdvdnav-${portVersion}"
-
 BUILD()
 {
 	./autogen.sh
@@ -68,14 +71,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libdvdnav${secondaryArchSuffix}_devel = $portVersion
-	devel:libdvdnav$secondaryArchSuffix = $portVersion
-	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libdvdnav$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libmpdclient/libmpdclient-2.11_git.recipe b/media-libs/libmpdclient/libmpdclient-2.11_git.recipe
index e54b51078..86ab35b56 100644
--- a/media-libs/libmpdclient/libmpdclient-2.11_git.recipe
+++ b/media-libs/libmpdclient/libmpdclient-2.11_git.recipe
@@ -1,15 +1,14 @@
 SUMMARY="A library for interfacing Music Player Daemon"
-DESCRIPTION="
-Music Player Daemon (MPD) is a flexible, powerful, server-side application \
+DESCRIPTION="Music Player Daemon (MPD) is a flexible, powerful, server-side application \
 for playing music. Through plugins and libraries it can play a variety \
-of sound files while being controlled by its network protocol.
-"
+of sound files while being controlled by its network protocol."
 HOMEPAGE="http://www.musicpd.org/"
+COPYRIGHT="2003-2014 The Music Player Daemon Project"
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="git://git.musicpd.org/master/libmpdclient.git#11b76ed4527d17153fc12f289bc1d59fabb6ea30"
 #CHECKSUM_SHA256=""
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2003-2014 The Music Player Daemon Project"
-REVISION="1"
+
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -22,6 +21,15 @@ REQUIRES="
 	glib2$secondaryArchSuffix >= 2
 	lib:libexpat$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libmpdclient${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpdclient${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libmpdclient${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libglib_2.0$secondaryArchSuffix
@@ -69,14 +77,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-#TODO: move html docs here?
-
-PROVIDES_devel="
-	libmpdclient${secondaryArchSuffix}_devel = $portVersion
-	devel:libmpdclient${secondaryArchSuffix} = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libmpdclient${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
index c7c6cf6a5..23df4300c 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
@@ -1,21 +1,31 @@
-DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
 SUMMARY="A decoding library for BMP and ICO images"
+DESCRIPTION="Libnsbmp is a decoding library written in C for BMP and ICO image file formats. \
+It was developed as part of the NetSurf project."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
 COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
 LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libnsbmp-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libnsbmp = $portVersion
 	"
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	libnsbmp_devel = $portVersion
+	devel:libnsbmp = $portVersion
+	"
+REQUIRES_devel="
+	libnsbmp$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
@@ -42,13 +52,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libnsbmp_devel = $portVersion
-	devel:libnsbmp = $portVersion
-	"
-REQUIRES_devel="
-	libnsbmp$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libnsgif/libnsgif-0.1.1.recipe b/media-libs/libnsgif/libnsgif-0.1.1.recipe
index 64b6d8e41..72337e3e8 100644
--- a/media-libs/libnsgif/libnsgif-0.1.1.recipe
+++ b/media-libs/libnsgif/libnsgif-0.1.1.recipe
@@ -1,21 +1,31 @@
-DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
 SUMMARY="A decoding library for GIF images"
+DESCRIPTION="Libnsgif is a decoding library written in C for GIF image file format. \
+It was written as part of the NetSurf project."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
 COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
 LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="d450ea0a9da234486e997248b30a86524f75f1021ca67017b5597423cf6c0a15"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libnsgif-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libnsgif = $portVersion
 	"
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	libnsgif_devel = $portVersion
+	devel:libnsgif = $portVersion
+	"
+REQUIRES_devel="
+	libnsgif$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
@@ -42,13 +52,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libnsgif_devel = $portVersion
-	devel:libnsgif = $portVersion
-	"
-REQUIRES_devel="
-	libnsgif$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libpng/libpng-1.5.25.recipe b/media-libs/libpng/libpng-1.5.25.recipe
index 76dab6dab..5649048a1 100644
--- a/media-libs/libpng/libpng-1.5.25.recipe
+++ b/media-libs/libpng/libpng-1.5.25.recipe
@@ -3,15 +3,14 @@ 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-2011 Glenn Randers-Pehrson
-	1996-1997 Andreas Dilger
-	1995-1996 Guy Eric Schalnat, Group 42, Inc.
-	"
+COPYRIGHT="1998-2011 Glenn Randers-Pehrson
+	   1996-1997 Andreas Dilger
+	   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="1e25d7937ecda0bad46ab1b70f6f906c86efefc365a6f6c97ae6ae3895b17aa3"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -24,6 +23,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
+	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5
+	cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5
+	devel:libpng$secondaryArchSuffix = 15.25.0 compat >= 15
+	devel:libpng15$secondaryArchSuffix = 15.25.0 compat >= 15
+	"
+REQUIRES_devel="
+	libpng$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
@@ -62,16 +73,3 @@ INSTALL()
 		$developDir \
 		$manDir/man3
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	devel:libpng$secondaryArchSuffix = 15.25.0 compat >= 15
-	devel:libpng15$secondaryArchSuffix = 15.25.0 compat >= 15
-	"
-REQUIRES_devel="
-	libpng$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe
index d5126438c..f8700064b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe
@@ -1,16 +1,16 @@
 SUMMARY="Simple Direct Media Layer 2.0"
-DESCRIPTION="
-Simple DirectMedia Layer is a cross-platform development library designed to \
+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.
-"
+emulators, and popular games."
 HOMEPAGE="http://www.libsdl.org/"
+COPYRIGHT="1997-2013 Sam Lantinga"
+LICENSE="Zlib"
+REVISION="1"
 SOURCE_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz"
 CHECKSUM_SHA256="6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178"
-REVISION="1"
-LICENSE="Zlib"
-COPYRIGHT="1997-2013 Sam Lantinga"
+SOURCE_DIR="SDL2-$portVersion"
+PATCHES="libsdl2-2.0.0.patch"
 
 ARCHITECTURES="x86 x86_gcc2"
 
@@ -19,7 +19,6 @@ PROVIDES="
 	lib:libSDL2 = 0.12.0 compat >= 0.12
 	lib:libSDL2_2.0 = 0.12.0 compat >= 0.12
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 #	lib:libGL
@@ -29,6 +28,17 @@ REQUIRES="
 	lib:libtiff
 	"
 
+PROVIDES_devel="
+	cmd:sdl2_config = $portVersion compat >= 2.0
+	devel:libSDL2 = 0.12.0 compat >= 2.0
+	devel:libSDL2main = 0.12.0 compat >= 0.12
+	devel:libSDL2_test = 0.12.0 compat >= 0.12
+	devel:libSDL2_2.0 = 0.12.0 compat >= 0.12
+	"
+REQUIRES_devel="
+	libsdl2 == $portVersion base
+	"
+
 BUILD_REQUIRES="
 #	devel:mesa
 	devel:libglu
@@ -36,7 +46,6 @@ BUILD_REQUIRES="
 	devel:libjpeg
 #	devel:libtiff
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
@@ -47,10 +56,6 @@ BUILD_PREREQUIRES="
 	cmd:ld${secondaryArchSuffix}
 	"
 
-SOURCE_DIR="SDL2-$portVersion"
-
-PATCHES="libsdl2-2.0.0.patch"
-
 BUILD()
 {
 	runConfigure ./configure
@@ -73,16 +78,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir $binDir/sdl2-config $dataDir
 }
-
-# ----- devel package -------------------------------------
-PROVIDES_devel="
-	cmd:sdl2_config = $portVersion compat >= 2.0
-	devel:libSDL2 = 0.12.0 compat >= 2.0
-	devel:libSDL2main = 0.12.0 compat >= 0.12
-	devel:libSDL2_test = 0.12.0 compat >= 0.12
-	devel:libSDL2_2.0 = 0.12.0 compat >= 0.12
-	"
-
-REQUIRES_devel="
-	libsdl2 == $portVersion base
-	"