diff --git a/app-cdr/bchunk/bchunk-1.2.0.recipe b/app-cdr/bchunk/bchunk-1.2.0.recipe
index 0972e100f..a3765ed2f 100644
--- a/app-cdr/bchunk/bchunk-1.2.0.recipe
+++ b/app-cdr/bchunk/bchunk-1.2.0.recipe
@@ -10,9 +10,9 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2004 Heikki Hannikainen"
 HOMEPAGE="http://he.fi/bchunk/"
 SRC_URI="http://he.fi/bchunk/bchunk-1.2.0.tar.gz"
-REVISION="1"
+REVISION="2"
 CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	bchunk = $portVersion
diff --git a/app-emulation/aranym/aranym-0.9.11_cvs.recipe b/app-emulation/aranym/aranym-0.9.11_cvs.recipe
deleted file mode 100644
index b1900a133..000000000
--- a/app-emulation/aranym/aranym-0.9.11_cvs.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for running Atari ST/TT/Falcon operating systems and applications."
-HOMEPAGE="http://aranym.org/"
-SRC_URI="cvs://:pserver:anoncvs@cvs.aranym.org:/var/repos/aranym"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-libs/libcdio >= 0.82
-		media-libs/libsdl >= 1.2.10"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd aranym
-	./autogen.sh --help >/dev/null
-	./configure --prefix=/boot/apps/ARAnyM
-	make
-}
-
-INSTALL()
-{
-	cd aranym
-	make install
-}
-
-COPYRIGHT="2001-2010 ARAnyM developer team"
-LICENSE="GNU GPL v2"
diff --git a/app-emulation/aranym/aranym-0.9.15_git.recipe b/app-emulation/aranym/aranym-0.9.15_git.recipe
new file mode 100644
index 000000000..96c7b5286
--- /dev/null
+++ b/app-emulation/aranym/aranym-0.9.15_git.recipe
@@ -0,0 +1,52 @@
+SUMMARY="ARAnyM (Atari Running on Any Machine)"
+DESCRIPTION="ARAnyM (Atari Running on Any Machine)
+	is a multiplatform virtual machine for running
+	Atari ST/TT/Falcon operating systems and applications."
+HOMEPAGE="http://aranym.org/"
+SRC_URI="git://git.code.sf.net/p/aranym/code"
+REVISION="1"
+#CHECKSUM_MD5=""
+COPYRIGHT="2001-2010 ARAnyM developer team"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+SOURCE_DIR="code"
+
+PROVIDES="
+	aranym = $portVersion
+	app:aranym = $portVersion
+	cmd:aranym = $portVersion
+	"
+REQUIRES="
+	haiku
+	libsdl
+	lib:libsdl_image_1.2
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl_1.2 >= 0.10
+	devel:libSDL_image_1.2 >= 0.8.4
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	cmd:sdl_config
+	"
+
+BUILD()
+{
+	./autogen.sh --help >/dev/null
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+	mimeset $prefix/bin/aranym
+	addAppDeskbarSymlink /bin/aranym ARAnyM
+}
+
diff --git a/app-emulation/oricutron/oricutron-0.9_svn.recipe b/app-emulation/oricutron/oricutron-0.9_svn.recipe
deleted file mode 100644
index ca7088f5b..000000000
--- a/app-emulation/oricutron/oricutron-0.9_svn.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Oricutron is an emulator for the Oric series of computers."
-HOMEPAGE="http://code.google.com/p/oriculator/"
-SRC_URI="svn://http://oriculator.googlecode.com/svn/trunk"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="media-libs/libsdl >= 1.2.10"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd trunk
-	make
-}
-
-INSTALL()
-{
-	cd trunk
-	make install
-}
-
-COPYRIGHT="2009-2012 Peter Gordon"
-LICENSE="GNU GPL v2"
diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe
new file mode 100644
index 000000000..b029ea0d5
--- /dev/null
+++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Oricutron is an emulator for the Oric series of computers."
+DESCRIPTION="Oricutron is an emulator for the Oric series of computers."
+HOMEPAGE="http://code.google.com/p/oriculator/"
+SRC_URI="svn+http://oriculator.googlecode.com/svn/trunk"
+REVISION="1"
+DEPEND="media-libs/libsdl >= 1.2.10"
+#CHECKSUM_MD5=""
+COPYRIGHT="2009-2012 Peter Gordon"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+SOURCE_DIR="trunk"
+
+PROVIDES="
+	oricutron = $portVersion
+	app:oricutron = $portVersion
+	cmd:oricutron = $portVersion
+	"
+REQUIRES="
+	haiku
+	libsdl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl_1.2 >= 0.10
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:sdl_config
+	"
+#FIXME: Makefile uses svnversion to get the revision...
+#	subversion >= 1.6.18
+#	cmd:svnversion >= 1.6.18
+
+BUILD()
+{
+	make INSTALLDIR=$prefix/apps/Oricutron
+}
+
+INSTALL()
+{
+	make install INSTALLDIR=$prefix/apps/Oricutron
+	mimeset $prefix/apps/Oricutron/oricutron
+	#addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron
+}
+
diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe
new file mode 100644
index 000000000..76af17379
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.7.0.recipe
@@ -0,0 +1,86 @@
+SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer."
+HOMEPAGE="http://wiki.qemu.org/"
+SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
+COPYRIGHT="2003-2008 Fabrice Bellard"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86"
+
+PROVIDES="
+	qemu = $portVersion
+	cmd:qemu = $portVersion
+	cmd:qemu_img = $portVersion
+	cmd:qemu_io = $portVersion
+	cmd:qemu_system_alpha = $portVersion
+	cmd:qemu_system_arm = $portVersion
+	cmd:qemu_system_cris = $portVersion
+	cmd:qemu_system_i386 = $portVersion
+	cmd:qemu_system_lm32 = $portVersion
+	cmd:qemu_system_m68k = $portVersion
+	cmd:qemu_system_microblaze = $portVersion
+	cmd:qemu_system_microblazeel = $portVersion
+	cmd:qemu_system_mips = $portVersion
+	cmd:qemu_system_mips64 = $portVersion
+	cmd:qemu_system_mips64el = $portVersion
+	cmd:qemu_system_mipsel = $portVersion
+	cmd:qemu_system_moxie = $portVersion
+	cmd:qemu_system_or32 = $portVersion
+	cmd:qemu_system_ppc = $portVersion
+	cmd:qemu_system_ppc64 = $portVersion
+	cmd:qemu_system_ppcemb = $portVersion
+	cmd:qemu_system_s390x = $portVersion
+	cmd:qemu_system_sh4 = $portVersion
+	cmd:qemu_system_sh4eb = $portVersion
+	cmd:qemu_system_sparc = $portVersion
+	cmd:qemu_system_sparc64 = $portVersion
+	cmd:qemu_system_unicore32 = $portVersion
+	cmd:qemu_system_x86_64 = $portVersion
+	cmd:qemu_system_xtensa = $portVersion
+	cmd:qemu_system_xtensaeb = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	lib:libintl
+	glib2 >= 2.12
+	pixman
+	"
+
+BUILD_REQUIRES="
+	devel:libz
+	devel:libfdt
+	glib2_devel >= 2.12
+	pixman_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:pkg_config
+	cmd:pod2man
+	cmd:python
+	"
+
+BUILD()
+{
+	chmod +x configure
+	./configure --prefix=$prefix --mandir=$manDir --datadir=$dataDir/qemu \
+		--docdir=$docDir --bindir=$binDir --libdir=$libDir \
+		--sysconfdir=$settingsDir/qemu
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# provide convenience symlink to just "qemu"
+	ln -s qemu-system-i386 $binDir/qemu
+
+	# remove empty target config file
+	rm $settingsDir/qemu/target-x86_64.conf
+}
diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe
index d79dff6f6..9a9a2b1c7 100644
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -1,32 +1,63 @@
+SUMMARY="The friendly interactive shell" 
 DESCRIPTION="The friendly interactive shell" 
 HOMEPAGE="http://ridiculousfish.com/shell/" 
 SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="app-doc/doxygen >= 1.7.4
-	sys-libs/ncurses >= 5.9"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2009 Axel Liljencrantz"
+
+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="
+	fish$secondaryArchSuffix = $portVersion
+	cmd:fish = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix >= 5.9
+	devel:libgettextlib$secondaryArchSuffix
+	doxygen >= 1.6.3
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:which
+	"
+
+
 BUILD()
 {
-    cd fish-1.23.1-git
 	libtoolize --force --copy --install
     autoconf
-    ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY`
+    ./configure --without-xsel --prefix=$prefix
     make
 }
 
 INSTALL()
 {
-    cd fish-1.23.1-git
     make install DESTDIR=${DESTDIR}
 }
 
 TEST()
 {
-	cd fish-1.23.1-git
 	make test
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2009 Axel Liljencrantz"
diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
new file mode 100644
index 000000000..c66848af8
--- /dev/null
+++ b/dev-db/db/db-4.8.30.recipe
@@ -0,0 +1,90 @@
+SUMMARY="The Oracle Berkeley Database"
+DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases provides developers with fast, reliable, local persistence with zero administration." 
+HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz"
+CHECKSUM_MD5="f80022099c5742cd179343556179aa8c"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="SleepyCat"
+COPYRIGHT="1990-2013, Oracle
+	1990-1995, The Regents of the University of California
+	1996-1996, The President and Fellows of Harvard University
+	2000-2005, INRIA - France Telecom"
+
+PROVIDES="
+	db${secondaryArchSuffix} = $portVersion compat >= 4.8
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_sql${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_4.8${secondaryArchSuffix}
+	lib:libdb_4${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_4.8${secondaryArchSuffix}
+	lib:libdb_cxx_4${secondaryArchSuffix}
+	"
+REQUIRES="
+    haiku${secondaryArchSuffix} >= $haikuVersion
+    "
+BUILD_REQUIRES="
+    "
+BUILD_PREREQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+    cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	"
+
+PATCHES="db-${portVersion}.patch"
+
+BUILD()
+{
+	cd build_unix
+	runConfigure ../dist/configure --enable-cxx
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build_unix
+	make install
+
+    # prepare develop/lib
+    prepareInstalledDevelLibs libdb libdb-4.8 libdb_cxx libdb_cxx-4.8
+    fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	cd build_unix
+	#make dbtest
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 4.8
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_4.8${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_4.8${secondaryArchSuffix} = $portVersion
+	"
+
+REQUIRES_devel="
+	db$secondaryArchSuffix == $portVersion base
+    "
diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe
index 976880726..afa37f969 100644
--- a/dev-db/db/db-5.3.28.recipe
+++ b/dev-db/db/db-5.3.28.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz"
 CHECKSUM_MD5="b99454564d5b4479750567031d66fe24"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SleepyCat"
@@ -13,27 +13,27 @@ COPYRIGHT="1990-2013, Oracle
 	2000-2005, INRIA - France Telecom"
 
 PROVIDES="
-	db${secondaryArchSuffix} = $portVersion
-	cmd:db_archive
-	cmd:db_checkpoint
-	cmd:db_deadlock
-	cmd:db_dump
-	cmd:db_hotbackup
-	cmd:db_load
-	cmd:db_log_verify
-	cmd:db_printlog
-	cmd:db_recover
-	cmd:db_replicate
-	cmd:db_stat
-	cmd:db_tuner
-	cmd:db_upgrade
-	cmd:db_verify
-	lib:libdb_5.3
-	lib:libdb_5
-	lib:libdb
-	lib:libdb_cxx
-	lib:libdb_cxx_5.3
-	lib:libdb_cxx_5
+	db${secondaryArchSuffix} = $portVersion compat >= 5.3
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_log_verify${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_replicate${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_tuner${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_5.3${secondaryArchSuffix}
+	lib:libdb_5${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_5.3${secondaryArchSuffix}
+	lib:libdb_cxx_5${secondaryArchSuffix}
 	"
 REQUIRES="
     haiku${secondaryArchSuffix} >= $haikuVersion
@@ -81,11 +81,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	db${secondaryArchSuffix}_devel = $portVersion
-	devel:libdb$secondaryArchSuffix = $portVersion
-	devel:libdb_5.3$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx_5.3$secondaryArchSuffix = $portVersion
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 5.3
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_5.3${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_5.3${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES_devel="
diff --git a/dev-db/db/patches/db-4.8.30.patch b/dev-db/db/patches/db-4.8.30.patch
new file mode 100644
index 000000000..0b176f9b4
--- /dev/null
+++ b/dev-db/db/patches/db-4.8.30.patch
@@ -0,0 +1,79 @@
+diff --git a/dist/Makefile.in b/dist/Makefile.in
+index c4b0739..d3860b4 100644
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	@docdir@
+ 
+ dmode=	755
+ emode=	555
+diff --git a/dist/configure b/dist/configure
+index 295fec1..e05e451 100755
+--- a/dist/configure
++++ b/dist/configure
+@@ -4533,6 +4533,8 @@ irix*)	optimize_debug="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	$as_echo "#define HAVE_QNX 1" >>confdefs.h
+diff --git a/dist/configure.ac b/dist/configure.ac
+index 4a99779..85dfb93 100644
+--- a/dist/configure.ac
++++ b/dist/configure.ac
+@@ -184,6 +184,8 @@ irix*)	optimize_debug="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	AC_DEFINE(HAVE_QNX)
+@@ -519,6 +521,9 @@ AC_SEARCH_LIBS(sched_yield, rt)
+ # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
+ AC_SEARCH_LIBS(fdatasync, rt)
+ 
++# Socket only available in -lnetwork on Haiku
++AC_SEARCH_LIBS(socket, network)
++
+ AC_SEARCH_LIBS(getaddrinfo, nsl socket)
+ AC_SEARCH_LIBS(hstrerror, resolv)
+ 
+diff --git a/repmgr/repmgr_posix.c b/repmgr/repmgr_posix.c
+index 741f378..6892469 100644
+--- a/repmgr/repmgr_posix.c
++++ b/repmgr/repmgr_posix.c
+@@ -488,11 +488,7 @@ __repmgr_wake_main_thread(env)
+  * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	int nw;
+ 
+@@ -506,11 +502,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p)
+  * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	ssize_t nw;
+ 
diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
index 39f1085dd..8d2d49743 100644
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
@@ -202,6 +202,6 @@ INSTALL()
 	# create a profile.d file that sets up JAVA_HOME
 	jdkProfile=$dataDir/profile.d/openjdk.sh
 	mkdir -p $(dirname $jdkProfile)
-	echo JAVA_HOME=`java-config -H` > $jdkProfile
+	echo 'JAVA_HOME=`java-config -H`' > $jdkProfile
 	echo "export JAVA_HOME" >> $jdkProfile
 }
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
new file mode 100644
index 000000000..69b10dc11
--- /dev/null
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -0,0 +1,111 @@
+SUMMARY="GLib is a cross-platform software utility library"
+DESCRIPTION="GLib is a cross-platform software utility library that began as \
+part of the GTK+ project. However, before releasing version 2 of GTK+, the \
+project's developers decided to separate non-GUI-specific code from the GTK+ \
+platform, thus creating GLib as a separate product. GLib was released as a \
+separate library so other developers, those who did not make use of the \
+GUI-related portions of GTK+, could make use of the non-GUI portions of the \
+library without the overhead of depending on the entire GUI library.
+
+Since GLib is a cross-platform library, applications using it to interface with \
+the operating system are usually portable across different operating systems \
+without major changes"
+HOMEPAGE="http://www.gtk.org/" 
+SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz"
+CHECKSUM_MD5="6fe30dad87c77b91b632def29dd69ef9"
+LICENSE="GNU LGPL v2"
+COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+	1991-2002 Free Software Foundation, Inc.
+	1997-2002 University of Cambridge.
+	1998-2001, 2003-2010 Red Hat, Inc.
+	1995-2002 Several others"
+
+REVISION="1"
+
+ARCHITECTURES="?x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PROVIDES="
+	glib$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libglib$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libglib_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libgmodule$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libgmodule_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libgthread$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libgthread_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:m4
+	cmd:make
+	"
+
+PATCHES="glib-1.2.10.patchset"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	automake --add-missing
+	autoconf
+
+	runConfigure ./configure \
+		--enable-shared=yes
+
+	cp -f $portPackageLinksDir/cmd~libtool/bin/libtool .
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	prepareInstalledDevelLibs libglib libglib-1.2 \
+		libgmodule libgmodule-1.2 \
+		libgthread libgthread-1.2
+
+	fixPkgconfig
+
+	fixDevelopLibDirReferences $binDir/glib-config
+
+	mv $libDir/glib/include/glibconfig.h $includeDir/glib-1.2
+	rm -rf $libDir/glib
+
+	# devel package
+	packageEntries devel \
+		$developDir $binDir \
+		$manDir $infoDir $dataDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	glib${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	cmd:glib_config$secondaryArchSuffix = $portVersion
+	devel:libglib$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libglib_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgmodule$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgmodule_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgthread$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libgthread_1.2$secondaryArchSuffix = $portVersion compat >= 1
+	"
+
+REQUIRES_devel="
+	glib$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/glib/glib-2.22.2.recipe b/dev-libs/glib/glib-2.22.2.recipe
deleted file mode 100644
index b33e97fc1..000000000
--- a/dev-libs/glib/glib-2.22.2.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="glib" 
-HOMEPAGE="http://www.gtk.org/" 
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.22/glib-2.22.2.tar.gz"
-CHECKSUM_MD5="00eb873975e2ef9361b8177131c7c943"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd glib-2.22.2
-	rm -rf aclocal.m4
-	mkdir -p m4
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
-	libtoolize --force --copy --install
-	aclocal -I m4
-#	automake
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd glib-2.22.2
-	make install
-}
diff --git a/dev-libs/glib/glib-2.24.1.recipe b/dev-libs/glib/glib-2.24.1.recipe
deleted file mode 100644
index 0e74b1972..000000000
--- a/dev-libs/glib/glib-2.24.1.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="glib" 
-HOMEPAGE="http://www.gtk.org/" 
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.1.tar.gz"
-CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd glib-2.24.1
-	rm -rf aclocal.m4
-	mkdir -p m4
-	cp ../../gtk-doc.m4 m4
-	libtoolize --force --copy --install
-	aclocal --install -I m4
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-threads=posix \
-	LDFLAGS=-lnetwork
-	make
-}
-
-INSTALL()
-{
-	cd glib-2.24.1
-	make install
-}
-
-LICENSE="GNU LGPL v2"
-COPYRIGHT=""  # TODO: Need to determine who/what to list for the copyright on this one.
diff --git a/dev-libs/glib/glib-2.24.2.recipe b/dev-libs/glib/glib-2.24.2.recipe
deleted file mode 100644
index a19d4cd8e..000000000
--- a/dev-libs/glib/glib-2.24.2.recipe
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION="glib" 
-HOMEPAGE="http://www.gtk.org/" 
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.2.tar.gz"
-CHECKSUM_MD5="071b8e246197d334e20ab67956aef936"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/pkgconfig >= 0.23
-	sys-devel/gettext >= 0.17
-	dev-libs/libpcre >= 8.00"
-BUILD()
-{
-	cd glib-2.24.2
-	rm -rf aclocal.m4
-	mkdir -p m4
-	cp ../../gtk-doc.m4 m4
-	libtoolize --force --copy --install
-	aclocal --install -I m4 -I m4macros
-	autoheader
-	automake
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	DATADIR=`finddir B_COMMON_DATA_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=$DATADIR \
-		--docdir=$COMMON_DOCS/doc/glib \
-		--htmldir=$COMMON_DOCS/doc/gtk-doc/html \
-		--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL()
-{
-	cd glib-2.24.2
-	make install
-}
-
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
-	1991-2003 Free Software Foundation, Inc.
-	1997-2006 University of Cambridge.
-	1998-2001, 2003-2010 Red Hat, Inc.
-	2007-2009 Nokia Corporation
-	2008, 2010 Oracle and/or its affiliates, Inc. All rights
-	2008-2010 Codethink Limited
-	2008-2010 Collabora Ltd.
-	1995-2010 Several others"
diff --git a/dev-libs/glib/glib-2.26.1.recipe b/dev-libs/glib/glib-2.26.1.recipe
deleted file mode 100644
index 4d44567d8..000000000
--- a/dev-libs/glib/glib-2.26.1.recipe
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION="glib" 
-HOMEPAGE="http://www.gtk.org/" 
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.26/glib-2.26.1.tar.gz"
-CHECKSUM_MD5="2634337609e747fc7946517e3008d53c"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="dev-libs/pkgconfig >= 0.23
-	sys-devel/gettext >= 0.17"
-BUILD()
-{
-	cd glib-2.26.1
-	rm -rf aclocal.m4
-	mkdir -p m4
-	cp ../../gtk-doc.m4 m4
-	libtoolize --force --copy --install
-	aclocal --install -I m4
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd glib-2.26.1
-	make install
-}
-
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
-	1991-2003 Free Software Foundation, Inc.
-	1997-2006 University of Cambridge.
-	1998-2001, 2003-2010 Red Hat, Inc.
-	2007-2009 Nokia Corporation
-	2008, 2010 Oracle and/or its affiliates, Inc. All rights
-	2008-2010 Codethink Limited
-	2008-2010 Collabora Ltd.
-	1995-2010 Several others"
diff --git a/dev-libs/glib/glib-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe
similarity index 55%
rename from dev-libs/glib/glib-2.38.1.recipe
rename to dev-libs/glib/glib2-2.38.1.recipe
index d59d3791c..c870f6ca7 100644
--- a/dev-libs/glib/glib-2.38.1.recipe
+++ b/dev-libs/glib/glib2-2.38.1.recipe
@@ -1,5 +1,15 @@
-SUMMARY="glib"
-DESCRIPTION="glib" 
+SUMMARY="GLib is a cross-platform software utility library"
+DESCRIPTION="GLib is a cross-platform software utility library that began as \
+part of the GTK+ project. However, before releasing version 2 of GTK+, the \
+project's developers decided to separate non-GUI-specific code from the GTK+ \
+platform, thus creating GLib as a separate product. GLib was released as a \
+separate library so other developers, those who did not make use of the \
+GUI-related portions of GTK+, could make use of the non-GUI portions of the \
+library without the overhead of depending on the entire GUI library.
+
+Since GLib is a cross-platform library, applications using it to interface with \
+the operating system are usually portable across different operating systems \
+without major changes"
 HOMEPAGE="http://www.gtk.org/" 
 SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.1.tar.xz"
 CHECKSUM_MD5="f3f6789151c1810f2fe23fe9ebb8b828"
@@ -20,20 +30,20 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	glib$secondaryArchSuffix = $portVersion compat >= 2
-	cmd:gdbus
-	cmd:gdbus_codegen
-	cmd:gio_querymodules
-	cmd:glib_compile_resources
-	cmd:glib_compile_schemas
-	cmd:glib_genmarshal
-	cmd:glib_gettextize
-	cmd:glib_mkenums
-	cmd:gobject_query
-	cmd:gresource
-	cmd:gsettings
-	cmd:gtester
-	cmd:gtester_report
+	glib2$secondaryArchSuffix = $portVersion compat >= 2
+	cmd:gdbus$secondaryArchSuffix
+	cmd:gdbus_codegen$secondaryArchSuffix
+	cmd:gio_querymodules$secondaryArchSuffix
+	cmd:glib_compile_resources$secondaryArchSuffix
+	cmd:glib_compile_schemas$secondaryArchSuffix
+	cmd:glib_genmarshal$secondaryArchSuffix
+	cmd:glib_gettextize$secondaryArchSuffix
+	cmd:glib_mkenums$secondaryArchSuffix
+	cmd:gobject_query$secondaryArchSuffix
+	cmd:gresource$secondaryArchSuffix
+	cmd:gsettings$secondaryArchSuffix
+	cmd:gtester$secondaryArchSuffix
+	cmd:gtester_report$secondaryArchSuffix
 	lib:libgio_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
 	lib:libglib_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
 	lib:libgmodule_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
@@ -43,18 +53,18 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	gettext
-	lib:libiconv
-	lib:libz
+	gettext$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
-	lib:libintl
+	lib:libintl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libiconv
-	devel:libz
+	devel:libiconv$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	devel:libffi$secondaryArchSuffix
-	devel:libintl
+	devel:libintl$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
@@ -69,7 +79,9 @@ BUILD_PREREQUIRES="
 	cmd:python
 	"
 
-PATCHES="glib-2.38.1.patch"
+PATCHES="glib2-2.38.1.patch"
+
+SOURCE_DIR="glib-2.38.1"
 
 BUILD()
 {
@@ -103,7 +115,7 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	glib${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	glib2${secondaryArchSuffix}_devel = $portVersion compat >= 0
 	devel:libgio_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
 	devel:libglib_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
 	devel:libgmodule_2.0$secondaryArchSuffix = 0.3800.1 compat >= 2
@@ -112,5 +124,5 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	glib$secondaryArchSuffix == $portVersion base
+	glib2$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-libs/glib/gtk-doc.m4 b/dev-libs/glib/gtk-doc.m4
deleted file mode 100644
index 2cfa1e717..000000000
--- a/dev-libs/glib/gtk-doc.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-  dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH([html-dir],
-    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST([HTML_DIR])
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE([gtk-doc],
-    AS_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [[default=no]]]),,
-    [enable_gtk_doc=no])
-
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-  fi
-
-  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-  AC_MSG_RESULT($enable_gtk_doc)
-
-  dnl enable/disable output formats
-  AC_ARG_ENABLE([gtk-doc-html],
-    AS_HELP_STRING([--enable-gtk-doc-html],
-                   [build documentation in html format [[default=yes]]]),,
-    [enable_gtk_doc_html=yes])
-    AC_ARG_ENABLE([gtk-doc-pdf],
-      AS_HELP_STRING([--enable-gtk-doc-pdf],
-                     [build documentation in pdf format [[default=no]]]),,
-      [enable_gtk_doc_pdf=no])
-
-  if test -z "$GTKDOC_MKPDF"; then
-    enable_gtk_doc_pdf=no
-  fi
-
-
-  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
diff --git a/dev-libs/glib/patches/glib-1.2.10.patchset b/dev-libs/glib/patches/glib-1.2.10.patchset
new file mode 100644
index 000000000..13e9d9b04
--- /dev/null
+++ b/dev-libs/glib/patches/glib-1.2.10.patchset
@@ -0,0 +1,175 @@
+From afb8aab8236d2c30c34642c755ce7c07dfc95ab2 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 9 Dec 2013 16:58:10 -0700
+Subject: Attempt to bring glib-1 into the modern age
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 3a6e201..f059565 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -70,7 +70,7 @@ configinclude_DATA = \
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4		
+ 
+-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
++BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
+ glibconfig.h: stamp-gc-h
+ 	@:
+ stamp-gc-h: config.status
+diff --git a/acinclude.m4 b/acinclude.m4
+index 47abe43..43ed3f1 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -21,6 +21,18 @@
+ ## configuration script generated by Autoconf, you may include it under
+ ## the same distribution terms that you use for the rest of that program.
+ 
++# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
++# ---------------------------------
++# Put STUFF early enough so that they are available for $ac_help expansion.
++# Handle both classic (<= v2.13) and modern autoconf
++AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
++[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
++	[ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
++		[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++$1
++AC_DIVERT_POP()])])])
++
++
+ # serial 40 AC_PROG_LIBTOOL
+ AC_DEFUN(AC_PROG_LIBTOOL,
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+diff --git a/configure.in b/configure.in
+index 8ee9339..cad722f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -17,7 +17,7 @@ rm -f glibconfig-sysdefs.h
+ 
+ dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++GLIB_AC_DIVERT_BEFORE_HELP([
+ #
+ # The following version number definitions apply to GLib, GModule and GThread
+ # as a whole, so if changes occoured in any of them, they are all
+@@ -38,7 +38,7 @@ GLIB_INTERFACE_AGE=10
+ GLIB_BINARY_AGE=10
+ GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
+ dnl
+-AC_DIVERT_POP()dnl
++])
+ 
+ AC_SUBST(GLIB_MAJOR_VERSION)
+ AC_SUBST(GLIB_MINOR_VERSION)
+@@ -63,7 +63,7 @@ PACKAGE=glib
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+ 
+ # Specify a configuration file
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
+ AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
+@@ -71,6 +71,7 @@ AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION)
+ AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE)
+ AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
+ 
++AC_CANONICAL_SYSTEM
+ dnl Initialize libtool
+ AM_PROG_LIBTOOL
+ 
+@@ -81,13 +82,13 @@ AC_CANONICAL_HOST
+ 
+ dnl figure debugging default, prior to $ac_help setup
+ dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++GLIB_AC_DIVERT_BEFORE_HELP([
+ if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
+ 	debug_default=yes
+ else
+ 	debug_default=minimum
+ fi
+-AC_DIVERT_POP()dnl
++])
+ 
+ dnl declare --enable-* args and collect ac_help strings
+ AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
+@@ -154,7 +155,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+ 
+ changequote(,)dnl
+diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
+index ff4410a..5f0ce56 100644
+--- a/gmodule/Makefile.am
++++ b/gmodule/Makefile.am
+@@ -42,7 +42,7 @@ libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+ 
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+ 
+ .PHONY: files release
+diff --git a/gstrfuncs.c b/gstrfuncs.c
+index feb4572..f3859b4 100644
+--- a/gstrfuncs.c
++++ b/gstrfuncs.c
+@@ -702,7 +702,7 @@ g_strsignal (gint signum)
+   char *msg;
+ 
+ #ifdef HAVE_STRSIGNAL
+-  extern char *strsignal (int sig);
++  extern const char *strsignal (int sig);
+   return strsignal (signum);
+ #elif NO_SYS_SIGLIST
+   switch (signum)
+@@ -867,8 +867,7 @@ g_printf_string_upper_bound (const gchar* format,
+                   /* beware of positional parameters
+                    */
+                 case '$':
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle positional parameters (%%n$)");
++                  g_warning ("%s(): unable to handle positional parameters (%%n$)", G_GNUC_PRETTY_FUNCTION);
+                   len += 1024; /* try adding some safety padding */
+                   break;
+ 
+@@ -1034,8 +1033,7 @@ g_printf_string_upper_bound (const gchar* format,
+                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
+                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
+                   if (spec.mod_extra_long)
+-                    g_warning (G_GNUC_PRETTY_FUNCTION
+-                               "(): unable to handle long double, collecting double only");
++                    g_warning ("%s(): unable to handle long double, collecting double only", G_GNUC_PRETTY_FUNCTION);
+ #ifdef HAVE_LONG_DOUBLE
+ #error need to implement special handling for long double
+ #endif
+@@ -1077,8 +1075,7 @@ g_printf_string_upper_bound (const gchar* format,
+                   conv_done = TRUE;
+                   if (spec.mod_long)
+                     {
+-                      g_warning (G_GNUC_PRETTY_FUNCTION
+-                                 "(): unable to handle wide char strings");
++                      g_warning ("%s(): unable to handle wide char strings", G_GNUC_PRETTY_FUNCTION);
+                       len += 1024; /* try adding some safety padding */
+                     }
+                   break;
+@@ -1108,9 +1105,7 @@ g_printf_string_upper_bound (const gchar* format,
+                   conv_len += format - spec_start;
+                   break;
+                 default:
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle `%c' while parsing format",
+-                             c);
++                  g_warning ("%s(): unable to handle `%c' while parsing format", G_GNUC_PRETTY_FUNCTION, c);
+                   break;
+                 }
+               conv_done |= conv_len > 0;
+-- 
+1.8.3.4
+
diff --git a/dev-libs/glib/patches/glib-2.18.3-haiku-more.diff b/dev-libs/glib/patches/glib-2.18.3-haiku-more.diff
deleted file mode 100644
index 1e373cb68..000000000
--- a/dev-libs/glib/patches/glib-2.18.3-haiku-more.diff
+++ /dev/null
@@ -1,285 +0,0 @@
-diff -Naur glib-2.18.3-some/gio/Makefile.am glib-2.18.3-more/gio/Makefile.am
---- glib-2.18.3-some/gio/Makefile.am	2009-03-29 05:36:04.000000000 +0000
-+++ glib-2.18.3-more/gio/Makefile.am	2009-03-29 05:37:24.000000000 +0000
-@@ -162,7 +162,7 @@
- 
- endif
- 
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-diff -Naur glib-2.18.3-some/gio/gunixinputstream.c glib-2.18.3-more/gio/gunixinputstream.c
---- glib-2.18.3-some/gio/gunixinputstream.c	2009-03-29 05:36:05.000000000 +0000
-+++ glib-2.18.3-more/gio/gunixinputstream.c	2009-03-29 05:37:24.000000000 +0000
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -171,6 +173,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -226,6 +231,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -331,6 +337,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) &&!defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -353,6 +360,7 @@
-   g_source_attach (source, NULL);
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -Naur glib-2.18.3-some/gio/gunixmounts.c glib-2.18.3-more/gio/gunixmounts.c
---- glib-2.18.3-some/gio/gunixmounts.c	2009-03-29 05:36:05.000000000 +0000
-+++ glib-2.18.3-more/gio/gunixmounts.c	2009-03-29 05:37:25.000000000 +0000
-@@ -594,6 +594,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -974,6 +984,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -Naur glib-2.18.3-some/gio/gunixoutputstream.c glib-2.18.3-more/gio/gunixoutputstream.c
---- glib-2.18.3-some/gio/gunixoutputstream.c	2009-03-29 05:36:05.000000000 +0000
-+++ glib-2.18.3-more/gio/gunixoutputstream.c	2009-03-29 05:37:25.000000000 +0000
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -159,6 +161,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -215,6 +220,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -320,6 +326,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -342,6 +349,7 @@
-   g_source_attach (source, NULL);
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -Naur glib-2.18.3-some/gio/makegioalias.pl glib-2.18.3-more/gio/makegioalias.pl
---- glib-2.18.3-some/gio/makegioalias.pl	2009-03-29 05:36:05.000000000 +0000
-+++ glib-2.18.3-more/gio/makegioalias.pl	2009-03-29 05:37:25.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -Naur glib-2.18.3-some/glib/Makefile.am glib-2.18.3-more/glib/Makefile.am
---- glib-2.18.3-some/glib/Makefile.am	2009-03-29 05:36:06.000000000 +0000
-+++ glib-2.18.3-more/glib/Makefile.am	2009-03-29 05:37:25.000000000 +0000
-@@ -19,7 +19,7 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-diff -Naur glib-2.18.3-some/glib/gbacktrace.c glib-2.18.3-more/glib/gbacktrace.c
---- glib-2.18.3-some/glib/gbacktrace.c	2009-03-29 05:36:06.000000000 +0000
-+++ glib-2.18.3-more/glib/gbacktrace.c	2009-03-29 05:37:25.000000000 +0000
-@@ -158,7 +158,7 @@
- void
- g_on_error_stack_trace (const gchar *prg_name)
- {
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   pid_t pid;
-   gchar buf[16];
-   gchar *args[4] = { "gdb", NULL, NULL, NULL };
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-diff -Naur glib-2.18.3-some/glib/gmain.c glib-2.18.3-more/glib/gmain.c
---- glib-2.18.3-some/glib/gmain.c	2009-03-29 05:36:08.000000000 +0000
-+++ glib-2.18.3-more/glib/gmain.c	2009-03-29 05:37:25.000000000 +0000
-@@ -82,6 +82,12 @@
- #include <sys/wait.h>
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+#include "fcntl.h"
-+#endif /* G_OS_HAIKU */
-+
- #ifdef G_OS_UNIX
- #include <fcntl.h>
- #include <sys/wait.h>
-@@ -569,6 +575,10 @@
- #undef NO_FD_SET
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#undef NO_FD_SET
-+#endif /* G_OS_HAIKU */
-+
- #ifndef NO_FD_SET
- #  define SELECT_MASK fd_set
- #else /* !NO_FD_SET */
-@@ -4022,6 +4032,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -4041,6 +4052,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-diff -Naur glib-2.18.3-some/glib/gspawn.c glib-2.18.3-more/glib/gspawn.c
---- glib-2.18.3-some/glib/gspawn.c	2009-03-29 05:36:08.000000000 +0000
-+++ glib-2.18.3-more/glib/gspawn.c	2009-03-29 05:37:25.000000000 +0000
-@@ -238,6 +238,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -433,6 +436,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -908,7 +912,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   struct rlimit rl;
- #endif
- 
-@@ -951,7 +955,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-diff -Naur glib-2.18.3-some/glib/makegalias.pl glib-2.18.3-more/glib/makegalias.pl
---- glib-2.18.3-some/glib/makegalias.pl	2009-03-29 05:36:09.000000000 +0000
-+++ glib-2.18.3-more/glib/makegalias.pl	2009-03-29 05:37:25.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -Naur glib-2.18.3-some/gobject/makegobjectalias.pl glib-2.18.3-more/gobject/makegobjectalias.pl
---- glib-2.18.3-some/gobject/makegobjectalias.pl	2009-03-29 05:36:09.000000000 +0000
-+++ glib-2.18.3-more/gobject/makegobjectalias.pl	2009-03-29 05:37:25.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
diff --git a/dev-libs/glib/patches/glib-2.18.3-haiku-some.diff b/dev-libs/glib/patches/glib-2.18.3-haiku-some.diff
deleted file mode 100644
index d510346c0..000000000
--- a/dev-libs/glib/patches/glib-2.18.3-haiku-some.diff
+++ /dev/null
@@ -1,323 +0,0 @@
-diff -Naur glib-2.18.3-clean/configure.in glib-2.18.3-some/configure.in
---- glib-2.18.3-clean/configure.in	2009-03-29 05:11:44.000000000 +0000
-+++ glib-2.18.3-some/configure.in	2009-03-29 05:36:03.000000000 +0000
-@@ -112,6 +112,17 @@
- esac
- AC_MSG_RESULT([$glib_native_beos])
- 
-+AC_MSG_CHECKING([for Haiku])
-+case $host in
-+  *-*-haiku*)
-+    glib_native_haiku="yes"
-+    ;;
-+  *)
-+    glib_native_haiku="no"
-+    ;;
-+esac
-+AC_MSG_RESULT([$glib_native_haiku])
-+
- dnl
- 
- AC_MSG_CHECKING([for Win32])
-@@ -3280,6 +3291,9 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-mingw*)
-     glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
-diff -Naur glib-2.18.3-clean/docs/reference/glib/glib-overrides.txt glib-2.18.3-some/docs/reference/glib/glib-overrides.txt
---- glib-2.18.3-clean/docs/reference/glib/glib-overrides.txt	2009-03-29 05:11:44.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/glib-overrides.txt	2009-03-29 05:36:03.000000000 +0000
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/glib-sections.txt glib-2.18.3-some/docs/reference/glib/glib-sections.txt
---- glib-2.18.3-clean/docs/reference/glib/glib-sections.txt	2009-03-29 05:11:44.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/glib-sections.txt	2009-03-29 05:36:03.000000000 +0000
-@@ -125,6 +125,7 @@
- <SUBSECTION>
- G_OS_WIN32
- G_OS_BEOS
-+G_OS_HAIKU
- G_OS_UNIX
- 
- <SUBSECTION>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/html/glib-Standard-Macros.html glib-2.18.3-some/docs/reference/glib/html/glib-Standard-Macros.html
---- glib-2.18.3-clean/docs/reference/glib/html/glib-Standard-Macros.html	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/html/glib-Standard-Macros.html	2009-03-29 05:36:04.000000000 +0000
-@@ -60,6 +60,7 @@
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS" title="G_OS_WIN32">G_OS_WIN32</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS" title="G_OS_BEOS">G_OS_BEOS</a>
-+#define             <a class="link" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS" title="G_OS_HAIKU">G_OS_HAIKU</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS" title="G_OS_UNIX">G_OS_UNIX</a>
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS" title="G_DIR_SEPARATOR">G_DIR_SEPARATOR</a>
-@@ -115,6 +116,15 @@
- BeOS-specific code in "#ifdef G_OS_BEOS".
- </p>
- </div>
-+<div class="refsect2" lang="en">
-+<a name="G-OS-HAIKU--CAPS"></a><h3>G_OS_HAIKU</h3>
-+<pre class="programlisting">#define G_OS_HAIKU
-+</pre>
-+<p>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "#ifdef G_OS_HAIKU".
-+</p>
-+</div>
- <hr>
- <div class="refsect2" lang="en">
- <a name="G-OS-UNIX--CAPS"></a><h3>G_OS_UNIX</h3>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/html/glib.devhelp glib-2.18.3-some/docs/reference/glib/html/glib.devhelp
---- glib-2.18.3-clean/docs/reference/glib/html/glib.devhelp	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/html/glib.devhelp	2009-03-29 05:36:04.000000000 +0000
-@@ -189,6 +189,7 @@
-     <function name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <function name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <function name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <function name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <function name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <function name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <function name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/html/glib.devhelp2 glib-2.18.3-some/docs/reference/glib/html/glib.devhelp2
---- glib-2.18.3-clean/docs/reference/glib/html/glib.devhelp2	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/html/glib.devhelp2	2009-03-29 05:36:04.000000000 +0000
-@@ -189,6 +189,7 @@
-     <keyword type="macro" name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <keyword type="macro" name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <keyword type="macro" name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <keyword type="macro" name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <keyword type="macro" name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/html/ix01.html glib-2.18.3-some/docs/reference/glib/html/ix01.html
---- glib-2.18.3-clean/docs/reference/glib/html/ix01.html	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/html/ix01.html	2009-03-29 05:36:04.000000000 +0000
-@@ -2260,6 +2260,8 @@
- </dt>
- <dt>G_OS_BEOS, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS">G_OS_BEOS</a>
- </dt>
-+<dt>G_OS_HAIKU, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS">G_OS_HAIKU</a>
-+</dt>
- <dt>G_OS_UNIX, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS">G_OS_UNIX</a>
- </dt>
- <dt>G_OS_WIN32, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS">G_OS_WIN32</a>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/tmpl/macros.sgml glib-2.18.3-some/docs/reference/glib/tmpl/macros.sgml
---- glib-2.18.3-clean/docs/reference/glib/tmpl/macros.sgml	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/tmpl/macros.sgml	2009-03-29 05:36:04.000000000 +0000
-@@ -33,6 +33,14 @@
- 
- 
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
-+
-+
- <!-- ##### MACRO G_OS_UNIX ##### -->
- <para>
- This macro is defined only on UNIX. So you can bracket
-diff -Naur glib-2.18.3-clean/docs/reference/glib/xml/api-index-full.xml glib-2.18.3-some/docs/reference/glib/xml/api-index-full.xml
---- glib-2.18.3-clean/docs/reference/glib/xml/api-index-full.xml	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/xml/api-index-full.xml	2009-03-29 05:36:04.000000000 +0000
-@@ -1107,6 +1107,7 @@
- <indexentry><primaryie linkends="g-option-group-set-translation-domain"><link linkend="g-option-group-set-translation-domain">g_option_group_set_translation_domain</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OPTION-REMAINING--CAPS"><link linkend="G-OPTION-REMAINING--CAPS">G_OPTION_REMAINING</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-BEOS--CAPS"><link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link></primaryie></indexentry>
-+<indexentry><primaryie linkends="G-OS-HAIKU--CAPS"><link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-UNIX--CAPS"><link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-WIN32--CAPS"><link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link></primaryie></indexentry>
- <indexentry><primaryie linkends="g-parse-debug-string"><link linkend="g-parse-debug-string">g_parse_debug_string</link></primaryie></indexentry>
-diff -Naur glib-2.18.3-clean/docs/reference/glib/xml/macros.xml glib-2.18.3-some/docs/reference/glib/xml/macros.xml
---- glib-2.18.3-clean/docs/reference/glib/xml/macros.xml	2009-03-29 05:11:45.000000000 +0000
-+++ glib-2.18.3-some/docs/reference/glib/xml/macros.xml	2009-03-29 05:36:04.000000000 +0000
-@@ -19,6 +19,7 @@
- 
- #define             <link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link>
- #define             <link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link>
-+#define             <link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link>
- #define             <link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link>
- 
- #define             <link linkend="G-DIR-SEPARATOR--CAPS">G_DIR_SEPARATOR</link>
-@@ -81,6 +82,14 @@
- This macro is defined only on BeOS. So you can bracket
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para></refsect2>
-+<refsect2 id="G-OS-HAIKU--CAPS" role="macro">
-+<title>G_OS_HAIKU</title>
-+<indexterm zone="G-OS-HAIKU--CAPS"><primary sortas="G_OS_HAIKU">G_OS_HAIKU</primary></indexterm><programlisting>#define G_OS_HAIKU
-+</programlisting>
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para></refsect2>
- <refsect2 id="G-OS-UNIX--CAPS" role="macro">
- <title>G_OS_UNIX</title>
- <indexterm zone="G-OS-UNIX--CAPS"><primary sortas="G_OS_UNIX">G_OS_UNIX</primary></indexterm><programlisting>#define G_OS_UNIX
-diff -Naur glib-2.18.3-clean/gio/xdgmime/xdgmimealias.c glib-2.18.3-some/gio/xdgmime/xdgmimealias.c
---- glib-2.18.3-clean/gio/xdgmime/xdgmimealias.c	2009-03-29 05:11:46.000000000 +0000
-+++ glib-2.18.3-some/gio/xdgmime/xdgmimealias.c	2009-03-29 05:40:01.000000000 +0000
-@@ -35,7 +35,10 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-+#	include <fnmatch.h>
-+#endif
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-clean/gio/xdgmime/xdgmimecache.c glib-2.18.3-some/gio/xdgmime/xdgmimecache.c
---- glib-2.18.3-clean/gio/xdgmime/xdgmimecache.c	2009-03-29 05:11:46.000000000 +0000
-+++ glib-2.18.3-some/gio/xdgmime/xdgmimecache.c	2009-03-29 05:40:41.000000000 +0000
-@@ -34,7 +34,11 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <fnmatch.h>
-+
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-+#	include <fnmatch.h>
-+#endif
-+
- #include <assert.h>
- 
- #include <netinet/in.h> /* for ntohl/ntohs */
-diff -Naur glib-2.18.3-clean/gio/xdgmime/xdgmimeglob.c glib-2.18.3-some/gio/xdgmime/xdgmimeglob.c
---- glib-2.18.3-clean/gio/xdgmime/xdgmimeglob.c	2009-03-29 05:11:46.000000000 +0000
-+++ glib-2.18.3-some/gio/xdgmime/xdgmimeglob.c	2009-03-29 05:41:11.000000000 +0000
-@@ -35,7 +35,10 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-+#	include <fnmatch.h>
-+#endif
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-clean/gio/xdgmime/xdgmimeparent.c glib-2.18.3-some/gio/xdgmime/xdgmimeparent.c
---- glib-2.18.3-clean/gio/xdgmime/xdgmimeparent.c	2009-03-29 05:11:46.000000000 +0000
-+++ glib-2.18.3-some/gio/xdgmime/xdgmimeparent.c	2009-03-29 05:41:22.000000000 +0000
-@@ -35,7 +35,10 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-+#	include <fnmatch.h>
-+#endif
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-clean/glib/gslice.c glib-2.18.3-some/glib/gslice.c
---- glib-2.18.3-clean/glib/gslice.c	2009-03-29 05:11:52.000000000 +0000
-+++ glib-2.18.3-some/glib/gslice.c	2009-03-29 05:36:08.000000000 +0000
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-diff -Naur glib-2.18.3-clean/glib/gstdio.c glib-2.18.3-some/glib/gstdio.c
---- glib-2.18.3-clean/glib/gstdio.c	2009-03-29 05:11:52.000000000 +0000
-+++ glib-2.18.3-some/glib/gstdio.c	2009-03-29 05:36:08.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined(G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -Naur glib-2.18.3-clean/glib/gstrfuncs.c glib-2.18.3-some/glib/gstrfuncs.c
---- glib-2.18.3-clean/glib/gstrfuncs.c	2009-03-29 05:11:52.000000000 +0000
-+++ glib-2.18.3-some/glib/gstrfuncs.c	2009-03-29 05:36:08.000000000 +0000
-@@ -1328,7 +1328,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -Naur glib-2.18.3-clean/glib/gtester.c glib-2.18.3-some/glib/gtester.c
---- glib-2.18.3-clean/glib/gtester.c	2009-03-29 05:11:52.000000000 +0000
-+++ glib-2.18.3-some/glib/gtester.c	2009-03-29 05:36:08.000000000 +0000
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-diff -Naur glib-2.18.3-clean/glib/gutils.c glib-2.18.3-some/glib/gutils.c
---- glib-2.18.3-clean/glib/gutils.c	2009-03-29 05:11:52.000000000 +0000
-+++ glib-2.18.3-some/glib/gutils.c	2009-03-29 05:36:08.000000000 +0000
-@@ -458,7 +458,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-@@ -2279,6 +2279,21 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("$HOME");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
- #if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
diff --git a/dev-libs/glib/patches/glib-2.18.3-haiku.diff b/dev-libs/glib/patches/glib-2.18.3-haiku.diff
deleted file mode 100644
index 1acc25cf2..000000000
--- a/dev-libs/glib/patches/glib-2.18.3-haiku.diff
+++ /dev/null
@@ -1,964 +0,0 @@
-diff -Naur glib-2.18.3-virgin/configure.in glib-2.18.3/configure.in
---- glib-2.18.3-virgin/configure.in	2008-12-15 14:14:07.000000000 +0000
-+++ glib-2.18.3/configure.in	2008-12-15 14:22:15.000000000 +0000
-@@ -112,6 +112,17 @@
- esac
- AC_MSG_RESULT([$glib_native_beos])
- 
-+AC_MSG_CHECKING([for Haiku])
-+case $host in
-+  *-*-haiku*)
-+    glib_native_haiku="yes"
-+    ;;
-+  *)
-+    glib_native_haiku="no"
-+    ;;
-+esac
-+AC_MSG_RESULT([$glib_native_haiku])
-+
- dnl
- 
- AC_MSG_CHECKING([for Win32])
-@@ -3280,6 +3291,9 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-mingw*)
-     glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/glib-overrides.txt glib-2.18.3/docs/reference/glib/glib-overrides.txt
---- glib-2.18.3-virgin/docs/reference/glib/glib-overrides.txt	2008-12-15 14:14:06.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/glib-overrides.txt	2008-12-15 14:26:31.000000000 +0000
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/glib-sections.txt glib-2.18.3/docs/reference/glib/glib-sections.txt
---- glib-2.18.3-virgin/docs/reference/glib/glib-sections.txt	2008-12-15 14:14:06.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/glib-sections.txt	2008-12-15 14:27:12.000000000 +0000
-@@ -125,6 +125,7 @@
- <SUBSECTION>
- G_OS_WIN32
- G_OS_BEOS
-+G_OS_HAIKU
- G_OS_UNIX
- 
- <SUBSECTION>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/html/glib-Standard-Macros.html glib-2.18.3/docs/reference/glib/html/glib-Standard-Macros.html
---- glib-2.18.3-virgin/docs/reference/glib/html/glib-Standard-Macros.html	2008-12-15 14:14:05.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/html/glib-Standard-Macros.html	2008-12-15 14:28:52.000000000 +0000
-@@ -60,6 +60,7 @@
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS" title="G_OS_WIN32">G_OS_WIN32</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS" title="G_OS_BEOS">G_OS_BEOS</a>
-+#define             <a class="link" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS" title="G_OS_HAIKU">G_OS_HAIKU</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS" title="G_OS_UNIX">G_OS_UNIX</a>
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS" title="G_DIR_SEPARATOR">G_DIR_SEPARATOR</a>
-@@ -115,6 +116,15 @@
- BeOS-specific code in "#ifdef G_OS_BEOS".
- </p>
- </div>
-+<div class="refsect2" lang="en">
-+<a name="G-OS-HAIKU--CAPS"></a><h3>G_OS_HAIKU</h3>
-+<pre class="programlisting">#define G_OS_HAIKU
-+</pre>
-+<p>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "#ifdef G_OS_HAIKU".
-+</p>
-+</div>
- <hr>
- <div class="refsect2" lang="en">
- <a name="G-OS-UNIX--CAPS"></a><h3>G_OS_UNIX</h3>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/html/glib.devhelp glib-2.18.3/docs/reference/glib/html/glib.devhelp
---- glib-2.18.3-virgin/docs/reference/glib/html/glib.devhelp	2008-12-15 14:14:05.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/html/glib.devhelp	2008-12-15 14:29:21.000000000 +0000
-@@ -189,6 +189,7 @@
-     <function name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <function name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <function name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <function name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <function name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <function name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <function name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/html/glib.devhelp2 glib-2.18.3/docs/reference/glib/html/glib.devhelp2
---- glib-2.18.3-virgin/docs/reference/glib/html/glib.devhelp2	2008-12-15 14:14:05.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/html/glib.devhelp2	2008-12-15 14:29:46.000000000 +0000
-@@ -189,6 +189,7 @@
-     <keyword type="macro" name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <keyword type="macro" name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <keyword type="macro" name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <keyword type="macro" name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <keyword type="macro" name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/html/ix01.html glib-2.18.3/docs/reference/glib/html/ix01.html
---- glib-2.18.3-virgin/docs/reference/glib/html/ix01.html	2008-12-15 14:14:05.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/html/ix01.html	2008-12-15 14:30:31.000000000 +0000
-@@ -2260,6 +2260,8 @@
- </dt>
- <dt>G_OS_BEOS, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS">G_OS_BEOS</a>
- </dt>
-+<dt>G_OS_HAIKU, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS">G_OS_HAIKU</a>
-+</dt>
- <dt>G_OS_UNIX, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS">G_OS_UNIX</a>
- </dt>
- <dt>G_OS_WIN32, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS">G_OS_WIN32</a>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/tmpl/macros.sgml glib-2.18.3/docs/reference/glib/tmpl/macros.sgml
---- glib-2.18.3-virgin/docs/reference/glib/tmpl/macros.sgml	2008-12-15 14:14:06.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/tmpl/macros.sgml	2008-12-15 14:31:07.000000000 +0000
-@@ -33,6 +33,14 @@
- 
- 
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
-+
-+
- <!-- ##### MACRO G_OS_UNIX ##### -->
- <para>
- This macro is defined only on UNIX. So you can bracket
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/xml/api-index-full.xml glib-2.18.3/docs/reference/glib/xml/api-index-full.xml
---- glib-2.18.3-virgin/docs/reference/glib/xml/api-index-full.xml	2008-12-15 14:14:06.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/xml/api-index-full.xml	2008-12-15 14:31:46.000000000 +0000
-@@ -1107,6 +1107,7 @@
- <indexentry><primaryie linkends="g-option-group-set-translation-domain"><link linkend="g-option-group-set-translation-domain">g_option_group_set_translation_domain</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OPTION-REMAINING--CAPS"><link linkend="G-OPTION-REMAINING--CAPS">G_OPTION_REMAINING</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-BEOS--CAPS"><link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link></primaryie></indexentry>
-+<indexentry><primaryie linkends="G-OS-HAIKU--CAPS"><link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-UNIX--CAPS"><link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-WIN32--CAPS"><link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link></primaryie></indexentry>
- <indexentry><primaryie linkends="g-parse-debug-string"><link linkend="g-parse-debug-string">g_parse_debug_string</link></primaryie></indexentry>
-diff -Naur glib-2.18.3-virgin/docs/reference/glib/xml/macros.xml glib-2.18.3/docs/reference/glib/xml/macros.xml
---- glib-2.18.3-virgin/docs/reference/glib/xml/macros.xml	2008-12-15 14:14:05.000000000 +0000
-+++ glib-2.18.3/docs/reference/glib/xml/macros.xml	2008-12-15 14:33:46.000000000 +0000
-@@ -19,6 +19,7 @@
- 
- #define             <link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link>
- #define             <link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link>
-+#define             <link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link>
- #define             <link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link>
- 
- #define             <link linkend="G-DIR-SEPARATOR--CAPS">G_DIR_SEPARATOR</link>
-@@ -81,6 +82,14 @@
- This macro is defined only on BeOS. So you can bracket
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para></refsect2>
-+<refsect2 id="G-OS-HAIKU--CAPS" role="macro">
-+<title>G_OS_HAIKU</title>
-+<indexterm zone="G-OS-HAIKU--CAPS"><primary sortas="G_OS_HAIKU">G_OS_HAIKU</primary></indexterm><programlisting>#define G_OS_HAIKU
-+</programlisting>
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para></refsect2>
- <refsect2 id="G-OS-UNIX--CAPS" role="macro">
- <title>G_OS_UNIX</title>
- <indexterm zone="G-OS-UNIX--CAPS"><primary sortas="G_OS_UNIX">G_OS_UNIX</primary></indexterm><programlisting>#define G_OS_UNIX
-diff -Naur glib-2.18.3-virgin/gio/Makefile.am glib-2.18.3/gio/Makefile.am
---- glib-2.18.3-virgin/gio/Makefile.am	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/Makefile.am	2008-12-15 14:42:41.000000000 +0000
-@@ -162,7 +162,7 @@
- 
- endif
- 
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-diff -Naur glib-2.18.3-virgin/gio/Makefile.am~ glib-2.18.3/gio/Makefile.am~
---- glib-2.18.3-virgin/gio/Makefile.am~	1970-01-01 00:00:00.000000000 +0000
-+++ glib-2.18.3/gio/Makefile.am~	2008-12-15 14:14:26.000000000 +0000
-@@ -0,0 +1,365 @@
-+include $(top_srcdir)/Makefile.decl
-+
-+NULL =
-+
-+SUBDIRS=
-+
-+if OS_UNIX
-+SUBDIRS += xdgmime
-+endif
-+
-+if OS_WIN32_AND_DLL_COMPILATION
-+if MS_LIB_AVAILABLE
-+noinst_DATA = gio-2.0.lib
-+
-+install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
-+uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
-+endif
-+endif
-+
-+install-ms-lib:
-+	$(install_ms_lib_cmd)
-+
-+uninstall-ms-lib:
-+	$(uninstall_ms_lib_cmd)
-+
-+gio.def: gio.symbols
-+	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
-+	  mv gio.def.tmp gio.def
-+
-+gioalias.h: gio.symbols
-+	$(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h.tmp && \
-+	  mv gioalias.h.tmp gioalias.h
-+
-+gioaliasdef.c: gio.symbols
-+	$(PERL) $(srcdir)/makegioalias.pl -def < $(srcdir)/gio.symbols > gioaliasdef.c.tmp && \
-+	  mv gioaliasdef.c.tmp gioaliasdef.c
-+
-+if OS_LINUX
-+if HAVE_GNUC_VISIBILITY
-+TESTS = abicheck.sh pltcheck.sh
-+endif
-+endif
-+
-+AM_CPPFLAGS = \
-+	-DG_LOG_DOMAIN=\"GLib-GIO\"			\
-+	-I$(top_builddir)				\
-+	-I$(top_srcdir)					\
-+	-I$(top_srcdir)/glib				\
-+	-I$(top_srcdir)/gmodule				\
-+	$(GLIB_DEBUG_FLAGS)				\
-+	-DG_DISABLE_DEPRECATED				\
-+	-DGIO_COMPILATION				\
-+	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	
-+
-+lib_LTLIBRARIES = libgio-2.0.la
-+
-+marshal_sources = \
-+        gio-marshal.h	\
-+        gio-marshal.c	\
-+	$(NULL)
-+
-+if CROSS_COMPILING
-+  glib_genmarshal=$(GLIB_GENMARSHAL)
-+else
-+  glib_genmarshal=../gobject/glib-genmarshal
-+endif
-+
-+gio-marshal.h: gio-marshal.list
-+	$(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \
-+	  mv $@.tmp $@
-+
-+gio-marshal.c: gio-marshal.h gio-marshal.list
-+	(echo "#include \"gio-marshal.h\""; \
-+	$(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \
-+	  mv $@.tmp $@
-+
-+local_sources = \
-+	glocaldirectorymonitor.c 	\
-+	glocaldirectorymonitor.h 	\
-+	glocalfile.c 			\
-+	glocalfile.h 			\
-+	glocalfileenumerator.c 		\
-+	glocalfileenumerator.h 		\
-+	glocalfileinfo.c 		\
-+	glocalfileinfo.h 		\
-+	glocalfileinputstream.c 	\
-+	glocalfileinputstream.h 	\
-+	glocalfilemonitor.c 		\
-+	glocalfilemonitor.h 		\
-+	glocalfileoutputstream.c 	\
-+	glocalfileoutputstream.h 	\
-+	glocalvfs.c 			\
-+	glocalvfs.h 			\
-+	$(NULL)
-+
-+platform_libadd =
-+platform_deps =
-+appinfo_sources =
-+
-+if HAVE_INOTIFY
-+SUBDIRS += inotify
-+platform_libadd += inotify/libinotify.la
-+platform_deps += inotify/libinotify.la
-+endif
-+
-+if HAVE_FEN
-+AM_CPPFLAGS += -DHAVE_FEN
-+SUBDIRS += fen
-+platform_libadd += fen/libfen.la
-+platform_deps += fen/libfen.la
-+endif
-+
-+if OS_WIN32
-+SUBDIRS += win32
-+platform_libadd += win32/libgiowin32.la
-+platform_deps += win32/libgiowin32.la
-+endif
-+
-+
-+SUBDIRS += .
-+
-+if HAVE_FAM
-+SUBDIRS += fam
-+endif
-+
-+if OS_UNIX
-+appinfo_sources += gdesktopappinfo.c gdesktopappinfo.h
-+platform_libadd += xdgmime/libxdgmime.la
-+platform_deps += xdgmime/libxdgmime.la
-+unix_sources = \
-+	gunixmount.c		\
-+	gunixmount.h		\
-+	gunixmounts.c 		\
-+	gunixmounts.h 		\
-+	gunixvolume.c 		\
-+	gunixvolume.h 		\
-+	gunixvolumemonitor.c 	\
-+	gunixvolumemonitor.h 	\
-+	gunixinputstream.c 	\
-+	gunixoutputstream.c 	\
-+	$(NULL)
-+
-+
-+giounixincludedir=$(includedir)/gio-unix-2.0/gio
-+giounixinclude_HEADERS = \
-+	gdesktopappinfo.h	\
-+	gunixmounts.h 		\
-+	gunixinputstream.h 	\
-+	gunixoutputstream.h 	\
-+	$(NULL)
-+endif
-+
-+if OS_WIN32
-+appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-+platform_libadd += -lshlwapi
-+win32_sources = \
-+	gwin32mount.c \
-+	gwin32mount.h \
-+	gwin32volumemonitor.c \
-+	gwin32volumemonitor.h \
-+	$(NULL)
-+
-+endif
-+
-+SUBDIRS += tests
-+
-+libgio_2_0_la_SOURCES =		\
-+	gappinfo.c 		\
-+	gasynchelper.c 		\
-+	gasynchelper.h 		\
-+	gasyncresult.c 		\
-+	gbufferedinputstream.c 	\
-+	gbufferedoutputstream.c \
-+	gcancellable.c 		\
-+	gcontenttype.c 		\
-+	gcontenttypeprivate.h 	\
-+	gdatainputstream.c 	\
-+	gdataoutputstream.c 	\
-+	gdrive.c 		\
-+	gdummyfile.h 		\
-+	gdummyfile.c 		\
-+	gemblem.h 		\
-+	gemblem.c 		\
-+	gemblemedicon.h		\
-+	gemblemedicon.c		\
-+	gfile.c 		\
-+	gfileattribute.c 	\
-+	gfileattribute-priv.h 	\
-+	gfileenumerator.c 	\
-+	gfileicon.c 		\
-+	gfileinfo.c 		\
-+	gfileinputstream.c 	\
-+	gfilemonitor.c 		\
-+	gfilenamecompleter.c 	\
-+	gfileoutputstream.c 	\
-+	gfilterinputstream.c 	\
-+	gfilteroutputstream.c 	\
-+	gicon.c 		\
-+	ginputstream.c 		\
-+	gioenums.h		\
-+	gioerror.c 		\
-+	giomodule.c 		\
-+	giomodule-priv.h	\
-+	gioscheduler.c 		\
-+	gloadableicon.c 	\
-+	gmount.c 		\
-+	gmemoryinputstream.c 	\
-+	gmemoryoutputstream.c 	\
-+	gmountoperation.c 	\
-+	gnativevolumemonitor.c 	\
-+	gnativevolumemonitor.h 	\
-+	goutputstream.c 	\
-+	gpollfilemonitor.c 	\
-+	gpollfilemonitor.h 	\
-+	gseekable.c 		\
-+	gsimpleasyncresult.c 	\
-+	gthemedicon.c 		\
-+	gunionvolumemonitor.c 	\
-+	gunionvolumemonitor.h 	\
-+	gvfs.c 			\
-+	gvolume.c 		\
-+	gvolumemonitor.c 	\
-+	gmountprivate.h 	\
-+	gioenumtypes.h		\
-+	gioenumtypes.c		\
-+	gioalias.h 		\
-+	gioaliasdef.c		\
-+	$(appinfo_sources) 	\
-+	$(unix_sources) 	\
-+	$(win32_sources) 	\
-+	$(local_sources) 	\
-+	$(marshal_sources) 	\
-+	$(NULL)
-+
-+$(libgio_2_0_la_OBJECTS): $(marshal_sources)
-+
-+libgio_2_0_la_LIBADD = \
-+	$(top_builddir)/glib/libglib-2.0.la 		\
-+	$(top_builddir)/gobject/libgobject-2.0.la 	\
-+	$(top_builddir)/gmodule/libgmodule-2.0.la 	\
-+	$(platform_libadd) 				\
-+	$(SELINUX_LIBS) 				\
-+	$(GLIB_LIBS) 					\
-+	$(XATTR_LIBS) 					\
-+	$(NULL)
-+
-+if PLATFORM_WIN32
-+no_undefined = -no-undefined
-+endif
-+
-+if OS_WIN32_AND_DLL_COMPILATION
-+export_symbols = -export-symbols gio.def
-+gio_def = gio.def
-+
-+install-def-file:
-+	$(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def
-+
-+uninstall-def-file:
-+	-rm $(DESTDIR)$(libdir)/gio-2.0.def
-+else
-+install-def-file:
-+uninstall-def-file:
-+
-+export_symbols = -export-symbols-regex '^g_.*'
-+endif
-+
-+install-data-local: install-ms-lib install-def-file
-+	$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
-+
-+uninstall-local: uninstall-ms-lib uninstall-def-file
-+
-+libgio_2_0_la_LDFLAGS = \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-export-dynamic $(no_undefined) $(export_symbols)
-+
-+libgio_2_0_la_DEPENDENCIES = $(gio_def) $(platform_deps)
-+
-+gio_headers =			\
-+	gappinfo.h 		\
-+	gasyncresult.h 		\
-+	gbufferedinputstream.h 	\
-+	gbufferedoutputstream.h \
-+	gcancellable.h 		\
-+	gcontenttype.h 		\
-+	gdatainputstream.h 	\
-+	gdataoutputstream.h 	\
-+	gdrive.h 		\
-+	gemblem.h 		\
-+	gemblemedicon.h		\
-+	gfile.h 		\
-+	gfileattribute.h 	\
-+	gfileenumerator.h 	\
-+	gfileicon.h 		\
-+	gfileinfo.h 		\
-+	gfileinputstream.h 	\
-+	gfilemonitor.h 		\
-+	gfilenamecompleter.h 	\
-+	gfileoutputstream.h 	\
-+	gfilterinputstream.h 	\
-+	gfilteroutputstream.h 	\
-+	gicon.h 		\
-+	ginputstream.h 		\
-+	gio.h			\
-+	giotypes.h		\
-+	gioenums.h		\
-+	gioerror.h 		\
-+	giomodule.h 		\
-+	gioscheduler.h 		\
-+	gloadableicon.h 	\
-+	gmount.h 		\
-+	gmemoryinputstream.h 	\
-+	gmemoryoutputstream.h 	\
-+	gmountoperation.h 	\
-+	gnativevolumemonitor.h 	\
-+	goutputstream.h 	\
-+	gseekable.h 		\
-+	gsimpleasyncresult.h 	\
-+	gthemedicon.h 		\
-+	gvfs.h 			\
-+	gvolume.h 		\
-+	gvolumemonitor.h 	\
-+	$(NULL)
-+
-+gioincludedir=$(includedir)/glib-2.0/gio/
-+gioinclude_HEADERS = 		\
-+	$(gio_headers)		\
-+	gioenumtypes.h
-+
-+# these sources (also mentioned above) are generated.
-+BUILT_SOURCES = 		\
-+	gio-marshal.h 		\
-+	gio-marshal.c 		\
-+	gioalias.h 		\
-+	gioaliasdef.c		\
-+	gioenumtypes.h		\
-+	gioenumtypes.c		\
-+	$(NULL)
-+
-+EXTRA_DIST += 			\
-+	gio-marshal.list	\
-+	gio.symbols		\
-+	gioenumtypes.h.template	\
-+	gioenumtypes.c.template	\
-+	makefile.msc		\
-+	makegioalias.pl		\
-+	abicheck.sh		\
-+	pltcheck.sh		\
-+	$(NULL)
-+
-+CLEANFILES = 			\
-+	$(marshal_sources)	\
-+	$(NULL)
-+
-+gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
-+	( top_builddir=`cd $(top_builddir) && pwd`; \
-+	  cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
-+	    gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
-+
-+gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
-+	( top_builddir=`cd $(top_builddir) && pwd`; \
-+	  cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
-+	    gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
-+
-+gio-2.0.lib: libgio-2.0.la gio.def
-+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@
-diff -Naur glib-2.18.3-virgin/gio/gunixinputstream.c glib-2.18.3/gio/gunixinputstream.c
---- glib-2.18.3-virgin/gio/gunixinputstream.c	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/gunixinputstream.c	2008-12-15 14:46:58.000000000 +0000
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -171,6 +173,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -226,6 +231,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -331,6 +337,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) &&!defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -353,6 +360,7 @@
-   g_source_attach (source, NULL);
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -Naur glib-2.18.3-virgin/gio/gunixmounts.c glib-2.18.3/gio/gunixmounts.c
---- glib-2.18.3-virgin/gio/gunixmounts.c	2008-12-15 14:14:01.000000000 +0000
-+++ glib-2.18.3/gio/gunixmounts.c	2008-12-15 14:48:11.000000000 +0000
-@@ -594,6 +594,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -974,6 +984,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -Naur glib-2.18.3-virgin/gio/gunixoutputstream.c glib-2.18.3/gio/gunixoutputstream.c
---- glib-2.18.3-virgin/gio/gunixoutputstream.c	2008-12-15 14:14:01.000000000 +0000
-+++ glib-2.18.3/gio/gunixoutputstream.c	2008-12-15 14:49:48.000000000 +0000
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -159,6 +161,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -215,6 +220,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -320,6 +326,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -342,6 +349,7 @@
-   g_source_attach (source, NULL);
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -Naur glib-2.18.3-virgin/gio/makegioalias.pl glib-2.18.3/gio/makegioalias.pl
---- glib-2.18.3-virgin/gio/makegioalias.pl	2008-12-15 14:14:01.000000000 +0000
-+++ glib-2.18.3/gio/makegioalias.pl	2008-12-15 14:42:41.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -Naur glib-2.18.3-virgin/gio/xdgmime/xdgmimealias.c glib-2.18.3/gio/xdgmime/xdgmimealias.c
---- glib-2.18.3-virgin/gio/xdgmime/xdgmimealias.c	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/xdgmime/xdgmimealias.c	2008-12-15 14:42:41.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-virgin/gio/xdgmime/xdgmimecache.c glib-2.18.3/gio/xdgmime/xdgmimecache.c
---- glib-2.18.3-virgin/gio/xdgmime/xdgmimecache.c	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/xdgmime/xdgmimecache.c	2008-12-15 14:42:41.000000000 +0000
-@@ -34,7 +34,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- #include <assert.h>
- 
- #include <netinet/in.h> /* for ntohl/ntohs */
-diff -Naur glib-2.18.3-virgin/gio/xdgmime/xdgmimeglob.c glib-2.18.3/gio/xdgmime/xdgmimeglob.c
---- glib-2.18.3-virgin/gio/xdgmime/xdgmimeglob.c	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/xdgmime/xdgmimeglob.c	2008-12-15 14:42:41.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-virgin/gio/xdgmime/xdgmimeparent.c glib-2.18.3/gio/xdgmime/xdgmimeparent.c
---- glib-2.18.3-virgin/gio/xdgmime/xdgmimeparent.c	2008-12-15 14:14:02.000000000 +0000
-+++ glib-2.18.3/gio/xdgmime/xdgmimeparent.c	2008-12-15 14:42:41.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -Naur glib-2.18.3-virgin/glib/Makefile.am glib-2.18.3/glib/Makefile.am
---- glib-2.18.3-virgin/glib/Makefile.am	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/Makefile.am	2008-12-15 14:42:41.000000000 +0000
-@@ -19,7 +19,7 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-diff -Naur glib-2.18.3-virgin/glib/gbacktrace.c glib-2.18.3/glib/gbacktrace.c
---- glib-2.18.3-virgin/glib/gbacktrace.c	2008-12-15 14:14:08.000000000 +0000
-+++ glib-2.18.3/glib/gbacktrace.c	2008-12-15 15:04:11.000000000 +0000
-@@ -158,7 +158,7 @@
- void
- g_on_error_stack_trace (const gchar *prg_name)
- {
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   pid_t pid;
-   gchar buf[16];
-   gchar *args[4] = { "gdb", NULL, NULL, NULL };
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-diff -Naur glib-2.18.3-virgin/glib/gmain.c glib-2.18.3/glib/gmain.c
---- glib-2.18.3-virgin/glib/gmain.c	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/gmain.c	2008-12-15 14:53:50.000000000 +0000
-@@ -82,6 +82,12 @@
- #include <sys/wait.h>
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+#include "fcntl.h"
-+#endif /* G_OS_HAIKU */
-+
- #ifdef G_OS_UNIX
- #include <fcntl.h>
- #include <sys/wait.h>
-@@ -569,6 +575,10 @@
- #undef NO_FD_SET
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#undef NO_FD_SET
-+#endif /* G_OS_HAIKU */
-+
- #ifndef NO_FD_SET
- #  define SELECT_MASK fd_set
- #else /* !NO_FD_SET */
-@@ -4022,6 +4032,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -4041,6 +4052,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-diff -Naur glib-2.18.3-virgin/glib/gslice.c glib-2.18.3/glib/gslice.c
---- glib-2.18.3-virgin/glib/gslice.c	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/gslice.c	2008-12-15 14:42:41.000000000 +0000
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-diff -Naur glib-2.18.3-virgin/glib/gspawn.c glib-2.18.3/glib/gspawn.c
---- glib-2.18.3-virgin/glib/gspawn.c	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/gspawn.c	2008-12-15 14:55:23.000000000 +0000
-@@ -238,6 +238,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -433,6 +436,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -908,7 +912,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   struct rlimit rl;
- #endif
- 
-@@ -951,7 +955,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-diff -Naur glib-2.18.3-virgin/glib/gstdio.c glib-2.18.3/glib/gstdio.c
---- glib-2.18.3-virgin/glib/gstdio.c	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/gstdio.c	2008-12-15 14:56:19.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined(G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -Naur glib-2.18.3-virgin/glib/gstrfuncs.c glib-2.18.3/glib/gstrfuncs.c
---- glib-2.18.3-virgin/glib/gstrfuncs.c	2008-12-15 14:14:09.000000000 +0000
-+++ glib-2.18.3/glib/gstrfuncs.c	2008-12-15 15:01:39.000000000 +0000
-@@ -1328,7 +1328,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -Naur glib-2.18.3-virgin/glib/gtester.c glib-2.18.3/glib/gtester.c
---- glib-2.18.3-virgin/glib/gtester.c	2008-12-15 14:14:08.000000000 +0000
-+++ glib-2.18.3/glib/gtester.c	2008-12-15 14:42:41.000000000 +0000
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-diff -Naur glib-2.18.3-virgin/glib/gutils.c glib-2.18.3/glib/gutils.c
---- glib-2.18.3-virgin/glib/gutils.c	2008-12-15 14:14:08.000000000 +0000
-+++ glib-2.18.3/glib/gutils.c	2008-12-15 15:03:09.000000000 +0000
-@@ -458,7 +458,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-@@ -2279,6 +2279,21 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("$HOME");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
- #if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
-diff -Naur glib-2.18.3-virgin/glib/makegalias.pl glib-2.18.3/glib/makegalias.pl
---- glib-2.18.3-virgin/glib/makegalias.pl	2008-12-15 14:14:08.000000000 +0000
-+++ glib-2.18.3/glib/makegalias.pl	2008-12-15 14:42:41.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -Naur glib-2.18.3-virgin/gobject/makegobjectalias.pl glib-2.18.3/gobject/makegobjectalias.pl
---- glib-2.18.3-virgin/gobject/makegobjectalias.pl	2008-12-15 14:14:10.000000000 +0000
-+++ glib-2.18.3/gobject/makegobjectalias.pl	2008-12-15 14:42:41.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
diff --git a/dev-libs/glib/patches/glib-2.19.2-haiku.diff b/dev-libs/glib/patches/glib-2.19.2-haiku.diff
deleted file mode 100644
index a80f1dde1..000000000
--- a/dev-libs/glib/patches/glib-2.19.2-haiku.diff
+++ /dev/null
@@ -1,494 +0,0 @@
-diff -urN glib-2.19.2/configure.in glib-2.19.2-haiku/configure.in
---- glib-2.19.2/configure.in	2008-12-18 07:13:29.000000000 -0800
-+++ glib-2.19.2-haiku/configure.in	2008-12-18 07:36:31.000000000 -0800
-@@ -112,6 +112,17 @@
- esac
- AC_MSG_RESULT([$glib_native_beos])
- 
-+AC_MSG_CHECKING([for Haiku])
-+case $host in
-+  *-*-haiku*)
-+    glib_native_haiku="yes"
-+    ;;
-+  *)
-+    glib_native_haiku="no"
-+    ;;
-+esac
-+AC_MSG_RESULT([$glib_native_haiku])
-+
- dnl
- 
- AC_MSG_CHECKING([for Win32])
-@@ -358,7 +369,7 @@
-   AC_PATH_PROG(PERL_PATH, [$PERL])
- fi
- if test "x$PERL_PATH" = x ; then
--  PERL_PATH="/usr/bin/env perl"
-+  PERL_PATH="/bin/env perl"
- fi
- AC_SUBST(PERL_PATH)
- 
-@@ -3277,11 +3288,18 @@
-   *-*-beos*)
-     glib_os="#define G_OS_BEOS"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU
-+#define G_OS_UNIX"
-+    ;;
-   *-*-cygwin*)
-     glib_os="#define G_OS_UNIX
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-mingw*)
-     glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
-diff -urN glib-2.19.2/docs/reference/glib/glib-overrides.txt glib-2.19.2-haiku/docs/reference/glib/glib-overrides.txt
---- glib-2.19.2/docs/reference/glib/glib-overrides.txt	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/glib-overrides.txt	2008-12-18 07:35:30.000000000 -0800
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -urN glib-2.19.2/docs/reference/glib/glib-sections.txt glib-2.19.2-haiku/docs/reference/glib/glib-sections.txt
---- glib-2.19.2/docs/reference/glib/glib-sections.txt	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/glib-sections.txt	2008-12-18 07:36:44.000000000 -0800
-@@ -125,7 +125,9 @@
- <SUBSECTION>
- G_OS_WIN32
- G_OS_BEOS
-+G_OS_HAIKU
- G_OS_UNIX
-+G_OS_HAIKU
- 
- <SUBSECTION>
- G_DIR_SEPARATOR
-diff -urN glib-2.19.2/docs/reference/glib/html/glib-Standard-Macros.html glib-2.19.2-haiku/docs/reference/glib/html/glib-Standard-Macros.html
---- glib-2.19.2/docs/reference/glib/html/glib-Standard-Macros.html	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/html/glib-Standard-Macros.html	2008-12-18 07:35:30.000000000 -0800
-@@ -61,6 +61,7 @@
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS" title="G_OS_WIN32">G_OS_WIN32</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS" title="G_OS_BEOS">G_OS_BEOS</a>
-+#define             <a class="link" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS" title="G_OS_HAIKU">G_OS_HAIKU</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS" title="G_OS_UNIX">G_OS_UNIX</a>
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS" title="G_DIR_SEPARATOR">G_DIR_SEPARATOR</a>
-@@ -116,6 +117,15 @@
- BeOS-specific code in "#ifdef G_OS_BEOS".
- </p>
- </div>
-+<div class="refsect2" lang="en">
-+<a name="G-OS-HAIKU--CAPS"></a><h3>G_OS_HAIKU</h3>
-+<pre class="programlisting">#define G_OS_HAIKU
-+</pre>
-+<p>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "#ifdef G_OS_HAIKU".
-+</p>
-+</div>
- <hr>
- <div class="refsect2" lang="en">
- <a name="G-OS-UNIX--CAPS"></a><h3>G_OS_UNIX</h3>
-diff -urN glib-2.19.2/docs/reference/glib/html/glib.devhelp glib-2.19.2-haiku/docs/reference/glib/html/glib.devhelp
---- glib-2.19.2/docs/reference/glib/html/glib.devhelp	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/html/glib.devhelp	2008-12-18 07:35:30.000000000 -0800
-@@ -190,6 +190,7 @@
-     <function name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <function name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <function name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <function name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <function name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <function name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <function name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.19.2/docs/reference/glib/html/glib.devhelp2 glib-2.19.2-haiku/docs/reference/glib/html/glib.devhelp2
---- glib-2.19.2/docs/reference/glib/html/glib.devhelp2	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/html/glib.devhelp2	2008-12-18 07:35:30.000000000 -0800
-@@ -190,6 +190,7 @@
-     <keyword type="macro" name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <keyword type="macro" name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <keyword type="macro" name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <keyword type="macro" name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <keyword type="macro" name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.19.2/docs/reference/glib/html/ix01.html glib-2.19.2-haiku/docs/reference/glib/html/ix01.html
---- glib-2.19.2/docs/reference/glib/html/ix01.html	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/html/ix01.html	2008-12-18 07:35:30.000000000 -0800
-@@ -2115,6 +2115,8 @@
- </dt>
- <dt>G_OS_BEOS, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS">G_OS_BEOS</a>
- </dt>
-+<dt>G_OS_HAIKU, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS">G_OS_HAIKU</a>
-+</dt>
- <dt>G_OS_UNIX, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS">G_OS_UNIX</a>
- </dt>
- <dt>G_OS_WIN32, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS">G_OS_WIN32</a>
-diff -urN glib-2.19.2/docs/reference/glib/tmpl/macros.sgml glib-2.19.2-haiku/docs/reference/glib/tmpl/macros.sgml
---- glib-2.19.2/docs/reference/glib/tmpl/macros.sgml	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/tmpl/macros.sgml	2008-12-18 07:36:44.000000000 -0800
-@@ -31,6 +31,19 @@
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para>
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
-+
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
- 
- 
- <!-- ##### MACRO G_OS_UNIX ##### -->
-diff -urN glib-2.19.2/docs/reference/glib/xml/api-index-full.xml glib-2.19.2-haiku/docs/reference/glib/xml/api-index-full.xml
---- glib-2.19.2/docs/reference/glib/xml/api-index-full.xml	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/xml/api-index-full.xml	2008-12-18 07:35:30.000000000 -0800
-@@ -1024,6 +1024,7 @@
- <indexentry><primaryie linkends="g-option-group-set-translation-domain"><link linkend="g-option-group-set-translation-domain">g_option_group_set_translation_domain</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OPTION-REMAINING--CAPS"><link linkend="G-OPTION-REMAINING--CAPS">G_OPTION_REMAINING</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-BEOS--CAPS"><link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link></primaryie></indexentry>
-+<indexentry><primaryie linkends="G-OS-HAIKU--CAPS"><link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-UNIX--CAPS"><link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-WIN32--CAPS"><link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link></primaryie></indexentry>
- </indexdiv>
-diff -urN glib-2.19.2/docs/reference/glib/xml/macros.xml glib-2.19.2-haiku/docs/reference/glib/xml/macros.xml
---- glib-2.19.2/docs/reference/glib/xml/macros.xml	2008-12-18 07:13:28.000000000 -0800
-+++ glib-2.19.2-haiku/docs/reference/glib/xml/macros.xml	2008-12-18 07:36:44.000000000 -0800
-@@ -19,6 +19,7 @@
- 
- #define             <link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link>
- #define             <link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link>
-+#define             <link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link>
- #define             <link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link>
- 
- #define             <link linkend="G-DIR-SEPARATOR--CAPS">G_DIR_SEPARATOR</link>
-@@ -81,6 +82,14 @@
- This macro is defined only on BeOS. So you can bracket
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para></refsect2>
-+<refsect2 id="G-OS-HAIKU--CAPS" role="macro">
-+<title>G_OS_HAIKU</title>
-+<indexterm zone="G-OS-HAIKU--CAPS"><primary sortas="G_OS_HAIKU">G_OS_HAIKU</primary></indexterm><programlisting>#define G_OS_HAIKU
-+</programlisting>
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para></refsect2>
- <refsect2 id="G-OS-UNIX--CAPS" role="macro">
- <title>G_OS_UNIX</title>
- <indexterm zone="G-OS-UNIX--CAPS"><primary sortas="OS_UNIX">G_OS_UNIX</primary></indexterm><programlisting>#define G_OS_UNIX
-diff -urN glib-2.19.2/gio/gunixinputstream.c glib-2.19.2-haiku/gio/gunixinputstream.c
---- glib-2.19.2/gio/gunixinputstream.c	2008-12-18 07:13:27.000000000 -0800
-+++ glib-2.19.2-haiku/gio/gunixinputstream.c	2008-12-18 07:35:30.000000000 -0800
-@@ -170,6 +170,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -220,6 +223,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -325,6 +329,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) &&!defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -347,6 +352,7 @@
-   g_source_attach (source, NULL);
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.19.2/gio/gunixmounts.c glib-2.19.2-haiku/gio/gunixmounts.c
---- glib-2.19.2/gio/gunixmounts.c	2008-12-18 07:13:26.000000000 -0800
-+++ glib-2.19.2-haiku/gio/gunixmounts.c	2008-12-18 07:36:44.000000000 -0800
-@@ -594,6 +594,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -974,6 +984,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -urN glib-2.19.2/gio/gunixoutputstream.c glib-2.19.2-haiku/gio/gunixoutputstream.c
---- glib-2.19.2/gio/gunixoutputstream.c	2008-12-18 07:13:26.000000000 -0800
-+++ glib-2.19.2-haiku/gio/gunixoutputstream.c	2008-12-18 07:35:31.000000000 -0800
-@@ -158,6 +158,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -209,6 +212,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -314,6 +318,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -336,6 +341,7 @@
-   g_source_attach (source, NULL);
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.19.2/glib/gbacktrace.c glib-2.19.2-haiku/glib/gbacktrace.c
---- glib-2.19.2/glib/gbacktrace.c	2008-12-18 07:13:31.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gbacktrace.c	2008-12-18 07:35:31.000000000 -0800
-@@ -158,7 +158,7 @@
- void
- g_on_error_stack_trace (const gchar *prg_name)
- {
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   pid_t pid;
-   gchar buf[16];
-   gchar *args[4] = { "gdb", NULL, NULL, NULL };
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-diff -urN glib-2.19.2/glib/gmain.c glib-2.19.2-haiku/glib/gmain.c
---- glib-2.19.2/glib/gmain.c	2008-12-18 07:13:43.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gmain.c	2008-12-18 07:35:31.000000000 -0800
-@@ -70,6 +70,12 @@
- #include <sys/wait.h>
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+#include "fcntl.h"
-+#endif /* G_OS_HAIKU */
-+
- #ifdef G_OS_UNIX
- #include <fcntl.h>
- #include <sys/wait.h>
-@@ -3701,6 +3707,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -3720,6 +3727,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-diff -urN glib-2.19.2/glib/gslice.c glib-2.19.2-haiku/glib/gslice.c
---- glib-2.19.2/glib/gslice.c	2008-12-18 07:13:55.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gslice.c	2008-12-18 07:35:31.000000000 -0800
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-diff -urN glib-2.19.2/glib/gspawn.c glib-2.19.2-haiku/glib/gspawn.c
---- glib-2.19.2/glib/gspawn.c	2008-12-18 07:13:48.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gspawn.c	2008-12-18 07:35:31.000000000 -0800
-@@ -238,6 +238,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -433,6 +436,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -908,7 +912,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   struct rlimit rl;
- #endif
- 
-@@ -951,7 +955,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-diff -urN glib-2.19.2/glib/gstdio.c glib-2.19.2-haiku/glib/gstdio.c
---- glib-2.19.2/glib/gstdio.c	2008-12-18 07:13:55.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gstdio.c	2008-12-18 07:36:44.000000000 -0800
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined(G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.19.2/glib/gstrfuncs.c glib-2.19.2-haiku/glib/gstrfuncs.c
---- glib-2.19.2/glib/gstrfuncs.c	2008-12-18 07:13:40.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gstrfuncs.c	2008-12-18 07:35:31.000000000 -0800
-@@ -1328,7 +1328,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -urN glib-2.19.2/glib/gtester.c glib-2.19.2-haiku/glib/gtester.c
---- glib-2.19.2/glib/gtester.c	2008-12-18 07:13:35.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gtester.c	2008-12-18 07:35:31.000000000 -0800
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-diff -urN glib-2.19.2/glib/gutils.c glib-2.19.2-haiku/glib/gutils.c
---- glib-2.19.2/glib/gutils.c	2008-12-18 07:13:36.000000000 -0800
-+++ glib-2.19.2-haiku/glib/gutils.c	2008-12-18 08:28:37.000000000 -0800
-@@ -478,7 +478,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-@@ -2311,9 +2311,24 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("$HOME");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
--#if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
-+#if defined(G_OS_UNIX) && !defined(HAVE_CARBON) && !defined(G_OS_HAIKU)
- 
- /* adapted from xdg-user-dir-lookup.c
-  *
diff --git a/dev-libs/glib/patches/glib-2.19.6-haiku.patch b/dev-libs/glib/patches/glib-2.19.6-haiku.patch
deleted file mode 100644
index 4013823d7..000000000
--- a/dev-libs/glib/patches/glib-2.19.6-haiku.patch
+++ /dev/null
@@ -1,552 +0,0 @@
-diff -urN glib-2.19.6/configure.in glib-2.19.6-haiku/configure.in
---- glib-2.19.6/configure.in	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/configure.in	2009-02-08 07:48:49.000000000 +0000
-@@ -112,6 +112,17 @@
- esac
- AC_MSG_RESULT([$glib_native_beos])
- 
-+AC_MSG_CHECKING([for Haiku])
-+case $host in
-+  *-*-haiku*)
-+    glib_native_haiku="yes"
-+    ;;
-+  *)
-+    glib_native_haiku="no"
-+    ;;
-+esac
-+AC_MSG_RESULT([$glib_native_haiku])
-+
- dnl
- 
- AC_MSG_CHECKING([for Win32])
-@@ -3301,6 +3312,9 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-mingw*)
-     glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
-diff -urN glib-2.19.6/docs/reference/glib/glib-overrides.txt glib-2.19.6-haiku/docs/reference/glib/glib-overrides.txt
---- glib-2.19.6/docs/reference/glib/glib-overrides.txt	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/glib-overrides.txt	2009-02-08 07:48:49.000000000 +0000
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -urN glib-2.19.6/docs/reference/glib/glib-sections.txt glib-2.19.6-haiku/docs/reference/glib/glib-sections.txt
---- glib-2.19.6/docs/reference/glib/glib-sections.txt	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/glib-sections.txt	2009-02-08 07:48:49.000000000 +0000
-@@ -126,6 +126,7 @@
- <SUBSECTION>
- G_OS_WIN32
- G_OS_BEOS
-+G_OS_HAIKU
- G_OS_UNIX
- 
- <SUBSECTION>
-diff -urN glib-2.19.6/docs/reference/glib/html/glib-Standard-Macros.html glib-2.19.6-haiku/docs/reference/glib/html/glib-Standard-Macros.html
---- glib-2.19.6/docs/reference/glib/html/glib-Standard-Macros.html	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/html/glib-Standard-Macros.html	2009-02-08 07:48:49.000000000 +0000
-@@ -61,6 +61,7 @@
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS" title="G_OS_WIN32">G_OS_WIN32</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS" title="G_OS_BEOS">G_OS_BEOS</a>
-+#define             <a class="link" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS" title="G_OS_HAIKU">G_OS_HAIKU</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS" title="G_OS_UNIX">G_OS_UNIX</a>
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS" title="G_DIR_SEPARATOR">G_DIR_SEPARATOR</a>
-@@ -116,6 +117,15 @@
- BeOS-specific code in "#ifdef G_OS_BEOS".
- </p>
- </div>
-+<div class="refsect2" lang="en">
-+<a name="G-OS-HAIKU--CAPS"></a><h3>G_OS_HAIKU</h3>
-+<pre class="programlisting">#define G_OS_HAIKU
-+</pre>
-+<p>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "#ifdef G_OS_HAIKU".
-+</p>
-+</div>
- <hr>
- <div class="refsect2" lang="en">
- <a name="G-OS-UNIX--CAPS"></a><h3>G_OS_UNIX</h3>
-diff -urN glib-2.19.6/docs/reference/glib/html/glib.devhelp glib-2.19.6-haiku/docs/reference/glib/html/glib.devhelp
---- glib-2.19.6/docs/reference/glib/html/glib.devhelp	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/html/glib.devhelp	2009-02-08 07:48:49.000000000 +0000
-@@ -191,6 +191,7 @@
-     <function name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <function name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <function name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <function name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <function name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <function name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <function name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.19.6/docs/reference/glib/html/glib.devhelp2 glib-2.19.6-haiku/docs/reference/glib/html/glib.devhelp2
---- glib-2.19.6/docs/reference/glib/html/glib.devhelp2	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/html/glib.devhelp2	2009-02-08 07:48:49.000000000 +0000
-@@ -191,6 +191,7 @@
-     <keyword type="macro" name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <keyword type="macro" name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <keyword type="macro" name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <keyword type="macro" name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <keyword type="macro" name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.19.6/docs/reference/glib/html/ix01.html glib-2.19.6-haiku/docs/reference/glib/html/ix01.html
---- glib-2.19.6/docs/reference/glib/html/ix01.html	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/html/ix01.html	2009-02-08 07:48:50.000000000 +0000
-@@ -2121,6 +2121,8 @@
- </dt>
- <dt>G_OS_BEOS, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS">G_OS_BEOS</a>
- </dt>
-+<dt>G_OS_HAIKU, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS">G_OS_HAIKU</a>
-+</dt>
- <dt>G_OS_UNIX, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS">G_OS_UNIX</a>
- </dt>
- <dt>G_OS_WIN32, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS">G_OS_WIN32</a>
-diff -urN glib-2.19.6/docs/reference/glib/tmpl/macros.sgml glib-2.19.6-haiku/docs/reference/glib/tmpl/macros.sgml
---- glib-2.19.6/docs/reference/glib/tmpl/macros.sgml	2009-02-08 07:46:22.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/tmpl/macros.sgml	2009-02-08 07:48:50.000000000 +0000
-@@ -33,6 +33,14 @@
- 
- 
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
-+
-+
- <!-- ##### MACRO G_OS_UNIX ##### -->
- <para>
- This macro is defined only on UNIX. So you can bracket
-diff -urN glib-2.19.6/docs/reference/glib/xml/api-index-full.xml glib-2.19.6-haiku/docs/reference/glib/xml/api-index-full.xml
---- glib-2.19.6/docs/reference/glib/xml/api-index-full.xml	2009-02-08 07:46:23.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/xml/api-index-full.xml	2009-02-08 07:48:50.000000000 +0000
-@@ -1027,6 +1027,7 @@
- <indexentry><primaryie linkends="g-option-group-set-translation-domain"><link linkend="g-option-group-set-translation-domain">g_option_group_set_translation_domain</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OPTION-REMAINING--CAPS"><link linkend="G-OPTION-REMAINING--CAPS">G_OPTION_REMAINING</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-BEOS--CAPS"><link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link></primaryie></indexentry>
-+<indexentry><primaryie linkends="G-OS-HAIKU--CAPS"><link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-UNIX--CAPS"><link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-WIN32--CAPS"><link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link></primaryie></indexentry>
- </indexdiv>
-diff -urN glib-2.19.6/docs/reference/glib/xml/macros.xml glib-2.19.6-haiku/docs/reference/glib/xml/macros.xml
---- glib-2.19.6/docs/reference/glib/xml/macros.xml	2009-02-08 07:46:23.000000000 +0000
-+++ glib-2.19.6-haiku/docs/reference/glib/xml/macros.xml	2009-02-08 07:48:50.000000000 +0000
-@@ -19,6 +19,7 @@
- 
- #define             <link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link>
- #define             <link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link>
-+#define             <link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link>
- #define             <link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link>
- 
- #define             <link linkend="G-DIR-SEPARATOR--CAPS">G_DIR_SEPARATOR</link>
-@@ -81,6 +82,14 @@
- This macro is defined only on BeOS. So you can bracket
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para></refsect2>
-+<refsect2 id="G-OS-HAIKU--CAPS" role="macro">
-+<title>G_OS_HAIKU</title>
-+<indexterm zone="G-OS-HAIKU--CAPS"><primary sortas="G_OS_HAIKU">G_OS_HAIKU</primary></indexterm><programlisting>#define G_OS_HAIKU
-+</programlisting>
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para></refsect2>
- <refsect2 id="G-OS-UNIX--CAPS" role="macro">
- <title>G_OS_UNIX</title>
- <indexterm zone="G-OS-UNIX--CAPS"><primary sortas="OS_UNIX">G_OS_UNIX</primary></indexterm><programlisting>#define G_OS_UNIX
-diff -urN glib-2.19.6/gio/Makefile.am glib-2.19.6-haiku/gio/Makefile.am
---- glib-2.19.6/gio/Makefile.am	2009-02-08 07:46:25.000000000 +0000
-+++ glib-2.19.6-haiku/gio/Makefile.am	2009-02-08 07:48:50.000000000 +0000
-@@ -162,7 +162,7 @@
- 
- endif
- 
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-diff -urN glib-2.19.6/gio/gunixinputstream.c glib-2.19.6-haiku/gio/gunixinputstream.c
---- glib-2.19.6/gio/gunixinputstream.c	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/gunixinputstream.c	2009-02-08 07:48:50.000000000 +0000
-@@ -333,6 +333,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -383,6 +386,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -488,6 +492,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) &&!defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -510,6 +515,7 @@
-   g_source_attach (source, NULL);
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.19.6/gio/gunixmounts.c glib-2.19.6-haiku/gio/gunixmounts.c
---- glib-2.19.6/gio/gunixmounts.c	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/gunixmounts.c	2009-02-08 07:48:50.000000000 +0000
-@@ -597,6 +597,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -975,6 +985,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -urN glib-2.19.6/gio/gunixoutputstream.c glib-2.19.6-haiku/gio/gunixoutputstream.c
---- glib-2.19.6/gio/gunixoutputstream.c	2009-02-08 07:46:25.000000000 +0000
-+++ glib-2.19.6-haiku/gio/gunixoutputstream.c	2009-02-08 07:48:50.000000000 +0000
-@@ -319,6 +319,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -370,6 +373,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -475,6 +479,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -497,6 +502,7 @@
-   g_source_attach (source, NULL);
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.19.6/gio/makegioalias.pl glib-2.19.6-haiku/gio/makegioalias.pl
---- glib-2.19.6/gio/makegioalias.pl	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/makegioalias.pl	2009-02-08 07:48:50.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -urN glib-2.19.6/gio/xdgmime/xdgmimealias.c glib-2.19.6-haiku/gio/xdgmime/xdgmimealias.c
---- glib-2.19.6/gio/xdgmime/xdgmimealias.c	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/xdgmime/xdgmimealias.c	2009-02-08 07:48:50.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -urN glib-2.19.6/gio/xdgmime/xdgmimecache.c glib-2.19.6-haiku/gio/xdgmime/xdgmimecache.c
---- glib-2.19.6/gio/xdgmime/xdgmimecache.c	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/xdgmime/xdgmimecache.c	2009-02-08 07:48:50.000000000 +0000
-@@ -35,7 +35,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- #include <assert.h>
- 
- #include <netinet/in.h> /* for ntohl/ntohs */
-diff -urN glib-2.19.6/gio/xdgmime/xdgmimeparent.c glib-2.19.6-haiku/gio/xdgmime/xdgmimeparent.c
---- glib-2.19.6/gio/xdgmime/xdgmimeparent.c	2009-02-08 07:46:42.000000000 +0000
-+++ glib-2.19.6-haiku/gio/xdgmime/xdgmimeparent.c	2009-02-08 07:48:50.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -urN glib-2.19.6/glib/Makefile.am glib-2.19.6-haiku/glib/Makefile.am
---- glib-2.19.6/glib/Makefile.am	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/Makefile.am	2009-02-08 07:48:50.000000000 +0000
-@@ -19,7 +19,7 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-diff -urN glib-2.19.6/glib/gbacktrace.c glib-2.19.6-haiku/glib/gbacktrace.c
---- glib-2.19.6/glib/gbacktrace.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gbacktrace.c	2009-02-08 07:48:50.000000000 +0000
-@@ -158,7 +158,7 @@
- void
- g_on_error_stack_trace (const gchar *prg_name)
- {
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   pid_t pid;
-   gchar buf[16];
-   gchar *args[4] = { "gdb", NULL, NULL, NULL };
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-diff -urN glib-2.19.6/glib/gmain.c glib-2.19.6-haiku/glib/gmain.c
---- glib-2.19.6/glib/gmain.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gmain.c	2009-02-08 07:48:51.000000000 +0000
-@@ -70,6 +70,12 @@
- #include <sys/wait.h>
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+#include "fcntl.h"
-+#endif /* G_OS_HAIKU */
-+
- #ifdef G_OS_UNIX
- #include <fcntl.h>
- #include <sys/wait.h>
-@@ -3699,6 +3705,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -3718,6 +3725,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-diff -urN glib-2.19.6/glib/gslice.c glib-2.19.6-haiku/glib/gslice.c
---- glib-2.19.6/glib/gslice.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gslice.c	2009-02-08 07:48:51.000000000 +0000
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-diff -urN glib-2.19.6/glib/gspawn.c glib-2.19.6-haiku/glib/gspawn.c
---- glib-2.19.6/glib/gspawn.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gspawn.c	2009-02-08 07:48:51.000000000 +0000
-@@ -238,6 +238,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -433,6 +436,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -909,7 +913,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   struct rlimit rl;
- #endif
- 
-@@ -952,7 +956,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-diff -urN glib-2.19.6/glib/gstdio.c glib-2.19.6-haiku/glib/gstdio.c
---- glib-2.19.6/glib/gstdio.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gstdio.c	2009-02-08 07:48:51.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined(G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.19.6/glib/gstrfuncs.c glib-2.19.6-haiku/glib/gstrfuncs.c
---- glib-2.19.6/glib/gstrfuncs.c	2009-02-08 07:46:23.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gstrfuncs.c	2009-02-08 07:48:51.000000000 +0000
-@@ -1410,7 +1410,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -urN glib-2.19.6/glib/gtester.c glib-2.19.6-haiku/glib/gtester.c
---- glib-2.19.6/glib/gtester.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gtester.c	2009-02-08 07:48:51.000000000 +0000
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-diff -urN glib-2.19.6/glib/gutils.c glib-2.19.6-haiku/glib/gutils.c
---- glib-2.19.6/glib/gutils.c	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/gutils.c	2009-02-08 07:48:51.000000000 +0000
-@@ -478,7 +478,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-@@ -2311,6 +2311,21 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("$HOME");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
- #if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
-diff -urN glib-2.19.6/glib/makegalias.pl glib-2.19.6-haiku/glib/makegalias.pl
---- glib-2.19.6/glib/makegalias.pl	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/glib/makegalias.pl	2009-02-08 07:48:51.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -urN glib-2.19.6/gobject/makegobjectalias.pl glib-2.19.6-haiku/gobject/makegobjectalias.pl
---- glib-2.19.6/gobject/makegobjectalias.pl	2009-02-08 07:46:24.000000000 +0000
-+++ glib-2.19.6-haiku/gobject/makegobjectalias.pl	2009-02-08 07:48:51.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
diff --git a/dev-libs/glib/patches/glib-2.22.2.patch b/dev-libs/glib/patches/glib-2.22.2.patch
deleted file mode 100644
index bb3c2d0de..000000000
--- a/dev-libs/glib/patches/glib-2.22.2.patch
+++ /dev/null
@@ -1,578 +0,0 @@
-diff -urN glib-2.22.2/configure.in glib-2.22.2-haiku/configure.in
---- glib-2.22.2/configure.in	2009-10-07 06:29:47.000000000 -0700
-+++ glib-2.22.2-haiku/configure.in	2009-11-20 08:22:30.000000000 -0800
-@@ -116,6 +116,17 @@
- esac
- AC_MSG_RESULT([$glib_native_beos])
- 
-+AC_MSG_CHECKING([for Haiku])
-+case $host in
-+  *-*-haiku*)
-+    glib_native_haiku="yes"
-+    ;;
-+  *)
-+    glib_native_haiku="no"
-+    ;;
-+esac
-+AC_MSG_RESULT([$glib_native_haiku])
-+
- dnl
- 
- AC_MSG_CHECKING([for Win32])
-@@ -998,6 +1009,8 @@
- AC_CHECK_HEADERS([netdb.h winsock2.h mswsock.h])
- 
- # For gio/libasyncns
-+
-+if test $glib_native_haiku = no; then
- if test $glib_native_win32 = no; then
-   AC_CHECK_FUNCS(strndup setresuid setreuid)
-   AC_CHECK_HEADERS(sys/prctl.h arpa/nameser_compat.h)
-@@ -1019,6 +1032,7 @@
-     ]
-   )
-   AC_SUBST(LIBASYNCNS_LIBADD)
-+fi else LIBS="-lnetwork $LIBS"
- fi
- 
- case $host in
-@@ -2682,8 +2696,6 @@
- dnl *** Checks for gtk-doc ***
- dnl **************************
- 
--GTK_DOC_CHECK([1.11])
--
- AC_ARG_ENABLE(man,
-               [AC_HELP_STRING([--enable-man],
-                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-@@ -3410,6 +3422,9 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-mingw*)
-     glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
-diff -urN glib-2.22.2/docs/reference/glib/glib-overrides.txt glib-2.22.2-haiku/docs/reference/glib/glib-overrides.txt
---- glib-2.22.2/docs/reference/glib/glib-overrides.txt	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/glib-overrides.txt	2009-11-20 08:30:36.000000000 -0800
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -urN glib-2.22.2/docs/reference/glib/glib-sections.txt glib-2.22.2-haiku/docs/reference/glib/glib-sections.txt
---- glib-2.22.2/docs/reference/glib/glib-sections.txt	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/glib-sections.txt	2009-11-20 08:30:43.000000000 -0800
-@@ -130,6 +130,7 @@
- <SUBSECTION>
- G_OS_WIN32
- G_OS_BEOS
-+G_OS_HAIKU
- G_OS_UNIX
- 
- <SUBSECTION>
-diff -urN glib-2.22.2/docs/reference/glib/html/glib-Standard-Macros.html glib-2.22.2-haiku/docs/reference/glib/html/glib-Standard-Macros.html
---- glib-2.22.2/docs/reference/glib/html/glib-Standard-Macros.html	2009-10-07 07:08:12.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/html/glib-Standard-Macros.html	2009-11-20 08:30:50.000000000 -0800
-@@ -62,6 +62,7 @@
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS" title="G_OS_WIN32">G_OS_WIN32</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS" title="G_OS_BEOS">G_OS_BEOS</a>
-+#define             <a class="link" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS" title="G_OS_HAIKU">G_OS_HAIKU</a>
- #define             <a class="link" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS" title="G_OS_UNIX">G_OS_UNIX</a>
- 
- #define             <a class="link" href="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS" title="G_DIR_SEPARATOR">G_DIR_SEPARATOR</a>
-@@ -117,6 +118,15 @@
- BeOS-specific code in "#ifdef G_OS_BEOS".
- </p>
- </div>
-+<div class="refsect2" lang="en">
-+<a name="G-OS-HAIKU--CAPS"></a><h3>G_OS_HAIKU</h3>
-+<pre class="programlisting">#define G_OS_HAIKU
-+</pre>
-+<p>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "#ifdef G_OS_HAIKU".
-+</p>
-+</div>
- <hr>
- <div class="refsect2" title="G_OS_UNIX">
- <a name="G-OS-UNIX--CAPS"></a><h3>G_OS_UNIX</h3>
-diff -urN glib-2.22.2/docs/reference/glib/html/glib.devhelp glib-2.22.2-haiku/docs/reference/glib/html/glib.devhelp
---- glib-2.22.2/docs/reference/glib/html/glib.devhelp	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/html/glib.devhelp	2009-11-20 08:30:55.000000000 -0800
-@@ -196,6 +196,7 @@
-     <function name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <function name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <function name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <function name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <function name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <function name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <function name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.22.2/docs/reference/glib/html/glib.devhelp2 glib-2.22.2-haiku/docs/reference/glib/html/glib.devhelp2
---- glib-2.22.2/docs/reference/glib/html/glib.devhelp2	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/html/glib.devhelp2	2009-11-20 08:31:04.000000000 -0800
-@@ -196,6 +196,7 @@
-     <keyword type="macro" name="G_MAXDOUBLE" link="glib-Limits-of-Basic-Types.html#G-MAXDOUBLE--CAPS"/>
-     <keyword type="macro" name="G_OS_WIN32" link="glib-Standard-Macros.html#G-OS-WIN32--CAPS"/>
-     <keyword type="macro" name="G_OS_BEOS" link="glib-Standard-Macros.html#G-OS-BEOS--CAPS"/>
-+    <keyword type="macro" name="G_OS_HAIKU" link="glib-Standard-Macros.html#G-OS-HAIKU--CAPS"/>
-     <keyword type="macro" name="G_OS_UNIX" link="glib-Standard-Macros.html#G-OS-UNIX--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR" link="glib-Standard-Macros.html#G-DIR-SEPARATOR--CAPS"/>
-     <keyword type="macro" name="G_DIR_SEPARATOR_S" link="glib-Standard-Macros.html#G-DIR-SEPARATOR-S--CAPS"/>
-diff -urN glib-2.22.2/docs/reference/glib/html/ix01.html glib-2.22.2-haiku/docs/reference/glib/html/ix01.html
---- glib-2.22.2/docs/reference/glib/html/ix01.html	2009-10-07 07:08:12.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/html/ix01.html	2009-11-20 08:31:11.000000000 -0800
-@@ -2174,6 +2174,8 @@
- </dt>
- <dt>G_OS_BEOS, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-BEOS--CAPS">G_OS_BEOS</a>
- </dt>
-+<dt>G_OS_HAIKU, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-HAIKU--CAPS">G_OS_HAIKU</a>
-+</dt>
- <dt>G_OS_UNIX, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-UNIX--CAPS">G_OS_UNIX</a>
- </dt>
- <dt>G_OS_WIN32, <a class="indexterm" href="glib-Standard-Macros.html#G-OS-WIN32--CAPS">G_OS_WIN32</a>
-diff -urN glib-2.22.2/docs/reference/glib/tmpl/macros.sgml glib-2.22.2-haiku/docs/reference/glib/tmpl/macros.sgml
---- glib-2.22.2/docs/reference/glib/tmpl/macros.sgml	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/tmpl/macros.sgml	2009-11-20 08:31:16.000000000 -0800
-@@ -33,6 +33,14 @@
- 
- 
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
-+
-+
-+
- <!-- ##### MACRO G_OS_UNIX ##### -->
- <para>
- This macro is defined only on UNIX. So you can bracket
-diff -urN glib-2.22.2/docs/reference/glib/xml/api-index-full.xml glib-2.22.2-haiku/docs/reference/glib/xml/api-index-full.xml
---- glib-2.22.2/docs/reference/glib/xml/api-index-full.xml	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/xml/api-index-full.xml	2009-11-20 08:31:23.000000000 -0800
-@@ -1053,6 +1053,7 @@
- <indexentry><primaryie linkends="g-option-group-set-translation-domain"><link linkend="g-option-group-set-translation-domain">g_option_group_set_translation_domain</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OPTION-REMAINING--CAPS"><link linkend="G-OPTION-REMAINING--CAPS">G_OPTION_REMAINING</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-BEOS--CAPS"><link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link></primaryie></indexentry>
-+<indexentry><primaryie linkends="G-OS-HAIKU--CAPS"><link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-UNIX--CAPS"><link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link></primaryie></indexentry>
- <indexentry><primaryie linkends="G-OS-WIN32--CAPS"><link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link></primaryie></indexentry>
- </indexdiv>
-diff -urN glib-2.22.2/docs/reference/glib/xml/macros.xml glib-2.22.2-haiku/docs/reference/glib/xml/macros.xml
---- glib-2.22.2/docs/reference/glib/xml/macros.xml	2009-10-07 07:08:11.000000000 -0700
-+++ glib-2.22.2-haiku/docs/reference/glib/xml/macros.xml	2009-11-20 08:31:29.000000000 -0800
-@@ -19,6 +19,7 @@
- 
- #define             <link linkend="G-OS-WIN32--CAPS">G_OS_WIN32</link>
- #define             <link linkend="G-OS-BEOS--CAPS">G_OS_BEOS</link>
-+#define             <link linkend="G-OS-HAIKU--CAPS">G_OS_HAIKU</link>
- #define             <link linkend="G-OS-UNIX--CAPS">G_OS_UNIX</link>
- 
- #define             <link linkend="G-DIR-SEPARATOR--CAPS">G_DIR_SEPARATOR</link>
-@@ -81,6 +82,14 @@
- This macro is defined only on BeOS. So you can bracket
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para></refsect2>
-+<refsect2 id="G-OS-HAIKU--CAPS" role="macro">
-+<title>G_OS_HAIKU</title>
-+<indexterm zone="G-OS-HAIKU--CAPS"><primary sortas="G_OS_HAIKU">G_OS_HAIKU</primary></indexterm><programlisting>#define G_OS_HAIKU
-+</programlisting>
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para></refsect2>
- <refsect2 id="G-OS-UNIX--CAPS" role="macro">
- <title>G_OS_UNIX</title>
- <indexterm zone="G-OS-UNIX--CAPS"><primary sortas="OS_UNIX">G_OS_UNIX</primary></indexterm><programlisting>#define G_OS_UNIX
-diff -urN glib-2.22.2/gio/Makefile.am glib-2.22.2-haiku/gio/Makefile.am
---- glib-2.22.2/gio/Makefile.am	2009-09-29 20:08:03.000000000 -0700
-+++ glib-2.22.2-haiku/gio/Makefile.am	2009-11-20 08:31:42.000000000 -0800
-@@ -174,7 +174,7 @@
- 
- endif
- 
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-diff -urN glib-2.22.2/gio/gunixinputstream.c glib-2.22.2-haiku/gio/gunixinputstream.c
---- glib-2.22.2/gio/gunixinputstream.c	2009-09-18 16:20:05.000000000 -0700
-+++ glib-2.22.2-haiku/gio/gunixinputstream.c	2009-11-20 08:31:46.000000000 -0800
-@@ -329,6 +329,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -379,6 +382,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -484,6 +488,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) &&!defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -506,6 +511,7 @@
-   g_source_attach (source, g_main_context_get_thread_default ());
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.22.2/gio/gunixmounts.c glib-2.22.2-haiku/gio/gunixmounts.c
---- glib-2.22.2/gio/gunixmounts.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/gio/gunixmounts.c	2009-11-20 08:31:51.000000000 -0800
-@@ -656,6 +656,16 @@
- 
-   return return_list;
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -1040,6 +1050,16 @@
- {
-   return _g_get_unix_mounts ();
- }
-+
-+#elif defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -urN glib-2.22.2/gio/gunixoutputstream.c glib-2.22.2-haiku/gio/gunixoutputstream.c
---- glib-2.22.2/gio/gunixoutputstream.c	2009-09-18 16:20:05.000000000 -0700
-+++ glib-2.22.2-haiku/gio/gunixoutputstream.c	2009-11-20 08:31:56.000000000 -0800
-@@ -315,6 +315,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   GPollFD poll_fds[2];
-@@ -366,6 +369,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -471,6 +475,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -493,6 +498,7 @@
-   g_source_attach (source, g_main_context_get_thread_default ());
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-diff -urN glib-2.22.2/gio/makegioalias.pl glib-2.22.2-haiku/gio/makegioalias.pl
---- glib-2.22.2/gio/makegioalias.pl	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/gio/makegioalias.pl	2009-11-20 08:32:01.000000000 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -urN glib-2.22.2/gio/xdgmime/xdgmimealias.c glib-2.22.2-haiku/gio/xdgmime/xdgmimealias.c
---- glib-2.22.2/gio/xdgmime/xdgmimealias.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/gio/xdgmime/xdgmimealias.c	2009-11-20 08:32:06.000000000 -0800
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -urN glib-2.22.2/gio/xdgmime/xdgmimecache.c glib-2.22.2-haiku/gio/xdgmime/xdgmimecache.c
---- glib-2.22.2/gio/xdgmime/xdgmimecache.c	2009-10-06 13:07:59.000000000 -0700
-+++ glib-2.22.2-haiku/gio/xdgmime/xdgmimecache.c	2009-11-20 08:32:10.000000000 -0800
-@@ -34,7 +34,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- #include <assert.h>
- 
- #include <netinet/in.h> /* for ntohl/ntohs */
-diff -urN glib-2.22.2/gio/xdgmime/xdgmimeparent.c glib-2.22.2-haiku/gio/xdgmime/xdgmimeparent.c
---- glib-2.22.2/gio/xdgmime/xdgmimeparent.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/gio/xdgmime/xdgmimeparent.c	2009-11-20 08:32:15.000000000 -0800
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-diff -urN glib-2.22.2/glib/Makefile.am glib-2.22.2-haiku/glib/Makefile.am
---- glib-2.22.2/glib/Makefile.am	2009-09-29 20:08:03.000000000 -0700
-+++ glib-2.22.2-haiku/glib/Makefile.am	2009-11-20 08:32:21.000000000 -0800
-@@ -19,7 +19,7 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-diff -urN glib-2.22.2/glib/gbacktrace.c glib-2.22.2-haiku/glib/gbacktrace.c
---- glib-2.22.2/glib/gbacktrace.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gbacktrace.c	2009-11-20 08:32:30.000000000 -0800
-@@ -158,7 +158,7 @@
- void
- g_on_error_stack_trace (const gchar *prg_name)
- {
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   pid_t pid;
-   gchar buf[16];
-   gchar *args[4] = { "gdb", NULL, NULL, NULL };
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-diff -urN glib-2.22.2/glib/gmain.c glib-2.22.2-haiku/glib/gmain.c
---- glib-2.22.2/glib/gmain.c	2009-08-28 19:52:23.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gmain.c	2009-11-20 08:32:34.000000000 -0800
-@@ -72,6 +72,12 @@
- #include <sys/wait.h>
- #endif /* G_OS_BEOS */
- 
-+#ifdef G_OS_HAIKU
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+#include "fcntl.h"
-+#endif /* G_OS_HAIKU */
-+
- #ifdef G_OS_UNIX
- #include <fcntl.h>
- #include <sys/wait.h>
-@@ -3842,6 +3848,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#if !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -3861,6 +3868,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-diff -urN glib-2.22.2/glib/gslice.c glib-2.22.2-haiku/glib/gslice.c
---- glib-2.22.2/glib/gslice.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gslice.c	2009-11-20 08:32:42.000000000 -0800
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-diff -urN glib-2.22.2/glib/gspawn.c glib-2.22.2-haiku/glib/gspawn.c
---- glib-2.22.2/glib/gspawn.c	2009-08-27 20:51:21.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gspawn.c	2009-11-20 08:32:46.000000000 -0800
-@@ -240,6 +240,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -439,6 +442,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -915,7 +919,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-   struct rlimit rl;
- #endif
- 
-@@ -958,7 +962,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS) && !defined(G_OS_HAIKU)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-diff -urN glib-2.22.2/glib/gstdio.c glib-2.22.2-haiku/glib/gstdio.c
---- glib-2.22.2/glib/gstdio.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gstdio.c	2009-11-20 08:32:50.000000000 -0800
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined(G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.22.2/glib/gstrfuncs.c glib-2.22.2-haiku/glib/gstrfuncs.c
---- glib-2.22.2/glib/gstrfuncs.c	2009-08-27 20:48:13.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gstrfuncs.c	2009-11-20 08:32:55.000000000 -0800
-@@ -1410,7 +1410,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -urN glib-2.22.2/glib/gtester.c glib-2.22.2-haiku/glib/gtester.c
---- glib-2.22.2/glib/gtester.c	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gtester.c	2009-11-20 08:32:59.000000000 -0800
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-diff -urN glib-2.22.2/glib/gutils.c glib-2.22.2-haiku/glib/gutils.c
---- glib-2.22.2/glib/gutils.c	2009-08-28 19:52:23.000000000 -0700
-+++ glib-2.22.2-haiku/glib/gutils.c	2009-11-20 08:33:03.000000000 -0800
-@@ -478,7 +478,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-@@ -2311,6 +2311,21 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("$HOME");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("$HOME/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
- #if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
-diff -urN glib-2.22.2/glib/makegalias.pl glib-2.22.2-haiku/glib/makegalias.pl
---- glib-2.22.2/glib/makegalias.pl	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/glib/makegalias.pl	2009-11-20 08:33:08.000000000 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-diff -urN glib-2.22.2/gobject/makegobjectalias.pl glib-2.22.2-haiku/gobject/makegobjectalias.pl
---- glib-2.22.2/gobject/makegobjectalias.pl	2009-03-31 16:04:20.000000000 -0700
-+++ glib-2.22.2-haiku/gobject/makegobjectalias.pl	2009-11-20 08:33:14.000000000 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
diff --git a/dev-libs/glib/patches/glib-2.24.1.patch b/dev-libs/glib/patches/glib-2.24.1.patch
deleted file mode 100644
index def0edf1c..000000000
--- a/dev-libs/glib/patches/glib-2.24.1.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -urN glib-2.24.1/configure.in glib-2.24.1-haiku/configure.in
---- glib-2.24.1/configure.in	2010-05-02 23:58:58.044040192 +0000
-+++ glib-2.24.1-haiku/configure.in	2010-06-06 21:09:40.325582848 +0000
-@@ -140,6 +140,10 @@
-       ;;
-     esac
-     ;;
-+  *-*-haiku*)
-+    glib_native_win32=no
-+    glib_pid_type='signed long int'
-+    ;;
-   *)
-     glib_native_win32=no
-     glib_pid_type=int
-@@ -375,7 +379,7 @@
-   AC_PATH_PROG(PERL_PATH, [$PERL])
- fi
- if test "x$PERL_PATH" = x ; then
--  PERL_PATH="/usr/bin/env perl"
-+  PERL_PATH="/bin/env perl"
- fi
- AC_SUBST(PERL_PATH)
- 
-@@ -1023,14 +1027,14 @@
-               [res_query("test", 0, 0, (void *)0, 0);],
-               [AC_MSG_RESULT([yes])],
-               [save_libs="$LIBS"
--               LIBS="-lresolv $LIBS"
-+               LIBS="-lnetwork $LIBS"
-                AC_TRY_LINK([#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>],
-                            [res_query("test", 0, 0, (void *)0, 0);],
--                           [AC_MSG_RESULT([in -lresolv])
--                            LIBASYNCNS_LIBADD="-lresolv"],
-+                           [AC_MSG_RESULT([in -lnetwork])
-+                            LIBASYNCNS_LIBADD="-lnetwork"],
-                            [LIBS="-lbind $save_libs"
-                             AC_TRY_LINK([#include <resolv.h>],
-                                         [res_query("test", 0, 0, (void *)0, 0);],
-@@ -3476,6 +3480,10 @@
-   *-*-beos*)
-     glib_os="#define G_OS_BEOS"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU
-+#define G_OS_UNIX"
-+    ;;
-   *-*-cygwin*)
-     glib_os="#define G_OS_UNIX
- #define G_PLATFORM_WIN32
-diff -urN glib-2.24.1/docs/reference/glib/glib-overrides.txt glib-2.24.1-haiku/docs/reference/glib/glib-overrides.txt
---- glib-2.24.1/docs/reference/glib/glib-overrides.txt	2009-03-31 23:04:20.040632320 +0000
-+++ glib-2.24.1-haiku/docs/reference/glib/glib-overrides.txt	2010-06-06 21:09:40.327417856 +0000
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -urN glib-2.24.1/docs/reference/glib/glib-sections.txt glib-2.24.1-haiku/docs/reference/glib/glib-sections.txt
---- glib-2.24.1/docs/reference/glib/glib-sections.txt	2010-05-03 01:23:07.031981568 +0000
-+++ glib-2.24.1-haiku/docs/reference/glib/glib-sections.txt	2010-06-06 21:09:40.338165760 +0000
-@@ -131,6 +131,7 @@
- G_OS_WIN32
- G_OS_BEOS
- G_OS_UNIX
-+G_OS_HAIKU
- 
- <SUBSECTION>
- G_DIR_SEPARATOR
-diff -urN glib-2.24.1/docs/reference/glib/tmpl/macros.sgml glib-2.24.1-haiku/docs/reference/glib/tmpl/macros.sgml
---- glib-2.24.1/docs/reference/glib/tmpl/macros.sgml	2010-05-03 01:23:06.032768000 +0000
-+++ glib-2.24.1-haiku/docs/reference/glib/tmpl/macros.sgml	2010-06-06 21:09:40.348127232 +0000
-@@ -34,6 +34,11 @@
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para>
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
- 
- 
- <!-- ##### MACRO G_OS_UNIX ##### -->
-diff -urN glib-2.24.1/gio/gunixmounts.c glib-2.24.1-haiku/gio/gunixmounts.c
---- glib-2.24.1/gio/gunixmounts.c	2009-03-31 23:04:20.054525952 +0000
-+++ glib-2.24.1-haiku/gio/gunixmounts.c	2010-06-06 21:09:40.359661568 +0000
-@@ -656,6 +656,23 @@
- 
-   return return_list;
- }
-+
-+#elif defined(G_OS_HAIKU)
-+
-+static char *
-+get_mtab_monitor_file (void)
-+{
-+  return NULL;
-+}
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  /* TODO: implement me */
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -1040,6 +1057,16 @@
- {
-   return _g_get_unix_mounts ();
- }
-+
-+#elif defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -urN glib-2.24.1/gio/makegioalias.pl glib-2.24.1-haiku/gio/makegioalias.pl
---- glib-2.24.1/gio/makegioalias.pl	2009-03-31 23:04:20.004456448 +0000
-+++ glib-2.24.1-haiku/gio/makegioalias.pl	2010-06-06 21:09:40.361496576 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.1/gio/tests/memory-output-stream.c glib-2.24.1-haiku/gio/tests/memory-output-stream.c
---- glib-2.24.1/gio/tests/memory-output-stream.c	2010-04-13 13:33:16.043253760 +0000
-+++ glib-2.24.1-haiku/gio/tests/memory-output-stream.c	2010-06-06 21:09:50.734003200 +0000
-@@ -91,6 +91,8 @@
-   GOutputStream *mo;
-   GDataOutputStream *o;
-   int i;
-+  gsize data_size_fun, data_size_prop;
-+  gpointer data_fun, data_prop;
-   GError *error = NULL;
- 
-   g_test_bug ("605733");
-@@ -107,13 +109,11 @@
-       g_assert_no_error (error);
-     }
- 
--  gsize data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
--  gsize data_size_prop;
-+  data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data-size", &data_size_prop, NULL);
-   g_assert_cmpint (data_size_fun, ==, data_size_prop);
- 
--  gpointer data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
--  gpointer data_prop;
-+  data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data", &data_prop, NULL);
-   g_assert_cmphex (data_fun, ==, data_prop);
- 
-diff -urN glib-2.24.1/glib/gen-script-table.pl glib-2.24.1-haiku/glib/gen-script-table.pl
---- glib-2.24.1/glib/gen-script-table.pl	2009-03-31 23:04:20.056885248 +0000
-+++ glib-2.24.1-haiku/glib/gen-script-table.pl	2010-06-06 21:09:40.363069440 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w 
-+#!/bin/env perl 
- #
- # Script to convert http://www.unicode.org/Public/UNIDATA/Scripts.txt
- # into a machine-readable table.
-diff -urN glib-2.24.1/glib/gen-unicode-tables.pl glib-2.24.1-haiku/glib/gen-unicode-tables.pl
---- glib-2.24.1/glib/gen-unicode-tables.pl	2009-03-31 23:04:20.061603840 +0000
-+++ glib-2.24.1-haiku/glib/gen-unicode-tables.pl	2010-06-06 21:09:40.379584512 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
-diff -urN glib-2.24.1/glib/gstdio.c glib-2.24.1-haiku/glib/gstdio.c
---- glib-2.24.1/glib/gstdio.c	2010-05-02 23:58:59.055836672 +0000
-+++ glib-2.24.1-haiku/glib/gstdio.c	2010-06-06 21:09:40.392167424 +0000
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined (G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.24.1/glib/gstrfuncs.c glib-2.24.1-haiku/glib/gstrfuncs.c
---- glib-2.24.1/glib/gstrfuncs.c	2010-04-13 13:33:16.040632320 +0000
-+++ glib-2.24.1-haiku/glib/gstrfuncs.c	2010-06-06 21:09:40.403439616 +0000
-@@ -1410,7 +1410,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -urN glib-2.24.1/glib/gutils.c glib-2.24.1-haiku/glib/gutils.c
---- glib-2.24.1/glib/gutils.c	2010-04-13 13:33:16.062914560 +0000
-+++ glib-2.24.1-haiku/glib/gutils.c	2010-06-06 21:09:40.414711808 +0000
-@@ -478,7 +478,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-diff -urN glib-2.24.1/glib/makegalias.pl glib-2.24.1-haiku/glib/makegalias.pl
---- glib-2.24.1/glib/makegalias.pl	2009-03-31 23:04:20.055836672 +0000
-+++ glib-2.24.1-haiku/glib/makegalias.pl	2010-06-06 21:09:40.416546816 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.1/gobject/makegobjectalias.pl glib-2.24.1-haiku/gobject/makegobjectalias.pl
---- glib-2.24.1/gobject/makegobjectalias.pl	2009-03-31 23:04:20.025952256 +0000
-+++ glib-2.24.1-haiku/gobject/makegobjectalias.pl	2010-06-06 21:09:40.426508288 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.1/gobject/marshal-genstrings.pl glib-2.24.1-haiku/gobject/marshal-genstrings.pl
---- glib-2.24.1/gobject/marshal-genstrings.pl	2009-03-31 23:04:20.024641536 +0000
-+++ glib-2.24.1-haiku/gobject/marshal-genstrings.pl	2010-06-06 21:09:40.434372608 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/bin/env perl
- 
- open (List, "gmarshal.list");
- 
-diff -urN glib-2.24.1/tests/gen-casefold-txt.pl glib-2.24.1-haiku/tests/gen-casefold-txt.pl
---- glib-2.24.1/tests/gen-casefold-txt.pl	2009-03-31 23:04:20.060030976 +0000
-+++ glib-2.24.1-haiku/tests/gen-casefold-txt.pl	2010-06-06 21:09:40.446169088 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
-diff -urN glib-2.24.1/tests/gen-casemap-txt.pl glib-2.24.1-haiku/tests/gen-casemap-txt.pl
---- glib-2.24.1/tests/gen-casemap-txt.pl	2009-03-31 23:04:20.044564480 +0000
-+++ glib-2.24.1-haiku/tests/gen-casemap-txt.pl	2010-06-06 21:09:40.448004096 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
diff --git a/dev-libs/glib/patches/glib-2.24.2.patch b/dev-libs/glib/patches/glib-2.24.2.patch
deleted file mode 100644
index 362d692b9..000000000
--- a/dev-libs/glib/patches/glib-2.24.2.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -urN glib-2.24.2/configure.in glib-2.24.2-haiku/configure.in
---- glib-2.24.2/configure.in	2010-05-02 23:58:58.044040192 +0000
-+++ glib-2.24.2-haiku/configure.in	2010-06-06 21:09:40.325582848 +0000
-@@ -140,6 +140,10 @@
-       ;;
-     esac
-     ;;
-+  *-*-haiku*)
-+    glib_native_win32=no
-+    glib_pid_type='signed long int'
-+    ;;
-   *)
-     glib_native_win32=no
-     glib_pid_type=int
-@@ -375,7 +379,7 @@
-   AC_PATH_PROG(PERL_PATH, [$PERL])
- fi
- if test "x$PERL_PATH" = x ; then
--  PERL_PATH="/usr/bin/env perl"
-+  PERL_PATH="/bin/env perl"
- fi
- AC_SUBST(PERL_PATH)
- 
-@@ -1023,14 +1027,14 @@
-               [res_query("test", 0, 0, (void *)0, 0);],
-               [AC_MSG_RESULT([yes])],
-               [save_libs="$LIBS"
--               LIBS="-lresolv $LIBS"
-+               LIBS="-lnetwork $LIBS"
-                AC_TRY_LINK([#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>],
-                            [res_query("test", 0, 0, (void *)0, 0);],
--                           [AC_MSG_RESULT([in -lresolv])
--                            LIBASYNCNS_LIBADD="-lresolv"],
-+                           [AC_MSG_RESULT([in -lnetwork])
-+                            LIBASYNCNS_LIBADD="-lnetwork"],
-                            [LIBS="-lbind $save_libs"
-                             AC_TRY_LINK([#include <resolv.h>],
-                                         [res_query("test", 0, 0, (void *)0, 0);],
-@@ -3476,6 +3480,10 @@
-   *-*-beos*)
-     glib_os="#define G_OS_BEOS"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU
-+#define G_OS_UNIX"
-+    ;;
-   *-*-cygwin*)
-     glib_os="#define G_OS_UNIX
- #define G_PLATFORM_WIN32
-diff -urN glib-2.24.2/docs/reference/glib/glib-overrides.txt glib-2.24.2-haiku/docs/reference/glib/glib-overrides.txt
---- glib-2.24.2/docs/reference/glib/glib-overrides.txt	2009-03-31 23:04:20.040632320 +0000
-+++ glib-2.24.2-haiku/docs/reference/glib/glib-overrides.txt	2010-06-06 21:09:40.327417856 +0000
-@@ -215,6 +215,11 @@
- #define G_OS_BEOS
- </MACRO>
- 
-+<MACRO>
-+<NAME>G_OS_HAIKU</NAME>
-+#define G_OS_HAIKU
-+</MACRO>
-+
- # g_ascii_isxxx
- 
- <FUNCTION>
-diff -urN glib-2.24.2/docs/reference/glib/glib-sections.txt glib-2.24.2-haiku/docs/reference/glib/glib-sections.txt
---- glib-2.24.2/docs/reference/glib/glib-sections.txt	2010-05-03 01:23:07.031981568 +0000
-+++ glib-2.24.2-haiku/docs/reference/glib/glib-sections.txt	2010-06-06 21:09:40.338165760 +0000
-@@ -131,6 +131,7 @@
- G_OS_WIN32
- G_OS_BEOS
- G_OS_UNIX
-+G_OS_HAIKU
- 
- <SUBSECTION>
- G_DIR_SEPARATOR
-diff -urN glib-2.24.2/docs/reference/glib/tmpl/macros.sgml glib-2.24.2-haiku/docs/reference/glib/tmpl/macros.sgml
---- glib-2.24.2/docs/reference/glib/tmpl/macros.sgml	2010-05-03 01:23:06.032768000 +0000
-+++ glib-2.24.2-haiku/docs/reference/glib/tmpl/macros.sgml	2010-06-06 21:09:40.348127232 +0000
-@@ -34,6 +34,11 @@
- BeOS-specific code in "&num;ifdef G_OS_BEOS".
- </para>
- 
-+<!-- ##### MACRO G_OS_HAIKU ##### -->
-+<para>
-+This macro is defined only on Haiku. So you can bracket
-+Haiku-specific code in "&num;ifdef G_OS_HAIKU".
-+</para>
- 
- 
- <!-- ##### MACRO G_OS_UNIX ##### -->
-diff -urN glib-2.24.2/gio/gunixmounts.c glib-2.24.2-haiku/gio/gunixmounts.c
---- glib-2.24.2/gio/gunixmounts.c	2009-03-31 23:04:20.054525952 +0000
-+++ glib-2.24.2-haiku/gio/gunixmounts.c	2010-06-06 21:09:40.359661568 +0000
-@@ -656,6 +656,23 @@
- 
-   return return_list;
- }
-+
-+#elif defined(G_OS_HAIKU)
-+
-+static char *
-+get_mtab_monitor_file (void)
-+{
-+  return NULL;
-+}
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  /* TODO: implement me */
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -1040,6 +1057,16 @@
- {
-   return _g_get_unix_mounts ();
- }
-+
-+#elif defined(G_OS_HAIKU)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-diff -urN glib-2.24.2/gio/makegioalias.pl glib-2.24.2-haiku/gio/makegioalias.pl
---- glib-2.24.2/gio/makegioalias.pl	2009-03-31 23:04:20.004456448 +0000
-+++ glib-2.24.2-haiku/gio/makegioalias.pl	2010-06-06 21:09:40.361496576 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.2/gio/tests/memory-output-stream.c glib-2.24.2-haiku/gio/tests/memory-output-stream.c
---- glib-2.24.2/gio/tests/memory-output-stream.c	2010-04-13 13:33:16.043253760 +0000
-+++ glib-2.24.2-haiku/gio/tests/memory-output-stream.c	2010-06-06 21:09:50.734003200 +0000
-@@ -91,6 +91,8 @@
-   GOutputStream *mo;
-   GDataOutputStream *o;
-   int i;
-+  gsize data_size_fun, data_size_prop;
-+  gpointer data_fun, data_prop;
-   GError *error = NULL;
- 
-   g_test_bug ("605733");
-@@ -107,13 +109,11 @@
-       g_assert_no_error (error);
-     }
- 
--  gsize data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
--  gsize data_size_prop;
-+  data_size_fun = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data-size", &data_size_prop, NULL);
-   g_assert_cmpint (data_size_fun, ==, data_size_prop);
- 
--  gpointer data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
--  gpointer data_prop;
-+  data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
-   g_object_get (mo, "data", &data_prop, NULL);
-   g_assert_cmphex (data_fun, ==, data_prop);
- 
-diff -urN glib-2.24.2/glib/gen-script-table.pl glib-2.24.2-haiku/glib/gen-script-table.pl
---- glib-2.24.2/glib/gen-script-table.pl	2009-03-31 23:04:20.056885248 +0000
-+++ glib-2.24.2-haiku/glib/gen-script-table.pl	2010-06-06 21:09:40.363069440 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w 
-+#!/bin/env perl 
- #
- # Script to convert http://www.unicode.org/Public/UNIDATA/Scripts.txt
- # into a machine-readable table.
-diff -urN glib-2.24.2/glib/gen-unicode-tables.pl glib-2.24.2-haiku/glib/gen-unicode-tables.pl
---- glib-2.24.2/glib/gen-unicode-tables.pl	2009-03-31 23:04:20.061603840 +0000
-+++ glib-2.24.2-haiku/glib/gen-unicode-tables.pl	2010-06-06 21:09:40.379584512 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
-diff -urN glib-2.24.2/glib/gstdio.c glib-2.24.2-haiku/glib/gstdio.c
---- glib-2.24.2/glib/gstdio.c	2010-05-02 23:58:59.055836672 +0000
-+++ glib-2.24.2-haiku/glib/gstdio.c	2010-06-06 21:09:40.392167424 +0000
-@@ -47,7 +47,7 @@
- 
- #include "galias.h"
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) && !defined (G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.24.2/glib/gstrfuncs.c glib-2.24.2-haiku/glib/gstrfuncs.c
---- glib-2.24.2/glib/gstrfuncs.c	2010-04-13 13:33:16.040632320 +0000
-+++ glib-2.24.2-haiku/glib/gstrfuncs.c	2010-06-06 21:09:40.403439616 +0000
-@@ -1410,7 +1410,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
-   
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) || defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-diff -urN glib-2.24.2/glib/gutils.c glib-2.24.2-haiku/glib/gutils.c
---- glib-2.24.2/glib/gutils.c	2010-04-13 13:33:16.062914560 +0000
-+++ glib-2.24.2-haiku/glib/gutils.c	2010-06-06 21:09:40.414711808 +0000
-@@ -478,7 +478,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
-diff -urN glib-2.24.2/glib/makegalias.pl glib-2.24.2-haiku/glib/makegalias.pl
---- glib-2.24.2/glib/makegalias.pl	2009-03-31 23:04:20.055836672 +0000
-+++ glib-2.24.2-haiku/glib/makegalias.pl	2010-06-06 21:09:40.416546816 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.2/gobject/makegobjectalias.pl glib-2.24.2-haiku/gobject/makegobjectalias.pl
---- glib-2.24.2/gobject/makegobjectalias.pl	2009-03-31 23:04:20.025952256 +0000
-+++ glib-2.24.2-haiku/gobject/makegobjectalias.pl	2010-06-06 21:09:40.426508288 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/env perl
- 
- my $do_def = 0;
- 
-diff -urN glib-2.24.2/gobject/marshal-genstrings.pl glib-2.24.2-haiku/gobject/marshal-genstrings.pl
---- glib-2.24.2/gobject/marshal-genstrings.pl	2009-03-31 23:04:20.024641536 +0000
-+++ glib-2.24.2-haiku/gobject/marshal-genstrings.pl	2010-06-06 21:09:40.434372608 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/bin/env perl
- 
- open (List, "gmarshal.list");
- 
-diff -urN glib-2.24.2/tests/gen-casefold-txt.pl glib-2.24.2-haiku/tests/gen-casefold-txt.pl
---- glib-2.24.2/tests/gen-casefold-txt.pl	2009-03-31 23:04:20.060030976 +0000
-+++ glib-2.24.2-haiku/tests/gen-casefold-txt.pl	2010-06-06 21:09:40.446169088 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
-diff -urN glib-2.24.2/tests/gen-casemap-txt.pl glib-2.24.2-haiku/tests/gen-casemap-txt.pl
---- glib-2.24.2/tests/gen-casemap-txt.pl	2009-03-31 23:04:20.044564480 +0000
-+++ glib-2.24.2-haiku/tests/gen-casemap-txt.pl	2010-06-06 21:09:40.448004096 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -w
-+#! /bin/env perl
- 
- #    Copyright (C) 1998, 1999 Tom Tromey
- #    Copyright (C) 2001 Red Hat Software
diff --git a/dev-libs/glib/patches/glib-2.26.1.patch b/dev-libs/glib/patches/glib-2.26.1.patch
deleted file mode 100644
index 4c6346a21..000000000
--- a/dev-libs/glib/patches/glib-2.26.1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urN glib-2.26.1/configure.ac glib-2.26.1-haiku/configure.ac
---- glib-2.26.1/configure.ac	2010-11-14 05:59:52.043778048 +0000
-+++ glib-2.26.1-haiku/configure.ac	2011-01-13 11:12:11.055312384 +0000
-@@ -111,6 +111,10 @@
-   *-*-beos*)
-     glib_native_beos="yes"
-     ;;
-+  *-*-haiku*)
-+    glib_native_beos="yes"
-+    LIBS="-lnetwork $LIBS"
-+    ;;
-   *)
-     glib_native_beos="no"
-     ;;
-@@ -3595,6 +3599,9 @@
-   *-*-beos*)
-     glib_os="#define G_OS_BEOS"
-     ;;
-+  *-*-haiku*)
-+    glib_os="#define G_OS_HAIKU"
-+    ;;
-   *-*-cygwin*)
-     glib_os="#define G_OS_UNIX
- #define G_PLATFORM_WIN32
-diff -urN glib-2.26.1/glib/gmain.c glib-2.26.1-haiku/glib/gmain.c
---- glib-2.26.1/glib/gmain.c	2010-11-12 13:52:52.057409536 +0000
-+++ glib-2.26.1-haiku/glib/gmain.c	2011-01-11 13:13:26.355991552 +0000
-@@ -79,10 +79,11 @@
- #include <windows.h>
- #endif /* G_OS_WIN32 */
- 
--#ifdef G_OS_BEOS
-+#if defined G_OS_HAIKU
- #include <sys/socket.h>
- #include <sys/wait.h>
--#endif /* G_OS_BEOS */
-+#include <fcntl.h>
-+#endif /* G_OS_HAIKU */
- 
- #ifdef G_OS_UNIX
- #include <fcntl.h>
-diff -urN glib-2.26.1/glib/gstdio.c glib-2.26.1-haiku/glib/gstdio.c
---- glib-2.26.1/glib/gstdio.c	2010-09-13 13:40:53.047972352 +0000
-+++ glib-2.26.1-haiku/glib/gstdio.c	2011-01-11 13:17:06.033292288 +0000
-@@ -45,7 +45,7 @@
- #include "gstdio.h"
- 
- 
--#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS)
-+#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_HAIKU)
- #error Please port this to your operating system
- #endif
- 
-diff -urN glib-2.26.1/glib/gstrfuncs.c glib-2.26.1-haiku/glib/gstrfuncs.c
---- glib-2.26.1/glib/gstrfuncs.c	2010-09-04 01:40:14.015466496 +0000
-+++ glib-2.26.1-haiku/glib/gstrfuncs.c	2011-01-11 12:43:29.319815680 +0000
-@@ -1423,12 +1423,12 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
- 
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_HAIKU) || defined(G_WITH_CYGWIN)
- extern const char *strsignal(int);
- #else
--  /* this is declared differently (const) in string.h on BeOS */
-+  /* this is declared differently (const) in string.h on HAIKU */
-   extern char *strsignal (int sig);
--#endif /* !G_OS_BEOS && !G_WITH_CYGWIN */
-+#endif /* !G_OS_HAIKU && !G_WITH_CYGWIN */
-   msg_locale = strsignal (signum);
-   if (g_get_charset (NULL))
-     return msg_locale;
-diff -urN glib-2.26.1/glib/gutils.c glib-2.26.1-haiku/glib/gutils.c
---- glib-2.26.1/glib/gutils.c	2010-11-12 13:52:52.056098816 +0000
-+++ glib-2.26.1-haiku/glib/gutils.c	2011-01-11 13:27:36.000000000 +0000
-@@ -491,7 +491,7 @@
-     }
-   
-   path = g_getenv ("PATH");
--#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
-+#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
-   if (path == NULL)
-     {
-       /* There is no `PATH' in the environment.  The default
diff --git a/dev-libs/glib/patches/glib-trunk.diff b/dev-libs/glib/patches/glib-trunk.diff
deleted file mode 100644
index f7942d74d..000000000
--- a/dev-libs/glib/patches/glib-trunk.diff
+++ /dev/null
@@ -1,374 +0,0 @@
-Index: gio/gunixmounts.c
-===================================================================
---- gio/gunixmounts.c	(revision 6849)
-+++ gio/gunixmounts.c	(working copy)
-@@ -592,6 +592,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS)
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+  GList *return_list = NULL;
-+  return return_list;
-+}
-+
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -972,6 +982,16 @@
-   
-   return g_list_reverse (return_list);
- }
-+
-+#elif defined(G_OS_BEOS)
-+
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+	GList *return_list = NULL;
-+	return return_list;
-+}
-+
- #else
- #error No g_get_mount_table() implementation for system
- #endif
-Index: gio/makegioalias.pl
-===================================================================
---- gio/makegioalias.pl	(revision 6849)
-+++ gio/makegioalias.pl	(working copy)
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-Index: gio/gunixinputstream.c
-===================================================================
---- gio/gunixinputstream.c	(revision 6849)
-+++ gio/gunixinputstream.c	(working copy)
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -172,6 +174,9 @@
- 			  GCancellable  *cancellable,
- 			  GError       **error)
- {
-+#ifdef G_OS_BEOS
-+  return -1;
-+#else
-   GUnixInputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -227,6 +232,7 @@
-     }
- 
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -332,6 +338,7 @@
- 				GAsyncReadyCallback  callback,
- 				gpointer             user_data)
- {
-+#ifndef G_OS_BEOS
-   GSource *source;
-   GUnixInputStream *unix_stream;
-   ReadAsyncData *data;
-@@ -354,6 +361,7 @@
-   g_source_attach (source, NULL);
-  
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-Index: gio/Makefile.am
-===================================================================
---- gio/Makefile.am	(revision 6849)
-+++ gio/Makefile.am	(working copy)
-@@ -148,7 +148,7 @@
- platform_libadd += -lshlwapi
- endif
- 
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-Index: gio/xdgmime/xdgmimeglob.c
-===================================================================
---- gio/xdgmime/xdgmimeglob.c	(revision 6849)
-+++ gio/xdgmime/xdgmimeglob.c	(working copy)
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-Index: gio/xdgmime/xdgmimealias.c
-===================================================================
---- gio/xdgmime/xdgmimealias.c	(revision 6849)
-+++ gio/xdgmime/xdgmimealias.c	(working copy)
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-Index: gio/xdgmime/xdgmimeparent.c
-===================================================================
---- gio/xdgmime/xdgmimeparent.c	(revision 6849)
-+++ gio/xdgmime/xdgmimeparent.c	(working copy)
-@@ -35,7 +35,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <string.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- 
- #ifndef	FALSE
- #define	FALSE	(0)
-Index: gio/xdgmime/xdgmimecache.c
-===================================================================
---- gio/xdgmime/xdgmimecache.c	(revision 6849)
-+++ gio/xdgmime/xdgmimecache.c	(working copy)
-@@ -34,7 +34,7 @@
- 
- #include <fcntl.h>
- #include <unistd.h>
--#include <fnmatch.h>
-+//#include <fnmatch.h>
- #include <assert.h>
- 
- #include <netinet/in.h> /* for ntohl/ntohs */
-Index: gio/gunixoutputstream.c
-===================================================================
---- gio/gunixoutputstream.c	(revision 6849)
-+++ gio/gunixoutputstream.c	(working copy)
-@@ -28,7 +28,9 @@
- #include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#ifdef HAVE_POLL
- #include <poll.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-@@ -160,6 +162,9 @@
- 			    GCancellable   *cancellable,
- 			    GError        **error)
- {
-+#ifdef G_OS_BEOS
-+  return -1;
-+#else
-   GUnixOutputStream *unix_stream;
-   gssize res;
-   struct pollfd poll_fds[2];
-@@ -216,6 +221,7 @@
-     }
-   
-   return res;
-+#endif
- }
- 
- static gboolean
-@@ -321,6 +327,7 @@
- 				  GAsyncReadyCallback  callback,
- 				  gpointer             user_data)
- {
-+#ifndef G_OS_BEOS
-   GSource *source;
-   GUnixOutputStream *unix_stream;
-   WriteAsyncData *data;
-@@ -343,6 +350,7 @@
-   g_source_attach (source, NULL);
-   
-   g_source_unref (source);
-+#endif
- }
- 
- static gssize
-Index: gobject/makegobjectalias.pl
-===================================================================
---- gobject/makegobjectalias.pl	(revision 6849)
-+++ gobject/makegobjectalias.pl	(working copy)
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
-Index: glib/gutils.c
-===================================================================
---- glib/gutils.c	(revision 6849)
-+++ glib/gutils.c	(working copy)
-@@ -2236,6 +2236,21 @@
- }
- #endif /* G_OS_WIN32 */
- 
-+#if defined(G_OS_BEOS)
-+static void
-+load_user_special_dirs (void)
-+{
-+  g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup("/boot/home/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup("/boot/home");
-+  g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup("/boot/home/Desktop");
-+  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
-+  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
-+}
-+#endif /* G_OS_BEOS */
-+
- static void g_init_user_config_dir (void);
- 
- #if defined(G_OS_UNIX) && !defined(HAVE_CARBON)
-Index: glib/gmain.c
-===================================================================
---- glib/gmain.c	(revision 6849)
-+++ glib/gmain.c	(working copy)
-@@ -3876,6 +3876,7 @@
- static void
- g_child_watch_source_init_multi_threaded (void)
- {
-+#ifndef G_OS_BEOS
-   GError *error = NULL;
-   struct sigaction action;
- 
-@@ -3895,6 +3896,7 @@
-   sigemptyset (&action.sa_mask);
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-   sigaction (SIGCHLD, &action, NULL);
-+#endif
- }
- 
- static void
-Index: glib/gbacktrace.c
-===================================================================
---- glib/gbacktrace.c	(revision 6849)
-+++ glib/gbacktrace.c	(working copy)
-@@ -193,7 +193,7 @@
- #endif
- }
- 
--#ifndef G_OS_WIN32
-+#if !defined(G_OS_WIN32) && !defined(G_OS_BEOS)
- 
- static gboolean stack_trace_done = FALSE;
- 
-Index: glib/Makefile.am
-===================================================================
---- glib/Makefile.am	(revision 6849)
-+++ glib/Makefile.am	(working copy)
-@@ -19,7 +19,7 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-Index: glib/gslice.c
-===================================================================
---- glib/gslice.c	(revision 6849)
-+++ glib/gslice.c	(working copy)
-@@ -302,6 +302,8 @@
-     GetSystemInfo (&system_info);
-     sys_page_size = system_info.dwPageSize;
-   }
-+#elif defined(G_OS_BEOS)
-+  sys_page_size = 4096;
- #else
-   sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */
- #endif
-Index: glib/gtester.c
-===================================================================
---- glib/gtester.c	(revision 6849)
-+++ glib/gtester.c	(working copy)
-@@ -630,6 +630,7 @@
-    * we must fiddle with sigaction() *before* glib is used, otherwise
-    * we could revoke signal hanmdler setups from glib initialization code.
-    */
-+#ifdef SA_RESTART
-   if (TRUE)
-     {
-       struct sigaction sa;
-@@ -639,6 +640,7 @@
-       sa.sa_flags = SA_RESTART;
-       sigaction (SIGCHLD, &sa, &osa);
-     }
-+#endif
- 
-   g_set_prgname (argv[0]);
-   parse_args (&argc, &argv);
-Index: glib/gspawn.c
-===================================================================
---- glib/gspawn.c	(revision 6849)
-+++ glib/gspawn.c	(working copy)
-@@ -230,6 +230,9 @@
-               gint                 *exit_status,
-               GError              **error)     
- {
-+#ifdef G_OS_BEOS
-+  return FALSE;
-+#else
-   gint outpipe = -1;
-   gint errpipe = -1;
-   GPid pid;
-@@ -425,6 +428,7 @@
- 
-       return TRUE;
-     }
-+#endif
- }
- 
- /**
-@@ -896,7 +900,7 @@
-   gint fd;
-   gint res = 0;
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS)
-   struct rlimit rl;
- #endif
- 
-@@ -939,7 +943,7 @@
- 
- #endif
-   
--#ifdef HAVE_SYS_RESOURCE_H
-+#if defined(HAVE_SYS_RESOURCE_H) && !defined(G_OS_BEOS)
-       
-   if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
-       open_max = rl.rlim_max;
-Index: glib/makegalias.pl
-===================================================================
---- glib/makegalias.pl	(revision 6849)
-+++ glib/makegalias.pl	(working copy)
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/boot/home/config/bin/perl -w
- 
- my $do_def = 0;
- 
diff --git a/dev-libs/glib/patches/glib-2.38.1.patch b/dev-libs/glib/patches/glib2-2.38.1.patch
similarity index 100%
rename from dev-libs/glib/patches/glib-2.38.1.patch
rename to dev-libs/glib/patches/glib2-2.38.1.patch
diff --git a/dev-libs/glib/patches/pkgconfig_glib-1.2.10-installable.diff b/dev-libs/glib/patches/pkgconfig_glib-1.2.10-installable.diff
deleted file mode 100644
index 4d427538f..000000000
--- a/dev-libs/glib/patches/pkgconfig_glib-1.2.10-installable.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur glib-1.2.10-original/Makefile.am glib-1.2.10/Makefile.am
---- glib-1.2.10-original/Makefile.am	2009-01-22 23:29:09.000000000 +0000
-+++ glib-1.2.10/Makefile.am	2009-01-22 23:32:21.000000000 +0000
-@@ -1,5 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- # require automake 1.4
- AUTOMAKE_OPTIONS = 1.4
- 
-@@ -7,8 +9,8 @@
- 
- configincludedir = $(pkglibdir)/include
- 
--noinst_SCRIPTS=glib-config
--#BUILT_SOURCES=glib-config
-+bin_SCRIPTS=glib-config
-+BUILT_SOURCES=glib-config
- glib-config: glib-config.in
- 
- INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
-@@ -30,7 +32,7 @@
- 	gthread.pc.in
- 
- 
--noinst_LTLIBRARIES = libglib.la
-+lib_LTLIBRARIES = libglib.la
- 
- libglib_la_SOURCES = \
- 	garray.c	\
-@@ -60,11 +62,11 @@
- 	gutils.c
- 
- glibincludedir=$(includedir)/glib-1.2
--noinst_HEADERS =   \
-+glibinclude_HEADERS =   \
- 	glib.h
- 
--#noinst_DATA = \
--#	glibconfig.h
-+configinclude_DATA = \
-+	glibconfig.h
- 
- CONFIGURE_DEPENDENCIES = acglib.m4		
- 
-@@ -86,10 +88,10 @@
- testgdateparser_LDADD = libglib.la
- 
- m4datadir = $(datadir)/aclocal
--noinst_DATA = glib.m4
-+m4data_DATA = glib.m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
--noinst_DATA = glib.pc gmodule.pc gthread.pc
-+pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
- 
- glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-diff -Naur glib-1.2.10-original/configure.in glib-1.2.10/configure.in
---- glib-1.2.10-original/configure.in	2009-01-22 23:29:09.000000000 +0000
-+++ glib-1.2.10/configure.in	2009-01-22 23:30:28.000000000 +0000
-@@ -9,6 +9,8 @@
- # init autoconf (and check for presence of glist.c)
- AC_INIT(glist.c)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- # Save this value here, since automake will set cflags later
- cflags_set=${CFLAGS+set}
- 
diff --git a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
deleted file mode 100644
index 630629e2b..000000000
--- a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
-SRC_URI="git://git.netsurf-browser.org/libcss.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libparserutils >= 0.1.1"
-
-BUILD()
-{
-	cd libcss-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libcss-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.2.0_git.recipe
new file mode 100644
index 000000000..37944be56
--- /dev/null
+++ b/dev-libs/libcss/libcss-0.2.0_git.recipe
@@ -0,0 +1,54 @@
+#TODO:split out _devel
+SUMMARY="LibCSS is a CSS parser and selection engine" 
+DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
+SRC_URI="git://git.netsurf-browser.org/libcss.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2007 - 2013 J-M Bell"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libcss$secondaryArchSuffix = $portVersion
+	lib:libcss$secondaryArchSuffix = $portVersion
+	devel:libcss$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libparserutils${secondaryArchSuffix}
+	lib:libwapcaplet${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libparserutils${secondaryArchSuffix} >= 0.1.1
+	devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libcss
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+}
diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe
new file mode 100644
index 000000000..80788b342
--- /dev/null
+++ b/dev-libs/libidl/libidl-0.6.8.recipe
@@ -0,0 +1,80 @@
+SUMMARY="Library for creating CORBA Interface Definition Language files"
+DESCRIPTION="
+libIDL is a library for creating trees of CORBA Interface Definition Language \
+(IDL) files, which is a specification for defining portable interfaces. libIDL \
+was initially written for ORBit (the ORB from the GNOME project, and the \
+primary means of libIDL distribution). However, the functionality was designed \
+to be as reusable and portable as possible.
+"
+HOMEPAGE="http://andrewtv.org/libIDL/"
+SRC_URI="http://andrewtv.org/libIDL/libIDL-0.6.8.tar.gz"
+CHECKSUM_MD5="97e2da9229cdb0445719b6cf802c1782"
+COPYRIGHT="1998-1999 Andrew T. Veliath"
+LICENSE="GNU LGPL v2"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2"
+SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+
+PROVIDES="
+	libidl$secondaryArchSuffix = $portVersion
+	lib:libIDL$secondaryArchSuffix = $portVersion compat = 0.4.4
+	lib:libIDL_0.6$secondaryArchSuffix = $portVersion compat = 0.4.4
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libglib
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libglib$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:flex
+	cmd:bison
+	"
+
+PROVIDES_devel="
+	libidl${secondaryArchSuffix}_devel = $portVersion
+	cmd:libIDL_config = $portVersion
+	devel:libIDL$secondaryArchSuffix = $portVersion
+	devel:libIDL_0.6$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libidl$secondaryArchSuffix == $portVersion
+	"
+
+SOURCE_DIR="libIDL-$portVersion"
+
+PATCHES="libidl-0.6.8.patchset"
+
+BUILD()
+{
+	libtoolize -fci
+	aclocal
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libIDL libIDL-0.6
+
+	fixDevelopLibDirReferences $binDir/libIDL-config \
+		$libDir/libIDLConf.sh
+
+	packageEntries devel \
+		$developDir $binDir \
+		$dataDir $infoDir \
+		$libDir/libIDLConf.sh
+}
diff --git a/dev-libs/libidl/patches/libidl-0.6.8.patchset b/dev-libs/libidl/patches/libidl-0.6.8.patchset
new file mode 100644
index 000000000..60c656103
--- /dev/null
+++ b/dev-libs/libidl/patches/libidl-0.6.8.patchset
@@ -0,0 +1,51 @@
+From 5b768320419c034d19d2f4646365c3e3f2b93ff8 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 9 Dec 2013 18:27:26 -0700
+Subject: Attempt to bring libIDL into the modern age
+
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 0481a2f..0fc8e87 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,4 +1,15 @@
+ dnl Autoconf extension macros for libIDL
++# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
++# ---------------------------------
++# Put STUFF early enough so that they are available for $ac_help expansion.
++# Handle both classic (<= v2.13) and modern autoconf
++AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
++[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
++   [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
++       [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++$1
++AC_DIVERT_POP()])])])
++
+ AC_DEFUN(AC_CPP_ACCEPT_IDL,
+ 	[AC_CACHE_CHECK([if C preprocessor likes IDL],
+ 		ac_cv_cpp_accept_idl,
+diff --git a/configure.in b/configure.in
+index 3b32bbe..a4af53d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(IDL.h.new.in)
+ 
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++GLIB_AC_DIVERT_BEFORE_HELP([
+ #
+ # Making releases:
+ #   LIBIDL_MICRO_VERSION += 1;
+@@ -20,7 +20,7 @@ LIBIDL_INTERFACE_AGE=4
+ LIBIDL_BINARY_AGE=8
+ LIBIDL_LIBRARY_VERSION=$LIBIDL_MAJOR_VERSION.$LIBIDL_MINOR_VERSION.$LIBIDL_MICRO_VERSION
+ GLIB_VERSION_REQUIRED=1.2.0
+-AC_DIVERT_POP()dnl
++])
+ 
+ AC_SUBST(LIBIDL_MAJOR_VERSION)
+ AC_SUBST(LIBIDL_MINOR_VERSION)
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
deleted file mode 100644
index f05444ead..000000000
--- a/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="LibParserUtils is a library for building efficient parsers" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
-SRC_URI="git://git.netsurf-browser.org/libparserutils.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0.0.1"
-
-BUILD()
-{
-	cd libparserutils-0.1.2-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libparserutils-0.1.2-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
new file mode 100644
index 000000000..cd3f2e789
--- /dev/null
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
@@ -0,0 +1,51 @@
+#TODO:split out _devel
+SUMMARY="LibParserUtils is a library for building efficient parsers" 
+DESCRIPTION="LibParserUtils is a library for building efficient parsers" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
+SRC_URI="git://git.netsurf-browser.org/libparserutils.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2007 - 2013 J-M Bell"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libparserutils$secondaryArchSuffix = $portVersion
+	lib:libparserutils$secondaryArchSuffix = $portVersion
+	devel:libparserutils$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv${secondaryArchSuffix}
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libparserutils
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+}
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
deleted file mode 100644
index 7d65949e3..000000000
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="libpthread-stubs" 
-HOMEPAGE="http://xcb.freedesktop.org/" 
-SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
-CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
-BUILD()
-{
-	cd libpthread-stubs-0.3
-	libtoolize --force --copy --install
-	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libpthread-stubs-0.3
-	make install
-}
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
index 7d65949e3..5df1e235d 100644
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -1,21 +1,50 @@
+SUMMARY="libpthread-stubs" 
 DESCRIPTION="libpthread-stubs" 
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
 CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+
+COPYRIGHT="2006 Diego Pettenò"
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libpthread_stubs$secondaryArchSuffix = $portVersion
+	devel:libpthread_stubs$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+SOURCE_DIR="libpthread-stubs-$portVersion"
+
 BUILD()
 {
-	cd libpthread-stubs-0.3
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libpthread-stubs-0.3
 	make install
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
deleted file mode 100644
index 24a190d2d..000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="LibWapcaplet is a string internment library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
-SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0"
-
-BUILD()
-{
-	cd libwapcaplet-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libwapcaplet-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009 - 2012 The NetSurf Browser project"
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
new file mode 100644
index 000000000..137b0efeb
--- /dev/null
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
@@ -0,0 +1,48 @@
+#TODO:split out _devel
+SUMMARY="LibWapcaplet is a string internment library" 
+DESCRIPTION="LibWapcaplet is a string internment library" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
+SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2009 - 2012 The NetSurf Browser project"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libwapcaplet$secondaryArchSuffix = $portVersion
+	lib:libwapcaplet$secondaryArchSuffix = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libwapcaplet
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+}
diff --git a/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe
similarity index 63%
rename from dev-perl/HTML_Parser/HTML_Parser-3.70.recipe
rename to dev-perl/html_parser/html_parser-3.70.recipe
index 18e81d1e3..467457f6b 100644
--- a/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe
+++ b/dev-perl/html_parser/html_parser-3.70.recipe
@@ -1,3 +1,5 @@
+#FIXME: Appending installation info to /packages/html_parser-3.70-1/.self/lib/perl5/5.18.1/BePC-haiku/perllocal.pod
+#FIXME: Warning: prerequisite HTML::Tagset 3 not found.
 SUMMARY="Encode or decode strings with HTML entities"
 HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/"
 SRC_URI="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.70.tar.gz"
@@ -5,9 +7,12 @@ REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="efe7699f5ece3a230d730a3682359c08"
 PROVIDES="
-	HTML_Parser = $portVersion
+	html_parser = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	perl
 	"
-REQUIRES="perl"
 COPYRIGHT="
 1995-2009 Gisle Aas. All rights reserved.
 1999-2000 Michael A. Chase.  All rights reserved.
@@ -17,16 +22,20 @@ LICENSE="
 	Artistic (Perl)
 "
 
-BUILD_REQUIRES="make"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl"
 
 SOURCE_DIR="HTML-Parser-3.70"
 BUILD() {
-	perl Makefile.PL
+	perl Makefile.PL PREFIX=$prefix
 	make
 }
 
 INSTALL() {
-	make install DESTDIR=$prefix
+	make install
 }
 
 DESCRIPTION="
diff --git a/dev-util/buildsystem/buildsystem-0.recipe b/dev-util/buildsystem/buildsystem-0.recipe
deleted file mode 100644
index e8074bdb9..000000000
--- a/dev-util/buildsystem/buildsystem-0.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
-HOMEPAGE="http://www.netsurf-browser.org/" 
-SRC_URI="git://git.netsurf-browser.org/buildsystem"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd buildsystem-0
-	make
-}
-
-INSTALL()
-{
-	cd buildsystem-0
-	make install PREFIX=/boot/common/
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
deleted file mode 100644
index 9ea205843..000000000
--- a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
-HOMEPAGE="http://www.netsurf-browser.org/" 
-SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd buildsystem-1.0-HEAD
-	make
-}
-
-INSTALL()
-{
-	cd buildsystem-1.0-HEAD
-	make install PREFIX=/boot/common/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009 - 2013 The NetSurf Browser project"
diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe
index 3ab1af323..0cc56695c 100644
--- a/dev-util/ccache/ccache-3.1.9.recipe
+++ b/dev-util/ccache/ccache-3.1.9.recipe
@@ -1,6 +1,6 @@
 SUMMARY="ccache is a fast compiler cache."
-DESCRIPTION="ccache is a compiler cache.  It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again.  Supported languages are C, C++, Objective-C and Objective-C++." 
-HOMEPAGE="http://ccache.samba.org/" 
+DESCRIPTION="ccache is a compiler cache.  It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again.  Supported languages are C, C++, Objective-C and Objective-C++."
+HOMEPAGE="http://ccache.samba.org/"
 SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2"
 REVISION="1"
 
@@ -11,15 +11,21 @@ COPYRIGHT="2002-2007 Andrew Tridgell
 CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8"
 
 ARCHITECTURES="x86 x86_gcc2"
+
 PROVIDES="
+	ccache = $portVersion
 	cmd:ccache
 	"
+
 REQUIRES="
-	lib:libroot >= $haikuVersion
+	haiku >= $haikuVersion
 	lib:libz >= 1
 	"
+
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe
index 9aebf221e..8b20c2e5b 100644
--- a/dev-util/fastdep/fastdep-0.16.recipe
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -1,6 +1,6 @@
-SUMMARY="fastdep is a fast dependency generator for C/C++ files." 
+SUMMARY="fastdep is a fast dependency generator for C/C++ files."
 DESCRIPTION="fastdep is a preprocessor which generates dependency information suitable for Makefile inclusion from C or C++ source files.  Meant to run on slower hardware, it is several orders of magnitude faster than gcc."
-HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" 
+HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/"
 SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz"
 REVISION="1"
 CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54"
@@ -14,14 +14,15 @@ PATCHES="fastdep-0.16.patch"
 PROVIDES="
 	cmd:fastdep = $portVersion compat >= 0
 	"
-	
+
 REQUIRES="
-	lib:libstdc++.r4
-	lib:libroot >= $haikuVersion"
-	
-BUILD_REQUIRES="
+	haiku >= $haikuVersion
 	"
-	
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
@@ -40,5 +41,3 @@ INSTALL()
 	mkdir -p $binDir
 	cp -f fastdep $binDir
 }
-
-
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
new file mode 100644
index 000000000..7bdcadc5e
--- /dev/null
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
@@ -0,0 +1,43 @@
+SUMMARY="NetSurf build framework" 
+DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
+HOMEPAGE="http://www.netsurf-browser.org/" 
+SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2009 - 2013 The NetSurf Browser project"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	netsurf_buildsystem$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	# no-op
+	# make
+	:
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
+}
+
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
index 8f541f9a3..852955849 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -7,28 +7,29 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
 CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="pkgconfig-0.27.1.patchset"
 
 PROVIDES="
-	pkgconfig = $portVersion compat >= 0.27
-	cmd:pkg_config = $portVersion compat >= 0.27
+	pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27
+	cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libiconv
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libiconv
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
@@ -46,7 +47,7 @@ BUILD()
 	autoconf
 	automake --add-missing
 
-	pcPathSubdir="develop/lib/pkgconfig"
+	pcPathSubdir="develop/lib${secondaryArchSuffix/_//}/pkgconfig"
 	pcPath="/boot/home/config/non-packaged/$pcPathSubdir"
 	pcPath="$pcPath:/boot/home/config/$pcPathSubdir"
 	pcPath="$pcPath:/boot/system/$pcPathSubdir"
diff --git a/dev-vcs/fossil/fossil-1.27.recipe b/dev-vcs/fossil/fossil-1.27.recipe
new file mode 100644
index 000000000..a1f1184d1
--- /dev/null
+++ b/dev-vcs/fossil/fossil-1.27.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Simple, high-reliability, distributed software configuration management" 
+DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
+HOMEPAGE="http://www.fossil-scm.org/" 
+SRC_URI="http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz"
+CHECKSUM_MD5="fa4ea3eb25d2a8cfb0edbd0c30c268b9"
+REVISION="1"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2007 D. Richard Hipp"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	fossil = $portVersion
+	cms:fossil = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	openssl >= 1.0.0
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz >= 1.2.3
+	openssl_devel >= 1.0.0
+	"
+# tests require cmd:tclsh
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="fossil-src-20130911114349"
+
+BUILD()
+{
+	./configure --prefix=$prefix
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}
diff --git a/games-kids/pipepanic/patches/pipepanic-0.1.3.patch b/games-kids/pipepanic/patches/pipepanic-0.1.3.patch
new file mode 100644
index 000000000..e6c7c39f2
--- /dev/null
+++ b/games-kids/pipepanic/patches/pipepanic-0.1.3.patch
@@ -0,0 +1,23 @@
+--- ../main.c	2006-05-16 22:11:29.042991616 +0200
++++ main-new.c	2013-12-09 16:52:30.000000000 +0100
+@@ -16,6 +16,10 @@
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+ 
+ /* Includes */
++// chdir()
++#include <unistd.h>
++#include <libgen.h>
++
+ #include <SDL/SDL_main.h>
+ #include <SDL/SDL.h>
+ #include <string.h>
+@@ -102,6 +106,9 @@
+ int main(int argc, char *argv[]) {
+ 	int count, count2;
+ 	
++	// For tracker (Thanks PulkoMandy)
++	chdir(dirname(argv[0]));
++
+ 	/* Initialise the highscoreboard array because there may not yet
+ 	   be a saved highscore[board]/rc file */
+ 	for (count = 0; count < 5; count++) {
diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe
new file mode 100644
index 000000000..5324ca060
--- /dev/null
+++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe
@@ -0,0 +1,45 @@
+SUMMARY="A pipe connecting game."
+DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many different shaped pipes together as possible within the time given. "
+HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
+SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz"
+CHECKSUM_MD5="99b68e990012b2f58c184b8ba9e4fb4d"
+SOURCE_DIR="pipepanic-0.1.3-source"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2013 Thunor"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	pipepanic = $portVersion
+	app:pipepanic = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+PATCHES="
+	pipepanic-0.1.3.patch
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/Pipepanic
+	cp pipepanic ascii15.bmp ascii30.bmp digits24.bmp digits48.bmp tiles24.bmp tiles48.bmp $appsDir/Pipepanic/
+	addAppDeskbarSymlink $appsDir/Pipepanic/pipepanic "Pipepanic"
+}
\ No newline at end of file
diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index 74dc8f769..2e7cf9ce0 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -28,7 +28,6 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:make
 	"
 
 BUILD()
@@ -36,7 +35,7 @@ BUILD()
 	g++ -c src/bdh_main.cpp -o bdh_main.o
 	g++ -c src/bdh_view.cpp -o bdh_view.o
 	g++ -lbe bdh_main.o bdh_view.o -o bdhcalc
-	xres bdhcalc Ressources/bdh.rsrc
+	xres -o bdhcalc Ressources/bdh.rsrc
 	mimeset -f bdhcalc
 }
 
diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe
new file mode 100644
index 000000000..f3ea35ab7
--- /dev/null
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -0,0 +1,44 @@
+SUMMARY="HTML documentation viewer" 
+DESCRIPTION="HTML documentation viewer" 
+HOMEPAGE="http://www.becoz.org/beos-en/behappy" 
+SRC_URI="git+https://github.com/HaikuArchives/BeHappy.git"
+REVISION="1"
+#CHECKSUM_MD5=""
+LICENSE="MIT"
+COPYRIGHT="2006 Sylvain Tertois
+	2008-2009 François Revol"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	behappy = $portVersion
+	app:behappy = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+#	app:netsurf >= 2.6
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	cmd:ld
+"
+
+
+BUILD()
+{
+	cd trunk
+	make BUILDHOME=/system/develop
+}
+
+INSTALL()
+{
+	cd trunk
+	make install BUILDHOME=/system/develop
+}
+
diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe
new file mode 100644
index 000000000..2ac0c14bd
--- /dev/null
+++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe
@@ -0,0 +1,67 @@
+SUMMARY="Search through your files with ease!"
+
+DESCRIPTION="
+	BeIndexed searches all your files and builds a database with 
+	their content. You can then search for files by content,
+	like on Google etc. Index files with Indexer, Find files with
+	Finder.
+	" 
+
+HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" #Or web.archive.org and eiman.tv/BeIndexed
+SRC_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276"
+
+REVISION="1"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2003 Mikael Eiman"
+
+ARCHITECTURES="x86_gcc2 x86"
+
+
+PROVIDES="
+	beindexed = $portVersion
+	app:Finder = $portVersion
+	cmd:Indexer = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	lib:liblayout
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++
+	cmd:xres
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD_REQUIRES="
+	makefile_engine
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	devel:liblayout
+	"
+
+USER_SETTINGS_FILES="
+	data/BeIndexed directory
+	"
+
+BUILD()
+{
+	mkdir bin || true
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p $appsDir
+	
+	cp bin/Indexer $binDir
+	cp bin/Finder $appsDir
+	
+	addAppDeskbarSymlink $appsDir/Finder
+}
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
similarity index 90%
rename from haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe
rename to haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
index a0bfb4b3a..15214bdd1 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
@@ -8,7 +8,7 @@ DESCRIPTION="
 	section you select.
 	"
 HOMEPAGE="https://github.com/jackburton79/bescreencapture"
-SRC_URI="git+git://github.com/jackburton79/bescreencapture.git#87886da2972fd4bbabb3fc5caae301c6dc14e7fd"
+SRC_URI="git://github.com/jackburton79/bescreencapture.git#fb7de7c5dec3768509072e3f3ee2a433bc9285bb"
 LICENSE="
 	BSD (3-clause)
 	MIT
diff --git a/haiku-apps/burnitnow/burnitnow-27.recipe b/haiku-apps/burnitnow/burnitnow-27.recipe
deleted file mode 100644
index 7d9667d50..000000000
--- a/haiku-apps/burnitnow/burnitnow-27.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#27"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-27
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-27
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-38.recipe b/haiku-apps/burnitnow/burnitnow-38.recipe
deleted file mode 100644
index 22f906cb4..000000000
--- a/haiku-apps/burnitnow/burnitnow-38.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#38"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-38
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-38
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-39.recipe b/haiku-apps/burnitnow/burnitnow-39.recipe
deleted file mode 100644
index 4ed1fbf85..000000000
--- a/haiku-apps/burnitnow/burnitnow-39.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#39"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-39
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-39
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-43.recipe b/haiku-apps/burnitnow/burnitnow-43.recipe
deleted file mode 100644
index 0d3dcdd90..000000000
--- a/haiku-apps/burnitnow/burnitnow-43.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#43"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-43
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-43
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2011 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
deleted file mode 100644
index d2c4e80e7..000000000
--- a/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-beta5-svn
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-beta5-svn
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2011 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-beta6.recipe b/haiku-apps/burnitnow/burnitnow-beta6.recipe
deleted file mode 100644
index 08a74e2e1..000000000
--- a/haiku-apps/burnitnow/burnitnow-beta6.recipe
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://github.com/scottmc/burnitnow" 
-SRC_URI="git://github.com/scottmc/BurnItNow.git#6367b5beb2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd burnitnow-beta6/legacy
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	cd burnitnow-beta6/legacy
-	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
-	mkdir -p ${BURNITNOWDIR}/Docs
-	cp -a BurnItNow ${BURNITNOWDIR}
-	cp -a LICENSE ${BURNITNOWDIR}/LICENSE
-	cp -a TODO ${BURNITNOWDIR}/TODO
-	cp -a README ${BURNITNOWDIR}/README
-	cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS
-	cp -a Changes ${BURNITNOWDIR}/Changes
-	cp -a Docs ${BURNITNOWDIR}/
-	if [ -z ${DESTDIR} ];then
-		find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-	fi
-}
-
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2013 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe
index 98d226421..e772c93fa 100644
--- a/haiku-apps/burnitnow/burnitnow-trunk.recipe
+++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe
@@ -1,18 +1,15 @@
 SUMMARY="A utility for burning CD"
 DESCRIPTION="BurnItNow is a CD burning utility application for Haiku"
 HOMEPAGE="https://github.com/HaikuArchives/BurnItNow"
