[pkgsrc/trunk]: pkgsrc/audio/rhythmbox make "daap" support an option which if...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53685289d789
branches:  trunk
changeset: 570780:53685289d789
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 03 12:45:15 2010 +0000

description:
make "daap" support an option which if off per default -- it depends
on "avahi"
bump PKGREVISION

diffstat:

 audio/rhythmbox/Makefile   |   7 ++-----
 audio/rhythmbox/PLIST      |  12 ++++++------
 audio/rhythmbox/options.mk |  13 ++++++++++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diffs (77 lines):

diff -r 026b4569ead0 -r 53685289d789 audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile  Wed Feb 03 12:41:52 2010 +0000
+++ b/audio/rhythmbox/Makefile  Wed Feb 03 12:45:15 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2010/01/17 12:02:05 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2010/02/03 12:45:15 drochner Exp $
 #
 
 DISTNAME=      rhythmbox-0.12.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=  .tar.bz2
@@ -26,9 +26,6 @@
 
 GCONF_SCHEMAS=         rhythmbox.schemas
 
-# for DAAP
-.include "../../net/avahi/buildlink3.mk"
-
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
diff -r 026b4569ead0 -r 53685289d789 audio/rhythmbox/PLIST
--- a/audio/rhythmbox/PLIST     Wed Feb 03 12:41:52 2010 +0000
+++ b/audio/rhythmbox/PLIST     Wed Feb 03 12:45:15 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2009/12/09 10:30:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.27 2010/02/03 12:45:15 drochner Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 lib/librhythmbox-core.la
@@ -66,11 +66,11 @@
 lib/rhythmbox/plugins/context/tmpl/loading.html
 lib/rhythmbox/plugins/context/tmpl/lyrics-tmpl.html
 lib/rhythmbox/plugins/context/tmpl/main.css
-lib/rhythmbox/plugins/daap/daap-prefs.ui
-lib/rhythmbox/plugins/daap/daap-ui.xml
-lib/rhythmbox/plugins/daap/daap.rb-plugin
-lib/rhythmbox/plugins/daap/libdaap.la
-lib/rhythmbox/plugins/daap/rb-daap-glue.h
+${PLIST.daap}lib/rhythmbox/plugins/daap/daap-prefs.ui
+${PLIST.daap}lib/rhythmbox/plugins/daap/daap-ui.xml
+${PLIST.daap}lib/rhythmbox/plugins/daap/daap.rb-plugin
+${PLIST.daap}lib/rhythmbox/plugins/daap/libdaap.la
+${PLIST.daap}lib/rhythmbox/plugins/daap/rb-daap-glue.h
 lib/rhythmbox/plugins/generic-player/generic-player-ui.xml
 lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
 lib/rhythmbox/plugins/generic-player/libgeneric-player.la
diff -r 026b4569ead0 -r 53685289d789 audio/rhythmbox/options.mk
--- a/audio/rhythmbox/options.mk        Wed Feb 03 12:41:52 2010 +0000
+++ b/audio/rhythmbox/options.mk        Wed Feb 03 12:45:15 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2009/05/26 20:26:58 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2010/02/03 12:45:15 drochner Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rhythmbox
-PKG_SUPPORTED_OPTIONS= hal
+PKG_SUPPORTED_OPTIONS= hal daap
 PKG_SUGGESTED_OPTIONS= hal
-PLIST_VARS+=           hal
+PLIST_VARS+=           hal daap
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,3 +19,10 @@
 .else
 CONFIGURE_ARGS+=       --without-hal
 .endif
+
+.if !empty(PKG_OPTIONS:Mdaap)
+.include "../../net/avahi/buildlink3.mk"
+PLIST.daap=            yes
+.else
+CONFIGURE_ARGS+=       --disable-daap
+.endif