Update to 1.11. Test this thoroughly.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9096 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 220 insertions, 0 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
new file mode 100644
index 000000000..d7ef30c89
--- /dev/null
+++ b/converters/libiconv/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for:	libiconv
+# Date created:				17 July 2000
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD: ports/converters/libiconv/Makefile,v 1.39 2007/02/01 02:41:21 kris Exp $
+#
+
+PORTNAME=	libiconv
+PORTVERSION=	1.11
+CATEGORIES=	converters devel
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A character set conversion library
+
+USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget
+LIBTOOLFILES=	configure libcharset/configure
+CONFIGURE_ARGS=	--enable-static \
+		--without-libintl-prefix \
+		--mandir=${PREFIX}/man \
+		--docdir=${DOCSDIR}
+USE_LDCONFIG=	yes
+
+MAN1=		iconv.1
+MAN3=		iconv.3 iconv_open.3 iconv_close.3 iconvctl.3
+
+.ifdef USE_ICONV
+.error USE_ICONV is defined as an environment variable, or in the arguments \
+	to "make".  Please unset it and restart the build.
+.endif
+
+.if !defined(WITHOUT_EXTRA_ENCODINGS)
+CONFIGURE_ARGS+=	--enable-extra-encodings
+.endif
+
+#.if defined(WITH_EXTRA_PATCHES)
+#PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
+#PATCH_SITES+=	${MASTER_SITE_LOCAL}
+#PATCH_SITE_SUBDIR=     nork
+#PATCHFILES+=	${DISTNAME}-cp932.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+#.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "libiconv has the following tunable option(s):"
+	@${ECHO_MSG} "	WITHOUT_EXTRA_ENCODINGS=yes	Disable extra character sets"
+#	@${ECHO_MSG} "	WITH_EXTRA_PATCHES=yes		Apply extra patches (fixes cp932, adds EUCJP-MS)"
+	@${ECHO_MSG} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
+
+.include <bsd.port.mk>
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
new file mode 100644
index 000000000..e53fffbe7
--- /dev/null
+++ b/converters/libiconv/distinfo
@@ -0,0 +1,3 @@
+MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e
+SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
+SIZE (libiconv-1.11.tar.gz) = 4430930
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
new file mode 100644
index 000000000..196d15361
--- /dev/null
+++ b/converters/libiconv/files/patch-ae
@@ -0,0 +1,61 @@
+--- libcharset/lib/Makefile.in.orig	Mon Apr 14 22:51:06 2003
++++ libcharset/lib/Makefile.in	Sat Jul 10 02:37:15 2004
+@@ -10,6 +10,7 @@
+ local_prefix = /usr/local
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
++sysconfdir = ${exec_prefix}/libdata
+ 
+ # Programs used by "make":
+ CC = @CC@
+@@ -42,7 +43,7 @@
+ 
+ # Before making a release, change this according to the libtool documentation,
+ # section "Library interface versions".
+-LIBCHARSET_VERSION_INFO = 1:0:0
++LIBCHARSET_VERSION_INFO = 1
+ 
+ # Needed by $(LIBTOOL).
+ top_builddir = ..
+@@ -57,7 +58,7 @@
+ 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
+ 
+ localcharset.lo : $(srcdir)/localcharset.c
+-	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
++	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
+ 
+ relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
+ 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
+@@ -78,7 +79,7 @@
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ install-lib : all force
+ 	$(mkinstalldirs) $(libdir)
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
++	$(LIBTOOL_INSTALL) cp libcharset.la $(libdir)/libcharset.la
+ 	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
+ 	                                || orig=charset.alias; \
+ 	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
+@@ -95,15 +96,16 @@
+ install : all force
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+-	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+-	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
+-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
+-	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
++	  sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
++	  $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
++	  rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+ 	else \
+ 	  if test @GLIBC21@ = no; then \
+-	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
+-	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
+-	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
++	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
++	    $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
++	    rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
+ 	  fi ; \
+ 	fi
+ 
diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in
new file mode 100644
index 000000000..173146046
--- /dev/null
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	Fri Jul 14 09:18:42 2006
++++ lib/Makefile.in	Fri Jun 29 18:30:13 2007
+@@ -48,7 +48,7 @@ SHELL = /bin/sh
+ 
+ # Before making a release, change this according to the libtool documentation,
+ # section "Library interface versions".
+-LIBICONV_VERSION_INFO = 6:0:4
++LIBICONV_VERSION_INFO = 3
+ 
+ # Needed by $(LIBTOOL).
+ top_builddir = ..
diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset::lib::config.charset
new file mode 100644
index 000000000..d6dc5973b
--- /dev/null
+++ b/converters/libiconv/files/patch-libcharset::lib::config.charset
@@ -0,0 +1,45 @@
+--- libcharset/lib/config.charset.orig	Thu Jan 30 03:43:59 2003
++++ libcharset/lib/config.charset	Tue Oct 14 16:55:29 2003
+@@ -246,8 +246,8 @@
+ 	#echo "sun_eu_greek ?" # what is this?
+ 	echo "UTF-8 UTF-8"
+ 	;;
+-    freebsd* | os2*)
+-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
++    freebsd4.[0-5] | os2*)
++	# FreeBSD up to 4.6 doesn't have nl_langinfo(CODESET); therefore
+ 	# localcharset.c falls back to using the full locale name
+ 	# from the environment variables.
+ 	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+@@ -282,6 +282,31 @@
+ 	echo "ja_JP.SJIS SHIFT_JIS"
+ 	echo "ja_JP.Shift_JIS SHIFT_JIS"
+ 	echo "ko_KR.EUC EUC-KR"
++	;;
++    freebsd*)
++	echo "US-ASCII ASCII"
++	echo "ISO8859-1 ISO-8859-1"
++	echo "ISO_8859-1 ISO-8859-1"
++	echo "ISO8859-2 ISO-8859-2"
++	echo "ISO_8859-2 ISO-8859-2"
++	echo "ISO8859-4 ISO-8859-4"
++	echo "ISO_8859-4 ISO-8859-4"
++	echo "ISO8859-5 ISO-8859-5"
++	echo "ISO_8859-5 ISO-8859-5"
++	echo "ISO8859-7 ISO-8859-7"
++	echo "ISO_8859-7 ISO-8859-7"
++	echo "ISO8859-9 ISO-8859-9"
++	echo "ISO_8859-9 ISO-8859-9"
++	echo "ISO8859-13 ISO-8859-13"
++	echo "ISO_8859-13 ISO-8859-13"
++	echo "ISO8859-15 ISO-8859-15"
++	echo "ISO_8859-15 ISO-8859-15"
++	echo "eucCN GB2312"
++	echo "eucJP EUC-JP"
++	echo "eucKR EUC-KR"
++	echo "Big5 BIG5"
++	echo "SJIS SHIFT_JIS"
++	echo "Shift_JIS SHIFT_JIS"
+ 	;;
+     netbsd*)
+ 	echo "646 ASCII"
diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in
new file mode 100644
index 000000000..52b5865d3
--- /dev/null
+++ b/converters/libiconv/files/patch-src::Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Fri Jul 14 09:19:07 2006
++++ src/Makefile.in	Fri Jun 29 18:31:59 2007
+@@ -96,6 +96,7 @@ install : all force
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
++	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
diff --git a/converters/libiconv/pkg-descr b/converters/libiconv/pkg-descr
new file mode 100644
index 000000000..52c04d04d
--- /dev/null
+++ b/converters/libiconv/pkg-descr
@@ -0,0 +1,14 @@
+This library provides an iconv() implementation, for use on systems which
+don't have one, or whose implementation cannot convert from/to Unicode.
+
+It can convert from any of these encodings to any other, through Unicode
+conversion. It has also some limited support for transliteration, i.e.
+when a character cannot be represented in the target character set, it can
+be approximated through one or several similarly looking characters.
+
+libiconv is for you if your application needs to support multiple character
+encodings, but that support lacks from your system.
+
+See in either README or website for the list of support encodings.
+
+WWW: http://www.gnu.org/software/libiconv/
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
new file mode 100644
index 000000000..aca2a2d84
--- /dev/null
+++ b/converters/libiconv/pkg-plist
@@ -0,0 +1,19 @@
+bin/iconv
+include/iconv.h
+include/libcharset.h
+include/localcharset.h
+lib/libcharset.a
+lib/libcharset.la
+lib/libcharset.so
+lib/libcharset.so.1
+lib/libiconv.a
+lib/libiconv.la
+lib/libiconv.so
+lib/libiconv.so.3
+libdata/charset.alias
+%%DOCSDIR%%/iconv.1.html
+%%DOCSDIR%%/iconv.3.html
+%%DOCSDIR%%/iconv_close.3.html
+%%DOCSDIR%%/iconv_open.3.html
+%%DOCSDIR%%/iconvctl.3.html
+@dirrm %%DOCSDIR%%