Initial .bep file checking for sdl-image

2026-04-22 19:50:05 +02:00 · 2008-07-30 16:49:08 +00:00
commit 081833065f
54 changed files with 32707 additions and 0 deletions
--- a/app-arch/bzip2/bzip2-1.0.4.bep
+++ b/app-arch/bzip2/bzip2-1.0.4.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="bzip2" 
+HOMEPAGE="http://www.bzip.org/" 
+SRC_URI="http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="untested"
+DEPEND=""
+BUILD {
+	cd bzip2-1.0.4
+	make
+}
+
+INSTALL {
+	cd bzip2-1.0.4
+	make install PREFIX=/boot/home/config
+}
--- a/app-arch/gzip/gzip-1.2.4a.bep
+++ b/app-arch/gzip/gzip-1.2.4a.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="GNU zip" 
+HOMEPAGE="http://www.gzip.org/" 
+SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="untested"
+DEPEND=""
+BUILD {
+	cd gzip-1.2.4a
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd gzip-1.2.4a
+	make install
+}
--- a/app-arch/gzip/gzip-1.3.12.bep
+++ b/app-arch/gzip/gzip-1.3.12.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="GNU zip" 
+HOMEPAGE="http://www.gzip.org/" 
+SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="untested"
+DEPEND=""
+BUILD {
+	cd gzip-1.3.12
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd gzip-1.3.12
+	make install
+}
--- a/app-arch/gzip/patches/gzip-1.2.4a.patch
+++ b/app-arch/gzip/patches/gzip-1.2.4a.patch
@@ -0,0 +1,68 @@
+diff -Naur gzip-1.2.4a/Makefile.in gzip-1.2.4a-beos/Makefile.in
+--- gzip-1.2.4a/Makefile.in	Tue Aug 17 19:12:40 1993
+++ gzip-1.2.4a-beos/Makefile.in	Thu Jan  3 00:19:57 2008
+@@ -102,7 +102,7 @@
+ # Where to install the manual pages.
+ mandir = $(prefix)/man/man$(manext)
+ # Use manlinks=so to use the .so method instead of hard links
+-manlinks = ln
+manlinks = ln -s
+ 
+ alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir)
+ 
+@@ -208,7 +208,7 @@
+ 	for f in $(SCRIPTS); do \
+ 	  $(INSTALL_PROGRAM) $${f} $(scriptdir)/$${f}; done
+ 	rm -f $(scriptdir)/$(G)zcmp; \
+-	  ln $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp
+	  ln -s $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp
+ 	for f in gunzip$X ungzip$X $(ZCAT)$X ; do \
+ 	  rm -f $(bindir)/$${f}; done
+ 	@if echo $(DEFS) | grep GNU_STANDARD > /dev/null; then \
+@@ -216,8 +216,8 @@
+ 	  echo 'exec gzip -dc $${1+"$$@"}' > $(bindir)/$(ZCAT)$X; \
+ 	  chmod 755 $(bindir)/gunzip$X  $(bindir)/$(ZCAT)$X; \
+ 	else \
+-	  ln $(bindir)/gzip$X $(bindir)/gunzip$X; \
+-	  ln $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \
+	  ln -s $(bindir)/gzip$X $(bindir)/gunzip$X; \
+	  ln -s $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \
+ 	fi
+ 
+ installman: gzip.info
+@@ -233,9 +233,9 @@
+ 	  echo .so man$(manext)/gzip.$(manext)      > gunzip.$(manext);\
+ 	  chmod 644 $(ZCAT).$(manext) $(G)zcmp.$(manext) gunzip.$(manext);\
+ 	else \
+-	  ln gzip.$(manext)  $(ZCAT).$(manext);\
+-	  ln $(G)zdiff.$(manext) $(G)zcmp.$(manext);\
+-	  ln gzip.$(manext)  gunzip.$(manext);\
+	  ln -s gzip.$(manext)  $(ZCAT).$(manext);\
+	  ln -s $(G)zdiff.$(manext) $(G)zcmp.$(manext);\
+	  ln -s gzip.$(manext)  gunzip.$(manext);\
+ 	fi
+ 	-cd $(srcdir); for f in gzip.info* ; do $(INSTALL_DATA) $${f} \
+ 	  $(infodir)/$${f}; done
+@@ -251,9 +251,9 @@
+ install_compress: install
+ 	-test -f $(bindir)/compress.old || \
+ 	  mv $(bindir)/compress$X $(bindir)/compress.old
+-	ln $(bindir)/gzip$X $(bindir)/compress$X
+	ln -s $(bindir)/gzip$X $(bindir)/compress$X
+ 	rm -f $(bindir)/uncompress$X
+-	ln $(bindir)/gzip$X $(bindir)/uncompress$X
+	ln -s $(bindir)/gzip$X $(bindir)/uncompress$X
+ 
+ # Make sure all installation directories, e.g. $(bindir) actually exist by
+ # making them if necessary. At most one level is created (except for man).
+@@ -329,8 +329,8 @@
+ gzip$X:	Makefile $(OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 	rm -f gunzip$X $(ZCAT)$X
+-	ln gzip$X gunzip$X
+-	ln gzip$X $(ZCAT)$X
+	ln -s gzip$X gunzip$X
+	ln -s gzip$X $(ZCAT)$X
+ 
+ gzip$O zip$O deflate$O trees$O bits$O unzip$O inflate$O: gzip.h tailor.h
+ util$O lzw$O unlzw$O unpack$O unlzh$O crypt$O: gzip.h tailor.h
--- a/app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff
+++ b/app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff
@@ -0,0 +1,20 @@
+--- stdbool_.h	2008-05-14 14:48:48.000000000 +0000
+++ gzip-1.3.12/lib/stdbool_.h	2007-03-30 23:56:06.000000000 +0000
+@@ -58,7 +58,7 @@
+ 
+ /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+    definitions below, but temporarily we have to #undef them.  */
+-#if defined __BEOS__ && !defined __HAIKU__
+#ifdef __BEOS__
+ # include <OS.h> /* defines bool but not _Bool */
+ # undef false
+ # undef true
+@@ -73,7 +73,7 @@
+    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+    enum; this ensures that '_Bool' promotes to 'int'.  */
+-#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+#if defined __cplusplus || defined __BEOS__
+   /* A compiler known to have 'bool'.  */
+   /* If the compiler already has both 'bool' and '_Bool', we can assume they
+      are the same types.  */
--- a/app-emulation/qemu/qemu-trunk.git.diff
+++ b/app-emulation/qemu/qemu-trunk.git.diff
@@ -0,0 +1,50 @@
+diff --git a/configure b/configure
+index a2f54b8..8c603b3 100755
+--- a/configure
+++ b/configure
+@@ -191,6 +191,9 @@ SunOS)
+         oss=yes
+     fi
+ ;;
+Haiku)
+haiku="yes"
+;;
+ *)
+ oss="yes"
+ linux="yes"
+@@ -336,7 +339,7 @@ for opt do
+   esac
+ done
+ 
+-if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$mingw32" = "yes" ] ; then
+if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$mingw32" = "yes" -o "$haiku" = "yes" ] ; then
+     AIOLIBS=
+ else
+     # Some Linux architectures (e.g. s390) don't imply -lpthread automatically.
+@@ -375,8 +378,8 @@ case "$cpu" in
+            ARCH_CFLAGS="-march=z900"
+            ;;
+     i386)
+-           ARCH_CFLAGS="-m32"
+-           ARCH_LDFLAGS="-m32"
+#           ARCH_CFLAGS="-m32"
+#           ARCH_LDFLAGS="-m32"
+            ;;
+     x86_64)
+            ARCH_CFLAGS="-m64"
+diff --git a/qemu-img.c b/qemu-img.c
+index 309a746..2386497 100644
+--- a/qemu-img.c
+++ b/qemu-img.c
+@@ -593,7 +593,11 @@ static int64_t get_allocated_file_size(const char *filename)
+     struct stat st;
+     if (stat(filename, &st) < 0)
+         return -1;
+#ifdef __HAIKU__
+    return st.st_size;
+#else
+     return (int64_t)st.st_blocks * 512;
+#endif
+ }
+ #endif
+ 
--- a/dev-dotnet/pnet/pnet-CVS.diff
+++ b/dev-dotnet/pnet/pnet-CVS.diff
@@ -0,0 +1,41 @@
+? config.sub
+? libtool
+? ltmain.sh
+? ylwrap
+? libffi/Makefile.in
+? libffi/aclocal.m4
+? libffi/configure
+? libffi/fficonfig.h.in
+? libffi/include/Makefile.in
+? libgc/Makefile.in
+? libgc/aclocal.m4
+? libgc/config.guess
+? libgc/config.sub
+? libgc/configure
+? libgc/ltmain.sh
+? libgc/doc/Makefile.in
+? libgc/include/Makefile.in
+Index: configure.in
+===================================================================
+RCS file: /sources/dotgnu-pnet/pnet/configure.in,v
+retrieving revision 1.229
+diff -u -r1.229 configure.in
+--- configure.in	9 Dec 2007 21:17:20 -0000	1.229
+++ configure.in	18 May 2008 11:43:34 -0000
+@@ -262,7 +262,7 @@
+ 	*-*-darwin*)
+ 			THREADS=posix
+ 			;;
+-	*-*-beos*)
+	*-*-beos*|*-*-haiku*)
+ 			THREADS=beos
+ 			;;	
+ 	esac
+@@ -375,6 +375,7 @@
+ fi
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(socket, connect)
+AC_CHECK_LIB(network, connect)
+ AC_CHECK_LIB(nsl, gethostbyname)
+ AC_CHECK_LIB(rt, clock_gettime)
+ have_libz=no
--- a/dev-dotnet/pnetlib/pnetlib-CVS.diff
+++ b/dev-dotnet/pnetlib/pnetlib-CVS.diff
--- a/dev-lang/mono/mono-trunk.diff
+++ b/dev-lang/mono/mono-trunk.diff
@@ -0,0 +1,94 @@
+Index: eglib/test/Makefile.am
+===================================================================
+--- eglib/test/Makefile.am	(revision 101922)
+++ eglib/test/Makefile.am	(working copy)
+@@ -28,7 +28,8 @@
+ test_eglib_SOURCES = $(SOURCES)
+ 
+ test_eglib_CFLAGS = -Wall -Werror -D_FORTIFY_SOURCE=2 -I$(srcdir)/../src -I../src -DDRIVER_NAME=\"EGlib\"
+-test_eglib_LDADD = ../src/libeglib.la -ldl
+#test_eglib_LDADD = ../src/libeglib.la -ldl
+test_eglib_LDADD = ../src/libeglib.la
+ 
+ run-eglib: all
+ 	./test-eglib
+Index: eglib/src/gunicode.c
+===================================================================
+--- eglib/src/gunicode.c	(revision 101922)
+++ eglib/src/gunicode.c	(working copy)
+@@ -43,7 +43,7 @@
+ 
+ typedef int iconv_t;
+ #else
+-#include <langinfo.h>
+//#include <langinfo.h>
+ #include <iconv.h>
+ #endif
+ 
+@@ -183,6 +183,13 @@
+ 	sprintf (buf, "CP%u", GetACP ());
+ 	*charset = buf;
+ 	is_utf8 = FALSE;
+#elif defined(__HAIKU__) // workaround
+	if (my_charset == NULL) {
+		my_charset = g_strdup ("UTF-8");
+		is_utf8 = 1;
+	}
+	if (charset != NULL)
+		*charset = my_charset;
+ #else
+ 	if (my_charset == NULL){
+ 		my_charset = g_strdup (nl_langinfo (CODESET));
+Index: eglib/src/Makefile.am
+===================================================================
+--- eglib/src/Makefile.am	(revision 101922)
+++ eglib/src/Makefile.am	(working copy)
+@@ -37,7 +37,7 @@
+ if PLATFORM_WIN32
+ libeglib_la_LIBADD = -lm -liconv -lpsapi
+ else
+-libeglib_la_LIBADD = -lm
+#libeglib_la_LIBADD = -lm
+ endif
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+Index: configure.in
+===================================================================
+--- configure.in	(revision 101922)
+++ configure.in	(working copy)
+@@ -237,6 +237,10 @@
+ 			has_broken_apple_cpp=yes
+ 		fi
+ 		;;
+	*-*-haiku*)
+		platform_win32=no
+		libdl=
+		;;
+ 	*)
+ 		AC_MSG_WARN([*** Please add $host to configure.in checks!])
+ 		platform_win32=no
+@@ -1307,7 +1311,12 @@
+ 	dnl *********************************
+ 	dnl *** Checks for math functions ***
+ 	dnl *********************************
+	case $host_os in
+		haiku*)
+		;;
+		*)
+         LIBS="$LIBS -lm";
+	esac
+ 	if test "x$has_broken_apple_cpp" != "xyes"; then
+ 	        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+ 	                AC_TRY_LINK([#include <math.h>], 
+@@ -1703,7 +1712,10 @@
+ 			# foo.c:6: warning: visibility attribute not supported in this configuration; ignored
+ 			# ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
+ 			have_visibility_hidden=no
+-
+			;;
+		  haiku*)
+			have_visibility_hidden=no
+		    ;;
+ 		esac
+ 		;;
+ 	x86_64-*-* | amd64-*-*)
--- a/dev-lang/python/python-2.5.x.diff
+++ b/dev-lang/python/python-2.5.x.diff
--- a/dev-libs/apr-util/apr-util-0.9.x-haiku.diff
+++ b/dev-libs/apr-util/apr-util-0.9.x-haiku.diff
@@ -0,0 +1,24 @@
+diff -u apr-util-0.9.15-orig/config.layout apr-util-0.9.15/config.layout
+--- apr-util-0.9.15-orig/config.layout	2004-11-24 23:45:40.000000000 +0000
+++ apr-util-0.9.15/config.layout	2008-05-14 15:03:22.000000000 +0000
+@@ -229,3 +229,20 @@
+     infodir:       ${exec_prefix}/share/info
+     libsuffix     -${APRUTIL_MAJOR_VERSION}
+ </Layout>
+
+#  Haiku layout
+<Layout haiku>
+    prefix:        /boot/home/config
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
+    libexecdir:    ${exec_prefix}/bin
+    mandir:        ${prefix}/man
+    sysconfdir:    ${prefix}/conf
+    datadir:       ${prefix}
+    installbuilddir: ${datadir}/build
+    includedir:    ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
+    localstatedir: ${prefix}
+    libsuffix:     -${APRUTIL_MAJOR_VERSION}
+</Layout>
--- a/dev-libs/apr-util/apr-util-0.9.x.diff
+++ b/dev-libs/apr-util/apr-util-0.9.x.diff
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 645316)
+++ configure.in	(working copy)
+@@ -145,7 +145,7 @@
+     dnl ### apr and expat libraries to the build or it'll die a truly horrible
+     dnl ### death. We now use the apr-config tool to determine the correct
+     dnl ### library to link against :)
+-*AIX*|*Darwin*|*BeOS*|CYGWIN*)
+*AIX*|*Darwin*|*BeOS*|*Haiku*|CYGWIN*)
+     dnl need such stuff as -liconv to be specified when building libaprutil.la
+     EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)'
+     ;;
--- a/dev-libs/apr/apr-0.9.x-haiku.diff
+++ b/dev-libs/apr/apr-0.9.x-haiku.diff
@@ -0,0 +1,197 @@
+diff -urN apr-0.9.17-orig/build/apr_hints.m4 apr-0.9.17/build/apr_hints.m4
+--- apr-0.9.17-orig/build/apr_hints.m4	2006-03-16 09:41:51.000000000 +0000
+++ apr-0.9.17/build/apr_hints.m4	2008-05-13 22:10:51.000000000 +0000
+@@ -390,6 +390,12 @@
+ 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
+ 	APR_ADDTO(LIBS, [-lcrypt])
+ 	;;
+    *-haiku*)
+        APR_ADDTO(LIBS, [-lnetwork])
+        APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+        APR_SETIFNULL(apr_posixsem_is_global, [yes])
+        APR_SETIFNULL(apr_process_lock_is_global, [yes])
+        ;;
+   esac
+ 
+ fi
+diff -urN apr-0.9.17-orig/configure.in apr-0.9.17/configure.in
+--- apr-0.9.17-orig/configure.in	2007-11-03 14:18:38.000000000 +0000
+++ apr-0.9.17/configure.in	2008-05-13 22:10:51.000000000 +0000
+@@ -219,7 +219,7 @@
+ dnl otherwise.
+ 
+ case $host in
+-    *os390)
+    *os390|*haiku*)
+         if test "$ac_test_CFLAGS" != set; then
+            APR_REMOVEFROM(CFLAGS,-g)
+         fi
+@@ -434,6 +434,13 @@
+        OSDIR="unix"
+        eolstr="\\n"
+        ;;
+   *haiku*)
+       OSDIR="unix"
+       eolstr="\\n"
+       APR_ADDTO(CPPFLAGS,-I/boot/develop/headers/bsd)
+       AC_CHECK_LIB(bsd, getpass)
+       AC_CHECK_LIB(network, socket)
+       ;;
+    *)
+        OSDIR="unix"
+        eolstr="\\n"
+@@ -656,6 +663,10 @@
+ havemmapzero="0"
+ havemmapanon="0"
+ APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+             [havebeosshm="1"
+              APR_DECIDE(USE_SHMEM_BEOS_ANON,
+                         [BeOS areas])])
+ APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
+              func:shmget func:shmat func:shmdt func:shmctl,
+              [haveshmgetanon="1"
+@@ -671,10 +682,6 @@
+ APR_IFALLYES(header:os2.h,
+              [haveos2shm="1"
+               APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])])
+-APR_IFALLYES(header:kernel/OS.h func:create_area,
+-             [havebeosshm="1"
+-              APR_DECIDE(USE_SHMEM_BEOS_ANON,
+-                         [BeOS areas])])
+ case $host in
+     *linux* ) 
+         # Linux has problems with MM_SHMT_MMANON even though it reports
+@@ -722,6 +729,9 @@
+ havebeosarea="0"
+ haveos2shm="0"
+ APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+             [havebeosshm="1"
+              APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
+ APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
+              [havemmaptmp="1"
+               APR_DECIDE(USE_SHMEM_MMAP_TMP, 
+@@ -735,9 +745,6 @@
+              func:shmget func:shmat func:shmdt func:shmctl,
+              [haveshmget="1"
+               APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
+-APR_IFALLYES(header:kernel/OS.h func:create_area,
+-             [havebeosshm="1"
+-              APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
+ APR_IFALLYES(header:os2.h,
+              [haveos2shm="1"
+               APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
+@@ -1270,7 +1277,7 @@
+        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+        size_t_fmt='#define APR_SIZE_T_FMT "lu"'
+        ;;
+-    *beos*)
+    *beos*|*haiku*)
+         ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+         size_t_fmt='#define APR_SIZE_T_FMT "ld"'
+         ;;
+diff -urN apr-0.9.17-orig/include/apr_portable.h apr-0.9.17/include/apr_portable.h
+--- apr-0.9.17-orig/include/apr_portable.h	2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/include/apr_portable.h	2008-05-13 22:10:51.000000000 +0000
+@@ -84,7 +84,7 @@
+ typedef HMODULE               apr_os_dso_handle_t;
+ typedef void*                 apr_os_shm_t;
+ 
+-#elif defined(__BEOS__)
+#elif defined(__BEOS__) && !defined(__HAIKU__)
+ #include <kernel/OS.h>
+ #include <kernel/image.h>
+ 
+diff -urN apr-0.9.17-orig/test/testoc.c apr-0.9.17/test/testoc.c
+--- apr-0.9.17-orig/test/testoc.c	2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testoc.c	2008-05-13 22:10:51.000000000 +0000
+@@ -78,6 +78,9 @@
+     rv = apr_procattr_create(&procattr, p);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ 
+    rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+    CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
+     rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE, 
+                              APR_NO_PIPE);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+diff -urN apr-0.9.17-orig/test/testpipe.c apr-0.9.17/test/testpipe.c
+--- apr-0.9.17-orig/test/testpipe.c	2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpipe.c	2008-05-13 22:10:51.000000000 +0000
+@@ -152,6 +152,9 @@
+     rv = apr_procattr_create(&procattr, p);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ 
+    rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+    CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
+     rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK,
+                              APR_CHILD_BLOCK);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+diff -urN apr-0.9.17-orig/test/testpoll.c apr-0.9.17/test/testpoll.c
+--- apr-0.9.17-orig/test/testpoll.c	2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpoll.c	2008-05-13 22:10:51.000000000 +0000
+@@ -197,6 +197,8 @@
+ 
+     send_msg(s, sa, 2, tc);
+ 
+    apr_sleep(apr_time_make(0, 10000));
+
+     rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     check_sockets(pollarray, s, 0, 0, tc);
+@@ -212,6 +214,8 @@
+     recv_msg(s, 1, p, tc);
+     send_msg(s, sa, 0, tc);
+ 
+    apr_sleep(apr_time_make(0, 10000));
+
+     rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     check_sockets(pollarray, s, 0, 1, tc);
+@@ -318,6 +322,7 @@
+     int num;
+     
+     send_msg(s, sa, 0, tc);
+    apr_sleep(apr_time_make(0, 10000));
+     rv = apr_pollset_poll(pollset, 0, &num, &descs);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     CuAssertIntEquals(tc, 1, num);
+@@ -348,6 +353,7 @@
+     
+     send_msg(s, sa, 2, tc);
+     send_msg(s, sa, 5, tc);
+    apr_sleep(apr_time_make(0, 10000));
+     rv = apr_pollset_poll(pollset, 0, &num, &descs);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     CuAssertIntEquals(tc, 2, num);
+@@ -380,6 +386,7 @@
+     int num;
+     
+     send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+    apr_sleep(apr_time_make(0, 10000));
+     rv = apr_pollset_poll(pollset, 0, &num, &descs);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     CuAssertIntEquals(tc, 1, num);
+diff -urN apr-0.9.17-orig/test/testproc.c apr-0.9.17/test/testproc.c
+--- apr-0.9.17-orig/test/testproc.c	2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testproc.c	2008-05-13 22:10:51.000000000 +0000
+@@ -53,7 +53,7 @@
+     rv = apr_procattr_dir_set(attr, "data");
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ 
+-    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ 
+     args[0] = "proc_child" EXTENSION;
+@@ -129,7 +129,7 @@
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+     rv = apr_procattr_dir_set(attr, "data");
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+-    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
+     CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ 
+     args[0] = "proc_child";
--- a/dev-libs/apr/apr-0.9.x.diff
+++ b/dev-libs/apr/apr-0.9.x.diff
--- a/dev-libs/apr/apr-1.0.1.diff
+++ b/dev-libs/apr/apr-1.0.1.diff
--- a/dev-libs/apr/apr-1.2.x.diff
+++ b/dev-libs/apr/apr-1.2.x.diff
@@ -0,0 +1,23 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(revision 619048)
+++ Makefile.in	(working copy)
+@@ -18,7 +18,7 @@
+ INCDIR=./include
+ OSDIR=$(top_srcdir)/include/arch/@OSDIR@
+ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
+ 
+ #
+ # Macros for target determination
+Index: build/gen-build.py
+===================================================================
+--- build/gen-build.py	(revision 619048)
+++ build/gen-build.py	(working copy)
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/bin/env python
+ #
+ # USAGE: gen-build.py TYPE
+ #
--- a/dev-libs/expat/expat-CVS.diff
+++ b/dev-libs/expat/expat-CVS.diff
@@ -0,0 +1,326 @@
+Index: conftools/config.guess
+===================================================================
+RCS file: /cvsroot/expat/expat/conftools/config.guess,v
+retrieving revision 1.4
+diff -u -r1.4 config.guess
+--- conftools/config.guess	22 Sep 2006 14:42:54 -0000	1.4
+++ conftools/config.guess	20 Apr 2008 15:52:53 -0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2006-07-02'
+timestamp='2008-01-08'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -161,6 +161,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -329,7 +330,7 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+@@ -531,7 +532,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
+    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -780,7 +781,7 @@
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
+    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+     i*:windows32*:*)
+@@ -790,12 +791,18 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[3456]*)
+-	echo i586-pc-interix${UNAME_RELEASE}
+-	exit ;;
+-    EM64T:Interix*:[3456]*)
+-	echo x86_64-unknown-interix${UNAME_RELEASE}
+-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
+@@ -829,7 +836,14 @@
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -950,6 +964,9 @@
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+@@ -1199,6 +1216,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1208,6 +1231,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+Index: conftools/config.sub
+===================================================================
+RCS file: /cvsroot/expat/expat/conftools/config.sub,v
+retrieving revision 1.4
+diff -u -r1.4 config.sub
+--- conftools/config.sub	22 Sep 2006 14:42:54 -0000	1.4
+++ conftools/config.sub	20 Apr 2008 15:52:56 -0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2006-09-20'
+timestamp='2008-01-16'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -72,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -245,12 +245,12 @@
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
+	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -324,7 +324,7 @@
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+@@ -369,10 +369,14 @@
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+@@ -443,6 +447,14 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+@@ -475,8 +487,8 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -668,6 +680,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -683,6 +703,10 @@
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -809,6 +833,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -925,6 +957,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -1014,6 +1049,10 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -1219,7 +1258,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1414,6 +1453,9 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+        mep-*)
+		os=-elf
+		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
--- a/dev-libs/glib/glib-trunk.diff
+++ b/dev-libs/glib/glib-trunk.diff
@@ -0,0 +1,374 @@
+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;
+ 
--- a/dev-libs/libiconv/libiconv-1.12-haiku.diff
+++ b/dev-libs/libiconv/libiconv-1.12-haiku.diff
@@ -0,0 +1,813 @@
+diff -ur libiconv-1.12/build-aux/config.guess libiconv-1.12-haiku/build-aux/config.guess
+--- libiconv-1.12/build-aux/config.guess	2007-09-30 01:30:02.000000000 +0000
+++ libiconv-1.12-haiku/build-aux/config.guess	2008-05-25 16:59:19.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2007-07-22'
+timestamp='2008-01-08'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -532,7 +532,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
+    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -799,6 +799,9 @@
+ 	    EM64T | authenticamd)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+ 	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+@@ -833,7 +836,14 @@
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -954,8 +964,8 @@
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit ;;
+-    xtensa:Linux:*:*)
+-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+@@ -1206,6 +1216,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+diff -ur libiconv-1.12/build-aux/config.libpath libiconv-1.12-haiku/build-aux/config.libpath
+--- libiconv-1.12/build-aux/config.libpath	2007-10-23 23:31:23.000000000 +0000
+++ libiconv-1.12-haiku/build-aux/config.libpath	2008-05-26 04:06:01.000000000 +0000
+@@ -50,7 +50,7 @@
+       shlibpath_var=LIBPATH
+     fi
+     ;;
+-  beos*)
+  beos* | haiku*)
+     shlibpath_var=LIBRARY_PATH
+     ;;
+   bsdi[45]*)
+diff -ur libiconv-1.12/build-aux/config.rpath libiconv-1.12-haiku/build-aux/config.rpath
+--- libiconv-1.12/build-aux/config.rpath	2007-11-11 16:41:16.000000000 +0000
+++ libiconv-1.12-haiku/build-aux/config.rpath	2008-05-26 02:47:52.000000000 +0000
+@@ -175,7 +175,7 @@
+       # them.
+       ld_shlibs=no
+       ;;
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         :
+       else
+@@ -511,7 +511,7 @@
+   amigaos*)
+     library_names_spec='$libname.a'
+     ;;
+-  beos*)
+  beos* | haiku*)
+     library_names_spec='$libname$shrext'
+     ;;
+   bsdi[45]*)
+diff -ur libiconv-1.12/build-aux/ltmain.sh libiconv-1.12-haiku/build-aux/ltmain.sh
+--- libiconv-1.12/build-aux/ltmain.sh	2007-10-27 00:28:24.000000000 +0000
+++ libiconv-1.12-haiku/build-aux/ltmain.sh	2008-05-26 02:58:38.000000000 +0000
+@@ -1593,7 +1593,7 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -3505,7 +3505,7 @@
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+diff -ur libiconv-1.12/configure libiconv-1.12-haiku/configure
+--- libiconv-1.12/configure	2007-11-11 16:46:26.000000000 +0000
+++ libiconv-1.12-haiku/configure	2008-05-26 03:04:26.000000000 +0000
+@@ -5876,7 +5876,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -8697,7 +8697,7 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -9217,7 +9217,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -10272,7 +10272,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -10825,7 +10825,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+@@ -12686,7 +12686,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag_CXX=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -13624,7 +13624,7 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | cygwin* | os2* | pw32*)
+@@ -14243,7 +14243,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -15343,7 +15343,7 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -15863,7 +15863,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -16847,7 +16847,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -17931,7 +17931,7 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -18451,7 +18451,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -19455,7 +19455,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+diff -ur libiconv-1.12/libcharset/build-aux/config.guess libiconv-1.12-haiku/libcharset/build-aux/config.guess
+--- libiconv-1.12/libcharset/build-aux/config.guess	2005-12-29 12:12:25.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/build-aux/config.guess	2008-05-25 16:59:19.000000000 +0000
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2005-12-23'
+timestamp='2008-01-08'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -55,8 +56,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -106,7 +107,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -160,6 +161,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -206,8 +208,11 @@
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -325,7 +330,7 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+@@ -527,7 +532,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
+    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -767,6 +772,8 @@
+ 	case ${UNAME_MACHINE} in
+ 	    pc98)
+ 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+ 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+@@ -774,7 +781,7 @@
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
+    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+     i*:windows32*:*)
+@@ -784,9 +791,18 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[345]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
+@@ -820,6 +836,16 @@
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+@@ -856,7 +882,11 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     mips64:Linux:*:*)
+@@ -875,7 +905,11 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+@@ -930,6 +964,9 @@
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+@@ -972,7 +1009,7 @@
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+@@ -982,7 +1019,11 @@
+ 	LIBC=dietlibc
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+ 	test x"${LIBC}" != x && {
+ 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 		exit
+@@ -1175,6 +1216,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1184,6 +1231,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+diff -ur libiconv-1.12/libcharset/build-aux/config.libpath libiconv-1.12-haiku/libcharset/build-aux/config.libpath
+--- libiconv-1.12/libcharset/build-aux/config.libpath	2005-12-29 12:12:25.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/build-aux/config.libpath	2008-05-26 03:14:14.000000000 +0000
+@@ -51,7 +51,7 @@
+       shlibpath_var=LIBPATH
+     fi
+     ;;
+-  beos*)
+  beos* | haiku*)
+     shlibpath_var=LIBRARY_PATH
+     ;;
+   bsdi4*)
+diff -ur libiconv-1.12/libcharset/build-aux/ltmain.sh libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh
+--- libiconv-1.12/libcharset/build-aux/ltmain.sh	2007-10-27 00:28:36.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh	2008-05-26 03:18:48.000000000 +0000
+@@ -1593,7 +1593,7 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -3505,7 +3505,7 @@
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+diff -ur libiconv-1.12/libcharset/configure libiconv-1.12-haiku/libcharset/configure
+--- libiconv-1.12/libcharset/configure	2007-11-11 16:48:07.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/configure	2008-05-26 03:22:22.000000000 +0000
+@@ -4272,7 +4272,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -6985,7 +6985,7 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -7505,7 +7505,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -8560,7 +8560,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -9113,7 +9113,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+@@ -10974,7 +10974,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag_CXX=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -11912,7 +11912,7 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | cygwin* | os2* | pw32*)
+@@ -12531,7 +12531,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -13631,7 +13631,7 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -14151,7 +14151,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -15135,7 +15135,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -16219,7 +16219,7 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -16739,7 +16739,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -17743,7 +17743,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+diff -ur libiconv-1.12/libcharset/lib/config.charset libiconv-1.12-haiku/libcharset/lib/config.charset
+--- libiconv-1.12/libcharset/lib/config.charset	2006-06-19 10:40:15.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/lib/config.charset	2008-05-26 03:24:24.000000000 +0000
+@@ -469,7 +469,7 @@
+ 	# space nevertheless.
+ 	echo "* UTF-8"
+ 	;;
+-    beos*)
+    beos* | haiku*)
+ 	# BeOS has a single locale, and it has UTF-8 encoding.
+ 	echo "* UTF-8"
+ 	;;
+diff -ur libiconv-1.12/libcharset/m4/libtool.m4 libiconv-1.12-haiku/libcharset/m4/libtool.m4
+--- libiconv-1.12/libcharset/m4/libtool.m4	2007-10-27 00:46:10.000000000 +0000
+++ libiconv-1.12-haiku/libcharset/m4/libtool.m4	2008-05-26 03:29:49.000000000 +0000
+@@ -937,7 +937,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+@@ -1342,7 +1342,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2316,7 +2316,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2542,7 +2542,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3033,7 +3033,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -4955,7 +4955,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | cygwin* | os2* | pw32*)
+@@ -5238,7 +5238,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -5631,7 +5631,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+diff -ur libiconv-1.12/m4/libtool.m4 libiconv-1.12-haiku/m4/libtool.m4
+--- libiconv-1.12/m4/libtool.m4	2007-10-27 00:46:10.000000000 +0000
+++ libiconv-1.12-haiku/m4/libtool.m4	2008-05-26 03:33:20.000000000 +0000
+@@ -937,7 +937,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+@@ -1342,7 +1342,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2316,7 +2316,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2542,7 +2542,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3033,7 +3033,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -4955,7 +4955,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | cygwin* | os2* | pw32*)
+@@ -5238,7 +5238,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -5631,7 +5631,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
--- a/dev-libs/libiconv/libiconv-1.12.bep
+++ b/dev-libs/libiconv/libiconv-1.12.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="libiconv" 
+HOMEPAGE="http://www.gnu.org/software/libiconv/" 
+SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libiconv-1.12
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libiconv-1.12
+	make install
+}
--- a/dev-libs/libxml2/libxml2-trunk.diff
+++ b/dev-libs/libxml2/libxml2-trunk.diff
@@ -0,0 +1,35 @@
+Index: nanohttp.c
+===================================================================
+--- nanohttp.c	(revision 3738)
+++ nanohttp.c	(working copy)
+@@ -95,7 +95,7 @@
+  * A couple portability macros
+  */
+ #ifndef _WINSOCKAPI_
+-#ifndef __BEOS__
+#if !defined(__BEOS__) || defined(__HAIKU__)
+ #define closesocket(s) close(s)
+ #endif
+ #define SOCKET int
+@@ -844,7 +844,7 @@
+ 	status = ioctl(s, FIONBIO, &enable);
+     }
+ #else /* VMS */
+-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
+ 	{
+ 		bool noblock = true;
+ 		status = setsockopt(s, SOL_SOCKET, SO_NONBLOCK, &noblock, sizeof(noblock));
+Index: nanoftp.c
+===================================================================
+--- nanoftp.c	(revision 3738)
+++ nanoftp.c	(working copy)
+@@ -89,7 +89,7 @@
+  * A couple portability macros
+  */
+ #ifndef _WINSOCKAPI_
+-#ifndef __BEOS__
+#if !defined(__BEOS__) || defined(__HAIKU__)
+ #define closesocket(s) close(s)
+ #endif
+ #define SOCKET int
--- a/dev-util/cmake/Haiku.cmake
+++ b/dev-util/cmake/Haiku.cmake
@@ -0,0 +1,14 @@
+SET(BEOS 1)
+
+# GCC is the default compiler on Haiku.
+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
+
+SET(CMAKE_DL_LIBS root be)
+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
+
+INCLUDE(Platform/UnixPaths)
--- a/dev-util/cmake/cmake-2.6.0-haiku.diff
+++ b/dev-util/cmake/cmake-2.6.0-haiku.diff
@@ -0,0 +1,300 @@
+diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in
+--- cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in	2008-05-05 18:26:04.000000000 +0000
+++ cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-06-19 11:16:50.000000000 +0000
+@@ -48,6 +48,10 @@
+    PRINT *, 'INFO:platform[IRIX]'
+ #elif defined(__hpux) || defined(__hpux__)
+    PRINT *, 'INFO:platform[HP-UX]'
+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+   PRINT *, 'INFO:platform[Haiku]'
+! Haiku also defines __BEOS__ so we must 
+! put it prior to the check for __BEOS__
+ #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
+    PRINT *, 'INFO:platform[BeOS]'
+ #elif defined(__QNX__) || defined(__QNXNTO__)
+diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in
+--- cmake-2.6.0/Modules/CMakePlatformId.h.in	2008-05-05 18:26:04.000000000 +0000
+++ cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in	2008-06-19 11:16:50.000000000 +0000
+@@ -35,6 +35,11 @@
+ #elif defined(__hpux) || defined(__hpux__)
+ # define PLATFORM_ID "HP-UX"
+ 
+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+# define PLATFORM_ID "Haiku"
+! Haiku also defines __BEOS__ so we must 
+! put it prior to the check for __BEOS__
+
+ #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
+ # define PLATFORM_ID "BeOS"
+ 
+diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c
+--- cmake-2.6.0/Modules/CheckForPthreads.c	2008-05-05 18:26:04.000000000 +0000
+++ cmake-2.6.0-haiku/Modules/CheckForPthreads.c	2008-06-19 11:16:50.000000000 +0000
+@@ -16,7 +16,7 @@
+   pthread_create(&tid[0], 0, runner, (void*)1);
+   pthread_create(&tid[1], 0, runner, (void*)2);
+   
+-#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
+   usleep(1); // for strange behavior on single-processor sun
+ #endif
+ 
+Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake
+diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
+--- cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-06-19 11:16:50.000000000 +0000
+@@ -35,7 +35,7 @@
+ #endif
+ 
+ #if !defined(_WIN32) && !defined(__APPLE__) \
+- && !defined(__QNXNTO__) && !defined(__BEOS__)
+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
+ #  include "cmCPackDebGenerator.h"
+ #  include "cmCPackRPMGenerator.h"
+ #endif
+@@ -72,7 +72,8 @@
+     cmCPackOSXX11Generator::CreateGenerator);
+ #endif
+ #if !defined(_WIN32) && !defined(__APPLE__) \
+-  && !defined(__QNXNTO__) && !defined(__BEOS__)
+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
+  && !defined(__HAIKU__)
+   this->RegisterGenerator("DEB", "Debian packages",
+     cmCPackDebGenerator::CreateGenerator);
+   this->RegisterGenerator("RPM", "RPM packages",
+diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx
+--- cmake-2.6.0/Source/cmCTest.cxx	2008-05-05 18:26:04.000000000 +0000
+++ cmake-2.6.0-haiku/Source/cmCTest.cxx	2008-06-19 11:16:50.000000000 +0000
+@@ -49,10 +49,15 @@
+ 
+ #include <memory> // auto_ptr
+ 
+-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
+ #include <be/kernel/OS.h>   /* disable_debugger() API. */
+ #endif
+ 
+#if defined(__HAIKU__)
+#include <os/kernel/OS.h>   /* disable_debugger() API. */
+#endif
+
+
+ #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
+ #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
+ 
+diff -ur cmake-2.6.0/Source/kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx
+--- cmake-2.6.0/Source/kwsys/DynamicLoader.cxx	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx	2008-06-20 14:08:23.000000000 +0000
+@@ -331,7 +331,7 @@
+ 
+ // ---------------------------------------------------------------
+ // 4. Implementation for BeOS
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined(__HAIKU__)
+ #include <string.h> // for strerror()
+ #include <be/kernel/image.h>
+ #include <be/support/Errors.h>
+diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c
+--- cmake-2.6.0/Source/kwsys/ProcessUNIX.c	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c	2008-06-20 14:06:56.000000000 +0000
+@@ -75,7 +75,7 @@
+ typedef int kwsysProcess_ssize_t;
+ #endif
+ 
+-#if defined(__BEOS__) && !defined(__ZETA__)
+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+ /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
+ # include <be/kernel/OS.h>
+ static inline void kwsysProcess_usleep(unsigned int msec)
+diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx
+--- cmake-2.6.0/Source/kwsys/SystemTools.cxx	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx	2008-06-19 15:49:33.000000000 +0000
+@@ -131,7 +131,12 @@
+ #define _chdir chdir
+ #endif
+ 
+-#if defined(__BEOS__) && !defined(__ZETA__)
+#ifdef (__HAIKU__)
+#include <os/kernel.OS.h>
+#include <os/storage/Path.h>
+#endif
+
+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+ #include <be/kernel/OS.h>
+ #include <be/storage/Path.h>
+ 
+diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c
+--- cmake-2.6.0/Source/kwsys/testProcess.c	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Source/kwsys/testProcess.c	2008-06-19 11:16:51.000000000 +0000
+@@ -34,7 +34,7 @@
+ # pragma warn -8060 /* possibly incorrect assignment */
+ #endif
+ 
+-#if defined(__BEOS__) && !defined(__ZETA__)
+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+ /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
+ # include <be/kernel/OS.h>
+ static inline void testProcess_usleep(unsigned int msec)
+diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt
+--- cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt	2008-05-05 18:26:05.000000000 +0000
+++ cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt	2008-06-19 11:16:51.000000000 +0000
+@@ -53,7 +53,9 @@
+   )
+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
+ IF(NOT BEOS)  # No libm on BeOS.
+-  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
+  IF(NOT HAIKU) # libm in included in libroot on Haiku
+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
+  ENDIF(NOT HAIKU)
+ ENDIF(NOT BEOS)
+ GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
+ IF(${FOO_BAR_VAR} MATCHES "BAR")
+diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c
+--- cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c	2008-05-05 18:26:06.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-06-19 11:16:51.000000000 +0000
+@@ -38,6 +38,12 @@
+ # define PLATFORM_AIX_V3
+ #endif
+ 
+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
+/* many BeOS workarounds are no longer needed in Haiku */
+#if defined(__HAIKU__) && defined(__BEOS__)
+undef (__BEOS__)
+#endif
+
+ #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
+ #error "O_NONBLOCK does not work on this platform"
+ #endif
+diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h
+--- cmake-2.6.0/Utilities/cmcurl/curl/curl.h	2008-05-05 18:26:06.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h	2008-06-19 11:16:51.000000000 +0000
+@@ -1133,7 +1133,7 @@
+ }
+ #endif
+ 
+-#ifdef __BEOS__
+#if defined __BEOS__ || defined __HAIKU__
+ #include <support/SupportDefs.h>
+ #endif
+ 
+diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c
+--- cmake-2.6.0/Utilities/cmcurl/if2ip.c	2008-05-05 18:26:06.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c	2008-06-19 11:16:51.000000000 +0000
+@@ -39,7 +39,7 @@
+  */
+ #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
+     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
+-    !defined(_AMIGASF) && !defined(__minix)
+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
+ 
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c
+--- cmake-2.6.0/Utilities/cmcurl/select.c	2008-05-05 18:26:06.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmcurl/select.c	2008-06-19 11:16:51.000000000 +0000
+@@ -39,7 +39,7 @@
+ #error "We can't compile without select() support!"
+ #endif
+ 
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ /* BeOS has FD_SET defined in socket.h */
+ #include <socket.h>
+ #endif
+diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h
+--- cmake-2.6.0/Utilities/cmcurl/setup.h	2008-05-05 18:26:06.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmcurl/setup.h	2008-06-19 11:16:51.000000000 +0000
+@@ -264,7 +264,7 @@
+ 
+ #else /* MSDOS */
+ 
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #define sclose(x) closesocket(x)
+ #else /* __BEOS__ */
+ #define sclose(x) close(x)
+diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c
+--- cmake-2.6.0/Utilities/cmtar/libtar.c	2008-05-05 18:26:07.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmtar/libtar.c	2008-06-19 11:16:51.000000000 +0000
+@@ -98,8 +98,8 @@
+     {
+     return -1;
+     }
+-
+-#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
+/* no fchmod on BeOS...do pathname instead. */
+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
+     {
+     return -1;
+diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
+--- cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-05-05 18:26:07.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-06-19 11:16:51.000000000 +0000
+@@ -10,7 +10,7 @@
+ 
+ #include "xmlrpc_config.h"
+ 
+-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
+ /* Some helpful system header has char==bool, then bool.h does int==bool. */
+ #define HAVE_BOOL 1
+ #endif
+diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h
+--- cmake-2.6.0/Utilities/cmzlib/zconf.h	2008-05-05 18:26:07.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h	2008-06-19 11:16:51.000000000 +0000
+@@ -237,7 +237,7 @@
+ #  endif
+ #endif
+ 
+-#if defined (__BEOS__)
+#if defined (__BEOS__) && !defined (__HAIKU__)
+ #  ifdef ZLIB_DLL
+ #    ifdef ZLIB_INTERNAL
+ #      define ZEXPORT   __declspec(dllexport)
+diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h
+--- cmake-2.6.0/Utilities/cmzlib/zutil.h	2008-05-05 18:26:07.000000000 +0000
+++ cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h	2008-06-19 11:16:51.000000000 +0000
+@@ -147,7 +147,13 @@
+ #  define OS_CODE  0x0f
+ #endif
+ 
+-#if defined(_BEOS_) || defined(RISCOS)
+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
+/* many BeOS workarounds are no longer needed in Haiku */
+#if defined(__HAIKU__) && defined(__BEOS__)
+undef (__BEOS__)
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS) 
+ #  define fdopen(fd,mode) NULL /* No fdopen() */
+ #endif
+ 
+diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap
+--- cmake-2.6.0/bootstrap	2008-05-05 18:26:04.000000000 +0000
+++ cmake-2.6.0-haiku/bootstrap	2008-06-19 11:16:51.000000000 +0000
+@@ -73,6 +73,13 @@
+   cmake_system_beos=false
+ fi
+ 
+# Determine whether this is Haiku 
+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
+  cmake_system_haiku=true
+else
+  cmake_system_haiku=false
+fi
+
+ # Choose the generator to use for bootstrapping.
+ if ${cmake_system_mingw}; then
+   # Bootstrapping from an MSYS prompt.
+@@ -603,6 +610,11 @@
+   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
+ fi
+ 
+# Add Haiku toolkits...
+if ${cmake_system_haiku}; then
+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
+fi
+
+ # Test C compiler
+ cmake_c_compiler=
+ 
--- a/dev-util/cvs/cvs-1.12.13.diff
+++ b/dev-util/cvs/cvs-1.12.13.diff
@@ -0,0 +1,42 @@
+--- cvs-1.12.13/lib/stdbool_.h	2005-05-23 17:44:32.000000000 +0000
+++ cvs-1.12.13.patched/lib/stdbool_.h	2008-04-16 19:48:25.000000000 +0000
+@@ -55,7 +55,7 @@
+ 
+ /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+    definitions below, but temporarily we have to #undef them.  */
+-#ifdef __BEOS__
+#if defined(__BEOS__) && !defined(__HAIKU__)
+ # include <OS.h> /* defines bool but not _Bool */
+ # undef false
+ # undef true
+@@ -70,7 +70,7 @@
+    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+    enum; this ensures that '_Bool' promotes to 'int'.  */
+-#if !(defined __cplusplus || defined __BEOS__)
+#if !(defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__))
+ # if !@HAVE__BOOL@
+ #  if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
+     /* Avoid stupid "warning: _Bool is a keyword in ISO C99".  */
+--- cvs-1.12.13/lib/getpass.c	2005-09-19 21:12:21.000000000 +0000
+++ cvs-1.12.13.patched/lib/getpass.c	2008-04-13 22:14:46.000000000 +0000
+@@ -104,7 +104,7 @@
+   else
+     {
+       /* We do the locking ourselves.  */
+-      __fsetlocking (tty, FSETLOCKING_BYCALLER);
+//      __fsetlocking (tty, FSETLOCKING_BYCALLER);
+ 
+       out = in = tty;
+     }
+--- cvs-1.12.13/src/buffer.c	2005-10-02 15:17:20.000000000 +0000
+++ cvs-1.12.13.patched/src/buffer.c	2008-04-13 22:18:11.000000000 +0000
+@@ -2019,7 +2019,7 @@
+ 			 && sb.st_uid == devnull.st_uid
+ 			 && sb.st_gid == devnull.st_gid
+ 			 && sb.st_size == devnull.st_size
+-			 && sb.st_blocks == devnull.st_blocks
+//			 && sb.st_blocks == devnull.st_blocks
+ 			 && sb.st_blksize == devnull.st_blksize);
+ 	if (isdevnull)
+ 	    errno = 0;
--- a/dev-util/cvs/cvs-CVS.diff
+++ b/dev-util/cvs/cvs-CVS.diff
@@ -0,0 +1,433 @@
+? build-aux/ltmain.sh
+Index: configure
+===================================================================
+RCS file: /sources/cvs/ccvs/configure,v
+retrieving revision 1.488
+diff -u -p -r1.488 configure
+--- configure	28 Jan 2008 05:32:56 -0000	1.488
+++ configure	4 May 2008 09:32:20 -0000
+@@ -40558,7 +40558,7 @@ return connect ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' xnet socket inet; do
+for ac_lib in '' xnet socket inet network; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+Index: configure.in
+===================================================================
+RCS file: /sources/cvs/ccvs/configure.in,v
+retrieving revision 1.385
+diff -u -p -r1.385 configure.in
+--- configure.in	28 Jan 2008 05:32:56 -0000	1.385
+++ configure.in	4 May 2008 09:32:26 -0000
+@@ -527,7 +527,7 @@ CVS_FUNC_PRINTF_PTR
+ 
+ # Try to find connect and gethostbyname.
+ AC_CHECK_LIB(nsl, main)
+-AC_SEARCH_LIBS(connect, xnet socket inet,
+AC_SEARCH_LIBS(connect, xnet socket inet network,
+   AC_DEFINE(HAVE_CONNECT, 1,
+ [Define if you have the connect function.]))
+ dnl no need to search nsl for gethostbyname here since we should have
+Index: build-aux/config.guess
+===================================================================
+RCS file: /sources/cvs/ccvs/build-aux/config.guess,v
+retrieving revision 1.2
+diff -u -p -r1.2 config.guess
+--- build-aux/config.guess	21 Aug 2007 18:42:53 -0000	1.2
+++ build-aux/config.guess	4 May 2008 09:32:31 -0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2006-07-02'
+timestamp='2008-01-08'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+@@ -531,7 +532,7 @@ EOF
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
+    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -780,7 +781,7 @@ EOF
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
+    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+     i*:windows32*:*)
+@@ -790,12 +791,18 @@ EOF
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[3456]*)
+-	echo i586-pc-interix${UNAME_RELEASE}
+-	exit ;;
+-    EM64T:Interix*:[3456]*)
+-	echo x86_64-unknown-interix${UNAME_RELEASE}
+-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
+@@ -829,7 +836,14 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -950,6 +964,9 @@ EOF
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+@@ -1199,6 +1216,12 @@ EOF
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1208,6 +1231,15 @@ EOF
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+Index: build-aux/config.sub
+===================================================================
+RCS file: /sources/cvs/ccvs/build-aux/config.sub,v
+retrieving revision 1.2
+diff -u -p -r1.2 config.sub
+--- build-aux/config.sub	21 Aug 2007 18:42:53 -0000	1.2
+++ build-aux/config.sub	4 May 2008 09:32:35 -0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+ 
+-timestamp='2006-09-20'
+timestamp='2008-01-16'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -72,8 +72,8 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -245,12 +245,12 @@ case $basic_machine in
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
+	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -324,7 +324,7 @@ case $basic_machine in
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+@@ -369,10 +369,14 @@ case $basic_machine in
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+@@ -443,6 +447,14 @@ case $basic_machine in
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+@@ -475,8 +487,8 @@ case $basic_machine in
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -668,6 +680,14 @@ case $basic_machine in
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -683,6 +703,10 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -809,6 +833,14 @@ case $basic_machine in
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -925,6 +957,9 @@ case $basic_machine in
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -1014,6 +1049,10 @@ case $basic_machine in
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -1219,7 +1258,7 @@ case $os in
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1414,6 +1453,9 @@ case $basic_machine in
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+        mep-*)
+		os=-elf
+		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+Index: lib/stdbool_.h
+===================================================================
+RCS file: /sources/cvs/ccvs/lib/stdbool_.h,v
+retrieving revision 1.5
+diff -u -p -r1.5 stdbool_.h
+--- lib/stdbool_.h	22 Aug 2007 12:48:45 -0000	1.5
+++ lib/stdbool_.h	4 May 2008 09:32:38 -0000
+@@ -58,7 +58,7 @@
+ 
+ /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+    definitions below, but temporarily we have to #undef them.  */
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ # include <OS.h> /* defines bool but not _Bool */
+ # undef false
+ # undef true
+@@ -73,7 +73,7 @@
+    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+    enum; this ensures that '_Bool' promotes to 'int'.  */
+-#if defined __cplusplus || defined __BEOS__
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+   /* A compiler known to have 'bool'.  */
+   /* If the compiler already has both 'bool' and '_Bool', we can assume they
+      are the same types.  */
+Index: src/buffer.c
+===================================================================
+RCS file: /sources/cvs/ccvs/src/buffer.c,v
+retrieving revision 1.73
+diff -u -p -r1.73 buffer.c
+--- src/buffer.c	4 May 2006 18:15:15 -0000	1.73
+++ src/buffer.c	4 May 2008 09:32:45 -0000
+@@ -24,6 +24,7 @@
+ /* CVS headers.  */
+ #include "cvs.h"
+ 
+#include <sys/select.h>
+ 
+ 
+ /* Local functions.  */
+@@ -2120,7 +2121,7 @@ fd_buffer_block (void *closure, bool blo
+ 			 && sb.st_uid == devnull.st_uid
+ 			 && sb.st_gid == devnull.st_gid
+ 			 && sb.st_size == devnull.st_size
+-			 && sb.st_blocks == devnull.st_blocks
+//			 && sb.st_blocks == devnull.st_blocks
+ 			 && sb.st_blksize == devnull.st_blksize);
+ 	if (isdevnull)
+ 	    errno = 0;
+Index: windows-NT/stdbool.h
+===================================================================
+RCS file: /sources/cvs/ccvs/windows-NT/stdbool.h,v
+retrieving revision 1.6
+diff -u -p -r1.6 stdbool.h
+--- windows-NT/stdbool.h	22 Aug 2007 13:48:49 -0000	1.6
+++ windows-NT/stdbool.h	4 May 2008 09:35:17 -0000
+@@ -65,7 +65,7 @@
+ 
+ /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
+    definitions below, but temporarily we have to #undef them.  */
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ # include <OS.h> /* defines bool but not _Bool */
+ # undef false
+ # undef true
+@@ -80,7 +80,7 @@
+    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
+    enum; this ensures that '_Bool' promotes to 'int'.  */
+-#if defined __cplusplus || defined __BEOS__
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+   /* A compiler known to have 'bool'.  */
+   /* If the compiler already has both 'bool' and '_Bool', we can assume they
+      are the same types.  */
--- a/dev-util/git/git-1.5.5.diff
+++ b/dev-util/git/git-1.5.5.diff
@@ -0,0 +1,54 @@
+--- git-1.5.5/Makefile	2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/Makefile	2008-04-19 00:20:29.000000000 +0000
+@@ -989,7 +989,7 @@
+ 		'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
+ 
+ $(BUILT_INS): git$X
+-	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
+	$(QUIET_BUILT_IN)$(RM) $@ && ln -s git$X $@
+ 
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+ 
+@@ -1230,7 +1230,7 @@
+ 		cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
+ 			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
+ 	fi
+-	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ ifneq (,$X)
+ 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
+ endif
+--- git-1.5.5/git-compat-util.h	2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/git-compat-util.h	2008-04-18 22:15:48.000000000 +0000
+@@ -453,4 +453,8 @@
+ # define FORCE_DIR_SET_GID 0
+ #endif
+ 
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+ #endif
+--- git-1.5.5/builtin-count-objects.c	2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/builtin-count-objects.c	2008-04-19 00:32:05.000000000 +0000
+@@ -43,7 +43,8 @@
+ 			if (lstat(path, &st) || !S_ISREG(st.st_mode))
+ 				bad = 1;
+ 			else
+-				(*loose_size) += xsize_t(st.st_blocks);
+//				(*loose_size) += xsize_t(st.st_blocks);
+				(*loose_size) += ceil(st.st_size / 512.0);
+ 		}
+ 		if (bad) {
+ 			if (verbose) {
+--- git-1.5.5/templates/Makefile	2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/templates/Makefile	2008-04-19 00:44:46.000000000 +0000
+@@ -23,7 +23,7 @@
+ 
+ bpsrc = $(filter-out %~,$(wildcard *--*))
+ boilerplates.made : $(bpsrc)
+-	$(QUIET)ls *--* 2>/dev/null | \
+	$(QUIET)ls -1 *--* 2>/dev/null | \
+ 	while read boilerplate; \
+ 	do \
+ 		case "$$boilerplate" in *~) continue ;; esac && \
--- a/dev-util/git/git-master.diff
+++ b/dev-util/git/git-master.diff
@@ -0,0 +1,64 @@
+diff --git a/Makefile b/Makefile
+index 9d84c8d..a4ac815 100644
+--- a/Makefile
+++ b/Makefile
+@@ -992,7 +992,7 @@ help.o: help.c common-cmds.h GIT-CFLAGS
+ 		'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
+ 
+ $(BUILT_INS): git$X
+-	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
+	$(QUIET_BUILT_IN)$(RM) $@ && ln -s git$X $@
+ 
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+ 
+@@ -1234,7 +1234,7 @@ endif
+ 		cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
+ 			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
+ 	fi
+-	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ ifneq (,$X)
+ 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
+ endif
+diff --git a/builtin-count-objects.c b/builtin-count-objects.c
+index f00306f..f8a3068 100644
+--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
+@@ -43,7 +43,11 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
+ 			if (lstat(path, &st) || !S_ISREG(st.st_mode))
+ 				bad = 1;
+ 			else
+#ifdef __HAIKU__
+				(*loose_size) += ceil(st.st_size / 512.0);
+#else
+ 				(*loose_size) += xsize_t(st.st_blocks);
+#endif
+ 		}
+ 		if (bad) {
+ 			if (verbose) {
+diff --git a/git-compat-util.h b/git-compat-util.h
+index 167c3fe..def08dc 100644
+--- a/git-compat-util.h
+++ b/git-compat-util.h
+@@ -469,4 +469,8 @@ void git_qsort(void *base, size_t nmemb, size_t size,
+ # define FORCE_DIR_SET_GID 0
+ #endif
+ 
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+ #endif
+diff --git a/templates/Makefile b/templates/Makefile
+index bda9d13..e56682f 100644
+--- a/templates/Makefile
+++ b/templates/Makefile
+@@ -23,7 +23,7 @@ all: boilerplates.made custom
+ 
+ bpsrc = $(filter-out %~,$(wildcard *--*))
+ boilerplates.made : $(bpsrc)
+-	$(QUIET)ls *--* 2>/dev/null | \
+	$(QUIET)ls -1 *--* 2>/dev/null | \
+ 	while read boilerplate; \
+ 	do \
+ 		case "$$boilerplate" in *~) continue ;; esac && \
--- a/dev-util/subversion/subversion-1.4.x.diff
+++ b/dev-util/subversion/subversion-1.4.x.diff
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 30382)
+++ configure.in	(working copy)
+@@ -184,7 +184,7 @@
+ dnl So we only turn it on for platforms where we know we really need it.
+ AC_MSG_CHECKING([whether libtool needs -no-undefined])
+ case $host in
+-  *-*-cygwin*)
+  *-*-cygwin* | *-*-beos* | *-*-haiku*)
+     AC_MSG_RESULT([yes])
+     LT_NO_UNDEFINED="-no-undefined"
+     ;;
--- a/dev-util/treecc/treecc-CVS.diff
+++ b/dev-util/treecc/treecc-CVS.diff
@@ -0,0 +1,35 @@
+? ylwrap
+Index: Makefile.am
+===================================================================
+RCS file: /sources/dotgnu-pnet/treecc/Makefile.am,v
+retrieving revision 1.12
+diff -u -p -r1.12 Makefile.am
+--- Makefile.am	4 Jun 2007 10:14:29 -0000	1.12
+++ Makefile.am	26 Apr 2008 19:49:11 -0000
+@@ -47,8 +47,8 @@ SKELETON_FILES = $(top_srcdir)/etc/c_ske
+ 				 $(top_srcdir)/etc/cpp_gc_skel.h \
+ 				 $(top_srcdir)/etc/cpp_gc_skel.cc
+ 
+-skels.c: $(SKELETON_FILES) mkskel-sh
+-	$(SHELL) mkskel-sh $(SKELETON_FILES) >skels.c
+skels.c: $(SKELETON_FILES) $(top_srcdir)/mkskel-sh
+	$(SHELL) $(top_srcdir)/mkskel-sh $(SKELETON_FILES) >skels.c
+ 
+ CLEANFILES = skels.c
+ 
+Index: configure.in
+===================================================================
+RCS file: /sources/dotgnu-pnet/treecc/configure.in,v
+retrieving revision 1.52
+diff -u -p -r1.52 configure.in
+--- configure.in	4 Jun 2007 18:45:48 -0000	1.52
+++ configure.in	26 Apr 2008 19:49:11 -0000
+@@ -23,7 +23,7 @@ AC_MSG_RESULT($platform_win32)
+ 
+ AC_MSG_CHECKING([if building for BeOS platform])
+ case "$host" in
+-	*-*-beos*)
+	*-*-beos*|*-*-haiku*)
+ 		platform_beos=yes
+ 		LDADD=""
+ 		;;
--- a/media-libs/guilib/GUIlib-1.2.1-haiku.diff
+++ b/media-libs/guilib/GUIlib-1.2.1-haiku.diff
@@ -0,0 +1,79 @@
+diff -ur GUIlib-1.2.1/acinclude.m4 GUIlib-1.2.1-haiku/acinclude.m4
+--- GUIlib-1.2.1/acinclude.m4	2006-05-01 07:39:58.000000000 +0000
+++ GUIlib-1.2.1-haiku/acinclude.m4	2008-06-24 09:01:16.000000000 +0000
+@@ -910,10 +910,10 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     # On BeOS, this test takes a really really long time.
+     # So we just punt and use a minimum line length of 8192.
+-    lt_cv_sys_max_cmd_len=8192;
+    lt_cv_sys_max_cmd_len=4096;
+     ;;
+ 
+   amigaos*)
+@@ -1470,7 +1470,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2469,7 +2469,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2687,7 +2687,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3178,7 +3178,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -5032,7 +5032,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+@@ -5305,7 +5305,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -5672,7 +5672,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
--- a/media-libs/jbigkit/jbigkit-1.6.bep
+++ b/media-libs/jbigkit/jbigkit-1.6.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="JBIG-KIT" 
+HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" 
+SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-1.6.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd jbigkit
+	make
+}
+
+INSTALL {
+	cd jbigkit
+	make test
+}
--- a/media-libs/jpeg/jpeg-6b-haiku.diff
+++ b/media-libs/jpeg/jpeg-6b-haiku.diff
@@ -0,0 +1,403 @@
+diff -urN jpeg-6b/configure.in jpeg-6b-haiku/configure.in
+--- jpeg-6b/configure.in	1970-01-01 00:00:00.000000000 +0000
+++ jpeg-6b-haiku/configure.in	2008-07-15 10:48:15.000000000 +0000
+@@ -0,0 +1,346 @@
+dnl IJG auto-configuration source file.
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(jcmaster.c)
+AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
+dnl
+dnl do these first since other macros rely on them
+AC_PROG_CC
+AC_PROG_CPP
+dnl
+dnl See if compiler supports prototypes.
+AC_MSG_CHECKING(for function prototypes)
+AC_CACHE_VAL(ijg_cv_have_prototypes,
+[AC_TRY_COMPILE([
+int testfunction (int arg1, int * arg2); /* check prototypes */
+struct methods_struct {		/* check method-pointer declarations */
+  int (*error_exit) (char *msgtext);
+  int (*trace_message) (char *msgtext);
+  int (*another_method) (void);
+};
+int testfunction (int arg1, int * arg2) /* check definitions */
+{ return arg2[arg1]; }
+int test2function (void)	/* check void arg list */
+{ return 0; }
+], [ ], ijg_cv_have_prototypes=yes, ijg_cv_have_prototypes=no)])
+AC_MSG_RESULT($ijg_cv_have_prototypes)
+if test $ijg_cv_have_prototypes = yes; then
+  AC_DEFINE(HAVE_PROTOTYPES,1)
+else
+  echo Your compiler does not seem to know about function prototypes.
+  echo Perhaps it needs a special switch to enable ANSI C mode.
+  echo If so, we recommend running configure like this:
+  echo "   ./configure  CC='cc -switch'"
+  echo where -switch is the proper switch.
+fi
+dnl
+dnl check header files
+AC_CHECK_HEADER(stddef.h, AC_DEFINE(HAVE_STDDEF_H,1))
+AC_CHECK_HEADER(stdlib.h, AC_DEFINE(HAVE_STDLIB_H,1))
+AC_CHECK_HEADER(string.h,, AC_DEFINE(NEED_BSD_STRINGS,1))
+dnl See whether type size_t is defined in any ANSI-standard places;
+dnl if not, perhaps it is defined in <sys/types.h>.
+AC_MSG_CHECKING(for size_t)
+AC_TRY_COMPILE([
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <stdio.h>
+#ifdef NEED_BSD_STRINGS
+#include <strings.h>
+#else
+#include <string.h>
+#endif
+typedef size_t my_size_t;
+], [ my_size_t foovar; ], ijg_size_t_ok=yes,
+[ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"])
+AC_MSG_RESULT($ijg_size_t_ok)
+if test "$ijg_size_t_ok" != yes; then
+AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(NEED_SYS_TYPES_H,1)
+AC_EGREP_CPP(size_t, [#include <sys/types.h>],
+[ijg_size_t_ok="size_t is in sys/types.h"], ijg_size_t_ok=no)],
+ijg_size_t_ok=no)
+AC_MSG_RESULT($ijg_size_t_ok)
+if test "$ijg_size_t_ok" = no; then
+  echo Type size_t is not defined in any of the usual places.
+  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
+fi
+fi
+dnl
+dnl check compiler characteristics
+AC_MSG_CHECKING(for type unsigned char)
+AC_TRY_COMPILE(, [ unsigned char un_char; ],
+[AC_MSG_RESULT(yes)
+AC_DEFINE(HAVE_UNSIGNED_CHAR,1)], AC_MSG_RESULT(no))
+AC_MSG_CHECKING(for type unsigned short)
+AC_TRY_COMPILE(, [ unsigned short un_short; ],
+[AC_MSG_RESULT(yes)
+AC_DEFINE(HAVE_UNSIGNED_SHORT,1)], AC_MSG_RESULT(no))
+AC_MSG_CHECKING(for type void)
+AC_TRY_COMPILE([
+/* Caution: a C++ compiler will insist on valid prototypes */
+typedef void * void_ptr;	/* check void * */
+#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
+typedef void (*void_func) (int a, int b);
+#else
+typedef void (*void_func) ();
+#endif
+
+#ifdef HAVE_PROTOTYPES		/* check void function result */
+void test3function (void_ptr arg1, void_func arg2)
+#else
+void test3function (arg1, arg2)
+     void_ptr arg1;
+     void_func arg2;
+#endif
+{
+  char * locptr = (char *) arg1; /* check casting to and from void * */
+  arg1 = (void *) locptr;
+  (*arg2) (1, 2);		/* check call of fcn returning void */
+}
+], [ ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
+AC_DEFINE(void,char)])
+
+AC_C_CONST
+dnl check for non-broken inline under various spellings
+AC_MSG_CHECKING(for inline)
+ijg_cv_inline=""
+AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
+int bar() { return foo();], ijg_cv_inline="__inline__",
+AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
+int bar() { return foo();], ijg_cv_inline="__inline",
+AC_TRY_COMPILE(, [} inline int foo() { return 0; }
+int bar() { return foo();], ijg_cv_inline="inline")))
+AC_MSG_RESULT($ijg_cv_inline)
+AC_DEFINE_UNQUOTED(INLINE,$ijg_cv_inline)
+dnl we cannot check for bogus warnings, but at least we can check for errors
+AC_MSG_CHECKING(for broken incomplete types)
+AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
+AC_MSG_RESULT(ok),
+[AC_MSG_RESULT(broken)
+AC_DEFINE(INCOMPLETE_TYPES_BROKEN,1)])
+dnl test whether global names are unique to at least 15 chars
+AC_MSG_CHECKING(for short external names)
+AC_TRY_LINK([
+int possibly_duplicate_function () { return 0; }
+int possibly_dupli_function () { return 1; }
+], [ ], AC_MSG_RESULT(ok), [AC_MSG_RESULT(short)
+AC_DEFINE(NEED_SHORT_EXTERNAL_NAMES,1)])
+dnl
+dnl run-time checks
+AC_MSG_CHECKING(to see if char is signed)
+AC_TRY_RUN([
+#ifdef HAVE_PROTOTYPES
+int is_char_signed (int arg)
+#else
+int is_char_signed (arg)
+     int arg;
+#endif
+{
+  if (arg == 189) {		/* expected result for unsigned char */
+    return 0;			/* type char is unsigned */
+  }
+  else if (arg != -67) {	/* expected result for signed char */
+    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
+    printf("I fear the JPEG software will not work at all.\n\n");
+  }
+  return 1;			/* assume char is signed otherwise */
+}
+char signed_char_check = (char) (-67);
+int main() {
+  exit(is_char_signed((int) signed_char_check));
+}], [AC_MSG_RESULT(no)
+AC_DEFINE(CHAR_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
+[echo Assuming that char is signed on target machine.
+echo If it is unsigned, this will be a little bit inefficient.
+])
+dnl
+AC_MSG_CHECKING(to see if right shift is signed)
+AC_TRY_RUN([
+#ifdef HAVE_PROTOTYPES
+int is_shifting_signed (long arg)
+#else
+int is_shifting_signed (arg)
+     long arg;
+#endif
+/* See whether right-shift on a long is signed or not. */
+{
+  long res = arg >> 4;
+
+  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
+    return 1;			/* right shift is signed */
+  }
+  /* see if unsigned-shift hack will fix it. */
+  /* we can't just test exact value since it depends on width of long... */
+  res |= (~0L) << (32-4);
+  if (res == -0x7F7E80CL) {	/* expected result now? */
+    return 0;			/* right shift is unsigned */
+  }
+  printf("Right shift isn't acting as I expect it to.\n");
+  printf("I fear the JPEG software will not work at all.\n\n");
+  return 0;			/* try it with unsigned anyway */
+}
+int main() {
+  exit(is_shifting_signed(-0x7F7E80B1L));
+}], [AC_MSG_RESULT(no)
+AC_DEFINE(RIGHT_SHIFT_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
+AC_MSG_RESULT(Assuming that right shift is signed on target machine.))
+dnl
+AC_MSG_CHECKING(to see if fopen accepts b spec)
+AC_TRY_RUN([
+#include <stdio.h>
+int main() {
+  if (fopen("conftestdata", "wb") != NULL)
+    exit(0);
+  exit(1);
+}], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
+AC_DEFINE(DONT_USE_B_MODE,1)],
+AC_MSG_RESULT(Assuming that it does.))
+dnl
+dnl system services
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+# Decide whether to use libtool,
+# and if so whether to build shared, static, or both flavors of library.
+AC_DISABLE_SHARED
+AC_DISABLE_STATIC
+if test "x$enable_shared" != xno  -o  "x$enable_static" != xno; then
+  USELIBTOOL="yes"
+
+  # Configure libtool.
+  AC_PROG_LIBTOOL
+
+  LIBTOOL="./libtool"
+  O="lo"
+  A="la"
+  LN='$(LIBTOOL) --mode=link $(CC)'
+  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
+  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
+else
+  USELIBTOOL="no"
+  LIBTOOL=""
+  O="o"
+  A="a"
+  LN='$(CC)'
+  INSTALL_LIB="$INSTALL_DATA"
+fi
+AC_SUBST(LIBTOOL)
+AC_SUBST(O)
+AC_SUBST(A)
+AC_SUBST(LN)
+AC_SUBST(INSTALL_LIB)
+
+# Select memory manager depending on user input.
+# If no "-enable-maxmem", use jmemnobs
+MEMORYMGR='jmemnobs.$(O)'
+MAXMEM="no"
+AC_ARG_ENABLE(maxmem,
+[  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB],
+MAXMEM="$enableval")
+dnl [# support --with-maxmem for backwards compatibility with IJG V5.]
+dnl AC_ARG_WITH(maxmem, , MAXMEM="$withval")
+if test "x$MAXMEM" = xyes; then
+  MAXMEM=1
+fi
+if test "x$MAXMEM" != xno; then
+changequote(, )dnl
+  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
+changequote([, ])dnl
+    AC_MSG_ERROR(non-numeric argument to --enable-maxmem)
+  fi
+  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
+AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM, ${DEFAULTMAXMEM})
+AC_MSG_CHECKING([for 'tmpfile()'])
+AC_TRY_LINK([#include <stdio.h>], [ FILE * tfile = tmpfile(); ],
+[AC_MSG_RESULT(yes)
+MEMORYMGR='jmemansi.$(O)'],
+[AC_MSG_RESULT(no)
+dnl if tmpfile is not present, must use jmemname.
+MEMORYMGR='jmemname.$(O)'
+AC_DEFINE(NEED_SIGNAL_CATCHER,1)
+AC_MSG_CHECKING([for 'mktemp()'])
+AC_TRY_LINK(, [ char fname[80]; mktemp(fname); ], AC_MSG_RESULT(yes),
+[AC_MSG_RESULT(no)
+AC_DEFINE(NO_MKTEMP,1)])])
+fi
+AC_SUBST(MEMORYMGR)
+
+# Include PNG support in cjpeg/djpeg if appropriate.
+AC_ARG_WITH(png,
+[  --with-png              enable PNG support in cjpeg/djpeg],
+[#], [with_png="maybe"])
+
+# try to detect whether libpng is present
+if test "x$with_png" = xmaybe ; then
+  AC_CHECK_HEADER(png.h, [: ok so far], [with_png="no"])
+fi
+if test "x$with_png" = xmaybe ; then
+  AC_CHECK_HEADER(zlib.h, [: ok so far], [with_png="no"])
+fi
+if test "x$with_png" = xmaybe ; then
+  AC_CHECK_LIB(z, deflate, [: ok so far], [with_png="no"])
+fi
+if test "x$with_png" = xmaybe ; then
+  AC_CHECK_LIB(png, png_create_info_struct,
+	[with_png="yes"], [with_png="no"], [-lz -lm])
+fi
+
+if test "x$with_png" = xyes ; then
+  AC_DEFINE(PNG_SUPPORTED,1)
+  LIBS="-lpng -lz -lm $LIBS"
+fi
+
+# Extract the library version ID from jpeglib.h.
+AC_MSG_CHECKING([libjpeg version number])
+[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
+AC_MSG_RESULT($JPEG_LIB_VERSION)
+AC_SUBST(JPEG_LIB_VERSION)
+
+# Prepare to massage makefile.cfg correctly.
+if test $ijg_cv_have_prototypes = yes; then
+  A2K_DEPS=""
+  COM_A2K="# "
+else
+  A2K_DEPS="ansi2knr"
+  COM_A2K=""
+fi
+AC_SUBST(A2K_DEPS)
+AC_SUBST(COM_A2K)
+# ansi2knr needs -DBSD if string.h is missing
+if test $ac_cv_header_string_h = no; then
+  ANSI2KNRFLAGS="-DBSD"
+else
+  ANSI2KNRFLAGS=""
+fi
+AC_SUBST(ANSI2KNRFLAGS)
+dnl
+# Substitutions to enable or disable libtool-related stuff
+if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
+  COM_LT=""
+else
+  COM_LT="# "
+fi
+AC_SUBST(COM_LT)
+if test "x$enable_shared" != xno; then
+  FORCE_INSTALL_LIB="install-lib"
+else
+  FORCE_INSTALL_LIB=""
+fi
+AC_SUBST(FORCE_INSTALL_LIB)
+dnl
+# Set up -I directives
+if test "x$srcdir" = x.; then
+  INCLUDEFLAGS='-I$(srcdir)'
+else
+  if test "x$GCC" = xyes; then
+    INCLUDEFLAGS='-I- -I. -I$(srcdir)'
+  else
+    INCLUDEFLAGS='-I. -I$(srcdir)'
+  fi
+fi
+AC_SUBST(INCLUDEFLAGS)
+dnl
+AC_OUTPUT(Makefile:makefile.cfg)
+diff -urN jpeg-6b/makefile.cfg jpeg-6b-haiku/makefile.cfg
+--- jpeg-6b/makefile.cfg	1998-03-21 19:08:57.000000000 +0000
+++ jpeg-6b-haiku/makefile.cfg	2008-07-15 10:48:18.000000000 +0000
+@@ -17,7 +17,7 @@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
+mandir = @mandir@/man$(manext)
+ 
+ # The name of your C compiler:
+ CC= @CC@
+@@ -191,25 +191,25 @@
+ # Installation rules:
+ 
+ install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
+-	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
+-	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
+-	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
+-	$(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
+-	$(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
+-	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
+	$(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
+	$(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
+	$(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
+	$(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
+	$(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
+	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
+	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
+	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
+	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
+	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
+ 
+ install-lib: libjpeg.$(A) install-headers
+-	$(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
+	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
+ 
+ install-headers: jconfig.h
+-	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
+-	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
+-	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
+-	$(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
+	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
+	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
+	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
+	$(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
+ 
+ clean:
+ 	$(RM) *.o *.lo libjpeg.a libjpeg.la
--- a/media-libs/jpeg/jpeg-6b.bep
+++ b/media-libs/jpeg/jpeg-6b.bep
@@ -0,0 +1,22 @@
+DESCRIPTION="jpeg" 
+HOMEPAGE="http://www.ijg.org" 
+SRC_URI="http://www.ijg.org/files/jpegsrc.v6b.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd jpeg-6b
+	aclocal
+        libtoolize --force --copy
+        automake --add-missing
+        autoconf
+        ./configure --prefix=/boot/common --enable-shared
+        make 
+}
+
+INSTALL {
+	cd jpeg-6b
+	make install
+}
--- a/media-libs/libogg/libogg-1.1.3-haiku.diff
+++ b/media-libs/libogg/libogg-1.1.3-haiku.diff
@@ -0,0 +1,88 @@
+diff -ur libogg-1.1.3/configure.in libogg-1.1.3-haiku/configure.in
+--- libogg-1.1.3/configure.in	2005-11-28 04:26:07.000000000 +0000
+++ libogg-1.1.3-haiku/configure.in	2008-05-30 11:00:35.000000000 +0000
+@@ -84,7 +84,7 @@
+ AC_MSG_CHECKING(for int16_t)
+ AC_CACHE_VAL(has_int16_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -100,7 +100,7 @@
+ AC_MSG_CHECKING(for int32_t)
+ AC_CACHE_VAL(has_int32_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -116,7 +116,7 @@
+ AC_MSG_CHECKING(for uint32_t)
+ AC_CACHE_VAL(has_uint32_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -132,7 +132,7 @@
+ AC_MSG_CHECKING(for uint16_t)
+ AC_CACHE_VAL(has_uint16_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -148,7 +148,7 @@
+ AC_MSG_CHECKING(for u_int32_t)
+ AC_CACHE_VAL(has_u_int32_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -164,7 +164,7 @@
+ AC_MSG_CHECKING(for u_int16_t)
+ AC_CACHE_VAL(has_u_int16_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+@@ -180,7 +180,7 @@
+ AC_MSG_CHECKING(for int64_t)
+ AC_CACHE_VAL(has_int64_t,
+ [AC_TRY_RUN([
+-#ifdef __BEOS__
+#if defined __BEOS__ && !defined __HAIKU__
+ #include <inttypes.h>
+ #endif
+ #include <sys/types.h>
+diff -ur libogg-1.1.3/include/ogg/os_types.h libogg-1.1.3-haiku/include/ogg/os_types.h
+--- libogg-1.1.3/include/ogg/os_types.h	2005-11-28 04:26:05.000000000 +0000
+++ libogg-1.1.3-haiku/include/ogg/os_types.h	2008-05-30 12:50:50.000000000 +0000
+@@ -73,7 +73,17 @@
+    typedef u_int32_t ogg_uint32_t;
+    typedef int64_t ogg_int64_t;
+ 
+-#elif defined(__BEOS__)
+#elif defined(__HAIKU__)
+
+  /* Haiku */
+#  include <sys/types.h>
+   typedef short ogg_int16_t;
+   typedef unsigned short ogg_uint16_t;
+   typedef int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef long long ogg_int64_t;   
+
+#elif defined(__BEOS__) 
+ 
+    /* Be */
+ #  include <inttypes.h>
--- a/media-libs/libogg/libogg-1.1.3.bep
+++ b/media-libs/libogg/libogg-1.1.3.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="libogg" 
+HOMEPAGE="http://www.xiph.org" 
+SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libogg-1.1.3
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd libogg-1.1.3
+	make install
+}
--- a/media-libs/libpng/libpng-1.2.29-haiku.diff
+++ b/media-libs/libpng/libpng-1.2.29-haiku.diff
@@ -0,0 +1,160 @@
+diff -ur libpng-1.2.29/aclocal.m4 libpng-1.2.29-haiku/aclocal.m4
+--- libpng-1.2.29/aclocal.m4	2008-05-08 11:58:29.000000000 +0000
+++ libpng-1.2.29-haiku/aclocal.m4	2008-05-26 08:54:27.000000000 +0000
+@@ -1741,7 +1741,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+@@ -2188,7 +2188,7 @@
+   esac
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2986,7 +2986,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -3257,7 +3257,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3569,7 +3569,7 @@
+       esac
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | cygwin* | os2* | pw32*)
+@@ -3867,7 +3867,7 @@
+       esac
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -4285,7 +4285,7 @@
+       esac
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -5570,7 +5570,7 @@
+         fi
+         ;;
+ 
+-      beos*)
+      beos* | haiku*)
+ 	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+diff -ur libpng-1.2.29/config.guess libpng-1.2.29-haiku/config.guess
+--- libpng-1.2.29/config.guess	2008-05-02 03:50:32.000000000 +0000
+++ libpng-1.2.29-haiku/config.guess	2008-05-25 16:59:19.000000000 +0000
+@@ -1216,6 +1216,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+diff -ur libpng-1.2.29/configure libpng-1.2.29-haiku/configure
+--- libpng-1.2.29/configure	2008-05-08 11:58:30.000000000 +0000
+++ libpng-1.2.29-haiku/configure	2008-05-26 09:00:00.000000000 +0000
+@@ -5423,7 +5423,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -7761,7 +7761,7 @@
+       esac
+       ;;
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -8357,7 +8357,7 @@
+       esac
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -9684,7 +9684,7 @@
+   esac
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -10378,7 +10378,7 @@
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+-  beos*)
+  beos* | haiku*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+diff -ur libpng-1.2.29/ltmain.sh libpng-1.2.29-haiku/ltmain.sh
+--- libpng-1.2.29/ltmain.sh	2008-05-02 03:51:25.000000000 +0000
+++ libpng-1.2.29-haiku/ltmain.sh	2008-05-26 09:02:08.000000000 +0000
+@@ -3995,7 +3995,7 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -5951,7 +5951,7 @@
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
--- a/media-libs/libpng/libpng-1.2.29.bep
+++ b/media-libs/libpng/libpng-1.2.29.bep
@@ -0,0 +1,19 @@
+DESCRIPTION="libpng" 
+HOMEPAGE="http://www.libpng.org" 
+SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libpng-1.2.29
+	./autogen.sh
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libpng-1.2.29
+	make install
+}
--- a/media-libs/libsdl/SDL-1.2.13-haiku.diff
+++ b/media-libs/libsdl/SDL-1.2.13-haiku.diff
--- a/media-libs/libsdl/libsdl-1.2.12.bep
+++ b/media-libs/libsdl/libsdl-1.2.12.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="Simple Direct Media Layer" 
+HOMEPAGE="http://www.libsdl.org/" 
+SRC_URI="http://www.libsdl.org/release/SDL-1.2.12.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="untested"
+DEPEND=""
+BUILD {
+	cd SDL-1.2.12
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd SDL-1.2.12
+	make install
+}
--- a/media-libs/libsdl/libsdl-1.2.13.bep
+++ b/media-libs/libsdl/libsdl-1.2.13.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="Simple Direct Media Layer" 
+HOMEPAGE="http://www.libsdl.org/" 
+SRC_URI="http://www.libsdl.org/release/SDL-1.2.13.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd SDL-1.2.13
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd SDL-1.2.13
+	make install
+}
--- a/media-libs/libvorbis/libvorbis-1.2.0-haiku.diff
+++ b/media-libs/libvorbis/libvorbis-1.2.0-haiku.diff
@@ -0,0 +1,48 @@
+diff -urN libvorbis-1.2.0/aclocal.m4 libvorbis-1.2.0-haiku/aclocal.m4
+--- libvorbis-1.2.0/aclocal.m4	2007-07-25 16:46:33.000000000 +0000
+++ libvorbis-1.2.0-haiku/aclocal.m4	2008-07-14 09:15:18.000000000 +0000
+@@ -1291,7 +1291,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2276,7 +2276,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2492,7 +2492,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -4825,7 +4825,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+@@ -5098,7 +5098,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
--- a/media-libs/sdl-image/SDL_image-1.2.6-haiku.diff
+++ b/media-libs/sdl-image/SDL_image-1.2.6-haiku.diff
@@ -0,0 +1,79 @@
+diff -urN SDL_image-1.2.6/acinclude/libtool.m4 SDL_image-1.2.6-haiku/acinclude/libtool.m4
+--- SDL_image-1.2.6/acinclude/libtool.m4	2007-07-13 03:38:28.000000000 +0000
+++ SDL_image-1.2.6-haiku/acinclude/libtool.m4	2008-06-30 09:50:10.000000000 +0000
+@@ -734,6 +734,12 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+  haiku*)
+    # On Haiku, this test takes a really really long time.
+    # Haiku has a maximum line length of 4096 for now.
+    lt_cv_sys_max_cmd_len=4096;
+    ;;
+
+   amigaos*)
+     # On AmigaOS with pdksh, this test takes hours, literally.
+     # So we just punt and use a minimum line length of 8192.
+@@ -1288,7 +1294,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2287,7 +2293,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2505,7 +2511,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -2996,7 +3002,7 @@
+     fi
+     ;;
+ 
+-  beos*)
+  beos* | haiku*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+@@ -4850,7 +4856,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+@@ -5123,7 +5129,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+@@ -5490,7 +5496,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    beos*)
+    beos* | haiku*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
--- a/media-libs/sdl-image/sdl-image-1.2.6.bep
+++ b/media-libs/sdl-image/sdl-image-1.2.6.bep
@@ -0,0 +1,25 @@
+DESCRIPTION="Simple Direct Media Layer Image Library" 
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image" 
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="untested"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd sdl-image-1.2.6
+	cat acinclude/libtool.m4 >> aclocal.m4
+	cat acinclude/sdl.m4 >> aclocal.m4
+	aclocal
+	libtoolize --copy --force
+	aclocal
+	autoconf
+	./autogen.sh
+	./configure --prefix=/boot/common LDFLAGS=-L/boot/common/lib CPPFLAGS=-I/boot/common/include
+	make
+}
+
+INSTALL {
+	cd sdl-image-1.2.6
+	make install
+}
--- a/media-libs/sdl-net/SDL_net-1.2.7-haiku.diff
+++ b/media-libs/sdl-net/SDL_net-1.2.7-haiku.diff
@@ -0,0 +1,61 @@
+diff -urN SDL_net-1.2.7/acinclude/libtool.m4 SDL_net-1.2.7-haiku/acinclude/libtool.m4
+--- SDL_net-1.2.7/acinclude/libtool.m4	2007-07-15 01:34:07.000000000 +0000
+++ SDL_net-1.2.7-haiku/acinclude/libtool.m4	2008-07-10 23:46:27.000000000 +0000
+@@ -1288,7 +1288,7 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+@@ -2287,7 +2287,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-beos*)
+beos* | haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2505,7 +2505,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -4850,7 +4850,7 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+@@ -5123,7 +5123,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+diff -urN SDL_net-1.2.7/configure.in SDL_net-1.2.7-haiku/configure.in
+--- SDL_net-1.2.7/configure.in	2007-07-20 12:40:02.000000000 +0000
+++ SDL_net-1.2.7-haiku/configure.in	2008-07-10 23:48:29.000000000 +0000
+@@ -92,6 +92,9 @@
+     *-*-beos*)
+         INETLIB=""
+         ;;
+    *-*-haiku*)
+        INETLIB="-lnetwork"
+        ;;
+     *)
+         INETLIB=""
+         ;;
--- a/net-libs/libxml2/libxml2-trunk.diff
+++ b/net-libs/libxml2/libxml2-trunk.diff
@@ -0,0 +1,35 @@
+Index: nanohttp.c
+===================================================================
+--- nanohttp.c	(revision 3738)
+++ nanohttp.c	(working copy)
+@@ -95,7 +95,7 @@
+  * A couple portability macros
+  */
+ #ifndef _WINSOCKAPI_
+-#ifndef __BEOS__
+#if !defined(__BEOS__) || defined(__HAIKU__)
+ #define closesocket(s) close(s)
+ #endif
+ #define SOCKET int
+@@ -844,7 +844,7 @@
+ 	status = ioctl(s, FIONBIO, &enable);
+     }
+ #else /* VMS */
+-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
+ 	{
+ 		bool noblock = true;
+ 		status = setsockopt(s, SOL_SOCKET, SO_NONBLOCK, &noblock, sizeof(noblock));
+Index: nanoftp.c
+===================================================================
+--- nanoftp.c	(revision 3738)
+++ nanoftp.c	(working copy)
+@@ -89,7 +89,7 @@
+  * A couple portability macros
+  */
+ #ifndef _WINSOCKAPI_
+-#ifndef __BEOS__
+#if !defined(__BEOS__) || defined(__HAIKU__)
+ #define closesocket(s) close(s)
+ #endif
+ #define SOCKET int
--- a/net-misc/curl/curl-7.18.1.diff
+++ b/net-misc/curl/curl-7.18.1.diff
@@ -0,0 +1,16 @@
+--- curl-7.18.1/lib/select.c	2008-03-08 22:11:11.000000000 +0000
+++ curl-7.18.1.patched/lib/select.c	2008-04-19 15:28:49.000000000 +0000
+@@ -35,9 +35,13 @@
+ #endif
+ 
+ #ifdef __BEOS__
+#ifdef __HAIKU__
+#include <sys/socket.h>
+#else
+ /* BeOS has FD_SET defined in socket.h */
+ #include <socket.h>
+ #endif
+#endif
+ 
+ #ifdef MSDOS
+ #include <dos.h>  /* delay() */
--- a/net-misc/neon/neon-0.25.4.diff
+++ b/net-misc/neon/neon-0.25.4.diff
@@ -0,0 +1,73 @@
+diff -ur neon-0.25.4-orig/src/ne_openssl.c neon-0.25.4/src/ne_openssl.c
+--- neon-0.25.4-orig/src/ne_openssl.c	2005-06-01 09:19:15.000000000 +0000
+++ neon-0.25.4/src/ne_openssl.c	2008-05-18 03:09:40.000000000 +0000
+@@ -196,8 +196,12 @@
+     
+     bio = BIO_new(BIO_s_mem());
+     if (bio) {
+-	if (ASN1_TIME_print(bio, tm))
+-	    BIO_read(bio, buf, NE_SSL_VDATELEN-1);
+	if (ASN1_TIME_print(bio, tm)) {
+	    int len = BIO_read(bio, buf, NE_SSL_VDATELEN-1);
+	    if (len >= 0)
+	    	buf[len] = '\0';
+	    
+	}
+ 	BIO_free(bio);
+     }
+ }
+diff -ur neon-0.25.4-orig/src/ne_socket.c neon-0.25.4/src/ne_socket.c
+--- neon-0.25.4-orig/src/ne_socket.c	2005-08-19 09:40:16.000000000 +0000
+++ neon-0.25.4/src/ne_socket.c	2008-05-18 03:09:40.000000000 +0000
+@@ -136,7 +136,7 @@
+ #include "ne_alloc.h"
+ #include "ne_sspi.h"
+ 
+-#if defined(__BEOS__) && !defined(BONE_VERSION)
+#if defined(__BEOS__) && !defined(BONE_VERSION) && !defined(__HAIKU__)
+ /* pre-BONE */
+ #define ne_close(s) closesocket(s)
+ #define ne_errno errno
+diff -ur neon-0.25.4-orig/test/common/child.c neon-0.25.4/test/common/child.c
+--- neon-0.25.4-orig/test/common/child.c	2005-02-14 15:43:27.000000000 +0000
+++ neon-0.25.4/test/common/child.c	2008-05-18 03:09:40.000000000 +0000
+@@ -230,11 +230,12 @@
+ 	char ch;
+ 	
+ #ifdef USE_PIPE
+	close(fds[1]);
+
+ 	if (read(fds[0], &ch, 1) < 0)
+ 	    perror("parent read");
+ 
+ 	close(fds[0]);
+-	close(fds[1]);
+ #else
+ 	minisleep();
+ #endif
+diff -ur neon-0.25.4-orig/test/common/tests.c neon-0.25.4/test/common/tests.c
+--- neon-0.25.4-orig/test/common/tests.c	2005-02-14 15:43:27.000000000 +0000
+++ neon-0.25.4/test/common/tests.c	2008-05-18 03:09:40.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#include <sys/signal.h>
+//#include <sys/signal.h>
+ 
+ #include <stdio.h>
+ #ifdef HAVE_SIGNAL_H
+diff -ur neon-0.25.4-orig/test/run.sh neon-0.25.4/test/run.sh
+--- neon-0.25.4-orig/test/run.sh	2004-10-17 18:18:20.000000000 +0000
+++ neon-0.25.4/test/run.sh	2008-05-18 03:09:40.000000000 +0000
+@@ -2,8 +2,8 @@
+ 
+ rm -f debug.log child.log
+ 
+-ulimit -c unlimited
+-ulimit -v 10240
+#ulimit -c unlimited
+#ulimit -v 10240
+ 
+ # enable an safety-checking malloc in glibc which will abort() if
+ # heap corruption is detected.
--- a/net-misc/wput/wput-0.6.1-haiku.diff
+++ b/net-misc/wput/wput-0.6.1-haiku.diff
@@ -0,0 +1,72 @@
+diff -urN wput-0.6.1/Makefile.in wput-0.6.1-haiku/Makefile.in
+--- wput-0.6.1/Makefile.in	2007-12-12 17:30:04.000000000 +0000
+++ wput-0.6.1-haiku/Makefile.in	2008-07-01 13:44:33.000000000 +0000
+@@ -16,8 +16,10 @@
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(mandir)
+	install -m0755 wput $(DESTDIR)$(bindir)
+	install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir)
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
+diff -urN wput-0.6.1/configure.in wput-0.6.1-haiku/configure.in
+--- wput-0.6.1/configure.in	2007-12-12 17:30:04.000000000 +0000
+++ wput-0.6.1-haiku/configure.in	2008-07-01 10:53:25.000000000 +0000
+@@ -171,6 +171,7 @@
+     LIBS="-lsocket $LIBS";;
+ SCO*)      CC=${CC-"cc -belf"}
+            LIBS="-lsocket $LIBS";;
+Haiku*)    LIBS="-lnetwork $LIBS";;
+ esac
+ AC_CONFIG_HEADER(src/config.h)
+ AC_SUBST(GETOPT)
+diff -urN wput-0.6.1/src/progress.c wput-0.6.1-haiku/src/progress.c
+--- wput-0.6.1/src/progress.c	2007-12-12 17:30:04.000000000 +0000
+++ wput-0.6.1-haiku/src/progress.c	2008-07-01 13:39:16.000000000 +0000
+@@ -219,14 +219,16 @@
+ 	unsigned short int terminal_width = 80;
+ 
+ int get_term_width(void) {
+	int termwidth = 80;
+#ifndef __HAIKU__
+ 	struct winsize win;
+ 	char * p;
+-	int termwidth = 80;
+ 	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == -1 || !win.ws_col) {
+         	if ((p = getenv("COLUMNS")) != NULL)
+ 			termwidth = atoi(p);
+     	} else
+         	termwidth = win.ws_col;
+#endif
+ 	return termwidth;
+ }
+ 
+diff -urN wput-0.6.1/src/socketlib.c wput-0.6.1-haiku/src/socketlib.c
+--- wput-0.6.1/src/socketlib.c	2007-12-12 17:30:04.000000000 +0000
+++ wput-0.6.1-haiku/src/socketlib.c	2008-07-01 10:42:33.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #ifndef WIN32
+ #include <netdb.h>
+-#include <sys/errno.h>
+#include <errno.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #endif
+diff -urN wput-0.6.1/src/wput.h wput-0.6.1-haiku/src/wput.h
+--- wput-0.6.1/src/wput.h	2007-12-12 17:30:04.000000000 +0000
+++ wput-0.6.1-haiku/src/wput.h	2008-07-01 10:42:16.000000000 +0000
+@@ -18,7 +18,7 @@
+ 
+ #  include <sys/uio.h>
+ #  include <strings.h>
+-#  include <sys/errno.h>
+#  include <errno.h>
+ #  include <pwd.h>
+ 
+ #  define WINCONV
--- a/sys-devel/gettext/gettext-CVS.diff
+++ b/sys-devel/gettext/gettext-CVS.diff
@@ -0,0 +1,33 @@
+? gettext-runtime/libasprintf/autom4te.cache
+Index: gettext-runtime/libasprintf/configure.ac
+===================================================================
+RCS file: /sources/gettext/gettext/gettext-runtime/libasprintf/configure.ac,v
+retrieving revision 1.24
+diff -u -r1.24 configure.ac
+--- gettext-runtime/libasprintf/configure.ac	20 Apr 2008 06:48:03 -0000	1.24
+++ gettext-runtime/libasprintf/configure.ac	4 May 2008 17:26:34 -0000
+@@ -41,7 +41,7 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+  beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ AC_SUBST([LTNOUNDEF])
+Index: gettext-tools/configure.ac
+===================================================================
+RCS file: /sources/gettext/gettext/gettext-tools/configure.ac,v
+retrieving revision 1.96
+diff -u -r1.96 configure.ac
+--- gettext-tools/configure.ac	20 Apr 2008 06:48:03 -0000	1.96
+++ gettext-tools/configure.ac	4 May 2008 17:29:23 -0000
+@@ -92,7 +92,7 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+  beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ AC_SUBST([LTNOUNDEF])
--- a/sys-devel/libtool/libtool-2.2.5a-haiku.diff
+++ b/sys-devel/libtool/libtool-2.2.5a-haiku.diff
@@ -0,0 +1,54 @@
+diff -ur libtool-2.2.5a/libltdl/config/ltmain.m4sh libtool-2.2.5a-haiku/libltdl/config/ltmain.m4sh
+--- libtool-2.2.5a/libltdl/config/ltmain.m4sh	2008-06-02 07:07:26.000000000 +0000
+++ libtool-2.2.5a-haiku/libltdl/config/ltmain.m4sh	2008-06-05 16:07:25.000000000 +0000
+@@ -4072,7 +4072,7 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -6026,7 +6026,7 @@
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+diff -ur libtool-2.2.5a/libltdl/m4/libtool.m4 libtool-2.2.5a-haiku/libltdl/m4/libtool.m4
+--- libtool-2.2.5a/libltdl/m4/libtool.m4	2008-05-26 07:05:05.000000000 +0000
+++ libtool-2.2.5a-haiku/libltdl/m4/libtool.m4	2008-06-06 09:32:17.000000000 +0000
+@@ -2344,6 +2344,18 @@
+   hardcode_into_libs=yes
+   ;;
+ 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+@@ -5656,6 +5668,10 @@
+       gnu*)
+         ;;
+ 
+      haiku*)
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        ;;
+
+       hpux9*)
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--- a/sys-devel/sparse/sparse-master.diff
+++ b/sys-devel/sparse/sparse-master.diff
@@ -0,0 +1,111 @@
+diff --git a/Makefile b/Makefile
+index 3eab17e..146da72 100644
+--- a/Makefile
+++ b/Makefile
+@@ -13,7 +13,7 @@ HAVE_LIBXML=$(shell pkg-config --exists libxml-2.0 && echo 'yes')
+ #
+ # For debugging, uncomment the next one
+ #
+-CFLAGS += -DDEBUG
+#CFLAGS += -DDEBUG
+ 
+ DESTDIR=
+ PREFIX=$(HOME)
+diff --git a/allocate.h b/allocate.h
+index 9f1dc8c..abde7a0 100644
+--- a/allocate.h
+++ b/allocate.h
+@@ -4,7 +4,7 @@
+ struct allocation_blob {
+ 	struct allocation_blob *next;
+ 	unsigned int left, offset;
+-	unsigned char data[];
+	unsigned char data[1];
+ };
+ 
+ struct allocator_struct {
+diff --git a/compat/strtold.c b/compat/strtold.c
+index 1b6ad7d..0749e33 100644
+--- a/compat/strtold.c
+++ b/compat/strtold.c
+@@ -2,5 +2,6 @@
+ 
+ long double string_to_ld(const char *nptr, char **endptr)
+ {
+-	return strtold(nptr, endptr);
+	//return strtold(nptr, endptr);
+	return strtod(nptr, endptr);
+ }
+diff --git a/evaluate.c b/evaluate.c
+index 2a126dd..4c09dee 100644
+--- a/evaluate.c
+++ b/evaluate.c
+@@ -152,24 +152,24 @@ static struct symbol *bigger_int_type(struct symbol *left, struct symbol *right)
+ 	right = integer_promotion(right);
+ 
+ 	if (left == right)
+-		goto left;
+		goto lleft;
+ 
+ 	if (left->bit_size > right->bit_size)
+-		goto left;
+		goto lleft;
+ 
+ 	if (right->bit_size > left->bit_size)
+-		goto right;
+		goto lright;
+ 
+ 	lmod = left->ctype.modifiers;
+ 	rmod = right->ctype.modifiers;
+ 	if ((lmod ^ rmod) & MOD_UNSIGNED) {
+ 		if (lmod & MOD_UNSIGNED)
+-			goto left;
+			goto lleft;
+ 	} else if ((lmod & ~rmod) & (MOD_LONG | MOD_LONGLONG))
+-		goto left;
+-right:
+		goto lleft;
+lright:
+ 	left = right;
+-left:
+lleft:
+ 	return left;
+ }
+ 
+diff --git a/lib.c b/lib.c
+index 75afdb7..973d953 100644
+--- a/lib.c
+++ b/lib.c
+@@ -35,6 +35,10 @@ int die_if_error = 0;
+ # define __GNUC__ 2
+ # define __GNUC_MINOR__ 95
+ # define __GNUC_PATCHLEVEL__ 0
+#else
+# ifndef __GNUC_PATCHLEVEL__
+#  define __GNUC_PATCHLEVEL__ 3
+# endif
+ #endif
+ 
+ int gcc_major = __GNUC__;
+diff --git a/token.h b/token.h
+index ba7866d..6cea61a 100644
+--- a/token.h
+++ b/token.h
+@@ -56,7 +56,7 @@ struct ident {
+ 	unsigned char tainted:1,
+ 	              reserved:1,
+ 		      keyword:1;
+-	char name[];		/* Actual identifier */
+	char name[1];		/* Actual identifier */
+ };
+ 
+ enum token_type {
+@@ -137,7 +137,7 @@ enum special_token {
+ 
+ struct string {
+ 	unsigned int length;
+-	char data[];
+	char data[1];
+ };
+ 
+ /* will fit into 32 bits */
--- a/sys-libs/ncurses/ncurses-5.6-haiku.diff
+++ b/sys-libs/ncurses/ncurses-5.6-haiku.diff
@@ -0,0 +1,54 @@
+diff -ur ncurses-5.6/include/curses.h ncurses-5.6-haiku/include/curses.h
+--- ncurses-5.6/include/curses.h	2008-06-04 05:57:46.000000000 -0700
+++ ncurses-5.6-haiku/include/curses.h	2008-06-14 18:12:44.000000000 -0700
+@@ -450,7 +450,7 @@
+  */
+ #if 1
+ #ifdef NCURSES_WGETCH_EVENTS
+-#if !defined(__BEOS__)		/* Fix _nc_timed_wait() on BEOS... */
+#if !defined(__BEOS__) || defined(__HAIKU__)	/* Fix _nc_timed_wait() on BEOS... */
+ #  define NCURSES_EVENT_VERSION	1
+ #endif	/* !defined(__BEOS__) */
+ 
+diff -ur ncurses-5.6/ncurses/tty/lib_twait.c ncurses-5.6-haiku/ncurses/tty/lib_twait.c
+--- ncurses-5.6/ncurses/tty/lib_twait.c	2006-05-27 14:57:43.000000000 -0700
+++ ncurses-5.6-haiku/ncurses/tty/lib_twait.c	2008-06-14 18:26:31.000000000 -0700
+@@ -42,6 +42,10 @@
+ 
+ #include <curses.priv.h>
+ 
+#if defined __HAIKU__ && defined __BEOS__
+#undef __BEOS__
+#endif
+
+ #ifdef __BEOS__
+ #undef false
+ #undef true
+diff -ur ncurses-5.6/ncurses/tty/tty_update.c ncurses-5.6-haiku/ncurses/tty/tty_update.c
+--- ncurses-5.6/ncurses/tty/tty_update.c	2006-11-25 14:33:21.000000000 -0800
+++ ncurses-5.6-haiku/ncurses/tty/tty_update.c	2008-06-14 18:27:03.000000000 -0700
+@@ -44,6 +44,10 @@
+ 
+ #include <curses.priv.h>
+ 
+#if defined __HAIKU__ && defined __BEOS__
+#undef __BEOS__
+#endif
+
+ #ifdef __BEOS__
+ #undef false
+ #undef true
+diff -ur ncurses-5.6/tack/sysdep.c ncurses-5.6-haiku/tack/sysdep.c
+--- ncurses-5.6/tack/sysdep.c	2005-09-17 12:49:16.000000000 -0700
+++ ncurses-5.6-haiku/tack/sysdep.c	2008-06-14 18:26:03.000000000 -0700
+@@ -34,6 +34,10 @@
+ #include <term.h>
+ #include <errno.h>
+ 
+#if defined __HAIKU__ && defined __BEOS__
+#undef __BEOS__
+#endif
+
+ #if defined(__BEOS__)
+ #undef false
+ #undef true
--- a/sys-libs/zlib/zlib-1.2.3.bep
+++ b/sys-libs/zlib/zlib-1.2.3.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="zlib" 
+HOMEPAGE="http://www.zlib.net/" 
+SRC_URI="http://www.zlib.net/zlib-1.2.3.tar.bz2"
+REVISION="1"
+STATUS_R5="untested"
+STATUS_BONE="stable"
+STATUS_HAIKU="untested"
+DEPEND=""
+BUILD {
+	cd zlib-1.2.3
+	./configure --prefix=/boot/home/config
+	make
+}
+
+INSTALL {
+	cd zlib-1.2.3
+	make install
+}
--- a/x11-libs/cairo/cairo-master.diff
+++ b/x11-libs/cairo/cairo-master.diff
@@ -0,0 +1,196 @@
+diff --git a/configure.in b/configure.in
+index c7e457f..3af7f67 100644
+--- a/configure.in
+++ b/configure.in
+@@ -445,7 +445,7 @@ dnl ===========================================================================
+ 
+ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, beos, BEOS_SURFACE, no, [
+   case "$host" in
+-    *-*-beos)
+    *-*-beos|*-*-haiku*)
+       dnl Add libbe and libzeta if available
+       AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
+       AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta")
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 200867a..9890b36 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -242,7 +242,7 @@ if CAIRO_HAS_BEOS_SURFACE
+ cairo_headers += $(beos_headers)
+ # automake is stupid enough to always use c++ linker if we enable the
+ # following line, even if beos surface is not enabled.  Disable it for now.
+-#cairo_sources += $(beos_sources)
+cairo_sources += $(beos_sources)
+ backend_pkgconfigs += cairo-beos.pc
+ endif
+ 
+diff --git a/src/cairo-beos-surface.cpp b/src/cairo-beos-surface.cpp
+index 69dfd83..44ba8dd 100644
+--- a/src/cairo-beos-surface.cpp
+++ b/src/cairo-beos-surface.cpp
+@@ -36,7 +36,9 @@
+ 
+ // This is a C++ file in order to use the C++ BeOS API
+ 
+extern "C" {
+ #include "cairoint.h"
+}
+ 
+ #include "cairo-beos.h"
+ 
+@@ -102,17 +104,17 @@ _cairo_beos_surface_create_internal (BView*   view,
+ 				     bool     owns_bitmap_view = false);
+ 
+ static BRect
+-_cairo_rect_to_brect (const cairo_rectangle_int16_t* rect)
+_cairo_rect_to_brect (const cairo_rectangle_int_t* rect)
+ {
+     // A BRect is one pixel wider than you'd think
+     return BRect(rect->x, rect->y, rect->x + rect->width - 1,
+ 	    	 rect->y + rect->height - 1);
+ }
+ 
+-static cairo_rectangle_int16_t
+static cairo_rectangle_int_t
+ _brect_to_cairo_rect (const BRect& rect)
+ {
+-    cairo_rectangle_int16_t retval;
+    cairo_rectangle_int_t retval;
+     retval.x = int(rect.left + 0.5);
+     retval.y = int(rect.top + 0.5);
+     retval.width = rect.IntegerWidth() + 1;
+@@ -551,9 +553,9 @@ _cairo_beos_surface_release_source_image (void                  *abstract_surfac
+ 
+ static cairo_status_t
+ _cairo_beos_surface_acquire_dest_image (void			 *abstract_surface,
+-                                        cairo_rectangle_int16_t	 *interest_rect,
+                                        cairo_rectangle_int_t	 *interest_rect,
+                                         cairo_image_surface_t	**image_out,
+-                                        cairo_rectangle_int16_t	 *image_rect,
+                                        cairo_rectangle_int_t	 *image_rect,
+                                         void			**image_extra)
+ {
+     cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
+@@ -616,9 +618,9 @@ _cairo_beos_surface_acquire_dest_image (void			 *abstract_surface,
+ 
+ static void
+ _cairo_beos_surface_release_dest_image (void			*abstract_surface,
+-                                        cairo_rectangle_int16_t	*intersect_rect,
+                                        cairo_rectangle_int_t	*intersect_rect,
+                                         cairo_image_surface_t	*image,
+-                                        cairo_rectangle_int16_t	*image_rect,
+                                        cairo_rectangle_int_t	*image_rect,
+                                         void			*image_extra)
+ {
+     fprintf(stderr, "Fallback drawing\n");
+@@ -769,7 +771,7 @@ _cairo_beos_surface_composite (cairo_operator_t		op,
+ 
+ static void
+ _cairo_beos_surface_fill_rectangle (cairo_beos_surface_t	*surface,
+-				    cairo_rectangle_int16_t	*rect)
+				    cairo_rectangle_int_t	*rect)
+ {
+     BRect brect(_cairo_rect_to_brect(rect));
+     surface->view->FillRect(brect);
+@@ -779,7 +781,7 @@ static cairo_int_status_t
+ _cairo_beos_surface_fill_rectangles (void			*abstract_surface,
+ 				     cairo_operator_t		 op,
+ 				     const cairo_color_t	*color,
+-				     cairo_rectangle_int16_t	*rects,
+				     cairo_rectangle_int_t	*rects,
+ 				     int			 num_rects)
+ {
+     fprintf(stderr, "Drawing %i rectangles\n", num_rects);
+@@ -835,9 +837,10 @@ _cairo_beos_surface_fill_rectangles (void			*abstract_surface,
+ 
+ static cairo_int_status_t
+ _cairo_beos_surface_set_clip_region (void              *abstract_surface,
+-                                     pixman_region16_t *region)
+                                     cairo_region_t *reg)
+ {
+     fprintf(stderr, "Setting clip region\n");
+    pixman_region16_t* region = reinterpret_cast<pixman_region16_t*>(reg);
+     cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
+ 							abstract_surface);
+     AutoLockView locker(surface->view);
+@@ -850,8 +853,8 @@ _cairo_beos_surface_set_clip_region (void              *abstract_surface,
+ 	return CAIRO_INT_STATUS_SUCCESS;
+     }
+ 
+-    int count = pixman_region_num_rects(region);
+-    pixman_box16_t* rects = pixman_region_rects(region);
+    int count;
+    pixman_box16_t* rects = pixman_region_rectangles(region, &count);
+     BRegion bregion;
+     for (int i = 0; i < count; ++i) {
+ 	// Have to substract one, because for pixman, the second coordinate
+@@ -864,7 +867,7 @@ _cairo_beos_surface_set_clip_region (void              *abstract_surface,
+ 
+ static cairo_int_status_t
+ _cairo_beos_surface_get_extents (void				*abstract_surface,
+-				 cairo_rectangle_int16_t	*rectangle)
+				 cairo_rectangle_int_t	*rectangle)
+ {
+     cairo_beos_surface_t *surface = reinterpret_cast<cairo_beos_surface_t*>(
+ 							abstract_surface);
+@@ -914,6 +917,45 @@ static const struct _cairo_surface_backend cairo_beos_surface_backend = {
+     NULL  /* show_glyphs */
+ };
+ 
+#define DEFINE_NIL_SURFACE(status, name)			\
+const cairo_surface_t name = {					\
+    &cairo_image_surface_backend,	/* backend */		\
+    CAIRO_SURFACE_TYPE_IMAGE,					\
+    CAIRO_CONTENT_COLOR,					\
+    CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */		\
+    status,				/* status */		\
+    FALSE,				/* finished */		\
+    { 0,	/* size */					\
+      0,	/* num_elements */				\
+      0,	/* element_size */				\
+      NULL,	/* elements */					\
+    },					/* user_data */		\
+    { 1.0, 0.0,							\
+      0.0, 1.0,							\
+      0.0, 0.0							\
+    },					/* device_transform */	\
+    { 1.0, 0.0,							\
+      0.0, 1.0,							\
+      0.0, 0.0							\
+    },					/* device_transform_inverse */	\
+    0.0,				/* x_resolution */	\
+    0.0,				/* y_resolution */	\
+    0.0,				/* x_fallback_resolution */	\
+    0.0,				/* y_fallback_resolution */	\
+    NULL,				/* clip */		\
+    0,					/* next_clip_serial */	\
+    0,					/* current_clip_serial */	\
+    FALSE,				/* is_snapshot */	\
+    FALSE,				/* has_font_options */	\
+    { CAIRO_ANTIALIAS_DEFAULT,					\
+      CAIRO_SUBPIXEL_ORDER_DEFAULT,				\
+      CAIRO_HINT_STYLE_DEFAULT,					\
+      CAIRO_HINT_METRICS_DEFAULT				\
+    }					/* font_options */	\
+}
+
+static DEFINE_NIL_SURFACE(CAIRO_STATUS_NO_MEMORY, _cairo_surface_nil);
+
+ static cairo_surface_t *
+ _cairo_beos_surface_create_internal (BView*   view,
+ 				     BBitmap* bmp,
+diff --git a/test/Makefile.am b/test/Makefile.am
+index ec98a49..225b6d2 100644
+--- a/test/Makefile.am
+++ b/test/Makefile.am
+@@ -826,8 +826,10 @@ $(top_builddir)/test/pdiff/libpdiff.la:
+ 	cd $(top_builddir)/test/pdiff && $(MAKE) $(AM_MAKEFLAGS) libpdiff.la
+ 
+ if HAVE_PTHREAD
+if !CAIRO_HAS_BEOS_SURFACE
+ LDADD += -lpthread
+ endif
+endif
+ 
+ check_PROGRAMS += imagediff png-flatten
+