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

@@ -18,7 +18,7 @@ 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 +63,7 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 
-PATCHES="keepassx-2.0a4.git.patchset"
+PATCHES="keepassx-2.0a5.patchset"
 
 BUILD()
 {

app-arch/bzip2/bzip2-1.0.6.recipe

@@ -5,7 +5,7 @@ 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 +44,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -58,8 +57,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 +84,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/libarchive/libarchive-3.1.2.recipe

@@ -94,7 +94,6 @@ REQUIRES_devel="
 
 PATCHES="libarchive-3.1.2.patchset"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-arch/tar/tar-1.26.recipe

@@ -43,7 +43,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage tar \
 	$binDir/tar
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

app-doc/doxygen/doxygen-1.6.3.recipe

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

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"
-DEPEND="app-text/texi2html >= 1.82"
+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
+	"
+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
-	./configure
+	runConfigure ./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,65 @@
+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-emulation/oricutron/oricutron-1.1_svn.recipe

@@ -43,6 +43,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-misc/colordiff/colordiff-1.0.13.recipe

@@ -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/getopt/getopt-1.1.5.recipe

@@ -22,7 +22,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,50 @@
+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/zsh/zsh-5.0.2.recipe

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

app-text/aiksaurus/aiksaurus-1.2.1.recipe

@@ -0,0 +1,84 @@
+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

@@ -15,33 +15,43 @@ COPYRIGHT="1998-2005 A.J. van Os"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
-		antiword = $portVersion
-		cmd:antiword = $portVersion
-"
+	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:make
-"
+	cmd:gcc
+	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_RESOURCES_DIR = $(HOME)/.antiword
++LOCAL_INSTALL_DIR = $(BINDIR)
++LOCAL_RESOURCES_DIR = $(ANTIWORD_SETTINGS)
 +
-+GLOBAL_INSTALL_DIR = /boot/common/bin
-+GLOBAL_RESOURCES_DIR = /boot/common/data/antiword
++GLOBAL_INSTALL_DIR = $(BINDIR)
++GLOBAL_RESOURCES_DIR = $(ANTIWORD_DATA)
 +
 +all:		$(PROGS)
 +

app-text/asciidoc/asciidoc-8.6.8.recipe

@@ -30,7 +30,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-text/aspell/aspell-0.60.6.1.recipe

@@ -65,7 +65,6 @@ REQUIRES_devel="
 	aspell == $portVersion
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

app-text/discount/discount-2.1.3.recipe

@@ -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,38 @@
+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/help2man/help2man-1.43.3.recipe

@@ -0,0 +1,45 @@
+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

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

app-text/libpaper/libpaper-1.1.24.recipe

@@ -14,20 +14,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 +73,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
+#	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	libpaper$secondaryArchSuffix  == $portVersion base
 	"

app-text/mdocml/mdocml-1.12.2.recipe

@@ -13,7 +13,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

@@ -9,7 +9,6 @@ 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

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

dev-games/ode/ode-0.12.recipe

@@ -1,19 +1,66 @@
-DESCRIPTION="ODE is an open source, high performance 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."
+SUMMARY="Library for simulating rigid body dynamics"
 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
-	BSD (3-clause)"
-CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
+LICENSE="
+	GNU LGPL v3
+	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
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure --enable-shared
+	make $jobArgs
 }
 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
---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000
-+++ ode-0.12-haiku/ode/src/joints/Makefile.in   2012-12-27 19:39:57.854327296 +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
+diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h
+--- ode-0.12/include/ode/collision.h	2010-11-08 12:00:18.044564480 +0000
++++ ode-0.12-patch/include/ode/collision.h	2013-12-16 16:47:37.561774592 +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

@@ -6,35 +6,41 @@ CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613"
 LICENSE="PHYSFS"
 COPYRIGHT="2001-2012 Ryan C. Gordon"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 REVISION="1"
 
 PROVIDES="
-	physfs$secondaryArchSuffix = $portVersion
-	lib:libphysfs$secondaryArchSuffix = $portVersion
+	physfs$secondaryArchSuffix = $portVersion compat >= 2.0
+	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 +58,7 @@ INSTALL()
 
 PROVIDES_devel="
 	physfs$secondaryArchSuffix_devel = $portVersion compat >= 2.0
-	devel:physfs$secondaryArchSuffix = $portVersion compat >= 2.0
-	devel:libphysfs$secondaryArchSuffix = 2.0.3 compat >= 2.0
+	devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0
 	"
 
 REQUIRES_devel="

dev-java/gnu_classpath/gnu_classpath-0.98.recipe

@@ -1,42 +1,9 @@
+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 +15,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,61 @@
-DESCRIPTION="JamVM" 
-HOMEPAGE="http://jamvm.sourceforge.net" 
+SUMMARY="JamVM"
+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` \
-		--with-classpath-install-dir=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure \
+		--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/nasm/nasm-2.08.01.recipe

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

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

@@ -40,7 +40,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 +91,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 +156,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 +171,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

@@ -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/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

@@ -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

@@ -28,7 +28,6 @@ CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	swig = $portVersion

dev-lang/yasm/yasm-1.1.0.recipe

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

dev-lang/yasm/yasm-1.2.0.recipe

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

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()
 {

dev-libs/apr_util/apr_util-1.3.10.recipe

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

dev-libs/boehm_gc/boehm_gc-7.2d.recipe

@@ -9,42 +9,33 @@ be otherwise accessed."
 
 HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
+REVISION="2"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2"
 SOURCE_DIR="gc-7.2"
 
 PATCHES="boehm_gc-7.2d.patch"
 
 PROVIDES="
-	boehm_gc = $portVersion compat >= 7
-	lib:libgc = $portVersion compat >= 7
-	lib:libcord = $portVersion compat >= 7
+	boehm_gc$secondaryArchSuffix = $portVersion compat >= 7
+	lib:libgc$secondaryArchSuffix = $portVersion compat >= 7
+	lib:libcord$secondaryArchSuffix = $portVersion compat >= 7
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
-	cmd:gcc
-	cmd:ld
-	"
-
-PROVIDES_devel="
-	boehm_gc_devel = $portVersion compat >= 7
-	devel:libgc = $portVersion compat >= 7
-	devel:libcord = $portVersion compat >= 7
-	"
-
-REQUIRES_devel="
-	boehm_gc == $portVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	"
 
 BUILD()
@@ -52,7 +43,7 @@ BUILD()
 	libtoolize --force --copy --install
 	autoconf -f
 	runConfigure ./configure --enable-threads=posix \
-	--enable-thread-local-alloc --enable-parallel-mark
+		--enable-thread-local-alloc --enable-parallel-mark
 	make
 }
 
@@ -69,6 +60,16 @@ TEST()
 	make check
 }
 
+PROVIDES_devel="
+	boehm_gc${secondaryArchSuffix}_devel = $portVersion compat >= 7
+	devel:libgc${secondaryArchSuffix} = $portVersion compat >= 7
+	devel:libcord${secondaryArchSuffix} = $portVersion compat >= 7
+	"
+
+REQUIRES_devel="
+	boehm_gc${secondaryArchSuffix} == $portVersion base
+	"
+
 LICENSE="BOEHM"
 COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers
 	1991-1996 by Xerox Corporation.  All rights reserved.

dev-libs/boost/boost-1.42.0.recipe

@@ -1,26 +0,0 @@
-DESCRIPTION="boost" 
-HOMEPAGE="http://www.boost.org/" 
-SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.42.0/boost_1_42_0.tar.bz2/download"
-CHECKSUM_MD5="7bf3b4eb841b62ffb0ade2b82218ebe6"
-REVISION="1"
-STATUS_HAIKU="broken"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
-BUILD()
-{
-	cd boost_1_42_0
-	./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY`
-	./bjam --prefix=`finddir B_COMMON_DIRECTORY` \
-	--libdir=/boot/common/lib \
-	--includedir=/boot/common/include \
-	variant=release \
-	link=shared \
-	threading=single \
-	runtime-link=shared
-}
-
-INSTALL()
-{
-	cd boost_1_42_0
-	./bjam install
-}

dev-libs/boost/boost-1.50.0.recipe

@@ -1,52 +0,0 @@
-DESCRIPTION="boost" 
-HOMEPAGE="http://www.boost.org/" 
-SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
-CHECKSUM_MD5="52dd00be775e689f55a987baebccc462"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="boehm-gc"
-BUILD()
-{
-	cd boost_1_50_0
-	./bootstrap.sh \
-		--without-icu \
-		--prefix=`finddir B_COMMON_DIRECTORY` \
-		--exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` 
-	./bjam \
-		 -sICU_PATH=`finddir B_COMMON_DIRECTORY` \
-		 -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \
-		-d2 \
-		--without-mpi \
-		--prefix=`finddir B_COMMON_DIRECTORY` \
-		--exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \
-		--enable-threads=posix \
-		--enable-thread-local-alloc \
-		--enable-parallel-mark \
-		inlining=on \
-		linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \
-		threading=multi \
-		variant=release \
-		link=shared \
-		runtime-link=shared
-}
-
-INSTALL()
-{
-	cd boost_1_50_0
-	./bjam install \
-		-d2 \
-		--prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \
-		#--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \
-		#--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \		
-		#--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \
-		inlining=on \
-		--without-mpi 
-}
-
-LICENSE="Boost v1.0"
-COPYRIGHT="1998-2011 Beman Dawes, David Abrahams, Rene Rivera, et al."

dev-libs/boost/boost-1.53.0.recipe

@@ -1,52 +0,0 @@
-DESCRIPTION="boost" 
-HOMEPAGE="http://www.boost.org/" 
-SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.53.0/boost_1_53_0.tar.bz2/download"
-CHECKSUM_MD5="a00d22605d5dbcfb4c9936a9b35bc4c2"
-REVISION="1"
-STATUS_HAIKU="broken"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="boehm-gc"
-BUILD()
-{
-	cd boost_1_53_0
-	./bootstrap.sh \
-		--without-icu \
-		--prefix=`finddir B_COMMON_DIRECTORY` \
-		--exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` 
-	./bjam \
-		 -sICU_PATH=`finddir B_COMMON_DIRECTORY` \
-		 -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \
-		-d2 \
-		--without-mpi \
-		--prefix=`finddir B_COMMON_DIRECTORY` \
-		--exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \
-		--enable-threads=posix \
-		--enable-thread-local-alloc \
-		--enable-parallel-mark \
-		inlining=on \
-		linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \
-		threading=multi \
-		variant=release \
-		link=shared \
-		runtime-link=shared
-}
-
-INSTALL()
-{
-	cd boost_1_53_0
-	./bjam install \
-		-d2 \
-		--prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \
-		#--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \
-		#--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \		
-		#--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \
-		inlining=on \
-		--without-mpi 
-}
-
-LICENSE="Boost v1.0"
-COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."

dev-libs/boost/boost-1.55.0.recipe

@@ -7,82 +7,449 @@ DESCRIPTION="
 	"
 SUMMARY="Boost is a set of libraries for the C++ programming language."
 HOMEPAGE="http://www.boost.org/" 
-SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download"
+SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2"
 CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354"
-REVISION="1"
+REVISION="2"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
-ARCHITECTURES="?x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86 ?x86_64"
+
 SOURCE_DIR="boost_1_55_0"	
-PATCHES="boost-1.55.0.patch"
+
+PATCHES="boost-1.55.0.patchset"
 
 PROVIDES="
