[pkgsrc/trunk]: pkgsrc/converters/libiconv Merge platform-specific PLISTs. Su...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/160883c30ee1
branches:  trunk
changeset: 527704:160883c30ee1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Apr 12 10:27:15 2007 +0000

description:
Merge platform-specific PLISTs. Suggested by <joerg>

diffstat:

 converters/libiconv/Makefile     |  10 +++++++++-
 converters/libiconv/PLIST        |  21 +++++++++++++++++++++
 converters/libiconv/PLIST.Linux  |   2 --
 converters/libiconv/PLIST.OSF1   |   2 --
 converters/libiconv/PLIST.SunOS  |   2 --
 converters/libiconv/PLIST.common |  20 --------------------
 6 files changed, 30 insertions(+), 27 deletions(-)

diffs (91 lines):

diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Thu Apr 12 10:24:06 2007 +0000
+++ b/converters/libiconv/Makefile      Thu Apr 12 10:27:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/03/20 00:44:52 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/04/12 10:27:15 tnn Exp $
 
 DISTNAME=      libiconv-1.11
 CATEGORIES=    converters
@@ -35,6 +35,14 @@
 MAKE_ENV+=             PAX=${PAX:Q}
 MAKE_JOBS_SAFE=                no              # ENOENT(srclib)
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "OSF1"
+PLIST_SUBST+=          PRELOADABLE_LIBICONV=""
+.else
+PLIST_SUBST+=          PRELOADABLE_LIBICONV="@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
diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/libiconv/PLIST Thu Apr 12 10:27:15 2007 +0000
@@ -0,0 +1,21 @@
+@comment $NetBSD: PLIST,v 1.6 2007/04/12 10:27:15 tnn Exp $
+bin/iconv
+include/iconv.h
+include/libcharset.h
+include/localcharset.h
+lib/libcharset.la
+lib/libiconv.la
+${PRELOADABLE_LIBICONV}lib/preloadable_libiconv.so
+man/man1/iconv.1
+man/man3/iconv.3
+man/man3/iconv_close.3
+man/man3/iconv_open.3
+man/man3/iconvctl.3
+share/doc/libiconv/iconv.1.html
+share/doc/libiconv/iconv.3.html
+share/doc/libiconv/iconv_close.3.html
+share/doc/libiconv/iconv_open.3.html
+share/doc/libiconv/iconvctl.3.html
+share/examples/libiconv/charset.alias
+@dirrm share/examples/libiconv
+@dirrm share/doc/libiconv
diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/PLIST.Linux
--- a/converters/libiconv/PLIST.Linux   Thu Apr 12 10:24:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2005/07/28 15:15:18 adam Exp $
-lib/preloadable_libiconv.so
diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/PLIST.OSF1
--- a/converters/libiconv/PLIST.OSF1    Thu Apr 12 10:24:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.OSF1,v 1.1 2007/04/11 19:29:17 tnn Exp $
-lib/preloadable_libiconv.so
diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/PLIST.SunOS
--- a/converters/libiconv/PLIST.SunOS   Thu Apr 12 10:24:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2005/07/28 15:15:18 adam Exp $
-lib/preloadable_libiconv.so
diff -r 7e2c2dec1b37 -r 160883c30ee1 converters/libiconv/PLIST.common
--- a/converters/libiconv/PLIST.common  Thu Apr 12 10:24:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.8 2007/03/20 00:44:52 wiz Exp $
-bin/iconv
-include/iconv.h
-include/libcharset.h
-include/localcharset.h
-lib/libcharset.la
-lib/libiconv.la
-man/man1/iconv.1
-man/man3/iconv.3
-man/man3/iconv_close.3
-man/man3/iconv_open.3
-man/man3/iconvctl.3
-share/doc/libiconv/iconv.1.html
-share/doc/libiconv/iconv.3.html
-share/doc/libiconv/iconv_close.3.html
-share/doc/libiconv/iconv_open.3.html
-share/doc/libiconv/iconvctl.3.html
-share/examples/libiconv/charset.alias
-@dirrm share/examples/libiconv
-@dirrm share/doc/libiconv