ensure we always install charset.alias and tidy PLIST handling,

improves portability.

6 files changed, 26 insertions, 12 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 30e855fc223..edbdf8dd01c 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/01/03 12:32:59 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/02/28 22:15:29 grant Exp $
 #
 
 DISTNAME=		libiconv-1.8
+PKGREVISION=		1
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=libiconv/}
 
@@ -15,14 +16,6 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libcharset/libtool
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-PLIST_SUBST+=		SUNOS=
-.else
-PLIST_SUBST+=		SUNOS="@comment "
-.endif
-
 # 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
@@ -30,6 +23,10 @@ PLIST_SUBST+=		SUNOS="@comment "
 pre-install:
 	${RM} -f ${PREFIX}/lib/charset.alias
 
+# be sure to install a new charset.alias
+post-install:
+	cd ${WRKSRC}/libcharset/lib && ${MAKE} install-lib
+
 test: build
 	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | tee ${WRKDIR}/check.log
 
diff --git a/converters/libiconv/PLIST.Linux b/converters/libiconv/PLIST.Linux
new file mode 100644
index 00000000000..1aac58ec200
--- /dev/null
+++ b/converters/libiconv/PLIST.Linux
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2003/02/28 22:15:30 grant Exp $
+lib/libiconv_plug.so
diff --git a/converters/libiconv/PLIST.SunOS b/converters/libiconv/PLIST.SunOS
new file mode 100644
index 00000000000..65cdfe43486
--- /dev/null
+++ b/converters/libiconv/PLIST.SunOS
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.SunOS,v 1.3 2003/02/28 22:15:31 grant Exp $
+lib/libiconv_plug.so
diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST.common
index ec12db558cb..afce2dbdaaa 100644
--- a/converters/libiconv/PLIST
+++ b/converters/libiconv/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/09/01 20:24:17 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2003/02/28 22:15:31 grant Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -13,7 +13,6 @@ lib/libiconv.la
 lib/libiconv.so
 lib/libiconv.so.3
 lib/libiconv.so.3.0
-${SUNOS}lib/libiconv_plug.so
 man/man1/iconv.1
 man/man3/iconv.3
 man/man3/iconv_close.3
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index dc529a2bf47..863391e85e2 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2002/11/26 00:51:02 grant Exp $
+$NetBSD: distinfo,v 1.10 2003/02/28 22:15:31 grant Exp $
 
 SHA1 (libiconv-1.8.tar.gz) = 8894488118c31d3d1f1c6d2f81f61d7e052e9799
 Size (libiconv-1.8.tar.gz) = 3514117 bytes
 SHA1 (patch-ab) = 842ef918bb2036e1d9274a63c01c4c3743e9a084
 SHA1 (patch-ac) = 6896d58b242f4c08887061ddf3217bd9b291c895
 SHA1 (patch-ad) = 384cafd6f4c11443d0a539409121543b9201efdd
+SHA1 (patch-ae) = f4cb8da07449a640750f8021a4663fc3eee3fb57
diff --git a/converters/libiconv/patches/patch-ae b/converters/libiconv/patches/patch-ae
new file mode 100644
index 00000000000..8c2584b73bc
--- /dev/null
+++ b/converters/libiconv/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/02/28 22:15:31 grant Exp $
+
+--- libcharset/lib/Makefile.in.orig	Thu Jun 28 09:02:48 2001
++++ libcharset/lib/Makefile.in
+@@ -71,7 +71,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)
+-	$(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; \