From 18588b4916136c3b5158933e3eeb5d90386d6f91 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 20 Aug 2015 19:00:14 +0200
Subject: [PATCH] Improved SUMMARY/DESCRIPTION and re-ordered blocks

---
 app-arch/lha/lha-1.14i.recipe                 |  27 +--
 app-arch/lz4/lz4-r131.recipe                  |  39 ++-
 .../vmware-addons/vmware_addons-1.1.1.recipe  |  24 +-
 app-text/psiconv/psiconv-0.9.8.recipe         |  46 ++--
 app-text/texi2html/texi2html-1.82.recipe      |  27 ++-
 app-text/xmlto/xmlto-0.0.26.recipe            |  24 +-
 dev-db/postgresql/postgresql-9.3.5.recipe     |  38 +--
 .../postgresql_server-9.3.4.recipe            |  24 +-
 dev-embedded/2cdt/2cdt-2014.01.03.recipe      |  45 ++--
 dev-games/physfs/physfs-2.0.3.recipe          |  41 ++--
 dev-lang/luajit/luajit-2.0.2.recipe           |  32 +--
 dev-lang/ocaml/ocaml-4.01.0.recipe            |  25 +-
 dev-lang/openjdk/openjdk-1.8.u40_b27.recipe   |  11 +-
 dev-libs/apr/apr-1.5.2.recipe                 |  80 +++----
 dev-libs/apr_util/apr_util-1.5.4.recipe       |  54 ++---
 dev-libs/icu/icu-55.1.recipe                  | 138 ++++++-----
 dev-libs/libevent/libevent-2.0.21.recipe      |  65 +++--
 dev-libs/libiconv/libiconv-1.13.1.recipe      | 226 +++++++++---------
 .../libpthread_stubs-0.3.recipe               |  22 +-
 .../libusb-compat/libusb_compat-0.1.5.recipe  |   4 +-
 dev-libs/libusb/libusb-1.0.19.recipe          |  62 ++---
 dev-libs/libxml2/libxml2-2.9.2.recipe         |  81 +++----
 dev-libs/libxslt/libxslt-1.1.28.recipe        |  14 +-
 dev-libs/lzo/lzo-2.09.recipe                  |  41 ++--
 dev-libs/mpc/mpc-1.0.3.recipe                 |  40 ++--
 dev-libs/mpfr/mpfr-3.1.3.recipe               |  28 +--
 26 files changed, 604 insertions(+), 654 deletions(-)

diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe
index 6af3f5a14..eba11742a 100644
--- a/app-arch/lha/lha-1.14i.recipe
+++ b/app-arch/lha/lha-1.14i.recipe
@@ -1,18 +1,16 @@
-SUMMARY="Archive files using LZSS and Huffman compression (.lzh files)"
-DESCRIPTION="
-LHA archives are often used on Amiga computers. The compression is rather \
-effective and the unpacking is fast.
-"
-LICENSE="lha"
-COPYRIGHT="
-	1991, Masaru Oki
-	1993-1995, Nobutaka Watazaki
-	2000, Tsugio Okamoto et al.
-	"
+SUMMARY="Tools to archive files using LZSS and Huffman compression (.lzh files)"
+DESCRIPTION="LHA archives are often used on Amiga computers. The compression \
+is rather effective and the unpacking is fast."
 HOMEPAGE="http://sourceforge.jp/projects/lha/"
+COPYRIGHT="1991, Masaru Oki
+	1993-1995, Nobutaka Watazaki
+	2000, Tsugio Okamoto et al."
+LICENSE="lha"
+REVISION="2"
 SOURCE_URI="http://jaist.dl.sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz"
 CHECKSUM_SHA256="b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4"
-REVISION="2"
+SOURCE_DIR="lha-1.14i-ac20050924p1"
+PATCHES="lha-1.14i.patchset"
 ARCHITECTURES="x86 x86_gcc2 ?x86_64"
 
 PROVIDES="
@@ -23,6 +21,7 @@ REQUIRES="
 	haiku
 	lib:libiconv
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libiconv
@@ -38,10 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-PATCHES="lha-1.14i.patchset"
-
-SOURCE_DIR="lha-1.14i-ac20050924p1"
-
 BUILD()
 {
 	autoreconf -vfi
diff --git a/app-arch/lz4/lz4-r131.recipe b/app-arch/lz4/lz4-r131.recipe
index 8db93dee7..837d11cec 100644
--- a/app-arch/lz4/lz4-r131.recipe
+++ b/app-arch/lz4/lz4-r131.recipe
@@ -1,22 +1,20 @@
-SUMMARY="Data compression utilities and libraries for the LZ4 format"
-DESCRIPTION="
-LZ4 is a very fast lossless compression algorithm, providing compression speed \
-at 400 MB/s per core, scalable with multi-cores CPU. It also features an \
-extremely fast decoder, with speed in multiple GB/s per core, typically \
-reaching RAM speed limits on multi-core systems.
-"
+SUMMARY="Data compression utilities and libraries"
+DESCRIPTION="LZ4 is a very fast lossless compression algorithm, providing \
+compression speed at 400 MB/s per core, scalable with multi-core CPUs. It \
+also features an extremely fast decoder, with speed in multiple GB/s per \
+core, typically reaching RAM speed limits on multi-core systems."
 HOMEPAGE="https://code.google.com/p/lz4/"
-LICENSE="BSD (2-clause)"
 COPYRIGHT="2011-2014, Yann Collet"
+LICENSE="BSD (2-clause)"
+REVISION="1"
 SOURCE_URI="https://github.com/Cyan4973/lz4/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="lz4-$portVersion.tar.gz"
 CHECKSUM_SHA256="9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed"
-REVISION="1"
+PATCHES="lz4-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
-PATCHES="lz4-$portVersion.patchset"
-
 PROVIDES="
 	lz4${secondaryArchSuffix} = $portVersion
 	lib:liblz4${secondaryArchSuffix} = 1.7.0 compat >= 1
@@ -34,6 +32,15 @@ fi
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
+PROVIDES_devel="
+	lz4${secondaryArchSuffix}_devel = $portVersion
+	devel:liblz4$secondaryArchSuffix = 1.7.0 compat >= 1
+	"
+REQUIRES_devel="
+	lz4${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
@@ -59,13 +66,3 @@ INSTALL()
 	packageEntries devel \
     	$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	lz4${secondaryArchSuffix}_devel = $portVersion
-	devel:liblz4$secondaryArchSuffix = 1.7.0 compat >= 1
-	"
-REQUIRES_devel="
-	lz4${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
index 615f099c3..525a46fbf 100644
--- a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
+++ b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
@@ -1,13 +1,13 @@
 SUMMARY="Tools for using Haiku in a VMware virtual machine"
-DESCRIPTION="
-VMware add-ons are a set of tools to enhance interaction between Haiku, \
-running in a virtual machine, and the host operating system. It is like \
-the official VMware tools on Windows or Linux.
+DESCRIPTION="VMware add-ons are a set of tools to enhance interaction \
+between Haiku, running in a virtual machine, and the host operating system. \
+It is like the official VMware tools on Windows or Linux.
+
 It currently provides:
  * Clipboard sharing between Haiku and the host OS
  * Mouse sharing: the mouse can seamlessly enter and quit the VM window.
- * Disk compacting: starts the VMware "shrink" process, which reduces the \
-size of "auto-expanding" virtual disks attached to the virtual machine. \
+ * Disk compacting: starts the VMware \"shrink\" process, which reduces the \
+size of \"auto-expanding\" virtual disks attached to the virtual machine. \
 The free space on disks is cleaned up previously, in order to get better \
 results.
  * Graphics driver: you can choose your preferred resolution using Screen \
@@ -20,14 +20,12 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 	"
 fi
 HOMEPAGE="https://github.com/HaikuArchives/VMwareAddons"
-SOURCE_URI="git://github.com/HaikuArchives/VMwareAddons#54a5999ce64b242aa992760adcf4b1ac14e23333"
-COPYRIGHT="
-	1999 Be Inc.
+COPYRIGHT="1999 Be Inc.
 	2007 Haiku, Inc.
-	2009 Vincent Duvert
-	"
+	2009 Vincent Duvert"
 LICENSE="MIT"
 REVISION="2"
+SOURCE_URI="git://github.com/HaikuArchives/VMwareAddons#54a5999ce64b242aa992760adcf4b1ac14e23333"
 
 ARCHITECTURES="x86_gcc2 x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -41,8 +39,10 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/app-text/psiconv/psiconv-0.9.8.recipe b/app-text/psiconv/psiconv-0.9.8.recipe
index dfa65e573..aeab9a892 100644
--- a/app-text/psiconv/psiconv-0.9.8.recipe
+++ b/app-text/psiconv/psiconv-0.9.8.recipe
@@ -8,45 +8,52 @@ conversion programs. At least, that is what I have gathered through the \
 newsgroups and from other sources.
 
 The Psion 5MX uses mostly the same file formats as the Psion 5; the conversion \
-utilities seem to work, though you might get a few additional warnings. I own \
-a 5MX myself now, so this will improve. Other Psion PDA's might be supported \
-too, and even other machines running EPOC32. The Psion Series 3 uses EPOC16, \
-and are not supported.
-"
+utilities seem to work, though you might get a few additional warnings. Other \
+Psion PDAs might be supported too, and even other machines running EPOC32. The \
+Psion Series 3 uses EPOC16, and are not supported."
 HOMEPAGE="http://software.frodo.looijaard.name/psiconv/"
-REVISION="1"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2005  Frodo Looijaard"
-ARCHITECTURES="x86_gcc2 x86"
-
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="${HOMEPAGE}files/psiconv-$portVersion.tar.gz"
 CHECKSUM_SHA256="1eee15b29ddcbfd2d15e0a0d26f59e28bac281c870b77418fa369dceed796806"
 PATCHES="psiconv-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	psiconv = $portVersion
 	cmd:psiconv
 	cmd:psiconv_config
 	lib:libpsiconv = 6.4.2 compat >= 6
-"
-
+	"
 REQUIRES="
 	haiku
-"
+	"
 
-BUILD_PREREQUIRES="
+PROVIDES_devel="
+	psiconv_devel = $portVersion
+	devel:libpsiconv = 6.4.2 compat >= 6
+	"
+REQUIRES_devel="
+	psiconv == $portVersion base
+	"
+
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
 	cmd:libtoolize
 	cmd:make
-"
+	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/psiconv/psiconv.conf keep-old
 	settings/psiconv/psiconv.conf.eg keep-old
-"
+	"
 
 BUILD()
 {
@@ -64,12 +71,3 @@ INSTALL()
 	prepareInstalledDevelLib libpsiconv
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	psiconv_devel = $portVersion
-	devel:libpsiconv = 6.4.2 compat >= 6
-"
-
-REQUIRES_devel="
-	psiconv == $portVersion base
-"
diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe
index bf372bcec..30ef5fa7c 100644
--- a/app-text/texi2html/texi2html-1.82.recipe
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -1,38 +1,41 @@
 SUMMARY="Perl script that converts Texinfo to HTML"
-DESCRIPTION="
-Texi2HTML is a Perl script which converts Texinfo source files to HTML output, \
-licensed under the GNU General Public License, version 3, or any later version.
+DESCRIPTION="Texi2HTML is a Perl script which converts Texinfo source files \
+to HTML output.
+
 This is an evolving version of the script originally developed by Lionel Cons \
 and later maintained for a time by Olaf Bachmann. It now supports many \
 advanced features, such as internationalization and extremely configurable \
 output formats. Development of Texi2HTML moved to the GNU Texinfo repository \
 in 2010, since it was meant to replace the makeinfo implementation in GNU \
-Texinfo. There was no release of GNU Texinfo with makeinfo based on Texi2HTML, \
+Texinfo.
+There was no release of GNU Texinfo with makeinfo based on Texi2HTML, \
 however, because the implementation based on Texi2HTML was abandoned in favor \
 of the current program in GNU Texinfo, which parses the Texinfo input into a \
 tree for processing and supports nearly all the features of Texi2HTML. Latest \
 Texi2HTML sources are thus in the GNU Texinfo repository, although development \
 of Texi2HTML and of the Texi2HTML based makeinfo implementation stopped in 2011.
+
 There are some differences between Texi2HTML and the GNU Texinfo \
 makeinfo/texi2any implementation, even in the Texi2HTML compatibility mode, \
 they are documented in the GNU Texinfo manual. Nevertheless, the route forward \
 for authors is, in most cases, to alter manuals and build processes as \
 necessary to use the new features of the makeinfo/texi2any implementation of \
-GNU Texinfo. The Texi2HTML maintainers (one of whom is the principal author of \
+GNU Texinfo.
+
+The Texi2HTML maintainers (one of whom is the principal author of \
 the GNU Texinfo implementation) do not intend to make further releases of \
 Texi2HTML. If you have difficulties using the new implementation, you could \
-try to ask on the GNU Texinfo mailing lists.
-"
+try to ask on the GNU Texinfo mailing lists."
 HOMEPAGE="http://www.nongnu.org/texi2html/"
 COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
 LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2"
 CHECKSUM_SHA256="d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
-REVISION="2"
-ARCHITECTURES="any"
-
 PATCHES="texi2html-1.82.patchset"
 
+ARCHITECTURES="any"
+
 PROVIDES="
 	texi2html = $portVersion compat >= 1.82
 	cmd:texi2html = $portVersion compat >= 1.82
@@ -40,10 +43,11 @@ PROVIDES="
 REQUIRES="
 	cmd:perl
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -52,7 +56,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/app-text/xmlto/xmlto-0.0.26.recipe b/app-text/xmlto/xmlto-0.0.26.recipe
index b260bc386..bb1007d13 100644
--- a/app-text/xmlto/xmlto-0.0.26.recipe
+++ b/app-text/xmlto/xmlto-0.0.26.recipe
@@ -1,20 +1,19 @@
 SUMMARY="Shell-script tool for converting XML files to various formats"
-DESCRIPTION="xmlto is a shell-script tool for converting XML files to \
-various formats. At the moment it supports conversion from docbook, \
+DESCRIPTION="At the moment xmlto supports conversion from docbook, \
 xhtml1 and fo format to various output formats (awt, fo, htmlhelp, \
 javahelp, mif, pdf, svg, xhtml, dvi, html, html-nochunks, man, \
-pcl, ps, txt, xhtml-nochunks, epub). It uses \
-passivetex(default)/fop/dblatex for processing, just provides easy \
-to use command line frontend to make fine output without remembering \
-many long options and searching for syntax. "
+pcl, ps, txt, xhtml-nochunks, epub).
+It uses passivetex(default)/fop/dblatex for processing and provides an easy \
+to use command line frontend to avoid having to remember many long options \
+or searching for the correct syntax."
 HOMEPAGE="https://fedorahosted.org/xmlto/"
-SOURCE_URI="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$portVersion.tar.gz"
-CHECKSUM_SHA256="cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977"
-PATCHES="xmlto-$portVersion.patch"
-REVISION="1"
 COPYRIGHT="2009 Tim Waugh
 	2013 Ondrej Vasik"
 LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$portVersion.tar.gz"
+CHECKSUM_SHA256="cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977"
+PATCHES="xmlto-$portVersion.patch"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -23,7 +22,6 @@ PROVIDES="
 	cmd:xmlto
 	cmd:xmlif
 	"
-
 REQUIRES="
 	haiku
 	cmd:getopt
@@ -31,8 +29,10 @@ REQUIRES="
 	cmd:xsltproc
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:awk
 	cmd:getopt
diff --git a/dev-db/postgresql/postgresql-9.3.5.recipe b/dev-db/postgresql/postgresql-9.3.5.recipe
index da7484125..8deb40517 100644
--- a/dev-db/postgresql/postgresql-9.3.5.recipe
+++ b/dev-db/postgresql/postgresql-9.3.5.recipe
@@ -1,8 +1,7 @@
-SUMMARY="A powerful, open source object-relational database system"
-DESCRIPTION="PostgreSQL is a powerful, open source object-relational database \
-system. It has more than 15 years of active development and a proven \
-architecture that has earned it a strong reputation for reliability, data \
-integrity, and correctness.
+SUMMARY="A powerful object-relational database system"
+DESCRIPTION="PostgreSQL has more than 15 years of active development and a \
+proven architecture that has earned it a strong reputation for reliability, \
+data integrity, and correctness.
 
 * It runs on all major operating systems, including Linux, UNIX (AIX, BSD, \
 HP-UX, SGI IRIX, Mac OS X, Solaris, Tru64), and Windows.
@@ -15,13 +14,14 @@ video.
 * It has native programming interfaces for C/C++, Java, .Net, Perl, Python, \
 Ruby, Tcl, ODBC, among others, and exceptional documentation."
 HOMEPAGE="http://www.postgresql.org/"
-LICENSE="PostgreSQL"
 COPYRIGHT="1996-2014 PostgreSQL Global Development Group"
+LICENSE="PostgreSQL"
+REVISION="2"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v$portVersion/postgresql-$portVersion.tar.bz2"
 CHECKSUM_SHA256="14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"
 SOURCE_DIR="postgresql-$portVersion"
 PATCHES="postgresql-$portVersion.patchset"
-REVISION="2"
+
 ARCHITECTURES="x86_gcc2 ?x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -65,17 +65,7 @@ BUILD_REQUIRES="
 	devel:libreadline$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:aclocal
-	cmd:awk
-	cmd:bison
-	cmd:flex
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
+
 PROVIDES_devel="
 	postgresql${secondaryArchSuffix}_devel = $portVersion
 	devel:libpgport$secondaryArchSuffix = $portVersion
@@ -89,6 +79,18 @@ REQUIRES_devel="
 	postgresql${secondaryArchSuffix} == $portVersion base
 	"
 
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:aclocal
+	cmd:awk
+	cmd:bison
+	cmd:flex
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
 BUILD()
 {
 	runConfigure ./configure
diff --git a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
index 1e26d04ad..b623d7428 100644
--- a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
+++ b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
@@ -1,18 +1,18 @@
-SUMMARY="A powerful, open source object-relational database system"
-DESCRIPTION="PostgreSQL is a powerful, open source object-relational \
-database system. It has more than 15 years of active development and a \
+SUMMARY="A powerful object-relational database system"
+DESCRIPTION="PostgreSQL has more than 15 years of active development and a \
 proven architecture that has earned it a strong reputation for reliability, \
 data integrity, and correctness.
 
-It runs on all major operating systems, including Linux, UNIX (AIX, BSD, \
-HP-UX, SGI IRIX, Mac OS X, Solaris, Tru64), and Windows. It is fully ACID \
-compliant, has full support for foreign keys, joins, views, triggers, and \
-stored procedures (in multiple languages). It includes most SQL:2008 data \
-types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, \
-and TIMESTAMP. It also supports storage of binary large objects, including \
-pictures, sounds, or video. It has native programming interfaces for C/C++, \
-Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional \
-documentation."
+* It runs on all major operating systems, including Linux, UNIX (AIX, BSD, \
+HP-UX, SGI IRIX, Mac OS X, Solaris, Tru64), and Windows.
+* It is fully ACID compliant, has full support for foreign keys, joins, \
+views, triggers, and stored procedures (in multiple languages).
+* It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, \
+CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP.
+* It supports storage of binary large objects, including pictures, sounds, or \
+video.
+* It has native programming interfaces for C/C++, Java, .Net, Perl, Python, \
+Ruby, Tcl, ODBC, among others, and exceptional documentation."
 HOMEPAGE="http://www.postgresql.org/"
 COPYRIGHT="1996-2014, PostgreSQL Global Development Group"
 LICENSE="PostgreSQL"
diff --git a/dev-embedded/2cdt/2cdt-2014.01.03.recipe b/dev-embedded/2cdt/2cdt-2014.01.03.recipe
index 3351e1ad9..6265d675e 100644
--- a/dev-embedded/2cdt/2cdt-2014.01.03.recipe
+++ b/dev-embedded/2cdt/2cdt-2014.01.03.recipe
@@ -1,59 +1,52 @@
 SUMMARY="Convert files into tape images for Amstrad computers"
-DESCRIPTION="2CDT is a utility to transfer files into a \".CDT\" Tape-Image.
+DESCRIPTION="2CDT is a utility to transfer files into a .CDT Tape-Image.
+A .CDT is a tape-image file which describes the data stored on a cassette \
+tape. This file format is very powerful and can describe fast and custom \
+loaders as well as standard operating system formats.
 
-A \".CDT\" is a tape-image file which describes the data stored on a cassette \
-tape.
-
-This file format is very powerful and can describe fast and custom loaders as \
-well as standard operating system formats.
-
-The \".CDT\" file format is identical to the \".TZX\" format. The extension is \
+The .CDT file format is identical to the .TZX format. The extension is \
 used to differentiate between Spectrum and Amstrad Tape-Images.
+The .TZX file format was originally designed to store Spectrum tape \
+programs, its format can be found from various sources, one of these is \
+\"World Of Spectrum\": http://www.void.jump.org/.
 
-The \".TZX\" file format was originally designed to store Spectrum tape \
-programs, it's format can be found from various sources, one of these is \
-\"World Of Spectrum\": http://www.void.jump.org/
-
-There are a number of tools which already create .TZX files, Taper, Voc2TZX \
+There are a number of tools which already create .TZX files: Taper, Voc2TZX \
 and MakeTZX. However, these are designed to recognise Spectrum tape loaders, \
 and so do not do well at creating a tape-image for Amstrad formats.
 
-This tool has been designed as a starting point for furthur Amstrad CDT tools, \
+2CDT has been designed as a starting point for further Amstrad CDT tools, \
 and as a program to generate reference tape-images which can be used by \
 emulator authors to support this tape-image format in their programs.
 
-This tool is designed to \"inject\" one or more file into a \".CDT\" in the \
+This tool is designed to \"inject\" one or more file into a .CDT in the \
 format written  by the Amstrad operating system. The tool allows the user to
-define the \".CDT\" \"recording\" method and baud rate.
-"
+define the .CDT \"recording\" method and baud rate."
 HOMEPAGE="http://cpctech.org.uk/"
+COPYRIGHT="2000-2014 Kevin Thacker"
 REVISION="1"
 LICENSE="GNU GPL v2"
-ARCHITECTURES="x86_gcc2"
-COPYRIGHT="2000-2014 Kevin Thacker"
-
 SOURCE_URI="http://cpctech.cpc-live.com/download/2cdt.zip"
 CHECKSUM_SHA256="e6a4e69de46b256df51c9c265c6b9a50f8016264bfb3d35f5958152b91500e56"
 SOURCE_DIR="2cdt"
 PATCHES="2cdt-$portVersion.patchet"
 
+ARCHITECTURES="x86_gcc2"
+
 PROVIDES="
 	2cdt = $portVersion
 	cmd:2cdt
-"
-
+	"
 REQUIRES="
 	haiku
-"
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-"
+	"
 
 BUILD()
 {
diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe
index 459c43c36..543704a16 100644
--- a/dev-games/physfs/physfs-2.0.3.recipe
+++ b/dev-games/physfs/physfs-2.0.3.recipe
@@ -1,24 +1,23 @@
 SUMMARY="A library to access multiple forms of archives"
-DESCRIPTION="
-Physfs is short for PhysicsFS. It's a C library that provides abstract \
-access to various archives. It is intended for use in video games, and the \
-design was somewhat inspired by Quake 3's file subsystem. The programmer \
-defines a \"write directory\" on the physical filesystem. No file writing done \
-through the PhysicsFS API can leave that write directory, for security.
+DESCRIPTION="Physfs is short for PhysicsFS. It's a C library that provides \
+abstract access to various archives. It is intended for use in video games, \
+and the design was somewhat inspired by Quake 3's file subsystem.
+
+The programmer defines a \"write directory\" on the physical filesystem to \
+which all writing through the PhysicsFS is restricted for security reasons.
 PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are \
-available, the user's home directory, where in the real filesystem your \
-program is running, etc."
+available, the user's home directory (where in the real filesystem your \
+game is running), etc."
 HOMEPAGE="http://icculus.org/physfs"
+COPYRIGHT="2001-2012 Ryan C. Gordon"
+LICENSE="PHYSFS"
+REVISION="2"
 SOURCE_URI="http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2"
 CHECKSUM_SHA256="ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69"
-LICENSE="PHYSFS"
-COPYRIGHT="2001-2012 Ryan C. Gordon"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-REVISION="2"
-
 PROVIDES="
 	physfs$secondaryArchSuffix = $portVersion compat >= 2.0
 	lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
@@ -27,6 +26,15 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	physfs${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
+	devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
+	"
+REQUIRES_devel="
+	physfs$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -35,6 +43,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
+
 PATCH()
 {
 	sed -i "s,DESTINATION include,DESTINATION $relativeIncludeDir," CMakeLists.txt
@@ -59,11 +68,3 @@ INSTALL()
 	packageEntries devel \
 			$developDir
 }
-
-PROVIDES_devel="
-	physfs${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
-	devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
-	"
-REQUIRES_devel="
-	physfs$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-lang/luajit/luajit-2.0.2.recipe b/dev-lang/luajit/luajit-2.0.2.recipe
index 1f0eadd5f..aad0ab4f2 100644
--- a/dev-lang/luajit/luajit-2.0.2.recipe
+++ b/dev-lang/luajit/luajit-2.0.2.recipe
@@ -1,16 +1,16 @@
 SUMMARY="A Just-In-Time Compiler (JIT) for the Lua programming language"
-DESCRIPTION="
-LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language.
-
-Lua is a powerful, dynamic and light-weight programming language. It may be \
-embedded or used as a general-purpose, stand-alone language.
-"
+DESCRIPTION="Lua is a powerful, dynamic and light-weight programming \
+language. It may be embedded or used as a general-purpose, stand-alone \
+language. LuaJIT is a Just-In-Time Compiler (JIT) for it."
 HOMEPAGE="http://luajit.org/luajit.html"
+COPYRIGHT="2005-2013 Mike Pall"
+LICENSE="MIT"
+REVISION="2"
 SOURCE_URI="http://luajit.org/download/LuaJIT-$portVersion.tar.gz"
 CHECKSUM_SHA256="c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38"
-LICENSE="MIT"
-COPYRIGHT="2005-2013, Mike Pall"
-REVISION="2"
+SOURCE_DIR="LuaJIT-$portVersion"
+PATCHES="luajit-$portVersion.patchset"
+
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -23,11 +23,6 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	"
 
 PROVIDES_devel="
 	luajit${secondaryArchSuffix}_devel = $portVersion compat >= 5.1
@@ -37,8 +32,13 @@ REQUIRES_devel="
 	luajit$secondaryArchSuffix == $portVersion base
 	"
 
-PATCHES="luajit-$portVersion.patchset"
-SOURCE_DIR="LuaJIT-$portVersion"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
 
 BUILD()
 {
diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.01.0.recipe
index 217380f74..bd6d624cb 100644
--- a/dev-lang/ocaml/ocaml-4.01.0.recipe
+++ b/dev-lang/ocaml/ocaml-4.01.0.recipe
@@ -1,27 +1,27 @@
 SUMMARY="Implementation of the Caml language"
-DESCRIPTION="
-Caml is a general-purpose programming language, designed with program safety \
-and reliability in mind. It is very expressive, yet easy to learn and use. \
+DESCRIPTION="Caml is a general-purpose programming language, designed with \
+program safety and reliability in mind. It is very expressive, yet easy to \
+learn and use.
 Caml supports functional, imperative, and object-oriented programming styles. \
 It has been developed and distributed by INRIA, a French research institute in \
 computer science and applied mathematics, since 1985.
+
 The OCaml system is the main implementation of the Caml language. It features \
 a powerful module system and a full-fledged object-oriented layer. It comes \
 with a native-code compiler that supports numerous architectures, for high \
 performance; a bytecode compiler, for increased portability; and an \
-interactive loop, for experimentation and rapid development.
-"
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1996-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)."
+interactive loop, for experimentation and rapid development."
 HOMEPAGE="http://caml.inria.fr/index.en.html"
+COPYRIGHT="1996-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)"
+LICENSE="GNU LGPL v2"
+REVISION="1"
 SOURCE_URI="http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-$portVersion.tar.gz"
 CHECKSUM_SHA256="ea1751deff454f5c738d10d8a0ad135afee0852d391cf95766b726c0faf7cfdb"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
 #TODO: fix pthread test
 PATCHES="ocaml-$portVersion.patchset"
 
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
 PROVIDES="
 	ocaml = $portVersion compat >= 4
 	cmd:camlp4 = $portVersion compat >= 4
@@ -64,13 +64,14 @@ PROVIDES="
 	cmd:ocamlrun = $portVersion compat >= 4
 	cmd:ocamlyacc = $portVersion compat >= 4
 	"
-
 REQUIRES="
 	haiku
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:awk
diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
index c425ef110..d6fe544fb 100644
--- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
+++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
@@ -4,15 +4,13 @@ implementation of the Java Platform, Standard Edition (Java SE). It is the \
 result of an effort Sun Microsystems began in 2006. The implementation is \
 licensed under the GNU General Public License (GNU GPL) with a linking \
 exception. Were it not for the GPL linking exception, components that linked \
-to the Java class library would be subject to the terms of the GPL license. \
+to the Java class library would be subject to the terms of the GPL license.
 OpenJDK is the official Java SE 7 reference implementation."
 HOMEPAGE="http://openjdk.java.net/"
 COPYRIGHT="2015 Oracle and/or its affiliates."
 LICENSE="GNU GPL v2"
-
+REVISION="1"
 SOURCE_URI="hg+http://bitbucket.org/hamishm/haiku-jdk8u#6e3a7c2"
-SOURCE_DIR="jdk"
-
 SOURCE_URI_2="hg+http://bitbucket.org/hamishm/haiku-jdk8u-hotspot#e5ab6f7"
 SOURCE_URI_3="hg+http://bitbucket.org/hamishm/haiku-jdk8u-jdk#9b3967c"
 SOURCE_URI_4="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/langtools#jdk8u40-b27"
@@ -20,9 +18,8 @@ SOURCE_URI_5="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/corba#jdk8u40-b27"
 SOURCE_URI_6="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp#jdk8u40-b27"
 SOURCE_URI_7="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws#jdk8u40-b27"
 SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
+SOURCE_DIR="jdk"
 
-
-REVISION="1"
 ARCHITECTURES="!x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86"
 
@@ -75,7 +72,6 @@ PROVIDES="
 	cmd:wsimport = $portVersion compat >= 1.8
 	cmd:xjc = $portVersion compat >= 1.8
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -93,7 +89,6 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:cpio
 	cmd:make
diff --git a/dev-libs/apr/apr-1.5.2.recipe b/dev-libs/apr/apr-1.5.2.recipe
index 59937f291..7a8b9e116 100644
--- a/dev-libs/apr/apr-1.5.2.recipe
+++ b/dev-libs/apr/apr-1.5.2.recipe
@@ -1,15 +1,37 @@
 SUMMARY="Apache Portable Runtime Library"
+DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \
+create and maintain software libraries that provide a predictable and \
+consistent interface to underlying platform-specific implementations.
+The primary goal is to provide an API to which software developers may code \
+and be assured of predictable if not identical behaviour regardless of the \
+platform on which their software is built, relieving them of the need to code \
+special-case conditions to work around or take advantage of platform-specific \
+deficiencies or features.
+
+To give a brief overview, the primary core subsystems of APR 1.x include the \
+following:
+- atomic operations
+- dynamic shared object loading
+- file I/O
+- locks (mutexes, condition variables, etc.)
+- memory management (high performance allocators)
+- memory-mapped files
+- multicast sockets
+- network I/O
+- shared memory
+- thread and process management
+- various data structures (tables, hashes, priority queues, etc.)"
 HOMEPAGE="http://apr.apache.org/"
-SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
-CHECKSUM_SHA256="1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"
 COPYRIGHT="2012 The Apache Software Foundation"
 LICENSE="Apache v2"
 REVISION="1"
+SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
+CHECKSUM_SHA256="1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"
+PATCHES="apr-$portVersion.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="apr-$portVersion.patch"
-
 PROVIDES="
 	apr$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libapr_1$secondaryArchSuffix = 0.5.2 compat >= 0
@@ -17,10 +39,20 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	apr_devel$secondaryArchSuffix = portVersion compat >= 1
+	cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1
+	devel:libapr_1$secondaryArchSuffix = 0.5.2 compat >= 0
+	"
+REQUIRES_devel="
+	apr$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
@@ -72,41 +104,3 @@ TEST()
 {
 	make test
 }
-
-# ----- description ----------------------------------------------------------
-
-DESCRIPTION="
-The mission of the Apache Portable Runtime (APR) project is to create and \
-maintain software libraries that provide a predictable and consistent \
-interface to underlying platform-specific implementations. The primary goal is \
-to provide an API to which software developers may code and be assured of \
-predictable if not identical behaviour regardless of the platform on which \
-their software is built, relieving them of the need to code special-case \
-conditions to work around or take advantage of platform-specific deficiencies \
-or features.
-
-To give a brief overview, the primary core subsystems of APR 1.x include the \
-following:
-- atomic operations
-- dynamic Shared Object loading
-- file I/O
-- locks (mutexes, condition variables, etc)
-- memory management (high performance allocators)
-- memory-mapped files
-- multicast Sockets
-- network I/O
-- shared memory
-- thread and Process management
-- various data structures (tables, hashes, priority queues, etc)
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	apr_devel$secondaryArchSuffix = portVersion compat >= 1
-	cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1
-	devel:libapr_1$secondaryArchSuffix = 0.5.2 compat >= 0
-	"
-REQUIRES_devel="
-	apr$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe
index 35cb6fd05..dd5fc765b 100644
--- a/dev-libs/apr_util/apr_util-1.5.4.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.4.recipe
@@ -1,25 +1,24 @@
 SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="
-The mission of the Apache Portable Runtime (APR) project is to create and \
-maintain software libraries that provide a predictable and consistent \
-interface to underlying platform-specific implementations. The primary goal is \
-to provide an API to which software developers may code and be assured of \
-predictable if not identical behaviour regardless of the platform on which \
-their software is built, relieving them of the need to code special-case \
-conditions to work around or take advantage of platform-specific deficiencies \
-or features.
-"
+DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \
+create and maintain software libraries that provide a predictable and \
+consistent interface to underlying platform-specific implementations.
+The primary goal is to provide an API to which software developers may code \
+and be assured of predictable if not identical behaviour regardless of the \
+platform on which their software is built, relieving them of the need to code \
+special-case conditions to work around or take advantage of platform-specific \
+deficiencies or features."
 HOMEPAGE="http://apr.apache.org/"
+COPYRIGHT="2011 The Apache Software Foundation."
+LICENSE="Apache v2"
+REVISION="1"
 SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz"
 CHECKSUM_SHA256="976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"
-LICENSE="Apache v2"
-COPYRIGHT="2011 The Apache Software Foundation."
-REVISION="1"
+SOURCE_DIR="apr-util-$portVersion"
+PATCHES="apr_util-1.5.3.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="apr_util-1.5.3.patch"
-
 PROVIDES="
 	apr_util$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
@@ -30,13 +29,23 @@ REQUIRES="
 	lib:libexpat$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	apr_util_devel$secondaryArchSuffix = portVersion compat >= 1
+	cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
+	"
+REQUIRES_devel="
+	apr_util$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libapr_1$secondaryArchSuffix >= 0.5.0
 	devel:libexpat$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
@@ -46,8 +55,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="apr-util-$portVersion"
-
 PATCH()
 {
 	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
@@ -104,14 +111,3 @@ INSTALL()
 		$binDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	apr_util_devel$secondaryArchSuffix = portVersion compat >= 1
-	cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
-	"
-REQUIRES_devel="
-	apr_util$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/icu/icu-55.1.recipe b/dev-libs/icu/icu-55.1.recipe
index e8c382e04..009d2a027 100644
--- a/dev-libs/icu/icu-55.1.recipe
+++ b/dev-libs/icu/icu-55.1.recipe
@@ -1,14 +1,61 @@
-SUMMARY="International Components for Unicode (ICU)"
+SUMMARY="Libraries to support Unicode and globalization"
+SUMMARY_devel="The ICU development files"
+DESCRIPTION="International Components for Unicode (ICU) is a mature, widely \
+used set of C/C++ and Java libraries providing Unicode and Globalization \
+support for software applications. ICU is widely portable and gives \
+applications the same results on all platforms and between C/C++ and Java \
+software.
+ICU is released under a nonrestrictive open source license that is suitable \
+for use with both commercial software and with other open source or free \
+software.
+
+Here are a few highlights of the services provided by ICU:
+
+* Code Page Conversion: Convert text data to or from Unicode and nearly any \
+other character set or encoding. ICU's conversion tables are based on charset \
+data collected by IBM over the course of many decades, and is the most \
+complete available anywhere.
+* Collation: Compare strings according to the conventions and standards of a \
+particular language, region or country. ICU's collation is based on the \
+Unicode Collation Algorithm plus locale-specific comparison rules from the \
+Common Locale Data Repository, a comprehensive source for this type of data.
+* Formatting: Format numbers, dates, times and currency amounts according the \
+conventions of a chosen locale. This includes translating month and day names \
+into the selected language, choosing appropriate abbreviations, ordering \
+fields correctly, etc. This data also comes from the Common Locale Data \
+Repository.
+* Time Calculations: Multiple types of calendars are provided beyond the \
+traditional Gregorian calendar. A thorough set of timezone calculation APIs \
+are provided.
+* Unicode Support: ICU closely tracks the Unicode standard, providing easy \
+access to all of the many Unicode character properties, Unicode Normalization, \
+Case Folding and other fundamental operations as specified by the Unicode \
+Standard.
+* Regular Expression: ICU's regular expressions fully support Unicode while \
+providing very competitive performance.
+* Bidi: support for handling text containing a mixture of left to right \
+(English) and right to left (Arabic or Hebrew) data.
+* Text Boundaries: Locate the positions of words, sentences, paragraphs within \
+a range of text, or identify locations that would be suitable for line \
+wrapping when displaying the text."
 HOMEPAGE="http://www.icu-project.org"
-LICENSE="ICU"
 COPYRIGHT="1995-2015 IBM Corporation and others."
+LICENSE="ICU"
+REVISION="5"
 SOURCE_URI="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-src.tgz"
 SOURCE_URI_2="http://www.iana.org/time-zones/repository/releases/tzdata2015f.tar.gz#noarchive"
 SOURCE_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-data.zip#noarchive"
 CHECKSUM_SHA256="e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b"
 CHECKSUM_SHA256_2="959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d"
 CHECKSUM_SHA256_3="84ae6a6512b6f38b417497d05e4ed90d8fa7447b46db9905032354c8574b8f59"
-REVISION="5"
+SOURCE_DIR="icu"
+PATCHES="icu-55.1.patchset"
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+PATCHES+="
+	"icu-55.1.gcc2.patchset"
+	"
+fi
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -30,10 +77,27 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 REQUIRES+="
 	"
 fi
+
+PROVIDES_devel="
+	icu${secondaryArchSuffix}_devel = $portVersion
+	cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicudata${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicui18n${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicuio${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicule${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libiculx${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicutest${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicutu${secondaryArchSuffix} = $portVersion compat >= 55
+	devel:libicuuc${secondaryArchSuffix} = $portVersion compat >= 55
+	"
+REQUIRES_devel="
+	icu${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
@@ -43,14 +107,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="icu"
-PATCHES="icu-55.1.patchset"
-if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-PATCHES+="
-	"icu-55.1.gcc2.patchset"
-	"
-fi
-
 BUILD()
 {
 	cd source
@@ -107,61 +163,3 @@ TEST()
 	cd source
 	make check
 }
-
-DESCRIPTION="
-ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode \
-and Globalization support for software applications. ICU is widely portable \
-and gives applications the same results on all platforms and between C/C++ and \
-Java software.
-ICU is released under a nonrestrictive open source license that is suitable \
-for use with both commercial software and with other open source or free \
-software.
-
-Here are a few highlights of the services provided by ICU:
-* Code Page Conversion: Convert text data to or from Unicode and nearly any \
-other character set or encoding. ICU's conversion tables are based on charset \
-data collected by IBM over the course of many decades, and is the most \
-complete available anywhere.
-* Collation: Compare strings according to the conventions and standards of a \
-particular language, region or country. ICU's collation is based on the \
-Unicode Collation Algorithm plus locale-specific comparison rules from the \
-Common Locale Data Repository, a comprehensive source for this type of data.
-* Formatting: Format numbers, dates, times and currency amounts according the \
-conventions of a chosen locale. This includes translating month and day names \
-into the selected language, choosing appropriate abbreviations, ordering \
-fields correctly, etc. This data also comes from the Common Locale Data \
-Repository.
-* Time Calculations: Multiple types of calendars are provided beyond the \
-traditional Gregorian calendar. A thorough set of timezone calculation APIs \
-are provided.
-* Unicode Support: ICU closely tracks the Unicode standard, providing easy \
-access to all of the many Unicode character properties, Unicode Normalization, \
-Case Folding and other fundamental operations as specified by the Unicode \
-Standard.
-* Regular Expression: ICU's regular expressions fully support Unicode while \
-providing very competitive performance.
-* Bidi: support for handling text containing a mixture of left to right \
-(English) and right to left (Arabic or Hebrew) data.
-* Text Boundaries: Locate the positions of words, sentences, paragraphs within \
-a range of text, or identify locations that would be suitable for line \
-wrapping when displaying the text.
-"
-
-# ----- devel package -------------------------------------------------------
-
-SUMMARY_devel="The ICU development files"
-PROVIDES_devel="
-	icu${secondaryArchSuffix}_devel = $portVersion
-	cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicudata${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicui18n${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicuio${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicule${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libiculx${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicutest${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicutu${secondaryArchSuffix} = $portVersion compat >= 55
-	devel:libicuuc${secondaryArchSuffix} = $portVersion compat >= 55
-	"
-REQUIRES_devel="
-	icu${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index b00177909..26891fb45 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -1,8 +1,8 @@
 SUMMARY="An event notification library"
-DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a \
-specific event occurs on a file descriptor or after a timeout has been \
-reached. Furthermore, libevent also support callbacks due to signals or \
-regular timeouts.\
+DESCRIPTION="The libevent API provides a mechanism to execute a callback \
+function when a specific event occurs on a file descriptor or after a \
+timeout has been reached. Furthermore, libevent also support callbacks due \
+to signals or regular timeouts.
 libevent is meant to replace the event loop found in event driven network \
 servers. An application just needs to call event_dispatch() and then add or \
 remove events dynamically without having to change the event loop."
@@ -41,14 +41,39 @@ REQUIRES="
 	"
 #	haiku${secondaryArchSuffix} doesn't define included libraries yet
 #	lib:libnetwork$secondaryArchSuffix
+
+PROVIDES_devel="
+	cmd:event_rpcgen.py
+	lib:libevent$secondaryArchSuffix = $portVersion
+	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
+	"
+REQUIRES_devel="
+	libevent$secondaryArchSuffix == $portVersion base
+	devel:libssl$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libz
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -99,31 +124,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cmd:event_rpcgen.py
-	lib:libevent$secondaryArchSuffix = $portVersion
-	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
-	"
-
-REQUIRES_devel="
-	libevent$secondaryArchSuffix == $portVersion base
-	devel:libssl$secondaryArchSuffix
-	devel:libcrypto$secondaryArchSuffix
-	"
diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe
index 918daa9a4..4a068ef95 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.recipe
+++ b/dev-libs/libiconv/libiconv-1.13.1.recipe
@@ -1,16 +1,109 @@
-SUMMARY="GNU iconv implementation"
-HOMEPAGE="
-	http://www.gnu.org/software/libiconv
-	http://www.gnu.org/software/iconv
-	"
-LICENSE="
-	GNU LGPL v2
-	GNU GPL v3
-	"
+SUMMARY="The GNU iconv implementation to convert text encodings"
+SUMMARY_devel="The libiconv development files"
+DESCRIPTION="
+For historical reasons, international text is often encoded using a language \
+or country dependent character encoding. With the advent of the internet and \
+the frequent exchange of text across countries - even the viewing of a web \
+page from a foreign country is a \"text exchange\" in this context -, \
+conversions between these encodings have become important.
+They have also become a problem, because many characters which are present \
+in one encoding are absent in many other encodings. To solve this mess, the \
+Unicode encoding has been created. It is a super-encoding of all others and \
+is therefore the default encoding for new text formats like XML.
+
+Still, many computers still operate in locale with a traditional (limited) \
+character encoding. Some programs, like mailers and web browsers, must be able \
+to convert between a given text encoding and the user's encoding. Other \
+programs internally store strings in Unicode, to facilitate internal \
+processing, and need to convert between internal string representation \
+(Unicode) and external string representation (a traditional encoding) when \
+they are doing I/O. GNU libiconv is a conversion library for both kinds of \
+applications.
+
+This library provides an iconv() implementation, for use on systems which \
+don't have one, or whose implementation cannot convert from/to Unicode.
+It provides support for these encodings:
+
+European languages
+- ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U, KOI8-RU, \
+CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131}, \
+Mac{Roman,CentralEurope,Iceland,Croatian,Romania}, \
+Mac{Cyrillic,Ukraine,Greek,Turkish}, Macintosh
+Semitic languages
+- ISO-8859-{6,8}, CP{1255,1256}, CP862, Mac{Hebrew,Arabic}
+Japanese
+- EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1
+Chinese
+- EUC-CN, HZ, GBK, CP936, GB18030, EUC-TW, BIG5, CP950, BIG5-HKSCS, \
+BIG5-HKSCS:2004, BIG5-HKSCS:2001, BIG5-HKSCS:1999, ISO-2022-CN, ISO-2022-CN-EXT
+Korean
+- EUC-KR, CP949, ISO-2022-KR, JOHAB
+Armenian
+- ARMSCII-8
+Georgian
+- Georgian-Academy, Georgian-PS
+Tajik
+- KOI8-T
+Kazakh
+- PT154, RK1048
+Thai
+- ISO-8859-11, TIS-620, CP874, MacThai
+Laotian
+- MuleLao-1, CP1133
+Vietnamese
+- VISCII, TCVN, CP1258
+Platform specifics
+- HP-ROMAN8, NEXTSTEP
+Full Unicode
+- UTF-8
+- UCS-2, UCS-2BE, UCS-2LE
+- UCS-4, UCS-4BE, UCS-4LE
+- UTF-16, UTF-16BE, UTF-16LE
+- UTF-32, UTF-32BE, UTF-32LE
+- UTF-7
+- C99, JAVA
+Full Unicode, in terms of uint16_t or uint32_t (with machine dependent \
+endianness and alignment)
+- UCS-2-INTERNAL, UCS-4-INTERNAL
+Locale dependent, in terms of 'char' or 'wchar_t' (with machine dependent \
+endianness and alignment, and with OS and locale dependent semantics)
+- char, wchar_t
+- The empty encoding name \"\" is equivalent to \"char\": it denotes the \
+locale dependent character encoding.
+
+When configured with the option --enable-extra-encodings, it also provides \
+support for a few extra encodings:
+European languages
+- CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125}
+Semitic languages
+- CP864
+Japanese
+- EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3
+Chinese
+- BIG5-2003 (experimental)
+Turkmen
+- TDS565
+Platform specifics
+- ATARIST, RISCOS-LATIN1
+
+It can convert from any of these encodings to any other, through Unicode \
+conversion.
+It has also some limited support for transliteration, i.e. when a character \
+cannot be represented in the target character set, it can be approximated \
+through one or several similarly looking characters. Transliteration is \
+activated when \"//TRANSLIT\" is appended to the target encoding name.
+
+libiconv is for you if your application needs to support multiple character \
+encodings, but that support lacks from your system."
+HOMEPAGE="http://www.gnu.org/software/libiconv
+	http://www.gnu.org/software/iconv"
 COPYRIGHT="2000-2009 Free Software Foundation, Inc."
+LICENSE="GNU LGPL v2
+	GNU GPL v3	"
+REVISION="6"
 SOURCE_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
 CHECKSUM_SHA256="55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
-REVISION="6"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -28,10 +121,20 @@ fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libiconv${secondaryArchSuffix}_devel = $portVersion compat >= 1.13
+	devel:libiconv${secondaryArchSuffix} = 2.5.0 compat >= 2
+	devel:libcharset${secondaryArchSuffix} = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	libiconv${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
@@ -92,104 +195,3 @@ TEST()
 {
 	make check
 }
-
-DESCRIPTION="
-For historical reasons, international text is often encoded using a language \
-or country dependent character encoding. With the advent of the internet and \
-the frequent exchange of text across countries - even the viewing of a web \
-page from a foreign country is a \"text exchange\" in this context -, \
-conversions between these encodings have become important. They have also \
-become a problem, because many characters which are present in one encoding \
-are absent in many other encodings. To solve this mess, the Unicode encoding \
-has been created. It is a super-encoding of all others and is therefore the \
-default encoding for new text formats like XML.
-Still, many computers still operate in locale with a traditional (limited) \
-character encoding. Some programs, like mailers and web browsers, must be able \
-to convert between a given text encoding and the user's encoding. Other \
-programs internally store strings in Unicode, to facilitate internal \
-processing, and need to convert between internal string representation \
-(Unicode) and external string representation (a traditional encoding) when \
-they are doing I/O. GNU libiconv is a conversion library for both kinds of \
-applications.
-This library provides an iconv() implementation, for use on systems which \
-don't have one, or whose implementation cannot convert from/to Unicode.
-It provides support for the encodings:
-European languages
-- ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U, KOI8-RU, \
-CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131}, \
-Mac{Roman,CentralEurope,Iceland,Croatian,Romania}, \
-Mac{Cyrillic,Ukraine,Greek,Turkish}, Macintosh
-Semitic languages
-- ISO-8859-{6,8}, CP{1255,1256}, CP862, Mac{Hebrew,Arabic}
-Japanese
-- EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1
-Chinese
-- EUC-CN, HZ, GBK, CP936, GB18030, EUC-TW, BIG5, CP950, BIG5-HKSCS, \
-BIG5-HKSCS:2004, BIG5-HKSCS:2001, BIG5-HKSCS:1999, ISO-2022-CN, ISO-2022-CN-EXT
-Korean
-- EUC-KR, CP949, ISO-2022-KR, JOHAB
-Armenian
-- ARMSCII-8
-Georgian
-- Georgian-Academy, Georgian-PS
-Tajik
-- KOI8-T
-Kazakh
-- PT154, RK1048
-Thai
-- ISO-8859-11, TIS-620, CP874, MacThai
-Laotian
-- MuleLao-1, CP1133
-Vietnamese
-- VISCII, TCVN, CP1258
-Platform specifics
-- HP-ROMAN8, NEXTSTEP
-Full Unicode
-- UTF-8
-- UCS-2, UCS-2BE, UCS-2LE
-- UCS-4, UCS-4BE, UCS-4LE
-- UTF-16, UTF-16BE, UTF-16LE
-- UTF-32, UTF-32BE, UTF-32LE
-- UTF-7
-- C99, JAVA
-Full Unicode, in terms of uint16_t or uint32_t (with machine dependent \
-endianness and alignment)
-- UCS-2-INTERNAL, UCS-4-INTERNAL
-Locale dependent, in terms of 'char' or 'wchar_t' (with machine dependent \
-endianness and alignment, and with OS and locale dependent semantics)
-- char, wchar_t
-- The empty encoding name \"\" is equivalent to \"char\": it denotes the \
-locale dependent character encoding.
-When configured with the option --enable-extra-encodings, it also provides \
-support for a few extra encodings:
-European languages
-- CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125}
-Semitic languages
-- CP864
-Japanese
-- EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3
-Chinese
-- BIG5-2003 (experimental)
-Turkmen
-- TDS565
-Platform specifics
-- ATARIST, RISCOS-LATIN1
-It can convert from any of these encodings to any other, through Unicode conversion.
-It has also some limited support for transliteration, i.e. when a character \
-cannot be represented in the target character set, it can be approximated \
-through one or several similarly looking characters. Transliteration is \
-activated when \"//TRANSLIT\" is appended to the target encoding name.
-libiconv is for you if your application needs to support multiple character encodings, but that support lacks from your system.
-"
-
-# ----- devel package -------------------------------------------------------
-
-SUMMARY_devel="The libiconv development files"
-PROVIDES_devel="
-	libiconv${secondaryArchSuffix}_devel = $portVersion compat >= 1.13
-	devel:libiconv${secondaryArchSuffix} = 2.5.0 compat >= 2
-	devel:libcharset${secondaryArchSuffix} = 1.0.0 compat >= 1
-	"
-REQUIRES_devel="
-	libiconv${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
index 95f64683f..d42454f91 100644
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -1,14 +1,13 @@
-SUMMARY="Pthread functions stubs for platforms missing them"
-DESCRIPTION="
-Pthread functions stubs for platforms missing them.
-"
+SUMMARY="Pthread functions stubs"
+DESCRIPTION="Pthread functions stubs for platforms that don't (yet) provide \
+those functions."
 HOMEPAGE="http://xcb.freedesktop.org/"
-SOURCE_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
-CHECKSUM_SHA256="3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde"
-REVISION="2"
-
 COPYRIGHT="2006 Diego Pettenò"
 LICENSE="MIT"
+REVISION="2"
+SOURCE_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
+CHECKSUM_SHA256="3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde"
+SOURCE_DIR="libpthread-stubs-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -22,10 +21,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
@@ -36,8 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-SOURCE_DIR="libpthread-stubs-$portVersion"
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
index 98449c2ce..5c6094f9a 100644
--- a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
+++ b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
@@ -1,8 +1,6 @@
 SUMMARY="An API wrapper for libusb"
 DESCRIPTION="libusb is a C library that provides generic access to USB \
-devices. It is intended to be used by developers to facilitate the production \
-of applications that communicate with USB hardware.
-
+devices. It is intended to facilitate the communication with USB hardware.
 libusb-compat is a wrapper library for software that use the 0.1 API."
 HOMEPAGE="http://libusb.info/"
 COPYRIGHT="2008 Daniel Drake"
diff --git a/dev-libs/libusb/libusb-1.0.19.recipe b/dev-libs/libusb/libusb-1.0.19.recipe
index e56a9ccbd..6f93cc093 100644
--- a/dev-libs/libusb/libusb-1.0.19.recipe
+++ b/dev-libs/libusb/libusb-1.0.19.recipe
@@ -1,34 +1,26 @@
 SUMMARY="A library that provides generic access to USB devices"
-DESCRIPTION="
-libusb is a library that provides generic access to USB devices. As a library, \
-it is meant to be used by developers, to facilitate the production of \
-applications that communicate with USB hardware.
+DESCRIPTION="libusb is meant to facilitate the communication with USB hardware.
 
-It is portable: Using a single cross-platform API, it provides access to USB \
+- portable: Using a single cross-platform API, it provides access to USB \
 devices on Linux, OS X, Windows and OpenBSD.
-
-It is user-mode: No special privilege or elevation is required for the \
+- user-mode: No special privilege or elevation is required for the \
 application to communicate with a device.
-
-It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0 \
-(latest), are supported.
-"
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="
-2001 Johannes Erdfelt
-2007-2009 Daniel Drake
-2010-2012 Peter Stuge
-2008-2013 Nathan Hjelm
-2009-2013 Pete Batard
-2009-2013 Ludovic Rousseau
-2010-2012 Michael Plante
-2011-2013 Hans de Goede
-2012-2013 Martin Pieuchot
-2012-2013 Toby Gray
-"
+- version-agnostic: All versions of the USB protocol, from 1.0 to 3.0 \
+(latest), are supported."
 HOMEPAGE="http://libusb.info/"
-SOURCE_URI="git+git://github.com/libusb/libusb.git#a447fa4cd517e5393c0f1504b1a35b095aafa334"
+COPYRIGHT="2001 Johannes Erdfelt
+	2007-2009 Daniel Drake
+	2010-2012 Peter Stuge
+	2008-2013 Nathan Hjelm
+	2009-2013 Pete Batard
+	2009-2013 Ludovic Rousseau
+	2010-2012 Michael Plante
+	2011-2013 Hans de Goede
+	2012-2013 Martin Pieuchot
+	2012-2013 Toby Gray"
+LICENSE="GNU LGPL v2.1"
 REVISION="2"
+SOURCE_URI="git+git://github.com/libusb/libusb.git#a447fa4cd517e5393c0f1504b1a35b095aafa334"
 
 ARCHITECTURES="x86 x86_64 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -41,10 +33,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	libusb${secondaryArchSuffix}_devel = $portVersion
+	devel:libusb_1.0${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES_devel="
+	libusb${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:find
@@ -74,13 +74,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libusb${secondaryArchSuffix}_devel = $portVersion
-	devel:libusb_1.0${secondaryArchSuffix} = $portVersion
-	"
-REQUIRES_devel="
-	libusb${secondaryArchSuffix} == $portVersion base
-	"
diff --git a/dev-libs/libxml2/libxml2-2.9.2.recipe b/dev-libs/libxml2/libxml2-2.9.2.recipe
index f92d61063..c63417ff3 100644
--- a/dev-libs/libxml2/libxml2-2.9.2.recipe
+++ b/dev-libs/libxml2/libxml2-2.9.2.recipe
@@ -1,24 +1,23 @@
 SUMMARY="The XML C parser and toolkit of Gnome"
-DESCRIPTION="
-Libxml2 is the XML C parser and toolkit developed for the Gnome project \
-(but usable outside of the Gnome platform), it is free software available \
-under the MIT License. XML itself is a metalanguage to design markup \
-languages, i.e. text language where semantic and structure are added to \
-the content using extra "markup" information enclosed between angle \
-brackets. HTML is the most well-known markup language. Though the library \
-is written in C a variety of language bindings make it available in other \
-environments.
-"
+DESCRIPTION="Libxml2 is the XML C parser and toolkit developed for the Gnome \
+project, but is usable outside of the Gnome platform as well.
+XML itself is a metalanguage to design markup languages, i.e. text language \
+where semantic and structure are added to the content using extra \"markup\" \
+information enclosed between angle brackets. HTML is the most well-known \
+markup language.
+Though the library is written in C a variety of language bindings make it \
+available in other environments."
 HOMEPAGE="http://www.xmlsoft.org/"
-LICENSE="MIT"
 COPYRIGHT="1998-2013 Daniel Veillard.  All Rights Reserved."
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz"
 CHECKSUM_SHA256="5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc"
-REVISION="1"
+PATCHES="libxml2-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libxml2-$portVersion.patchset"
 
 # build the python module only for the primary architecture
 pythonModuleEnabled=false
@@ -36,25 +35,44 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:xmllint = $portVersion compat >= 2
 		"
 fi
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libxml2${secondaryArchSuffix}_devel = $portVersion
+	cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2
+	devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2
+	"
+REQUIRES_devel="
+	libxml2$secondaryArchSuffix == $portVersion base
+	devel:libz$secondaryArchSuffix
+	"
+
+if $pythonModuleEnabled; then
+	SUMMARY_python="The python module for libxml2"
+	PROVIDES_python="
+		libxml2_python = $portVersion
+		"
+	REQUIRES_python="
+		libxml2 == $portVersion base
+		cmd:python
+		"
+fi
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	"
 if $pythonModuleEnabled; then
 	BUILD_REQUIRES="$BUILD_REQUIRES
 		python >= 2.7
 		"
-			# Note: We don't use "cmd:python" here to avoid issues with the
-			# python search path.
+		# Note: We don't use "cmd:python" here to avoid issues with the
+		# python search path.
 fi
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	haiku_devel
 	lib:libicudata$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
@@ -152,28 +170,3 @@ TEST()
 {
 	make tests
 }
-
-# ----- devel package ---------------------------------------------------------
-
-PROVIDES_devel="
-	libxml2${secondaryArchSuffix}_devel = $portVersion
-	cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2
-	devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2
-	"
-REQUIRES_devel="
-	libxml2$secondaryArchSuffix == $portVersion base
-	devel:libz$secondaryArchSuffix
-	"
-
-# ----- python package -------------------------------------------------------
-
-if $pythonModuleEnabled; then
-	SUMMARY_python="The python module for libxml2"
-	PROVIDES_python="
-		libxml2_python = $portVersion
-		"
-	REQUIRES_python="
-		libxml2 == $portVersion base
-		cmd:python
-		"
-fi
diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe
index 4742caf70..ca15aaceb 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.recipe
+++ b/dev-libs/libxslt/libxslt-1.1.28.recipe
@@ -1,17 +1,17 @@
-SUMMARY="XSLT C library developed for the GNOME project"
-DESCRIPTION="Libxslt is the XSLT C library developed for the GNOME project. \
-It implements most of the EXSLT set of processor-portable extensions functions \
-and some of Saxon's evaluate and expressions extensions.
+SUMMARY="The XSLT C library of Gnome"
+DESCRIPTION="Libxslt implements most of the EXSLT set of processor-portable \
+extensions functions and some of Saxon's evaluate and expressions extensions.
 
 People can either embed the library in their application or use xsltproc the \
 command line processing tool. This library is free software and can be reused \
 in commercial applications."
 HOMEPAGE="http://www.xmlsoft.org/"
-LICENSE="MIT"
 COPYRIGHT="2001-2012 Daniel Veillard"
+LICENSE="MIT"
+REVISION="5"
 SOURCE_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz"
 CHECKSUM_SHA256="5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
-REVISION="5"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -39,11 +39,11 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:libtoolize
diff --git a/dev-libs/lzo/lzo-2.09.recipe b/dev-libs/lzo/lzo-2.09.recipe
index 463c577e6..6de5bdd51 100644
--- a/dev-libs/lzo/lzo-2.09.recipe
+++ b/dev-libs/lzo/lzo-2.09.recipe
@@ -1,12 +1,12 @@
-SUMMARY="A portable lossless data compression library written in ANSI C"
-DESCRIPTION="
-LZO is a data compression library which is suitable for data de-/compression in \
-real-time. This means it favours speed over compression ratio.
-
+SUMMARY="A portable lossless data compression library"
+DESCRIPTION="LZO is a data compression library which is suitable for data \
+de-/compression in real-time. This means it favours speed over compression \
+ratio.
 LZO is written in ANSI C. Both the source code and the compressed data format \
 are designed to be portable across platforms.
 
 LZO implements a number of algorithms with the following features:
+
 * Decompression is simple and *very* fast.
 * Requires no memory for decompression.
 * Compression is pretty fast.
@@ -18,14 +18,14 @@ a quite competitive compression ratio.
 * There is also a compression level which needs only 8 kB for compression.
 * Algorithm is thread safe.
 * Algorithm is lossless.
-* LZO supports overlapping compression and in-place decompression.
-"
+* LZO supports overlapping compression and in-place decompression."
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
+COPYRIGHT="1996-2011 Markus F.X.J Oberhumer"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://www.oberhumer.com/opensource/lzo/download/lzo-$portVersion.tar.gz"
 CHECKSUM_SHA256="f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="1996-2011 Markus F.X.J Oberhumer"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -36,8 +36,19 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
+
+PROVIDES_devel="
+	lzo${secondaryArchSuffix}_devel = $portVersion
+	devel:liblzo2$secondaryArchSuffix = 2.0.0 compat >= 2
+	"
+REQUIRES_devel="
+	lzo$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
@@ -61,11 +72,3 @@ TEST()
 {
 	make check
 }
-
-PROVIDES_devel="
-	lzo${secondaryArchSuffix}_devel = $portVersion
-	devel:liblzo2$secondaryArchSuffix = 2.0.0 compat >= 2
-	"
-REQUIRES_devel="
-	lzo$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/mpc/mpc-1.0.3.recipe b/dev-libs/mpc/mpc-1.0.3.recipe
index 881146ec2..e9e1aeec3 100644
--- a/dev-libs/mpc/mpc-1.0.3.recipe
+++ b/dev-libs/mpc/mpc-1.0.3.recipe
@@ -1,21 +1,22 @@
 SUMMARY="Arithmetics of complex numbers with arbitrarily high precision"
-DESCRIPTION="Gnu Mpc is a C library for the arithmetic of complex numbers \
+DESCRIPTION="GNU Mpc is a C library for the arithmetic of complex numbers \
 with arbitrarily high precision and correct rounding of the result. It \
 extends the principles of the IEEE-754 standard for fixed precision real \
 floating point numbers to complex numbers, providing well-defined semantics \
 for every operation. At the same time, speed of operation at high precision \
-is a major design goal.
-"
-LICENSE="GNU LGPL v3"
-COPYRIGHT="2006-2014 Andreas Enge, Mickaël Gastineau, Philippe Théveny
-and Paul Zimmermann"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+is a major design goal."
 HOMEPAGE="http://www.multiprecision.org"
+COPYRIGHT="2006-2014 Andreas Enge, Mickaël Gastineau, Philippe Théveny and \
+Paul Zimmermann"
+LICENSE="GNU LGPL v3"
+REVISION="1"
 SOURCE_URI="$HOMEPAGE/mpc/download/mpc-$portVersion.tar.gz"
 CHECKSUM_SHA256="617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+
 PROVIDES="
 	mpc$secondaryArchSuffix = $portVersion
 	lib:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3
@@ -25,12 +26,21 @@ REQUIRES="
 	lib:libgmp$secondaryArchSuffix
 	lib:libmpfr$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	mpc${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3
+	"
+REQUIRES_devel="
+	mpc$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix
 	devel:libmpfr$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
@@ -53,13 +63,3 @@ TEST()
 {
 	make $jobArgs check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	mpc${secondaryArchSuffix}_devel = $portVersion
-	devel:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3
-	"
-REQUIRES_devel="
-	mpc$secondaryArchSuffix == $portVersion base
-	"
diff --git a/dev-libs/mpfr/mpfr-3.1.3.recipe b/dev-libs/mpfr/mpfr-3.1.3.recipe
index e5583c784..583209652 100644
--- a/dev-libs/mpfr/mpfr-3.1.3.recipe
+++ b/dev-libs/mpfr/mpfr-3.1.3.recipe
@@ -19,14 +19,13 @@ des Programmes under the number IDDN FR 001 120020 00 R P 2000 000 10800, on \
 to make sure MPFR is free for all its users. Unlike the ordinary General \
 Public License, the Lesser GPL enables developers of non-free programs to use \
 MPFR in their programs. If you have written a new function for MPFR or \
-improved an existing one, please share your work!
-"
-LICENSE="GNU LGPL v3"
+improved an existing one, please share your work!"
 HOMEPAGE="http://www.mpfr.org"
 COPYRIGHT="2000-2014 INRIA"
+LICENSE="GNU LGPL v3"
+REVISION="1"
 SOURCE_URI="http://www.mpfr.org/mpfr-current/mpfr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f63bb459157cacd223caac545cb816bcdb5a0de28b809e7748b82e9eb89b0afd"
-REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
@@ -39,11 +38,20 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	mpfr${secondaryArchSuffix}_devel = $portVersion
+	devel:libmpfr$secondaryArchSuffix = 4.1.3 compat >= 4
+	"
+REQUIRES_devel="
+	mpfr$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
@@ -66,13 +74,3 @@ TEST()
 {
 	make check $jobArgs
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	mpfr${secondaryArchSuffix}_devel = $portVersion
-	devel:libmpfr$secondaryArchSuffix = 4.1.3 compat >= 4
-	"
-REQUIRES_devel="
-	mpfr$secondaryArchSuffix == $portVersion base
-	"