diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe
index 223e6b399..5e4984c3a 100644
--- a/dev-db/sqlite/sqlite-3.7.5.recipe
+++ b/dev-db/sqlite/sqlite-3.7.5.recipe
@@ -1,24 +1,38 @@
-SUMMARY="A SQL Database Engine in a C Library" 
-DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." 
+SUMMARY="An SQL database engine in a C library" 
+DESCRIPTION="
+	SQLite is a software library that implements a self-contained, 
+	serverless, zero-configuration, transactional SQL database engine.
+	
+	SQLite is the most widely deployed SQL database engine in the world. 
+	The source code for SQLite is in the public domain.
+	"
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
 CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="sqlite = $portVersion compat >= 3
+PROVIDES="
+	sqlite = $portVersion compat >= 3
 	cmd:sqlite3 = $portVersion compat >= 3
 	lib:libsqlite = $portVersion compat >= 3
-	lib:libsqlite3 = $portVersion compat >= 3"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:aclocal
+	lib:libsqlite3 = $portVersion compat >= 3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="sqlite-autoconf-3070500"
 
diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe
index 1cc5fff37..ceaec12a4 100644
--- a/dev-libs/apr/apr-1.4.2.recipe
+++ b/dev-libs/apr/apr-1.4.2.recipe
@@ -1,22 +1,54 @@
 SUMMARY="Apache Portable Runtime Library"
-DESCRIPTION="The 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/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
 CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="apr = $portVersion compat >= 1
+PROVIDES="
+	apr = $portVersion compat >= 1
 	lib:libapr = $portVersion compat >= 1
-	lib:libapr-1 = $portVersion compat >= 1"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:aclocal
+	lib:libapr-1 = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"
 
@@ -24,10 +56,11 @@ BUILD()
 {
 	libtoolize --force --copy --install
 	touch libtool.m4
-#	./buildconf
 	aclocal -I build
 	autoconf
 	./configure $configureDirArgs
+	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
+	ln -sfn $sourceDir/libtool /libtool
 	make
 }
 
@@ -38,7 +71,6 @@ INSTALL()
 
 TEST()
 {
-	cd apr-1.4.2
 	make test
 }
 
diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe
index ab622f8a9..1288bdef6 100644
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -1,21 +1,31 @@
-SUMMARY="XML Parser Toolkit" 
-DESCRIPTION="XML Parser Toolkit" 
+SUMMARY="XML parser toolkit" 
+DESCRIPTION="
+	XML Parser Toolkit
+	"
 HOMEPAGE="http://expat.sourceforge.net/" 
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
 CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="expat = $portVersion compat >= 2.0
-	lib:libexpat = $portVersion compat >= 1.5"
-REQUIRES="haiku >= $haikuVersion"
-BUILD_REQUIRES="cmd:aclocal
+PROVIDES="
+	expat = $portVersion compat >= 2.0
+	lib:libexpat = $portVersion compat >= 1.5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"
 
@@ -37,5 +47,7 @@ INSTALL()
 }
 
 LICENSE="MIT"
-COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-	2001-2006 Expat maintainers."
+COPYRIGHT="
+	1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+	2001-2006 Expat maintainers.
+	"
diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe
index 8d956ecee..ba2f2cf6e 100644
--- a/dev-libs/libxml2/libxml2-2.7.8.recipe
+++ b/dev-libs/libxml2/libxml2-2.7.8.recipe
@@ -1,22 +1,84 @@
 SUMMARY="The XML C parser and toolkit of Gnome"
-DESCRIPTION="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.
+
+	Libxml2 implements a number of existing standards related to markup 
+	languages:
+
+    - the XML standard: http://www.w3.org/TR/REC-xml
+    - Namespaces in XML: http://www.w3.org/TR/REC-xml-names/
+    - XML Base: http://www.w3.org/TR/xmlbase/
+    - RFC 2396 : Uniform Resource Identifiers
+    - XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath
+    - HTML4 parser: http://www.w3.org/TR/html401/
+    - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr
+    - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/
+    - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] 
+      Unicode encodings, and more if using iconv support part of SGML Open 
+      Technical Resolution TR9401:1997
+    - XML Catalogs Working Draft 06 August 2001: 
+      http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+    - Canonical XML Version 1.0: 
+      http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization 
+      CR draft http://www.w3.org/TR/xml-exc-c14n
+    - Relax NG, ISO/IEC 19757-2:2003, 
+      http://www.oasis-open.org/committees/relax-ng/spec-20011203.html
+    - W3C XML Schemas Part 2: Datatypes REC 02 May 2001
+    - W3C xml:id Working Draft 7 April 2004
+
+	In most cases libxml2 tries to implement the specifications in a 
+	relatively strictly compliant way. As of release 2.4.16, libxml2 passed 
+	all 1800+ tests from the OASIS XML Tests Suite.
+
+	To some extent libxml2 provides support for the following additional 
+	specifications but doesn't claim to implement them completely:
+
+    - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ 
+      the document model, but it doesn't implement the API itself, gdome2 
+      does this on top of libxml2
+    - RFC 959 : libxml2 implements a basic FTP client code
+    - RFC 1945 : HTTP/1.0, again a basic HTTP client code
+    - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible 
+      with early expat versions
+
+	A partial implementation of XML Schemas Part 1: Structure is being worked 
+	on but it would be far too early to make any conformance statement about 
+	it at the moment.
+	"
 HOMEPAGE="http://www.xmlsoft.org/" 
 SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
 CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="libxml2 = $portVersion compat >= 2.7
-	lib:libxml2 = $portVersion compat >= 2.7"
-REQUIRES="haiku >= $haikuVersion
-	zlib"
-BUILD_REQUIRES="cmd:aclocal
+PROVIDES="
+	libxml2 = $portVersion compat >= 2.7
+	lib:libxml2 = $portVersion compat >= 2.7
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	zlib
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc
 	cmd:ld
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe
index d86f61bcd..2fb63d280 100644
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -1,31 +1,56 @@
-SUMMARY="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
-DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)"
+DESCRIPTION="
+	The OpenSSL Project is a collaborative effort to develop a robust, 
+	commercial-grade, full-featured, and Open Source toolkit implementing the 
+	Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+	protocols as well as a full-strength general purpose cryptography library. 
+	The project is managed by a worldwide community of volunteers that use the
+	Internet to communicate, plan, and develop the OpenSSL toolkit and its 
+	related documentation.
+
+	OpenSSL is based on the excellent SSLeay library developed by Eric A. Young
+	and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style 
+	licence, which basically means that you are free to get and use it for 
+	commercial and non-commercial purposes subject to some simple license 
+	conditions. 
+	"
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz"
 CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="openssl = $portVersion compat >= 1
+PROVIDES="
+	openssl = $portVersion compat >= 1
 	cmd:c_rehash = $portVersion compat >= 1
 	cmd:openssl = $portVersion compat >= 1
 	lib:libcrypto = $portVersion compat >= 1
-	lib:libssl = $portVersion compat >= 1"
-REQUIRES="haiku >= $haikuVersion
-	zlib >= 1.2.3"
-BUILD_REQUIRES="cmd:gcc
+	lib:libssl = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	zlib >= 1.2.3
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:gcc
 	cmd:ld
 	cmd:make
-	cmd:sed"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:perl >= 5
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
-	sed -i "s@MANDIR=\$(OPENSSLDIR)\/man@MANDIR=$manDir@g" Make*
-	./config --prefix=$prefix zlib shared \
-		--openssldir=$dataRootDir/ssl
+	# Fix hardcoded directory for manpages
+	sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make*
+	
+	./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl
 	make
 }
 
diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe
index 047556d58..26a60ffe9 100644
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -1,12 +1,20 @@
 SUMMARY="Open source version control system"
-DESCRIPTION="Subversion is an open source version control system."
+DESCRIPTION="
+	Subversion exists to be universally recognized and adopted as an 
+	open-source, centralized version control system characterized by its 
+	reliability as a safe haven for valuable data; the simplicity of its 
+	model and usage; and its ability to support the needs of a wide 
+	variety of users and projects, from individuals to large-scale enterprise 
+	operations.
+	"
 HOMEPAGE="http://subversion.apache.org"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
 CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="subversion = $portVersion compat >= 1.6
+PROVIDES="
+	subversion = $portVersion compat >= 1.6
 	cmd:svn = $portVersion compat >= 1.6
 	cmd:svnadmin = $portVersion compat >= 1.6
 	cmd:svndumpfilter = $portVersion compat >= 1.6
@@ -15,8 +23,10 @@ PROVIDES="subversion = $portVersion compat >= 1.6
 	cmd:svnsync = $portVersion compat >= 1.6
 	cmd:svnversion = $portVersion compat >= 1.6
 	lib:libiconv = 2.5.0 compat >= 2
-	lib:libcharset = 1.0.0 compat >= 1"
-REQUIRES="haiku >= $haikuVersion
+	lib:libcharset = 1.0.0 compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	apr >= 1.3
 	apr-util >= 1.3
 	expat >= 2.0
@@ -24,14 +34,20 @@ REQUIRES="haiku >= $haikuVersion
 	libxml2 >= 2.7
 	neon >= 0.29
 	sqlite >= 3.4
-	zlib"
-BUILD_REQUIRES="cmd:aclocal
+	zlib
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"
 
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index 8aa8370c9..bcfcd82be 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -1,22 +1,49 @@
 SUMMARY="HTTP and WebDAV client library, with a C interface"
-DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface."
+DESCRIPTION="
+	neon is an HTTP and WebDAV client library, with a C interface. Features:
+
+	- high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, 
+	  DELETE, etc)
+	- low-level interface to the HTTP request/response engine, allowing the 
+	  use of arbitrary HTTP methods, headers, etc.
+	- authentication support including Basic and Digest support, along with 
+	  GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32
+	- SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer 
+	  for verifying server certificates, handling client certificates, and 
+	  examining certificate properties. Smartcard-based client certificates 
+	  are also supported via a PKCS#11 wrapper interface.
+	- abstract interface to parsing XML using libxml2 or expat, and wrappers 
+      for simplifying handling XML HTTP response bodies
+	- WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify 
+	  property manipulation.
+	"
 HOMEPAGE="http://www.webdav.org/neon/"
 SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
 CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="neon = $portVersion compat >= 0.29
-	lib:libneon = 27.2.6 compat >= 27.2"
-REQUIRES="haiku >= $haikuVersion
+PROVIDES="
+	neon = $portVersion compat >= 0.29
+	lib:libneon = 27.2.6 compat >= 27.2
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	openssl >= 1.0.0
-	libxml2 >= 2.7.8"
-BUILD_REQUIRES="cmd:aclocal
+	libxml2 >= 2.7.8
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
 	cmd:autoconf
+	cmd:libtoolize
 	cmd:gcc
 	cmd:ld
-	cmd:make"
-BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku-devel >= $haikuVersion
+	"
 
 SOURCE_DIR="$portVersionedName"