[pkgsrc/trunk]: pkgsrc/audio/musicpd Convert to use bsd.options.mk, the follo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de02fbc5f188
branches:  trunk
changeset: 484184:de02fbc5f188
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Nov 25 20:16:52 2004 +0000

description:
Convert to use bsd.options.mk, the following options are available:

        aac audiofile flac iconv id3 ogg

# XXX Support for the following variables will be removed after the
# XXX pkgsrc-2004Q4 branch is released:
# XXX
# XXX MUSICPD_WITH_AAC
# XXX MUSICPD_WITH_AUDIOFILE
# XXX MUSICPD_WITH_FLAC
# XXX MUSICPD_WITH_ICONV
# XXX MUSICPD_WITH_ID3
# XXX MUSICPD_WITH_OGG

diffstat:

 audio/musicpd/Makefile   |  61 +---------------------------------
 audio/musicpd/options.mk |  85 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 59 deletions(-)

diffs (173 lines):

diff -r 5bd0783ccc5d -r de02fbc5f188 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Thu Nov 25 20:16:51 2004 +0000
+++ b/audio/musicpd/Makefile    Thu Nov 25 20:16:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/11/11 03:17:07 simonb Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/25 20:16:52 xtraeme Exp $
 
 DISTNAME=              mpd-0.11.5
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
@@ -14,23 +14,9 @@
 USE_LIBTOOL=           yes
 USE_PKGINSTALL=                yes
 
-BUILD_DEFS+=           MUSICPD_WITH_AAC
-BUILD_DEFS+=           MUSICPD_WITH_AUDIOFILE
-BUILD_DEFS+=           MUSICPD_WITH_FLAC
-BUILD_DEFS+=           MUSICPD_WITH_ICONV
-BUILD_DEFS+=           MUSICPD_WITH_ID3
-BUILD_DEFS+=           MUSICPD_WITH_OGG
-#BUILD_DEFS+=          USE_INET6
-
+.include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-MUSICPD_WITH_AAC?=     YES
-MUSICPD_WITH_AUDIOFILE?=YES
-MUSICPD_WITH_FLAC?=    YES
-MUSICPD_WITH_ICONV?=   YES
-MUSICPD_WITH_ID3?=     YES
-MUSICPD_WITH_OGG?=     YES
-
 EGDIR=                 ${PREFIX}/share/examples/mpd
 RCD_SCRIPTS=           mpd
 
@@ -42,49 +28,6 @@
 SUBST_FILES.config=    src/main.c
 SUBST_SED.config=      -e s,/etc/mpd.conf,${PKG_SYSCONFDIR}/mpd.conf,
 
-.if ${MUSICPD_WITH_AAC} == "YES"
-.  include "../../audio/faad2/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-faad=${BUILDLINK_PREFIX.faad2}
-.else
-CONFIGURE_ARGS+=       --disable-aac
-.endif
-
-.if ${MUSICPD_WITH_AUDIOFILE} == "YES"
-.  include "../../audio/libaudiofile/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-audiofile=${BUILDLINK_PREFIX.audiofile}
-CONFIGURE_ENV+=                ac_cv_lib_iconv_iconv_open=yes
-.else
-CONFIGURE_ARGS+=       --disable-audiofile
-.endif
-
-.if ${MUSICPD_WITH_FLAC} == "YES"
-.  include "../../audio/flac/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-flac=${BUILDLINK_PREFIX.flac}
-.else
-CONFIGURE_ARGS+=       --disable-flac
-.endif
-
-.if ${MUSICPD_WITH_ICONV} == "YES"
-.  include "../../converters/libiconv/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
-.else
-CONFIGURE_ARGS+=       --disable-iconv
-.endif
-
-.if ${MUSICPD_WITH_ID3} == "YES"
-.  include "../../audio/libid3tag/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-id3tag=${BUILDLINK_PREFIX.libid3tag}
-.else
-CONFIGURE_ARGS+=       --disable-id3
-.endif
-
-.if ${MUSICPD_WITH_OGG} == "YES"
-.  include "../../audio/libvorbis/buildlink3.mk"
-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 defined(USE_INET6) && ${USE_INET6} == "YES"
 #CONFIGURE_ARGS+=      --enable-ipv6
diff -r 5bd0783ccc5d -r de02fbc5f188 audio/musicpd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/musicpd/options.mk  Thu Nov 25 20:16:52 2004 +0000
@@ -0,0 +1,85 @@
+# $NetBSD: options.mk,v 1.1 2004/11/25 20:16:52 xtraeme Exp $
+#
+# XXX Support for the following variables will be removed after the
+# XXX pkgsrc-2004Q4 branch is released:
+# XXX
+# XXX MUSICPD_WITH_AAC
+# XXX MUSICPD_WITH_AUDIOFILE
+# XXX MUSICPD_WITH_FLAC
+# XXX MUSICPD_WITH_ICONV
+# XXX MUSICPD_WITH_ID3
+# XXX MUSICPD_WITH_OGG
+
+.if defined(MUSICPD_WITH_AAC) && !empty(MUSICPD_WITH_AAC:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  aac
+.endif
+
+.if defined(MUSICPD_WITH_AUDIOFILE) && \
+    !empty(MUSICPD_WITH_AUDIOFILE:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  audiofile
+.endif
+
+.if defined(MUSICPD_WITH_FLAC) && !empty(MUSICPD_WITH_FLAC:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  flac
+.endif
+
+.if defined(MUSICPD_WITH_ICONV) && !empty(MUSICPD_WITH_ICONV:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  iconv
+.endif
+
+.if defined(MUSICPD_WITH_ID3) && !empty(MUSICPD_WITH_ID3:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  id3
+.endif
+
+.if defined(MUSICPD_WITH_OGG) && !empty(MUSICPD_WITH_OGG:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  ogg
+.endif
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
+PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 ogg
+PKG_DEFAULT_OPTIONS+=  aac audiofile flac iconv id3 ogg
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Maac)
+.  include "../../audio/faad2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-faad=${BUILDLINK_PREFIX.faad2}
+.else
+CONFIGURE_ARGS+=       --disable-aac
+.endif
+
+.if !empty(PKG_OPTIONS:Maudiofile)
+.  include "../../audio/libaudiofile/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-audiofile=${BUILDLINK_PREFIX.audiofile}
+CONFIGURE_ENV+=                ac_cv_lib_iconv_iconv_open=yes
+.else
+CONFIGURE_ARGS+=       --disable-audiofile
+.endif
+
+.if !empty(PKG_OPTIONS:Mflac)
+.  include "../../audio/flac/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-flac=${BUILDLINK_PREFIX.flac}
+.else
+CONFIGURE_ARGS+=       --disable-flac
+.endif
+
+.if !empty(PKG_OPTIONS:Miconv)
+.  include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
+.else
+CONFIGURE_ARGS+=       --disable-iconv
+.endif
+
+.if !empty(PKG_OPTIONS:Mid3)
+.  include "../../audio/libid3tag/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-id3tag=${BUILDLINK_PREFIX.libid3tag}
+.else
+CONFIGURE_ARGS+=       --disable-id3
+.endif
+
+.if !empty(PKG_OPTIONS:Mogg)
+.  include "../../audio/libvorbis/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ogg=${BUILDLINK_PREFIX.libvorbis}
+.else
+CONFIGURE_ARGS+=       --disable-ogg
+.endif