diff options
| author | drochner <drochner@pkgsrc.org> | 2011-09-08 20:09:25 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-09-08 20:09:25 +0000 |
| commit | d19ed263ad0bf029fc639671ccafdb69c026700b (patch) | |
| tree | f735eae9113e3fc5b8b3cfccbebf3675dc80cfcd /sysutils/gnome-settings-daemon | |
| parent | bca670bdf639a72365a96243c7d92b21108e25aa (diff) | |
| download | pkgsrc-d19ed263ad0bf029fc639671ccafdb69c026700b.tar.gz | |
make pulseaudio requirement an option (default off, to keep the
status quo), bump PKGREV
Diffstat (limited to 'sysutils/gnome-settings-daemon')
| -rw-r--r-- | sysutils/gnome-settings-daemon/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon/PLIST | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index 2604540a543..ba74ab91579 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2011/08/28 07:44:29 obache Exp $ +# $NetBSD: Makefile,v 1.27 2011/09/08 20:09:25 drochner Exp $ # DISTNAME= gnome-settings-daemon-2.32.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/} EXTRACT_SUFX= .tar.bz2 @@ -29,9 +29,17 @@ GCONF_SCHEMAS+= desktop_gnome_peripherals_touchpad.schemas GCONF_SCHEMAS+= desktop_gnome_peripherals_smartcard.schemas PKGCONFIG_OVERRIDE+= data/gnome-settings-daemon.pc.in +PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-settings-daemon +PKG_SUPPORTED_OPTIONS= pulseaudio +.include "../../mk/bsd.options.mk" +PLIST_VARS+= pulseaudio + +.if !empty(PKG_OPTIONS:Mpulseaudio) +PLIST.pulseaudio= yes BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.15 .include "../../audio/pulseaudio/buildlink3.mk" .include "../../audio/libcanberra/buildlink3.mk" +.endif .include "../../devel/GConf/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.74 diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST index e56eee74071..9ad58f8d7bb 100644 --- a/sysutils/gnome-settings-daemon/PLIST +++ b/sysutils/gnome-settings-daemon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2011/08/28 07:44:29 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2011/09/08 20:09:25 drochner Exp $ include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin @@ -15,14 +15,14 @@ lib/gnome-settings-daemon-2.0/libfont.la lib/gnome-settings-daemon-2.0/libhousekeeping.la lib/gnome-settings-daemon-2.0/libkeybindings.la lib/gnome-settings-daemon-2.0/libkeyboard.la -lib/gnome-settings-daemon-2.0/libmedia-keys.la +${PLIST.pulseaudio}lib/gnome-settings-daemon-2.0/libmedia-keys.la lib/gnome-settings-daemon-2.0/libmouse.la lib/gnome-settings-daemon-2.0/libsound.la lib/gnome-settings-daemon-2.0/libtyping-break.la lib/gnome-settings-daemon-2.0/libxrandr.la lib/gnome-settings-daemon-2.0/libxrdb.la lib/gnome-settings-daemon-2.0/libxsettings.la -lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin +${PLIST.pulseaudio}lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin |