diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index 6e6b338c9..ff92876d7 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -1,17 +1,17 @@
-SUMMARY="bzip2 data compression utilities and libraries"
-DESCRIPTION="
-bzip2 is a patent free, high-quality data compressor. It typically compresses \
-files to within 10% to 15% of the best available techniques (the PPM family of \
-statistical compressors), whilst being around twice as fast at compression and \
-six times faster at decompression. bzip2 supports recovery from media errors \
-as well. Its command line flags are similar to those of GNU Gzip.
-"
+SUMMARY="Data compression utilities and libraries"
+DESCRIPTION="bzip2 is a patent free, high-quality data compressor. It \
+typically compresses files to within 10% to 15% of the best available \
+techniques (the PPM family of statistical compressors), whilst being around \
+twice as fast at compression and six times faster at decompression. bzip2 \
+supports recovery from media errors as well. Its command line flags are \
+similar to those of GNU Gzip."
 HOMEPAGE="http://www.bzip.org/"
-LICENSE="bzip2"
 COPYRIGHT="1996-2010 Julian R Seward"
+LICENSE="bzip2"
+REVISION="5"
 SOURCE_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
-REVISION="5"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -39,10 +39,19 @@ fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	bzip2${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
+	"
+REQUIRES_devel="
+	bzip2$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:ar
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -50,7 +59,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-
 BUILD()
 {
 	make $jobArgs
@@ -97,13 +105,3 @@ INSTALL()
 		rm -rf $manDir
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	bzip2${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
-	"
-REQUIRES_devel="
-	bzip2$secondaryArchSuffix == $portVersion base
-	"
diff --git a/app-misc/fdupes/fdupes-1.51.recipe b/app-misc/fdupes/fdupes-1.51.recipe
index 060de4a2a..6937b9115 100644
--- a/app-misc/fdupes/fdupes-1.51.recipe
+++ b/app-misc/fdupes/fdupes-1.51.recipe
@@ -1,30 +1,29 @@
-SUMMARY="FDUPES is a program for identifying or deleting duplicate files"
-DESCRIPTION="
-fdupes is a program written by Adrian Lopez to scan directories for duplicate \
-files, with options to list, delete or replace the files with hardlinks \
-pointing to the duplicate. It first compares file sizes and MD5 signatures, \
-and then performs a byte-by-byte check for verification.
-"
+SUMMARY="A program for identifying or deleting duplicate files"
+DESCRIPTION="fdupes is a program written by Adrian Lopez to scan directories \
+for duplicate files, with options to list, delete or replace the files with \
+hardlinks pointing to the duplicate. It first compares file sizes and MD5 \
+signatures, and then performs a byte-by-byte check for verification."
 HOMEPAGE="http://code.google.com/p/fdupes/"
-SOURCE_URI="http://fdupes.googlecode.com/files/fdupes-1.51.tar.gz"
-CHECKSUM_SHA256="87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881"
 COPYRIGHT="1999-2013 Adrian Lopez"
 LICENSE="MIT"
 REVISION="1"
+SOURCE_URI="http://fdupes.googlecode.com/files/fdupes-1.51.tar.gz"
+CHECKSUM_SHA256="87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881"
+
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	fdupes = $portVersion
 	cmd:fdupes = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
 
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	"
diff --git a/app-misc/figlet/figlet-222.recipe b/app-misc/figlet/figlet-222.recipe
index 0e0d9eb81..26cf7b907 100644
--- a/app-misc/figlet/figlet-222.recipe
+++ b/app-misc/figlet/figlet-222.recipe
@@ -1,16 +1,19 @@
-SUMMARY="FIGlet ASCII art"
-DESCRIPTION="
-FIGlet is a program for making large letter ASCII banners \
+SUMMARY="A program to create ASCII art"
+DESCRIPTION="FIGlet is a program for making large letter ASCII banners \
 out of ordinary text. It can generate characters in many different styles \
 and it can kern and 'smush' the letters these letters together in \
-various ways.
-"
+various ways."
 HOMEPAGE="http://www.figlet.org/"
-SOURCE_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz"
+COPYRIGHT="1991, 1993, 1994 Glenn Chappell and Ian Chai
+	1996, 1997, 1998, 1999, 2000, 2001 John Cowan
+	2002 Christiaan Keet"
+LICENSE="AFL v2.1"
 REVISION="1"
+SOURCE_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz"
+CHECKSUM_MD5="5f84ad52d092d5db4ad5916df767646b"
 STATUS_HAIKU="stable"
 DEPEND=""
-CHECKSUM_MD5="5f84ad52d092d5db4ad5916df767646b"
+
 BUILD()
 {
 	cd figlet222
@@ -34,7 +37,3 @@ INSTALL()
 	rm -rf ${DESTDIR}/tmp
 	rm -rf ${DEFAULTFONTDIR}/tmp
 }
-LICENSE="AFL v2.1"
-COPYRIGHT="1991, 1993, 1994 Glenn Chappell and Ian Chai
-	1996, 1997, 1998, 1999, 2000, 2001 John Cowan
-	2002 Christiaan Keet"
diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe
index 69eb31397..0158030a8 100644
--- a/app-text/dos2unix/dos2unix-1.0.1.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.1.recipe
@@ -1,14 +1,21 @@
+<<<<<<< HEAD
 SUMMARY="dos2unix and unix2dos end of line file convertors"
 DESCRIPTION="
 DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have \
 just LF. Dos2unix and unix2dos are simple parser/converter command line \
 programs to convert between the two formats.
 "
+=======
+SUMMARY="Convertor between DOS and Unix end-of-line"
+DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like \
+to have just LF.  Dos2unix and unix2dos are simple parser/converter command line \
+programs to convert between the two formats." 
+>>>>>>> De-lint recipes.
 HOMEPAGE="http://github.com/puckipedia/dos2unix"
-SOURCE_URI="git://github.com/puckipedia/dos2unix.git#553720356be18ca60cae3d970a575520aef5a4f4"
-REVISION="1"
 COPYRIGHT="Public Domain"
 LICENSE="Public Domain"
+REVISION="1"
+SOURCE_URI="git://github.com/puckipedia/dos2unix.git#553720356be18ca60cae3d970a575520aef5a4f4"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -20,11 +27,11 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:g++
 	"
-
 BUILD()
 {
 	cd src
diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe
index fe2e518e9..2139c0aa0 100644
--- a/app-text/dos2unix/dos2unix-1.0.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -1,11 +1,13 @@
-SUMMARY="dos2unix and unix2dos end of line file convertors"
-DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF.  Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats."
-HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx"
-SOURCE_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip"
-CHECKSUM_SHA256="a88941a2ab824deb79e7d012b0df72b5c84d1157af0b2d59b46184fb35b5519d"
-REVISION="1"
+SUMMARY="Converter between DOS and Unix end-of-line"
+DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like \
+to have just LF.  Dos2unix and unix2dos are simple parser/converter command line \
+programs to convert between the two formats." 
+HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" 
 COPYRIGHT="Public Domain"
 LICENSE="Public Domain"
+REVISION="1"
+SOURCE_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip"
+CHECKSUM_SHA256="a88941a2ab824deb79e7d012b0df72b5c84d1157af0b2d59b46184fb35b5519d"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -17,6 +19,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/app-text/dos2unix/dos2unix-7.2.2.recipe b/app-text/dos2unix/dos2unix-7.2.2.recipe
index 9b0bad787..324f24eb0 100644
--- a/app-text/dos2unix/dos2unix-7.2.2.recipe
+++ b/app-text/dos2unix/dos2unix-7.2.2.recipe
@@ -1,25 +1,20 @@
-SUMMARY="dos2unix and unix2dos end of line file convertors"
-DESCRIPTION="
-DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have \
-just LF. Dos2unix and unix2dos are simple parser/converter command line \
-programs to convert between the two formats.
-"
+SUMMARY="Converter between DOS and Unix end-of-line"
+DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like \
+to have just LF.  Dos2unix and unix2dos are simple parser/converter command line \
+programs to convert between the two formats."
 HOMEPAGE="http://sourceforge.net/projects/dos2unix"
-SOURCE_URI="http://downloads.sourceforge.net/project/dos2unix/dos2unix/$portVersion/dos2unix-$portVersion.tar.gz"
-CHECKSUM_SHA256="9c23907296267fa4ea66e1ee03eb6f6229cf7b64968318d00a77076ae89c2612"
-REVISION="1"
-COPYRIGHT="
-	2009-2015  Erwin Waterlander
+COPYRIGHT="2009-2015  Erwin Waterlander
 	1998 Christian Wurll
 	1998 Bernd Johannes Wuebben
-	1994-1995 Benjamin Lin.
-	"
+	1994-1995 Benjamin Lin"
 LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/project/dos2unix/dos2unix/$portVersion/dos2unix-$portVersion.tar.gz"
+CHECKSUM_SHA256="9c23907296267fa4ea66e1ee03eb6f6229cf7b64968318d00a77076ae89c2612"
+PATCHES="dos2unix-$portVersion.patchset"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
-PATCHES="dos2unix-$portVersion.patchset"
-
 PROVIDES="
 	dos2unix = $portVersion compat >= 7
 	cmd:dos2unix
@@ -30,6 +25,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe
index 0dd247661..fe994e3d9 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4.recipe
+++ b/dev-cpp/clucene/clucene-2.3.3.4.recipe
@@ -1,4 +1,4 @@
-SUMMARY="clucene the open-source, C++ search engine"
+SUMMARY="An open-source, C++ search engine"
 DESCRIPTION="CLucene is a high-performance, scalable, cross platform, \
 full-featured, open-source indexing and searching API. Specifically, CLucene \
 is the guts of a search engine, the hard stuff. You write the easy stuff: the \
@@ -16,24 +16,28 @@ Being written in pure cross-platform C++ code, and utilizing the flexible \
 CMake build system, CLucene can virtually be used for any purpose, on any \
 machine. From PCs running Windows or Linux to Mobile devices. The sky is the \
 limit."
-
 HOMEPAGE="http://clucene.sourceforge.net/"
-LICENSE="Apache v2"
 COPYRIGHT="2003-2006 Ben van Klinken
 	2003-2006 CLucene Team
 	2003-2006 Jos van den Oever"
+LICENSE="Apache v2"
+REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/clucene/clucene-core-2.3.3.4.tar.gz"
 CHECKSUM_SHA256="ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"
 SOURCE_DIR="clucene-core-2.3.3.4"
 PATCHES="clucene-2.3.3.4.patchset"
-REVISION="1"
-ARCHITECTURES="!x86_gcc2"
+
+ARCHITECTURES=""
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	clucene$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	boost$secondaryArchSuffix
@@ -44,7 +48,6 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libboost_atomic$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:make
diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe
index 5a9bf8e00..418b7e25b 100644
--- a/dev-lang/erlang/erlang-16.03.recipe
+++ b/dev-lang/erlang/erlang-16.03.recipe
@@ -1,21 +1,20 @@
-SUMMARY="Erlang/OTP"
-DESCRIPTION="
-Erlang is a programming language used to
-build massively scalable soft real-time systems with
-requirements on high availability. Some of its uses
-are in telecoms, banking, e-commerce, computer
-telephony and instant messaging. Erlang's runtime
-system has built-in support for concurrency, distribution and fault tolerance."
+SUMMARY="The programming language Erlang/OTP"
+DESCRIPTION="Erlang is a programming language used to build massively \
+scalable soft real-time systems with requirements on high availability. \
+Some of its uses are in telecoms, banking, e-commerce, computer telephony \
+and instant messaging. Erlang's runtime system has built-in support for \
+concurrency, distribution and fault tolerance." 
 HOMEPAGE="http://www.erlang.org"
-SOURCE_URI="http://www.erlang.org/download/otp_src_R16B03.tar.gz"
-CHECKSUM_SHA256="6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06"
-ARCHITECTURES="x86_gcc2 x86"
+COPYRIGHT="1997-2013 Ericsson AB"
 LICENSE="EPL"
 REVISION="1"
-COPYRIGHT="1997-2013 Ericsson AB"
+SOURCE_URI="http://www.erlang.org/download/otp_src_R16B03.tar.gz"
+CHECKSUM_SHA256="6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06"
 SOURCE_DIR="otp_src_R16B03"
 PATCHES="erlang_R16B03_haiku.patch"
 
+ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	erl = $portVersion
 	cmd:erl = $portVersion
@@ -28,7 +27,6 @@ PROVIDES="
 	cmd:to_erl = $portVersion
 	cmd:typer = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:libtool
@@ -36,8 +34,11 @@ REQUIRES="
 	cmd:gcc
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+
+BUILD_PREREQUIRES="
 	cmd:perl
 	cmd:make
 	cmd:gcc
@@ -47,6 +48,7 @@ BUILD_PREREQUIRES="
 	devel:libssl
 	devel:libcrypto
 	"
+
 ERLANG_CFLAGS="-DETHR_X86_OUT_OF_ORDER -DHAVE_NET_IF_DL_H -DETHR_HAVE_ETHREAD_DEFINES -DETHR_PTHREADS -DETHR_SIZEOF_PTR=4 -DHAVE_CONFIG_H -I../i586-pc-haiku -I../../i586-pc-haiku -I../include/internal -I../../include/internal -I../../emulator/sys/unix -I../../include/i586-pc-haiku -I../../emulator/beam -I../../../erts/include/internal/i586-pc-haiku -I../../../erts/i586-pc-haiku -Imisc -I../include -Iepmd -Iconnect -I../../../erts/emulator/beam -I../../../erts/include/i586-pc-haiku -I../../../../erts/emulator/beam -I../../../../erts/include/i586-pc-haiku -I../../../../erts/i586-pc-haiku"
 
 BUILD()
@@ -64,4 +66,4 @@ BUILD()
 INSTALL()
 {
 	HOME=/boot/home make CFLAGS="$ERLANG_CFLAGS" install
-}
\ No newline at end of file
+}
diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe
index a8acd304d..a5736edb2 100644
--- a/dev-libs/cyassl/cyassl-2.8.0.recipe
+++ b/dev-libs/cyassl/cyassl-2.8.0.recipe
@@ -1,13 +1,11 @@
-SUMMARY="CyaSSL embedded SSL implementation"
-DESCRIPTION="
-A lightweight yet fully functional embedded SSL implementation.
-"
+SUMMARY="An embedded SSL implementation" 
+DESCRIPTION="A lightweight yet fully functional embedded SSL implementation." 
 HOMEPAGE="http://yassl.com"
+COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://yassl.com/cyassl-2.8.0.zip"
 CHECKSUM_SHA256="94dcac2dfa87b8474815241eee50f7192e7f315c8173ec209d2a3f752bba9a8d"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
 
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
@@ -21,10 +19,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
@@ -34,8 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:dos2unix
 	"
 
-
-DEPEND="app-text/dos2unix >= 1.0"
+# DEPEND="app-text/dos2unix >= 1.0"
 BUILD()
 {
 	dos2unix *
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index fc05b102f..25540b754 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -1,4 +1,4 @@
-SUMMARY="GLib is a cross-platform software utility library"
+SUMMARY="A cross-platform software utility library"
 DESCRIPTION="GLib is a cross-platform software utility library that began as \
 part of the GTK+ project. However, before releasing version 2 of GTK+, the \
 project's developers decided to separate non-GUI-specific code from the GTK+ \
@@ -6,21 +6,21 @@ platform, thus creating GLib as a separate product. GLib was released as a \
 separate library so other developers, those who did not make use of the \
 GUI-related portions of GTK+, could make use of the non-GUI portions of the \
 library without the overhead of depending on the entire GUI library.
+
 Since GLib is a cross-platform library, applications using it to interface \
 with the operating system are usually portable across different operating \
-systems without major changes
-"
+systems without major changes"
 HOMEPAGE="http://www.gtk.org/"
-SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz"
-CHECKSUM_SHA256="6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
-LICENSE="GNU LGPL v2"
 COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	1991-2002 Free Software Foundation, Inc.
 	1997-2002 University of Cambridge.
 	1998-2001, 2003-2010 Red Hat, Inc.
 	1995-2002 Several others"
-
+LICENSE="GNU LGPL v2"
 REVISION="1"
+SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz"
+CHECKSUM_SHA256="6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
+PATCHES="glib-1.2.10.patchset"
 
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -34,15 +34,27 @@ PROVIDES="
 	lib:libgthread$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libgthread_1.2$secondaryArchSuffix = $portVersion compat >= 1
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	glib${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	cmd:glib_config$secondaryArchSuffix = $portVersion
+	devel:libglib$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libglib_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgmodule$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgmodule_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgthread$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgthread_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	glib$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -55,8 +67,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="glib-1.2.10.patchset"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -92,20 +102,3 @@ INSTALL()
 		$developDir $binDir \
 		$manDir $infoDir $dataDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	glib${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	cmd:glib_config$secondaryArchSuffix = $portVersion
-	devel:libglib$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libglib_1.2$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libgmodule$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libgmodule_1.2$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libgthread$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libgthread_1.2$secondaryArchSuffix = $portVersion compat >= 1
-	"
-
-REQUIRES_devel="
-	glib$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/gmp/gmp-5.1.3.recipe b/dev-libs/gmp/gmp-5.1.3.recipe
index ff7d306a0..e8eca1b43 100644
--- a/dev-libs/gmp/gmp-5.1.3.recipe
+++ b/dev-libs/gmp/gmp-5.1.3.recipe
@@ -1,29 +1,41 @@
-SUMMARY="GMP - GNU Multiple Precision Arithmetic Library"
-DESCRIPTION="
-The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
-arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
-and floating point numbers. There are no practical limits to the precision \
-except the ones implied by the available memory in the machine GMP runs on \
-(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
-64-bit machines). GMP has a rich set of functions, and the functions have a \
-regular interface. The basic interface is for C but wrappers exist for other \
-languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
-"
+SUMMARY="The GNU multiple precision arithmetic library" 
+DESCRIPTION="The GNU Multiple Precision Arithmetic Library (GMP) is a free \
+library for arbitrary-precision arithmetic, operating on signed integers, \
+rational numbers, and floating point numbers.
+
+There are no practical limits to the precision except the ones implied by \
+the available memory in the machine GMP runs on (operand dimension limit is \
+2^(32)-1 bits on 32-bit machines and 2^37 bits on 64-bit machines).
+GMP has a rich set of functions, and the functions have a regular interface. \
+The basic interface is for C but wrappers exist for other languages including \
+Ada, C++, C#, OCaml, Perl, PHP, and Python."
 HOMEPAGE="http://gmplib.org/"
-SOURCE_URI="http://ftp.gnu.org/gnu/gmp/gmp-5.1.3.tar.xz"
-CHECKSUM_SHA256="dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071"
+COPYRIGHT="1991-2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-COPYRIGHT="1991-2013 Free Software Foundation, Inc."
 REVISION="1"
+SOURCE_URI="http://ftp.gnu.org/gnu/gmp/gmp-5.1.3.tar.xz"
+CHECKSUM_SHA256="dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071"
+
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
+
+PROVIDES="
+	gmp$secondaryArchSuffix = $portVersion compat >= 5.1
 	lib:libgmp$secondaryArchSuffix = 10.1.3 compat >= 10
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	gmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.1.3 compat >= 0
+	"
+REQUIRES_devel="
+	gmp$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -61,13 +73,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package
-
-PROVIDES_devel="
-	gmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmp$secondaryArchSuffix = 10.1.3 compat >= 0
-	"
-REQUIRES_devel="
-	gmp$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe
index 0311b23dd..2dbc858ae 100644
--- a/dev-libs/gmp/gmp-6.0.0.recipe
+++ b/dev-libs/gmp/gmp-6.0.0.recipe
@@ -1,33 +1,41 @@
-SUMMARY="GMP - GNU Multiple Precision Arithmetic Library"
-DESCRIPTION="
-The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
-arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
-and floating point numbers. There are no practical limits to the precision \
-except the ones implied by the available memory in the machine GMP runs on \
-(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
-64-bit machines).
-GMP has a rich set of functions, and the functions have a \
-regular interface. The basic interface is for C but wrappers exist for other \
-languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
-"
+SUMMARY="The GNU multiple precision arithmetic library" 
+DESCRIPTION="The GNU Multiple Precision Arithmetic Library (GMP) is a free \
+library for arbitrary-precision arithmetic, operating on signed integers, \
+rational numbers, and floating point numbers.
+
+There are no practical limits to the precision except the ones implied by \
+the available memory in the machine GMP runs on (operand dimension limit is \
+2^(32)-1 bits on 32-bit machines and 2^37 bits on 64-bit machines).
+GMP has a rich set of functions, and the functions have a regular interface. \
+The basic interface is for C but wrappers exist for other languages including \
+Ada, C++, C#, OCaml, Perl, PHP, and Python."
 HOMEPAGE="http://gmplib.org/"
+COPYRIGHT="1991-2014 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/gmp/gmp-6.0.0a.tar.xz"
 CHECKSUM_SHA256="9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764"
-LICENSE="
-	GNU GPL v3
-	GNU LGPL v3
-	"
-COPYRIGHT="1991-2014 Free Software Foundation, Inc."
-REVISION="1"
+
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 6.0
+PROVIDES="
+	gmp$secondaryArchSuffix = $portVersion compat >= 6.0
 	lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	gmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
+	"
+REQUIRES_devel="
+	gmp$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -65,13 +73,3 @@ TEST()
 {
 	make $jobArgs check
 }
-
-# ----- devel package
-
-PROVIDES_devel="
-	gmp${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
-	"
-REQUIRES_devel="
-	gmp$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe
index 691f690c7..1929fbc68 100644
--- a/dev-python/docutils/docutils-0.11.recipe
+++ b/dev-python/docutils/docutils-0.11.recipe
@@ -1,13 +1,9 @@
-SUMMARY="Docutils is an open-source text processing system"
-DESCRIPTION="
-Docutils is an open-source text processing system for processing plaintext \
-documentation into useful formats, such as HTML, LaTeX, man-pages, \
+SUMMARY="An open-source text processing system"
+DESCRIPTION="Docutils is an open-source text processing system for processing \
+plaintext documentation into useful formats, such as HTML, LaTeX, man-pages, \
 open-document or XML. It includes reStructuredText, the easy to read, easy to \
-use, what-you-see-is-what-you-get plaintext markup language.
-"
+use, what-you-see-is-what-you-get plaintext markup language."
 HOMEPAGE="http://docutils.sourceforge.net/"
-SOURCE_URI="http://sourceforge.net/projects/docutils/files/docutils/0.11/docutils-0.11.tar.gz"
-CHECKSUM_SHA256="9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9"
 COPYRIGHT="Günter Milde
 	John Gruber
 	Alex Fernández"
@@ -16,6 +12,9 @@ LICENSE="Public Domain
 	GNU GPL v3
 	Python"
 REVISION="1"
+SOURCE_URI="http://sourceforge.net/projects/docutils/files/docutils/0.11/docutils-0.11.tar.gz"
+CHECKSUM_SHA256="9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9"
+
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
@@ -32,15 +31,15 @@ PROVIDES="
 	cmd:rst2xml.py = $portVersion
 	cmd:rstpep2html.py = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:python
 	"
 
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:python
 	"
 
diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe
index 27ed7fb47..ae7d65f89 100644
--- a/games-engines/gemrb/gemrb-0.8.1.recipe
+++ b/games-engines/gemrb/gemrb-0.8.1.recipe
@@ -1,51 +1,43 @@
-SUMMARY="GemRB is an Infinite game engine generator"
+SUMMARY="An infinite game engine generator"
 DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \
 is a port (actually a new implementation) of the original Infinity \
 Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \
 to Linux/Unix, MacOS X and Windows with some enhancements. Would \
 you like to create a game like Baldur's Gate?"
-
-LICENSE="MIT"
-COPYRIGHT="2003-2010 The GemRB Team"
-
 HOMEPAGE="https://github.com/gemrb/gemrb"
+COPYRIGHT="2003-2010 The GemRB Team"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/gemrb/gemrb/archive/v0.8.1.tar.gz"
-
+CHECKSUM_SHA256="02e7d70f5f3f37d424a3bd2ceb705b8d532fb58d5a1da0a88fb20bc1b67e11b1"
 SOURCE_DIR="gemrb-$portVersion"
+PATCHES="gemrb_x86-0.8.1.patchset"
 
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-CHECKSUM_SHA256="02e7d70f5f3f37d424a3bd2ceb705b8d532fb58d5a1da0a88fb20bc1b67e11b1"
-
-REVISION="1"
-
 PROVIDES="
-        gemrb = $portVersion
-        app:gemrb = $portVersion
+	gemrb = $portVersion
+	app:gemrb = $portVersion
         "
-
 REQUIRES="
-        haiku$secondaryArchSuffix
-        lib:libSDL_1.2$secondaryArchSuffix
-        lib:libz$secondaryArchSuffix
-        lib:libutil$secondaryArchSuffix
-        "
+	haiku$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libutil$secondaryArchSuffix
+	"
 
 BUILD_REQUIRES="
-        haiku${secondaryArchSuffix}_devel
-        devel:libsdl_1.2$secondaryArchSuffix
-        devel:libz$secondaryArchSuffix
-        "
-
+	haiku${secondaryArchSuffix}_devel
+	devel:libsdl_1.2$secondaryArchSuffix
+ 	devel:libz$secondaryArchSuffix
+	"
 BUILD_PREREQUIRES="
-        cmd:gcc$secondaryArchSuffix
-        cmd:cmake
-        cmd:make
-        cmd:python
-        "
-
-PATCHES="gemrb_x86-0.8.1.patchset"
+	cmd:gcc$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:python
+	"
 
 BUILD()
 {
@@ -59,4 +51,4 @@ INSTALL()
 {
         cd build
         make install
-}
\ No newline at end of file
+}
diff --git a/haiku-apps/caya/caya-0.0.3.recipe b/haiku-apps/caya/caya-0.0.3.recipe
index 612c50705..7d2283d50 100644
--- a/haiku-apps/caya/caya-0.0.3.recipe
+++ b/haiku-apps/caya/caya-0.0.3.recipe
@@ -1,19 +1,15 @@
-SUMMARY="Caya is a multiprotocol IM client"
-DESCRIPTION="
-Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \
-google talk, and facebook.
-"
+SUMMARY="A multi-protocol IM client"
+DESCRIPTION="Caya is a multi-protocol chat client for Haiku. It supports \
+msn, aim, jabber, google talk, and facebook."
 HOMEPAGE="http://www.versut.com/caya/"
+COPYRIGHT="2009-2011 Andrea Anzani
+	2010-2015 Dario Casalinuovo
+	2009-2011 Pier Luigi Fiorini"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="https://github.com/Barrett17/Caya/archive/caya-0.0.3.tar.gz"
 CHECKSUM_SHA256="cb4580557671cdd7cc74d8cfd1301e407d266f71145dea8aa96d5c42daec397a"
-
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2009-2011 Andrea Anzani
-	2010-2015 Dario Casalinuovo
-	2009-2011 Pier Luigi Fiorini
-	"
+SOURCE_DIR="Caya-caya-0.0.3"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 # no secondary architectures due to Deskbar's replicant handeling.
@@ -27,6 +23,7 @@ REQUIRES="
 	lib:libexpat
 	lib:libssl
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libexpat
@@ -40,7 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:tr
 	cmd:which
 	"
-SOURCE_DIR=Caya-caya-0.0.3
 
 BUILD()
 {
diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
index 7b80667f7..788f3f384 100644
--- a/haiku-apps/digiclock/digiclock-1.0.recipe
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -1,29 +1,27 @@
-SUMMARY="DigiClock Screensaver"
-DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and\
- random colors."
+SUMMARY="A screensaver showing a binary clock"
+DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled \
+rectangles and random colors."
 HOMEPAGE="http://www.fatelk.com"
+COPYRIGHT="2012 Jim Saxton, Fat Elk Software"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="https://github.com/bbjimmy/DigiClock/archive/1.0.tar.gz"
 CHECKSUM_SHA512="24ab1ed06a4b13d63fbca87708a9e98b53b5737d12fee22663549132e6434b61e789326231e0168447f46f609eb4a296497f98418db41874cc712756f118daa8"
 SOURCE_DIR="DigiClock-1.0"
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2012 Jim Saxton, Fat Elk Software"
-
-REVISION="2"
-
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	digiclock = $portVersion
 	app:digiclock = $portVersion
 	"
-
 REQUIRES="
-	haiku"
+	haiku
+	"
 
 BUILD_REQUIRES="
-	haiku_devel"
-
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
index aae90f3fb..bd5400a20 100644
--- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
+++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
@@ -1,16 +1,13 @@
-SUMMARY="DockBert adds a dock to your deskbar"
-DESCRIPTION="
-DockBert is a Deskbar modification. It adds a dock to your deskbar where you \
-may have shortcuts organized in \"tabs\", a tab of the running apps and some \
-other general eyecandy.
-"
+SUMMARY="A dock for the Deskbar"
+DESCRIPTION="DockBert is a Deskbar modification. It adds a dock to your \
+Deskbar here you may have shortcuts organized in \"tabs\", a tab of the \
+running apps and some other general eyecandy."
 HOMEPAGE="https://github.com/HaikuArchives/DockBert"
-SOURCE_URI="https://github.com/HaikuArchives/DockBert/archive/722161cf8646b18eee2d00208fa649a0ebfe8d00.zip"
-CHECKSUM_SHA256="704a8cde914b41219e60ef8fc375ab7847cae580b1265f1b9b84cbe294334cce"
 COPYRIGHT="2005 yellowTAB GmbH"
 LICENSE="BSD (3-clause)"
-
 REVISION="4"
+SOURCE_URI="https://github.com/HaikuArchives/DockBert/archive/722161cf8646b18eee2d00208fa649a0ebfe8d00.zip"
+CHECKSUM_SHA256="704a8cde914b41219e60ef8fc375ab7847cae580b1265f1b9b84cbe294334cce"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -19,7 +16,6 @@ PROVIDES="
 	dockbert = $portVersion
 	app:Dock = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
@@ -27,7 +23,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
diff --git a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
index 84c6b5be3..0a06d3517 100644
--- a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
+++ b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
@@ -1,11 +1,14 @@
-SUMMARY="DuckSaver screen saver"
-DESCRIPTION="DuckSaver is a screen saver which transforms your screen into a duck pool."
+SUMMARY="A screensaver with ducks"
+DESCRIPTION="DuckSaver is a screen saver which transforms your screen into a \
+duck pool."
 HOMEPAGE="http://maybe.de/software/ducksaver"
-SOURCE_URI="git://github.com/jscipione/DuckSaver#4859bfaf74d3d42883e03c85ef02a2ef03569a19"
-REVISION="2"
 COPYRIGHT="2002-2008, Werner Freytag, 2009-2014 Haiku, Inc."
 LICENSE="MIT"
+REVISION="2"
+SOURCE_URI="git://github.com/jscipione/DuckSaver#4859bfaf74d3d42883e03c85ef02a2ef03569a19"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	ducksaver = $portVersion
 	addon:DuckSaver = $portVersion
@@ -13,14 +16,15 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+	
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	"
-BUILD_REQUIRES="
-	haiku_devel
-	"
 
 BUILD()
 {
diff --git a/haiku-apps/globe/globe-0.4.recipe b/haiku-apps/globe/globe-0.4.recipe
index a006bc76a..4f108979f 100644
--- a/haiku-apps/globe/globe-0.4.recipe
+++ b/haiku-apps/globe/globe-0.4.recipe
@@ -1,33 +1,32 @@
-SUMMARY="Globe Web Editor"
-DESCRIPTION="
-Globe is an editor with support for HTML and PHP. It offers syntax \
-highlighting and basic project management.
-"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2004 Gergely Rózsahegyi"
+SUMMARY="A web editor"
+DESCRIPTION="Globe is an editor with support for HTML and PHP. It offers \
+syntax highlighting and basic project management."
 HOMEPAGE="http://globe.beos.hu/index_en.html"
+COPYRIGHT="2001-2004 Gergely Rózsahegyi"
+LICENSE="GNU GPL v2"
+REVISION="3"
 SOURCE_URI="https://github.com/HaikuArchives/Globe/archive/93b044c9e4eb2d12b18d138cec010507840c6836.tar.gz"
 CHECKSUM_SHA256="28c410dcc019267d8e400f4e56ae7cf7a0a1d80d34f78dd292f4f84d1fb31bc6"
 SOURCE_DIR="Globe-93b044c9e4eb2d12b18d138cec010507840c6836"
-REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 REQUIRES="
 	haiku
 	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	makefile_engine
-	cmd:gcc
-	cmd:make
-	"
-
 PROVIDES="
 	globe = $portVersion
 	app:Globe = $portVersion
 	"
+	
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	"
 
 BUILD()
 {
diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe
index c068fcdbb..f069535da 100644
--- a/media-libs/allegro/allegro-4.4.2.recipe
+++ b/media-libs/allegro/allegro-4.4.2.recipe
@@ -1,24 +1,22 @@
-SUMMARY="Allegro game programming library"
-DESCRIPTION="
-Allegro 4 and Allegro 5 are cross-platform, libraries mainly aimed at video \
-game and multimedia programming. They handle common, low-level tasks such as \
-creating windows, accepting user input, loading data, drawing images, playing \
-sounds, etc. and generally abstracting away the underlying platform. However, \
-Allegro is not a game engine: you are free to design and structure your \
-program as you like.
+SUMMARY="A cross-platform game programming library"
+DESCRIPTION="Allegro 4 and Allegro 5 are cross-platform, libraries mainly \
+aimed at video game and multimedia programming. They handle common, low-level \
+tasks such as creating windows, accepting user input, loading data, drawing \
+images, playing sounds, etc. and generally abstracting away the underlying \
+platform. However, Allegro is not a game engine: you are free to design and \
+structure your program as you like.
 
 According to the Oxford Companion to Music, Allegro is the Italian for «quick, \
 lively, bright». It is also a recursive acronym which stands for «Allegro Low \
 LEvel Game ROutines». Allegro was started by Shawn Hargreaves in the mid-90's \
-but has since received contributions from hundreds of people over the net.
-"
+but has since received contributions from hundreds of people over the net."
 HOMEPAGE="http://alleg.sourceforge.net/"
+COPYRIGHT="1998-2010 Shawn Hargreaves et al."
+LICENSE="Allegro"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.2/allegro-4.4.2.tar.gz/download"
 CHECKSUM_SHA256="1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc"
-LICENSE="Allegro"
-COPYRIGHT="1998-2010 Shawn Hargreaves et al."
-
-REVISION="1"
+PATCHES="allegro-4.4.2.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -27,7 +25,6 @@ PROVIDES="
 	allegro$secondaryArchSuffix = $portVersion
 	lib:liballeg$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -42,40 +39,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	"
 fi
 
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libpng$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:cmake
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-PATCHES="allegro-4.4.2.patchset"
-
-BUILD()
-{
-	cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir \
-		-DLIB_SUFFIX=$secondaryArchSubDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg
-
-	packageEntries devel $developDir $binDir
-}
-
 PROVIDES_devel="
 	allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4
 	devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4
@@ -99,3 +62,33 @@ REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	allegro$secondaryArchSuffix == $portVersion base
 	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir \
+		-DLIB_SUFFIX=$secondaryArchSubDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg
+	packageEntries devel $developDir $binDir
+}
diff --git a/media-libs/flac/flac-1.3.1.recipe b/media-libs/flac/flac-1.3.1.recipe
index fa0b432f4..5843b804b 100644
--- a/media-libs/flac/flac-1.3.1.recipe
+++ b/media-libs/flac/flac-1.3.1.recipe
@@ -1,29 +1,23 @@
-SUMMARY="flac - Free Lossless Audio Codec"
-DESCRIPTION="
-FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but \
-lossless, meaning that audio is compressed in FLAC without any loss in \
-quality. This is similar to how Zip works, except with FLAC you will get much \
-better compression because it is designed specifically for audio, and you can \
-play back compressed FLAC files in your favorite player (or your car or home \
-stereo) just like you would an MP3 file.
-"
+SUMMARY="The free lossless audio codec"
+DESCRIPTION="FLAC stands for Free Lossless Audio Codec, an audio format \
+similar to MP3, but lossless, meaning that audio is compressed in FLAC \
+without any loss in quality. This is similar to how Zip works, except with \
+FLAC you will get much better compression because it is designed specifically \
+for audio, and you can play back compressed FLAC files in your favorite player \
+(or your car or home stereo) just like you would an MP3 file."
 HOMEPAGE="http://flac.sourceforge.net/"
-SOURCE_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz"
-CHECKSUM_SHA256="4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"
-REVISION="1"
-
+COPYRIGHT="2000-2007 Josh Coalson"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
-	BSD (3-clause)
-	"
-
-COPYRIGHT="2000-2007 Josh Coalson"
+	BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz"
+CHECKSUM_SHA256="4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"
+PATCHES="flac-1.3.1.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="flac-1.3.1.patchset"
-
 PROVIDES="
 	flac$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libFLAC$secondaryArchSuffix = 8.3.0 compat >= 8
@@ -35,7 +29,6 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:metaflac$secondaryArchSuffix
 		"
 fi
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -43,12 +36,20 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	flac${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libFLAC$secondaryArchSuffix = 8.3.0 compat >= 8
+	devel:libFLAC++$secondaryArchSuffix = 6.3.0 compat >= 6
+	"
+REQUIRES_devel="
+	flac$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:nasm
 	cmd:gcc$secondaryArchSuffix
@@ -102,15 +103,3 @@ TEST()
 	test_flac.sh
 	test_seeking.sh
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	flac${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libFLAC$secondaryArchSuffix = 8.3.0 compat >= 8
-	devel:libFLAC++$secondaryArchSuffix = 6.3.0 compat >= 6
-	"
-
-REQUIRES_devel="
-	flac$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/giflib/giflib-5.1.1.recipe b/media-libs/giflib/giflib-5.1.1.recipe
index b0e8c2220..2592c7715 100644
--- a/media-libs/giflib/giflib-5.1.1.recipe
+++ b/media-libs/giflib/giflib-5.1.1.recipe
@@ -1,26 +1,26 @@
-DESCRIPTION="
-The GIFLIB project maintains the giflib service library, which has been pulling
-images out of GIFs since 1989. It is deployed everywhere you can think of and
-some places you probably can't - graphics applications and web browsers on
-multiple operating systems, game consoles, smartphones, and likely your ATM too.
+SUMMARY="A library for processing GIFs"
+DESCRIPTION="The GIFLIB project maintains the giflib service library, which \
+has been pulling images out of GIFs since 1989. It is deployed everywhere you \
+can think of and some places you probably can't - graphics applications and \
+web browsers on multiple operating systems, game consoles, smartphones, and \
+likely your ATM too.
 
-This is very mature, stable, small-footprint code with minimal dependencies
-(suitable for use in embedded deployments) that needs only occasional very
-minor bugfixes. Test reports from odd platforms and better regression tests are
-particularly welcome. Don't try to redesign it, applications beyond counting
-would break if you did.
+This is very mature, stable, small-footprint code with minimal dependencies \
+(suitable for use in embedded deployments) that needs only occasional very \
+minor bugfixes. Test reports from odd platforms and better regression tests \
+are particularly welcome. Don't try to redesign it, applications beyond \
+counting would break if you did.
 
-It's \"GIFLIB\" in caps as a nod to the code's origins in the dark and backward
-abysm of MS-DOS, but Unix hackers are encouraged to spell it \"giflib\" in
-deference to local conventions. :-)
-"
-SUMMARY="giflib - A library for processing GIFs"
+It's \"GIFLIB\" in caps as a nod to the code's origins in the dark and \
+backward abysm of MS-DOS, but Unix hackers are encouraged to spell it \
+\"giflib\" in deference to local conventions. :-)"
 HOMEPAGE="http://sourceforge.net/projects/giflib/"
+COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/giflib/files/giflib-$portVersion.tar.bz2"
 CHECKSUM_SHA256="391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc"
-LICENSE="MIT"
-COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
-REVISION="1"
+PATCHES="giflib-5.1.0.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -38,15 +38,25 @@ PROVIDES="
 	cmd:giftext$secondaryArchSuffix
 	cmd:giftool$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5
+	devel:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
+	"
+REQUIRES_devel="
+	giflib$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
+<<<<<<< HEAD
 
+=======
+>>>>>>> De-lint recipes.
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -57,8 +67,6 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-PATCHES="giflib-5.1.0.patchset"
-
 BUILD()
 {
 	runConfigure ./configure
@@ -76,12 +84,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir
 }
-
-PROVIDES_devel="
-	giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5
-	devel:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
-	"
-
-REQUIRES_devel="
-	giflib$secondaryArchSuffix == $portVersion base
-	"
diff --git a/sci-libs/gdal/gdal-1.11.0.recipe b/sci-libs/gdal/gdal-1.11.0.recipe
index 89f8000f3..4a36ec8f7 100644
--- a/sci-libs/gdal/gdal-1.11.0.recipe
+++ b/sci-libs/gdal/gdal-1.11.0.recipe
@@ -1,14 +1,12 @@
-SUMMARY="GDAL - Geospatial Data Abstraction Library"
-DESCRIPTION="
-GDAL is a translator library for raster and vector geospatial data formats \
-that is released under an X/MIT style OpenSource license by the Open \
-Source Geospatial Foundation. As a library, it presents a single raster \
+SUMMARY="The Geospatial Data Abstraction Library"
+DESCRIPTION="GDAL is a translator library for raster and vector geospatial \
+data formats that is released under an X/MIT style OpenSource license by the \
+Open Source Geospatial Foundation. As a library, it presents a single raster \
 abstract data model and vector abstract data model to the calling application \
 for all supported formats. It also comes with a variety of useful \
 commandline utilies for data translation and processing."
 HOMEPAGE="http://www.gdal.org"
-COPYRIGHT="
-	2007-2014 Even Rouault
+COPYRIGHT="2007-2014 Even Rouault
 	2011 Alessandro Furieri
 	1999, 2001, 2002-2003, 2005, 2008 Frank Warmerdam
 	2013 Paul Ramsey
@@ -28,19 +26,18 @@ COPYRIGHT="
 	2011 Ben Ahmed Daho Ali
 	2002 Mark Phillips
 	2009-2014 Martin Landa
-	2013  ZJU Walkinfo Technology Corp., Ltd.
-	"
+	2013  ZJU Walkinfo Technology Corp., Ltd."
 LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz"
 CHECKSUM_SHA256="b5186b5817e94743de1bceef66aeee1461687e14f73bf81034fcf0377eacbcc3"
-REVISION="1"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 if [ $targetArchitecture != x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
-PATCHES="gdal-$portVersion.patchset"
 
 PROVIDES="
 	gdal$secondaryArchSuffix = $portVersion compat >= 1.11
@@ -81,6 +78,16 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	gdal${secondaryArchSuffix}_devel = $portVersion compat >= 1.11
+	cmd:gdal_config$secondaryArchSuffix
+	devel:libgdal$secondaryArchSuffix = 1.18.0 compat >= 1.18
+	"
+REQUIRES_devel="
+	gdal$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
@@ -124,14 +131,3 @@ INSTALL()
 		$binDir/gdal-config \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	gdal${secondaryArchSuffix}_devel = $portVersion compat >= 1.11
-	cmd:gdal_config$secondaryArchSuffix
-	devel:libgdal$secondaryArchSuffix = 1.18.0 compat >= 1.18
-	"
-REQUIRES_devel="
-	gdal$secondaryArchSuffix == $portVersion base
-	"