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 /audio/xmms | |
| 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 'audio/xmms')
| -rw-r--r-- | audio/xmms/Makefile | 7 | ||||
| -rw-r--r-- | audio/xmms/Makefile.common | 6 | ||||
| -rw-r--r-- | audio/xmms/PLIST.common | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index b1cdf9e3e9a..a549ce6344a 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2007/12/21 23:23:58 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2008/04/12 22:42:58 jlam Exp $ # .include "Makefile.common" @@ -7,11 +7,12 @@ USE_TOOLS+= msgfmt CONFIGURE_ARGS+= --disable-esd +PLIST_VARS+= cdaudio + .if ${OPSYS} == "Darwin" -PLIST_SUBST+= CDAUDIO="@comment " _INSTALL_UNSTRIPPED= yes .else -PLIST_SUBST+= CDAUDIO="" +PLIST.cdaudio= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index d35807f8d9d..41e0b16b28c 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2007/11/29 18:36:35 wiz Exp $ +# $NetBSD: Makefile.common,v 1.28 2008/04/12 22:42:58 jlam Exp $ # DISTNAME= xmms-1.2.11 @@ -14,6 +14,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes +PLIST_VARS= oss DISTINFO_FILE= ${.CURDIR}/../../audio/xmms/distinfo FILESDIR= ${.CURDIR}/../../audio/xmms/files @@ -65,9 +66,8 @@ post-patch: .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "Linux" && ${OPSYS} != "NetBSD" && \ ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly" CONFIGURE_ARGS+= --disable-oss -PLIST_SUBST+= OSS="@comment " .else -PLIST_SUBST+= OSS="" +PLIST.oss= yes .endif .include "../../audio/libmikmod/buildlink3.mk" diff --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common index 6a5a3daf886..5c752eca9ea 100644 --- a/audio/xmms/PLIST.common +++ b/audio/xmms/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.10 2007/12/06 10:30:53 martti Exp $ +@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:58 jlam Exp $ bin/wmxmms bin/xmms bin/xmms-config @@ -16,13 +16,13 @@ lib/xmms/Effect/libstereo.la lib/xmms/Effect/libvoice.la lib/xmms/General/libir.la lib/xmms/General/libsong_change.la -${CDAUDIO}lib/xmms/Input/libcdaudio.la +${PLIST.cdaudio}lib/xmms/Input/libcdaudio.la lib/xmms/Input/libmikmod.la lib/xmms/Input/libmpg123.la lib/xmms/Input/libtonegen.la lib/xmms/Input/libvorbis.la lib/xmms/Input/libwav.la -${OSS}lib/xmms/Output/libOSS.la +${PLIST.oss}lib/xmms/Output/libOSS.la lib/xmms/Output/libdisk_writer.la lib/xmms/Visualization/libbscope.la lib/xmms/Visualization/libogl_spectrum.la |