summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-settings-daemon
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-30 06:04:41 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-30 06:04:41 +0800
commit489be98e5d16ddb72a9a413a0648a0621e9adf70 (patch)
tree68c747b98c75d8d98dc1ffddd768f92d318ef074 /sysutils/gnome-settings-daemon
parentc0d4c503d3b0f55557fade43064400459eb6cd56 (diff)
downloadmarcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar.gz
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar.bz2
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar.lz
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar.xz
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.tar.zst
marcuscom-ports-489be98e5d16ddb72a9a413a0648a0621e9adf70.zip
Re-add patch that was lost when g-c-c and g-s-d were splitted. It's for
eject -> cdcontrol eject and apm -> zzz. Bump the PORTREVISION. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10291 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-settings-daemon')
-rw-r--r--sysutils/gnome-settings-daemon/Makefile3
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c26
2 files changed, 28 insertions, 1 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 0c697065f..2c88d39ba 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,11 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.7 2008/01/29 17:31:03 kwm Exp $
+# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.8 2008/01/29 19:03:58 kwm Exp $
#
PORTNAME= gnome-settings-daemon
PORTVERSION= 2.21.90.1
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
new file mode 100644
index 000000000..1db1bb16e
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
@@ -0,0 +1,26 @@
+--- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600
++++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600
+@@ -667,7 +667,11 @@
+ if ((command != NULL) && (strcmp (command, "") != 0)) {
+ execute (manager, command, FALSE, FALSE);
+ } else {
++#if __FreeBSD__
++ execute (manager, "cdcontrol eject", FALSE, FALSE);
++#else
+ execute (manager, "eject -T", FALSE, FALSE);
++#endif
+ }
+
+ g_free (command);
+@@ -869,7 +873,11 @@
+ do_mail_action (manager);
+ break;
+ case SLEEP_KEY:
++#if __FreeBSD__
++ do_sleep_action ("zzz", "xset dpms force off");
++#else
+ do_sleep_action ("apm", "xset dpms force off");
++#endif
+ break;
+ case SCREENSAVER_KEY:
+ if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {