diff options
| -rw-r--r-- | converters/libiconv/Makefile | 5 | ||||
| -rw-r--r-- | converters/libiconv/PLIST | 6 | ||||
| -rw-r--r-- | converters/libiconv/distinfo | 9 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-aa | 23 | ||||
| -rw-r--r-- | converters/libiconv/patches/patch-ab | 8 |
5 files changed, 13 insertions, 38 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 9123510b31b..00fc91226b5 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/07/12 06:37:14 grant Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/20 11:52:10 wiz Exp $ # -DISTNAME= libiconv-1.7 -PKGREVISION= 2 +DISTNAME= libiconv-1.8 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/} diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST index 64e403c5d9e..3b490d1a5ad 100644 --- a/converters/libiconv/PLIST +++ b/converters/libiconv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:50:54 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/20 11:52:11 wiz Exp $ bin/iconv include/iconv.h include/libcharset.h @@ -11,8 +11,8 @@ lib/libcharset.so.1.0 lib/libiconv.a lib/libiconv.la lib/libiconv.so -lib/libiconv.so.2 -lib/libiconv.so.2.4 +lib/libiconv.so.3 +lib/libiconv.so.3.0 man/man1/iconv.1 man/man3/iconv.3 man/man3/iconv_close.3 diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index b191280a20a..de08a8a8c8b 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/05/14 15:57:55 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/08/20 11:52:11 wiz Exp $ -SHA1 (libiconv-1.7.tar.gz) = 14232820739d778e0cdbe3aa647aa7ce6ff4d101 -Size (libiconv-1.7.tar.gz) = 2941046 bytes -SHA1 (patch-aa) = 9990fa9faecb6e332a67d7af58cc2c98139a8e0c -SHA1 (patch-ab) = 4859358c291ee59c85fc9e9090e7c6505817bcb4 +SHA1 (libiconv-1.8.tar.gz) = 8894488118c31d3d1f1c6d2f81f61d7e052e9799 +Size (libiconv-1.8.tar.gz) = 3514117 bytes +SHA1 (patch-ab) = a206c213e41555e37a8cac9a93f17dd0664295e7 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895 diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa deleted file mode 100644 index 4ca5859a9a0..00000000000 --- a/converters/libiconv/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$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,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 diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab index 6f06e7c8ac0..30843ebefc1 100644 --- a/converters/libiconv/patches/patch-ab +++ b/converters/libiconv/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2001/05/14 12:14:48 rh Exp $ +$NetBSD: patch-ab,v 1.3 2002/08/20 11:52:14 wiz Exp $ ---- Makefile.in.orig Mon Apr 16 13:58:39 2001 +--- Makefile.in.orig Tue Aug 20 13:38:33 2002 +++ Makefile.in -@@ -27,7 +27,9 @@ +@@ -27,7 +27,9 @@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh all : force @@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.2 2001/05/14 12:14:48 rh Exp $ + cp -pR include/*.h "$$builddir/include" cd lib && $(MAKE) all cd src && $(MAKE) all - cd man && $(MAKE) all + cd po && $(MAKE) all |