Update to 1.11:

New in 1.11:
* The iconv program has new options --unicode-subst, --byte-subst,
  --widechar-subst that allow to specify substitutions for characters that
  cannot be converted.
* The iconv program now understands long options:
    long option    equivalent to
    --from-code    -f
    --to-code      -t
    --list         -l
    --silent       -s
* The CP936 converter is now different from the GBK converter: it has changed
  to include the Euro sign and private area characters. CP936 is no longer an
  alias of GBK.
* Updated GB18030 converter to include all private area characters.
* Updated CP950 converter to include the Euro sign and private area characters.
* Updated CP949 converter to include private area characters.
* Updated the BIG5-HKSCS converter. The old BIG5-HKSCS converter is renamed to
  BIG5-HKSCS:1999 and updated to Unicode 4. New converters BIG5-HKSCS:2001 and
  BIG5-HKSCS:2004 are added. BIG5-HKSCS is now an alias for BIG5-HKSCS:2004.
* Added a few irreversible mappings to the CP932 converter.
* Tidy up the list of symbols exported from libiconv (assumes gcc >= 4.0).

9 files changed, 39 insertions, 61 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index b4b3520c239..3e341c73ec3 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2007/01/30 11:27:44 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2007/03/20 00:44:52 wiz Exp $
 
-DISTNAME=	libiconv-1.10
-PKGREVISION=	3
+DISTNAME=	libiconv-1.11
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
 
@@ -9,9 +8,9 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libiconv/
 COMMENT=	Character set conversion library
 
-PATCH_SITES=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCHFILES=	libiconv-1.10-ja-1.patch.gz
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
+#PATCHFILES=	libiconv-1.10-ja-1.patch.gz
+#PATCH_DIST_STRIP=	-p1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -26,6 +25,8 @@ GNU_CONFIGURE=		yes
 #
 CONFIGURE_ARGS+=	--disable-nls
 
+CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/libiconv
+
 TEST_TARGET=		check
 
 EGDIR=			${PREFIX}/share/examples/libiconv
diff --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST.common
index 0aa46268682..0f8371d045d 100644
--- a/converters/libiconv/PLIST.common
+++ b/converters/libiconv/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2005/08/19 22:26:21 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2007/03/20 00:44:52 wiz Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -10,11 +10,11 @@ man/man3/iconv.3
 man/man3/iconv_close.3
 man/man3/iconv_open.3
 man/man3/iconvctl.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
-share/doc/html/libiconv/iconvctl.3.html
+share/doc/libiconv/iconv.1.html
+share/doc/libiconv/iconv.3.html
+share/doc/libiconv/iconv_close.3.html
+share/doc/libiconv/iconv_open.3.html
+share/doc/libiconv/iconvctl.3.html
 share/examples/libiconv/charset.alias
 @dirrm share/examples/libiconv
-@dirrm share/doc/html/libiconv
+@dirrm share/doc/libiconv
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index a9182c1e247..e1f31591ae7 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.24 2006/11/14 13:55:34 joerg Exp $
+$NetBSD: distinfo,v 1.25 2007/03/20 00:44:52 wiz Exp $
 
-SHA1 (libiconv-1.10.tar.gz) = a0190b476e322775d91ee0eabe4041e3a591f865
-RMD160 (libiconv-1.10.tar.gz) = 33c648775743331adf8dcfbc994179fd2fda6aad
-Size (libiconv-1.10.tar.gz) = 3954075 bytes
 SHA1 (libiconv-1.10-ja-1.patch.gz) = ae699d1af00a829bf84112e7bfe9811115b39775
 RMD160 (libiconv-1.10-ja-1.patch.gz) = acc19f69978969bfe351f12394eaf33f2c551921
 Size (libiconv-1.10-ja-1.patch.gz) = 234616 bytes
-SHA1 (patch-aa) = f845b01e08fbeede13bb1d9e46db4ea9ed0e8d03
-SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
-SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
-SHA1 (patch-ad) = 1e21a1ad8a81141990a2c7982af8576c68c819db
-SHA1 (patch-ae) = 28f18b89762ee81d63d2e3f0b7937bc3eba23567
-SHA1 (patch-af) = ee6ce5cf4f2fd0a5606bb23296964f34ca2e165c
+SHA1 (libiconv-1.11.tar.gz) = df09c3ef43443ac15c0c2d49fd791aa73a64bf30
+RMD160 (libiconv-1.11.tar.gz) = 9adbcd61598bee2fbe4eb94ac3f35f83f568d9d0
+Size (libiconv-1.11.tar.gz) = 4430930 bytes
+SHA1 (patch-aa) = 9bfac74baf8c103760c642e1fa57388886e75607
+SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc
+SHA1 (patch-ac) = 52183b39c7fab57fc93972a62cbbba79b16ccce6
+SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
+SHA1 (patch-af) = 1bcd89564e20834c605e4a78e6fe1035b515b9a6
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index d80949d889a..0e7c11b9f88 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2005/07/28 15:15:18 adam Exp $
+$NetBSD: patch-aa,v 1.9 2007/03/20 00:44:53 wiz Exp $
 
