summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2005-07-28 15:15:17 +0000
committeradam <adam@pkgsrc.org>2005-07-28 15:15:17 +0000
commitc7919dce642aaf23bae6c51277a52dad249565ef (patch)
treeed3bdd10b0b1a5be3f97b84c9b6984067cfb94d3 /converters
parente0e32d70d32d7efd81ac2847194eed045672b7ac (diff)
downloadpkgsrc-c7919dce642aaf23bae6c51277a52dad249565ef.tar.gz
Changes 1.10:
* Added ISO-8859-11 converter. * Updated the ISO-8859-7 converter. * Added ATARIST converter, available through --enable-extra-encodings. * Added BIG5-2003 converter (experimental), available through --enable-extra-encodings. * Updated EUC-TW converter to include the Euro sign. * The preloadable library has been renamed from libiconv_plug.so to preloadable_libiconv.so. * Portability to mingw.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/Makefile15
-rw-r--r--converters/libiconv/PLIST.Linux4
-rw-r--r--converters/libiconv/PLIST.SunOS4
-rw-r--r--converters/libiconv/PLIST.common4
-rw-r--r--converters/libiconv/distinfo15
-rw-r--r--converters/libiconv/patches/patch-aa6
-rw-r--r--converters/libiconv/patches/patch-ad10
7 files changed, 22 insertions, 36 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index b935269346b..4541263fe26 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2005/05/24 04:36:51 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/28 15:15:17 adam Exp $
-DISTNAME= libiconv-1.9.2
-PKGREVISION= 1
+DISTNAME= libiconv-1.10
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
@@ -9,15 +8,11 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libiconv/
COMMENT= Character set conversion library
-PATCH_SITES= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCHFILES= libiconv-1.9.2-cp932.patch.gz
-PATCH_DIST_STRIP= -p1
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_LIBTOOL= YES
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
TEST_TARGET= check
diff --git a/converters/libiconv/PLIST.Linux b/converters/libiconv/PLIST.Linux
index 1aac58ec200..bd9d4f2c872 100644
--- a/converters/libiconv/PLIST.Linux
+++ b/converters/libiconv/PLIST.Linux
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2003/02/28 22:15:30 grant Exp $
-lib/libiconv_plug.so
+@comment $NetBSD: PLIST.Linux,v 1.2 2005/07/28 15:15:18 adam Exp $
+lib/preloadable_libiconv.so
diff --git a/converters/libiconv/PLIST.SunOS b/converters/libiconv/PLIST.SunOS
index 65cdfe43486..ab7157bd317 100644
--- a/converters/libiconv/PLIST.SunOS
+++ b/converters/libiconv/PLIST.SunOS
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.SunOS,v 1.3 2003/02/28 22:15:31 grant Exp $
-lib/libiconv_plug.so
+@comment $NetBSD: PLIST.SunOS,v 1.4 2005/07/28 15:15:18 adam Exp $
+lib/preloadable_libiconv.so
diff --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST.common
index 6db1abe71c3..d251dceab91 100644
--- a/converters/libiconv/PLIST.common
+++ b/converters/libiconv/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/11/23 12:38:00 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2005/07/28 15:15:18 adam Exp $
bin/iconv
include/iconv.h
include/libcharset.h
@@ -9,10 +9,12 @@ man/man1/iconv.1
man/man3/iconv.3
man/man3/iconv_close.3
man/man3/iconv_open.3
+man/man3/iconvctl.3
share/doc/html/libiconv/iconv.1.html
share/doc/html/libiconv/iconv.3.html
share/doc/html/libiconv/iconv_close.3.html
share/doc/html/libiconv/iconv_open.3.html
+share/doc/html/libiconv/iconvctl.3.html
share/examples/libiconv/charset.alias
@unexec ${RM} -f %D/lib/charset.alias
@dirrm share/examples/libiconv
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 75087554cd4..9e593c7954e 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.20 2005/02/23 16:12:34 agc Exp $
+$NetBSD: distinfo,v 1.21 2005/07/28 15:15:18 adam Exp $
-SHA1 (libiconv-1.9.2.tar.gz) = 41090f57ef638aaf531c964256cc91735e46438f
-RMD160 (libiconv-1.9.2.tar.gz) = ab7dafec4be6ff63074d8a6e08eeb3e5d5c7cca6
-Size (libiconv-1.9.2.tar.gz) = 3919945 bytes
-SHA1 (libiconv-1.9.2-cp932.patch.gz) = 77182d26a7e0ed7961c7e0f1f539921dbf7aaeff
-RMD160 (libiconv-1.9.2-cp932.patch.gz) = 0e808b1eb63e9f395bf92c6747fb8531bd744e0d
-Size (libiconv-1.9.2-cp932.patch.gz) = 106981 bytes
-SHA1 (patch-aa) = b1e27a936302f762afaff2bca937ff30aaeeaf46
+SHA1 (libiconv-1.10.tar.gz) = a0190b476e322775d91ee0eabe4041e3a591f865
+RMD160 (libiconv-1.10.tar.gz) = 33c648775743331adf8dcfbc994179fd2fda6aad
+Size (libiconv-1.10.tar.gz) = 3954075 bytes
+SHA1 (patch-aa) = f845b01e08fbeede13bb1d9e46db4ea9ed0e8d03
SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
-SHA1 (patch-ad) = ffe22ef24e296e978b09886f07409ddcede6d2e2
+SHA1 (patch-ad) = 1e21a1ad8a81141990a2c7982af8576c68c819db
SHA1 (patch-ae) = 626c959de9d4b5276ddf774f6aa68d20bff32184
SHA1 (patch-af) = ee6ce5cf4f2fd0a5606bb23296964f34ca2e165c
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index 204b5a9069a..d80949d889a 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2004/11/23 12:38:00 adam Exp $
+$NetBSD: patch-aa,v 1.8 2005/07/28 15:15:18 adam Exp $
---- src/Makefile.in.orig 2004-11-23 13:27:22.000000000 +0000
+--- src/Makefile.in.orig 2005-07-28 16:45:25.000000000 +0000
+++ src/Makefile.in
@@ -92,7 +92,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$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ 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;; \
esac
diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad
index e0abfb6d2db..8e33ab176ba 100644
--- a/converters/libiconv/patches/patch-ad
+++ b/converters/libiconv/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2004/11/23 12:38:00 adam Exp $
+$NetBSD: patch-ad,v 1.6 2005/07/28 15:15:18 adam Exp $
--- configure.orig 2003-07-02 10:34:07.000000000 +0000
+++ configure
@@ -11,11 +11,3 @@ $NetBSD: patch-ad,v 1.5 2004/11/23 12:38:00 adam Exp $
ac_ext=c
-@@ -13900,6 +13900,7 @@ else
- chmod u+w .
- $rm conftest* out/*
- rmdir out
-+ rm -f core core.* *.core
- cd ..
- rmdir conftest
- $rm conftest*