nb2: use $(INSTALL), not $(INSTALL_DATA), for a library in an autoconfiscated

package.

4 files changed, 32 insertions, 9 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index ecb496fb9a9..118b8f8cef1 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2004/04/02 19:08:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/28 15:19:04 tv Exp $
 #
 
 DISTNAME=		libiconv-1.9.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=libiconv/}
 
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 7976fb92932..88974b2d3f2 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/04/02 19:08:37 jschauma Exp $
+$NetBSD: distinfo,v 1.17 2004/04/28 15:19:04 tv Exp $
 
 SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
 Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
@@ -6,4 +6,5 @@ SHA1 (patch-aa) = c7b0a6c8d95df305a348d45394a87bc2432683ef
 SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = 3e256af27c28b37160a3788c096497241f62d783
-SHA1 (patch-ae) = be3bf77c41432dc2caf0c5696f1f1591bb1b6310
+SHA1 (patch-ae) = 626c959de9d4b5276ddf774f6aa68d20bff32184
+SHA1 (patch-af) = ee6ce5cf4f2fd0a5606bb23296964f34ca2e165c
diff --git a/converters/libiconv/patches/patch-ae b/converters/libiconv/patches/patch-ae
index 90c183f2caa..05c70448e66 100644
--- a/converters/libiconv/patches/patch-ae
+++ b/converters/libiconv/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2003/07/28 10:11:47 jmmv Exp $
+$NetBSD: patch-ae,v 1.4 2004/04/28 15:19:04 tv Exp $
 
---- libcharset/lib/Makefile.in.orig	2003-04-14 15:51:06.000000000 +0200
+--- libcharset/lib/Makefile.in.orig	Mon Apr 14 09:51:06 2003
 +++ libcharset/lib/Makefile.in
 @@ -9,7 +9,7 @@ srcdir = @srcdir@
  prefix = @prefix@
@@ -19,14 +19,16 @@ $NetBSD: patch-ae,v 1.3 2003/07/28 10:11:47 jmmv Exp $
 +install-charset-alias : all force
  	$(mkinstalldirs) $(libdir)
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+#	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
++#	$(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(libdir)/libcharset.la
  	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
  	                                || orig=charset.alias; \
  	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-@@ -95,6 +97,8 @@ install-lib : all force
+@@ -94,7 +96,9 @@ install-lib : all force
+ 
  install : all force
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
++	$(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
 +
 +install-charset-alias-unused:
  	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
diff --git a/converters/libiconv/patches/patch-af b/converters/libiconv/patches/patch-af
new file mode 100644
index 00000000000..aeaac43d9b7
--- /dev/null
+++ b/converters/libiconv/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2004/04/28 15:19:04 tv Exp $
+
+--- lib/Makefile.in.orig	Sun May 18 10:19:16 2003
++++ lib/Makefile.in
+@@ -101,13 +101,13 @@ relocatable.lo : $(srcdir)/relocatable.c
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ install-lib : all force
+ 	if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
++	$(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la
+ 
+ install : all force
+ 	if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
+ 	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
+ 	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
++	$(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
+ 	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
+ 
+ installdirs : force