-	lib:boost = 1.55.0
-	"
-
-BUILD_PREREQUIRES="
-	boehm_gc
-	libiconv
-	libiconv_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:jam
-	cmd:iconv
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libiconv
+	boost$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
-	lib:libiconv
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_atomic$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_context$secondaryArchSuffix == $portVersion
+	boost_coroutine$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_graph$secondaryArchSuffix == $portVersion
+	boost_iostreams$secondaryArchSuffix == $portVersion
+	boost_locale$secondaryArchSuffix == $portVersion
+	boost_log$secondaryArchSuffix == $portVersion
+	boost_math$secondaryArchSuffix == $portVersion
+	boost_program_options$secondaryArchSuffix == $portVersion
+	boost_random$secondaryArchSuffix == $portVersion
+	boost_regex$secondaryArchSuffix == $portVersion
+	boost_serialization$secondaryArchSuffix == $portVersion
+	boost_signals$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_test$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+	boost_timer$secondaryArchSuffix == $portVersion
+	boost_unit_test_framework$secondaryArchSuffix == $portVersion
+	boost_wave$secondaryArchSuffix == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libbz2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libicui18n$secondaryArchSuffix
+	devel:libicudata$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	./bootstrap.sh \
-		--without-icu \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` 
-	./bjam \
-		 -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \
-		 -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \
-		-d2 \
+		--prefix=$prefix \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \
+		--includedir=$includeDir
+
+	./b2 $jobArgs \
 		--without-mpi \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \
 		--enable-threads=posix \
 		--enable-thread-local-alloc \
-		--enable-parallel-mark \
+ 		--enable-parallel-mark \
 		inlining=on \
-		linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \
 		threading=multi \
 		variant=release \
-		link=shared \
-		runtime-link=shared
+		link=static,shared \
+		runtime-link=shared \
+		--without-python
 }
 
 INSTALL()
 {
-	./bjam install \
-		-d2 \
-		--prefix=$prefix \
-		#--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \
-		#--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \		
-		#--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \
+	./b2 $jobArgs \
+		--without-mpi \
+		--enable-threads=posix \
+		--enable-thread-local-alloc \
+ 		--enable-parallel-mark \
 		inlining=on \
-		--without-mpi 
+		threading=multi \
+		variant=release \
+		link=static,shared \
+		runtime-link=shared \
+		--without-python \
+		install
+
+	prepareInstalledDevelLibs libboost_atomic \
+		libboost_chrono libboost_context libboost_coroutine \
+		libboost_date_time libboost_filesystem libboost_iostreams \
+		libboost_locale libboost_log libboost_log_setup \
+		libboost_math_c99 libboost_math_c99f libboost_math_c99l \
+		libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l \
+		libboost_program_options libboost_random libboost_regex \
+		libboost_serialization libboost_signals libboost_system \
+		libboost_thread libboost_timer libboost_unit_test_framework \
+		libboost_wave libboost_wserialization libboost_prg_exec_monitor \
+		libboost_exception libboost_graph libboost_test_exec_monitor
+
+	packageEntries devel $developDir
+	packageEntries atomic $libDir/libboost_atomic*
+	packageEntries chrono $libDir/libboost_chrono*
+	packageEntries context $libDir/libboost_context*
+	packageEntries coroutine $libDir/libboost_coroutine*
+	packageEntries date_time $libDir/libboost_date_time*
+#	packageEntries exception $libDir/libboost_exception*
+	packageEntries filesystem $libDir/libboost_filesystem*
+	packageEntries graph $libDir/libboost_graph*
+	packageEntries iostreams $libDir/libboost_iostreams*
+	packageEntries locale $libDir/libboost_locale*
+	packageEntries log $libDir/libboost_log*
+	packageEntries math $libDir/libboost_math*
+	packageEntries program_options $libDir/libboost_program_options*
+	packageEntries random $libDir/libboost_random*
+	packageEntries regex $libDir/libboost_regex*
+	packageEntries serialization $libDir/libboost_serialization* $libDir/libboost_wserialization*
+	packageEntries signals $libDir/libboost_signals*
+	packageEntries system $libDir/libboost_system* 
+	packageEntries test $libDir/libboost_prg_exec_monitor*
+	packageEntries thread $libDir/libboost_thread*
+	packageEntries timer $libDir/libboost_timer*
+	packageEntries unit_test_framework $libDir/libboost_unit_test_framework*
+	packageEntries wave $libDir/libboost_wave*
 }
 
 PROVIDES_devel="
-	boost${secondaryArchSuffix} = $portVersion
+	boost_devel$secondaryArchSuffix = $portVersion
+	devel:libboost_atomic$secondaryArchSuffix = $portVersion
+	devel:libboost_chrono$secondaryArchSuffix = $portVersion
+	devel:libboost_context$secondaryArchSuffix = $portVersion
+	devel:libboost_coroutine$secondaryArchSuffix = $portVersion
+	devel:libboost_date_time$secondaryArchSuffix = $portVersion
+	devel:libboost_exception$secondaryArchSuffix = $portVersion
+	devel:libboost_filesystem$secondaryArchSuffix = $portVersion
+	devel:libboost_graph$secondaryArchSuffix = $portVersion
+	devel:libboost_iostreams$secondaryArchSuffix = $portVersion
+	devel:libboost_locale$secondaryArchSuffix = $portVersion
+	devel:libboost_log$secondaryArchSuffix = $portVersion
+	devel:libboost_log_setup$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99f$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99l$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1f$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1l$secondaryArchSuffix = $portVersion
+	devel:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion
+	devel:libboost_program_options$secondaryArchSuffix = $portVersion
+	devel:libboost_random$secondaryArchSuffix = $portVersion
+	devel:libboost_regex$secondaryArchSuffix = $portVersion
+	devel:libboost_serialization$secondaryArchSuffix = $portVersion
+	devel:libboost_signals$secondaryArchSuffix = $portVersion
+	devel:libboost_system$secondaryArchSuffix = $portVersion
+	devel:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion
+	devel:libboost_thread$secondaryArchSuffix = $portVersion
+	devel:libboost_timer$secondaryArchSuffix = $portVersion
+	devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion
+	devel:libboost_wave$secondaryArchSuffix = $portVersion
+	devel:libboost_wserialization$secondaryArchSuffix = $portVersion
 	"
-	
+
 REQUIRES_devel="
-	boost${secondaryArchSuffix} == $portVersion base
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost$secondaryArchSuffix == $portVersion
+	boost_atomic$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_context$secondaryArchSuffix == $portVersion
+	boost_coroutine$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+#	boost_exception$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_graph$secondaryArchSuffix == $portVersion
+	boost_iostreams$secondaryArchSuffix == $portVersion
+	boost_locale$secondaryArchSuffix == $portVersion
+	boost_log$secondaryArchSuffix == $portVersion
+	boost_math$secondaryArchSuffix == $portVersion
+	boost_program_options$secondaryArchSuffix == $portVersion
+	boost_random$secondaryArchSuffix == $portVersion
+	boost_regex$secondaryArchSuffix == $portVersion
+	boost_serialization$secondaryArchSuffix == $portVersion
+	boost_signals$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_test$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+	boost_timer$secondaryArchSuffix == $portVersion
+	boost_unit_test_framework$secondaryArchSuffix == $portVersion
+	boost_wave$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_atomic="
+	boost_atomic$secondaryArchSuffix = $portVersion
+	lib:libboost_atomic$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_atomic="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_chrono="
+	boost_chrono$secondaryArchSuffix = $portVersion
+	lib:libboost_chrono$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_chrono="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_context="
+	boost_context$secondaryArchSuffix = $portVersion
+	lib:libboost_context$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_context="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_coroutine="
+	boost_coroutine$secondaryArchSuffix = $portVersion
+	lib:libboost_coroutine$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_coroutine="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_context$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_date_time="
+	boost_date_time$secondaryArchSuffix = $portVersion
+	lib:libboost_date_time$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_date_time="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+#PROVIDES_exception="
+#	boost_exception$secondaryArchSuffix = $portVersion
+#	lib:libboost_exception$secondaryArchSuffix = $portVersion
+#	"
+
+#REQUIRES_exception="
+#	haiku$secondaryArchSuffix >= $haikuVersion
+#	"
+
+PROVIDES_filesystem="
+	boost_filesystem$secondaryArchSuffix = $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_filesystem="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+PROVIDES_graph="
+	boost_graph$secondaryArchSuffix = $portVersion
+	lib:libboost_graph$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_graph="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_regex$secondaryArchSuffix == $portVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	"
+
+PROVIDES_iostreams="
+	boost_iostreams$secondaryArchSuffix = $portVersion
+	lib:libboost_iostreams$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_iostreams="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+PROVIDES_locale="
+	boost_locale$secondaryArchSuffix = $portVersion
+	lib:libboost_locale$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_locale="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	"
+
+PROVIDES_log="
+	boost_log$secondaryArchSuffix = $portVersion
+	lib:libboost_log$secondaryArchSuffix = $portVersion
+	lib:libboost_log_setup$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_log="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_date_time$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_math="
+	boost_math$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99f$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99l$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1f$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1l$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_math="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_program_options="
+	boost_program_options$secondaryArchSuffix = $portVersion
+	lib:libboost_program_options$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_program_options="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_random="
+	boost_random$secondaryArchSuffix = $portVersion
+	lib:libboost_random$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_random="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_regex="
+	boost_regex$secondaryArchSuffix = $portVersion
+	lib:libboost_regex$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_regex="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	"
+
+PROVIDES_serialization="
+	boost_serialization$secondaryArchSuffix = $portVersion
+	lib:libboost_serialization$secondaryArchSuffix = $portVersion
+	lib:libboost_wserialization$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_serialization="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_signals="
+	boost_signals$secondaryArchSuffix = $portVersion
+	lib:libboost_signals$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_signals="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_system="
+	boost_system$secondaryArchSuffix = $portVersion
+	lib:libboost_system$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_system="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_test="
+	boost_test$secondaryArchSuffix = $portVersion
+	lib:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion
+#	lib:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_test="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_thread="
+	boost_thread$secondaryArchSuffix = $portVersion
+	lib:libboost_thread$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_thread="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_timer="
+	boost_timer$secondaryArchSuffix = $portVersion
+	lib:libboost_timer$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_timer="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_unit_test_framework="
+	boost_unit_test_framework$secondaryArchSuffix = $portVersion
+	lib:libboost_unit_test_framework$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_unit_test_framework="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+PROVIDES_wave="
+	boost_wave$secondaryArchSuffix = $portVersion
+	lib:libboost_wave$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_wave="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_date_time$secondaryArchSuffix == $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
 	"

dev-libs/boost/patches/boost-1.42.0.patch

@@ -1,225 +0,0 @@
-diff -Naur boost_1_42_0/boost/config/platform/haiku.hpp boost_1_42_0-haiku/boost/config/platform/haiku.hpp
---- boost_1_42_0/boost/config/platform/haiku.hpp	1970-01-01 00:00:00.000000000 +0000
-+++ boost_1_42_0-haiku/boost/config/platform/haiku.hpp	2010-04-23 02:22:35.100925440 +0000
-@@ -0,0 +1,27 @@
-+//  (C) Copyright John Maddock 2001. 
-+//  Use, modification and distribution are subject to the 
-+//  Boost Software License, Version 1.0. (See accompanying file 
-+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+//  See http://www.boost.org for most recent version.
-+	
-+//  Haiku specific config options:
-+
-+#define BOOST_PLATFORM "Haiku"
-+
-+#define BOOST_NO_INTRINSIC_WCHAR_T
-+#define BOOST_HAS_UNISTD_H
-+	
-+#define BOOST_HAS_BETHREADS
-+	
-+#ifndef BOOST_DISABLE_THREADS
-+#   define BOOST_HAS_THREADS
-+#endif
-+
-+//
-+// thread API's not auto detected:
-+//
-+#define BOOST_HAS_GETTIMEOFDAY
-+
-+// boilerplate code:
-+#include <boost/config/posix_features.hpp>
-diff -Naur boost_1_42_0/boost/config/select_platform_config.hpp boost_1_42_0-haiku/boost/config/select_platform_config.hpp
---- boost_1_42_0/boost/config/select_platform_config.hpp	2009-05-30 11:16:25.057409536 +0000
-+++ boost_1_42_0-haiku/boost/config/select_platform_config.hpp	2010-04-23 02:22:24.092798976 +0000
-@@ -41,6 +41,10 @@
- // win32:
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
- 
-+#elif defined(__HAIKU__)
-+// Haiku
-+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" 
-+
- #elif defined(__BEOS__)
- // BeOS
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"
-diff -Naur boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp
---- boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp	2009-05-30 11:16:25.057671680 +0000
-+++ boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp	2010-04-23 02:23:34.217841664 +0000
-@@ -31,7 +31,7 @@
- 
- #ifdef __GLIBCXX__ // gcc 3.4 and greater:
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
--        || defined(_GLIBCXX__PTHREADS)
-+        || defined(_GLIBCXX__PTHREADS) || defined(__HAIKU__)
-       //
-       // If the std lib has thread support turned on, then turn it on in Boost
-       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
-diff -Naur boost_1_42_0/boost/thread/thread_time.hpp boost_1_42_0-haiku/boost/thread/thread_time.hpp
---- boost_1_42_0/boost/thread/thread_time.hpp	2008-06-18 13:01:08.030408704 +0000
-+++ boost_1_42_0-haiku/boost/thread/thread_time.hpp	2010-04-23 02:24:59.809500672 +0000
-@@ -17,6 +17,9 @@
-     
-     inline system_time get_system_time()
-     {
-+#ifndef BOOST_DATE_TIME_HAS_HIGH_PRECISION_CLOCK
-+#       error "High precision clock not supported on this platform"
-+#endif
-         return boost::date_time::microsec_clock<system_time>::universal_time();
-     }
- 
-diff -Naur boost_1_42_0/tools/build/v2/tools/builtin.jam boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam
---- boost_1_42_0/tools/build/v2/tools/builtin.jam	2009-10-28 07:47:51.000786432 +0000
-+++ boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam	2010-04-23 02:26:20.131596288 +0000
-@@ -39,7 +39,7 @@
- 
- 
- .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd
--    openbsd osf qnx qnxnto sgi solaris unix unixware windows 
-+    openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku
-     elf # Not actually an OS -- used for targeting bare metal where
-         # object format is ELF.  This catches both -elf and -eabi gcc
-         # targets and well as other compilers targeting ELF. It is not
-@@ -77,6 +77,7 @@
-             case MACOSX       : host-os = darwin  ;
-             case KFREEBSD     : host-os = freebsd ;
-             case LINUX        : host-os = linux   ;
-+            case HAIKU        : host-os = haiku   ;
-             case SUNOS        : 
-               ECHO "SunOS is not a supported operating system." ;
-               ECHO "We believe last version of SunOS was released in 1992, " ;
-diff -Naur boost_1_42_0/tools/build/v2/tools/gcc.jam boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam
---- boost_1_42_0/tools/build/v2/tools/gcc.jam	2009-10-28 07:47:51.003145728 +0000
-+++ boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam	2010-04-23 02:28:40.680001536 +0000
-@@ -858,7 +858,7 @@
- # Differs from 'link' above only by -shared.
- actions link.dll bind LIBRARIES
- {
--    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -nostart -Wl,-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
- }
- 
- rule setup-threading ( targets * : sources * : properties * )
-@@ -889,6 +889,10 @@
-             {            
-                 # BeOS has no threading options, so do not set anything here.
-             }        
-+            case haiku :
-+            {            
-+                # pthread.
-+            }        
-             case *bsd :
-             {
-                 option = -pthread ;
-diff -Naur boost_1_42_0/tools/jam/src/Jambase boost_1_42_0-haiku/tools/jam/src/Jambase
---- boost_1_42_0/tools/jam/src/Jambase	2009-01-10 19:42:28.047185920 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/Jambase	2010-04-23 02:31:10.925106176 +0000
-@@ -849,6 +849,18 @@
-     NOARSCAN    ?= true ;
-     STDHDRS     ?= /boot/develop/headers/posix ;
- }
-+else if $(OS) = HAIKU
-+{
-+    BINDIR      ?= /boot/common/bin ;
-+    CC          ?= gcc ;
-+    C++         ?= $(CC) ;
-+    FORTRAN     ?= "" ;
-+    LIBDIR      ?= /boot/common/lib ;
-+    LINK        ?= gcc ;
-+    LINKLIBS    ?= -lnetwork ;
-+    NOARSCAN    ?= true ;
-+    STDHDRS     ?= /boot/develop/headers/posix ;
-+}
- else if $(UNIX)
- {
-     switch $(OS)
-diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/config.guess boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess
---- boost_1_42_0/tools/jam/src/boehm_gc/config.guess	2007-08-11 05:53:37.019922944 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess	2010-04-23 02:33:06.863502336 +0000
-@@ -1199,6 +1199,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+	BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h
---- boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h	2007-08-11 05:53:37.032243712 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h	2010-04-23 02:34:09.906231808 +0000
-@@ -215,6 +215,11 @@
- #    define BEOS
- #    define mach_type_known
- # endif
-+# if defined(__HAIKU__) && defined(_X86_)
-+#    define I386
-+#    define HAIKU
-+#    define mach_type_known
-+# endif
- # if defined(LINUX) && (defined(i386) || defined(__i386__))
- #    define I386
- #    define mach_type_known
-@@ -1014,6 +1019,13 @@
-       extern int etext[];
- #     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
- #   endif
-+#   ifdef HAIKU
-+#     define OS_TYPE "HAIKU"
-+#     include <OS.h>
-+#     define GETPAGESIZE() B_PAGE_SIZE
-+      extern int etext[];
-+#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-+#   endif
- #   ifdef SOLARIS
- #	define OS_TYPE "SOLARIS"
-         extern int _etext[], _end[];
-diff -Naur boost_1_42_0/tools/jam/src/fileunix.c boost_1_42_0-haiku/tools/jam/src/fileunix.c
---- boost_1_42_0/tools/jam/src/fileunix.c	2009-01-10 19:42:28.045613056 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/fileunix.c	2010-04-23 02:34:44.754712576 +0000
-@@ -80,6 +80,7 @@
- 
- # if defined( OS_QNX ) || \
-      defined( OS_BEOS ) || \
-+     defined( OS_HAIKU ) || \
-      defined( OS_MPEIX )
- # define NO_AR
- # define HAVE_AR
-diff -Naur boost_1_42_0/tools/jam/src/jam.h boost_1_42_0-haiku/tools/jam/src/jam.h
---- boost_1_42_0/tools/jam/src/jam.h	2009-01-10 19:42:28.046923776 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/jam.h	2010-04-23 02:35:27.411828224 +0000
-@@ -234,6 +234,11 @@
-     #define OS_BEOS
-     #define NO_VFORK
- #endif
-+#ifdef __HAIKU__
-+    #define unix
-+    #define OSMINOR "OS=HAIKU"
-+    #define OS_HAIKU
-+#endif
- #ifdef __bsdi__
-     #define OSMINOR "OS=BSDI"
-     #define OS_BSDI
-diff -Naur boost_1_42_0/tools/jam/src/jambase.c boost_1_42_0-haiku/tools/jam/src/jambase.c
---- boost_1_42_0/tools/jam/src/jambase.c	2009-01-10 19:42:28.047448064 +0000
-+++ boost_1_42_0-haiku/tools/jam/src/jambase.c	2010-04-23 02:36:46.935329792 +0000
-@@ -554,6 +554,18 @@
- "NOARSCAN    ?= true ;\n",
- "STDHDRS     ?= /boot/develop/headers/posix ;\n",
- "}\n",
-+"else if $(OS) = HAIKU\n",
-+"{\n",
-+"BINDIR      ?= /boot/common/bin ;\n",
-+"CC          ?= gcc ;\n",
-+"C++         ?= $(CC) ;\n",
-+"FORTRAN     ?= \"\" ;\n",
-+"LIBDIR      ?= /boot/common/lib ;\n",
-+"LINK        ?= gcc ;\n",
-+"LINKLIBS    ?= -lnetwork ;\n",
-+"NOARSCAN    ?= true ;\n",
-+"STDHDRS     ?= /boot/develop/headers/posix ;\n",
-+"}\n",
- "else if $(UNIX)\n",
- "{\n",
- "switch $(OS)\n",

dev-libs/boost/patches/boost-1.50.0.patch

@@ -1,337 +0,0 @@
-diff -Naur boost_1_50_0/boost/config/platform/haiku.hpp boost_1_50_0-haiku/boost/config/platform/haiku.hpp
---- boost_1_50_0/boost/config/platform/haiku.hpp	1970-01-01 01:00:00.000000000 +0100
-+++ boost_1_50_0-haiku/boost/config/platform/haiku.hpp	2012-08-16 01:16:44.000000000 +0200
-@@ -0,0 +1,27 @@
-+//  (C) Copyright John Maddock 2001. 
-+//  Use, modification and distribution are subject to the 
-+//  Boost Software License, Version 1.0. (See accompanying file 
-+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+//  See http://www.boost.org for most recent version.
-+	
-+//  Haiku specific config options:
-+
-+#define BOOST_PLATFORM "Haiku"
-+
-+#define BOOST_NO_INTRINSIC_WCHAR_T
-+#define BOOST_HAS_UNISTD_H
-+	
-+#define BOOST_HAS_BETHREADS
-+	
-+#ifndef BOOST_DISABLE_THREADS
-+#   define BOOST_HAS_THREADS
-+#endif
-+
-+//
-+// thread API's not auto detected:
-+//
-+#define BOOST_HAS_GETTIMEOFDAY
-+
-+// boilerplate code:
-+#include <boost/config/posix_features.hpp>
-diff -Naur boost_1_50_0/boost/config/select_platform_config.hpp boost_1_50_0-haiku/boost/config/select_platform_config.hpp
---- boost_1_50_0/boost/config/select_platform_config.hpp	2011-10-10 13:50:55.047185920 +0200
-+++ boost_1_50_0-haiku/boost/config/select_platform_config.hpp	2012-08-16 13:32:04.000000000 +0200
-@@ -41,6 +41,10 @@
- // win32:
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
- 
-+#elif defined(__HAIKU__)
-+// Haiku
-+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp"
-+
- #elif defined(__BEOS__)
- // BeOS
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"
-diff -Naur boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp
---- boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp	2012-05-15 13:57:21.047972352 +0200
-+++ boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp	2012-08-16 15:22:26.000000000 +0200
-@@ -35,7 +35,8 @@
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-         || defined(_GLIBCXX__PTHREADS) \
-         || defined(_GLIBCXX_HAS_GTHREADS) \
--        || defined(_WIN32)
-+        || defined(_WIN32) \
-+        || defined(__HAIKU__)
-       //
-       // If the std lib has thread support turned on, then turn it on in Boost
-       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
-diff -Naur boost_1_50_0/boost/thread/detail/platform.hpp boost_1_50_0-haiku/boost/thread/detail/platform.hpp
---- boost_1_50_0/boost/thread/detail/platform.hpp	2012-05-22 19:03:15.043253760 +0200
-+++ boost_1_50_0-haiku/boost/thread/detail/platform.hpp	2012-08-16 23:24:30.135266304 +0200
-@@ -34,6 +34,8 @@
- #  define BOOST_THREAD_WIN32
- #elif defined(__BEOS__)
- #  define BOOST_THREAD_BEOS
-+#elif defined(__HAIKU__)
-+#  define BOOST_THREAD_BEOS
- #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
- #  define BOOST_THREAD_MACOS
- #  define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000)
-diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c
---- boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c	2011-06-06 22:36:21.020185088 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c	2012-08-16 13:10:40.000000000 +0200
-@@ -64,7 +64,7 @@
-     !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \
-     !(defined(FREEBSD) && defined(__ELF__)) && \
-     !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
--    !defined(DARWIN) && !defined(CYGWIN32)
-+    !defined(DARWIN) && !defined(CYGWIN32) !(defined(HAIKU)
-  --> We only know how to find data segments of dynamic libraries for the
-  --> above.  Additional SVR4 variants might not be too
-  --> hard to add.
-@@ -82,6 +82,10 @@
- #   define ELFSIZE ARCH_ELFSIZE
- #endif
- 
-+#if defined(HAIKU)
-+
-+#endif
-+
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-@@ -216,7 +220,8 @@
- 
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
--    (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-+    (defined(NETBSD) && defined(__ELF__)) || defined(HURD) || \
-+    defined(HAIKU)
- 
- 
- #ifdef USE_PROC_FOR_LIBRARIES
-diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h	2011-06-06 22:36:21.022282240 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h	2012-08-16 13:17:27.000000000 +0200
-@@ -45,7 +45,8 @@
- 			     || defined(GC_AIX_THREADS) \
- 			     || defined(GC_LINUX_THREADS) \
- 			     || defined(GC_NETBSD_THREADS) \
--			     || defined(GC_GNU_THREADS))
-+			     || defined(GC_GNU_THREADS)) \
-+			     || defined(GC_HAIKU_THREADS)
- # define _REENTRANT
- 	/* Better late than never.  This fails if system headers that	*/
- 	/* depend on this were previously included.			*/
-@@ -62,6 +63,7 @@
- # if defined(GC_SOLARIS_THREADS) || defined(GC_FREEBSD_THREADS) || \
- 	defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \
- 	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
-+	defined(GC_HAIKU_THREADS) || \
- 	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
-         defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
-         (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \
-diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h
---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h	2011-06-06 22:36:21.022020096 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h	2012-08-16 13:12:51.000000000 +0200
-@@ -494,7 +494,7 @@
- /* of compilers.							*/
- /* This may also be desirable if it is possible but expensive to	*/
- /* retrieve the call chain.						*/
--#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
-+#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \
-      || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS)
- # define GC_ADD_CALLER
- # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
-diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h	2011-06-06 22:36:21.024117248 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h	2012-08-16 13:49:16.000000000 +0200
-@@ -215,6 +215,11 @@
- #    define BEOS
- #    define mach_type_known
- # endif
-+# if defined(__HAIKU__) && defined(_X86_)
-+#    define I386
-+#    define HAIKU
-+#    define mach_type_known
-+# endif
- # if defined(LINUX) && (defined(i386) || defined(__i386__))
- #    define I386
- #    define mach_type_known
-@@ -1014,6 +1019,13 @@
-       extern int etext[];
- #     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
- #   endif
-+#   ifdef HAIKU
-+#     define OS_TYPE "HAIKU"
-+#     include <OS.h>
-+#     define GETPAGESIZE() B_PAGE_SIZE
-+      extern int etext[];
-+#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
-+#   endif
- #   ifdef SOLARIS
- #	define OS_TYPE "SOLARIS"
-         extern int _etext[], _end[];
-diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c
---- boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c	2011-06-06 22:36:21.030408704 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c	2012-08-16 13:52:23.000000000 +0200
-@@ -777,6 +777,16 @@
- # endif /* BEOS */
- 
- 
-+# ifdef HAIKU
-+# include <OS.h>
-+ptr_t GC_get_main_stack_base(void){
-+	thread_info th;
-+	get_thread_info(find_thread(NULL),&th);
-+	return th.stack_end;
-+}
-+# endif /* HAIKU */
-+
-+
- # ifdef OS2
- 
- ptr_t GC_get_main_stack_base(void)
-@@ -1095,7 +1105,7 @@
- 
- #endif /* FREEBSD_STACKBOTTOM */
- 
--#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \
-+#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \
-     && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \
-     && !defined(CYGWIN32)
- 
-@@ -1154,7 +1164,7 @@
- #   endif /* STACKBOTTOM */
- }
- 
--# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */
-+# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */
- 
- #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE)
- 
-diff -Naur boost_1_50_0/tools/build/v2/engine/fileunix.c boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c
---- boost_1_50_0/tools/build/v2/engine/fileunix.c	2012-04-26 05:35:55.037224448 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c	2012-08-16 13:54:03.000000000 +0200
-@@ -81,6 +81,7 @@
- 
- # if defined( OS_QNX ) || \
-      defined( OS_BEOS ) || \
-+     defined( OS_HAIKU ) || \
-      defined( OS_MPEIX )
- # define NO_AR
- # define HAVE_AR
-diff -Naur boost_1_50_0/tools/build/v2/engine/jam.h boost_1_50_0-haiku/tools/build/v2/engine/jam.h
---- boost_1_50_0/tools/build/v2/engine/jam.h	2012-06-06 06:00:21.039059456 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/jam.h	2012-08-16 13:57:51.000000000 +0200
-@@ -151,6 +151,11 @@
-     #define OS_BEOS
-     #define NO_VFORK
- #endif
-+#ifdef __HAIKU__
-+    #define unix
-+    #define OSMINOR "OS=HAIKU"
-+    #define OS_HAIKU
-+#endif
- #ifdef __bsdi__
-     #define OSMINOR "OS=BSDI"
-     #define OS_BSDI
-diff -Naur boost_1_50_0/tools/build/v2/engine/jambase.c boost_1_50_0-haiku/tools/build/v2/engine/jambase.c
---- boost_1_50_0/tools/build/v2/engine/jambase.c	2011-06-06 22:36:21.039321600 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/engine/jambase.c	2012-08-16 14:03:05.000000000 +0200
-@@ -548,6 +548,18 @@
- "NOARSCAN    ?= true ;\n",
- "STDHDRS     ?= /boot/develop/headers/posix ;\n",
- "}\n",
-+"else if $(OS) = HAIKU\n",
-+"{\n",
-+"BINDIR      ?= /boot/common/bin ;\n",
-+"CC          ?= gcc ;\n",
-+"C++         ?= $(CC) ;\n",
-+"FORTRAN     ?= \"\" ;\n",
-+"LIBDIR      ?= /boot/common/lib ;\n",
-+"LINK        ?= gcc ;\n",
-+"LINKLIBS    ?= -lnetwork ;\n",
-+"NOARSCAN    ?= true ;\n",
-+"STDHDRS     ?= /boot/develop/headers/posix ;\n",
-+"}\n",
- "else if $(OS) = BEOS\n",
- "{\n",
- "BINDIR      ?= /boot/apps ;\n",
-diff -Naur boost_1_50_0/tools/build/v2/tools/builtin.jam boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam
---- boost_1_50_0/tools/build/v2/tools/builtin.jam	2011-06-06 22:36:21.022020096 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam	2012-08-16 15:57:04.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- 
- .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd
--    openbsd osf qnx qnxnto sgi solaris unix unixware windows 
-+    openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku
-     elf # Not actually an OS -- used for targeting bare metal where
-         # object format is ELF.  This catches both -elf and -eabi gcc
-         # targets and well as other compilers targeting ELF. It is not
-@@ -75,6 +75,7 @@
-             case COHERENT     : host-os = unix    ;
-             case DRAGONFLYBSD : host-os = bsd     ;
-             case IRIX         : host-os = sgi     ;
-+	        case HAIKU	      : host-os = haiku   ;
-             case MACOSX       : host-os = darwin  ;
-             case KFREEBSD     : host-os = freebsd ;
-             case LINUX        : host-os = linux   ;
-diff -Naur boost_1_50_0/tools/build/v2/tools/builtin.py boost_1_50_0-haiku/tools/build/v2/tools/builtin.py
---- boost_1_50_0/tools/build/v2/tools/builtin.py	2012-04-26 05:35:55.022020096 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.py	2012-08-16 15:59:13.000000000 +0200
-@@ -103,6 +103,7 @@
-         elif host_os == 'MACOSX': host_os = 'darwin'
-         elif host_os == 'KFREEBSD': host_os = 'freebsd'
-         elif host_os == 'LINUX': host_os = 'linux'
-+        elif host_os == 'HAIKU': host_os = 'haiku'
-         else: host_os = 'unix'
-     return host_os.lower()
- 
-diff -Naur boost_1_50_0/tools/build/v2/tools/gcc.jam boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam
---- boost_1_50_0/tools/build/v2/tools/gcc.jam	2012-04-26 05:35:55.025165824 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam	2012-08-16 13:40:12.000000000 +0200
-@@ -1050,6 +1050,10 @@
-             case beos :
-             {            
-                 # BeOS has no threading options, so do not set anything here.
-+            }
-+	     case haiku :
-+            {            
-+                option = ;
-             }        
-             case *bsd :
-             {
-@@ -1067,7 +1071,7 @@
-             }
-             case * :
-             {
--                option = -pthread ;
-+                option = -pthreads ;
-                 libs = rt ;
-             }
-         }
-diff -Naur boost_1_50_0/tools/build/v2/tools/gcc.py boost_1_50_0-haiku/tools/build/v2/tools/gcc.py
---- boost_1_50_0/tools/build/v2/tools/gcc.py	2012-04-26 05:35:55.025165824 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.py	2012-08-16 15:06:53.000000000 +0200
-@@ -675,6 +675,9 @@
-     elif host_os_name == 'BeOS':
-         # BeOS has no threading options, don't set anything here.
-         pass
-+    elif host_os_name == 'Haiku':
-+        flags('gcc', 'OPTIONS', ['<threading>multi'], ['-lroot'])
-+        # there is no -lrt on HAIKU
-     elif host_os_name.endswith('BSD'):
-         flags('gcc', 'OPTIONS', ['<threading>multi'], ['-pthread'])
-         # there is no -lrt on BSD
-diff -Naur boost_1_50_0/tools/build/v2/tools/python.jam boost_1_50_0-haiku/tools/build/v2/tools/python.jam
---- boost_1_50_0/tools/build/v2/tools/python.jam	2012-04-26 05:35:55.029097984 +0200
-+++ boost_1_50_0-haiku/tools/build/v2/tools/python.jam	2012-08-16 15:52:51.000000000 +0200
-@@ -648,13 +648,14 @@
-         case qnx* : return ;
-         case darwin : return ;
-         case windows : return ;
-+        case haiku : return ;
- 
-         case hpux : return  <library>rt ;
-         case *bsd : return  <library>pthread <toolset>gcc:<library>util ;
- 
-         case aix : return  <library>pthread <library>dl ;
- 
--        case * : return  <library>pthread <library>dl 
-+        case * : return ;   <library>pthread <library>dl 
-             <toolset>gcc:<library>util <toolset-intel:platform>linux:<library>util ;
-     }
- }

dev-libs/boost/patches/boost-1.55.0.patchset

@@ -1,6 +1,14 @@
-diff -urN boost_1_53_0/boost/config/platform/haiku.hpp boost_1_53_0-haiku/boost/config/platform/haiku.hpp
---- boost_1_53_0/boost/config/platform/haiku.hpp	1969-12-31 16:00:00.000000000 -0800
-+++ boost_1_53_0-haiku/boost/config/platform/haiku.hpp	2013-03-28 00:49:51.271056896 -0700
+From f194ab93c5c29020d5f0f4915b1f554645986587 Mon Sep 17 00:00:00 2001
+From: Scott McCreary <scottmc2@gmail.com>
+Date: Sun, 22 Dec 2013 10:01:12 -0800
+Subject: applying patch boost-1.55.0.patch
+
+
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+new file mode 100644
+index 0000000..1b15c7e
+--- /dev/null
++++ b/boost/config/platform/haiku.hpp
 @@ -0,0 +1,27 @@
 +//  (C) Copyright John Maddock 2001. 
 +//  Use, modification and distribution are subject to the 
@@ -29,9 +37,10 @@ diff -urN boost_1_53_0/boost/config/platform/haiku.hpp boost_1_53_0-haiku/boost/
 +
 +// boilerplate code:
 +#include <boost/config/posix_features.hpp>
-diff -urN boost_1_53_0/boost/config/select_platform_config.hpp boost_1_53_0-haiku/boost/config/select_platform_config.hpp
---- boost_1_53_0/boost/config/select_platform_config.hpp	2011-10-10 04:50:55.036175872 -0700
-+++ boost_1_53_0-haiku/boost/config/select_platform_config.hpp	2013-03-28 00:40:07.746586112 -0700
+diff --git a/boost/config/select_platform_config.hpp b/boost/config/select_platform_config.hpp
+index 2af61d2..5052d85 100644
+--- a/boost/config/select_platform_config.hpp
++++ b/boost/config/select_platform_config.hpp
 @@ -41,6 +41,10 @@
  // win32:
  #  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
@@ -43,22 +52,24 @@ diff -urN boost_1_53_0/boost/config/select_platform_config.hpp boost_1_53_0-haik
  #elif defined(__BEOS__)
  // BeOS
  #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"
-diff -urN boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp
---- boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp	2012-07-15 08:59:05.036700160 -0700
-+++ boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp	2013-03-28 00:40:17.162267136 -0700
-@@ -35,7 +35,8 @@
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+diff --git a/boost/config/stdlib/libstdcpp3.hpp b/boost/config/stdlib/libstdcpp3.hpp
+index 976ab76..66bc96d 100644
+--- a/boost/config/stdlib/libstdcpp3.hpp
++++ b/boost/config/stdlib/libstdcpp3.hpp
+@@ -36,7 +36,8 @@
          || defined(_GLIBCXX__PTHREADS) \
          || defined(_GLIBCXX_HAS_GTHREADS) \
--        || defined(_WIN32)
-+        || defined(_WIN32) \
+         || defined(_WIN32) \
+-        || defined(_AIX)
++        || defined(_AIX) \
 +        || defined(__HAIKU__)
        //
        // If the std lib has thread support turned on, then turn it on in Boost
        // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
-diff -urN boost_1_53_0/boost/thread/detail/platform.hpp boost_1_53_0-haiku/boost/thread/detail/platform.hpp
---- boost_1_53_0/boost/thread/detail/platform.hpp	2012-07-08 22:55:01.064225280 -0700
-+++ boost_1_53_0-haiku/boost/thread/detail/platform.hpp	2013-03-28 00:40:28.586153984 -0700
+diff --git a/boost/thread/detail/platform.hpp b/boost/thread/detail/platform.hpp
+index 1f33b1a..1b8917c 100644
+--- a/boost/thread/detail/platform.hpp
++++ b/boost/thread/detail/platform.hpp
 @@ -34,6 +34,8 @@
  #  define BOOST_THREAD_WIN32
  #elif defined(__BEOS__)
@@ -68,10 +79,11 @@ diff -urN boost_1_53_0/boost/thread/detail/platform.hpp boost_1_53_0-haiku/boost
  #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
  #  define BOOST_THREAD_MACOS
  //#  define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000)
-diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c
---- boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c	2011-06-06 13:36:21.029360128 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c	2013-03-28 00:40:38.863240192 -0700
-@@ -64,7 +64,7 @@
+diff --git a/tools/build/v2/engine/boehm_gc/dyn_load.c b/tools/build/v2/engine/boehm_gc/dyn_load.c
+index 36968ba..e725bdc 100644
+--- a/tools/build/v2/engine/boehm_gc/dyn_load.c
++++ b/tools/build/v2/engine/boehm_gc/dyn_load.c
+@@ -64,7 +64,7 @@ static int (*GC_has_static_roots)(const char *, void *, size_t);
      !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \
      !(defined(FREEBSD) && defined(__ELF__)) && \
      !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
@@ -80,7 +92,7 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-ha
   --> We only know how to find data segments of dynamic libraries for the
   --> above.  Additional SVR4 variants might not be too
   --> hard to add.
-@@ -82,6 +82,10 @@
+@@ -82,6 +82,10 @@ static int (*GC_has_static_roots)(const char *, void *, size_t);
  #   define ELFSIZE ARCH_ELFSIZE
  #endif
  
@@ -91,7 +103,7 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-ha
  #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
      (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
      (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-@@ -216,7 +220,8 @@
+@@ -216,7 +220,8 @@ void GC_register_dynamic_libraries()
  
  #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
      (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
@@ -101,9 +113,23 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-ha
  
  
  #ifdef USE_PROC_FOR_LIBRARIES
-diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h	2011-06-06 13:36:21.031719424 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h	2013-03-28 00:40:49.546045952 -0700
+diff --git a/tools/build/v2/engine/boehm_gc/include/gc.h b/tools/build/v2/engine/boehm_gc/include/gc.h
+index cc95088..590a868 100644
+--- a/tools/build/v2/engine/boehm_gc/include/gc.h
++++ b/tools/build/v2/engine/boehm_gc/include/gc.h
+@@ -494,7 +494,7 @@ GC_API void * GC_malloc_atomic_ignore_off_page(size_t lb);
+ /* of compilers.							*/
+ /* This may also be desirable if it is possible but expensive to	*/
+ /* retrieve the call chain.						*/
+-#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
++#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \
+      || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS)
+ # define GC_ADD_CALLER
+ # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
+diff --git a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
+index 66abf0b..797eddd 100644
+--- a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
++++ b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
 @@ -45,7 +45,8 @@
  			     || defined(GC_AIX_THREADS) \
  			     || defined(GC_LINUX_THREADS) \
@@ -122,21 +148,10 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h
  	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
          defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
          (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \
-diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h
---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h	2011-06-06 13:36:21.031195136 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h	2013-03-28 00:40:57.427556864 -0700
-@@ -494,7 +494,7 @@
- /* of compilers.							*/
- /* This may also be desirable if it is possible but expensive to	*/
- /* retrieve the call chain.						*/
--#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \
-+#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \
-      || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS)
- # define GC_ADD_CALLER
- # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
-diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h	2011-06-06 13:36:21.034078720 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h	2013-03-28 00:41:08.074448896 -0700
+diff --git a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
+index 20f35bc..7e798a7 100644
+--- a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
++++ b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
 @@ -215,6 +215,11 @@
  #    define BEOS
  #    define mach_type_known
@@ -163,10 +178,11 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h
  #   ifdef SOLARIS
  #	define OS_TYPE "SOLARIS"
          extern int _etext[], _end[];
-diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c
---- boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c	2011-06-06 13:36:21.039583744 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c	2013-03-28 00:41:17.561774592 -0700
-@@ -777,6 +777,16 @@
+diff --git a/tools/build/v2/engine/boehm_gc/os_dep.c b/tools/build/v2/engine/boehm_gc/os_dep.c
+index bb8fa08..a7edf72 100644
+--- a/tools/build/v2/engine/boehm_gc/os_dep.c
++++ b/tools/build/v2/engine/boehm_gc/os_dep.c
+@@ -777,6 +777,16 @@ ptr_t GC_get_main_stack_base(void){
  # endif /* BEOS */
  
  
@@ -183,7 +199,7 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haik
  # ifdef OS2
  
  ptr_t GC_get_main_stack_base(void)
-@@ -1095,7 +1105,7 @@
+@@ -1095,7 +1105,7 @@ ptr_t GC_get_main_stack_base(void)
  
  #endif /* FREEBSD_STACKBOTTOM */
  
@@ -192,7 +208,7 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haik
      && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \
      && !defined(CYGWIN32)
  
-@@ -1154,7 +1164,7 @@
+@@ -1154,7 +1164,7 @@ ptr_t GC_get_main_stack_base(void)
  #   endif /* STACKBOTTOM */
  }
  
@@ -201,21 +217,27 @@ diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haik
  
  #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE)
  
-diff -urN boost_1_53_0/tools/build/v2/engine/fileunix.c boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c
---- boost_1_53_0/tools/build/v2/engine/fileunix.c	2012-04-25 20:35:55.046399488 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c	2013-03-28 00:41:26.497549312 -0700
-@@ -81,6 +81,7 @@
+diff --git a/tools/build/v2/engine/fileunix.c b/tools/build/v2/engine/fileunix.c
+index bff3a42..1f60be2 100644
+--- a/tools/build/v2/engine/fileunix.c
++++ b/tools/build/v2/engine/fileunix.c
+@@ -80,7 +80,10 @@ struct ar_hdr  /* archive file member header - printable ascii */
+ };
+ #endif
  
- # if defined( OS_QNX ) || \
-      defined( OS_BEOS ) || \
+-#if defined( OS_QNX ) || defined( OS_BEOS ) || defined( OS_MPEIX )
++# if defined( OS_QNX ) || \
++     defined( OS_BEOS ) || \
 +     defined( OS_HAIKU ) || \
-      defined( OS_MPEIX )
++     defined( OS_MPEIX )
  # define NO_AR
  # define HAVE_AR
-diff -urN boost_1_53_0/tools/build/v2/engine/jam.h boost_1_53_0-haiku/tools/build/v2/engine/jam.h
---- boost_1_53_0/tools/build/v2/engine/jam.h	2012-06-05 21:00:21.048234496 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/jam.h	2013-03-28 00:41:36.127139840 -0700
-@@ -151,6 +151,11 @@
+ #endif
+diff --git a/tools/build/v2/engine/jam.h b/tools/build/v2/engine/jam.h
+index 86ad0e8..7c0bb69 100644
+--- a/tools/build/v2/engine/jam.h
++++ b/tools/build/v2/engine/jam.h
+@@ -125,6 +125,11 @@
      #define OS_BEOS
      #define NO_VFORK
  #endif
@@ -227,10 +249,11 @@ diff -urN boost_1_53_0/tools/build/v2/engine/jam.h boost_1_53_0-haiku/tools/buil
  #ifdef __bsdi__
      #define OSMINOR "OS=BSDI"
      #define OS_BSDI
-diff -urN boost_1_53_0/tools/build/v2/engine/jambase.c boost_1_53_0-haiku/tools/build/v2/engine/jambase.c
---- boost_1_53_0/tools/build/v2/engine/jambase.c	2011-06-06 13:36:21.048496640 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/engine/jambase.c	2013-03-28 00:41:44.670040064 -0700
-@@ -548,6 +548,18 @@
+diff --git a/tools/build/v2/engine/jambase.c b/tools/build/v2/engine/jambase.c
+index b15282b..5a127a1 100644
+--- a/tools/build/v2/engine/jambase.c
++++ b/tools/build/v2/engine/jambase.c
+@@ -548,6 +548,18 @@ char *jambase[] = {
  "NOARSCAN    ?= true ;\n",
  "STDHDRS     ?= /boot/develop/headers/posix ;\n",
  "}\n",
@@ -249,19 +272,20 @@ diff -urN boost_1_53_0/tools/build/v2/engine/jambase.c boost_1_53_0-haiku/tools/
  "else if $(OS) = BEOS\n",
  "{\n",
  "BINDIR      ?= /boot/apps ;\n",
-diff -urN boost_1_53_0/tools/build/v2/tools/builtin.jam boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam
---- boost_1_53_0/tools/build/v2/tools/builtin.jam	2011-06-06 13:36:21.033816576 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam	2013-03-28 00:41:54.663748608 -0700
-@@ -40,7 +40,7 @@
+diff --git a/tools/build/v2/tools/builtin.jam b/tools/build/v2/tools/builtin.jam
+index 176de13..1c3466f 100644
+--- a/tools/build/v2/tools/builtin.jam
++++ b/tools/build/v2/tools/builtin.jam
+@@ -41,7 +41,7 @@ import generate ;
  
  
- .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd
--    openbsd osf qnx qnxnto sgi solaris unix unixware windows 
-+    openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku
-     elf # Not actually an OS -- used for targeting bare metal where
-         # object format is ELF.  This catches both -elf and -eabi gcc
-         # targets and well as other compilers targeting ELF. It is not
-@@ -75,6 +75,7 @@
+ .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf
+-    qnx qnxnto sgi solaris unix unixware windows
++    qnx qnxnto sgi solaris unix unixware windows haiku
+     elf  # Not actually an OS -- used for targeting bare metal where object
+          # format is ELF.  This catches both -elf and -eabi gcc targets and well
+          # as other compilers targeting ELF. It is not clear how often we need
+@@ -76,6 +76,7 @@ local rule default-host-os ( )
              case COHERENT     : host-os = unix    ;
              case DRAGONFLYBSD : host-os = bsd     ;
              case IRIX         : host-os = sgi     ;
@@ -269,10 +293,11 @@ diff -urN boost_1_53_0/tools/build/v2/tools/builtin.jam boost_1_53_0-haiku/tools
              case MACOSX       : host-os = darwin  ;
              case KFREEBSD     : host-os = freebsd ;
              case LINUX        : host-os = linux   ;
-diff -urN boost_1_53_0/tools/build/v2/tools/builtin.py boost_1_53_0-haiku/tools/build/v2/tools/builtin.py
---- boost_1_53_0/tools/build/v2/tools/builtin.py	2012-04-25 20:35:55.034078720 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.py	2013-03-28 00:42:04.759693312 -0700
-@@ -103,6 +103,7 @@
+diff --git a/tools/build/v2/tools/builtin.py b/tools/build/v2/tools/builtin.py
+index 35c1a40..c430fad 100644
+--- a/tools/build/v2/tools/builtin.py
++++ b/tools/build/v2/tools/builtin.py
+@@ -103,6 +103,7 @@ def default_host_os():
          elif host_os == 'MACOSX': host_os = 'darwin'
          elif host_os == 'KFREEBSD': host_os = 'freebsd'
          elif host_os == 'LINUX': host_os = 'linux'
@@ -280,33 +305,28 @@ diff -urN boost_1_53_0/tools/build/v2/tools/builtin.py boost_1_53_0-haiku/tools/
          else: host_os = 'unix'
      return host_os.lower()
  
-diff -urN boost_1_53_0/tools/build/v2/tools/gcc.jam boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam
---- boost_1_53_0/tools/build/v2/tools/gcc.jam	2012-04-25 20:35:55.037224448 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam	2013-03-28 00:42:15.700710912 -0700
-@@ -1050,6 +1050,10 @@
-             case beos :
-             {            
-                 # BeOS has no threading options, so do not set anything here.
-+            }
-+	     case haiku :
-+            {            
-+                option = ;
-             }        
-             case *bsd :
-             {
-@@ -1067,7 +1071,7 @@
-             }
-             case * :
-             {
--                option = -pthread ;
-+                option = -pthreads ;
-                 libs = rt ;
-             }
+diff --git a/tools/build/v2/tools/gcc.jam b/tools/build/v2/tools/gcc.jam
+index ef90f05..2de76cf 100644
+--- a/tools/build/v2/tools/gcc.jam
++++ b/tools/build/v2/tools/gcc.jam
+@@ -1029,10 +1029,11 @@ rule setup-threading ( targets * : sources * : properties * )
+             case cygwin  : option = -mthreads ;
+             case solaris : option = -pthreads ; libs = rt ;
+             case beos    : # No threading options.
++            case haiku   : option = ;
+             case *bsd    : option = -pthread ;  # There is no -lrt on BSD.
+             case sgi     : # gcc on IRIX does not support multi-threading.
+             case darwin  : # No threading options.
+-            case *       : option = -pthread ; libs = rt ;
++            case *       : option = -pthreads ; libs = rt ;
          }
-diff -urN boost_1_53_0/tools/build/v2/tools/gcc.py boost_1_53_0-haiku/tools/build/v2/tools/gcc.py
---- boost_1_53_0/tools/build/v2/tools/gcc.py	2012-04-25 20:35:55.037224448 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.py	2013-03-28 00:42:26.814219264 -0700
-@@ -675,6 +675,9 @@
+ 
+         if $(option)
+diff --git a/tools/build/v2/tools/gcc.py b/tools/build/v2/tools/gcc.py
+index c2f3b02..4f60d22 100644
+--- a/tools/build/v2/tools/gcc.py
++++ b/tools/build/v2/tools/gcc.py
+@@ -677,6 +677,9 @@ elif bjam.variable('UNIX'):
      elif host_os_name == 'BeOS':
          # BeOS has no threading options, don't set anything here.
          pass
@@ -316,10 +336,11 @@ diff -urN boost_1_53_0/tools/build/v2/tools/gcc.py boost_1_53_0-haiku/tools/buil
      elif host_os_name.endswith('BSD'):
          flags('gcc', 'OPTIONS', ['<threading>multi'], ['-pthread'])
          # there is no -lrt on BSD
-diff -urN boost_1_53_0/tools/build/v2/tools/python.jam boost_1_53_0-haiku/tools/build/v2/tools/python.jam
---- boost_1_53_0/tools/build/v2/tools/python.jam	2012-04-25 20:35:55.041156608 -0700
-+++ boost_1_53_0-haiku/tools/build/v2/tools/python.jam	2013-03-28 00:42:37.560463872 -0700
-@@ -648,13 +648,14 @@
+diff --git a/tools/build/v2/tools/python.jam b/tools/build/v2/tools/python.jam
+index d48bb78..070f5d2 100644
+--- a/tools/build/v2/tools/python.jam
++++ b/tools/build/v2/tools/python.jam
+@@ -639,13 +639,14 @@ local rule system-library-dependencies ( target-os )
          case qnx* : return ;
          case darwin : return ;
          case windows : return ;
@@ -330,8 +351,53 @@ diff -urN boost_1_53_0/tools/build/v2/tools/python.jam boost_1_53_0-haiku/tools/
  
          case aix : return  <library>pthread <library>dl ;
  
--        case * : return  <library>pthread <library>dl 
-+        case * : return ;   <library>pthread <library>dl 
+-        case * : return  <library>pthread <library>dl
++        case * : return ;   <library>pthread <library>dl
              <toolset>gcc:<library>util <toolset-intel:platform>linux:<library>util ;
      }
  }
+-- 
+1.8.3.4
+
+
+From 0d11043b05a45a1bc8091387ba45f1fe41fe2e55 Mon Sep 17 00:00:00 2001
+From: Scott McCreary <scottmc2@gmail.com>
+Date: Sun, 22 Dec 2013 10:01:23 -0800
+Subject: applying patch type_traits.patch
+
+
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+index 1b15c7e..9a3becd 100644
+--- a/boost/config/platform/haiku.hpp
++++ b/boost/config/platform/haiku.hpp
+@@ -9,18 +9,26 @@
+ 
+ #define BOOST_PLATFORM "Haiku"
+ 
+-#define BOOST_NO_INTRINSIC_WCHAR_T
+ #define BOOST_HAS_UNISTD_H
++#define GLIBC_HAVE_LONG_LONG
++#define BOOST_HAS_STDINT_H
++#define BOOST_HASH_NO_EXTENSIONS
+ 	
+ #define BOOST_HAS_BETHREADS
+ 	
+ #ifndef BOOST_DISABLE_THREADS
+ #   define BOOST_HAS_THREADS
+ #endif
++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
++#define BOOST_NO_CXX11_STATIC_ASSERT
++#define BOOST_NO_CXX11_VARIADIC_MACROS
+ 
+ //
+ // thread API's not auto detected:
+ //
++#define BOOST_HAS_SCHED_YIELD
++#define BOOST_HAS_PTHREAD_YIELD
+ #define BOOST_HAS_GETTIMEOFDAY
+ 
+ // boilerplate code:
+-- 
+1.8.3.4
+

dev-libs/boost/patches/type_traits.patch

@@ -0,0 +1,35 @@
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+index 1b15c7e..9a3becd 100644
+--- a/boost/config/platform/haiku.hpp
++++ b/boost/config/platform/haiku.hpp
+@@ -9,18 +9,29 @@
+ 
+ #define BOOST_PLATFORM "Haiku"
+ 
+-#define BOOST_NO_INTRINSIC_WCHAR_T
++//#define BOOST_NO_INTRINSIC_WCHAR_T
+ #define BOOST_HAS_UNISTD_H
++#define BOOST_NO_AUTO_PTR
++#define GLIBC_HAVE_LONG_LONG
++#define BOOST_HAS_STDINT_H
++//#define BOOST_NOT_STD_WSTRING
++#define BOOST_HASH_NO_EXTENSIONS
+ 	
+ #define BOOST_HAS_BETHREADS
+ 	
+ #ifndef BOOST_DISABLE_THREADS
+ #   define BOOST_HAS_THREADS
+ #endif
++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
++#define BOOST_NO_CXX11_STATIC_ASSERT
++#define BOOST_NO_CXX11_VARIADIC_MACROS
+ 
+ //
+ // thread API's not auto detected:
+ //
++#define BOOST_HAS_SCHED_YIELD
++#define BOOST_HAS_PTHREAD_YIELD
+ #define BOOST_HAS_GETTIMEOFDAY
+ 
+ // boilerplate code:

dev-libs/cyassl/cyassl-2.8.0.recipe

@@ -0,0 +1,62 @@
+SUMMARY="CyaSSL embedded SSL implementation" 
+DESCRIPTION="lightweight yet fully functional embedded SSL implementation" 
+HOMEPAGE="http://yassl.com" 
+SRC_URI="http://yassl.com/cyassl-2.8.0.zip"
+REVISION="1"
+CHECKSUM_MD5="7465d4815af90eff01095fa1b031ce09"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	cyassl$secondaryArchSuffix = $portVersion
+	lib:libcyassl$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:dos2unix
+	"
+
+
+DEPEND="app-text/dos2unix >= 1.0"
+BUILD()
+{
+	dos2unix *
+	dos2unix include/*
+	dos2unix ctaocrypt/include/*
+	dos2unix ctaocrypt/src/*
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	chmod 755 configure
+	automake
+	runConfigure ./configure --enable-shared
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+	cd testsuite
+	testsuite
+}

dev-libs/fribidi/fribidi-0.19.5.recipe

@@ -11,19 +11,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc
 	1999,2000 Dov Grobgeld"
 
 ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	fribidi = $portVersion
-	cmd:fribidi = 0.19.5 compat >= 0.19
-	lib:libfribidi = 0.3.4 compat >= 0
+	fribidi$secondaryArchSuffix = $portVersion
+	cmd:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19
+	lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0
 	"
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -32,13 +36,14 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
+
 PATCH()
 {
 	sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac
 	sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac
 	sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac
-
 }
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -70,10 +75,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	fribidi_devel = $portVersion
-	devel:libfribidi = 0.3.4 compat >= 0
-	devel:fribidi = 0.19.5 compat >= 0.19
+	fribidi${secondaryArchSuffix}_devel = $portVersion
+	devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0
+	devel:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19
 	"
+
 REQUIRES_devel="
-	fribidi == $portVersion base
+	fribidi$secondaryArchSuffix == $portVersion base
 	"

dev-libs/gmp/gmp-5.1.1.recipe

@@ -22,8 +22,6 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 
-SOURE_DIR="$portVersionedName"
-
 BUILD()
 {
 	libtoolize --force --copy --install

dev-libs/gnulib/gnulib-2013_12_17.recipe

@@ -0,0 +1,47 @@
+DESCRIPTION="Gnulib is a source code library that provides basic functionality to programs and libraries.
+Many software packages make use of Gnulib to avoid reinventing the portability wheel.
+Gnulib is intended to be the canonical source for most of the important “portability” and/or common files for software projects.
+These are files intended to be shared at the source level; Gnulib is not a typical library meant to be installed and linked against. Thus, unlike most projects, Gnulib does not normally generate a source tarball distribution; instead, developers grab modules directly from the source repository."
+SUMMARY="Gnulib is a library of common routines intended to be shared at the source level"
+HOMEPAGE="http://www.gnu.org/software/gnulib" 
+SRC_URI="git+git://git.savannah.gnu.org/gnulib.git"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="GNULIB"
+COPYRIGHT="1985-2013 Free Software Foundation."
+
+PROVIDES="
+	gnulib = $portVersion
+	cmd:gnulib_tool$secondaryArchSuffix = $portVersion
+	"
+	
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="" # No build, no requirements
+	
+BUILD_PREREQUIRES="" # No build, no requirements
+
+BUILD()
+{
+	# Nothing to build
+	exit 0
+}
+
+INSTALL()
+{
+	# Try to install gnulib-tool
+	
+	mkdir -p $dataDir/gnulib $binDir
+	
+	cp gnulib-tool $dataDir/gnulib/gnulib_tool # Fix binary name in help
+	cp -R check-copyright check-module posix-modules build-aux config doc lib m4 modules tests top $dataDir/gnulib
+	ln -s $dataDir/gnulib/gnulib_tool $binDir/gnulib_tool
+}
+
+TEST()
+{
+	make check
+}

dev-libs/gnulib/gnulib-9999.recipe

@@ -1,24 +0,0 @@
-DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level" 
-HOMEPAGE="http://www.gnu.org/software/gnulib" 
-SRC_URI="git+git://git.savannah.gnu.org/gnulib.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	echo "gnulib isn't meant to be built."
-}
-
-INSTALL()
-{
-	echo "gnulib isn't meant to be installed."
-}
-
-TEST()
-{
-	make check
-}
-
-LICENSE="GNULIB"
-COPYRIGHT="1985-2011 Free Software Foundation."

dev-libs/libcss/libcss-0.2.0_git.recipe

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

dev-libs/libevent/libevent-1.4.14b.recipe

@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-SOURCE_DIR="$portVersionedName-stable"
+SOURCE_DIR="libevent-${portVersion}-stable"
 
 PATCHES="libevent-1.4.14b.patch"
 

dev-libs/libevent/libevent-2.0.21.recipe

@@ -7,33 +7,33 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
 
-REVISION="1"
+REVISION="4"
 
 ARCHITECTURES="x86_gcc2 x86"
-
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	cmd:event_rpcgen.py
-	lib:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5
+	libevent${secondaryArchSuffix} = ${portVersion}
+	cmd:event_rpcgen.py$secondaryArchSuffix
 	lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5
+	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
-	lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5
+	lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
-	lib:libnetwork >= $haikuVersion
+	cmd:python
 	"
+#	haiku${secondaryArchSuffix} doesn't define included libraries yet
+#	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
 BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
@@ -49,8 +49,9 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
+	cmd:python
 	"
-SOURCE_DIR="$portVersionedName-stable"
+SOURCE_DIR="libevent-${portVersion}-stable"
 
 PATCHES="libevent-2.0.21.patch"
 
@@ -77,10 +78,11 @@ INSTALL()
 		libevent_pthreads \
 		libevent_openssl
 
-	mv .libs/libevent_core.* \
-		.libs/libevent_extra.* \
-		.libs/libevent_pthreads.* \
-		.libs/libevent_openssl.* \
+	cp .libs/libevent-*.so* \
+		.libs/libevent_core-*.so* \
+		.libs/libevent_extra-*.so* \
+		.libs/libevent_pthreads-*.so* \
+		.libs/libevent_openssl-*.so* \
 		$developLibDir
 	fixPkgconfig
 
@@ -99,8 +101,8 @@ PROVIDES_devel="
 	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
-	devel:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5
 	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5	
@@ -112,7 +114,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	libevent$secondaryArchSuffix  == $portVersion base
+	libevent$secondaryArchSuffix == $portVersion base
 	devel:libssl
 	devel:libcrypto
 	"

dev-libs/libidn/libidn-1.9.recipe

@@ -0,0 +1,100 @@
+SUMMARY="libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications."
+DESCRIPTION="GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and decode internationalized domain names."
+
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="http://ftpmirror.gnu.org/libidn/libidn-1.9.tar.gz"
+CHECKSUM_MD5="f4d794639564256a367566302611224e"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+REVISION="1"
+
+LICENSE="
+	GNU GPL v3
+	GNU LGPL v2.1
+	"
+COPYRIGHT="
+	2004-2008 Simon Josefsson
+	1998, 1999 Tom Tromey
+	2001 Red Hat Software
+	1994-2007 Free Software Foundation
+	"
+	
+PROVIDES="
+	libidn = $portVersion
+	lib:libidn$secondaryArchSuffix = $portVersion
+	cmd:idn$secondaryArchSuffix = $portVersion
+	"
+	
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	gettext${secondaryArchSuffix}_libintl
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:gnulib_tool$secondaryArchSuffix
+	cmd:gperf
+	cmd:help2man$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:makeinfo
+	"
+	
+PATCHES="libidn-1.9.patch"
+
+BUILD()
+{
+	gnulib_tool --import --local-dir=gl/override --source-base=gl \
+	--m4-base=gl/m4 --libtool --no-vc-files \
+	csharpcomp-script error fdl gendocs getopt gnupload gpl-3.0 lgpl-2.1 \
+	maintainer-makefile progname version-etc
+	
+	gnulib_tool --import --local-dir=lib/gl/override --source-base=lib/gl \
+	--m4-base=lib/gl/m4 --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files \
+	gettext-h stdint striconv strverscmp
+	
+	libtoolize --force --copy --install
+	
+	# Libtoolize is going to ask us to add 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 -I gl/m4 -I lib/gl/m4
+	autoconf
+	automake --add-missing
+	
+	runConfigure ./configure --enable-shared
+	make
+}
+
+INSTALL()
+{
+	make install
+	
+	prepareInstalledDevelLib libidn
+	fixPkgconfig
+	
+	packageEntries devel \
+		$developDir \
+		$documentationDir
+}
+
+# ------ devel package ------------------------------------------------------
+
+PROVIDES_devel="
+	libidn${secondaryArchSuffix}_devel = $portVersion
+	devel:libidn$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libidn$secondaryArchSuffix == $portVersion base
+	"

dev-libs/libidn/patches/libidn-1.9.patch

@@ -0,0 +1,11 @@
+diff -ur libidn-1.9-orig/configure.ac libidn-1.9/configure.ac
+--- libidn-1.9-orig/configure.ac	2013-12-24 15:51:24.035913728 +0000
++++ libidn-1.9/configure.ac	2013-12-24 16:39:55.968622080 +0000
+@@ -28,6 +28,7 @@
+ AC_SUBST(LT_REVISION, 38)
+ AC_SUBST(LT_AGE, 5)
+ 
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AM_INIT_AUTOMAKE([1.10])
+ AB_INIT

dev-libs/libparserutils/libparserutils-0.1.2_git.recipe

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

dev-libs/libpcre/libpcre-8.21.recipe

@@ -13,7 +13,7 @@ COPYRIGHT="
 	1997-2011 University of Cambridge
 	2007-2011, Google Inc. All rights reserved.
 	"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2"
+SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2"
 CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"

dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe

@@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe

@@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe

@@ -27,7 +27,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {

dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe

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

dev-libs/libxslt/libxslt-1.1.28.recipe

@@ -5,8 +5,8 @@ COPYRIGHT="2001-2002 Daniel Veillard.  All Rights Reserved."
 SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz"
 CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	libxslt$secondaryArchSuffix = $portVersion

dev-libs/libzip/libzip-0.10.1.recipe

@@ -1,24 +1,75 @@
+SUMMARY="A C library for reading, creating, and modifying zip archives."
 DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." 
 HOMEPAGE="http://www.nih.at/libzip/" 
 SRC_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2"
 CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libzip${secondaryArchSuffix} = $portVersion
+	lib:libzip${secondaryArchSuffix} = $portVersion
+	cmd:zipcmp${secondaryArchSuffix}
+	cmd:zipmerge${secondaryArchSuffix}
+	cmd:ziptorrent${secondaryArchSuffix}
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	cd libzip-0.10.1
-	sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt
 	sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt
-	cmake .
-	make
+
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libzip-0.10.1
 	make install
+
+	# clean up includes
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir/
+	rm -rf $prefix/include
+
+	# clean up man pages
+	mkdir -p $manDir
+	mv $prefix/man/* $manDir/
+	rm -rf $prefix/man
+
+    prepareInstalledDevelLibs \
+        libzip \
+
+    fixPkgconfig
+
+    # devel package
+    packageEntries devel \
+        $developDir
 }
 
+PROVIDES_devel="
+	libzip${secondaryArchSuffix}_devel = $portVersion
+	devel:libzip$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libzip$secondaryArchSuffix == $portVersion base
+	"
+
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"

dev-libs/libzip/libzip-0.11.2.recipe

@@ -0,0 +1,75 @@
+SUMMARY="A C library for reading, creating, and modifying zip archives."
+DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." 
+HOMEPAGE="http://www.nih.at/libzip/" 
+SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz"
+CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libzip${secondaryArchSuffix} = $portVersion
+	lib:libzip${secondaryArchSuffix} = $portVersion
+	cmd:zipcmp${secondaryArchSuffix}
+	cmd:zipmerge${secondaryArchSuffix}
+	cmd:ziptorrent${secondaryArchSuffix}
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	sed -i 's/LN = ln/LN = cp/' man/Makefile.in
+
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+#	# clean up includes
+#	mkdir -p $includeDir
+#	mv $prefix/include/* $includeDir/
+#	rm -rf $prefix/include
+#
+#	# clean up man pages
+#	mkdir -p $manDir
+#	mv $prefix/man/* $manDir/
+#	rm -rf $prefix/man
+
+    prepareInstalledDevelLibs \
+        libzip \
+
+    fixPkgconfig
+
+    # devel package
+    packageEntries devel \
+        $developDir
+}
+
+PROVIDES_devel="
+	libzip${secondaryArchSuffix}_devel = $portVersion
+	devel:libzip$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libzip$secondaryArchSuffix == $portVersion base
+	"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"

dev-libs/openssl/openssl-1.0.0d.recipe

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

dev-perl/xml_parser/xml_parser-2.36.recipe

@@ -1,25 +1,42 @@
-#dev-perl/XML-Parser
+SUMMARY="XML-Parser - A perl module for parsing XML documents"
 DESCRIPTION="XML-Parser - A perl module for parsing XML documents"
 HOMEPAGE="http://search.cpan.org/~msergeant/XML-Parser-2.36/"
 SRC_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz"
 REVISION="1"
-# only tested on gcc4
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded"
+COPYRIGHT="1998-2000 Larry Wall and Clark Cooper. All rights reserved."
+LICENSE="Artistic (Perl)"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	xml_parser = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libexpat
+	perl
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libexpat
+	cmd:gcc
+	cmd:make
+	cmd:perl"
+
+SOURCE_DIR="XML-Parser-2.36"
 
 # TODO: Remove hardcoded paths. The following shows how to get the the file path:
 #find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h
 
 BUILD()
 {
-	cd XML-Parser-2.36
-	perl Makefile.PL
+	perl Makefile.PL PREFIX=$prefix
 	make
 }
 
 INSTALL()
 {
-	cd XML-Parser-2.36
 	make install DESTDIR="${DESTDIR}"
 }

dev-python/docutils/docutils-0.11.recipe

@@ -17,7 +17,6 @@ LICENSE="Public Domain
 	Python"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	docutils = $portVersion

dev-python/dulwich/dulwich-0.9.1.recipe

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

dev-python/ordereddict/ordereddict-1.1.recipe

@@ -13,7 +13,6 @@ LICENSE="MIT"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	ordereddict = $portVersion

dev-scheme/chicken/chicken-4.8.0.5.recipe

@@ -8,7 +8,6 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2008-2013 The Chicken Team
 		2000-2007 Felix L. Winkelmann"
 
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
 PROVIDES="

dev-util/cmake/cmake-2.8.5.recipe

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

dev-util/cscope/cscope-15.7a.recipe

@@ -18,7 +18,6 @@ ARCHITECTURES="x86 x86_gcc2"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1998-2000 The Santa Cruz Operation"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCHES="cscope-15.7a.patch"
 

dev-util/ctags/ctags-5.8.recipe

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

dev-util/fastdep/fastdep-0.16.recipe

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

dev-util/global/global-6.2.9.recipe

@@ -17,7 +17,6 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="2000-2013 Tama Communications Corporation
 		2007-2013 Free Software Foundation, Inc."
 
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PATCHES="global-6.2.9.patch"

dev-util/idutils/idutils-4.6.recipe

@@ -19,7 +19,6 @@ CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd"
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1986-2012 Free Software Foundation, Inc."
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PATCHES="idutils-4.6.patchset"

dev-util/intltool/intltool-0.40.6.recipe

@@ -1,25 +1,66 @@
-DESCRIPTION="intltool" 
-HOMEPAGE="http://www.gnome.org/" 
+SUMMARY="intltool is a set of tools to centralize translation of file formats."
+DESCRIPTION="intltool is a set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files.
+
+The intltool collection can be used to do these things:
+
+* Extract translatable strings from various source files (.xml.in,
+glade, .desktop.in, .server.in, .oaf.in).
+
+* Collect the extracted strings together with messages from traditional
+source files (.c, .h) in po/PACKAGE.pot.
+
+* Merge back the translations from .po files into .xml, .desktop and
+oaf files. This merge step will happen at build resp. installation time."
+
+HOMEPAGE="http://freedesktop.org/wiki/Software/intltool"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
 CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631"
-REVISION="2"
-STATUS_HAIKU="stable"
-MESSAGE="Requires XML::Parser perl module installed"
-DEPEND=""
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."
+
+REVISION="3"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	intltool = $portVersion
+	cmd:intltool_extract$secondaryArchSuffix = $portVersion
+	cmd:intltool_merge$secondaryArchSuffix = $portVersion
+	cmd:intltool_prepare$secondaryArchSuffix = $portVersion
+	cmd:intltool_update$secondaryArchSuffix = $portVersion
+	cmd:intltoolize$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:perl
+	xml_parser
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	xml_parser
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:autoconf
+	"
+
 BUILD()
 {
-	cd intltool-0.40.6
-	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
-	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
-	--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd intltool-0.40.6
 	make install
+}
+
+TEST ()
+{
 	make check
 }
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."

dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe

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

dev-util/patchutils/patchutils-0.3.3.recipe

@@ -28,7 +28,6 @@ CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 Tim Waugh"
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="

dev-util/ragel/patches/ragel-6.8.patch

@@ -0,0 +1,23 @@
+diff -ur ragel-6.8/ragel/common.h ragel-6.8-haiku/ragel/common.h
+--- ragel-6.8/ragel/common.h	2013-02-11 01:57:45.020971520 +0000
++++ ragel-6.8-haiku/ragel/common.h	2013-12-30 19:13:12.330301440 +0000
+@@ -24,6 +24,7 @@
+ 
+ #include <fstream>
+ #include <climits>
++#include <cstdio>
+ #include "dlist.h"
+ 
+ /* Location in an input file. */
+diff -ur ragel-6.8/ragel/mlcodegen.cpp ragel-6.8-haiku/ragel/mlcodegen.cpp
+--- ragel-6.8/ragel/mlcodegen.cpp	2013-02-11 01:57:45.022282240 +0000
++++ ragel-6.8-haiku/ragel/mlcodegen.cpp	2013-12-30 19:18:36.937426944 +0000
+@@ -514,7 +514,7 @@
+   {
+     data_prefix = string(fsmName) + "_";
+     if (data_prefix.size() > 0)
+-      data_prefix[0] = ::tolower(data_prefix[0]); // uncapitalize
++      data_prefix[0] = tolower(data_prefix[0]); // uncapitalize
+   }
+ 	if ( !noPrefix )
+ 		return data_prefix;

dev-util/ragel/ragel-6.8.recipe

@@ -0,0 +1,53 @@
+SUMMARY="Ragel compiles executable finite state machines from regular languages"
+DESCRIPTION="
+Ragel compiles executable finite state machines from regular languages.
+
+Ragel targets C, C++, Objective-C, C#, D, Java, Ruby, OCaml and Go.
+
+Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language.
+Code embedding is done using inline operators that do not disrupt the regular language syntax."
+
+HOMEPAGE="http://www.complang.org/ragel"
+SRC_URI="http://www.complang.org/ragel/ragel-6.8.tar.gz"
+CHECKSUM_MD5="1bb39745ac23da449019f9f2cb4b0d01"
+
+REVISION="1"
+
+LICENSE="GNU GPL v1"
+COPYRIGHT="
+	2001-2009 Adrian Thurston <thurston@complang.org>
+	2007 Victor Hugo Borja <vic@rubyforge.org>
+	2011 Josef Goettgens
+	"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	ragel$secondaryArchSuffix = $portVersion
+	cmd:ragel$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+	
+PATCHES="ragel-6.8.patch"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}

dev-vcs/cvs/cvs-1.12.13.1.recipe

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

dev-vcs/git/git-1.7.10.2.recipe

@@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
 CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
-SOURCE_DIR="$portVersionedName"
 PATCHES="git-1.7.10.2.patch"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz"

dev-vcs/git/git-1.8.3.4.recipe

@@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz"
 CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e"
-SOURCE_DIR="$portVersionedName"
 PATCHES="git-1.8.3.4.patchset"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz"

dev-vcs/mercurial/mercurial-2.2.2.recipe

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

dev-vcs/subversion/subversion-1.6.15.recipe

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

dev-vcs/subversion/subversion-1.6.18.recipe

@@ -80,7 +80,6 @@ USER_SETTINGS_FILES="
 	settings/subversion directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {

games-emulation/visualboyadvance/patches/Makefile.am.patch

@@ -0,0 +1,91 @@
+diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am
+index bcc9f92..ba6db7a 100644
+--- a/src/sdl/Makefile.am
++++ b/src/sdl/Makefile.am
+@@ -1,7 +1,5 @@
+ bin_PROGRAMS = VisualBoyAdvance
+ 
+-noinst_PROGRAMS = TestEmu
+-
+ VisualBoyAdvance_SOURCES = \
+ 	SDL.cpp			\
+ 	debugger.cpp		\
+@@ -79,78 +77,6 @@ VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@
+ 
+ VisualBoyAdvance_DEPENDENCIES = @VBA_LIBS@
+ 
+-TestEmu_SOURCES = \
+-	TestEmu.cpp		\
+-	debugger.cpp		\
+-	debugger.h		\
+-	../2xSaI.cpp		\
+-	../AutoBuild.h		\
+-	../Cheats.cpp		\
+-	../Cheats.h		\
+-	../EEprom.cpp		\
+-	../EEprom.h		\
+-	../Flash.cpp		\
+-	../Flash.h		\
+-	../GBA.cpp		\
+-	../GBA.h		\
+-	../GBAinline.h		\
+-	../Gfx.cpp		\
+-	../Gfx.h		\
+-	../Globals.cpp		\
+-	../Globals.h		\
+-	../Mode0.cpp		\
+-	../Mode1.cpp		\
+-	../Mode2.cpp		\
+-	../Mode3.cpp		\
+-	../Mode4.cpp		\
+-	../Mode5.cpp		\
+-	../NLS.h		\
+-	../Port.h		\
+-	../RTC.cpp		\
+-	../RTC.h		\
+-	../Sound.cpp		\
+-	../Sound.h		\
+-	../Sram.cpp		\
+-	../Sram.h		\
+-	../System.h		\
+-	../Text.cpp		\
+-	../Text.h		\
+-	../Util.cpp		\
+-	../Util.h		\
+-	../admame.cpp		\
+-	../agbprint.cpp		\
+-	../agbprint.h		\
+-	../arm-new.h		\
+-	../armdis.cpp		\
+-	../armdis.h		\
+-	../bios.cpp		\
+-	../bios.h		\
+-	../elf.cpp		\
+-	../elf.h		\
+-	../expr-lex.cpp		\
+-	../expr.cpp		\
+-	../expr.cpp.h		\
+-	../exprNode.cpp		\
+-	../exprNode.h		\
+-	../hq2x.cpp		\
+-	../hq2x.h		\
+-	../interp.h		\
+-	../lq2x.h		\
+-	../memgzio.c		\
+-	../memgzio.h		\
+-	../motionblur.cpp	\
+-	../pixel.cpp		\
+-	../remote.cpp		\
+-	../scanline.cpp		\
+-	../simple2x.cpp		\
+-	../thumb.h		\
+-	../unzip.cpp		\
+-	../unzip.h
+-
+-TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@
+-
+-TestEmu_DEPENDENCIES = @VBA_LIBS@
+-
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src		\
+ 	-DSDL				\