[pkgsrc/trunk]: pkgsrc/audio/musicpd Introduce "libao" and "curl" options, bo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/762b7f94112a
branches:  trunk
changeset: 556181:762b7f94112a
user:      asau <asau%pkgsrc.org@localhost>
date:      Tue Mar 17 18:16:20 2009 +0000

description:
Introduce "libao" and "curl" options, both "on" by default.
This addresses PRs pkg/36173 and pkg/41027.

While here, add DESTDIR support.

diffstat:

 audio/musicpd/Makefile   |  11 ++++++-----
 audio/musicpd/options.mk |  20 +++++++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diffs (79 lines):

diff -r 039c4bd9cf27 -r 762b7f94112a audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Tue Mar 17 17:58:49 2009 +0000
+++ b/audio/musicpd/Makefile    Tue Mar 17 18:16:20 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2009/01/28 18:06:21 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2009/03/17 18:16:20 asau Exp $
 
 DISTNAME=              mpd-0.14.1
-PKGREVISION=           1
+PKGREVISION=           2
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
 CATEGORIES=            audio
 #MASTER_SITES=         http://musicpd.org/uploads/files/
@@ -14,6 +14,8 @@
 HOMEPAGE=              http://musicpd.org/
 COMMENT=               Remote controllable audio player
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
@@ -38,11 +40,10 @@
        ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff -r 039c4bd9cf27 -r 762b7f94112a audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Tue Mar 17 17:58:49 2009 +0000
+++ b/audio/musicpd/options.mk  Tue Mar 17 18:16:20 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.9 2009/01/28 18:06:21 drochner Exp $
+# $NetBSD: options.mk,v 1.10 2009/03/17 18:16:20 asau Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile flac id3 libmikmod musepack ogg inet6
-PKG_SUGGESTED_OPTIONS= aac audiofile flac id3 musepack ogg
+PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao libmikmod musepack ogg inet6
+PKG_SUGGESTED_OPTIONS= aac audiofile curl flac id3 libao musepack ogg
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,6 +20,13 @@
 CONFIGURE_ARGS+=       --disable-audiofile
 .endif
 
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-curl
+.else
+CONFIGURE_ARGS+=       --disable-curl
+.endif
+
 .if !empty(PKG_OPTIONS:Mflac)
 .  include "../../audio/flac/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-flac
@@ -34,6 +41,13 @@
 CONFIGURE_ARGS+=       --disable-id3
 .endif
 
+.if !empty(PKG_OPTIONS:Mlibao)
+.  include "../../audio/libao/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ao
+.else
+CONFIGURE_ARGS+=       --disable-ao
+.endif
+
 .if !empty(PKG_OPTIONS:Mlibmikmod)
 .  include "../../audio/libmikmod/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-mod