4 files changed, 25 insertions, 16 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index d86ca70b736a..226f0d428c77 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.53 2009/11/26 06:20:13 marcus Exp $
+#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.62 2010/04/26 23:24:41 kwm Exp $
 #
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	2.28.1
-PORTREVISION=	4
+PORTVERSION=	2.30.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 5cced3e1045e..7072a4788336 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = cadb2e161846c4df76fec45679db1f50
-SHA256 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2
-SIZE (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1174173
+MD5 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 0a287d63b15bda50c344b3fe9a71c47e
+SHA256 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 6f66de1bb80af094a640398549799109e60f53d5373a1b0b7719a5a31c900095
+SIZE (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 1246609
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c b/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c
deleted file mode 100644
index db87cfc70ff4..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/housekeeping/gsd-disk-space.c.orig	2009-12-11 12:14:35.000000000 -0500
-+++ plugins/housekeeping/gsd-disk-space.c	2009-12-11 12:14:56.000000000 -0500
-@@ -315,6 +315,7 @@
-                 "procfs",
-                 "ptyfs",
-                 "selinuxfs",
-+                "linsysfs",
-                 "sysfs",
-                 "tmpfs",
-                 "usbfs",
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 3407151e081d..a63c3473679c 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -65,16 +65,27 @@ share/gnome-control-center/keybindings/50-accessibility.xml
 %%DATADIR%%/acme.ui
 %%DATADIR%%/gsd-a11y-preferences-dialog.ui
 %%DATADIR%%/modmap-dialog.ui
+%%DATADIR%%/show-layout.ui
 %%DATADIR%%/xrdb/Editres.ad
 %%DATADIR%%/xrdb/Emacs.ad
 %%DATADIR%%/xrdb/General.ad
 %%DATADIR%%/xrdb/Motif.ad
 %%DATADIR%%/xrdb/Tk.ad
 %%DATADIR%%/xrdb/Xaw.ad
+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
@@ -91,12 +102,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
@@ -130,6 +143,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
@@ -185,6 +199,8 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -193,8 +209,12 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES