diff options
| author | wiz <wiz@pkgsrc.org> | 2007-01-30 07:05:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-01-30 07:05:58 +0000 |
| commit | 609b0c95c4cd4a732cb1175af3a8616b004bd495 (patch) | |
| tree | f93ea225d8f33e33aa440c24de22e2a86407fc4f /audio | |
| parent | 092674335a51665bfe7777cdb783f61ad60d2852 (diff) | |
| download | pkgsrc-609b0c95c4cd4a732cb1175af3a8616b004bd495.tar.gz | |
Remove PKG_OPTIONS_LEGACY_OPTS after 3 branches, and split
options handling into options.mk file.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/daapd/Makefile | 15 | ||||
| -rw-r--r-- | audio/daapd/options.mk | 13 |
2 files changed, 15 insertions, 13 deletions
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile index 17c1ffab2e7..ccb43eabef5 100644 --- a/audio/daapd/Makefile +++ b/audio/daapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/09/09 02:41:54 obache Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/30 07:05:58 wiz Exp $ DISTNAME= daapd-0.2.4b PKGREVISION= 1 @@ -19,18 +19,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf -PKG_OPTIONS_VAR=PKG_OPTIONS.daapd -PKG_SUPPORTED_OPTIONS=mpeg4ip -# to be removed after 2006Q2 -PKG_OPTIONS_LEGACY_OPTS+=faad:mpeg4ip -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mmpeg4ip) -.include "../../multimedia/mpeg4ip/buildlink3.mk" -MAKE_ENV+= WITH_FAAD=1 -.else -MAKE_ENV+= WITH_FAAD=0 -.endif +.include "options.mk" MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} diff --git a/audio/daapd/options.mk b/audio/daapd/options.mk new file mode 100644 index 00000000000..cdae2451764 --- /dev/null +++ b/audio/daapd/options.mk @@ -0,0 +1,13 @@ +# $NetBSD: options.mk,v 1.1 2007/01/30 07:05:58 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.daapd +PKG_SUPPORTED_OPTIONS= mpeg4ip + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mmpeg4ip) +.include "../../multimedia/mpeg4ip/buildlink3.mk" +MAKE_ENV+= WITH_FAAD=1 +.else +MAKE_ENV+= WITH_FAAD=0 +.endif |