Update libiconv to 1.6.1. Notable changes include:

  * Bugfixes
  * The iconv program's -f and -t options are now optional.
  * Many more transliterations.
  * Added CP862 converter.
  * Changed the GB18030 converter.
  * Portability to DOS with DJGPP.

6 files changed, 23 insertions, 23 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index f8b8e307826..0370f75119b 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/14 12:14:47 rh Exp $
 #
 
-DISTNAME=		libiconv-1.5
+DISTNAME=		libiconv-1.6.1
 CATEGORIES=		converters
 MASTER_SITES=		ftp://ftp.ilog.fr/pub/Users/haible/gnu/
 
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 97611679a78..43f6b63aaa7 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:28:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/14 12:14:47 rh Exp $
 
-SHA1 (libiconv-1.5.tar.gz) = f94f74b5d6a36f9b7827c5f80ce2a2473dc301d1
-Size (libiconv-1.5.tar.gz) = 2203472 bytes
-SHA1 (patch-aa) = 0d993f8dd2491e5cbc6f930b43cfe2bc4e704751
-SHA1 (patch-ab) = 8857beb62075e9d28642b30da96ad754eda8442f
+SHA1 (libiconv-1.6.1.tar.gz) = 259abcc264a64873204714a8342fe085b6f34ac9
+Size (libiconv-1.6.1.tar.gz) = 2312409 bytes
+SHA1 (patch-aa) = b170180c457a14276ebc96f73ef9573fb7944e6f
+SHA1 (patch-ab) = 4859358c291ee59c85fc9e9090e7c6505817bcb4
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index 7082f1f77b2..7d381d50761 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/01 17:29:20 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/14 12:14:47 rh Exp $
 
---- libcharset/lib/config.charset.orig	Sun Dec 10 18:07:10 2000
+--- libcharset/lib/config.charset.orig	Sun Mar 11 15:37:53 2001
 +++ libcharset/lib/config.charset
-@@ -204,7 +204,7 @@
+@@ -235,7 +235,7 @@
  	#echo "sun_eu_greek ?" # what is this?
  	echo "UTF-8 UTF-8"
  	;;
 -    freebsd*)
 +    *bsd*)
- 	# FreeBSD 3.3 doesn't have nl_langinfo(CODESET); therefore
+ 	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
  	# localcharset.c falls back to using the full locale name
  	# from the environment variables.
diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab
index 798192f849c..6f06e7c8ac0 100644
--- a/converters/libiconv/patches/patch-ab
+++ b/converters/libiconv/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2001/01/11 10:56:34 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/14 12:14:48 rh Exp $
 
---- Makefile.in.orig	Sat Dec  2 04:00:57 2000
+--- Makefile.in.orig	Mon Apr 16 13:58:39 2001
 +++ Makefile.in
 @@ -27,7 +27,9 @@
  SHELL = /bin/sh
  
  all : force
--	builddir="`pwd`"; cd libcharset && $(MAKE) -r all && $(MAKE) -r install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
-+	builddir="`pwd`"; cd libcharset && $(MAKE) -r all &&		\
-+	cp -pR lib/libcharset.la lib/.libs "$$builddir/lib" &&		\
+-	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
++	builddir="`pwd`"; cd libcharset && $(MAKE) all &&	\
++	cp -pR lib/libcharset.la lib/.libs "$$builddir/lib" &&	\
 +	cp -pR include/*.h "$$builddir/include"
- 	cd lib && $(MAKE) -r all
- 	cd src && $(MAKE) -r all
- 	cd man && $(MAKE) -r all
+ 	cd lib && $(MAKE) all
+ 	cd src && $(MAKE) all
+ 	cd man && $(MAKE) all
diff --git a/converters/libiconv/pkg/PLIST b/converters/libiconv/pkg/PLIST
index 84fd565964d..82f10fe8088 100644
--- a/converters/libiconv/pkg/PLIST
+++ b/converters/libiconv/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:23 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/05/14 12:14:48 rh Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -12,7 +12,7 @@ lib/libiconv.a
 lib/libiconv.la
 lib/libiconv.so
 lib/libiconv.so.2
-lib/libiconv.so.2.2
+lib/libiconv.so.2.3
 man/man1/iconv.1
 man/man3/iconv.3
 man/man3/iconv_close.3
diff --git a/converters/libiconv/pkg/PLIST.SunOS b/converters/libiconv/pkg/PLIST.SunOS
index cccbcef6275..02fee5274c8 100644
--- a/converters/libiconv/pkg/PLIST.SunOS
+++ b/converters/libiconv/pkg/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2001/03/21 15:54:27 tron Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2001/05/14 12:14:48 rh Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -12,7 +12,7 @@ lib/libiconv.a
 lib/libiconv.la
 lib/libiconv.so
 lib/libiconv.so.2
-lib/libiconv.so.2.2
+lib/libiconv.so.2.3
 lib/libiconv_plug.so
 man/man1/iconv.1
 man/man3/iconv.3