diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-08-18 04:12:46 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-08-18 04:12:46 +0800 |
| commit | fedbe71afba7e210cae3bab034830d46f3c3f368 (patch) | |
| tree | 6c258c09282fd78be8b8e69cb13201ec7ef07b24 /sysutils | |
| parent | fc4203fce87788311e54b689a227088b654d0996 (diff) | |
| download | marcuscom-ports-fedbe71afba7e210cae3bab034830d46f3c3f368.tar.gz marcuscom-ports-fedbe71afba7e210cae3bab034830d46f3c3f368.tar.zst marcuscom-ports-fedbe71afba7e210cae3bab034830d46f3c3f368.zip | |
Sync with FreeBSD ports (optionfy pulse).
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14428 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-settings-daemon/Makefile | 21 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon/pkg-plist | 8 |
2 files changed, 21 insertions, 8 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index 820e77b54..7cee0ac34 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.62 2010/04/26 23:24:41 kwm Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.66 2010/07/14 10:22:09 kwm Exp $ # PORTNAME= gnome-settings-daemon @@ -16,8 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon -LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb @@ -27,11 +26,14 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd USE_GETTEXT= yes USE_GSTREAMER= good +USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +OPTIONS= PULSEAUDIO "Enable Pulseaudio support" On + GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \ apps_gnome_settings_daemon_keybindings.schemas \ apps_gnome_settings_daemon_xrandr.schemas \ @@ -40,4 +42,15 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \ desktop_gnome_peripherals_touchpad.schemas \ gnome-settings-daemon.schemas -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(WITHOUT_PULSEAUDIO) +CONFIGURE_ARGS+=--disable-pulse +PLIST_SUB+= PULSEAUDIO="@comment " +.else +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +CONFIGURE_ARGS+=--enable-pulse +PLIST_SUB+= PULSEAUDIO="" +.endif + +.include <bsd.port.post.mk> diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index a63c34736..144568d8c 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -29,9 +29,9 @@ lib/gnome-settings-daemon-2.0/libkeybindings.so lib/gnome-settings-daemon-2.0/libkeyboard.a lib/gnome-settings-daemon-2.0/libkeyboard.la lib/gnome-settings-daemon-2.0/libkeyboard.so -lib/gnome-settings-daemon-2.0/libmedia-keys.a -lib/gnome-settings-daemon-2.0/libmedia-keys.la -lib/gnome-settings-daemon-2.0/libmedia-keys.so +%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.a +%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.la +%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.so lib/gnome-settings-daemon-2.0/libmouse.a lib/gnome-settings-daemon-2.0/libmouse.la lib/gnome-settings-daemon-2.0/libmouse.so @@ -50,7 +50,7 @@ lib/gnome-settings-daemon-2.0/libxrdb.so lib/gnome-settings-daemon-2.0/libxsettings.a lib/gnome-settings-daemon-2.0/libxsettings.la lib/gnome-settings-daemon-2.0/libxsettings.so -lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin +%%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 |