Handle installation and removal of the charset.alias file properly in binary

packages, using SUPPORT_FILES from bsd.pkg.install.mk.  Bump PKGREVISION to 1.

4 files changed, 37 insertions, 9 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 8ebc81428a0..2dc8615ddb1 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/07/21 16:36:12 martti Exp $
+# $NetBSD: Makefile,v 1.21 2003/07/28 10:11:45 jmmv Exp $
 #
 
 DISTNAME=		libiconv-1.9.1
+PKGREVISION=		1
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=libiconv/}
 
@@ -10,6 +11,7 @@ HOMEPAGE=		http://www.gnu.org/software/libiconv/
 COMMENT=		Character set conversion library
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
@@ -17,6 +19,9 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/libcharset/libtool
 
 TEST_TARGET=		check
 
+EGDIR=			${PREFIX}/share/examples/libiconv
+SUPPORT_FILES=		${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
+
 # remove any existing charset.alias; if it already exists, libiconv does
 # not overwrite it, and older versions of libiconv wrote incorrect
 # charset.alias files, which were not removed during deinstall since
@@ -26,6 +31,7 @@ pre-install:
 
 # be sure to install a new charset.alias
 post-install:
-	cd ${WRKSRC}/libcharset/lib && ${MAKE} install-lib
+	cd ${WRKSRC}/libcharset/lib && ${MAKE} libdir=${EGDIR} \
+		install-charset-alias
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST.common
index 7777239193d..ebc3752b2c2 100644
--- a/converters/libiconv/PLIST.common
+++ b/converters/libiconv/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2003/07/13 13:32:30 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2003/07/28 10:11:46 jmmv Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -21,5 +21,6 @@ share/doc/html/libiconv/iconv.1.html
 share/doc/html/libiconv/iconv.3.html
 share/doc/html/libiconv/iconv_close.3.html
 share/doc/html/libiconv/iconv_open.3.html
-@unexec ${RM} %D/lib/charset.alias
+share/examples/libiconv/charset.alias
+@unexec ${RM} -f %D/lib/charset.alias
 @dirrm share/doc/html/libiconv
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index e55dc92fdf9..008cbe3f7bc 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2003/07/13 13:32:30 wiz Exp $
+$NetBSD: distinfo,v 1.12 2003/07/28 10:11:46 jmmv Exp $
 
 SHA1 (libiconv-1.9.1.tar.gz) = f130c93fdf20903ca21bace8b8822f46468c9d65
 Size (libiconv-1.9.1.tar.gz) = 3907735 bytes
 SHA1 (patch-ab) = bfceb0cde182022bdcf181d3214f88ff27acc4b3
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = ae543f1a2483f69960ffa807f11d11ef779e5316
-SHA1 (patch-ae) = d4af960787c8c8e23e3e58753e1d778e2c0fc1e0
+SHA1 (patch-ae) = be3bf77c41432dc2caf0c5696f1f1591bb1b6310
diff --git a/converters/libiconv/patches/patch-ae b/converters/libiconv/patches/patch-ae
index 77045102594..90c183f2caa 100644
--- a/converters/libiconv/patches/patch-ae
+++ b/converters/libiconv/patches/patch-ae
@@ -1,13 +1,34 @@
-$NetBSD: patch-ae,v 1.2 2003/07/13 13:32:30 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2003/07/28 10:11:47 jmmv Exp $
 
---- libcharset/lib/Makefile.in.orig	Mon Apr 14 15:51:06 2003
+--- libcharset/lib/Makefile.in.orig	2003-04-14 15:51:06.000000000 +0200
 +++ libcharset/lib/Makefile.in
-@@ -78,7 +78,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
+@@ -9,7 +9,7 @@ srcdir = @srcdir@
+ prefix = @prefix@
+ local_prefix = /usr/local
+ exec_prefix = @exec_prefix@
+-libdir = @libdir@
++libdir ?= @libdir@
+ 
+ # Programs used by "make":
+ CC = @CC@
+@@ -77,8 +77,10 @@ ref-del.sed : $(srcdir)/ref-del.sin
+ # Installs the library and include files only. Typically called with only
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
++
++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
  	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
+ install : all force
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
++
++install-charset-alias-unused:
+ 	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; \