update to 2.28.1

This switches to the gnome-2.28 release branch.

3 files changed, 19 insertions, 22 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 1dd70c72067..6f2a8b0aaa0 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.15 2009/10/22 17:16:35 drochner Exp $
 #
 
-DISTNAME=	gnome-settings-daemon-2.26.1
-PKGREVISION=	1
+DISTNAME=	gnome-settings-daemon-2.28.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -23,8 +22,9 @@ GCONF_SCHEMAS+=	gnome-settings-daemon.schemas
 GCONF_SCHEMAS+=	desktop_gnome_font_rendering.schemas
 GCONF_SCHEMAS+=	desktop_gnome_keybindings.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
-GCONF_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_xrandr.schemas
+GCONF_SCHEMAS+=	apps_gnome_settings_daemon_housekeeping.schemas
+GCONF_SCHEMAS+=	desktop_gnome_peripherals_touchpad.schemas
 PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
@@ -32,7 +32,7 @@ BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/libglade/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"
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 024c0e99fde..0bcb27db88b 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/10/22 17:16:35 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
 lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
@@ -12,22 +11,17 @@ lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
 lib/gnome-settings-daemon-2.0/libbackground.la
 lib/gnome-settings-daemon-2.0/libclipboard.la
-lib/gnome-settings-daemon-2.0/libdummy.la
 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
 lib/gnome-settings-daemon-2.0/libmouse.la
-lib/gnome-settings-daemon-2.0/libscreensaver.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
 lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
@@ -35,18 +29,19 @@ lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
 lib/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-settings-daemon
+libexec/gsd-locate-pointer
 share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/gconf/schemas/apps_gnome_settings_daemon_housekeeping.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gconf/schemas/desktop_gnome_keybindings.schemas
+share/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas
 share/gconf/schemas/gnome-settings-daemon.schemas
 share/gnome-control-center/keybindings/50-accessibility.xml
-share/gnome-settings-daemon/acme-eject.png
-share/gnome-settings-daemon/acme.glade
-share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade
-share/gnome-settings-daemon/modmap-dialog.glade
+share/gnome-settings-daemon/acme.ui
+share/gnome-settings-daemon/gsd-a11y-preferences-dialog.ui
+share/gnome-settings-daemon/modmap-dialog.ui
 share/gnome-settings-daemon/xrdb/Editres.ad
 share/gnome-settings-daemon/xrdb/Emacs.ad
 share/gnome-settings-daemon/xrdb/General.ad
@@ -73,6 +68,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
@@ -104,6 +100,7 @@ share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 05a41ca604d..2e39cf96aae 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/04/17 18:00:52 drochner Exp $
+$NetBSD: distinfo,v 1.10 2009/10/22 17:16:35 drochner Exp $
 
-SHA1 (gnome-settings-daemon-2.26.1.tar.bz2) = 0c2cef37a0a3333c314a8205cefea9edb8f0669a
-RMD160 (gnome-settings-daemon-2.26.1.tar.bz2) = 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd
-Size (gnome-settings-daemon-2.26.1.tar.bz2) = 1084129 bytes
+SHA1 (gnome-settings-daemon-2.28.1.tar.bz2) = 2fd672a3c85a33d49522ff0938dbd04a842ac768
+RMD160 (gnome-settings-daemon-2.28.1.tar.bz2) = f73e361e92101f5ca03f6634d1165b0b5ab686f0
+Size (gnome-settings-daemon-2.28.1.tar.bz2) = 1174173 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23