summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authortron <tron>2002-09-01 20:24:17 +0000
committertron <tron>2002-09-01 20:24:17 +0000
commit428bd2613466f9459553686a4b8c58779e023d03 (patch)
tree16100173591d1c72dc6c725db79726036151df77 /converters
parent878d07bbbec2971441a70c0fcecc0f702712a8de (diff)
downloadpkgsrc-428bd2613466f9459553686a4b8c58779e023d03.tar.gz
Rejoin NetBSD and Solaris package lists which fixes package list problems
under Solaris.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/Makefile6
-rw-r--r--converters/libiconv/PLIST3
-rw-r--r--converters/libiconv/PLIST.SunOS20
3 files changed, 6 insertions, 23 deletions
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