diff options
| author | wiz <wiz@pkgsrc.org> | 2005-05-31 16:20:43 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-05-31 16:20:43 +0000 |
| commit | 93129e0f97ced42f05369175393a735323d85b4f (patch) | |
| tree | c3ea2a820ca7233423c8040e2c1c7899e3d2ddea /audio | |
| parent | 20b17e84242782e4e59bf5eb710307d59cb47ea3 (diff) | |
| download | pkgsrc-93129e0f97ced42f05369175393a735323d85b4f.tar.gz | |
Finish conversion to options framework.
Remove unnecessary inclusion of bsd.prefs.mk.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/musicpd/Makefile | 10 | ||||
| -rw-r--r-- | audio/musicpd/options.mk | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 59c9bc2ef18..c210d3751fb 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:55 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/05/31 16:20:43 wiz Exp $ DISTNAME= mpd-0.11.5 PKGNAME= ${DISTNAME:S/mpd/musicpd/} @@ -15,7 +15,6 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes .include "options.mk" -.include "../../mk/bsd.prefs.mk" EGDIR= ${PREFIX}/share/examples/mpd RCD_SCRIPTS= mpd @@ -28,13 +27,6 @@ SUBST_STAGE.config= pre-configure SUBST_FILES.config= src/main.c SUBST_SED.config= -e s,/etc/mpd.conf,${PKG_SYSCONFDIR}/mpd.conf, -# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address. -#.if defined(USE_INET6) && ${USE_INET6} == "YES" -#CONFIGURE_ARGS+= --enable-ipv6 -#.else -CONFIGURE_ARGS+= --disable-ipv6 -#.endif - post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mpd.conf > ${WRKDIR}/mpd.conf diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index 408b323ac1f..73bfb573664 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.4 2005/05/31 16:20:43 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 ogg @@ -48,3 +48,10 @@ CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis} .else CONFIGURE_ARGS+= --disable-ogg .endif + +# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address. +#.if !empty(PKG_OPTIONS:Minet6) +#CONFIGURE_ARGS+= --enable-ipv6 +#.else +CONFIGURE_ARGS+= --disable-ipv6 +#.endif |