Initial .bep file checking for sdl-image

2026-04-23 04:00:05 +02:00 · 2008-07-30 16:49:08 +00:00
commit 081833065f
54 changed files with 32707 additions and 0 deletions
--- 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