From d5e2bf0f0a93ef0d3c29ad2056d1d1a73f1301b9 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 1 Sep 2002 20:24:17 +0000
Subject: Rejoin NetBSD and Solaris package lists which fixes package list
 problems under Solaris.

---
 converters/libiconv/Makefile    |  6 ++++--
 converters/libiconv/PLIST       |  3 ++-
 converters/libiconv/PLIST.SunOS | 20 --------------------
 3 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 converters/libiconv/PLIST.SunOS

(limited to 'converters')

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 14de8804d60..864404f87e6 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 18:38:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/01 20:24:17 tron Exp $
 #
 
 DISTNAME=		libiconv-1.8
@@ -19,7 +19,9 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/libcharset/libtool
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == SunOS)
-PLIST_SRC=		${PKGDIR}/PLIST.${OPSYS}
+PLIST_SUBST+=		SUNOS=
+.else
+PLIST_SUBST+=		SUNOS="@comment "
 .endif
 
 # remove any existing charset.alias; if it already exists, libiconv does
diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST
index b8696161ae0..ec12db558cb 100644
--- a/converters/libiconv/PLIST
+++ b/converters/libiconv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/09/01 20:24:17 tron Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -13,6 +13,7 @@ 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/PLIST.SunOS b/converters/libiconv/PLIST.SunOS
deleted file mode 100644
index ff1fbb810d0..00000000000
--- a/converters/libiconv/PLIST.SunOS
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2001/10/31 21:52:56 zuntum Exp $
-bin/iconv
-include/iconv.h
-include/libcharset.h
-lib/charset.alias
-lib/libcharset.a
-lib/libcharset.la
-lib/libcharset.so
-lib/libcharset.so.1
-lib/libcharset.so.1.0
-lib/libiconv.a
-lib/libiconv.la
-lib/libiconv.so
-lib/libiconv.so.2
-lib/libiconv.so.2.4
-lib/libiconv_plug.so
-man/man1/iconv.1
-man/man3/iconv.3
-man/man3/iconv_close.3
-man/man3/iconv_open.3
-- 
cgit v1.2.3