Tue Sep 6 18:51:14 2011 UTC ()
Link libiconv.la against libcharset.la to fix the build on MirBSD.
Bump PKGREVISION.

Patch was first sent to tech-pkg, no one objected.


(bsiegert)
diff -r1.58 -r1.59 pkgsrc/converters/libiconv/Makefile
diff -r1.35 -r1.36 pkgsrc/converters/libiconv/distinfo
diff -r1.6 -r1.7 pkgsrc/converters/libiconv/patches/patch-af
cvs diff -r1.58 -r1.59 pkgsrc/converters/libiconv/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/libiconv/Makefile 2011/08/22 14:03:36 1.58
+++ pkgsrc/converters/libiconv/Makefile 2011/09/06 18:51:14 1.59
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.58 2011/08/22 14:03:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.59 2011/09/06 18:51:14 bsiegert Exp $
2 2
3DISTNAME= libiconv-1.14 3DISTNAME= libiconv-1.14
4CATEGORIES= converters 4CATEGORIES= converters
5MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/} 5MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
 6PKGREVISION= 1
6 7
7MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
8HOMEPAGE= http://www.gnu.org/software/libiconv/ 9HOMEPAGE= http://www.gnu.org/software/libiconv/
9COMMENT= Character set conversion library 10COMMENT= Character set conversion library
10LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2
11 12
12PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_LANGUAGES+= c c++ 16USE_LANGUAGES+= c c++
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17USE_TOOLS+= pax 18USE_TOOLS+= pax
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.35 -r1.36 pkgsrc/converters/libiconv/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/libiconv/distinfo 2011/08/22 14:03:36 1.35
+++ pkgsrc/converters/libiconv/distinfo 2011/09/06 18:51:14 1.36
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.35 2011/08/22 14:03:36 wiz Exp $ 1$NetBSD: distinfo,v 1.36 2011/09/06 18:51:14 bsiegert Exp $
2 2
3SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99 3SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99
4RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8 4RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8
5Size (libiconv-1.13-cp932.patch.gz) = 178020 bytes 5Size (libiconv-1.13-cp932.patch.gz) = 178020 bytes
6SHA1 (libiconv-1.14.tar.gz) = be7d67e50d72ff067b2c0291311bc283add36965 6SHA1 (libiconv-1.14.tar.gz) = be7d67e50d72ff067b2c0291311bc283add36965
7RMD160 (libiconv-1.14.tar.gz) = 87c36ba3f8ad1a49eb0d06f71856c856893bb52e 7RMD160 (libiconv-1.14.tar.gz) = 87c36ba3f8ad1a49eb0d06f71856c856893bb52e
8Size (libiconv-1.14.tar.gz) = 4984397 bytes 8Size (libiconv-1.14.tar.gz) = 4984397 bytes
9SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce 9SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce
10SHA1 (patch-ab) = f10e4d1de691043acca775eed5c47c6061b31626 10SHA1 (patch-ab) = f10e4d1de691043acca775eed5c47c6061b31626
11SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815 11SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
12SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782 12SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782
13SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6 13SHA1 (patch-af) = 8338647dbf181e908fc52dbc12e7bdff62f7bcb7
cvs diff -r1.6 -r1.7 pkgsrc/converters/libiconv/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/converters/libiconv/patches/Attic/patch-af 2010/11/10 21:00:50 1.6
+++ pkgsrc/converters/libiconv/patches/Attic/patch-af 2011/09/06 18:51:14 1.7
@@ -1,21 +1,31 @@ @@ -1,21 +1,31 @@
1$NetBSD: patch-af,v 1.6 2010/11/10 21:00:50 adam Exp $ 1$NetBSD: patch-af,v 1.7 2011/09/06 18:51:14 bsiegert Exp $
2 2
3--- lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 3--- lib/Makefile.in.orig Sun Aug 7 17:47:39 2011
4+++ lib/Makefile.in 4+++ lib/Makefile.in
5@@ -96,14 +96,14 @@ libiconv.res.lo : $(srcdir)/../windows/l 5@@ -68,7 +68,7 @@ OBJECTS_RES_no =
 6 all : libiconv.la
 7
 8 libiconv.la : $(OBJECTS)
 9- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS)
 10+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) libcharset.la
 11
 12 iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h \
 13 $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def \
 14@@ -96,7 +96,7 @@ libiconv.res.lo : $(srcdir)/../windows/l
6 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. 15 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
7 install-lib : all force 16 install-lib : all force
8 if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi 17 if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
9- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la 18- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
10+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la 19+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la
11  20
12 # On AIX, libiconv.a must include the object files of /lib/libiconv.a, 21 # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
13 # otherwise the setlocale() call fails when invoked from executables linked 22 # otherwise the setlocale() call fails when invoked from executables linked
 23@@ -103,7 +103,7 @@ install-lib : all force
14 # with -rpath $(libdir), even if linked without -liconv. 24 # with -rpath $(libdir), even if linked without -liconv.
15 install : all force 25 install : all force
16 if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi 26 if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
17- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la 27- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
18+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la 28+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
19 case "@host_os@" in \ 29 case "@host_os@" in \
20 aix*) (cd $(DESTDIR)$(libdir) && \ 30 aix*) (cd $(DESTDIR)$(libdir) && \
21 objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \ 31 objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \