Merged haikuports/haikuports into master

app-admin/keepassx/additional-files/keepassx.rdef

@@ -7,7 +7,7 @@ resource app_version {
 	minor  = 0,
 
 	variety = B_APPV_ALPHA,
-	internal = 4,
+	internal = 5,
 
 	short_info = "Qt password manager",
 	long_info = ""

app-admin/keepassx/keepassx-2.0a5.recipe

@@ -1,24 +1,20 @@
 SUMMARY="Qt password manager"
 DESCRIPTION="
-KeePassX is an application for people with extremly high demands on
+KeePassX is an application for people with extremly high demands on secure \
-secure personal data management. It has a light interface, is cross
+personal data management. It has a light interface, is cross platform and \
-platform and published under the terms of the GNU General Public
+published under the terms of the GNU General Public License.
-License.
+KeePassX saves many different information e.g. user names, passwords, urls, \
-
+attachments and comments in one single database. For a better management \
-KeePassX saves many different information e.g. user names, passwords,
+user-defined titles and icons can be specified for each single entry. \
-urls, attachments and comments in one single database. For a better
+Furthermore the entries are sorted in groups, which are customizable as well. \
-management user-defined titles and icons can be specified for each
+The integrated search function allows to search in a single group or the \
-single entry. Furthermore the entries are sorted in groups, which are
+complete database.
-customizable as well. The integrated search function allows to search
+KeePassX offers a little utility for secure password generation. The password \
-in a single group or the complete database.
+generator is very customizable, fast and easy to use. Especially someone who \
-
+generates passwords frequently will appreciate this feature.
-KeePassX offers a little utility for secure password generation. The
-password generator is very customizable, fast and easy to use.
-Especially someone who generates passwords frequently will appreciate
-this feature.
 "
 HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="git+https://github.com/keepassx/keepassx.git#755241df5c"
+SRC_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5"
 COPYRIGHT="
 	2010-2012, Felix Geyer
 	2011-2012, Florian Geyer
@@ -63,7 +59,7 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 
-PATCHES="keepassx-2.0a4.git.patchset"
+PATCHES="keepassx-2.0a5.patchset"
 
 BUILD()
 {

app-admin/pwgen/pwgen-2.06.recipe

@@ -1,22 +1,19 @@
 SUMMARY="pwgen - password generator"
 DESCRIPTION="
-The pwgen program generates passwords which are designed to be easily
+The pwgen program generates passwords which are designed to be easily \
-memorized by humans, while being as secure as possible.  Human-
+memorized by humans, while being as secure as possible. Human- memorable \
-memorable passwords are never going to be as secure as completely
+passwords are never going to be as secure as completely completely random \
-completely random passwords.  In particular, passwords generated by
+passwords. In particular, passwords generated by pwgen without the -s option \
-pwgen without the -s option should not be used in places where the
+should not be used in places where the password could be attacked via an \
-password could be attacked via an off-line brute-force attack.   On
+off-line brute-force attack. On the other hand, completely randomly generated \
-the other hand, completely randomly generated  passwords have a
+passwords have a tendency to be written down, and are subject to being \
-tendency to be written down, and are subject to being compromised in
+compromised in that fashion.
-that fashion.
+The pwgen program is designed to be used both interactively, and in shell \
-
+scripts. Hence, its default behavior differs depending on whether the standard \
-The pwgen program is designed to be used both interactively, and in
+output is a tty device or a pipe to another program. Used interactively, pwgen \
-shell scripts.  Hence, its default behavior differs depending on
+will display a screenful of passwords, allowing the user to pick a single \
-whether the standard output is a tty device or a pipe to another
+password, and then quickly erase the screen. This prevents someone from being \
-program.  Used interactively, pwgen will display a screenful of
+able to 'shoulder surf' the user's chosen password.
-passwords, allowing the user to pick a single password, and then
-quickly erase the screen.  This prevents someone from being able to
-'shoulder surf' the user's chosen password.
 "
 HOMEPAGE="http://sourceforge.net/projects/pwgen" 
 SRC_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz"

app-arch/arc/arc-5.21p.recipe

@@ -1,5 +1,7 @@
 SUMMARY="Create & extract files from DOS .ARC files"
-DESCRIPTION="Create & extract files from DOS .ARC files"
+DESCRIPTION="
+Create & extract files from DOS .ARC files
+"
 HOMEPAGE="http://arc.sourceforge.net/" 
 LICENSE="GNU GPL v2"
 COPYRIGHT="1985-2009 Thom Henderson"

app-arch/bzip2/bzip2-1.0.6.recipe

@@ -1,11 +1,17 @@
 SUMMARY="bzip2 data compression utilities and libraries"
-DESCRIPTION="bzip2 is a patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. bzip2 supports recovery from media errors as well. Its command line flags are similar to those of GNU Gzip."
+DESCRIPTION="
+bzip2 is a patent free, high-quality data compressor. It typically compresses \
+files to within 10% to 15% of the best available techniques (the PPM family of \
+statistical compressors), whilst being around twice as fast at compression and \
+six times faster at decompression. bzip2 supports recovery from media errors \
+as well. Its command line flags are similar to those of GNU Gzip.
+"
 HOMEPAGE="http://www.bzip.org/"
 LICENSE="bzip2"
 COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -44,7 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -58,8 +63,15 @@ INSTALL()
 	make install PREFIX=$prefix
 
 	mkdir -p $libDir
+
+	#move the static library to the right dir for secondary arch builds
+	if [ -n "$secondaryArchSuffix" ];then
+		mv $prefix/lib/libbz2.a $libDir
+	fi
+
 	# also install shared lib
-	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
+	ln -sf libbz2.so.1.0.6 libbz2.so
+	cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir
 
 	# move man pages
 	mkdir -p $manDir
@@ -78,6 +90,12 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	#remove bin commands and man pages when building for secondary arch
+	if [ -n "$secondaryArchSuffix" ];then
+		rm -rf $prefix/bin
+		rm -rf $manDir
+	fi
 }
 
 # ----- devel package -------------------------------------------------------

app-arch/cabextract/cabextract-1.4.recipe

@@ -1,10 +1,9 @@
 SUMMARY="A program to extract Microsoft Cabinet Files"
 DESCRIPTION="
-cabextract is Free Software for extracting Microsoft cabinet files,
+cabextract is Free Software for extracting Microsoft cabinet files, also \
-also called .CAB files. cabextract is distributed under the GPL
+called .CAB files. cabextract is distributed under the GPL license. It is \
-license. It is based on the portable LGPL libmspack library.
+based on the portable LGPL libmspack library. cabextract supports all special \
-cabextract supports all special features and all compression formats
+features and all compression formats of Microsoft cabinet files.
-of Microsoft cabinet files.
 "
 HOMEPAGE="http://www.cabextract.org.uk" 
 LICENSE="GNU GPL v2"

app-arch/cpio/cpio-2.11.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe." 
+DESCRIPTION="
+GNU cpio copies files into or out of a cpio or tar archive. The archive can be \
+another file on the disk, a magnetic tape, or a pipe.
+" 
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" 
 SRC_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.gz"
 CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c"

app-arch/fastjar/fastjar-0.98.recipe

@@ -1,10 +1,9 @@
 SUMMARY="A jar(java archive) program written in C"
 DESCRIPTION="
-FastJar is an attempt at creating a feature-for-feature copy of Sun's
+FastJar is an attempt at creating a feature-for-feature copy of Sun's JDK's \
-JDK's 'jar' command.  Sun's jar (or Blackdown's for that matter) is
+'jar' command.  Sun's jar (or Blackdown's for that matter) is written entirely \
-written entirely in Java which makes it dog slow.  Since FastJar is
+in Java which makes it dog slow.  Since FastJar is written in C, it can create \
-written in C, it can create the same .jar file as Sun's tool in a
+the same .jar file as Sun's tool in a fraction of the time.
-fraction of the time.
 "
 HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
 LICENSE="GNU GPL v2"

app-arch/ha/ha-0999.recipe

@@ -1,5 +1,7 @@
 SUMMARY="The HA archiver using the HSC compression method"
-DESCRIPTION="The HA archiver using the HSC compression method"
+DESCRIPTION="
+The HA archiver using the HSC compression method
+"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1993-1995 Harri Hirvola"
 HOMEPAGE="https://code.google.com/p/ak-various-projects/"

app-arch/lha/lha-1.14i.recipe

@@ -1,5 +1,7 @@
 SUMMARY="Archive files using LZSS and Huffman compression (.lzh files)"
-DESCRIPTION="Archive files using LZSS and Huffman compression (.lzh files)"
+DESCRIPTION="
+Archive files using LZSS and Huffman compression (.lzh files)
+"
 LICENSE="lha"
 COPYRIGHT="1991, Masaru Oki
 	1993-1995, Nobutaka Watazaki

app-arch/libarchive/libarchive-3.1.2.recipe

@@ -1,26 +1,24 @@
 SUMMARY="C library and tools for working with many archive formats."
 DESCRIPTION="
 The libarchive library features:
- * Support for a variety of archive and compression formats.
+* Support for a variety of archive and compression formats.
- * Robust automatic format detection, including archive/compression
+* Robust automatic format detection, including archive/compression \
-   combinations such as tar.gz.
+combinations such as tar.gz.
- * Zero-copy internal architecture for high performance.
+* Zero-copy internal architecture for high performance.
- * Streaming architecture eliminates all limits on size of archive,
+* Streaming architecture eliminates all limits on size of archive, limits on \
-   limits on entry sizes depend on particular formats.
+entry sizes depend on particular formats.
- * Carefully factored code to minimize bloat when programs are
+* Carefully factored code to minimize bloat when programs are statically linked.
-   statically linked.
+* Growing test suite ? to verify correctness of new ports.
- * Growing test suite ? to verify correctness of new ports.
+* Works on most POSIX-like systems
- * Works on most POSIX-like systems
+* Supports Windows, including Cygwin, MinGW, and Visual Studio.
- * Supports Windows, including Cygwin, MinGW, and Visual Studio.
+The bsdtar and bscpio command-line utilities are feature- and \
-
-The bsdtar and bscpio command-line utilities are feature- and
 performance-competitive with other tar and cpio implementations:
- * Reads a variety of formats, including tar, pax, cpio, zip, xar,
+* Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \
-   lha, ar, cab, mtree, rar, and ISO images.
+cab, mtree, rar, and ISO images.
- * Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
+* Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
- * Automatically handles archives compressed with gzip, bzip2, lzip,
+* Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \
-   xz, lzma, or compress.
+or compress.
- * Unique format conversion feature.
+* Unique format conversion feature.
 "
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2003-2013 Tim Kientzle"
@@ -94,7 +92,6 @@ REQUIRES_devel="
 
 PATCHES="libarchive-3.1.2.patchset"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-arch/p7zip/p7zip-9.20.1.recipe

@@ -1,5 +1,8 @@
 SUMMARY="7-zip file compression program"
-DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+DESCRIPTION="
+p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \
+OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga.
+"
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
 CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"

app-arch/pigz/pigz-2.3.1.recipe

@@ -1,14 +1,13 @@
 SUMMARY="A parallel implementation of gzip for multi-processor machines"
 DESCRIPTION="
-pigz, which stands for Parallel Implementation of GZip, is a fully
+pigz, which stands for Parallel Implementation of GZip, is a fully functional \
-functional replacement for gzip that exploits multiple processors and
+replacement for gzip that exploits multiple processors and multiple cores to \
-multiple cores to the hilt when compressing data.
+the hilt when compressing data.
 
-pigz was written by Mark Adler, and uses the zlib and pthread
+pigz was written by Mark Adler, and uses the zlib and pthread libraries.
-libraries.
 
-This version of pigz is written to be portable across Unix-style
+This version of pigz is written to be portable across Unix-style operating \
-operating systems that provide the zlib and pthread libraries.
+systems that provide the zlib and pthread libraries.
 "
 LICENSE="Zlib"
 COPYRIGHT="2008-2013 Mark Adler"

app-arch/sharutils/sharutils-4.14.recipe

@@ -1,19 +1,16 @@
 SUMMARY="sharutils"
 DESCRIPTION="
-GNU shar makes so-called shell archives out of many files, preparing
+GNU shar makes so-called shell archives out of many files, preparing them for \
-them for transmission by electronic mail services. A shell archive is
+transmission by electronic mail services. A shell archive is a collection of \
-a collection of files that can be unpacked by /bin/sh. A wide range
+files that can be unpacked by /bin/sh. A wide range of features provide \
-of features provide extensive flexibility in manufacturing shars and
+extensive flexibility in manufacturing shars and in specifying shar smartness. \
-in specifying shar smartness. For example, shar may compress files,
+For example, shar may compress files, uuencode binary files, split long files \
-uuencode binary files, split long files and construct multi-part
+and construct multi-part mailings, ensure correct unsharing order, and provide \
-mailings, ensure correct unsharing order, and provide simplistic
+simplistic checksums.
-checksums.
+GNU unshar scans a set of mail messages looking for the start of shell \
-
+archives. It will automatically strip off the mail headers and other \
-GNU unshar scans a set of mail messages looking for the start of shell
+introductory text. The archive bodies are then unpacked by a copy of the \
-archives. It will automatically strip off the mail headers and other
+shell. unshar may also process files containing concatenated shell archives.
-introductory text. The archive bodies are then unpacked by a copy of
-the shell. unshar may also process files containing concatenated
-shell archives.
 "
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 LICENSE="GNU GPL v3"

app-arch/tar/tar-1.26.recipe

@@ -1,16 +1,15 @@
 SUMMARY="Saves and restores files to/from a tape or disk archive."
 DESCRIPTION="
-	The Tar program provides the ability to create tar archives, as well as
+The Tar program provides the ability to create tar archives, as well as \
-	various other kinds of manipulation. For example, you can use Tar on
+various other kinds of manipulation. For example, you can use Tar on \
-	previously created archives to extract files, to store additional files,
+previously created archives to extract files, to store additional files, or to \
-	or to update or list files which were already stored.
+update or list files which were already stored.
-
+Initially, tar archives were used to store files conveniently on magnetic \
-	Initially, tar archives were used to store files conveniently on magnetic
+tape. The name "Tar" comes from this use; it stands for tape archiver. Despite \
-	tape. The name "Tar" comes from this use; it stands for tape archiver.
+the utility's name, Tar can direct its output to available devices, files, or \
-	Despite the utility's name, Tar can direct its output to available
+other programs (using pipes), it can even access remote devices or files (as \
-	devices, files, or other programs (using pipes), it can even access remote
+archives).
-	devices or files (as archives).
+"
-	"
 HOMEPAGE="http://www.gnu.org/software/tar/"
 COPYRIGHT="1990-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
@@ -43,7 +42,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage tar \
 	$binDir/tar
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-arch/unrar/unrar-4.2.4.recipe

@@ -1,5 +1,8 @@
 SUMMARY="Uncompress rar files"
-DESCRIPTION="Unrar decompresses rar files. It is a powerful archive manager that can backup your data and reduce the size of email attachments. Unrar can decompress the following file formats:
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
 - RAR
 - ZIP
 - CAB
@@ -14,7 +17,8 @@ DESCRIPTION="Unrar decompresses rar files. It is a powerful archive manager that
 - ISO
 - 7Z
 - XZ
-- Z (Unix Compress)"
+- Z (Unix Compress)
+"
 HOMEPAGE="http://www.rarlab.com/"
 SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz"
 REVISION="1"

app-arch/unzip/unzip-6.0.recipe

@@ -1,4 +1,6 @@
-DESCRIPTION="unzip" 
+DESCRIPTION="
+unzip
+" 
 HOMEPAGE="http://www.info-zip.org/UnZip.html" 
 SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
 REVISION="1"

app-arch/xar/xar-1.5.2.recipe

@@ -1,14 +1,13 @@
 SUMMARY="Easily extensible archiver"
 DESCRIPTION="
-The XAR project aims to provide an easily extensible archive format.
+The XAR project aims to provide an easily extensible archive format. Important \
-Important design decisions include an easily extensible XML table of
+design decisions include an easily extensible XML table of contents for random \
-contents for random access to archived files, storing the toc at the
+access to archived files, storing the toc at the beginning of the archive to \
-beginning of the archive to allow for efficient handling of streamed
+allow for efficient handling of streamed archives, the ability to handle files \
-archives, the ability to handle files of arbitrarily large sizes, the
+of arbitrarily large sizes, the ability to choose independent encodings for \
-ability to choose independent encodings for individual files in the
+individual files in the archive, the ability to store checksums for individual \
-archive, the ability to store checksums for individual files in both
+files in both compressed and uncompressed form, and the ability to query the \
-compressed and uncompressed form, and the ability to query the table
+table of content's rich meta-data.
-of content's rich meta-data.
 "
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2005 Rob Braun"

app-arch/xz_utils/xz_utils-5.0.4.recipe

@@ -96,16 +96,24 @@ TEST()
 	make check
 }
 
-DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+DESCRIPTION="
-
+XZ Utils is free general-purpose data compression software with high \
-The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2.
+compression ratio. XZ Utils were written for POSIX-like systems, but also work \
-
+on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+The core of the XZ Utils compression code is based on LZMA SDK, but it has \
+been modified quite a lot to be suitable for XZ Utils. The primary compression \
+algorithm is currently LZMA2, which is used inside the .xz container format. \
+With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \
+smaller output than bzip2.
 XZ Utils consist of several components:
-
+* liblzma is a compression library with API similar to that of zlib.
-    * liblzma is a compression library with API similar to that of zlib.
+* xz is a command line tool with syntax similar to that of gzip.
-    * xz is a command line tool with syntax similar to that of gzip.
+* xzdec is a decompression-only tool smaller than the full-featured xz tool.
-    * xzdec is a decompression-only tool smaller than the full-featured xz tool.
+* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \
-    * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files.
+ease viewing, grepping, and comparing compressed files.
-    * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils.
+* Emulation of command line tools of LZMA Utils eases transition from LZMA \
-
+Utils to XZ Utils.
-While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API."
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O \
+functions. A separate I/O library is planned, which would abstract handling of \
+.gz, .bz2, and .xz files with an easy to use API.
+"

app-benchmarks/bonnie++/bonnie++-1.03e.recipe

@@ -1,23 +1,19 @@
 SUMMARY="Bonnie++ is a benchmark and test suite for filesystems"
 DESCRIPTION="
-Bonnie++ is a benchmark suite that is aimed at performing a number of
+Bonnie++ is a benchmark suite that is aimed at performing a number of simple \
-simple tests of hard drive and file system performance. Then you can
+tests of hard drive and file system performance. Then you can decide which \
-decide which test is important and decide how to compare different
+test is important and decide how to compare different systems after running \
-systems after running it. I have no plans to ever have it produce a
+it. I have no plans to ever have it produce a single number, because I don't \
-single number, because I don't think that a single number can be
+think that a single number can be useful when comparing such things.
-useful when comparing such things.
+The main program tests database type access to a single file (or a set of \
-
+files if you wish to test more than 1G of storage), and it tests creation, \
-The main program tests database type access to a single file (or a set
+reading, and deleting of small files which can simulate the usage of programs \
-of files if you wish to test more than 1G of storage), and it tests
+such as Squid, INN, or Maildir format email.
-creation, reading, and deleting of small files which can simulate the
+The ZCAV program which I initially released as a seperate package tests the \
-usage of programs such as Squid, INN, or Maildir format email.
+performance of different zones of a hard drive. It does not write any data (so \
-
+you can use it on full file systems). It can show why comparing the speed of \
-The ZCAV program which I initially released as a seperate package
+Windows at the start of a hard drive to Linux at the end of the hard drive \
-tests the performance of different zones of a hard drive. It does not
+(typical dual-boot scenario) isn't a valid comparison.
-write any data (so you can use it on full file systems). It can show
-why comparing the speed of Windows at the start of a hard drive to
-Linux at the end of the hard drive (typical dual-boot scenario) isn't
-a valid comparison.
 "
 LICENSE="GNU GPL v2"
 COPYRIGHT="1990, Tim Bray

app-benchmarks/ffsb/ffsb-6.0_rc2.recipe

@@ -1,9 +1,9 @@
 SUMMARY="Flexible Filesystem Benchmark"
 DESCRIPTION="
-The Flexible Filesystem Benchmark (FFSB) is a cross-platform
+The Flexible Filesystem Benchmark (FFSB) is a cross-platform filesystem \
-filesystem performance measurement tool. It uses customizable profiles
+performance measurement tool. It uses customizable profiles to measure of \
-to measure of different workloads, and it supports multiple groups of
+different workloads, and it supports multiple groups of threads across \
-threads across multiple filesystems.
+multiple filesystems.
 "
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2004 International Business Machines Corp."

app-benchmarks/piozone/piozone-1.0.recipe

@@ -1,5 +1,7 @@
 SUMMARY="Hard disk benchmarking program"
-DESCRIPTION="Hard disk benchmarking program"
+DESCRIPTION="
+Hard disk benchmarking program
+"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002 Peter Eriksson"
 HOMEPAGE="http://www.lysator.se/~pen/piozone/" 

app-cdr/bchunk/bchunk-1.2.0.recipe

@@ -1,10 +1,10 @@
 SUMMARY="binchunker converts CD .bin/.cue formats to .iso and .cdr"
 DESCRIPTION="
-binchunker converts a CD image in a '.bin / .cue' format (sometimes
+binchunker converts a CD image in a '.bin / .cue' format (sometimes '.raw / \
-'.raw / .cue') to a set of .iso and .cdr tracks. The bin/cue format is
+.cue') to a set of .iso and .cdr tracks. The bin/cue format is used by some \
-used by some popular non-Unix cd-writing software, but is not
+popular non-Unix cd-writing software, but is not supported on most other CD \
-supported on most other CD burning programs. A lot of CD/VCD images
+burning programs. A lot of CD/VCD images distributed on the Internet are in \
-distributed on the Internet are in BIN/CUE format, I've been told.
+BIN/CUE format, I've been told.
 "
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2004 Heikki Hannikainen"

app-cdr/cdrtools/cdrtools-3.01~a18.recipe

@@ -1,18 +1,19 @@
 SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
-DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media.
+DESCRIPTION="
-
+Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
+media.
 The suite includes the following programs:
-
+- cdrecord  A CD/DVD/BD recording program 
-    cdrecord  A CD/DVD/BD recording program 
+- readcd    A program to read CD/DVD/BD media with CD-clone features 
-    readcd    A program to read CD/DVD/BD media with CD-clone features 
+- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-    cdda2wav  The most evolved CD-audio extraction program with paranoia support 
+- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with \
-    mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes 
+optional Rock Ridge attributes 
-    isodebug  A program to print mkisofs debug information from media 
+- isodebug  A program to print mkisofs debug information from media 
-    isodump   A program to dump ISO-9660 media 
+- isodump   A program to dump ISO-9660 media 
-    isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
+- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-    isovfy    A program to verify the ISO-9660 structures 
+- isovfy    A program to verify the ISO-9660 structures 
-    rscsi     A Remote SCSI enabling daemon
+- rscsi     A Remote SCSI enabling daemon
-    "
+"
 HOMEPAGE="http://cdrecord.berlios.de" 
 COPYRIGHT="
 	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)

app-cdr/daa2iso/daa2iso-0.1.7e.recipe

@@ -1,8 +1,7 @@
 SUMMARY="A tool for converting DAA/GBI images to ISO format."
 DESCRIPTION="
-DAA2ISO is an open source command-line/GUI tool for converting single
+DAA2ISO is an open source command-line/GUI tool for converting single and \
-and multipart DAA and GBI images to the original ISO format.
+multipart DAA and GBI images to the original ISO format.
-
 DAA/GBI files are 'Direct Access Archive' used by PowerISO and gBurner
 "
 LICENSE="GNU GPL v2"

app-cdr/uif2iso/uif2iso-0.1.7c.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="A command-line tool for converting single and multipart UIF images to the ISO format."
+DESCRIPTION="
+A command-line tool for converting single and multipart UIF images to the ISO \
+format.
+"
 HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
 SRC_URI="http://aluigi.altervista.org/mytoolz/uif2iso.zip"
 REVISION="1"

app-crypt/gnupg/gnupg-1.4.11.recipe

@@ -1,5 +1,12 @@
 SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." 
-DESCRIPTION="GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data and communication, features a versatile key management system as well as access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications." 
+DESCRIPTION="
+GnuPG is the GNU project's complete and free implementation of the OpenPGP \
+standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \
+and communication, features a versatile key management system as well as \
+access modules for all kinds of public key directories. GnuPG, also known as \
+GPG, is a command line tool with features for easy integration with other \
+applications.
+" 
 HOMEPAGE="http://www.gnupg.org/" 
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2"
 CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"

app-dicts/aspell_en/aspell_en-7.1_0.recipe

@@ -1,5 +1,11 @@
 SUMMARY="English dictionary for aspell program/library"
-DESCRIPTION="This is the English dictionary for the GNU Aspell program, an open source spell checker. Its advantage is its superiority of suggesting possible replacements for a misspelled wordx than most other spellcheck programs. Aspell is also able to maintain support for more than one langague at a time and can check documents in UTF-8."
+DESCRIPTION="
+This is the English dictionary for the GNU Aspell program, an open source \
+spell checker. Its advantage is its superiority of suggesting possible \
+replacements for a misspelled wordx than most other spellcheck programs. \
+Aspell is also able to maintain support for more than one langague at a time \
+and can check documents in UTF-8.
+"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2011 Kevin Atkinson"
 HOMEPAGE="http://aspell.net" 

app-doc/doxygen/doxygen-1.6.3.recipe

@@ -1,11 +1,24 @@
 SUMMARY="Generate documentation from source code"
-DESCRIPTION="Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
+DESCRIPTION="
-
+Doxygen is the de facto standard tool for generating documentation from \
+annotated C++ sources, but it also supports other popular programming \
+languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \
+Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
 Doxygen can help you in three ways:
-
+1. It can generate an on-line documentation browser (in HTML) and/or an \
-   1. It can generate an on-line documentation browser (in HTML) and/or an off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source files. There is also support for generating output in RTF (MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The documentation is extracted directly from the sources, which makes it much easier to keep the documentation consistent with the source code.
+off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \
-   2. You can configure doxygen to extract the code structure from undocumented source files. This is very useful to quickly find your way in large source distributions. Doxygen can also visualize the relations between the various elements by means of include dependency graphs, inheritance diagrams, and collaboration diagrams, which are all generated automatically.
+files. There is also support for generating output in RTF (MS-Word), \
-   3. You can also use doxygen for creating normal documentation (as I did for the doxygen user manual and web-site)."
+PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \
+documentation is extracted directly from the sources, which makes it much \
+easier to keep the documentation consistent with the source code.
+2. You can configure doxygen to extract the code structure from undocumented \
+source files. This is very useful to quickly find your way in large source \
+distributions. Doxygen can also visualize the relations between the various \
+elements by means of include dependency graphs, inheritance diagrams, and \
+collaboration diagrams, which are all generated automatically.
+3. You can also use doxygen for creating normal documentation (as I did for \
+the doxygen user manual and web-site).
+"
 HOMEPAGE="http://www.doxygen.org"
 COPYRIGHT="1997-2010 Dimitri van Heesch"
 LICENSE="GNU GPL v2"
@@ -39,7 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-doc/doxygen/doxygen-1.7.4.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
+DESCRIPTION="
+Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL \
+(Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.
+" 
 HOMEPAGE="http://www.doxygen.org" 
 SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz"
 CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48"

app-editors/jed/jed-0.99_19.recipe

@@ -1,4 +1,6 @@
-DESCRIPTION="JED is a freely available text editor" 
+DESCRIPTION="
+JED is a freely available text editor
+" 
 HOMEPAGE="http://www.jedsoft.org/jed/" 
 SRC_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2"
 REVISION="1"

app-editors/joe/joe-3.8_hg.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="JOE is a full featured terminal-based screen editor which is distributed under the GNU General Public License (GPL)." 
+DESCRIPTION="
+JOE is a full featured terminal-based screen editor which is distributed under \
+the GNU General Public License (GPL).
+" 
 HOMEPAGE="http://joe-editor.sourceforge.net/" 
 SRC_URI="hg+http://joe-editor.hg.sourceforge.net:8000/hgroot/joe-editor/joe-editor"
 REVISION="2"

app-editors/nano/nano-2.2.6.recipe

@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-editors/qemacs/qemacs-0.3.3.recipe

@@ -1,22 +1,55 @@
+SUMMARY="QEmacs editor"
 DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor"
 HOMEPAGE="http://bellard.org/qemacs/"
 SRC_URI="http://bellard.org/qemacs/qemacs-0.3.3.tar.gz"
 CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990"
 REVISION="1"
-STATUS_HAIKU="broken"
+LICENSE="GNU LGPL v2.1"
-DEPEND="app-text/texi2html >= 1.82"
+COPYRIGHT="2000-2003 Fabrice Bellard"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	qemacs$secondaryArchSuffix = $portVersion
+	app:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qe$secondaryArchSuffix = $portVersion
+	cmd:html2png$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libavcodec$secondaryArchSuffix
+#	lib:libavformat$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libpng$secondaryArchSuffix
+#	devel:libavcodec$secondaryArchSuffix
+#	devel:libavformat$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:texi2html
+	"
+
+PATCHES="qemacs-0.3.3.patch"
+
 BUILD()
 {
-	cd qemacs-0.3.3
+	runConfigure ./configure
-	./configure
 	make
 }
 
 INSTALL()
 {
-	cd qemacs-0.3.3
 	make install
+	addAppDeskbarSymlink $binDir/qe QEmacs
 }
 
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2000-2003 Fabrice Bellard"

app-editors/qemacs/qemacs-0.4.0dev.recipe

@@ -0,0 +1,68 @@
+SUMMARY="QEmacs editor"
+DESCRIPTION="
+QEmacs (for Quick Emacs), a very small but powerful UNIX editor.
+It has features that even big editors lack :
+- Full screen editor with an Emacs look and feel with all Emacs common features.
+- Full UTF8 support.
+- WYSIWYG HTML/XML/CSS2 mode graphical editing.
+- WYSIWYG DocBook.
+- C mode: coloring with immediate update. Emacs like auto-indent.
+- Shell mode, Hexadecimal editing...
+
+The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs \
+syntax.
+"
+HOMEPAGE="http://bellard.org/qemacs/"
+SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs"
+#CHECKSUM_MD5=""
+REVISION="1"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2000-2003 Fabrice Bellard"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	qemacs$secondaryArchSuffix = $portVersion
+	app:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qemacs$secondaryArchSuffix = $portVersion
+	cmd:qe$secondaryArchSuffix = $portVersion
+	cmd:html2png$secondaryArchSuffix = $portVersion
+	cmd:qemacs_pe2qe$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libavcodec$secondaryArchSuffix
+#	lib:libavformat$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libpng$secondaryArchSuffix
+#	devel:libavcodec$secondaryArchSuffix
+#	devel:libavformat$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:which
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:texi2html
+	"
+
+BUILD()
+{
+	./configure --prefix=$prefix --datadir=$dataDir --mandir=$manDir
+	make
+}
+
+INSTALL()
+{
+	make install
+	install -m 755 haiku-pe2qe.sh $binDir/qemacs-pe2qe
+	addAppDeskbarSymlink $binDir/qe QEmacs
+}
+

app-editors/vim/vim-7.4.recipe

@@ -1,17 +1,15 @@
 SUMMARY="Vim is highly configurable text editor." 
 DESCRIPTION="
-	Vim is a highly configurable text editor built to enable efficient text
+Vim is a highly configurable text editor built to enable efficient text \
-	editing. It is an improved version of the vi editor distributed with most
+editing. It is an improved version of the vi editor distributed with most UNIX \
-	UNIX systems.
+systems.
-
+Vim is often called a \"programmer's editor,\" and so useful for programming \
-	Vim is often called a \"programmer's editor,\" and so useful for programming
+that many consider it an entire IDE. It's not just for programmers, though. \
-	that many consider it an entire IDE. It's not just for programmers, though.
+Vim is perfect for all kinds of text editing, from composing email to editing \
-	Vim is perfect for all kinds of text editing, from composing email to editing
+configuration files.
-	configuration files.
+Despite what the above comic suggests, Vim can be configured to work in a very \
-
+simple (Notepad-like) way, called evim or Easy Vim.
-	Despite what the above comic suggests, Vim can be configured to work in a very
+"
-	simple (Notepad-like) way, called evim or Easy Vim.
-	"
 HOMEPAGE="http://www.vim.org" 
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
 COPYRIGHT="Bram Moleenar et al."

app-editors/xemacs/xemacs-21.5_hg.recipe

@@ -1,5 +1,7 @@
 SUMMARY="XEmacs editor"
-DESCRIPTION="highly customizable open source text editor and application development system"
+DESCRIPTION="
+highly customizable open source text editor and application development system
+"
 HOMEPAGE="http://xemacs.org/"
 SRC_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953"
 REVISION="1"
@@ -69,7 +71,6 @@ BUILD_PREREQUIRES="
 # TODO: fix lispdir to not use $HOME
 BUILD()
 {
-	export DISABLEASLR=1
 	autoconf
 	export HOME=/boot/home
 	runConfigure ./configure \
@@ -92,8 +93,7 @@ BUILD()
 
 INSTALL()
 {
-	export DISABLEASLR=1
 	make install
-	addattr SYS:ENV DISABLEASLR=1 $binDir/xemacs-21*
+	addattr SYS:ENV DISABLE_ASLR=1 $binDir/xemacs-21*
 	addAppDeskbarSymlink $binDir/xemacs XEmacs
 }

app-emulation/aranym/aranym-0.9.15_git.recipe

@@ -1,7 +1,8 @@
 SUMMARY="ARAnyM (Atari Running on Any Machine)"
-DESCRIPTION="ARAnyM (Atari Running on Any Machine)
+DESCRIPTION="
-	is a multiplatform virtual machine for running
+ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for \
-	Atari ST/TT/Falcon operating systems and applications."
+running Atari ST/TT/Falcon operating systems and applications.
+"
 HOMEPAGE="http://aranym.org/"
 SRC_URI="git://git.code.sf.net/p/aranym/code"
 REVISION="1"

app-emulation/libdsk/libdsk-1.3.3.recipe

@@ -64,16 +64,15 @@ INSTALL()
 COPYRIGHT="2010 John Elliott"
 LICENSE="GNU GPL v2"
 DESCRIPTION="
-	LIBDSK is a library for accessing discs and disc image files. It is
+LIBDSK is a library for accessing discs and disc image files. It is intended \
-	intended for use in:
+for use in:
-
+* Emulator tools - converting between real floppy discs and disc images, as \
-	* Emulator tools - converting between real floppy discs and disc images, as
+CPCTRANS / PCWTRANS do under DOS.
-	CPCTRANS / PCWTRANS do under DOS.
+* Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus allowing \
-	* Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus
+the use of CPMTOOLS on emulator .DSK images. To do this, install LIBDSK and \
-	allowing the use of CPMTOOLS on emulator .DSK images. To do this, install
+then build CPMTOOLS, using \"./configure --with-libdsk\". For CPMTOOLS 1.9 or \
-	LIBDSK and then build CPMTOOLS, using \"./configure --with-libdsk\". For
+2.0, you will also need to apply this patch.
-	CPMTOOLS 1.9 or 2.0, you will also need to apply this patch.
+* Emulators - it is possible to use LIBDSK as part of an emulator's floppy \
-	* Emulators - it is possible to use LIBDSK as part of an emulator's floppy
+controller emulation, thus giving the emulator transparent access to .DSK \
-	controller emulation, thus giving the emulator transparent access to .DSK
+files or real discs.
-	files or real discs.
+"
-	"

app-emulation/mednafen/mednafen-0.9.26.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="A portable, utilizing OpenGL and SDL, argument(command-line)-driven multi-system emulator"
+DESCRIPTION="
+A portable, utilizing OpenGL and SDL, argument(command-line)-driven \
+multi-system emulator
+"
 HOMEPAGE="http://mednafen.sourceforge.net/"
 SRC_URI="http://sourceforge.net/projects/mednafen/files/Mednafen/0.9.26-WIP/mednafen-0.9.26-wip.tar.bz2/download"
 CHECKSUM_MD5="cf4eadb057e91c59b181d07bc12245f0"

app-emulation/oricutron/oricutron-1.1_svn.recipe

@@ -1,5 +1,7 @@
 SUMMARY="Oricutron is an emulator for the Oric series of computers."
-DESCRIPTION="Oricutron is an emulator for the Oric series of computers."
+DESCRIPTION="
+Oricutron is an emulator for the Oric series of computers.
+"
 HOMEPAGE="http://code.google.com/p/oriculator/"
 SRC_URI="svn+http://oriculator.googlecode.com/svn/trunk"
 REVISION="1"
@@ -43,6 +45,6 @@ INSTALL()
 {
 	make install INSTALLDIR=$prefix/apps/Oricutron
 	mimeset $prefix/apps/Oricutron/oricutron
-	#addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron
+	addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron
 }
 

app-emulation/qemu/qemu-1.7.0.recipe

@@ -1,5 +1,7 @@
 SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
-DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer."
+DESCRIPTION="
+QEMU is a generic and open source machine emulator and virtualizer.
+"
 HOMEPAGE="http://wiki.qemu.org/"
 SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
 COPYRIGHT="2003-2008 Fabrice Bellard"

app-misc/colordiff/colordiff-1.0.13.recipe

@@ -1,8 +1,8 @@
 SUMMARY="Colorizes output of diff"
 DESCRIPTION="
-The Perl script colordiff is a wrapper for 'diff' and produces the
+The Perl script colordiff is a wrapper for 'diff' and produces the same output \
-same output but with pretty 'syntax' highlighting. Colour schemes
+but with pretty 'syntax' highlighting. Colour schemes can be customized.
-can be customized."
+"
 
 HOMEPAGE="http://colordiff.sourceforge.net/"
 SRC_URI="http://www.colordiff.org/colordiff-1.0.13.tar.gz"
@@ -11,7 +11,6 @@ REVISION="1"
 ARCHITECTURES="any"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2012  Dave Ewart"
-SOURCE_DIR="$portVersionedName"
 PATCHES="colordiff-1.0.13.patch"
 
 PROVIDES="

app-misc/fdupes/fdupes-1.51.recipe

@@ -1,10 +1,9 @@
 SUMMARY="FDUPES is a program for identifying or deleting duplicate files"
 DESCRIPTION="
-fdupes is a program written by Adrian Lopez to scan directories for
+fdupes is a program written by Adrian Lopez to scan directories for duplicate \
-duplicate files, with options to list, delete or replace the files
+files, with options to list, delete or replace the files with hardlinks \
-with hardlinks pointing to the duplicate. It first compares file
+pointing to the duplicate. It first compares file sizes and MD5 signatures, \
-sizes and MD5 signatures, and then performs a byte-by-byte check for
+and then performs a byte-by-byte check for verification.
-verification.
 "
 HOMEPAGE="http://code.google.com/p/fdupes/"
 SRC_URI="http://fdupes.googlecode.com/files/fdupes-1.51.tar.gz"

app-misc/getopt/getopt-1.1.5.recipe

@@ -1,19 +1,15 @@
 SUMMARY="A program to help shell scripts parse command-line parameters."
 DESCRIPTION="
-Getopt(1) is a program to help shell scripts parse command-line
+Getopt(1) is a program to help shell scripts parse command-line parameters.
-parameters.
+*It can do anything that the GNU getopt(3) routines can do.
-
+*It can cope with spaces and shell metacharacters within arguments.
-	*It can do anything that the GNU getopt(3) routines can do.
+*It can parse long parameters.
-	*It can cope with spaces and shell metacharacters within
+*It can shuffle parameters, so you can mix options and other parameters on the \
-	 arguments.
+command-line.
-	*It can parse long parameters.
+*It can be easily identified as an enhanced getopt(1) from within shell scripts.
-	*It can shuffle parameters, so you can mix options and other
+*It can report parse errors as coming from the shell script.
-	 parameters on the command-line.
+*It compiles cleanly with both libc-5 and glibc-2 (libc6).
-	*It can be easily identified as an enhanced getopt(1) from within
+"
-	 shell scripts.
-	*It can report parse errors as coming from the shell script.
-	*It compiles cleanly with both libc-5 and glibc-2 (libc6)."
-
 HOMEPAGE="http://software.frodo.looijaard.name/getopt/" 
 SRC_URI="http://software.frodo.looijaard.name/getopt/files/getopt-1.1.5.tar.gz"
 CHECKSUM_MD5="546acfdb67ba16b8658a45ade9a64d5d"
@@ -22,7 +18,6 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2012 Frodo Looijaard"
 ARCHITECTURES="x86 x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	getopt = $portVersion

app-misc/srm/srm-1.2.12_cvs.recipe

@@ -0,0 +1,52 @@
+SUMMARY="srm - secure file deletion for posix systems" 
+DESCRIPTION="
+A command-line compatible rm which destroys file contents before unlinking.
+" 
+HOMEPAGE="http://srm.sourceforge.net/" 
+SRC_URI="cvs://:pserver:anonymous@srm.cvs.sourceforge.net:/cvsroot/srm/srm"
+REVISION="1"
+LICENSE="MIT (no promotion)"
+COPYRIGHT="2000 Matthew D. Gauthier"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	srm$secondaryArchSuffix = $portVersion
+	cmd:srm = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	#./autogen.sh ...
+	aclocal
+	autoheader
+	automake --add-missing
+	autoconf
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+# Beware, needs at least 5GB of disk space free.
+TEST()
+{
+	make test
+}

app-shells/fish/fish-1.23.1_git.recipe

@@ -1,5 +1,7 @@
 SUMMARY="The friendly interactive shell" 
-DESCRIPTION="The friendly interactive shell" 
+DESCRIPTION="
+The friendly interactive shell
+" 
 HOMEPAGE="http://ridiculousfish.com/shell/" 
 SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
 #CHECKSUM_MD5=""
@@ -7,7 +9,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2009 Axel Liljencrantz"
 
-ARCHITECTURES="?x86 ?x86_64"
+ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
@@ -15,7 +17,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 else
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	fish$secondaryArchSuffix = $portVersion
@@ -32,7 +34,6 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix >= 5.9
 	devel:libgettextlib$secondaryArchSuffix
-	doxygen >= 1.6.3
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
@@ -40,20 +41,22 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:which
+	cmd:doxygen >= 1.6.3
 	"
 
+PATCHES="fish-1.23.1_git.patch"
 
 BUILD()
 {
 	libtoolize --force --copy --install
     autoconf
-    ./configure --without-xsel --prefix=$prefix
+    runConfigure ./configure --without-xsel
     make
 }
 
 INSTALL()
 {
-    make install DESTDIR=${DESTDIR}
+    make install
 }
 
 TEST()

app-shells/fish/patches/fish-1.23.1-git.patch

@@ -1,152 +0,0 @@
-diff --git a/configure.ac fish-1.23.1-git/configure.ac
-index 377ab5e..672d34b 100644
---- a/configure.ac
-+++ fish-1.23.1-git/configure.ac
-@@ -105,7 +105,7 @@ fi
- # tree and doesn't update CFLAGS.
- #
- 
--for i in /usr/pkg /sw /opt /opt/local; do
-+for i in /usr/pkg /sw /opt /opt/local /boot/common; do
- 
- 	AC_MSG_CHECKING([for $i/include include directory])
- 	if test -d $i/include; then
-@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do
- 	AC_MSG_CHECKING([for $i/lib library directory])
- 	if test -d $i/lib; then
- 		AC_MSG_RESULT(yes)
--		LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
-+		LDFLAGS="$LDFLAGS -L$i/lib/"
-+		#LDFLAGS="$LDFLAGS -R$i/lib/"
- 	else
- 		AC_MSG_RESULT(no)
- 	fi
-@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h)
- 
- 
- #
-+# Ask autoconf to detect the platform type
-+#
-+AC_CANONICAL_TARGET
-+
-+
-+#
- # This adds markup to the code that results in a few extra compile
- # time checks on recent GCC versions. It helps stop a few common bugs.
- #
-@@ -306,7 +313,13 @@ if test "$GCC" = yes; then
- 	# bug has been verified to not exist on Linux using GCC 3.3.3.
- 	#
- 
--	CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
-+	case $target_os in
-+		beos*|haiku*)
-+			;;
-+		*) 
-+			CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
-+			;;
-+	esac
- 
- 
- 	#
-@@ -319,7 +332,13 @@ if test "$GCC" = yes; then
- 	# This is needed in order to get the really cool backtraces
- 	#
- 
--	LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
-+	case $target_os in
-+		beos*|haiku*)
-+			;;
-+		*) 
-+			LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
-+			;;
-+	esac
- 
- fi
- 
-@@ -378,8 +397,6 @@ fi
- # seems that tputs is never really needed.
- #
- 
--AC_CANONICAL_TARGET
--
- if test $target_cpu = powerpc; then
- 	AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
- fi
-@@ -510,7 +527,7 @@ AC_DEFINE(
- # Check for os dependant libraries for all binaries.
- LIBS_COMMON=$LIBS
- LIBS=""
--AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
-+AC_SEARCH_LIBS( connect, network socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
- AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
- AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
- AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
-@@ -555,7 +572,7 @@ LIBS="$LIBS_SHARED"
- if test x$local_gettext != xno; then
- 	AC_SEARCH_LIBS( gettext, intl,,)
- fi
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
-+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
- LIBS_FISH_PAGER=$LIBS
- LIBS=$LIBS_COMMON
- 
-@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED"
- if test x$local_gettext != xno; then
- 	AC_SEARCH_LIBS( gettext, intl,,)
- fi
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
-+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
- LIBS_FISHD=$LIBS
- LIBS=$LIBS_COMMON
- 
-diff --git a/proc.c fish-1.23.1-git/proc.c
-index edcc7c6..30dd96f 100644
---- a/proc.c
-+++ fish-1.23.1-git/proc.c
-@@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status )
- 	return;
- }
- 
--
-+#ifdef SA_SIGINFO
- void job_handle_signal ( int signal, siginfo_t *info, void *con )
-+#else
-+void job_handle_signal ( int signal )
-+#endif
- {
- 
- 	int status;
-diff --git a/proc.h fish-1.23.1-git/proc.h
-index dd46bc0..3618956 100644
---- a/proc.h
-+++ fish-1.23.1-git/proc.h
-@@ -427,7 +427,9 @@ int job_reap( int interactive );
-    Signal handler for SIGCHLD. Mark any processes with relevant
-    information.
- */
-+#ifdef SA_SIGINFO
- void job_handle_signal( int signal, siginfo_t *info, void *con );
-+#endif
- 
- /**
-    Send the specified signal to all processes in the specified job.
-diff --git a/signal.c fish-1.23.1-git/signal.c
-index 2ac38aa..3ff1d38 100644
---- a/signal.c
-+++ fish-1.23.1-git/signal.c
-@@ -29,6 +29,14 @@ The library for various signal related issues
- #include "reader.h"
- #include "proc.h"
- 
-+#ifdef __HAIKU__
-+#ifndef SA_SIGINFO
-+#define SA_SIGINFO 0
-+typedef struct {
-+} siginfo_t;
-+#define sa_sigaction sa_handler
-+#endif
-+#endif
- 
- /**
-    Struct describing an entry for the lookup table used to convert

app-shells/fish/patches/fish-1.23.1_git.patch

@@ -1,27 +1,8 @@
-diff --git a/configure.ac fish-1.23.1-git/configure.ac
+diff --git a/configure.ac b/configure.ac
-index 377ab5e..672d34b 100644
+index 377ab5e..9f2e5e9 100644
 --- a/configure.ac
-+++ fish-1.23.1-git/configure.ac
++++ b/configure.ac
-@@ -105,7 +105,7 @@ fi
+@@ -142,6 +142,12 @@ AC_CONFIG_HEADERS(config.h)
- # tree and doesn't update CFLAGS.
- #
- 
--for i in /usr/pkg /sw /opt /opt/local; do
-+for i in /usr/pkg /sw /opt /opt/local /boot/common; do
- 
- 	AC_MSG_CHECKING([for $i/include include directory])
- 	if test -d $i/include; then
-@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do
- 	AC_MSG_CHECKING([for $i/lib library directory])
- 	if test -d $i/lib; then
- 		AC_MSG_RESULT(yes)
--		LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
-+		LDFLAGS="$LDFLAGS -L$i/lib/"
-+		#LDFLAGS="$LDFLAGS -R$i/lib/"
- 	else
- 		AC_MSG_RESULT(no)
- 	fi
-@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h)
  
  
  #
@@ -34,28 +15,13 @@ index 377ab5e..672d34b 100644
  # This adds markup to the code that results in a few extra compile
  # time checks on recent GCC versions. It helps stop a few common bugs.
  #
-@@ -306,7 +313,13 @@ if test "$GCC" = yes; then
+@@ -319,7 +325,13 @@ if test "$GCC" = yes; then
- 	# bug has been verified to not exist on Linux using GCC 3.3.3.
- 	#
- 
--	CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
-+	case $target_os in
-+		beos*|haiku*)
-+			;;
-+		*) 
-+			CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
-+			;;
-+	esac
- 
- 
- 	#
-@@ -319,7 +332,13 @@ if test "$GCC" = yes; then
  	# This is needed in order to get the really cool backtraces
  	#
  
 -	LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
 +	case $target_os in
-+		beos*|haiku*)
++		haiku*)
 +			;;
 +		*)
 +			LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
@@ -64,7 +30,7 @@ index 377ab5e..672d34b 100644
  
  fi
  
-@@ -378,8 +397,6 @@ fi
+@@ -378,8 +390,6 @@ fi
  # seems that tputs is never really needed.
  #
  
@@ -73,7 +39,7 @@ index 377ab5e..672d34b 100644
  if test $target_cpu = powerpc; then
  	AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
  fi
-@@ -510,7 +527,7 @@ AC_DEFINE(
+@@ -510,7 +520,7 @@ AC_DEFINE(
  # Check for os dependant libraries for all binaries.
  LIBS_COMMON=$LIBS
  LIBS=""
@@ -82,7 +48,7 @@ index 377ab5e..672d34b 100644
  AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
  AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
  AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
-@@ -555,7 +572,7 @@ LIBS="$LIBS_SHARED"
+@@ -555,7 +565,7 @@ LIBS="$LIBS_SHARED"
  if test x$local_gettext != xno; then
  	AC_SEARCH_LIBS( gettext, intl,,)
  fi
@@ -91,7 +57,7 @@ index 377ab5e..672d34b 100644
  LIBS_FISH_PAGER=$LIBS
  LIBS=$LIBS_COMMON
  
-@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED"
+@@ -568,7 +578,7 @@ LIBS="$LIBS_SHARED"
  if test x$local_gettext != xno; then
  	AC_SEARCH_LIBS( gettext, intl,,)
  fi
@@ -100,53 +66,3 @@ index 377ab5e..672d34b 100644
  LIBS_FISHD=$LIBS
  LIBS=$LIBS_COMMON
  
-diff --git a/proc.c fish-1.23.1-git/proc.c
-index edcc7c6..30dd96f 100644
---- a/proc.c
-+++ fish-1.23.1-git/proc.c
-@@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status )
- 	return;
- }
- 
--
-+#ifdef SA_SIGINFO
- void job_handle_signal ( int signal, siginfo_t *info, void *con )
-+#else
-+void job_handle_signal ( int signal )
-+#endif
- {
- 
- 	int status;
-diff --git a/proc.h fish-1.23.1-git/proc.h
-index dd46bc0..3618956 100644
---- a/proc.h
-+++ fish-1.23.1-git/proc.h
-@@ -427,7 +427,9 @@ int job_reap( int interactive );
-    Signal handler for SIGCHLD. Mark any processes with relevant
-    information.
- */
-+#ifdef SA_SIGINFO
- void job_handle_signal( int signal, siginfo_t *info, void *con );
-+#endif
- 
- /**
-    Send the specified signal to all processes in the specified job.
-diff --git a/signal.c fish-1.23.1-git/signal.c
-index 2ac38aa..3ff1d38 100644
---- a/signal.c
-+++ fish-1.23.1-git/signal.c
-@@ -29,6 +29,14 @@ The library for various signal related issues
- #include "reader.h"
- #include "proc.h"
- 
-+#ifdef __HAIKU__
-+#ifndef SA_SIGINFO
-+#define SA_SIGINFO 0
-+typedef struct {
-+} siginfo_t;
-+#define sa_sigaction sa_handler
-+#endif
-+#endif
- 
- /**
-    Struct describing an entry for the lookup table used to convert

app-shells/zsh/zsh-5.0.2.recipe

@@ -1,9 +1,9 @@
 SUMMARY="Zsh is a UNIX command interpreter (shell)"
 DESCRIPTION="
-Zsh is a shell designed for interactive use, although it is also a
+Zsh is a shell designed for interactive use, although it is also a powerful \
-powerful scripting language. Many of the useful features of bash,
+scripting language. Many of the useful features of bash, ksh, and tcsh were \
-ksh, and tcsh were incorporated into zsh; many original features were
+incorporated into zsh; many original features were added.
-added."
+"
 
 HOMEPAGE="http://www.zsh.org"
 LICENSE="ZSH"
@@ -36,7 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-text/aiksaurus/aiksaurus-1.2.1.recipe

@@ -0,0 +1,89 @@
+SUMMARY="A set of libraries and applications for Thesaurus"
+DESCRIPTION="
+Aiksaurus is a set of libraries and applications which provide a thesaurus \
+(currently English only, based on Guttenburg's Moby thesaurus) using native \
+GUI on several platforms:
+* UNIX (GTK+ & Qt)
+* Win32 & MacOSX (Cocoa)
+The core library itself is platform-independent. The principal language is \
+C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC.
+"
+
+HOMEPAGE="http://aiksaurus.sourceforge.net"
+SRC_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz"
+CHECKSUM_MD5="3eae03b7c49843ccc9262e52846ea6b4"
+
+REVISION="1"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2002 Jared Davis
+	2001 Michael D. Pritchett
+	"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	aiksaurus$secondaryArchSuffix = $portVersion
+	lib:libAiksaurus_1.2$secondaryArchSuffix = $portVersion
+	cmd:aiksaurus$secondaryArchSuffix = $portVersion
+	cmd:caiksaurus$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="aiksaurus-1.2.1.patch"	
+
+BUILD()
+{
+	# Automake complains about NEWS missing
+	touch NEWS
+	
+	libtoolize --force --copy --install
+	
+	# libtoolize is going to ask us to append the contents
+	# of some files to aclocal.m4
+	
+	for i in m4/{libtool,lt{options,sugar,version,~obsolete}}.m4; do cat $i >> aclocal.m4; done
+	
+	aclocal -I m4
+	autoconf
+	automake --add-missing
+	
+	runConfigure ./configure --without-gtk --datadir=$dataDir
+	make
+}
+
+INSTALL()
+{
+	make install
+	
+	prepareInstalledDevelLib libAiksaurus
+	fixPkgconfig
+	
+	packageEntries devel \
+		$developDir
+}
+
+PROVIDES_devel="
+	aiksaurus${secondaryArchSuffix}_devel = $portVersion
+	devel:aiksaurus$secondaryArchSuffix = $portVersion
+	devel:libAiksaurus$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	aiksaurus$secondaryArchSuffix == $portVersion base
+	"

app-text/aiksaurus/patches/aiksaurus-1.2.1.patch

@@ -0,0 +1,67 @@
+diff -ur aiksaurus-1.2.1/base/aiksaurus.t.cpp aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp
+--- aiksaurus-1.2.1/base/aiksaurus.t.cpp	2003-06-27 01:44:38.003407872 +0000
++++ aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp	2013-12-30 08:47:08.949747712 +0000
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #include <iostream>
+ #include <string>
++#include <stdlib.h>
+ using namespace std;
+ using AiksaurusImpl::AsciiCompare;
+ 
+diff -ur aiksaurus-1.2.1/configure.ac aiksaurus-1.2.1-haiku/configure.ac
+--- aiksaurus-1.2.1/configure.ac	2004-06-12 04:34:05.017563648 +0000
++++ aiksaurus-1.2.1-haiku/configure.ac	2013-12-29 23:53:53.963903488 +0000
+@@ -1,5 +1,6 @@
+ AC_INIT([aiksaurus],[1.2],[http://aiksaurus.sourceforge.net/])
+ AC_CONFIG_SRCDIR([base/Aiksaurus.h])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ # Aiksaurus, version 1.2.0
+ 
+@@ -47,19 +48,19 @@
+ 
+ AC_SUBST(LT_RELEASE)
+ 
+-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`
+-LT_REVISION=$AIK_INTERFACE_AGE
+-LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`
++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`)
++m4_define(LT_REVISION,$AIK_INTERFACE_AGE)
++m4_define(LT_AGE,`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`)
+ 
+-LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++LT_AIK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
+ 
+ AC_SUBST(LT_AIK_VERSION_INFO)
+ 
+-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE`
+-LT_REVISION=$AIKGTK_INTERFACE_AGE
+-LT_AGE=`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE`
++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE`)
++m4_define(LT_REVISION,$AIKGTK_INTERFACE_AGE)
++m4_define(LT_AGE,`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE`)
+ 
+-LT_AIKGTK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++LT_AIKGTK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
+ 
+ AC_SUBST(LT_AIKGTK_VERSION_INFO)
+ 
+@@ -69,7 +70,7 @@
+ 
+ # Specify a configuration file
+ # 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AH_TOP([
+ #ifndef AIKSAURUS_CONFIG_H
+diff -ur aiksaurus-1.2.1/Makefile.am aiksaurus-1.2.1-haiku/Makefile.am
+--- aiksaurus-1.2.1/Makefile.am	2003-06-15 10:17:42.018350080 +0000
++++ aiksaurus-1.2.1-haiku/Makefile.am	2013-12-29 23:53:53.966000640 +0000
+@@ -27,3 +27,5 @@
+ 	ac-helpers/pkg-config/pkg.m4	\
+ 	aiksaurus.spec.in		\
+ 	aiksaurus.spec
++
++ACLOCAL_AMFLAGS = -I m4

app-text/antiword/antiword-0.37.recipe

@@ -1,9 +1,9 @@
 SUMMARY="Converts MS Word files to text and ps"
-DESCRIPTION="Antiword is a free software reader for proprietary Microsoft
+DESCRIPTION="
-		Word documents, and is available for most computer platforms.
+Antiword is a free software reader for proprietary Microsoft Word documents, \
-		Antiword can convert the documents from Microsoft Word version
+and is available for most computer platforms. Antiword can convert the \
-		2, 6, 7, 97, 2000, 2002 and 2003 to plain text, PostScript, PDF,
+documents from Microsoft Word version 2, 6, 7, 97, 2000, 2002 and 2003 to \
-		and XML/DocBook (experimental).
+plain text, PostScript, PDF, and XML/DocBook (experimental).
 "
 HOMEPAGE="http://www.winfield.demon.nl/#Programmer"
 SRC_URI="http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz"
@@ -15,33 +15,43 @@ COPYRIGHT="1998-2005 A.J. van Os"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
-		antiword = $portVersion
+	antiword = $portVersion
-		cmd:antiword = $portVersion
+	cmd:antiword = $portVersion
-"
+	cmd:kantiword =$portVersion
+	"
 
 REQUIRES="
-		haiku >= $haikuVersion
+	haiku >= $haikuVersion
-"
+	"
 
 BUILD_REQUIRES="
-"
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-		haiku_devel >= $haikuVersion
+	cmd:gcc
-		cmd:gcc
+	cmd:make
-		cmd:make
+	"
-"
 
 PATCHES="
-		antiword-0.37.patch
+	antiword-0.37.patch
-"
+	"
+
+USER_SETTINGS_FILES="
+	settings/antiword_settings
+	"
 
 BUILD()
 {
-	make --makefile Makefile.haiku
+
+	make --makefile Makefile.haiku BINDIR=$binDir \
+		ANTIWORD_SETTINGS=$settingsDir/antiword \
+		ANTIWORD_DATA=$dataDir/antiword
 }
 
 INSTALL()
 {
-	make --makefile Makefile.haiku global_install
+	make --makefile Makefile.haiku global_install BINDIR=$binDir \
+		ANTIWORD_SETTINGS=$settingsDir/antiword \
+		ANTIWORD_DATA=$dataDir/antiword
 }

app-text/antiword/patches/antiword-0.37.patch

@@ -51,11 +51,11 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku
 +	antiword\
 +	kantiword
 +
-+LOCAL_INSTALL_DIR = $(HOME)/bin
++LOCAL_INSTALL_DIR = $(BINDIR)
-+LOCAL_RESOURCES_DIR = $(HOME)/.antiword
++LOCAL_RESOURCES_DIR = $(ANTIWORD_SETTINGS)
 +
-+GLOBAL_INSTALL_DIR = /boot/common/bin
++GLOBAL_INSTALL_DIR = $(BINDIR)
-+GLOBAL_RESOURCES_DIR = /boot/common/data/antiword
++GLOBAL_RESOURCES_DIR = $(ANTIWORD_DATA)
 +
 +all:		$(PROGS)
 +

app-text/asciidoc/asciidoc-8.6.8.recipe

@@ -1,8 +1,12 @@
 SUMMARY="Highly configurable text format for writing documentation" 
 DESCRIPTION="
-	AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can be translated to many formats including HTML, PDF, EPUB, man page.
+AsciiDoc is a text document format for writing notes, documentation, articles, \
-
+books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can \
-	AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user."
+be translated to many formats including HTML, PDF, EPUB, man page.
+AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the \
+backend output markups (which can be almost any type of SGML/XML markup) can \
+be customized and extended by the user.
+"
 HOMEPAGE="http://asciidoc.org" 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2011 Stuart Rackham"
@@ -30,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-text/aspell/aspell-0.60.6.1.recipe

@@ -1,15 +1,14 @@
 SUMMARY="aspell - a free and open source spell checker"
 DESCRIPTION="
-GNU Aspell is a Free and Open Source spell checker designed to
+GNU Aspell is a Free and Open Source spell checker designed to eventually \
-eventually replace Ispell. It can either be used as a library or as
+replace Ispell. It can either be used as a library or as an independent spell \
-an independent spell checker. Its main feature is that it does a
+checker. Its main feature is that it does a superior job of suggesting \
-superior job of suggesting possible replacements for a misspelled word
+possible replacements for a misspelled word than just about any other spell \
-than just about any other spell checker out there for the English
+checker out there for the English language. Unlike Ispell, Aspell can also \
-language. Unlike Ispell, Aspell can also easily check documents in
+easily check documents in UTF-8 without having to use a special dictionary. \
-UTF-8 without having to use a special dictionary. Aspell will also do
+Aspell will also do its best to respect the current locale setting. Other \
-its best to respect the current locale setting. Other advantages over
+advantages over Ispell include support for using multiple dictionaries at once \
-Ispell include support for using multiple dictionaries at once and
+and intelligently handling personal dictionaries when more than one Aspell \
-intelligently handling personal dictionaries when more than one Aspell
 process is open at once.
 "
 LICENSE="GNU LGPL v2"
@@ -65,7 +64,6 @@ REQUIRES_devel="
 	aspell == $portVersion
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-text/discount/discount-2.1.3.recipe

@@ -1,11 +1,11 @@
 SUMMARY="An implementation of John Gruber's Markdown text to html language written in C"
 DESCRIPTION="
-Markdown provides a library that gives you formatting functions
+Markdown provides a library that gives you formatting functions suitable for \
-suitable for marking down entire documents or lines of text, a
+marking down entire documents or lines of text, a command-line program that \
-command-line program that you can use to mark down documents
+you can use to mark down documents interactively or from a script, and a tiny \
-interactively or from a script, and a tiny (3 programs so far) suite
+(3 programs so far) suite of example programs that show how to fully utilize \
-of example programs that show how to fully utilize the markdown
+the markdown library.
-library."
+"
 
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" 
 SRC_URI="http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.3.tar.bz2"
@@ -14,7 +14,6 @@ LICENSE="BSD (4-clause)"
 COPYRIGHT="2007-2012 David Loren Parsons"
 ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	discount = $portVersion compat >= 2

app-text/dos2unix/dos2unix-1.0.1.recipe

@@ -0,0 +1,42 @@
+SUMMARY="dos2unix and unix2dos end of line file convertors."
+DESCRIPTION="
+DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have \
+just LF. Dos2unix and unix2dos are simple parser/converter command line \
+programs to convert between the two formats.
+" 
+HOMEPAGE="http://github.com/puckipedia/dos2unix"
+SRC_URI="git://github.com/puckipedia/dos2unix.git#553720356be18ca60cae3d970a575520aef5a4f4"
+REVISION="1"
+COPYRIGHT="Public Domain"
+LICENSE="Public Domain"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	dos2unix = 1.0.1 compat >= 1
+	cmd:dos2unix
+	cmd:unix2dos
+	"
+	
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:g++
+	"
+
+BUILD()
+{
+	cd src
+	g++ -O -o ../dos2unix dos2unix.c
+	g++ -O -o ../unix2dos unix2dos.c
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp dos2unix $binDir/dos2unix
+	cp unix2dos $binDir/unix2dos
+}

app-text/dos2unix/dos2unix-1.0.recipe

@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-text/gpp/gpp-2.4.recipe

@@ -1,4 +1,9 @@
-DESCRIPTION="GPP is a general-purpose preprocessor with customizable syntax, suitable for a wide range of preprocessing tasks. Its independence from any programming language makes it much more versatile than cpp, while its syntax is lighter and more flexible than that of m4." 
+DESCRIPTION="
+GPP is a general-purpose preprocessor with customizable syntax, suitable for a \
+wide range of preprocessing tasks. Its independence from any programming \
+language makes it much more versatile than cpp, while its syntax is lighter \
+and more flexible than that of m4.
+" 
 HOMEPAGE="http://files.nothingisreal.com/software/gpp/gpp.html" 
 SRC_URI="http://files.nothingisreal.com/software/gpp/gpp-2.24.tar.bz2"
 REVISION="1"

app-text/help2man/help2man-1.43.3.recipe

@@ -0,0 +1,52 @@
+SUMMARY="help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands."
+DESCRIPTION="
+help2man is a tool for automatically generating simple manual pages from \
+program output.
+This program is intended to provide an easy way for software authors to \
+include a manual page in their distribution without having to maintain that \
+document.
+Given a program which produces reasonably standard ‘--help’ and ‘--version’ \
+outputs, help2man can re-arrange that output into something which resembles a \
+manual page.
+"
+
+HOMEPAGE="http://www.gnu.org/software/help2man/"
+SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.43.3.tar.gz"
+CHECKSUM_MD5="a84868db7c139238df8add5d86a0b54f"
+
+REVISION="1"
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="1997-2013 Free Software Foundation"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	help2man = $portVersion
+	cmd:help2man$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:perl
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	"
+	
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}

app-text/htmldoc/htmldoc-1.8.27.recipe

@@ -1,8 +1,8 @@
 SUMMARY="HTML file processor and converter"
 DESCRIPTION="
-	HTMLDOC converts HTML files and web pages into index HTML, Adobe
+HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or \
-	Postscript or Adobe Portable Document Format files (pdf).
+Adobe Portable Document Format files (pdf).
-	"
+"
 HOMEPAGE="http://www.msweet.org/projects.php?Z1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2006 Easy Software Products"
@@ -38,7 +38,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-text/libpaper/libpaper-1.1.24.recipe

@@ -1,5 +1,8 @@
 SUMMARY="Library for handling paper characteristics"
-DESCRIPTION="The libpaper paper-handling library automates recognition of many different paper types and sizes for programs that need to deal with printed output."
+DESCRIPTION="
+The libpaper paper-handling library automates recognition of many different \
+paper types and sizes for programs that need to deal with printed output.
+"
 HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
 SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz"
 CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834"
@@ -14,20 +17,21 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpaper$secondaryArchSuffix = $portVersion
-	cmd:paperconf
-	cmd:paperconfig
 	lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1
+	cmd:paper_config$secondaryArchSuffix
+	cmd:paperconf$secondaryArchSuffix
+	cmd:paperconfig$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 	
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtool
@@ -72,5 +76,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
+#	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	libpaper$secondaryArchSuffix  == $portVersion base
 	"

app-text/libwpg/libwpg-0.2.1.recipe

@@ -1,4 +1,7 @@
-DESCRIPTION="Libwpg project is a collection of library and tools to work with graphics in WPG (WordPerfect Graphics) format."
+DESCRIPTION="
+Libwpg project is a collection of library and tools to work with graphics in \
+WPG (WordPerfect Graphics) format.
+"
 HOMEPAGE="libwpg.sourceforge.net"
 SRC_URI="http://sourceforge.net/projects/libwpg/files/libwpg/libwpg-0.2.1/libwpg-0.2.1.tar.gz/download"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."

app-text/mdocml/mdocml-1.12.2.recipe

@@ -1,10 +1,11 @@
 SUMMARY="A suite of tools for compiling roff and man pages."
 DESCRIPTION="
-mdocml is a suite of tools compiling mdoc, the roff macro package of
+mdocml is a suite of tools compiling mdoc, the roff macro package of choice \
-choice for BSD manual pages, and man, the predominant historical
+for BSD manual pages, and man, the predominant historical package for UNIX \
-package for UNIX manuals. The mission of mdocml is to deprecate
+manuals. The mission of mdocml is to deprecate groff, the GNU troff \
-groff, the GNU troff implementation, for displaying mdoc pages whilst
+implementation, for displaying mdoc pages whilst providing token support for \
-providing token support for man."
+man.
+"
 
 HOMEPAGE="http://mdocml.bsd.lv/"
 SRC_URI="http://mdocml.bsd.lv/snapshots/mdocml-1.12.2.tar.gz"
@@ -13,7 +14,6 @@ COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons"
 LICENSE="ISC"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	mdocml = $portVersion

app-text/rman/rman-3.2.recipe

@@ -1,15 +1,14 @@
 SUMMARY="Man page viewer and translator"
 DESCRIPTION="
-	Parse formatted man pages and man page source from most flavors of UNIX. 
+Parse formatted man pages and man page source from most flavors of UNIX. \
-	Convert to HTML, ASCII, TkMan, DocBook, and other formats.
+Convert to HTML, ASCII, TkMan, DocBook, and other formats.
-	"
+"
 HOMEPAGE="http://www.sourceforge.net/project/polyglotman"
 LICENSE="Artistic"
 COPYRIGHT="2003 Thomas A. Phelps"
 SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz"
 CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
 PATCHES="rman-3.2.patch"
-SOURCE_DIR="$portVersionedName"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 

app-text/texi2html/texi2html-1.82.recipe

@@ -1,9 +1,28 @@
 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, 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.
+licensed under the GNU General Public License, version 3, or any later version.
-
+This is an evolving version of the script originally developed by Lionel Cons \
-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 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."
+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, \
+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 \
+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.
+"
 HOMEPAGE="http://www.nongnu.org/texi2html/" 
 COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
 LICENSE="GNU GPL v2"
@@ -33,7 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

dev-cpp/hugen/hugen-1.recipe

@@ -0,0 +1,42 @@
+DESCRIPTION="
+Hugen is a simply python script for generating code for Haiku \
+applications. It is based on templates. You can define your own \
+one and quick generate some files with adequate names and content \
+instead creating it manually. Templates for class and simple \
+application with Makefile and Jamfile are provided by default. 
+"
+SUMMARY="Code generator for Haiku"
+HOMEPAGE="https://github.com/aldeck/hugen"
+COPYRIGHT="2009 Alexandre Deckner"
+LICENSE="MIT"
+SRC_URI="git+https://github.com/aldeck/hugen.git#a5e42390e6d4435d9d81fe3670670e18a52dee9c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	hugen$secondaryArchSuffix = $portVersion
+	cmd:hugen$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	cmd:python$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	"
+
+BUILD()
+{
+	# simply do nothing
+	echo
+}
+
+INSTALL()
+{
+	mkdir -p $binDir/hugen_app
+	cp -R hugen.py configs/ templates/ $binDir/hugen_app
+	echo python $binDir/hugen_app/hugen.py > $binDir/hugen
+	chmod +x $binDir/hugen 
+}

dev-db/db/db-5.3.28.recipe

@@ -1,5 +1,8 @@
 SUMMARY="The Oracle Berkeley Database"
-DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases provides developers with fast, reliable, local persistence with zero administration." 
+DESCRIPTION="
+The Oracle Berkeley DB family of open source, embeddable databases provides \
+developers with fast, reliable, local persistence with zero administration.
+" 
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz"
 CHECKSUM_MD5="b99454564d5b4479750567031d66fe24"

dev-db/postgresql/postgresql-9.2.3.recipe

@@ -1,4 +1,4 @@
-DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system." 
+DESCRIPTION="A powerful, open source object-relational database system."
 HOMEPAGE="http://www.postgresql.org/" 
 SRC_URI="http://ftp.postgresql.org/pub/source/v9.2.3/postgresql-9.2.3.tar.bz2"
 REVISION="1"

dev-db/redis/redis-2.2.11.recipe

@@ -1,5 +1,9 @@
 HOMEPAGE="http://redis.io/"
-DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets."
+DESCRIPTION="
+Redis is an open source, advanced key-value store. It is often referred to as \
+a data structure server since keys can contain strings, hashes, lists, sets \
+and sorted sets.
+"
 SRC_URI="http://redis.googlecode.com/files/redis-2.2.11.tar.gz"
 REVISION="1"
 DEPEND=""

dev-db/redis/redis-2.9.0_git.recipe

@@ -1,5 +1,9 @@
 HOMEPAGE="http://redis.io/"
-DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets."
+DESCRIPTION="
+Redis is an open source, advanced key-value store. It is often referred to as \
+a data structure server since keys can contain strings, hashes, lists, sets \
+and sorted sets.
+"
 SRC_URI="git://github.com/antirez/redis.git"
 REVISION="1"
 DEPEND=""

dev-db/sqlite/sqlite-3.8.0.2.recipe

@@ -1,11 +1,10 @@
 SUMMARY="An SQL Database Engine in a C Library" 
 DESCRIPTION="
-	SQLite is a software library that implements a self-contained,
+SQLite is a software library that implements a self-contained, serverless, \
-	serverless, zero-configuration, transactional SQL database engine.
+zero-configuration, transactional SQL database engine.
-
+SQLite is the most widely deployed SQL database engine in the world. The \
-	SQLite is the most widely deployed SQL database engine in the world.
+source code for SQLite is in the public domain.
-	The source code for SQLite is in the public domain.
+"
-	"
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz"
 CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386"

dev-games/ode/ode-0.12.recipe

@@ -1,19 +1,72 @@
-DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics."
+SUMMARY="Library for simulating rigid body dynamics"
+DESCRIPTION="
+ODE is an open source, high performance library for simulating rigid body \
+dynamics. It is fully featured, stable, mature and platform independent with \
+an easy to use C/C++ API. It has advanced joint types and integrated collision \
+detection with friction. ODE is useful for simulating vehicles, objects in \
+virtual reality environments and virtual creatures.
+"
 HOMEPAGE="http://www.ode.org/"
 SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr"
+CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
 REVISION="1"
 COPYRIGHT="2001-2004 Russell L. Smith"
-LICENSE="GNU LGPL v3
+LICENSE="
-	BSD (3-clause)"
+	GNU LGPL v3
-CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
+	BSD (3-clause)
+	"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	ode$secondaryArchSuffix = $portVersion
+	lib:libode$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+	
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:mkdepend
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+PATCHES="ode-0.12.patch"
+
 BUILD()
 {
-	cd ode-0.12
+	runConfigure ./configure --enable-shared
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	make $jobArgs
-	make
 }
 INSTALL()
 {
-	cd ode-0.12
+	fixDevelopLibDirReferences ode-config
+	
 	make install
+	
+	prepareInstalledDevelLib libode
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$binDir # ode_config binary here
 }
+
+PROVIDES_devel="
+	ode${secondaryArchSuffix}_devel = $portVersion
+	devel:libode$secondaryArchSuffix = $portVersion
+	cmd:ode_config$secondaryArchSuffix = $portVersion
+	"
+	
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ode$secondaryArchSuffix == $portVersion base
+	"

dev-games/ode/patches/ode-0.12.patch

@@ -1,18 +1,6 @@
-diff -u ode-0.12/ode/src/joints/Makefile.in ode-0.12-haiku/ode/src/joints/Makefile.in
+diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h
---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000
+--- ode-0.12/include/ode/collision.h	2010-11-08 12:00:18.044564480 +0000
-+++ ode-0.12-haiku/ode/src/joints/Makefile.in   2012-12-27 19:39:57.854327296 +0000
++++ ode-0.12-patch/include/ode/collision.h	2013-12-16 16:47:37.561774592 +0000
-@@ -53,7 +53,7 @@
-        contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \
-        lmotor.lo plane2d.lo pu.lo pr.lo piston.lo
- libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS)
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h
---- ode-0.12/include/ode/collision.h    2012-12-27 19:39:13.484704256 +0000
-+++ ode-0.12-haiku/include/ode/collision.h      2012-12-27 19:39:01.685244416 +0000
 @@ -1081,7 +1081,7 @@
  ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit);
  ODE_API int dGeomRayGetClosestHit (dGeomID g);
@@ -22,3 +10,15 @@ diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h
  
  ODE_API dGeomID dCreateGeomTransform (dSpaceID space);
  ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj);
+diff -ur ode-0.12/ode/src/joints/Makefile.in ode-0.12-patch/ode/src/joints/Makefile.in
+--- ode-0.12/ode/src/joints/Makefile.in	2012-05-28 23:26:01.004980736 +0000
++++ ode-0.12-patch/ode/src/joints/Makefile.in	2013-12-16 16:35:09.259784704 +0000
+@@ -53,7 +53,7 @@
+ 	contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \
+ 	lmotor.lo plane2d.lo pu.lo pr.lo piston.lo
+ libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS)
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src
++DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f

dev-games/physfs/physfs-2.0.3.recipe

@@ -1,40 +1,48 @@
 SUMMARY="Physfs"
-DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives"
+DESCRIPTION="
+PhysicsFS is a library to provide abstract access to various archives.
+"
 HOMEPAGE="http://icculus.org/physfs"
 SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2"
 CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613"
 LICENSE="PHYSFS"
 COPYRIGHT="2001-2012 Ryan C. Gordon"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 REVISION="1"
 
 PROVIDES="
-	physfs$secondaryArchSuffix = $portVersion
+	physfs$secondaryArchSuffix = $portVersion compat >= 2.0
-	lib:libphysfs$secondaryArchSuffix = $portVersion
+	lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
+	cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libz$secondaryArchSuffix >= 1.0.4
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	sed -i "s,DESTINATION include,DESTINATION $relativeIncludeDir," CMakeLists.txt
+	sed -i "s,DESTINATION bin,DESTINATION $relativeBinDir," CMakeLists.txt
+}
+
 BUILD()
 {
-	cmake . -DLIBRARY_OUTPUT_PATH:=$libDir
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DLIB_SUFFIX="/${secondaryArchSuffix/_/}"
 	make $jobArgs
 }
 
@@ -52,8 +60,7 @@ INSTALL()
 
 PROVIDES_devel="
 	physfs$secondaryArchSuffix_devel = $portVersion compat >= 2.0
-	devel:physfs$secondaryArchSuffix = $portVersion compat >= 2.0
+	devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
-	devel:libphysfs$secondaryArchSuffix = 2.0.3 compat >= 2.0
 	"
 
 REQUIRES_devel="

dev-java/ant_core/ant_core-1.9.2.recipe

@@ -1,13 +1,22 @@
-SUMMARY="Java-based build tool similar to 'make' that uses XML configuration files"
+SUMMARY="Java-based build tool similar to 'make'"
-DESCRIPTION="Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications. Ant supplies a number of built-in tasks allowing to compile, assemble, test and run Java applications. Ant can also be used effectively to build non Java applications, for instance C or C++ applications. More generally, Ant can be used to pilot any type of process which can be described in terms of targets and tasks.
+DESCRIPTION="
-
+Apache Ant is a Java library and command-line tool whose mission is to drive \
-Ant is written in Java. Users of Ant can develop their own "antlibs" containing Ant tasks and types, and are offered a large number of ready-made commercial or open-source "antlibs".
+processes described in build files as targets and extension points dependent \
-
+upon each other. The main known usage of Ant is the build of Java \
-Ant is extremely flexible and does not impose coding conventions or directory layouts to the Java projects which adopt it as a build tool.
+applications. Ant supplies a number of built-in tasks allowing to compile, \
-
+assemble, test and run Java applications. Ant can also be used effectively to \
-Software development projects looking for a solution combining build tool and dependency management can use Ant in combination with Apache Ivy.
+build non Java applications, for instance C or C++ applications. More \
-
+generally, Ant can be used to pilot any type of process which can be described \
-The Apache Ant project is part of the Apache Software Foundation."
+in terms of targets and tasks.
+Ant is written in Java. Users of Ant can develop their own "antlibs" \
+containing Ant tasks and types, and are offered a large number of ready-made \
+commercial or open-source "antlibs".
+Ant is extremely flexible and does not impose coding conventions or directory \
+layouts to the Java projects which adopt it as a build tool.
+Software development projects looking for a solution combining build tool and \
+dependency management can use Ant in combination with Apache Ivy.
+The Apache Ant project is part of the Apache Software Foundation.
+"
 HOMEPAGE="http://ant.apache.org/"
 COPYRIGHT="1999-2013 The Apache Software Foundation"
 LICENSE="Apache v2"

dev-java/gnu_classpath/gnu_classpath-0.98.recipe

@@ -1,42 +1,12 @@
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
+SUMMARY="GNU Java class library"
+DESCRIPTION="
+Free core class libraries for use with virtual machines and compilers for the \
+Java language
+"
 HOMEPAGE="http://www.gnu.org/software/classpath"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
 CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9"
-BUILD()
-{
-	cd classpath-0.98
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man \
-		--infodir=$COMMON_DOCS/info \
-		--disable-gtk-peer \
-		--disable-alsa \
-		--disable-plugin \
-		--disable-gconf-peer \
-		--disable-gjdoc \
-		LDFLAGS="-lnetwork"
-	make
-}
-
-INSTALL()
-{
-	cd classpath-0.98
-	make install
-}
-
-TEST()
-{
-	cd classpath-0.98
-#	make test
-#	make check
-}
-
 LICENSE="GNU GPL v2
 	GNU GPL v2 with classpath exceptions"
 COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation
@@ -48,3 +18,56 @@ COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation
 	2004 World Wide Web Consortium
 	2005 Caolan McNamara
 	2005 Daniel Richard G."
+	
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	gnu_classpath = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	# at least one java VM, for now just use jamvm
+	cmd:jamvm$secondaryArchSuffix
+"
+
+SOURCE_DIR="classpath-0.98"
+
+PATCHES="gnu_classpath-0.98.patch"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	runConfigure ./configure \
+		--disable-gtk-peer \
+		--disable-alsa \
+		--disable-plugin \
+		--disable-gconf-peer \
+		--disable-gjdoc \
+		LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	:
+#	make test
+#	make check
+}

dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch

@@ -25,7 +25,7 @@
 @@ -310,7 +310,7 @@
  
  libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
-		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
+ 		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
 -		       $(LTLIBICONV) 
 +		       -Wl,$(LIBICONV) 
  

dev-java/jamvm/jamvm-1.5.4.recipe

@@ -1,28 +1,64 @@
-DESCRIPTION="JamVM" 
+SUMMARY="JamVM"
-HOMEPAGE="http://jamvm.sourceforge.net" 
+DESCRIPTION="
+JamVM is a new Java Virtual Machine which conforms to the JVM specification \
+version 2 (blue book). In comparison to most other VM's (free and commercial) \
+it is extremely small.
+"
+HOMEPAGE="http://jamvm.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download"
 REVISION="1"
-STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2010 Robert Lougher"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	jamvm$secondaryArchSuffix = $portVersion
+	cmd:jamvm$secondaryArchSuffix = $portVersion
+	lib:libjvm$secondaryArchSuffix
+	devel:libjvm$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:aclocal
+	cmd:libtool
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+
+PATCHES="jamvm-1.5.4.patch"
 
 BUILD()
 {
-	cd jamvm-1.5.4
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+	runConfigure ./configure \
-		--with-classpath-install-dir=`finddir B_COMMON_DIRECTORY`
+		--with-classpath-install-dir=$prefix
 	make
 }
 
 INSTALL()
 {
-	cd jamvm-1.5.4
 	make install
+	prepareInstalledDevelLib libjvm
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2010 Robert Lougher"

dev-lang/fpc/fpc-2.6.0.recipe

@@ -1,4 +1,4 @@
-DESCRIPTION="Free Pascal Compiler - open source compiler for pascal and object pascal" 
+DESCRIPTION="An open source compiler for pascal and object pascal"
 HOMEPAGE="http://www.freepascal.org" 
 SRC_URI="ftp://ftp.freepascal.org/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz
 	 http://fpc.planetmirror.com/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz

dev-lang/lua/lua-5.2.1.recipe

@@ -51,10 +51,9 @@ INSTALL()
 LICENSE="MIT"
 COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
 DESCRIPTION="
-	Lua combines simple procedural syntax with powerful data description
+Lua combines simple procedural syntax with powerful data description \
-	constructs based on associative arrays and extensible semantics. Lua is
+constructs based on associative arrays and extensible semantics. Lua is \
-	dynamically typed, runs by interpreting bytecode for a register-based
+dynamically typed, runs by interpreting bytecode for a register-based virtual \
-	virtual machine, and has automatic memory management with incremental
+machine, and has automatic memory management with incremental garbage \
-	garbage collection, making it ideal for configuration, scripting, and rapid
+collection, making it ideal for configuration, scripting, and rapid prototyping.
-	prototyping.
+"
-	"

dev-lang/nasm/nasm-2.08.01.recipe

@@ -1,5 +1,7 @@
 SUMMARY="The Nasm assembler"
-DESCRIPTION="The Nasm assembler" 
+DESCRIPTION="
+The Nasm assembler
+" 
 HOMEPAGE="http://www.nasm.us/" 
 SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2"
 CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211"
@@ -27,7 +29,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 	
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

dev-lang/ocaml/ocaml-4.00.0.recipe

@@ -1,18 +1,16 @@
 SUMMARY="Implementation of the Caml language"
 DESCRIPTION="
-Caml is a general-purpose programming language, designed with program
+Caml is a general-purpose programming language, designed with program safety \
-safety and reliability in mind. It is very expressive, yet easy to
+and reliability in mind. It is very expressive, yet easy to learn and use. \
-learn and use. Caml supports functional, imperative, and
+Caml supports functional, imperative, and object-oriented programming styles. \
-object-oriented programming styles. It has been developed and
+It has been developed and distributed by INRIA, a French research institute in \
-distributed by INRIA, a French research institute in computer science
+computer science and applied mathematics, since 1985.
-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 \
-The OCaml system is the main implementation of the Caml language. It
+with a native-code compiler that supports numerous architectures, for high \
-features a powerful module system and a full-fledged object-oriented
+performance; a bytecode compiler, for increased portability; and an \
-layer. It comes with a native-code compiler that supports numerous
+interactive loop, for experimentation and rapid development.
-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-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)."
 HOMEPAGE="http://caml.inria.fr/index.en.html" 

dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe

@@ -1,5 +1,7 @@
-SUMMARY="Open-source implementation of the Java Platform, Standard Edition"
+SUMMARY="Open-source implementation of the Java Platform, SE"
-DESCRIPTION="Open-source implementation of the Java Platform, Standard Edition."
+DESCRIPTION="
+Open-source implementation of the Java Platform, Standard Edition.
+"
 HOMEPAGE="http://openjdk.java.net/"
 COPYRIGHT="2005, 2006, Oracle and/or its affiliates"
 LICENSE="GNU GPL v2"
@@ -40,7 +42,7 @@ CHECKSUM_MD5_11="18d15dfd71117daadb332af003d08212"
 SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip#noarchive"
 CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702"
 
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 !x86_gcc2"
 
 DISABLE_SOURCE_PACKAGE=yes
@@ -91,12 +93,14 @@ REQUIRES="
 	haiku >= $haikuVersion
 	lib:libfreetype
 	lib:libiconv
+	lib:libz
 	"
 
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
 	devel:libfreetype
 	devel:libiconv
+	devel:libz
 	"
 
 BUILD_PREREQUIRES="
@@ -154,7 +158,7 @@ BUILD()
 
 	# set up environment
 	export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image
-export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
+	export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
 	export ANT=${OPENJDK_DIR}/ant
 	export ALT_OUTPUTDIR=${OPENJDK_DIR}/output
 	export LANG=C
@@ -169,6 +173,8 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
 
 	export ALLOW_DOWNLOADS=false
 
+	export USE_EXTERNAL_ZLIB=true
+
 	# Build.
 	cd jdk
 	make

dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset

@@ -1,4 +1,4 @@
-From 5cca79ee50fbf704e67d337a16adf66877a976cd Mon Sep 17 00:00:00 2001
+From 255d3c92d7bf021c109a7ef7a0376fcbf7cb9ac5 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 02:30:27 +0100
 Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables
@@ -67,7 +67,7 @@ index c1cc440..134e128 100644
 1.8.3.4
 
 
-From cab8b76a94407e51e0a9c665b53f28588e003a8b Mon Sep 17 00:00:00 2001
+From 9e2dcc26b19f2fa0694ee7608c74ad3716054679 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 02:35:20 +0100
 Subject: PLATFORM_API_HaikuOS_PCM.cpp: Fix SoundConsumer include
@@ -91,7 +91,7 @@ index ec111fc..d69c6a9 100644
 1.8.3.4
 
 
-From f8a888057bba2123556300ca7cb200ff6b0f3186 Mon Sep 17 00:00:00 2001
+From 645161b7ecc348da7f94ddac74277a9569321f6b Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 14:52:36 +0100
 Subject: Fix freetype paths for Haiku
@@ -116,7 +116,7 @@ index a478f97..c0dc0d0 100644
 1.8.3.4
 
 
-From aad23df8dd37db1f0b5c3cd82cb90bb3f23e303f Mon Sep 17 00:00:00 2001
+From daedb42f69c0c3b4a39e4ea354a53799c89265ab Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 14:53:56 +0100
 Subject: HaikuFontManager: Use BPathFinder API to find font dirs
@@ -165,7 +165,7 @@ index a645d00..66af9ab 100644
 1.8.3.4
 
 
-From dcfb77462ec97c8b72c746dcb3d18bf2d488fe62 Mon Sep 17 00:00:00 2001
+From 7052c7beb2d10b40f35ac6c4868cb238d3b0d7db Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Tue, 26 Nov 2013 17:50:46 +0100
 Subject: Make use of $ORIGIN in rpath now supported in Haiku
@@ -234,7 +234,7 @@ index bb0db1e..74e744e 100644
 1.8.3.4
 
 
-From d71b1d303b0b6681b76c7557eec6e581734e0a7c Mon Sep 17 00:00:00 2001
+From c0578bc31277c67e94d8a8d71f7e47db49d0ec37 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Wed, 4 Dec 2013 03:23:53 +0100
 Subject: make/java/java/Makefile: Missing generated classes
@@ -257,3 +257,194 @@ index 93878e6..bd94e8f 100644
 -- 
 1.8.3.4
 
+
+From e730fb5a7d27fdc3f9213f2d75ad5ef5519e20c4 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Sun, 22 Dec 2013 21:21:11 +0100
+Subject: Add support for using an external zlib
+
+To enable it, USE_EXTERNAL_ZLIB must be set to true. EXTERNAL_ZLIB_LIB
+and EXTERNAL_ZLIB_HEADERS_PATH can be set to the library to link
+against and the headers path respectively. The former defaults to
+"-lz".
+
+diff --git a/make/com/sun/java/pack/Makefile b/make/com/sun/java/pack/Makefile
+index 22e0b69..ce28479 100644
+--- a/make/com/sun/java/pack/Makefile
++++ b/make/com/sun/java/pack/Makefile
+@@ -70,9 +70,14 @@ ifeq ($(STANDALONE),true)
+ 	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+ 	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+ 
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++  ifeq ($(USE_EXTERNAL_ZLIB), true)
++    OTHER_CXXFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS)
++    LDDFLAGS += $(EXTERNAL_ZLIB_LIB)
++  else
++    ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++    OTHER_CXXFLAGS += $(ZINCLUDE)
++    LDDFLAGS += $(ZIPOBJS)
++  endif
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+   OTHER_LDLIBS += $(JVMLIB)
+diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk
+index c0dc0d0..07849f3 100644
+--- a/make/common/Defs.gmk
++++ b/make/common/Defs.gmk
+@@ -210,6 +210,21 @@ ZLIB_VERSION = 1.2.3
+ 
+ 
+ #
++# External zlib support
++#
++ifeq ($(USE_EXTERNAL_ZLIB), true)
++  ifndef EXTERNAL_ZLIB_LIB
++    EXTERNAL_ZLIB_LIB = -lz
++  endif
++  ifdef EXTERNAL_ZLIB_HEADERS_PATH
++    EXTERNAL_ZLIB_CPPFLAGS = -I$(EXTERNAL_ZLIB_HEADERS_PATH)
++  else
++    EXTERNAL_ZLIB_CPPFLAGS = 
++  endif
++endif
++
++
++#
+ # Localizations for the different parts of the product beyond English
+ #
+ 
+diff --git a/make/java/jli/Makefile b/make/java/jli/Makefile
+index 3e5994d..5500e73 100644
+--- a/make/java/jli/Makefile
++++ b/make/java/jli/Makefile
+@@ -69,13 +69,17 @@ FILES_c = \
+ 	parse_manifest.c \
+ 	version_comp.c \
+ 	wildcard.c \
+-	jli_util.c \
+-	inflate.c \
+-	inftrees.c \
+-	inffast.c \
+-	zadler32.c \
+-	zcrc32.c \
+-	zutil.c
++	jli_util.c
++
++ifneq ($(USE_EXTERNAL_ZLIB), true)
++	FILES_c += \
++		inflate.c \
++		inftrees.c \
++		inffast.c \
++		zadler32.c \
++		zcrc32.c \
++		zutil.c
++endif
+ 
+ ifneq ($(PLATFORM), windows)
+   FILES_c += ergo.c 
+@@ -131,7 +135,12 @@ endif
+ 
+ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
+ OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
+-OTHER_INCLUDES += -I$(ZIP_SRC)
++
++ifeq ($(USE_EXTERNAL_ZLIB), true)
++  OTHER_INCLUDES += $(EXTERNAL_ZLIB_CPPFLAGS)
++else
++  OTHER_INCLUDES += -I$(ZIP_SRC)
++endif
+ 
+ #
+ # Library to compile.
+@@ -164,6 +173,13 @@ library:: $(STATIC_LIBRARY)
+ endif	# PLATFORM
+ 
+ #
+-# Add to ambient vpath so we pick up the library files
++# Add to ambient vpath so we pick up the library files. When using an external
++# zlib, add the library instead of the sources.
+ #
+-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
++vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
++
++ifeq ($(USE_EXTERNAL_ZLIB), true)
++  LDLIBS += $(EXTERNAL_ZLIB_LIB)
++else
++  vpath %.c $(ZIP_SRC)
++endif
+diff --git a/make/java/zip/FILES_c.gmk b/make/java/zip/FILES_c.gmk
+index 6664887..97c6d3f 100644
+--- a/make/java/zip/FILES_c.gmk
++++ b/make/java/zip/FILES_c.gmk
+@@ -29,16 +29,20 @@ FILES_c = \
+ 	Deflater.c \
+ 	Inflater.c \
+ 	ZipFile.c \
+-	zip_util.c \
+-	compress.c \
+-	deflate.c \
+-	gzio.c \
+-	infback.c \
+-	inffast.c \
+-	inflate.c \
+-	inftrees.c \
+-	trees.c \
+-	uncompr.c \
+-	zadler32.c \
+-	zcrc32.c \
+-	zutil.c 
++	zip_util.c
++
++ifneq ($(USE_EXTERNAL_ZLIB), true)
++	FILES_c += \
++		compress.c \
++		deflate.c \
++		gzio.c \
++		infback.c \
++		inffast.c \
++		inflate.c \
++		inftrees.c \
++		trees.c \
++		uncompr.c \
++		zadler32.c \
++		zcrc32.c \
++		zutil.c 
++endif
+diff --git a/make/java/zip/Makefile b/make/java/zip/Makefile
+index 906e7e8..15b2d45 100644
+--- a/make/java/zip/Makefile
++++ b/make/java/zip/Makefile
+@@ -74,14 +74,24 @@ else
+ CPPFLAGS += -UDEBUG 
+ endif
+ 
+-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++ifeq ($(USE_EXTERNAL_ZLIB), true)
++  CPPFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS)
++else
++  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++endif
++
+ CPPFLAGS += -I$(SHARE_SRC)/native/java/io
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
+ 
+ #
+-# Add to ambient vpath so we pick up the library files
++# Add to ambient vpath so we pick up the library files. When using an external
++# zlib, add the library instead.
+ #
+-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
++ifeq ($(USE_EXTERNAL_ZLIB), true)
++  LDLIBS += $(EXTERNAL_ZLIB_LIB)
++else
++  vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
++endif
+ 
+ #
+ # Link to JVM library for JVM_Zip* functions
+-- 
+1.8.3.4
+

dev-lang/perl/perl-5.10.1.recipe

@@ -85,7 +85,6 @@ GLOBAL_WRITABLE_FILES="
 	non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()

dev-lang/perl/perl-5.18.1.recipe

@@ -1,19 +1,19 @@
 SUMMARY="Larry Wall's Practical Extraction and Report Language"
 DESCRIPTION="
-	Perl was originally developed by Larry Wall in 1987 as a general-purpose
+Perl was originally developed by Larry Wall in 1987 as a general-purpose Unix \
-	Unix scripting language to make report processing easier.
+scripting language to make report processing easier.
 
-	Perl borrows features from other programming languages including C, shell
+Perl borrows features from other programming languages including C, shell \
-	scripting (sh), AWK, and sed. The language provides powerful text
+scripting (sh), AWK, and sed. The language provides powerful text processing \
-	processing facilities without the arbitrary data-length limits of many
+facilities without the arbitrary data-length limits of many contemporary Unix \
-	contemporary Unix tools, facilitating easy manipulation of text files.
+tools, facilitating easy manipulation of text files.
 
-	In addition to CGI, Perl is used for graphics programming, system
+In addition to CGI, Perl is used for graphics programming, system \
-	administration, network programming, finance, bioinformatics, and other
+administration, network programming, finance, bioinformatics, and other \
-	applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting
+applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting \
-	languages' because of its flexibility and power, and possibly also
+languages' because of its flexibility and power, and possibly also because of \
-	because of its perceived 'ugliness'.
+its perceived 'ugliness'.
-	"
+"
 HOMEPAGE="http://www.perl.org/"
 COPYRIGHT="1993-2009 Larry Wall and others"
 LICENSE="GNU GPL v1
@@ -97,7 +97,6 @@ GLOBAL_WRITABLE_FILES="
 	non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old
 	"
 
-SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()

dev-lang/python/python-2.6.8.recipe

@@ -1,9 +1,13 @@
 SUMMARY="An interpreted, interactive, object-oriented programming language"
-DESCRIPTION="Python is a programming language that lets you work more quickly and integrate your systems more effectively. You can learn to use Python and see almost immediate gains in productivity and lower maintenance costs.
+DESCRIPTION="
-
+Python is a programming language that lets you work more quickly and integrate \
-Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java and .NET virtual machines.
+your systems more effectively. You can learn to use Python and see almost \
-
+immediate gains in productivity and lower maintenance costs.
-Python is free to use, even for commercial products, because of its OSI-approved open source license."
+Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java \
+and .NET virtual machines.
+Python is free to use, even for commercial products, because of its \
+OSI-approved open source license.
+"
 HOMEPAGE="http://www.python.org"
 LICENSE="Python"
 COPYRIGHT="1990-2012, Python Software Foundation"

dev-lang/rebol/rebol-2.101.0.5.75.recipe

@@ -1,4 +1,6 @@
-DESCRIPTION="Language with lightweight domain-specific sublanguages and micro-formats"
+DESCRIPTION="
+Language with lightweight domain-specific sublanguages and micro-formats.
+"
 HOMEPAGE="http://www.rebol.com/"
 SRC_URI="https://github.com/rebol/r3/archive/master.zip"
 CHECKSUM_MD5="b6dc765aa910ad7d7e4af649d5e35431"

dev-lang/ruby/patches/ruby-1.9.1.patchset

@@ -1,4 +1,4 @@
-From 8905e56a8092d502b54c26a753bb7920eae149ba Mon Sep 17 00:00:00 2001
+From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 11 Nov 2013 19:00:01 -0700
 Subject: applying patch ruby-1.9.1.patch
@@ -470,7 +470,7 @@ index 5da1769..74072d2 100644
 1.8.3.4
 
 
-From 623782bf181c3f15a276316c69839bf774fe8658 Mon Sep 17 00:00:00 2001
+From b5cf064c70f3212fb0a44dd4eaa4298e881b333f Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 11 Nov 2013 20:00:13 -0700
 Subject: Use gcc for linking modules
@@ -496,7 +496,7 @@ index 113d4e5..9bfbfb3 100644
 1.8.3.4
 
 
-From cc3d90149f715a93b962b4eab1b186acae22c23c Mon Sep 17 00:00:00 2001
+From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 11 Nov 2013 23:13:59 -0700
 Subject: Add soname flags for libruby.so
@@ -520,3 +520,26 @@ index 9bfbfb3..611b586 100644
 -- 
 1.8.3.4
 
+
+From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001
+From: Rene Gollent <rene@gollent.com>
+Date: Wed, 18 Dec 2013 21:52:24 -0500
+Subject: Add case for x86_64.
+
+
+diff --git a/configure.in b/configure.in
+index 611b586..01f0bb0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then
+ 			    : ${LDSHARED="ld -xms"}
+ 			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+                             ;;
+-			  i586*)
++			  i586*|x86_64*)
+ 			    : ${LDSHARED="${CC} -shared"}
+ 				if test "$rb_cv_binary_elf" = yes; then
+ 				    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+-- 
+1.8.3.4
+

dev-lang/ruby/ruby-1.9.1.recipe

@@ -1,4 +1,4 @@
-SUMMARY="A dynamic programming language focused on simplicity and productivity" 
+SUMMARY="A programming language focused on simplicity and productivity"
 DESCRIPTION="
 Ruby is a dynamic, reflective, object-oriented, general-purpose
 programming language. It was designed and developed in the mid-1990s
@@ -22,7 +22,7 @@ COPYRIGHT="1993-2009 Yukihiro Matsumoto"
 
 REVISION="2"
 
-ARCHITECTURES="?x86_gcc2 ?x86 !x86_64"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	ruby = $portVersion compat >= 1.9

dev-lang/swig/swig-2.0.11.recipe

@@ -1,22 +1,21 @@
 SUMMARY="Simplified Wrapper and Interface Generator"
 DESCRIPTION="
-SWIG is a software development tool that connects programs written in
+SWIG is a software development tool that connects programs written in C and \
-C and C++ with a variety of high-level programming languages. SWIG is
+C++ with a variety of high-level programming languages. SWIG is used with \
-used with different types of target languages including common
+different types of target languages including common scripting languages such \
-scripting languages such as Perl, PHP, Python, Tcl and Ruby. The list
+as Perl, PHP, Python, Tcl and Ruby. The list of supported languages also \
-of supported languages also includes non-scripting languages such as
+includes non-scripting languages such as C#, Common Lisp (CLISP, Allegro CL, \
-C#, Common Lisp (CLISP, Allegro CL, CFFI, UFFI), D, Go language, Java
+CFFI, UFFI), D, Go language, Java including Android, Lua, Modula-3, OCAML, \
-including Android, Lua, Modula-3, OCAML, Octave and R. Also several
+Octave and R. Also several interpreted and compiled Scheme implementations \
-interpreted and compiled Scheme implementations (Guile,
+(Guile, MzScheme/Racket, Chicken) are supported. SWIG is most commonly used to \
-MzScheme/Racket, Chicken) are supported. SWIG is most commonly used to
+create high-level interpreted or compiled programming environments, user \
-create high-level interpreted or compiled programming environments,
+interfaces, and as a tool for testing and prototyping C/C++ software. SWIG is \
-user interfaces, and as a tool for testing and prototyping C/C++
+typically used to parse C/C++ interfaces and generate the 'glue code' required \
-software. SWIG is typically used to parse C/C++ interfaces and
+for the above target languages to call into the C/C++ code. SWIG can also \
-generate the 'glue code' required for the above target languages to
+export its parse tree in the form of XML and Lisp s-expressions. SWIG is free \
-call into the C/C++ code. SWIG can also export its parse tree in the
+software and the code that SWIG generates is compatible with both commercial \
-form of XML and Lisp s-expressions. SWIG is free software and the code
+and non-commercial projects.
-that SWIG generates is compatible with both commercial and
+"
-non-commercial projects."
 LICENSE="SWIG"
 COPYRIGHT="1995-1998 University of Utah and the Regents of the University of California
 		1998-2005 University of Chicago
@@ -28,7 +27,6 @@ CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	swig = $portVersion

dev-lang/tcl/tcl-8.5.9.recipe

@@ -1,12 +1,11 @@
-SUMMARY="Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language."
+SUMMARY="A very powerful but easy to learn dynamic programming language"
 DESCRIPTION="
-Tcl (Tool Command Language) is a very powerful but easy to learn
+Tcl (Tool Command Language) is a very powerful but easy to learn dynamic \
-dynamic programming language, suitable for a very wide range of uses,
+programming language, suitable for a very wide range of uses, including web \
-including web and desktop applications, networking, administration,
+and desktop applications, networking, administration, testing and many more. \
-testing and many more. Open source and business-friendly, Tcl is a
+Open source and business-friendly, Tcl is a mature yet evolving language that \
-mature yet evolving language that is truly cross platform, easily
+is truly cross platform, easily deployed and highly extensible.
-deployed and highly extensible."
+"
-
 HOMEPAGE="http://www.tcl.tk" 
 SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz"
 REVISION="1"

dev-lang/v8/v8-3.16.1.recipe

@@ -1,11 +1,11 @@
-SUMMARY="V8 is Google's open source JavaScript engine."
+SUMMARY="Google's open source JavaScript engine."
 DESCRIPTION="
-V8 is Google's open source JavaScript engine.  V8 is written in C++
+V8 is Google's open source JavaScript engine. V8 is written in C++ and is used \
-and is used in Google Chrome, the open source browser from Google.  V8
+in Google Chrome, the open source browser from Google. V8 implements \
-implements ECMAScript as specified in ECMA-262, 5th edition, and runs
+ECMAScript as specified in ECMA-262, 5th edition, and runs on Windows (XP or \
-on Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems
+newer), Mac OS X (10.5 or newer), and Linux systems that use IA-32, x64, or \
-that use IA-32, x64, or ARM processors.  V8 can run standalone, or can
+ARM processors. V8 can run standalone, or can be embedded into any C++ \
-be embedded into any C++ application.
+application.
 "
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2006-2012 The V8 Project Authors"

dev-lang/yasm/yasm-1.1.0.recipe

@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -47,8 +46,13 @@ INSTALL()
 }
 
 
-DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new” BSD License (some portions are under other licenses, see COPYING for details).
+DESCRIPTION="
-
+Yasm is a complete rewrite of the NASM assembler under the “new” BSD License \
-Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats.
+(some portions are under other licenses, see COPYING for details).
-
+Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and \
-Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files."
+GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, \
+RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging \
+information in STABS, DWARF 2, and CodeView 8 formats.
+Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \
+assembly of NASM or GAS syntax code into Win32 or Win64 object files.
+"

dev-lang/yasm/yasm-1.2.0.recipe

@@ -33,7 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -52,8 +51,13 @@ INSTALL()
 }
 
 
-DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new” BSD License (some portions are under other licenses, see COPYING for details).
+DESCRIPTION="
-
+Yasm is a complete rewrite of the NASM assembler under the “new” BSD License \
-Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats.
+(some portions are under other licenses, see COPYING for details).
-
+Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and \
-Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files."
+GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, \
+RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging \
+information in STABS, DWARF 2, and CodeView 8 formats.
+Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \
+assembly of NASM or GAS syntax code into Win32 or Win64 object files.
+"

dev-libs/apr/apr-1.4.6.recipe

@@ -1,6 +1,6 @@
 SUMMARY="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
-SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
+SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz"
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
 CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
@@ -28,7 +28,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -74,30 +73,28 @@ TEST()
 # ----- description ----------------------------------------------------------
 
 DESCRIPTION="
-	The mission of the Apache Portable Runtime (APR) project is to create
+The mission of the Apache Portable Runtime (APR) project is to create and \
-	and maintain software libraries that provide a predictable and consistent
+maintain software libraries that provide a predictable and consistent \
-	interface to underlying platform-specific implementations. The primary
+interface to underlying platform-specific implementations. The primary goal is \
-	goal is to provide an API to which software developers may code and be
+to provide an API to which software developers may code and be assured of \
-	assured of predictable if not identical behaviour regardless of the
+predictable if not identical behaviour regardless of the platform on which \
-	platform on which their software is built, relieving them of the need to
+their software is built, relieving them of the need to code special-case \
-	code special-case conditions to work around or take advantage of
+conditions to work around or take advantage of platform-specific deficiencies \
-	platform-specific deficiencies or features.
+or features.
-
+To give a brief overview, the primary core subsystems of APR 1.x include the \
-	To give a brief overview, the primary core subsystems of APR 1.x include
+following:
-	the following:
+- atomic operations
-
+- dynamic Shared Object loading
-	- atomic operations
+- file I/O
-	- dynamic Shared Object loading
+- locks (mutexes, condition variables, etc)
-	- file I/O
+- memory management (high performance allocators)
-	- locks (mutexes, condition variables, etc)
+- memory-mapped files
-	- memory management (high performance allocators)
+- multicast Sockets
-	- memory-mapped files
+- network I/O
-	- multicast Sockets
+- shared memory
-	- network I/O
+- thread and Process management
-	- shared memory
+- various data structures (tables, hashes, priority queues, etc)
-	- thread and Process management
+"
-	- various data structures (tables, hashes, priority queues, etc)
-	"
 
 # ----- devel package -------------------------------------------------------
 

dev-libs/apr_util/apr_util-1.3.10.recipe

@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {