summaryrefslogtreecommitdiff
path: root/converters/libiconv
diff options
context:
space:
mode:
Diffstat (limited to 'converters/libiconv')
-rw-r--r--converters/libiconv/Makefile9
-rw-r--r--converters/libiconv/PLIST4
-rw-r--r--converters/libiconv/builtin.mk4
-rw-r--r--converters/libiconv/distinfo24
-rw-r--r--converters/libiconv/options.mk4
-rw-r--r--converters/libiconv/patches/patch-aa14
-rw-r--r--converters/libiconv/patches/patch-ab6
-rw-r--r--converters/libiconv/patches/patch-ac18
-rw-r--r--converters/libiconv/patches/patch-ae12
-rw-r--r--converters/libiconv/patches/patch-af53
-rw-r--r--converters/libiconv/patches/patch-ag19
11 files changed, 42 insertions, 125 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 208e73270e4..b4bdb107d66 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/11/10 21:00:49 adam Exp $
-DISTNAME= libiconv-1.12
-PKGREVISION= 1
+DISTNAME= libiconv-1.13.1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
@@ -57,7 +56,7 @@ pre-install:
# be sure to install a new charset.alias
post-install:
- cd ${WRKSRC}/libcharset/lib && ${MAKE} libdir=${EGDIR} DESTDIR=${DESTDIR:Q} \
- install-charset-alias
+ cd ${WRKSRC}/libcharset/lib && \
+ ${MAKE} libdir=${EGDIR} DESTDIR=${DESTDIR} install-charset-alias
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST
index ac346b6ac81..24e9b745a7d 100644
--- a/converters/libiconv/PLIST
+++ b/converters/libiconv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:39:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/11/10 21:00:49 adam Exp $
bin/iconv
include/iconv.h
include/libcharset.h
@@ -10,10 +10,12 @@ man/man1/iconv.1
man/man3/iconv.3
man/man3/iconv_close.3
man/man3/iconv_open.3
+man/man3/iconv_open_into.3
man/man3/iconvctl.3
share/doc/libiconv/iconv.1.html
share/doc/libiconv/iconv.3.html
share/doc/libiconv/iconv_close.3.html
share/doc/libiconv/iconv_open.3.html
+share/doc/libiconv/iconv_open_into.3.html
share/doc/libiconv/iconvctl.3.html
share/examples/libiconv/charset.alias
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 678df0ed1dd..ed78f05c0f6 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.20 2010/08/30 02:04:58 obache Exp $
+# $NetBSD: builtin.mk,v 1.21 2010/11/10 21:00:49 adam Exp $
BUILTIN_PKG:= iconv
@@ -161,7 +161,7 @@ BUILDLINK_TRANSFORM+= rm:-liconv
. if defined(GNU_CONFIGURE)
. if !empty(USE_BUILTIN.iconv:M[nN][oO])
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv:Q}
+CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
. else
CONFIGURE_ARGS+= --without-libiconv-prefix
. endif
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 0c74bb68045..dfe31e1d1ad 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.33 2010/01/30 10:24:29 obache Exp $
+$NetBSD: distinfo,v 1.34 2010/11/10 21:00:49 adam Exp $
-SHA1 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625
-RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc
-Size (libiconv-1.12-cp932.patch.gz) = 107962 bytes
-SHA1 (libiconv-1.12.tar.gz) = a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179
-RMD160 (libiconv-1.12.tar.gz) = 74a63c1a2963ac1729c1ac7adfec8fd397a685bd
-Size (libiconv-1.12.tar.gz) = 4513309 bytes
-SHA1 (patch-aa) = 2ae2484e92362fc3ac6ecd06f8c8bf6c634fcda9
-SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc
-SHA1 (patch-ac) = a27e8ab5a776a2bc8b2c790eabff5c15985d9584
+SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99
+RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8
+Size (libiconv-1.13-cp932.patch.gz) = 178020 bytes
+SHA1 (libiconv-1.13.1.tar.gz) = 5b0524131cf0d7abd50734077f13aaa5508f6bbe
+RMD160 (libiconv-1.13.1.tar.gz) = a3e4b4d419006447045fde50fef0fe39bed9d501
+Size (libiconv-1.13.1.tar.gz) = 4716070 bytes
+SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce
+SHA1 (patch-ab) = f10e4d1de691043acca775eed5c47c6061b31626
SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
-SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
-SHA1 (patch-af) = 83c65b3b2d8a7e8ed83246258523a8d2f2b49c41
-SHA1 (patch-ag) = f2ac1a4ecb30e328e6cccdfac47789e03e65c31d
+SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782
+SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6
diff --git a/converters/libiconv/options.mk b/converters/libiconv/options.mk
index 093aedc9e9a..ebf77125817 100644
--- a/converters/libiconv/options.mk
+++ b/converters/libiconv/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/11/29 17:05:35 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2010/11/10 21:00:49 adam Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.libiconv
@@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS= libiconv-cp932
.if !empty(PKG_OPTIONS:Mlibiconv-cp932)
PATCH_SITES= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCHFILES= libiconv-1.12-cp932.patch.gz
+PATCHFILES= libiconv-1.13-cp932.patch.gz
PATCH_DIST_STRIP= -p1
.endif
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index af19a94d655..908bcbeea05 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2007/11/29 17:05:35 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2010/11/10 21:00:50 adam Exp $
---- src/Makefile.in.orig 2007-05-27 22:15:52.000000000 +0000
+--- src/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000
+++ src/Makefile.in
-@@ -104,7 +104,7 @@ install : all force
+@@ -113,7 +113,7 @@ install : all force
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
- hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
-- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
-+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
esac
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab
index 1c112002414..94f4f8e312d 100644
--- a/converters/libiconv/patches/patch-ab
+++ b/converters/libiconv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2007/03/20 00:44:53 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2010/11/10 21:00:50 adam Exp $
---- Makefile.in.orig 2006-07-14 13:14:17.000000000 +0000
+--- Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000
+++ Makefile.in
-@@ -38,7 +38,9 @@ all : lib/localcharset.h force
+@@ -39,7 +39,9 @@ all : lib/localcharset.h force
if test -d tests; then cd tests && $(MAKE) all; fi
lib/localcharset.h :
diff --git a/converters/libiconv/patches/patch-ac b/converters/libiconv/patches/patch-ac
deleted file mode 100644
index 557a15791bc..00000000000
--- a/converters/libiconv/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2008/01/08 22:08:37 sketch Exp $
-
---- configure.orig Tue Jan 8 21:38:03 2008
-+++ configure Tue Jan 8 21:38:25 2008
-@@ -25733,13 +25733,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Test preprocessor. */
-- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-- error in preprocessor;
-- #endif
-- #if ! (18446744073709551615ULL <= -1ull)
-- error in preprocessor;
-- #endif
- /* Test literals. */
- long long int ll = 9223372036854775807ll;
- long long int nll = -9223372036854775807LL;
diff --git a/converters/libiconv/patches/patch-ae b/converters/libiconv/patches/patch-ae
index 482fe26b898..567333a9333 100644
--- a/converters/libiconv/patches/patch-ae
+++ b/converters/libiconv/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2007/03/20 00:44:53 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2010/11/10 21:00:50 adam Exp $
---- libcharset/lib/Makefile.in.orig 2006-07-14 13:18:55.000000000 +0000
+--- libcharset/lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000
+++ libcharset/lib/Makefile.in
@@ -9,7 +9,7 @@ srcdir = @srcdir@
prefix = @prefix@
@@ -32,10 +32,10 @@ $NetBSD: patch-ae,v 1.6 2007/03/20 00:44:53 wiz Exp $
# The following is needed in order to install a simple file in $(libdir)
# which is shared with other installed packages. We use a list of referencing
-@@ -96,7 +96,9 @@ install-lib : all force
-
- install : all force
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+@@ -108,7 +108,9 @@ install : all force
+ need_charset_alias=false ; \
+ fi ; \
+ $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+ $(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af
index 3a7b7f3a25a..77388530a2f 100644
--- a/converters/libiconv/patches/patch-af
+++ b/converters/libiconv/patches/patch-af
@@ -1,53 +1,8 @@
-$NetBSD: patch-af,v 1.5 2010/01/06 21:01:09 tron Exp $
+$NetBSD: patch-af,v 1.6 2010/11/10 21:00:50 adam Exp $
---- lib/Makefile.in.orig 2007-05-27 23:15:31.000000000 +0100
-+++ lib/Makefile.in 2010-01-06 20:53:18.000000000 +0000
-@@ -69,35 +69,15 @@
- libiconv.la : $(OBJECTS)
- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS)
-
--preloadable_libiconv.so : preloadable_libiconv_@OS@.so
-- $(RM) preloadable_libiconv.so
-- $(LN_S) preloadable_libiconv_@OS@.so preloadable_libiconv.so
--
--preloadable_libiconv_linux.so : $(SOURCES)
-- if test -n "@GCC@"; then \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
-- else \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
-- fi
--
--preloadable_libiconv_solaris.so : $(SOURCES)
-- if test -n "@GCC@"; then \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_solaris.so; \
-- else \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -G -o preloadable_libiconv_solaris.so; \
-- fi
--
--preloadable_libiconv_osf.so : $(SOURCES)
-- if test -n "@GCC@"; then \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_osf.so; \
-- else \
-- mkdir objects; \
-- for f in $(SOURCES); do \
-- $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'`; \
-- done; \
-- /bin/ld -shared -expect_unresolved \* -o preloadable_libiconv_osf.so objects/*.o; \
-- rm -rf objects; \
-- fi
-+preloadable_libiconv.so : $(SOURCES)
-+ $(RM) -rf objects
-+ mkdir objects && \
-+ for f in $(SOURCES); do \
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'` || exit 1; \
-+ done && \
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o objects/libiconv.la -rpath $(libdir) -no-undefined objects/*.lo && \
-+ cp objects/.libs/libiconv.so preloadable_libiconv.so
-+ $(RM) -rf objects
-
- iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/iconv.c
-@@ -118,14 +98,14 @@
+--- lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000
++++ lib/Makefile.in
+@@ -96,14 +96,14 @@ libiconv.res.lo : $(srcdir)/../windows/l
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
install-lib : all force
if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
diff --git a/converters/libiconv/patches/patch-ag b/converters/libiconv/patches/patch-ag
deleted file mode 100644
index c4e544e6510..00000000000
--- a/converters/libiconv/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/01/30 10:24:29 obache Exp $
-
-Treat Haiku like BeOS
-
-http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=40d88197eef9efb44102f8fd6ce10141ca61fb3c
-
---- srclib/binary-io.h.orig 2007-10-23 23:31:23.000000000 +0000
-+++ srclib/binary-io.h
-@@ -30,8 +30,8 @@
- # define O_BINARY _O_BINARY
- # define O_TEXT _O_TEXT
- #endif
--#ifdef __BEOS__
-- /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
-+#if defined __BEOS__ || defined __HAIKU__
-+ /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */
- # undef O_BINARY
- # undef O_TEXT
- #endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 18:53:09 +0000