From 723604bb8408b564147d9438a742b739165de646 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 15 Jun 2009 03:51:57 +0000 Subject: Update to 1.13. Note: the iconv(1) utility is now licensed under GPLv3. The library is still licensed under the LGPL. PR: 131769 Submitted by: Takeshi Taguchi (based on) --- converters/libiconv/Makefile | 11 +++++----- converters/libiconv/distinfo | 9 +++----- converters/libiconv/files/patch-ae | 28 +++++++++++++----------- converters/libiconv/files/patch-lib_Makefile.in | 12 +++++----- converters/libiconv/files/patch-src::Makefile.in | 12 +++++----- converters/libiconv/pkg-plist | 1 + 6 files changed, 37 insertions(+), 36 deletions(-) (limited to 'converters') diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 1bfbe16692a..6d55ce1a267 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libiconv -PORTVERSION= 1.11 -PORTREVISION= 1 +PORTVERSION= 1.13 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,11 +23,13 @@ CONFIGURE_ARGS= --enable-static \ --without-libintl-prefix \ --docdir=${DOCSDIR} USE_LDCONFIG= yes -CONFIGURE_ENV= gl_cv_cc_visibility="no" +CONFIGURE_ENV= gl_cv_cc_visibility="no" \ + am_cv_func_iconv="yes" \ + am_cv_proto_iconv_arg1="const" MAKE_JOBS_UNSAFE= yes MAN1= iconv.1 -MAN3= iconv.3 iconv_open.3 iconv_close.3 iconvctl.3 +MAN3= iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3 OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \ EXTRA_PATCHES "Apply patches to fix CP932 add EUCJP-MS" off @@ -48,7 +49,7 @@ CONFIGURE_ARGS+= --enable-extra-encodings PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= nork -PATCHFILES+= ${DISTNAME}-cp932.patch.gz +PATCHFILES+= ${DISTNAME}-ja-4.patch.gz PATCH_DIST_STRIP+= -p1 .endif diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index ead1d6c2a43..3e041ece75e 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,6 +1,3 @@ -MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e -SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b -SIZE (libiconv-1.11.tar.gz) = 4430930 -MD5 (libiconv-1.11-cp932.patch.gz) = 1d6c7711b6ec76c9c42230d8e097baa0 -SHA256 (libiconv-1.11-cp932.patch.gz) = 48ed20ab2bd59d9af9fa6d4328b363849bf0e155b70bdbe137dc8973341b65d1 -SIZE (libiconv-1.11-cp932.patch.gz) = 112830 +MD5 (libiconv-1.13.tar.gz) = 048032a3032ebd182150bdee30a5d533 +SHA256 (libiconv-1.13.tar.gz) = 8a4fc94bcecf87fd7f39104d356d3c4c307cad390721e65973988430a2519cf6 +SIZE (libiconv-1.13.tar.gz) = 4731530 diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae index 196d15361b5..d9b1009744a 100644 --- a/converters/libiconv/files/patch-ae +++ b/converters/libiconv/files/patch-ae @@ -1,6 +1,6 @@ ---- libcharset/lib/Makefile.in.orig Mon Apr 14 22:51:06 2003 -+++ libcharset/lib/Makefile.in Sat Jul 10 02:37:15 2004 -@@ -10,6 +10,7 @@ +--- libcharset/lib/Makefile.in.orig 2009-03-26 08:01:00.000000000 -0400 ++++ libcharset/lib/Makefile.in 2009-06-06 15:28:00.000000000 -0400 +@@ -10,6 +10,7 @@ prefix = @prefix@ local_prefix = /usr/local exec_prefix = @exec_prefix@ libdir = @libdir@ @@ -8,7 +8,7 @@ # Programs used by "make": CC = @CC@ -@@ -42,7 +43,7 @@ +@@ -44,7 +45,7 @@ SHELL = /bin/sh # Before making a release, change this according to the libtool documentation, # section "Library interface versions". @@ -17,8 +17,8 @@ # Needed by $(LIBTOOL). top_builddir = .. -@@ -57,7 +58,7 @@ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS) +@@ -59,7 +60,7 @@ libcharset.la : $(OBJECTS) + $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS) localcharset.lo : $(srcdir)/localcharset.c - $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c @@ -26,7 +26,7 @@ relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c -@@ -78,7 +79,7 @@ +@@ -80,7 +81,7 @@ ref-del.sed : $(srcdir)/ref-del.sin # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. install-lib : all force $(mkinstalldirs) $(libdir) @@ -35,21 +35,23 @@ test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ || orig=charset.alias; \ sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ -@@ -95,15 +96,16 @@ - install : all force - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la +@@ -108,16 +109,17 @@ install : all force + need_charset_alias=false ; \ + fi ; \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ +- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ - $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ - rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \ ++ $(LIBTOOL_INSTALL) cp libcharset.la $(DESTDIR)$(libdir)/libcharset.la + if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \ + sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ + $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ + rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ else \ - if test @GLIBC21@ = no; then \ + if $$need_charset_alias; then \ - sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ - $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ - rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in index 1731460465a..d91a17541e7 100644 --- a/converters/libiconv/files/patch-lib_Makefile.in +++ b/converters/libiconv/files/patch-lib_Makefile.in @@ -1,11 +1,11 @@ ---- lib/Makefile.in.orig Fri Jul 14 09:18:42 2006 -+++ lib/Makefile.in Fri Jun 29 18:30:13 2007 -@@ -48,7 +48,7 @@ SHELL = /bin/sh +--- lib/Makefile.in.orig 2009-03-25 22:14:26.000000000 -0400 ++++ lib/Makefile.in 2009-06-06 15:26:31.000000000 -0400 +@@ -50,7 +50,7 @@ SHELL = /bin/sh # Before making a release, change this according to the libtool documentation, # section "Library interface versions". --LIBICONV_VERSION_INFO = 6:0:4 +-LIBICONV_VERSION_INFO = 7:0:5 +LIBICONV_VERSION_INFO = 3 - # Needed by $(LIBTOOL). - top_builddir = .. + PACKAGE_VERSION = @VERSION@ + diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in index 52b5865d3fd..8d528faa553 100644 --- a/converters/libiconv/files/patch-src::Makefile.in +++ b/converters/libiconv/files/patch-src::Makefile.in @@ -1,10 +1,10 @@ ---- src/Makefile.in.orig Fri Jul 14 09:19:07 2006 -+++ src/Makefile.in Fri Jun 29 18:31:59 2007 -@@ -96,6 +96,7 @@ install : all force +--- src/Makefile.in.orig 2007-05-28 07:15:52.000000000 +0900 ++++ src/Makefile.in 2009-01-28 10:25:10.000000000 +0900 +@@ -104,6 +104,7 @@ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi case "@host_os@" in \ - 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;; \ -+ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \ - *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -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;; \ ++ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \ esac $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index aca2a2d8412..884a181b62a 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -15,5 +15,6 @@ libdata/charset.alias %%DOCSDIR%%/iconv.3.html %%DOCSDIR%%/iconv_close.3.html %%DOCSDIR%%/iconv_open.3.html +%%DOCSDIR%%/iconv_open_into.3.html %%DOCSDIR%%/iconvctl.3.html @dirrm %%DOCSDIR%% -- cgit