diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /audio/bmp | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'audio/bmp')
| -rw-r--r-- | audio/bmp/Makefile | 11 | ||||
| -rw-r--r-- | audio/bmp/PLIST | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index 19122a5c801..4ff6ebaefd1 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/03/06 14:53:47 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2008/04/12 22:42:57 jlam Exp $ # BMP_ENABLE_ENCODERS= yes @@ -9,12 +9,11 @@ PKGREVISION= 5 DEPENDS+= unzip-[0-9]*:../../archivers/unzip -.if ${OPSYS} == "Darwin" -PLIST_SUBST+= CDAUDIO="@comment " -.else -PLIST_SUBST+= CDAUDIO="" +PLIST_VARS+= cdaudio +.if ${OPSYS} != "Darwin" +PLIST.cdaudio= yes .endif -PRINT_PLIST_AWK+= /cdaudio/ { print "$${CDAUDIO}" $$0; next } +PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next } # XXX Workaround a crash during shutdown that happens when dlclose(3)ing # any open plugin. libstdc++ gets dynamically linked in when the id3lib diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST index 6ef47bed50e..830e9bc4448 100644 --- a/audio/bmp/PLIST +++ b/audio/bmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/07/31 21:43:55 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:42:58 jlam Exp $ bin/beep-media-player include/bmp/beepctrl.h include/bmp/configdb.h @@ -11,7 +11,7 @@ include/bmp/rcfile.h include/bmp/titlestring.h include/bmp/util.h include/bmp/vfs.h -${CDAUDIO}lib/bmp/Input/libcdaudio.la +${PLIST.cdaudio}lib/bmp/Input/libcdaudio.la lib/bmp/Input/libmpg123.la lib/bmp/Input/libvorbis.la lib/bmp/Input/libwav.la |