Update to 1.9.1.

* Many more transliterations.
* New configuration option --enable-relocatable.

8 files changed, 65 insertions, 53 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 6d9ff23214f..855c3e7c4d8 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/07/12 13:13:46 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/13 13:32:29 wiz Exp $
 #
 
-DISTNAME=		libiconv-1.8
-PKGREVISION=		1
+DISTNAME=		libiconv-1.9.1
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=libiconv/}
 
diff --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST.common
index afce2dbdaaa..7777239193d 100644
--- a/converters/libiconv/PLIST.common
+++ b/converters/libiconv/PLIST.common
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/02/28 22:15:31 grant Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/07/13 13:32:30 wiz Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
-lib/charset.alias
+include/localcharset.h
 lib/libcharset.a
 lib/libcharset.la
 lib/libcharset.so
@@ -11,9 +11,15 @@ lib/libcharset.so.1.0
 lib/libiconv.a
 lib/libiconv.la
 lib/libiconv.so
-lib/libiconv.so.3
-lib/libiconv.so.3.0
+lib/libiconv.so.4
+lib/libiconv.so.4.0
 man/man1/iconv.1
 man/man3/iconv.3
 man/man3/iconv_close.3
 man/man3/iconv_open.3
+share/doc/html/libiconv/iconv.1.html
+share/doc/html/libiconv/iconv.3.html
+share/doc/html/libiconv/iconv_close.3.html
+share/doc/html/libiconv/iconv_open.3.html
+@unexec ${RM} %D/lib/charset.alias
+@dirrm share/doc/html/libiconv
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index a4c24bad749..845e4bf6d01 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/06/29 19:43:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:32:30 wiz Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_DEPENDS.iconv?=	libiconv>=1.8
+BUILDLINK_DEPENDS.iconv?=	libiconv>=1.9.1
 BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 
 .if defined(USE_GNU_ICONV)
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 863391e85e2..e55dc92fdf9 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/02/28 22:15:31 grant Exp $
+$NetBSD: distinfo,v 1.11 2003/07/13 13:32:30 wiz Exp $
 
-SHA1 (libiconv-1.8.tar.gz) = 8894488118c31d3d1f1c6d2f81f61d7e052e9799
-Size (libiconv-1.8.tar.gz) = 3514117 bytes
-SHA1 (patch-ab) = 842ef918bb2036e1d9274a63c01c4c3743e9a084
-SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895
-SHA1 (patch-ad) = 384cafd6f4c11443d0a539409121543b9201efdd
-SHA1 (patch-ae) = f4cb8da07449a640750f8021a4663fc3eee3fb57
+SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
+Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
+SHA1 (patch-ab) = bfceb0cde182022bdcf181d3214f88ff27acc4b3
+SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
+SHA1 (patch-ad) = ae543f1a2483f69960ffa807f11d11ef779e5316
+SHA1 (patch-ae) = d4af960787c8c8e23e3e58753e1d778e2c0fc1e0
diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab
index 0f079c6792b..93fa33fbe7b 100644
--- a/converters/libiconv/patches/patch-ab
+++ b/converters/libiconv/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.5 2002/11/26 00:51:02 grant Exp $
+$NetBSD: patch-ab,v 1.6 2003/07/13 13:32:30 wiz Exp $
 
---- Makefile.in.orig	Wed May  1 00:23:47 2002
-+++ Makefile.in	Tue Nov 26 11:46:45 2002
-@@ -27,7 +27,9 @@
- SHELL = /bin/sh
+--- Makefile.in.orig	Wed Apr 23 13:29:22 2003
++++ Makefile.in
+@@ -37,7 +37,9 @@ all : lib/localcharset.h force
+ 	if test -d tests; then cd tests && $(MAKE) all; fi
  
- all : force
+ lib/localcharset.h :
 -	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
 +	builddir="`pwd`"; cd libcharset && $(MAKE) all &&	\
 +	cp -R lib/libcharset.la lib/.libs "$$builddir/lib" &&	\
 +	cp -R include/*.h "$$builddir/include"
- 	cd lib && $(MAKE) all
- 	cd src && $(MAKE) all
- 	cd po && $(MAKE) all
+ 
+ # Installs the library and include files only. Typically called with only
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
diff --git a/converters/libiconv/patches/patch-ac b/converters/libiconv/patches/patch-ac
index 2953b9758b0..45bc5050996 100644
--- a/converters/libiconv/patches/patch-ac
+++ b/converters/libiconv/patches/patch-ac
@@ -1,15 +1,22 @@
-$NetBSD: patch-ac,v 1.1 2001/10/30 17:41:20 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2003/07/13 13:32:30 wiz Exp $
 
---- man/Makefile.in.orig	Tue Oct 30 18:02:20 2001
-+++ man/Makefile.in	Tue Oct 30 18:06:26 2001
-@@ -35,10 +35,6 @@
- 	cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
- 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
- 	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
--	if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
--	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
--	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
--	cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done
+--- man/Makefile.in.orig	Wed Apr 23 13:29:22 2003
++++ man/Makefile.in
+@@ -12,7 +12,7 @@ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ mandir = @mandir@
+ docdir = $(datadir)/doc/libiconv
+-htmldir = $(docdir)
++htmldir = $(datadir)/doc/html/libiconv
+ 
+ # Programs used by "make":
+ RM = rm -f
+@@ -38,8 +38,6 @@ install : force
+ 	builddir="`pwd`"; cd $(srcdir) && for f in *.1 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f) ; done
+ 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 ; fi
+ 	builddir="`pwd`"; cd $(srcdir) && for f in *.3 ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f) ; done
+-	if [ ! -d $(DESTDIR)$(datadir)/doc ] ; then $(mkinstalldirs) $(DESTDIR)$(datadir)/doc ; fi
+-	if [ ! -d $(DESTDIR)$(docdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(docdir) ; fi
+ 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs) $(DESTDIR)$(htmldir) ; fi
+ 	builddir="`pwd`"; cd $(srcdir) && for f in *.html ; do (cd "$$builddir"; echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f) ; done
  
- installdirs : force
- 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad
index 86619fd539d..e08953525a1 100644
--- a/converters/libiconv/patches/patch-ad
+++ b/converters/libiconv/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:19 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2003/07/13 13:32:30 wiz Exp $
 
---- src/Makefile.in.orig	Thu Aug 22 15:14:31 2002
-+++ src/Makefile.in	Thu Aug 22 15:20:07 2002
-@@ -78,7 +78,7 @@
- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
- 	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
--	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
-+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
- 	esac
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+--- configure.orig	Sun Jul 13 10:39:43 2003
++++ configure
+@@ -1905,7 +1905,7 @@ fi
  
+ 
+ 
+-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
++#test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+ 
+ 
+ ac_ext=c
diff --git a/converters/libiconv/patches/patch-ae b/converters/libiconv/patches/patch-ae
index 8c2584b73bc..77045102594 100644
--- a/converters/libiconv/patches/patch-ae
+++ b/converters/libiconv/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2003/02/28 22:15:31 grant Exp $
+$NetBSD: patch-ae,v 1.2 2003/07/13 13:32:30 wiz Exp $
 
---- libcharset/lib/Makefile.in.orig	Thu Jun 28 09:02:48 2001
+--- libcharset/lib/Makefile.in.orig	Mon Apr 14 15:51:06 2003
 +++ libcharset/lib/Makefile.in
-@@ -71,7 +71,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
+@@ -78,7 +78,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
- 	$(MKINSTALLDIRS) $(libdir)
+ 	$(mkinstalldirs) $(libdir)
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
 +#	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
  	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \