Revert recent commit, add a (hopefully) correct patch instead. Bump rev.

In the Makefile.in, libcharset is copied with pax into lib/ along with
its object files. This overwrites relocatable.lo from libiconv, which
is then relinked against the wrong object. Use "libtool --mode=install cp"
instead to only copy the library.

Should hopefully fix PR pkg/45341.

4 files changed, 22 insertions, 22 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 621e92233d2..e78285eab27 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2011/09/06 18:51:14 bsiegert Exp $
+# $NetBSD: Makefile,v 1.60 2011/09/08 16:29:48 bsiegert Exp $
 
 DISTNAME=	libiconv-1.14
+PKGREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
-PKGREVISION=	1
 
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libiconv/
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index a8b3300c73d..cb9d9ab4905 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2011/09/06 18:51:14 bsiegert Exp $
+$NetBSD: distinfo,v 1.37 2011/09/08 16:29:49 bsiegert Exp $
 
 SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99
 RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8
@@ -7,7 +7,7 @@ SHA1 (libiconv-1.14.tar.gz) = be7d67e50d72ff067b2c0291311bc283add36965
 RMD160 (libiconv-1.14.tar.gz) = 87c36ba3f8ad1a49eb0d06f71856c856893bb52e
 Size (libiconv-1.14.tar.gz) = 4984397 bytes
 SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce
-SHA1 (patch-ab) = f10e4d1de691043acca775eed5c47c6061b31626
+SHA1 (patch-ab) = 5ee1e7573d84fb857fb96387653c191008d96b02
 SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
 SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782
-SHA1 (patch-af) = 8338647dbf181e908fc52dbc12e7bdff62f7bcb7
+SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6
diff --git a/converters/libiconv/patches/patch-ab b/converters/libiconv/patches/patch-ab
index 94f4f8e312d..9169e42a2ee 100644
--- a/converters/libiconv/patches/patch-ab
+++ b/converters/libiconv/patches/patch-ab
@@ -1,14 +1,24 @@
-$NetBSD: patch-ab,v 1.10 2010/11/10 21:00:50 adam Exp $
+$NetBSD: patch-ab,v 1.11 2011/09/08 16:29:49 bsiegert Exp $
 
---- Makefile.in.orig	2009-06-21 11:17:33.000000000 +0000
+--- Makefile.in.orig	Sun Jun 21 11:17:09 2009
 +++ Makefile.in
-@@ -39,7 +39,9 @@ all : lib/localcharset.h force
+@@ -25,6 +25,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ mkinstalldirs = $(SHELL) @top_srcdir@/build-aux/mkinstalldirs
+ 
++top_builddir = @top_builddir@
++LIBTOOL = @LIBTOOL@
++
+ #### End of system configuration section. ####
+ 
+ SHELL = /bin/sh
+@@ -39,7 +42,9 @@ all : lib/localcharset.h force
  	if test -d tests; then cd tests && $(MAKE) all; fi
  
  lib/localcharset.h :
 -	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
 +	builddir="`pwd`"; cd libcharset && $(MAKE) all &&	\
-+	${PAX} -rw lib/libcharset.la lib/.libs "$$builddir/" &&	\
++	${LIBTOOL} --mode=install cp lib/libcharset.la "$$builddir/lib/" &&	\
 +	${PAX} -rw include/*.h "$$builddir/"
  
  # Installs the library and include files only. Typically called with only
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af
index 64ddcf802c8..da3502e4646 100644
--- a/converters/libiconv/patches/patch-af
+++ b/converters/libiconv/patches/patch-af
@@ -1,17 +1,8 @@
-$NetBSD: patch-af,v 1.7 2011/09/06 18:51:14 bsiegert Exp $
+$NetBSD: patch-af,v 1.8 2011/09/08 16:29:49 bsiegert Exp $
 
---- lib/Makefile.in.orig	Sun Aug  7 17:47:39 2011
+--- lib/Makefile.in.orig	2009-06-21 11:17:33.000000000 +0000
 +++ lib/Makefile.in
-@@ -68,7 +68,7 @@ OBJECTS_RES_no =
- all : libiconv.la
- 
- libiconv.la : $(OBJECTS)
--	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS)
-+	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) libcharset.la
- 
- 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 \
-@@ -96,7 +96,7 @@ libiconv.res.lo : $(srcdir)/../windows/l
+@@ -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
@@ -20,7 +11,6 @@ $NetBSD: patch-af,v 1.7 2011/09/06 18:51:14 bsiegert Exp $
  
  # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
  # otherwise the setlocale() call fails when invoked from executables linked
-@@ -103,7 +103,7 @@ install-lib : all force
  # with -rpath $(libdir), even if linked without -liconv.
  install : all force
  	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi