Install desktop file to share/gnome/autostart, in the hope that this

will cause the daemon to start automatically with a new Gnome session.

Bump PKGREVISION.

4 files changed, 27 insertions, 11 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index ea1ef675896..ed9c3797f83 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/10/23 11:59:30 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2008/11/14 01:01:50 wiz Exp $
 #
 
 DISTNAME=	gnome-settings-daemon-2.24.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
 EXTRACT_SUFX=	.tar.bz2
@@ -29,15 +29,16 @@ PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
 
 .include "../../devel/GConf/schemas.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 75a90120da0..2dba0803f83 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/10/16 14:40:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/11/14 01:01:51 wiz Exp $
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
@@ -50,6 +50,7 @@ share/gnome-settings-daemon/xrdb/General.ad
 share/gnome-settings-daemon/xrdb/Motif.ad
 share/gnome-settings-daemon/xrdb/Tk.ad
 share/gnome-settings-daemon/xrdb/Xaw.ad
+share/gnome/autostart/gnome-settings-daemon.desktop
 share/icons/hicolor/16x16/apps/gsd-xrandr.png
 share/icons/hicolor/22x22/apps/gsd-xrandr.png
 share/icons/hicolor/24x24/apps/gsd-xrandr.png
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 3e77be0cf63..016fc9ee160 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/10/16 14:40:35 drochner Exp $
+$NetBSD: distinfo,v 1.4 2008/11/14 01:01:51 wiz Exp $
 
 SHA1 (gnome-settings-daemon-2.24.0.tar.bz2) = 7d95a7550c465c9a64e4bda64331c92069958bfd
 RMD160 (gnome-settings-daemon-2.24.0.tar.bz2) = da517b2a5841ba4044c7ee69f784894f622ec5f3
 Size (gnome-settings-daemon-2.24.0.tar.bz2) = 1119609 bytes
 SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
 SHA1 (patch-ab) = 60620de4803cce1afb3276a061de2c833d8ef23b
+SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
diff --git a/sysutils/gnome-settings-daemon/patches/patch-ac b/sysutils/gnome-settings-daemon/patches/patch-ac
new file mode 100644
index 00000000000..56b508f9622
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/11/14 01:01:51 wiz Exp $
+
+--- data/Makefile.in.orig	2008-09-23 09:43:06.000000000 +0000
++++ data/Makefile.in
+@@ -270,7 +270,7 @@ schemas_in_files = \
+ 	$(NULL)
+ 
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/gnome/autostart
+ desktop_in_files = gnome-settings-daemon.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ servicedir = $(datadir)/dbus-1/services