Thu Dec 18 15:56:13 2008 UTC ()
If PREFIX/bin/esdcompat is found, prefer it over PREFIX/bin/esd.
Bump PKGREVISION.


(jmcneill)
diff -r1.10 -r1.11 pkgsrc/sysutils/gnome-settings-daemon/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/gnome-settings-daemon/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-ab
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/gnome-settings-daemon/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/Makefile 2008/12/02 16:24:17 1.10
+++ pkgsrc/sysutils/gnome-settings-daemon/Makefile 2008/12/18 15:56:13 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2008/12/02 16:24:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2008/12/18 15:56:13 jmcneill Exp $
2# 2#
3 3
4DISTNAME= gnome-settings-daemon-2.24.1 4DISTNAME= gnome-settings-daemon-2.24.1
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
11COMMENT= GNOME settings daemon 12COMMENT= GNOME settings daemon
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config intltool gmake msgfmt 18USE_TOOLS+= pkg-config intltool gmake msgfmt
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/gnome-settings-daemon/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/distinfo 2008/12/02 16:24:17 1.6
+++ pkgsrc/sysutils/gnome-settings-daemon/distinfo 2008/12/18 15:56:13 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2008/12/02 16:24:17 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2008/12/18 15:56:13 jmcneill Exp $
2 2
3SHA1 (gnome-settings-daemon-2.24.1.tar.bz2) = d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 3SHA1 (gnome-settings-daemon-2.24.1.tar.bz2) = d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3
4RMD160 (gnome-settings-daemon-2.24.1.tar.bz2) = 27d432cd217a836fcef0deac5f80f638a73cda7c 4RMD160 (gnome-settings-daemon-2.24.1.tar.bz2) = 27d432cd217a836fcef0deac5f80f638a73cda7c
5Size (gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 bytes 5Size (gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 bytes
6SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db 6SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
7SHA1 (patch-ab) = 60620de4803cce1afb3276a061de2c833d8ef23b 7SHA1 (patch-ab) = 28315b12cb41d4c1072f6dd683c2e23eedc116b3
8SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23 8SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
9SHA1 (patch-ad) = dd3a45da76f0d9e728240adacc01aa5251db0342 9SHA1 (patch-ad) = dd3a45da76f0d9e728240adacc01aa5251db0342
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-ab 2008/04/11 19:12:09 1.1.1.1
+++ pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-ab 2008/12/18 15:56:13 1.2
@@ -1,12 +1,46 @@ @@ -1,12 +1,46 @@
1$NetBSD: patch-ab,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $ 1$NetBSD: patch-ab,v 1.2 2008/12/18 15:56:13 jmcneill Exp $
2 2
3--- plugins/sound/gsd-sound-manager.c.orig 2008-04-10 20:35:19.000000000 +0200 3--- plugins/sound/gsd-sound-manager.c.orig 2008-11-24 18:02:41.000000000 -0500
4+++ plugins/sound/gsd-sound-manager.c 4+++ plugins/sound/gsd-sound-manager.c
5@@ -28,6 +28,7 @@ 5@@ -21,6 +21,7 @@
 6
 7 #include "config.h"
 8
 9+#include <sys/stat.h>
 10 #include <sys/types.h>
 11 #include <sys/wait.h>
 12 #include <stdlib.h>
 13@@ -28,6 +29,7 @@
6 #include <unistd.h> 14 #include <unistd.h>
7 #include <string.h> 15 #include <string.h>
8 #include <errno.h> 16 #include <errno.h>
9+#include <signal.h> 17+#include <signal.h>
10  18
11 #include <locale.h> 19 #include <locale.h>
12  20
 21@@ -97,16 +99,24 @@ reset_esd_pid (GPid pid,
 22 static gboolean
 23 start_gnome_sound (GsdSoundManager *manager)
 24 {
 25- char *argv[] = { ESD_LOCATION "esd", "-nobeeps", NULL};
 26+ char **argv;
 27+ char *argv_esd[] = { ESD_LOCATION "esd", "-nobeeps", NULL};
 28+ char *argv_esdcompat[] = { ESD_LOCATION "esdcompat", "-nobeeps", NULL};
 29 GError *error;
 30 gboolean res;
 31 time_t starttime;
 32 gboolean ret;
 33+ struct stat st;
 34
 35 ret = FALSE;
 36
 37 gnome_settings_profile_start (NULL);
 38
 39+ if (stat (argv_esdcompat[0], &st) == 0)
 40+ argv = argv_esdcompat;
 41+ else
 42+ argv = argv_esd;
 43+
 44 error = NULL;
 45 res = g_spawn_async (NULL,
 46 argv,