Update to 1.12:

New in libiconv-1.12-cp932.patch:
* Changed CP932 converter to use exact mapping table.
* Added WINDOWS-31J, csWINDOWS31J, SJIS-OPEN, SJIS-WIN as aliases for CP932.
* Added EUCJP-MS converter.
* Added EUC-JP-MS, EUCJP-OPEN, EUCJP-WIN as aliases for EUCJP-MS.

New in 1.12:
* The iconv program is now licensed under the GPL version 3, instead of the
  GPL version 2. The libiconv library continues to be licensed under LGPL.
* Added RK1048 converter.
* On AIX, an existing system libiconv no longer causes setlocale() to fail.
* Upgraded EUC-KR, JOHAB to include the Korean postal code sign.

6 files changed, 29 insertions, 42 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 540db621ec8..bb8e42a8c7e 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2007/10/28 02:07:41 taca Exp $
+# $NetBSD: Makefile,v 1.52 2007/11/29 17:05:34 wiz Exp $
 
-DISTNAME=	libiconv-1.11
-PKGREVISION=	1
+DISTNAME=	libiconv-1.12
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
 
@@ -15,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES+=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+#LICENSE=		gnu-gplv3 gnu-lgplv2
 
 # Explicitly disable NLS since libiconv is a dependency for gettext-lib
 # and we don't want libiconv to pick up any NLS functions from libc
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 15de442f5a3..eb5af3bb412 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.26 2007/10/28 02:07:41 taca Exp $
+$NetBSD: distinfo,v 1.27 2007/11/29 17:05:34 wiz Exp $
 
-SHA1 (libiconv-1.11-cp932.patch.gz) = 66996070edcc40d8bc8a3a3805437051cd14893e
-RMD160 (libiconv-1.11-cp932.patch.gz) = 28ca702fb57d6d5e73e5723d32375f131a998c43
-Size (libiconv-1.11-cp932.patch.gz) = 112830 bytes
-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 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625
+RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc
+Size (libiconv-1.12-cp932.patch.gz) = 107962 bytes
+SHA1 (libiconv-1.12.tar.gz) = a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179
+RMD160 (libiconv-1.12.tar.gz) = 74a63c1a2963ac1729c1ac7adfec8fd397a685bd
+Size (libiconv-1.12.tar.gz) = 4513309 bytes
+SHA1 (patch-aa) = 2ae2484e92362fc3ac6ecd06f8c8bf6c634fcda9
 SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc
-SHA1 (patch-ac) = 52183b39c7fab57fc93972a62cbbba79b16ccce6
 SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
-SHA1 (patch-af) = 1bcd89564e20834c605e4a78e6fe1035b515b9a6
+SHA1 (patch-af) = de976e1f97fa5f8b973be1a225ae3e0ee2352851
diff --git a/converters/libiconv/options.mk b/converters/libiconv/options.mk
index 0c6f9ca80d5..093aedc9e9a 100644
--- a/converters/libiconv/options.mk
+++ b/converters/libiconv/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/10/28 02:07:41 taca Exp $
+# $NetBSD: options.mk,v 1.2 2007/11/29 17:05:35 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libiconv
@@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS=	libiconv-cp932
 
 .if !empty(PKG_OPTIONS:Mlibiconv-cp932)
 PATCH_SITES=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCHFILES=	libiconv-1.11-cp932.patch.gz
+PATCHFILES=	libiconv-1.12-cp932.patch.gz
 PATCH_DIST_STRIP=	-p1
 .endif
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index 0e7c11b9f88..af19a94d655 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2007/03/20 00:44:53 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2007/11/29 17:05:35 wiz Exp $
 
---- src/Makefile.in.orig	2006-07-14 13:19:07.000000000 +0000
+--- src/Makefile.in.orig	2007-05-27 22:15:52.000000000 +0000
 +++ src/Makefile.in
-@@ -96,7 +96,7 @@ install : all force
+@@ -104,7 +104,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;; \
--	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
-+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
  	esac
  	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
  
diff --git a/converters/libiconv/patches/patch-ac b/converters/libiconv/patches/patch-ac
deleted file mode 100644
index c54c27c446d..00000000000
--- a/converters/libiconv/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/03/20 00:44:53 wiz Exp $
-
---- man/Makefile.in.orig	2006-06-27 12:58:55.000000000 +0000
-+++ man/Makefile.in
-@@ -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
--	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
- 
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af
index 7c4fe08eb4d..8d037717c1c 100644
--- a/converters/libiconv/patches/patch-af
+++ b/converters/libiconv/patches/patch-af
@@ -1,20 +1,21 @@
-$NetBSD: patch-af,v 1.2 2007/03/20 00:44:53 wiz Exp $
+$NetBSD: patch-af,v 1.3 2007/11/29 17:05:35 wiz Exp $
 
---- lib/Makefile.in.orig	2006-07-14 13:18:42.000000000 +0000
+--- lib/Makefile.in.orig	2007-05-27 22:15:31.000000000 +0000
 +++ lib/Makefile.in
-@@ -110,13 +110,13 @@ iconv-exports.lo : $(srcdir)/../woe32dll
+@@ -118,14 +118,14 @@ libiconv.res : $(srcdir)/../windows/libi
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
  	if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
 +	$(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la
  
+ # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
+ # otherwise the setlocale() call fails when invoked from executables linked
+ # with -rpath $(libdir), even if linked without -liconv.
  install : all force
- 	if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
- 	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
  	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
 +	$(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
- 	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
- 
- installdirs : force
+ 	case "@host_os@" in \
+ 	  aix*) (cd $(DESTDIR)$(libdir) && \
+ 	         objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \