diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /converters | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libiconv/Makefile | 9 | ||||
| -rw-r--r-- | converters/libiconv/PLIST | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 0464cb44e25..9ca74d5eb0f 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/01/13 09:30:57 joerg Exp $ +# $NetBSD: Makefile,v 1.54 2008/04/12 22:42:58 jlam Exp $ DISTNAME= libiconv-1.12 PKGREVISION= 1 @@ -39,13 +39,12 @@ MAKE_JOBS_SAFE= no # ENOENT(srclib) CFLAGS+= -c99 .endif - .include "options.mk" +PLIST_VARS+= preload + .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "OSF1" -PLIST_SUBST+= PRELOADABLE_LIBICONV="" -.else -PLIST_SUBST+= PRELOADABLE_LIBICONV="@comment " +PLIST.preload= yes .endif # remove any existing charset.alias; if it already exists, libiconv does diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST index bcbb09e45d8..c2216e1bdd7 100644 --- a/converters/libiconv/PLIST +++ b/converters/libiconv/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2007/04/12 10:27:15 tnn Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:42:59 jlam Exp $ bin/iconv include/iconv.h include/libcharset.h include/localcharset.h lib/libcharset.la lib/libiconv.la -${PRELOADABLE_LIBICONV}lib/preloadable_libiconv.so +${PLIST.preload}lib/preloadable_libiconv.so man/man1/iconv.1 man/man3/iconv.3 man/man3/iconv_close.3 |