---- src/Makefile.in.orig	2005-07-28 16:45:25.000000000 +0000
+--- src/Makefile.in.orig	2006-07-14 13:19:07.000000000 +0000
 +++ src/Makefile.in
-@@ -92,7 +92,7 @@ install : all force
+@@ -96,7 +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;; \
diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab
index 7aac13ca197..1c112002414 100644
--- a/converters/libiconv/patches/patch-ab
+++ b/converters/libiconv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/04/02 19:08:37 jschauma Exp $
+$NetBSD: patch-ab,v 1.9 2007/03/20 00:44:53 wiz Exp $
 
---- Makefile.in.orig	Wed Apr 23 13:29:22 2003
+--- Makefile.in.orig	2006-07-14 13:14:17.000000000 +0000
 +++ Makefile.in
-@@ -37,7 +37,9 @@ all : lib/localcharset.h force
+@@ -38,7 +38,9 @@ all : lib/localcharset.h force
  	if test -d tests; then cd tests && $(MAKE) all; fi
  
  lib/localcharset.h :
diff --git a/converters/libiconv/patches/patch-ac b/converters/libiconv/patches/patch-ac
index 45bc5050996..c54c27c446d 100644
--- a/converters/libiconv/patches/patch-ac
+++ b/converters/libiconv/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2003/07/13 13:32:30 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2007/03/20 00:44:53 wiz Exp $
 
---- man/Makefile.in.orig	Wed Apr 23 13:29:22 2003
+--- man/Makefile.in.orig	2006-06-27 12:58:55.000000000 +0000
 +++ 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
+@@ -39,8 +39,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
diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad
deleted file mode 100644
index 8e33ab176ba..00000000000
--- a/converters/libiconv/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/07/28 15:15:18 adam Exp $
-
---- configure.orig	2003-07-02 10:34:07.000000000 +0000
-+++ 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 8c982b88360..482fe26b898 100644
--- a/converters/libiconv/patches/patch-ae
+++ b/converters/libiconv/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2006/11/14 13:55:34 joerg Exp $
+$NetBSD: patch-ae,v 1.6 2007/03/20 00:44:53 wiz Exp $
 
---- libcharset/lib/Makefile.in.orig	2005-03-22 17:30:59.000000000 +0100
+--- libcharset/lib/Makefile.in.orig	2006-07-14 13:18:55.000000000 +0000
 +++ libcharset/lib/Makefile.in
 @@ -9,7 +9,7 @@ srcdir = @srcdir@
  prefix = @prefix@
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2006/11/14 13:55:34 joerg Exp $
  
  # Programs used by "make":
  CC = @CC@
-@@ -77,13 +77,13 @@ ref-del.sed : $(srcdir)/ref-del.sin
+@@ -79,13 +79,13 @@ ref-del.sed : $(srcdir)/ref-del.sin
  # Installs the library and include files only. Typically called with only
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.5 2006/11/14 13:55:34 joerg Exp $
  
  # The following is needed in order to install a simple file in $(libdir)
  # which is shared with other installed packages. We use a list of referencing
-@@ -94,7 +94,9 @@ install-lib : all force
+@@ -96,7 +96,9 @@ install-lib : all force
  
  install : all force
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af
index aeaac43d9b7..7c4fe08eb4d 100644
--- a/converters/libiconv/patches/patch-af
+++ b/converters/libiconv/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2004/04/28 15:19:04 tv Exp $
+$NetBSD: patch-af,v 1.2 2007/03/20 00:44:53 wiz Exp $
 
---- lib/Makefile.in.orig	Sun May 18 10:19:16 2003
+--- lib/Makefile.in.orig	2006-07-14 13:18:42.000000000 +0000
 +++ lib/Makefile.in
-@@ -101,13 +101,13 @@ relocatable.lo : $(srcdir)/relocatable.c
+@@ -110,13 +110,13 @@ iconv-exports.lo : $(srcdir)/../woe32dll
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
  	if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi