update to 2.30.2

This switches to the gnome-2.30 release branch.

6 files changed, 34 insertions, 19 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index db55e0ff67e..bb3e2d6151f 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:22 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/07/14 16:17:41 drochner Exp $
 #
 
-DISTNAME=	gnome-settings-daemon-2.28.1
-PKGREVISION=	3
+DISTNAME=	gnome-settings-daemon-2.30.2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -30,8 +29,8 @@ PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
 
-# pkgsrc pulseaudio is too old
 #.include "../../audio/pulseaudio/buildlink3.mk"
+#.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 0bcb27db88b..49052db9b6a 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/10/22 17:16:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/07/14 16:17:41 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
@@ -42,6 +42,7 @@ share/gnome-control-center/keybindings/50-accessibility.xml
 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/show-layout.ui
 share/gnome-settings-daemon/xrdb/Editres.ad
 share/gnome-settings-daemon/xrdb/Emacs.ad
 share/gnome-settings-daemon/xrdb/General.ad
@@ -49,10 +50,20 @@ 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/actions/touchpad-disabled.png
+share/icons/hicolor/16x16/actions/touchpad-enabled.png
 share/icons/hicolor/16x16/apps/gsd-xrandr.png
+share/icons/hicolor/22x22/actions/touchpad-disabled.png
+share/icons/hicolor/22x22/actions/touchpad-enabled.png
 share/icons/hicolor/22x22/apps/gsd-xrandr.png
+share/icons/hicolor/24x24/actions/touchpad-disabled.png
+share/icons/hicolor/24x24/actions/touchpad-enabled.png
 share/icons/hicolor/24x24/apps/gsd-xrandr.png
+share/icons/hicolor/32x32/actions/touchpad-disabled.png
+share/icons/hicolor/32x32/actions/touchpad-enabled.png
 share/icons/hicolor/32x32/apps/gsd-xrandr.png
+share/icons/hicolor/scalable/actions/touchpad-disabled.svg
+share/icons/hicolor/scalable/actions/touchpad-enabled.svg
 share/icons/hicolor/scalable/apps/gsd-xrandr.svg
 share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
@@ -69,12 +80,14 @@ 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/crh/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
 share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo
@@ -108,6 +121,7 @@ share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/nds/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 2e39cf96aae..1a2ada2cc78 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/10/22 17:16:35 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/07/14 16:17:41 drochner Exp $
 
-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 (gnome-settings-daemon-2.30.2.tar.bz2) = 75fe75eaa7d6197514c1de8b8c47c869f2bade2c
+RMD160 (gnome-settings-daemon-2.30.2.tar.bz2) = a4547cdb13c2c5dc8f690cf198853129514adaab
+Size (gnome-settings-daemon-2.30.2.tar.bz2) = 1250365 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 73acc08b337..6d3fd8c3b49 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/07/14 16:16:49 drochner Exp $
 #
 
-DISTNAME=	libgnomekbd-2.28.2
-PKGREVISION=	2
+DISTNAME=	libgnomekbd-2.30.2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST
index c3229ae577f..206c8b7c789 100644
--- a/x11/libgnomekbd/PLIST
+++ b/x11/libgnomekbd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/12/16 19:05:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/07/14 16:16:49 drochner Exp $
 bin/gkbd-indicator-plugins-capplet
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
@@ -6,6 +6,7 @@ include/libgnomekbd/gkbd-indicator-plugin.h
 include/libgnomekbd/gkbd-indicator.h
 include/libgnomekbd/gkbd-keyboard-config.h
 include/libgnomekbd/gkbd-keyboard-drawing.h
+include/libgnomekbd/gkbd-status.h
 include/libgnomekbd/gkbd-util.h
 lib/libgnomekbd.la
 lib/libgnomekbdui.la
@@ -17,6 +18,7 @@ share/libgnomekbd/ui/gkbd-indicator-plugins.ui
 share/libgnomekbd/ui/gkbd-indicator-plugins_add.ui
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/as/LC_MESSAGES/libgnomekbd.mo
+share/locale/ast/LC_MESSAGES/libgnomekbd.mo
 share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
 share/locale/bn/LC_MESSAGES/libgnomekbd.mo
@@ -64,6 +66,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
 share/locale/ro/LC_MESSAGES/libgnomekbd.mo
 share/locale/ru/LC_MESSAGES/libgnomekbd.mo
 share/locale/si/LC_MESSAGES/libgnomekbd.mo
+share/locale/sk/LC_MESSAGES/libgnomekbd.mo
 share/locale/sl/LC_MESSAGES/libgnomekbd.mo
 share/locale/sq/LC_MESSAGES/libgnomekbd.mo
 share/locale/sr/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index d9918369cd1..f5927aed122 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2009/12/16 19:05:13 drochner Exp $
+$NetBSD: distinfo,v 1.12 2010/07/14 16:16:49 drochner Exp $
 
-SHA1 (libgnomekbd-2.28.2.tar.bz2) = f37ead3549232ebc3e98200086c4a6e225aeac04
-RMD160 (libgnomekbd-2.28.2.tar.bz2) = ab0b50e5d64e09965a4d95854371a44f935d8644
-Size (libgnomekbd-2.28.2.tar.bz2) = 398401 bytes
+SHA1 (libgnomekbd-2.30.2.tar.bz2) = 474acc0ae87ac8eccadbf48b60fad885f9e271f7
+RMD160 (libgnomekbd-2.30.2.tar.bz2) = fc1d96bf48283cbe0379a019d2aa3307f77e4f13
+Size (libgnomekbd-2.30.2.tar.bz2) = 405388 bytes
 SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde
 SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98
 SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126