Add some more charsets to the alias file (see previous revision).

Fixes e.g. the second gtk2 demo in the gtk2 tutorial on the web.
Patch from libiconv CVS via Owen Tayler.

Bump to 1.7nb2, and depend on it in buildlink.mk.
This commit is contained in:
wiz 2002-05-14 15:57:55 +00:00
parent 96c602805c
commit bd42d28342
4 changed files with 19 additions and 8 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.8 2002/05/10 12:16:41 wiz Exp $
# $NetBSD: Makefile,v 1.9 2002/05/14 15:57:55 wiz Exp $
#
DISTNAME= libiconv-1.7
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= converters
MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/gnu/

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink.mk,v 1.9 2002/05/10 12:16:41 wiz Exp $
# $NetBSD: buildlink.mk,v 1.10 2002/05/14 15:57:55 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.7nb1
BUILDLINK_DEPENDS.iconv?= libiconv>=1.7nb2
DEPENDS+= ${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv
EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=libiconv

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.5 2002/05/10 12:16:41 wiz Exp $
$NetBSD: distinfo,v 1.6 2002/05/14 15:57:55 wiz Exp $
SHA1 (libiconv-1.7.tar.gz) = 14232820739d778e0cdbe3aa647aa7ce6ff4d101
Size (libiconv-1.7.tar.gz) = 2941046 bytes
SHA1 (patch-aa) = 8e9a1d8d28966d038b17eccbe8e157dae3d91d69
SHA1 (patch-aa) = 9990fa9faecb6e332a67d7af58cc2c98139a8e0c
SHA1 (patch-ab) = 4859358c291ee59c85fc9e9090e7c6505817bcb4
SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895

View file

@ -1,12 +1,23 @@
$NetBSD: patch-aa,v 1.3 2002/05/10 12:16:42 wiz Exp $
$NetBSD: patch-aa,v 1.4 2002/05/14 15:57:56 wiz Exp $
--- libcharset/lib/config.charset.orig Mon Jun 25 14:01:22 2001
+++ libcharset/lib/config.charset
@@ -435,4 +435,7 @@
@@ -435,4 +435,18 @@
echo "eo CP850"
echo "eo_EO CP850"
;;
+ netbsd*)
+ echo "646 ASCII"
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO8859-4 ISO-8859-4"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "eucCN GB2312"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "eucTW EUC-TW"
+ echo "BIG5 BIG5"
+ echo "SJIS SHIFT_JIS"
+ ;;
esac