[pkgsrc/trunk]: pkgsrc/audio/musicpd Finish conversion to options framework.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebb25823059f
branches:  trunk
changeset: 494869:ebb25823059f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 31 16:20:43 2005 +0000

description:
Finish conversion to options framework.
Remove unnecessary inclusion of bsd.prefs.mk.

diffstat:

 audio/musicpd/Makefile   |  10 +---------
 audio/musicpd/options.mk |   9 ++++++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 3eda0ff5a11f -r ebb25823059f audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Tue May 31 16:20:05 2005 +0000
+++ b/audio/musicpd/Makefile    Tue May 31 16:20:43 2005 +0000
@@ -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_PKGINSTALL=                yes
 
 .include "options.mk"
-.include "../../mk/bsd.prefs.mk"
 
 EGDIR=                 ${PREFIX}/share/examples/mpd
 RCD_SCRIPTS=           mpd
@@ -28,13 +27,6 @@
 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 -r 3eda0ff5a11f -r ebb25823059f audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Tue May 31 16:20:05 2005 +0000
+++ b/audio/musicpd/options.mk  Tue May 31 16:20:43 2005 +0000
@@ -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 @@
 .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