Fix charset.alias file, the same as it is in the current glib2 distribution

and as it will be in the next release of libiconv.
This should fix the pango build failures on -current.
Tracked down by Owen Taylor.

Bump version to 1.7nb1, and bump buildlink dependency, too.

4 files changed, 22 insertions, 15 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 9f3207157e3..52d6d3b558f 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/04/24 02:56:15 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/10 12:16:41 wiz Exp $
 #
 
 DISTNAME=		libiconv-1.7
+PKGREVISION=		1
 CATEGORIES=		converters
 MASTER_SITES=		ftp://ftp.ilog.fr/pub/Users/haible/gnu/
 
@@ -22,6 +23,13 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/libcharset/libtool
 PLIST_SRC=		${PKGDIR}/PLIST.${OPSYS}
 .endif
 
+# remove any existing charset.alias; if it already exists, libiconv does
+# not overwrite it, and older versions of libiconv wrote incorrect
+# charset.alias files, which were not removed during deinstall since
+# other packages touched them.
+pre-install:
+	${RM} -f ${PREFIX}/lib/charset.alias
+
 test: build
 	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check |& tee ${WRKDIR}/check.log
 
diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index c75e24373c5..82fadd4d7bf 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/27 13:33:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/05/10 12:16:41 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libiconv.
 #
@@ -17,7 +17,7 @@ ICONV_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.iconv?=	libiconv>=1.5
+BUILDLINK_DEPENDS.iconv?=	libiconv>=1.7nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.iconv=libiconv
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index b179ac8305a..6700941ca97 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/10/30 17:41:20 drochner Exp $
+$NetBSD: distinfo,v 1.5 2002/05/10 12:16:41 wiz Exp $
 
 SHA1 (libiconv-1.7.tar.gz) = 14232820739d778e0cdbe3aa647aa7ce6ff4d101
 Size (libiconv-1.7.tar.gz) = 2941046 bytes
-SHA1 (patch-aa) = b170180c457a14276ebc96f73ef9573fb7944e6f
+SHA1 (patch-aa) = 8e9a1d8d28966d038b17eccbe8e157dae3d91d69
 SHA1 (patch-ab) = 4859358c291ee59c85fc9e9090e7c6505817bcb4
 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index 7d381d50761..1a9ed16e0ba 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2001/05/14 12:14:47 rh Exp $
+$NetBSD: patch-aa,v 1.3 2002/05/10 12:16:42 wiz Exp $
 
---- libcharset/lib/config.charset.orig	Sun Mar 11 15:37:53 2001
+--- libcharset/lib/config.charset.orig	Mon Jun 25 14:01:22 2001
 +++ libcharset/lib/config.charset
-@@ -235,7 +235,7 @@
- 	#echo "sun_eu_greek ?" # what is this?
- 	echo "UTF-8 UTF-8"
+@@ -435,4 +435,7 @@
+ 	echo "eo CP850"
+ 	echo "eo_EO CP850"
  	;;
--    freebsd*)
-+    *bsd*)
- 	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
- 	# localcharset.c falls back to using the full locale name
- 	# from the environment variables.
++     netbsd*)
++	echo "646 ASCII"
++	;;
+ esac