From 4a26d0a4c98098e1e31b06d1a9b3052f754ea449 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 29 Mar 2013 00:55:31 +0000
Subject: [PATCH] libiconv-1.13.1: Update from trunk and update for hpkg
 building

---
 dev-libs/libiconv/libiconv-1.13.1.bep | 69 +++++++++++++++------------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep
index 0e93e1ed9..7eb525a76 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.bep
+++ b/dev-libs/libiconv/libiconv-1.13.1.bep
@@ -1,53 +1,60 @@
-DESCRIPTION="libiconv" 
+SUMMARY="GNU iconv implementation"
+DESCRIPTION="GNU iconv implementation."
 HOMEPAGE="http://www.gnu.org/software/libiconv/" 
 SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
 CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a"
-REVISION="1"
+REVISION="2"
 STATUS_HAIKU="stable"
-DEPEND=""
+
+PROVIDES="iconv = $portVersion compat >= 1.13
+	cmd:iconv = 2.5.0 compat >= 2
+	lib:libiconv = 2.5.0 compat >= 2
+	lib:libcharset = 1.0.0 compat >= 1"
+REQUIRES="haiku >= $haikuVersion"
+BUILD_REQUIRES="cmd:aclocal
+	cmd:autoconf
+	cmd:autoheader
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make"
+BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD {
-	cd libiconv-1.13.1
 	rm -rf aclocal.m4
-	ln -sf /boot/common/bin/autoconf /boot/common/bin/autoconf-2.63
-	ln -sf /boot/common/bin/autoheader /boot/common/bin/autoheader-2.63 
-	ln -sf /boot/common/bin/aclocal /boot/common/bin/aclocal-1.11 
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
 	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
-	cp -r /boot/common/share/libtool m4
-	libtoolize --force --copy --install 
-	aclocal -I m4 -I srcm4
+	libtoolize -fci
+	aclocal --install -I m4 -I srcm4
 	autoconf
 	autoheader
 	cd libcharset
-	cp /boot/common/share/aclocal/libtool.m4 m4
-	cp /boot/common/share/aclocal/ltoptions.m4 m4
-	cp /boot/common/share/aclocal/ltversion.m4 m4
-	cp /boot/common/share/aclocal/ltsugar.m4 m4
-	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
-       echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
-	libtoolize --force --copy --install
-	cp -r /boot/common/share/libtool m4
-	libtoolize --force --copy --install
-	aclocal -I m4 
+	echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
+	libtoolize -fci
+	aclocal --install -I m4
 	autoconf
 	autoheader
 	cd ..
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
-		--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+	./configure $configureDirArgs \
+		--localedir=$dataRootDir/locale \
 		--enable-relocatable \
 		--enable-shared \
-		--enable-static
+		--enable-static \
+		--disable-nls
 	make
 }
 
 INSTALL {
-	cd libiconv-1.13.1
+	ACLOCALDIR=$prefix/data/aclocal
+	mkdir -p ${ACLOCALDIR}
+	cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4
 	make install
+}
+
+TEST{
 	make check
 }
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="2000-2009 Free Software Foundation, Inc."