-SRC_URI="git+https://github.com/HaikuArchives/BurnItNow#5036e55"
+SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87"
 REVISION="1"
 COPYRIGHT="
 	2010-2013 BurnItNow Team
-	2005-2007 Ingo Weinhold <bonefish@users.sf.net>
-	2007 Haiku, Inc.
-	1991-2000 Be Incorporated
 	"
 LICENSE="MIT"
 
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	burnitnow = $portVersion
@@ -20,22 +17,22 @@ PROVIDES="
 	"
 
 REQUIRES="
+	haiku >= $haikuVersion
 	cmd:cdrecord
 	"
 
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:cmake
-	cmd:make
-	cmd:gcc
-	"
-	
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
-SOURCE_DIR="$portName/trunk"
-		
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+#SOURCE_DIR="$portName/burnitnow2"
+
 BUILD()
 {
 	cmake .
diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe
index a64b8da0e..f7ce8092e 100644
--- a/haiku-apps/fortuna/fortuna-1.0.0.recipe
+++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe
@@ -9,7 +9,7 @@ DESCRIPTION="
 	" # Taken from homepage
 
 HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm"
-SRC_URI="git://github.com/HaikuArchives/Fortuna.git#eacb3689800064b948d3b943302b2d4bf18c9dbc"
+SRC_URI="git://github.com/HaikuArchives/Fortuna.git#9e0cd6c1e6"
 REVISION="1"
 
 LICENSE="MIT"
@@ -39,6 +39,8 @@ BUILD_REQUIRES="
 
 BUILD()
 {
+
+	rc src/Fortuna.rdef
 	g++ -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp
 	xres -o Fortuna src/Fortuna.rsrc
 	mimeset -f Fortuna
diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
new file mode 100644
index 000000000..1b18547e3
--- /dev/null
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -0,0 +1,41 @@
+SUMMARY="Easy to use powerful contact manager for haiku"
+DESCRIPTION="MrPeeps is an app for managing People files that has more
+	features than other contact managers. For more info read README file"
+HOMEPAGE="https://github.com/HaikuArchives/MrPeeps"
+SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65"
+LICENSE="MIT"
+COPYRIGHT="2003 DarkWyrm"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+PROVIDES="
+	MrPeeps = $portVersion
+	app:MrPeeps = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+PATCHES="MrPeeps-1.2_beta.patch"
+
+BUILD()
+{
+	cd src
+	cp Locale\ Support/* ./
+	g++ -lbe -ltranslation -lroot AboutWindow.cpp BitmapDump.cpp \
+		BitmapView.cpp BStringList.cpp DataView.cpp Formatting.cpp \
+		IntroView.cpp ListData.cpp MrPeeps.cpp NewTextControl.cpp \
+		PeepsItem.cpp PeepsWindow.cpp PeopleList.cpp LocaleRoster.cpp \
+		Locale.cpp TextFile.cpp -o ../MrPeeps
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -f ./MrPeeps $appsDir
+	addAppDeskbarSymlink $appsDir/MrPeeps
+}
diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
new file mode 100644
index 000000000..069aa06a4
--- /dev/null
+++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
@@ -0,0 +1,50 @@
+diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h
+--- /boot/home/MrPeeps/src/ListData.h	2013-12-01 19:17:49.441188352 +0400
++++ ./src/ListData.h	2013-12-09 19:07:33.235667456 +0400
+@@ -3,10 +3,11 @@
+ 
+ #include <Entry.h>
+ #include <List.h>
++#include <Node.h>
+ #include <String.h>
+-#include "BStringList.h"
+ #include <Bitmap.h>
+ #include "BitmapDump.h"
++#include "BStringList.h"
+ 
+ class PeepsListItem;
+ class GroupItem;
+diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h
+--- /boot/home/MrPeeps/src/PeepsWindow.h	2013-12-01 19:17:49.467927040 +0400
++++ ./src/PeepsWindow.h	2013-12-09 19:07:59.108789760 +0400
+@@ -1,16 +1,18 @@
+ #ifndef PEEPSWINDOW_H
+ #define PEEPSWINDOW_H
+ 
+-#include <Window.h>
+-#include <View.h>
+-#include <TextControl.h>
+-#include <PopUpMenu.h>
+ #include <Button.h>
++#include <Entry.h>
++#include <ListItem.h>
+ #include <Menu.h>
+ #include <MenuItem.h>
+-#include "NewTextControl.h"
+ #include <Messenger.h>
++#include <PopUpMenu.h>
++#include <TextControl.h>
++#include <View.h>
++#include <Window.h>
+ #include "LocaleRoster.h"
++#include "NewTextControl.h"
+ 
+ class PeopleList;
+ class PeepsListItem;
+@@ -117,4 +119,4 @@
+ 
+ #define TRANSLATE(x) gCurrentLocale->Translate(x).String()
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe
index 950bf44c9..7095700d1 100644
--- a/haiku-apps/paladin/paladin-1.3.recipe
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -1,6 +1,6 @@
 SUMMARY="Paladin is a open source integrated development environment (IDE)"
-DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." 
-HOMEPAGE="http://paladin.sourceforge.net" 
+DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE."
+HOMEPAGE="http://paladin.sourceforge.net"
 SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download"
 REVISION="2"
 CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
@@ -25,6 +25,8 @@ PROVIDES="
 REQUIRES="
 	haiku >= $haikuVersion
 	lib:libpcre
+	cmd:fastdep
+	cmd:ccache
 "
 BUILD_REQUIRES="
 	devel:libpcre
@@ -51,12 +53,12 @@ BUILD()
 	cd Paladin
 	./build.sh
 	cd ..
-	
+
 	#Rez
 	cd PalEdit/rez/Sources
 	g++ -o rez *.cpp -I. -lbe
 	cd ../../..
-	
+
 	#PalEdit
 	cd PalEdit/Sources
 	g++ -shared -fPIC -o libhekkel.so HAppResFile.cpp HButtonBar.cpp HColorControl.cpp \
@@ -76,7 +78,7 @@ BUILD()
 		utf-support.cpp Utils.cpp libhekkel.so -lpcre -lbe -ltracker -lmail -ltextencoding -ltranslation \
 		-lnetwork
 	cd ../..
-	
+
 	#SymbolFinder
 	cd SymbolFinder
 	g++ -o SymbolFinder *.cpp -lbe -lroot
@@ -88,23 +90,23 @@ INSTALL()
 	mkdir -p $appsDir/Paladin
 	mkdir -p $libDir
 	mkdir -p $binDir
-	
+
 	#Paladin
 	cp Paladin/Paladin $appsDir/Paladin
 	cp Paladin/README $appsDir/Paladin
 	cp -r Templates $appsDir/Paladin
 	cp -r Paladin/Licenses $appsDir/Paladin
-	
+
 	#Rez
 	cp PalEdit/rez/Sources/rez $binDir
-	
+
 	#PalEdit
 	cp PalEdit/Sources/PalEdit $appsDir/Paladin/PalEdit
 	cp PalEdit/Sources/libhekkel.so $libDir
-	
+
 	#SymbolFinder
 	cp SymbolFinder/SymbolFinder $appsDir/Paladin
-	
+
 	addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
 	addAppDeskbarSymlink $appsDir/Paladin/PalEdit PalEdit
 	addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder "Symbol Finder"
diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe
new file mode 100644
index 000000000..bf1a6eb7a
--- /dev/null
+++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe
@@ -0,0 +1,72 @@
+SUMMARY="A programmer's editor"
+DESCRIPTION="A programmer's editor"
+HOMEPAGE="http://pe-editor.berlios.de/"
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
+
+COPYRIGHT="
+	1996-2002 Maarteen Hekkelman
+	2003-2013 Team Pe
+	"
+
+SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#614"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	pe = $portVersion
+	cmd:Pe = $portVersion compat >= 2
+	cmd:lpe = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku
+	lib:libpcre
+	lib:libpcreposix
+	"
+
+BUILD_REQUIRES="
+	devel:libpcre
+	devel:libpcreposix
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCHES="
+	pe-2.4.3_hg611.patch3
+	"
+
+BUILD()
+{
+	jam -q
+		# multi-job builds don't work reliably
+}
+
+INSTALL()
+{
+	peDir=$appsDir/Pe
+
+	mkdir -p $appsDir
+	cp -a generated/distro $peDir
+	cp -a doc $peDir/Documentation
+
+	mkdir $binDir
+	ln -sfn $peDir/lpe $binDir
+
+	addAppDeskbarSymlink $peDir/Pe
+}
diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe
new file mode 100644
index 000000000..8616204e1
--- /dev/null
+++ b/haiku-apps/whisper/whisper-1.2.recipe
@@ -0,0 +1,47 @@
+DESCRIPTION="Whisper BeNet aims to provide a VoIP solution to the Haiku Platform. It was ported from ZETA."
+SUMMARY="VoIP for Haiku"
+COPYRIGHT="
+	1998-2001 the BeNet team
+	2004-2006 Bernd Korz & Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com
+	2008 Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com
+	"
+LICENSE="MIT"
+HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet"
+SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#902635a"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	whisper = $portVersion
+	app:whisper = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+USER_SETTINGS_FILES="
+	settings/BeNet directory"
+
+BUILD()
+{
+	rc -o BeNet.rsrc BeNet.rdef
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	
+	cd build
+	cp Whisper $appsDir
+	addAppDeskbarSymlink $appsDir/Whisper
+}
diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe
new file mode 100644
index 000000000..c7f5117c7
--- /dev/null
+++ b/haiku-games/becheckers/becheckers-1.0.1.recipe
@@ -0,0 +1,43 @@
+SUMMARY="A simple checkers game for two players"
+DESCRIPTION="
+	BeCheckers is a simple checkers game for two players.
+	It follows almost all American Checker Federation (ACF)
+	rules.
+	"
+HOMEPAGE="https://github.com/HaikuArchives/BeCheckers"
+SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439"
+LICENSE="MIT"
+COPYRIGHT="2000 Jeremy J. Gibbons"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	BeCheckers = $portVersion
+	app:BeCheckers = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+
+BUILD()
+{
+	cd trunk
+	g++ -o BeCheckers -lbe \
+		BeCheckers.cpp BeCheckersWindow.cpp \
+		Checker.cpp CheckerBoard.cpp
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp trunk/BeCheckers $appsDir
+	addAppDeskbarSymlink $appsDir/BeCheckers
+}
diff --git a/haiku-games/guitarmaster/guitarmaster-r20.recipe b/haiku-games/guitarmaster/guitarmaster-r21.recipe
similarity index 89%
rename from haiku-games/guitarmaster/guitarmaster-r20.recipe
rename to haiku-games/guitarmaster/guitarmaster-r21.recipe
index 3c040777e..4f082b9aa 100644
--- a/haiku-games/guitarmaster/guitarmaster-r20.recipe
+++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe
@@ -6,7 +6,7 @@ DESCRIPTION="
 	Usage: GuitarMaster [/path/to/songsDirectory]
 	"
 HOMEPAGE="http://code.google.com/p/guitarmaster/"
-SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@20"
+SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@21"
 LICENSE="MIT"
 COPYRIGHT="Toxic Labs 2008-2009"
 REVISION="1"
@@ -27,10 +27,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-PATCHES="
-	guitarmaster-r20.patch
-	"
-
 SRC_FILENAME="download"
 SOURCE_DIR="$portName"
 
diff --git a/haiku-games/guitarmaster/patches/guitarmaster-r20.patch b/haiku-games/guitarmaster/patches/guitarmaster-r20.patch
deleted file mode 100644
index de7e0da10..000000000
--- a/haiku-games/guitarmaster/patches/guitarmaster-r20.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 4929c586441b40f7046487bc9b9a7dd887e3e605 Mon Sep 17 00:00:00 2001
-From: Luke <noryb009@gmail.com>
-Date: Sun, 24 Nov 2013 07:51:48 +0000
-Subject: [PATCH] Search for songs directory
-
----
- TApp.cpp        |  5 +++--
- TApp.h          |  4 +++-
- TMainWindow.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- TMainWindow.h   |  4 +++-
- main.cpp        | 11 +++++++++-
- 5 files changed, 79 insertions(+), 8 deletions(-)
-
-diff --git a/TApp.cpp b/TApp.cpp
-index b38dbe1..a9d89ec 100644
---- a/TApp.cpp
-+++ b/TApp.cpp
-@@ -10,10 +10,11 @@ using namespace org::toxic;
- using namespace std;
- 
- 
--TApp::TApp():BApplication("application/x-vnd.guitar-master")
-+TApp::TApp(BString * UserSpecifiedSongDir):BApplication("application/x-vnd.guitar-master")
- {
- 	cout<<"Guitar Master project"<<endl;
- 	cout<<"Toxic Labs 2008/2009"<<endl;
-+	this->UserSpecifiedSongDir = UserSpecifiedSongDir;
- }
- 
- 
-@@ -27,5 +28,5 @@ void TApp::ReadyToRun()
- {
- 	cout<<"ready!!"<<endl;
- 	
--	window = new TMainWindow(BRect(50,50,300,300));
-+	window = new TMainWindow(BRect(50,50,300,300), UserSpecifiedSongDir);
- }
-diff --git a/TApp.h b/TApp.h
-index f9a6a93..ecf8f00 100644
---- a/TApp.h
-+++ b/TApp.h
-@@ -5,6 +5,7 @@
- #ifndef _TApp_
- #define _TApp_
- 
-+#include <String.h>
- #include <Application.h>
- #include "TMainWindow.h"
- 
-@@ -16,9 +17,10 @@ namespace org
- 		{
- 			private:
- 			TMainWindow * window;
-+			BString * UserSpecifiedSongDir;
- 			public:
- 		
--			TApp();
-+			TApp(BString * UserSpecifiedSongDir = NULL);
- 			~TApp();
- 			
- 			virtual void ReadyToRun();
-diff --git a/TMainWindow.cpp b/TMainWindow.cpp
-index d84cbd4..f16be1d 100644
---- a/TMainWindow.cpp
-+++ b/TMainWindow.cpp
-@@ -11,12 +11,17 @@
- #include <String.h>
- #include <iostream>
- 
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <stdlib.h>
-+
- using namespace org::toxic;
- using namespace org::toxic::resources;
- using namespace std;
- 
- 
--TMainWindow::TMainWindow(BRect frame): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
-+TMainWindow::TMainWindow(BRect frame, BString * UserSpecifiedSongDir): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
- {
- 	cout<<"Main window"<<endl;
- 	
-@@ -46,9 +51,61 @@ TMainWindow::TMainWindow(BRect frame): BWindow(frame,"Guitar Master",B_TITLED_WI
- 	//Songs menu
- 	menu = new BMenu("Songs");
- 	// fill with available song list...
-+	
-+	BString homeDir = getenv("HOME");
-+	if(homeDir == NULL) {
-+		struct passwd *pw = getpwuid(getuid());
-+		homeDir = pw->pw_dir;
-+ 	}
-+	
-+	BString * songLocations[13];
-+	songLocations[0] = UserSpecifiedSongDir;
-+	songLocations[1] = new BString("songs");
-+	songLocations[2] = new BString("/music/GuitarMaster");
-+	songLocations[2]->Prepend(homeDir);
-+	songLocations[3] = new BString("/music/guitarmaster");
-+	songLocations[3]->Prepend(homeDir);
-+	songLocations[4] = new BString("/music/Guitar Master");
-+	songLocations[4]->Prepend(homeDir);
-+	songLocations[5] = new BString("/music/guitar master");
-+	songLocations[5]->Prepend(homeDir);
-+	songLocations[6] = new BString("/Music/GuitarMaster");
-+	songLocations[6]->Prepend(homeDir);
-+	songLocations[7] = new BString("/Music/guitarmaster");
-+	songLocations[7]->Prepend(homeDir);
-+	songLocations[8] = new BString("/Music/Guitar Master");
-+	songLocations[8]->Prepend(homeDir);
-+	songLocations[9] = new BString("/Music/guitar master");
-+	songLocations[9]->Prepend(homeDir);
-+	songLocations[10] = new BString("/music");
-+	songLocations[10]->Prepend(homeDir);
-+	songLocations[11] = new BString("/Music");
-+	songLocations[11]->Prepend(homeDir);
-+	songLocations[12] = new BString(homeDir);
-+	
-+	cout<<"Searching for songs directory..."<<endl;
-+	
-+	BDirectory * songs_dir_check;
-+	for(int i=0; i<sizeof(songLocations)/sizeof(BString *); i++) {
-+		if(songLocations[i] != NULL) {
-+			cout<<"  Checking "<<songLocations[i]->String()<<endl;
-+			songs_dir_check = new BDirectory(songLocations[i]->String());
-+			if(songs_dir_check->InitCheck() == B_OK) {
-+				SongsDirLocation = new BString(*songLocations[i]);
-+				delete songs_dir_check;
-+				break;
-+			}
-+			delete songs_dir_check;
-+		}
-+	}
-+	
-+	for(int i=0; i<sizeof(songLocations)/sizeof(BString *); i++) {
-+		delete songLocations[i];
-+	}
-+	
- 	cout<<"Reading songs directory..."<<endl;
- 	
--	BDirectory songs_dir("songs");
-+	BDirectory songs_dir(SongsDirLocation->String());
- 	BEntry entry;
- 	char str[B_FILE_NAME_LENGTH];
- 	BMessage * message;
-@@ -128,7 +185,7 @@ void TMainWindow::MessageReceived(BMessage * mesg)
- 		case T_MSG_SELECT_SONG:
- 			mesg->FindString("song",&str);
- 			
--			spath<<"songs/"<<str<<"/notes.mid";
-+			spath<<SongsDirLocation->String()<<"/"<<str<<"/notes.mid";
- 			
- 			cout<<"Selected: "<<spath.String()<<endl;
- 			
-diff --git a/TMainWindow.h b/TMainWindow.h
-index b5a3ea4..db632ec 100644
---- a/TMainWindow.h
-+++ b/TMainWindow.h
-@@ -5,6 +5,7 @@
- 
- #include <Window.h>
- #include <MessageRunner.h>
-+#include <String.h>
- #include "TGameView.h"
- 
- #define T_MSG_FRAME 0x00FF0011
-@@ -20,10 +21,11 @@ namespace org
- 			
- 			TGameView * gameview;
- 			BMessageRunner * timer;
-+			BString * SongsDirLocation;
- 				
- 			public:
- 		
--			TMainWindow(BRect frame);
-+			TMainWindow(BRect frame, BString * songDirectory = NULL);
- 			~TMainWindow();
- 			
- 		
-diff --git a/main.cpp b/main.cpp
-index 6e9a650..da8d16b 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -3,13 +3,22 @@
- * Toxic Labs
- */
- 
-+#include <String.h>
- #include "TApp.h"
- 
- using namespace org::toxic;
- 
- int main (int argc,char * argv[])
- {
--	TApp app;
-+	BString * UserSpecifiedSongDir;
-+	UserSpecifiedSongDir = NULL;
-+	// see if song directory was specified
-+	if(argc > 1)
-+	{
-+		UserSpecifiedSongDir = new BString(argv[1]);
-+	}
-+	
-+	TApp app(UserSpecifiedSongDir);
- 	
- 	app.Run();
- 
--- 
-1.8.3.4
-
diff --git a/haiku-libs/libsanta/libsanta-0.0.1.recipe b/haiku-libs/libsanta/libsanta-0.0.1.recipe
new file mode 100644
index 000000000..347c3bea7
--- /dev/null
+++ b/haiku-libs/libsanta/libsanta-0.0.1.recipe
@@ -0,0 +1,63 @@
+SUMMARY="Custom widget library"
+DESCRIPTION="libsanta has some useful custom widgets."
+HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag"
+COPYRIGHT="briant@timelinevista.com"
+LICENSE="libsanta"
+SRC_URI="git+https://github.com/HaikuArchives/SantasGiftBag#4b62541"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	libsanta$secondaryArchSuffix = $portVersion
+	lib:libsanta$secondaryArchSuffix = $portVersion
+	"
+	
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make TYPE=STATIC \
+		OBJ_DIR=build \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	
+	make TYPE=SHARED \
+		OBJ_DIR=build \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $developLibDir $libDir
+	
+	cp -R Documentation $developLibDir
+	
+	cd build
+	cp libsanta.a $developLibDir
+	cp libsanta $libDir/libsanta.so
+	
+	packageEntries devel \
+		$developLibDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libsanta${secondaryArchSuffix}_devel = $portVersion
+	libsanta$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libsanta$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-libs/libsanta/licenses/libsanta b/haiku-libs/libsanta/licenses/libsanta
new file mode 100644
index 000000000..a528e5e41
--- /dev/null
+++ b/haiku-libs/libsanta/licenses/libsanta
@@ -0,0 +1,12 @@
+License
+
+The source code, object code, libraries, and the other components of Santa's Gift Bag are being made publicly available and free to use in freeware and shareware products with a price under $25 (I believe that shareware should be cheap). For overpriced shareware (hehehe) or commercial products, please contact me to negotiate a fee for use. After all, I did work hard on these classes and invested a lot of time into it. That being said, DON'T WORRY I don't want much. It totally depends on the sort of project you're working on and how much you expect to make off it. If someone makes money using my work, I'd like to get at least a little something for my contribution to that profit.
+
+If any of the components of Santa's Gift Bag are is used in a shareware or commercial product, I get a free copy.  The source is made available so that you can improve and extend it as you need. In general it is best to customize these classes through inheritance, leaving the original Santa's Gift Bag source code unmodified, so that you can take advantage of enhancements and bug fixes as they become available. 
+
+Feel free to distribute any components of this archive, but you are required to keep the documentation and license with it.  If you wish to distribute modified source, also feel free to do so, but do so in such a manner that it is very clear what was modified, why, how, that it is not an official Santa's Gift Bag release, and you are also required to keep the documentation and license with any modified versions.
+
+I can be contacted at:
+briant@timelinevista.com
+
+Thank you for using Santa's Gift Bag, and enjoy!
\ No newline at end of file
diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe
index dee1e1aec..9d521657a 100644
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -1,26 +1,102 @@
-DESCRIPTION="jasper - software-based implementation of the codec specified in the JPEG-2000 Part-1 standard" 
-HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" 
+DESCRIPTION="The JasPer Project is an open-source initiative to provide a free software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard. More details about this software can be found in the JasPer Software Reference Manual."
+SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard."
+HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
 SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip"
 REVISION="1"
-STATUS_HAIKU="stable"
 CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
-DEPEND=""
+
+LICENSE="JasPer v2"
+COPYRIGHT="1999-2007 Michael D. Adams"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libjasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:chmod
+	"
+
+
+
 BUILD()
 {
-	cd jasper-1.900.1
 	libtoolize --force --copy --install
 	aclocal -I acaux
 	autoconf
 	automake
 	chmod 777 configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared
+	runConfigure ./configure --enable-shared
 	make
 }
 
 INSTALL()
 {
-	cd  jasper-1.900.1
 	make install
+	
+	prepareInstalledDevelLibs libjasper
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# tools package
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
-LICENSE="JasPer v2"
-COPYRIGHT="1999-2007 Michael D. Adams"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	jasper${secondaryArchSuffix}_devel = $portVersion
+	devel:libjasper$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	jasper$secondaryArchSuffix == $portVersion base
+	"
+
+# ----- tools package -------------------------------------------------------
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The jasper tools"
+	PROVIDES_tools="
+		jasper_tools = $portVersion
+		cmd:imgcmp = $portVersion
+		cmd:imginfo = $portVersion
+		cmd:jasper = $portVersion
+		cmd:tmrdemo = $portVersion
+		"
+	REQUIRES_tools="
+		haiku >= $haikuVersion
+		jasper == $portVersion base
+		"
+fi
\ No newline at end of file
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 4e9a5b657..dc4a603f6 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -21,7 +21,7 @@ REQUIRES="
 	lib:libglu$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -148,7 +148,7 @@ TEST()
 
 PROVIDES_devel="
 	libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2
-	cmd:sdl_config = $portVersion compat >= 1.2
+	cmd:sdl_config$secondaryArchSuffix = $portVersion compat >= 1.2
 	devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
 	devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
 	devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0
diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe
index 0abc28e07..7dd91f191 100644
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -1,28 +1,67 @@
+SUMMARY="ocp - Open Cubic Player" 
 DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" 
 HOMEPAGE="http://stian.cubic.org/project-ocp.php" 
 SRC_URI="git://git.code.sf.net/p/opencubicplayer/code"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libvorbis >= 1.3.1
-		media-libs/libogg >= 1.2.2
-		sys-devel/gettext >= 0.18.1.1
-		media-libs/libsdl >= 1.2.14"
-#		media-libs/flac >= 1.2.1"
-# ncurses zlib ... cf. ocp.spec
-MESSAGE="This port requires gcc4"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
+#DEPEND="media-libs/libvorbis >= 1.3.1
+#		media-libs/libogg >= 1.2.2
+#		sys-devel/gettext >= 0.18.1.1
+#		media-libs/libsdl >= 1.2.14"
+##		media-libs/flac >= 1.2.1"
+## ncurses zlib ... cf. ocp.spec
+
+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="
+	ocp$secondaryArchSuffix = $portVersion
+	cmd:ocp = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	libsdl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix >= 0.8.0
+	lib:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl_1.2$secondaryArchSuffix >= 0.10
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libogg$secondaryArchSuffix >= 0.8.0
+	devel:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sdl_config$secondaryArchSuffix
+	"
+
+SOURCE_DIR="code"
+
 BUILD()
 {
-	cd code
 	autoconf
-	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd code
 	make install
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe
index 4d50c2c85..155753690 100644
--- a/net-libs/enet/enet-1.3.0.recipe
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -1,24 +1,69 @@
-DESCRIPTION="enet" 
+DESCRIPTION="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol). The primary feature it provides is optional reliable, in-order delivery of packets.
+ENet omits certain higher level networking features such as authentication, lobbying, server discovery, encryption, or other similar tasks that are particularly application specific so that the library remains flexible, portable, and easily embeddable."
+SUMMARY="ENet is simple and robust network communication layer."
 HOMEPAGE="http://enet.bespin.org" 
 SRC_URI="http://enet.bespin.org/download/enet-1.3.0.tar.gz"
 CHECKSUM_MD5="3ea50cc5f2f4bbea32abae0d50b64e3c"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+LICENSE="MIT"
+COPYRIGHT="2002-2010 Lee Salzman"
+
+PROVIDES="
+	enet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	"
 
 BUILD()
 {
-	cd enet-1.3.0
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }
 
 INSTALL()
 {
-	cd enet-1.3.0
 	make install
+	prepareInstalledDevelLibs libenet
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
 
-LICENSE="MIT"
-COPYRIGHT="2002-2010 Lee Salzman"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	enet${secondaryArchSuffix}_devel = $portVersion
+	devel:libenet$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	enet$secondaryArchSuffix == $portVersion base
+	"
\ No newline at end of file
diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe
new file mode 100644
index 000000000..ee6e4cf35
--- /dev/null
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -0,0 +1,39 @@
+SUMMARY="Decodes BIOS SMBIOS/DMI tables"
+DESCRIPTION="Reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard"
+HOMEPAGE="http://www.nongnu.org/dmidecode/"
+SRC_URI="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.12.tar.gz"
+CHECKSUM_MD5="02ee243e1ecac7fe0d04428aec85f63a"
+REVISION="2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2002 Alan Cox, 2002-2010 Jean Delvare"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	dmidecode = $portVersion
+	cmd:dmidecode = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install prefix=$prefix \
+		sbindir=$prefix/bin \
+		mandir=$prefix/documentation/man \
+		docdir=$prefix/documentation/dmidecode
+}
+
diff --git a/sys-apps/dtc/dtc-1.3.0_git.recipe b/sys-apps/dtc/dtc-1.3.0_git.recipe
deleted file mode 100644
index d29ddcb4f..000000000
--- a/sys-apps/dtc/dtc-1.3.0_git.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="The Device Tree Compiler" 
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" 
-SRC_URI="git://git.jdl.com/software/dtc.git"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="sys-devel/bison >= 2.5"
-# TODO: test gcc2 build
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd dtc-1.3.0-git
-	make PREFIX=`finddir B_COMMON_DIRECTORY`
-}
-
-INSTALL()
-{
-	cd dtc-1.3.0-git
-	make install PREFIX=`finddir B_COMMON_DIRECTORY`
-}
-
-TEST()
-{
-	cd dtc-1.3.0-git
-	make tests
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005 David Gibson, IBM Corporation"
-
diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe
new file mode 100644
index 000000000..907703ff7
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.0.recipe
@@ -0,0 +1,53 @@
+SUMMARY="The Device Tree Compiler"
+DESCRIPTION="The Device Tree Compiler" 
+HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" 
+SRC_URI="git://git.jdl.com/software/dtc.git#v1.4.0"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005 David Gibson, IBM Corporation"
+REVISION="1"
+
+ARCHITECTURES="x86"
+
+PROVIDES="
+	dtc = $portVersion
+	cmd:convert_dtsv0 = $portVersion
+	cmd:dtc = $portVersion
+	cmd:dtdiff = $portVersion
+	cmd:fdtdump = $portVersion
+	cmd:fdtget = $portVersion
+	cmd:fdtput = $portVersion
+	lib:libfdt = $portVersion
+	lib:libfdt_1.4.0 = $portVersion
+	devel:libfdt = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:bison >= 2.5
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="${portVersionedName}.patch"
+
+BUILD()
+{
+	make PREFIX=$prefix $jobArgs
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix INCLUDEDIR=$includeDir
+
+	prepareInstalledDevelLibs libfdt
+}
+
+TEST()
+{
+	make tests
+}
diff --git a/sys-apps/dtc/patches/dtc-1.3.0_git.patch b/sys-apps/dtc/patches/dtc-1.3.0_git.patch
deleted file mode 100644
index 64b4229f5..000000000
--- a/sys-apps/dtc/patches/dtc-1.3.0_git.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/Makefile dtc-1.3.0-git/Makefile
-index 1169e6c..60077a5 100644
---- a/Makefile
-+++ dtc-1.3.0-git/Makefile
-@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so
- SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
- endif
- 
-+ifeq ($(HOSTOS),haiku)
-+INSTALL = /bin/install
-+endif
-+
-+ifneq ($(HOSTOS),haiku)
-+LIBDL = -ldl
-+endif
-+
-+
- #
- # Overall rules
- #
-diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests
-index 1795466..97b6131 100644
---- a/tests/Makefile.tests
-+++ dtc-1.3.0-git/tests/Makefile.tests
-@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 
- $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 	@$(VECHO) LD [libdl] $@
--	$(LINK.c) -o $@ $^ -ldl
-+	$(LINK.c) -o $@ $^ $(LIBDL)
- 
- $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
- 		util.o $(LIBFDT_archive)
-diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c
-index f185133..66b34df 100644
---- a/tests/testutils.c
-+++ dtc-1.3.0-git/tests/testutils.c
-@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc)
- {
- 	cleanup();
- 	fprintf(stderr, "%s: %s (pid=%d)\n", test_name,
--		strsignal(signum), getpid());
-+		strsignal(signum), (int)getpid());
- 	exit(RC_BUG);
- }
- 
- void test_init(int argc, char *argv[])
- {
- 	int err;
--	struct sigaction sa_int = {
--		.sa_sigaction = sigint_handler,
--	};
-+	struct sigaction sa_int = { };
-+	sa_int.sa_sigaction = sigint_handler;
- 
- 	test_name = argv[0];
- 
-@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[])
- 		verbose_test = 0;
- 
- 	verbose_printf("Starting testcase \"%s\", pid %d\n",
--		       test_name, getpid());
-+		       test_name, (int)getpid());
- }
- 
- void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size)
diff --git a/sys-apps/dtc/patches/dtc-1.3.0-git.patch b/sys-apps/dtc/patches/dtc-1.4.0.patch
similarity index 100%
rename from sys-apps/dtc/patches/dtc-1.3.0-git.patch
rename to sys-apps/dtc/patches/dtc-1.4.0.patch
diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe
index fd0151916..2d61f06b9 100644
--- a/sys-devel/bison/bison-2.5.recipe
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -1,33 +1,68 @@
-DESCRIPTION="bison - A yacc-compatible parser generator" 
+SUMMARY="A yacc-compatible parser generator"
+DESCRIPTION="
+	Bison is a general-purpose parser generator that converts an annotated
+	context-free grammar into an LALR(1) or GLR parser for that grammar. Once
+	you are proficient with Bison, you can use it to develop a wide range of
+	language parsers, from those used in simple desk calculators to complex
+	programming languages.
+
+	Bison is upward compatible with Yacc: all properly-written Yacc grammars
+	ought to work with Bison with no change. Anyone familiar with Yacc should
+	be able to use Bison with little trouble. You need to be fluent in C or
+	C++ programming in order to use Bison.
+	"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+COPYRIGHT="1992-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
 CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
 REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
+
+ARCHITECTURES="?x86"
+
+PATCHES="${portVersionedName}.patch"
+
+PROVIDES="
+	bison = $portVersion compat >= 2.5
+	cmd:bison = $portVersion compat >= 2.5
+	cmd:yacc
+	devel:liby = $portVersion compat >= 2.5
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:m4
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:m4
+	cmd:make
+	cmd:sed
+	"
+
 BUILD()
 {
-	cd bison-2.5
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--disable-nls
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd bison-2.5
 	make install
+
+	prepareInstalledDevelLibs liby
+
+	rm $libDir/charset.alias
+	rmdir $libDir
 }
 
 TEST()
 {
-	cd bison-2.5
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1992-2011 Free Software Foundation, Inc."
diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe
new file mode 100644
index 000000000..cf62a9dc2
--- /dev/null
+++ b/sys-libs/mesa/mesa-10.0.0.recipe
@@ -0,0 +1,140 @@
+SUMMARY="Multi-platform GL implementation"
+DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification.
+	The OpenGL specification documents a system for rendering interactive 3D graphics.
+
+	Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku applications.
+	"
+HOMEPAGE="http://www.mesa3d.org/"
+COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
+LICENSE="MIT"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0/MesaLib-10.0.0.tar.bz2"
+CHECKSUM_MD5="f3fe55d9735bea158bbe97ed9a0da819"
+REVISION="1"
+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"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mesa$secondaryArchSuffix = $portVersion compat >= 10.0
+	lib:libGL$secondaryArchSuffix = $portVersion compat >= 10.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+	
+# We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku.
+# Mesa should build with any newer LLVM version however.
+# As LLVM is only linked into the swpipe renderer (and not libGL)
+# changing LLVM versions shouldn't introduce any abi issues.
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	libxml2_python
+	llvm == 3.2
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:scons
+	cmd:sed
+	"
+
+SOURCE_DIR="Mesa-$portVersion"
+
+BUILD()
+{
+	if [ -n "$secondaryArchSuffix" ]; then
+		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
+	fi
+	scons $jobArgs build=release
+	#scons $jobArgs build=debug
+}
+
+INSTALL()
+{
+	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
+
+	mkdir -p $includeDir/GL
+	cp include/GL/gl.h $includeDir/GL/
+	cp include/GL/gl_mangle.h $includeDir/GL/
+	cp include/GL/glext.h $includeDir/GL/
+
+	# libGL.so makes up the core of our OpenGL kit
+	mkdir -p $libDir
+	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
+
+	# Our rendering add-ons
+	mkdir -p $addOnsDir/opengl
+	cp $(find $mesaBuildDir -name 'libswrast.so') \
+		"$addOnsDir/opengl/Software Rasterizer"
+	cp $(find $mesaBuildDir -name 'libswpipe.so') \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# swpipe renderer package
+	packageEntries swpipe \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# swrast renderer package
+	packageEntries swrast \
+		"$addOnsDir/opengl/Software Rasterizer"
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mesa${secondaryArchSuffix}_devel = $portVersion
+	devel:libGL$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Mesa OpenGL Add-ons ==================================================
+# ----- swrast package -------------------------------------------------------
+
+SUMMARY_swrast="Mesa software rasterization renderer"
+DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software
+	rasterization on Haiku systems. Software rasterization performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. Software rasterization is generally considered a fallback
+	3D rendering method as performance is limited.
+	"
+PROVIDES_swrast="
+	mesa${secondaryArchSuffix}_swrast = $portVersion
+	"
+REQUIRED_swrast="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Gallium OpenGL Add-ons ===============================================
+# ----- swpipe package -------------------------------------------------------
+
+SUMMARY_swpipe="Mesa LLVM enhanced Gallium software pipe renderer"
+DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM
+	enhanced software rendering. Software pipe rendering performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. The usage of LLVM over traditional rasterization gives this
+	renderer a boost in performance.
+	
+	Gallium software pipe rendering is in an extremely early state as of
+	this version of Mesa, and may not function as expected.
+	"
+PROVIDES_swpipe="
+	mesa${secondaryArchSuffix}_swpipe = $portVersion
+	"
+
+REQUIRED_swpipe="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe
deleted file mode 100644
index c21cae4aa..000000000
--- a/sys-libs/mesa/mesa-9.3.recipe
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY="Multi-platform GL implementation"
-DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.
-
-Mesa fills the role of the Haiku OpenGL kit.
-"
-
-HOMEPAGE="http://www.mesa3d.org/"
-COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
-LICENSE="MIT"
-SRC_URI="git://anongit.freedesktop.org/mesa/mesa"
-REVISION="1"
-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"
-fi
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	mesa$secondaryArchSuffix = $portVersion compat >= 9.3
-	lib:libGL$secondaryArchSuffix = $portVersion compat >= 9.3
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	libxml2_python
-	llvm >= 3.2
-	cmd:bison
-	cmd:find
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:scons
-	cmd:sed
-	"
-
-SOURCE_DIR="Mesa-$portVersion"
-
-BUILD()
-{
-	if [ -n "$secondaryArchSuffix" ]; then
-		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
-	fi
-	scons $jobArgs build=release
-	#scons $jobArgs build=debug
-}
-
-INSTALL()
-{
-	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
-
-	mkdir -p $includeDir/GL
-	cp include/GL/gl.h $includeDir/GL/
-	cp include/GL/gl_mangle.h $includeDir/GL/
-	cp include/GL/glext.h $includeDir/GL/
-
-	# libGL.so makes up the core of our OpenGL kit
-	mkdir -p $libDir
-	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
-
-	# Our rendering add-ons
-	mkdir -p $addOnsDir/opengl
-	cp $(find $mesaBuildDir -name 'libswpipe.so') $addOnsDir/opengl/Softpipe
-
-	# devel package
-	packageEntries devel \
-		$developDir
-	# swpipe renderer package
-	packageEntries swpipe \
-		$addOnsDir
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	mesa${secondaryArchSuffix}_devel = $portVersion
-	devel:libGL$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES_devel="
-	mesa$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- swpipe package -------------------------------------------------------
-
-PROVIDES_swpipe="
-	mesa${secondaryArchSuffix}_swpipe = $portVersion
-	"
-
-REQUIRED_swpipe="
-	mesa$secondaryArchSuffix == $portVersion base
-	"
diff --git a/www-client/links/links-2.3pre2.recipe b/www-client/links/links-2.3pre2.recipe
index c2882b221..48546dcab 100644
--- a/www-client/links/links-2.3pre2.recipe
+++ b/www-client/links/links-2.3pre2.recipe
@@ -1,16 +1,56 @@
+SUMMARY="links web browser" 
 DESCRIPTION="links web browser" 
-HOMEPAGE="http://links.twibright.com" 
+HOMEPAGE="http://links.twibright.com/" 
 SRC_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999 - 2011 Mikulas Patocka
+	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	links$secondaryArchSuffix = $portVersion
+	cmd:links$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	openssl >= 1.0.0
+	"
+
+BUILD_REQUIRES="
+#	devel:libGL$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	openssl_devel >= 1.0.0
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="links-2.3pre2.patch"
+
 BUILD()
 {
-	cd links-2.3pre2
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+	runConfigure ./configure \
 		--without-x \
 		--enable-utf-8 \
 		--enable-graphics
@@ -22,10 +62,6 @@ BUILD()
 
 INSTALL()
 {
-	cd links-2.3pre2
-	make install DESTDIR=${DESTDIR}
+	make install
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="1999 - 2011 Mikulas Patocka
-	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe
index 854d047dc..fbaef0b80 100644
--- a/www-servers/haproxy/haproxy-1.4.22.recipe
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -1,24 +1,46 @@
-DESCRIPTION="Reliable, high performace TCP/HTTP load balancer"
+DESCRIPTION="HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing."
+SUMMARY="Reliable, high performace TCP/HTTP load balancer"
 HOMEPAGE="http://haproxy.1wt.eu/"
 SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
 CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c"
-STATUS_HAIKU="stable"
 REVISION="1"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2012 Willy Tarreau"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	haproxy = $portVersion
+	cmd:haproxy = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	"
+PATCHES="haproxy-1.4.22.patch"
+
+
 BUILD()
 {
-	cd haproxy-1.4.22
-	make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	make TARGET=haiku PREFIX="$prefix"
 }
 
 INSTALL()
 {
-	cd haproxy-1.4.22
-	make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-}
+	mkdir -p "${sbinDir}"
+	mkdir -p "${manDir}"
+	mkdir -p "${docDir}"
+	
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2012 Willy Tarreau"
\ No newline at end of file
+	make install DESTDIR="" \
+		PREFIX="$prefix"\
+		SBINDIR="${sbinDir}" \
+		MANDIR="${manDir}" \
+		DOCDIR="${docDir}"
+}
\ No newline at end of file
diff --git a/x11-libs/libX11/libX11-1.3.3.recipe b/x11-libs/libx11/libx11-1.3.3.recipe
similarity index 100%
rename from x11-libs/libX11/libX11-1.3.3.recipe
rename to x11-libs/libx11/libx11-1.3.3.recipe
diff --git a/x11-libs/libX11/patches/libX11-1.3.3.patch b/x11-libs/libx11/patches/libx11-1.3.3.patch
similarity index 100%
rename from x11-libs/libX11/patches/libX11-1.3.3.patch
rename to x11-libs/libx11/patches/libx11-1.3.3.patch
diff --git a/x11-libs/libXau/libXau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe
similarity index 100%
rename from x11-libs/libXau/libXau-1.0.5.recipe
rename to x11-libs/libxau/libxau-1.0.5.recipe
diff --git a/x11-libs/libXau/patches/libXau-1.0.5.patch b/x11-libs/libxau/patches/libxau-1.0.5.patch
similarity index 100%
rename from x11-libs/libXau/patches/libXau-1.0.5.patch
rename to x11-libs/libxau/patches/libxau-1.0.5.patch
diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe
index fb109065a..24967005b 100644
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -1,23 +1,53 @@
+SUMMARY="xtrans" 
 DESCRIPTION="xtrans" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
 CHECKSUM_MD5="b2f47d49faf1f24e8294b624b21b9b93"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.23
-        x11-misc/util-macros >= 1.7.0"
-        
+COPYRIGHT="1993, 1994, 1998  The Open Group
+	1993, 1994 NCR Corporation - Dayton, Ohio, USA
+	2002, 2005 Sun Microsystems, Inc.  All rights reserved.
+	Copyright 1996 by Sebastien Marineau and Holger Veit
+	2003 Keith Packard, Noah Levitt"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xtrans$secondaryArchSuffix = $portVersion
+	devel:xtrans$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+
 BUILD()
 {
-	cd xtrans-1.2.5
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY`
+	runConfigure ./configure
 }
 
 INSTALL()
 {
-	cd xtrans-1.2.5
 	make install
+	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
+	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
 }
diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
index 8f7f416d5..22926812b 100644
--- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe
+++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
@@ -1,3 +1,4 @@
+SUMMARY="xorg util-macros" 
 DESCRIPTION="xorg util-macros" 
 HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/" 
 COPYRIGHT="2005 Red Hat, Inc.
@@ -7,19 +8,42 @@ LICENSE="MIT"
 SRC_URI="git://anongit.freedesktop.org/xorg/util/macros"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	util_macros$secondaryArchSuffix = $portVersion
+	devel:util_macros$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+
 BUILD()
 {
-	cd util-macros-1.17.0-git
 	./autogen.sh -V
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_LIB_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd util-macros-1.17.0-git
 	make install
+	#fixPkgconfig
+	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
+	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
 }
diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe
index 6d461f68d..3835d78cb 100644
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -1,21 +1,50 @@
+SUMMARY="inputproto" 
 DESCRIPTION="inputproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz"
 CHECKSUM_MD5="13d91739cf70a781f1db24d8d3677574"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1989, 1998  The Open Group
+	1989 by Hewlett-Packard Company, Palo Alto, California.
+	"
+LICENSE="MIT (no promotion)"
+
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	inputproto$secondaryArchSuffix = $portVersion
+	devel:inputproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 BUILD()
 {
-	cd inputproto-2.0
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }
 
 INSTALL()
 {
-	cd inputproto-2.0
 	make install
+	fixPkgconfig
 }
diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe
index 970e88e87..4632636d4 100644
--- a/x11-proto/kbproto/kbproto-1.0.4.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -1,21 +1,47 @@
+SUMMARY="kbproto" 
 DESCRIPTION="kbproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz"
 CHECKSUM_MD5="4deef518a03bc94a7a25902bb7c98dd6"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1993 by Silicon Graphics Computer Systems, Inc."
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	kbproto$secondaryArchSuffix = $portVersion
+	devel:kbproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 BUILD()
 {
-	cd kbproto-1.0.4
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }
 
 INSTALL()
 {
-	cd kbproto-1.0.4
 	make install
+	fixPkgconfig
 }
diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
index 6573458f7..190bd056d 100644
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -1,22 +1,50 @@
+SUMMARY="xcb-proto" 
 DESCRIPTION="xcb-proto" 
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz"
 CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett."
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xcb_proto$secondaryArchSuffix = $portVersion
+	devel:xcb_proto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:python$secondaryArchSuffix
+	"
+
+SOURCE_DIR="xcb-proto-$portVersion"
 
 BUILD()
 {
-	cd xcb-proto-1.6
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd xcb-proto-1.6
 	make install
 }
diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe
index 224d93786..7fab39b0f 100644
--- a/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -1,21 +1,55 @@
+SUMMARY="xextproto" 
 DESCRIPTION="xextproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz"
 CHECKSUM_MD5="6c55283718dbeb826bcf899b9e89faba"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1989, 1998  The Open Group
+	1997 by Silicon Graphics Computer Systems, Inc.
+	1992 Network Computing Devices
+	1994, 1995  Hewlett-Packard Company
+	1996 Digital Equipment Corporation, Maynard, Massachusetts.
+	1988, 1989, 1990, 1994 Network Computing Devices, Inc.
+	1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and Olivetti Research Limited, Cambridge, England.
+	1986, 1987, 1988 by Hewlett-Packard Corporation
+	2007-2008 Peter Hutterer"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xextproto$secondaryArchSuffix = $portVersion
+	devel:xextproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix >= 1.7.0
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 BUILD()
 {
-	cd xextproto-7.1.1
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }
 
 INSTALL()
 {
-	cd xextproto-7.1.1
 	make install
+	fixPkgconfig
 }
diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe
index 1d808c8c7..f3b239bd7 100644
--- a/x11-proto/xproto/xproto-7.0.23_git.recipe
+++ b/x11-proto/xproto/xproto-7.0.23_git.recipe
@@ -1,3 +1,4 @@
+SUMMARY="xproto" 
 DESCRIPTION="xproto" 
 HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/" 
 COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
@@ -11,19 +12,44 @@ LICENSE="MIT (no promotion)"
 SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
+
+PATCHES="xproto-7.0.23_git.patch"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xproto$secondaryArchSuffix = $portVersion
+	devel:xproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	cd xproto-7.0.23-git
 	./autogen.sh -V
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_LIB_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd xproto-7.0.23-git
 	make install
+	fixPkgconfig
 }