summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authordrochner <drochner>2010-02-03 12:45:15 +0000
committerdrochner <drochner>2010-02-03 12:45:15 +0000
commit978681008470e5c6f4b080ad6641b0f3e366c987 (patch)
tree9146c682630b1bc50639bb3ed2fefd91d223e898 /audio
parenteb7af3f86ea58f62750919c0dd89de58b5d69c34 (diff)
downloadpkgsrc-978681008470e5c6f4b080ad6641b0f3e366c987.tar.gz
make "daap" support an option which if off per default -- it depends
on "avahi" bump PKGREVISION
Diffstat (limited to 'audio')
-rw-r--r--audio/rhythmbox/Makefile7
-rw-r--r--audio/rhythmbox/PLIST12
-rw-r--r--audio/rhythmbox/options.mk13
3 files changed, 18 insertions, 14 deletions
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 48c31129400..f5687e676ed 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -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 @@ CONFIGURE_ARGS+= --disable-fm-radio
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 --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index 9f772da34e1..4d058170072 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -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/artist-tmpl.html
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 --git a/audio/rhythmbox/options.mk b/audio/rhythmbox/options.mk
index f1a34537dab..73e1247fbf7 100644
--- a/audio/rhythmbox/options.mk
+++ b/audio/rhythmbox/options.mk
@@ -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 @@ PLIST.hal= yes
.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