diff --git a/dev-libs/libiconv/libiconv-1.12.recipe b/dev-libs/libiconv/libiconv-1.12.recipe
deleted file mode 100644
index 06ce5c699..000000000
--- a/dev-libs/libiconv/libiconv-1.12.recipe
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION="libiconv" 
-HOMEPAGE="http://www.gnu.org/software/libiconv/" 
-SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz"
-CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd libiconv-1.12
-	rm -rf aclocal.m4
-	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
-	libtoolize -fci
-	aclocal --install -I m4 -I srcm4
-	autoconf
-	autoheader
-	cd libcharset
-	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf
-	autoheader
-	cd ..
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
-		--docdir=$COMMON_DOCS/doc/iconv \
-		--mandir=$COMMON_DOCS/man \
-		--enable-relocatable \
-		--enable-shared \
-		--enable-static \
-		--disable-nls
-	make
-}
-
-INSTALL()
-{
-	cd libiconv-1.12
-	ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir`
-	mkdir -p ${ACLOCALDIR}
-	cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4
-	make install
-}
-
-TEST()
-{
-	cd libiconv-1.12
-	make check
-}
diff --git a/dev-libs/libiconv/libiconv.OptionalPackageDescription b/dev-libs/libiconv/libiconv.OptionalPackageDescription
deleted file mode 100644
index aa34e4d12..000000000
--- a/dev-libs/libiconv/libiconv.OptionalPackageDescription
+++ /dev/null
@@ -1,17 +0,0 @@
-Package:	libiconv
-Version:	1.13.1
-Copyright:	1998-2009 Free Software Foundation, Inc.
-License:	GNU LGPL v2
-URL:		http://www.gnu.org/software/libiconv
-
-Package:	libcharset
-Version:	1.13.1
-Copyright:	1998-2009 Free Software Foundation, Inc.
-License:	GNU LGPL v2
-URL:		http://www.gnu.org/software/libiconv
-
-Package:	iconv
-Version:	1.13.1
-Copyright:	1998-2009 Free Software Foundation, Inc.
-License:	GNU GPL v3
-URL:		http://www.gnu.org/software/iconv
diff --git a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff b/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff
deleted file mode 100644
index e2cc9cd3f..000000000
--- a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff
+++ /dev/null
@@ -1,813 +0,0 @@
-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