summaryrefslogtreecommitdiff
path: root/converters/libiconv
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2007-04-12 10:27:15 +0000
committertnn <tnn@pkgsrc.org>2007-04-12 10:27:15 +0000
commit94e884b989c58aea063a82913a6a363aeffe8858 (patch)
tree01e204c4c5eda4bf1c443275ba4477411e5a0cfd /converters/libiconv
parent01ce1119a793c80cc3a65d5b307d15f81fc24d3e (diff)
downloadpkgsrc-94e884b989c58aea063a82913a6a363aeffe8858.tar.gz
Merge platform-specific PLISTs. Suggested by <joerg>
Diffstat (limited to 'converters/libiconv')
-rw-r--r--converters/libiconv/Makefile10
-rw-r--r--converters/libiconv/PLIST (renamed from converters/libiconv/PLIST.common)3
-rw-r--r--converters/libiconv/PLIST.Linux2
-rw-r--r--converters/libiconv/PLIST.OSF12
-rw-r--r--converters/libiconv/PLIST.SunOS2
5 files changed, 11 insertions, 8 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 3e341c73ec3..12b86800867 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -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 @@ REQD_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
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 --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST
index 0f8371d045d..bcbb09e45d8 100644
--- a/converters/libiconv/PLIST.common
+++ b/converters/libiconv/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST.common,v 1.8 2007/03/20 00:44:52 wiz Exp $
+@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
diff --git a/converters/libiconv/PLIST.Linux b/converters/libiconv/PLIST.Linux
deleted file mode 100644
index bd9d4f2c872..00000000000
--- a/converters/libiconv/PLIST.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2005/07/28 15:15:18 adam Exp $
-lib/preloadable_libiconv.so
diff --git a/converters/libiconv/PLIST.OSF1 b/converters/libiconv/PLIST.OSF1
deleted file mode 100644
index e6778f431f5..00000000000
--- a/converters/libiconv/PLIST.OSF1
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.OSF1,v 1.1 2007/04/11 19:29:17 tnn Exp $
-lib/preloadable_libiconv.so
diff --git a/converters/libiconv/PLIST.SunOS b/converters/libiconv/PLIST.SunOS
deleted file mode 100644
index ab7157bd317..00000000000
--- a/converters/libiconv/PLIST.SunOS
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2005/07/28 15:15:18 adam Exp $
-lib/preloadable_libiconv.so