Update to 2.31.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14242 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 21 insertions, 19 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 946c18ed2..3f315e05d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.209 2010/05/29 18:16:41 kwm Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.31.2
+PORTVERSION=	2.31.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -62,7 +62,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    	${WRKSRC}/capplets/common/gnome-theme-info.c
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
-		${WRKSRC}/capplets/display/org.gnome.randr.policy.in
+		${WRKSRC}/panels/display/org.gnome.randr.policy.in
 
 post-install:
 	@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index e088c7299..74e59738e 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.31.2.tar.bz2) = d5da451dbc18b69b73433415fd42272c
-SHA256 (gnome2/gnome-control-center-2.31.2.tar.bz2) = 7fa269293c2165171aa877ff2676184bcd1700f61d4cd6899f79eb851190bb57
-SIZE (gnome2/gnome-control-center-2.31.2.tar.bz2) = 2927109
+MD5 (gnome2/gnome-control-center-2.31.3.tar.bz2) = bc38f41bb2b630c9dc86ccc95ac3511f
+SHA256 (gnome2/gnome-control-center-2.31.3.tar.bz2) = ad6ce953d3f2a2a3df4c9954eaadb5085e4ef5bab76c2185f99154c91ac14cd6
+SIZE (gnome2/gnome-control-center-2.31.3.tar.bz2) = 2924957
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index a6b19e95e..53625b1e3 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,10 +1,8 @@
 %%ABOUTME%%bin/gnome-about-me
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
-bin/gnome-at-properties
 bin/gnome-at-visual
 bin/gnome-control-center
-bin/gnome-display-properties
 bin/gnome-font-viewer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
@@ -19,6 +17,9 @@ include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/control-center-1/panels/libdefault-applications.a
 lib/control-center-1/panels/libdefault-applications.la
 lib/control-center-1/panels/libdefault-applications.so
+lib/control-center-1/panels/libdisplay.a
+lib/control-center-1/panels/libdisplay.la
+lib/control-center-1/panels/libdisplay.so
 lib/control-center-1/panels/libkeybinding-properties.a
 lib/control-center-1/panels/libkeybinding-properties.la
 lib/control-center-1/panels/libkeybinding-properties.so
@@ -32,6 +33,9 @@ lib/control-center-1/panels/libmouse-properties.so
 lib/control-center-1/panels/libnetwork.a
 lib/control-center-1/panels/libnetwork.la
 lib/control-center-1/panels/libnetwork.so
+lib/control-center-1/panels/libuniversal-access.a
+lib/control-center-1/panels/libuniversal-access.la
+lib/control-center-1/panels/libuniversal-access.so
 lib/libgnome-control-center.la
 lib/libgnome-control-center.so
 lib/libgnome-control-center.so.0
@@ -47,18 +51,18 @@ libdata/pkgconfig/gnome-keybindings.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libdata/pkgconfig/libgnome-control-center.pc
 sbin/gnome-display-properties-install-systemwide
-share/applications/at-properties.desktop
-share/applications/default-applications.desktop
-share/applications/display-properties.desktop
 %%ABOUTME%%share/applications/gnome-about-me.desktop
 share/applications/gnome-appearance-properties.desktop
-share/applications/gnome-font-viewer.desktop
 share/applications/gnome-control-center.desktop
-share/applications/gnome-network-properties.desktop
-share/applications/gnome-settings-mouse.desktop
+share/applications/gnome-default-applications-panel.desktop
+share/applications/gnome-display-panel.desktop
+share/applications/gnome-font-viewer.desktop
+share/applications/gnome-keybindings-panel.desktop
+share/applications/gnome-keyboard-panel.desktop
+share/applications/gnome-mouse-panel.desktop
+share/applications/gnome-network-panel.desktop
 share/applications/gnome-theme-installer.desktop
-share/applications/keybinding.desktop
-share/applications/keyboard.desktop
+share/applications/gnome-universal-access-panel.desktop
 share/desktop-directories/gnomecc.directory
 share/doc/libgnome-control-center/api-index-full.html
 share/doc/libgnome-control-center/ch01.html
@@ -77,8 +81,6 @@ share/doc/libgnome-control-center/up.png
 %%DATADIR%%/default-apps/gnome-default-applications.xml
 %%DATADIR%%/keybindings/00-multimedia-key.xml
 %%DATADIR%%/keybindings/01-desktop-key.xml
-%%DATADIR%%/pixmaps/at-startup.png
-%%DATADIR%%/pixmaps/at-support.png
 %%DATADIR%%/pixmaps/bar-disabled.png
 %%DATADIR%%/pixmaps/bar-green.png
 %%DATADIR%%/pixmaps/bar-red.png
@@ -124,7 +126,6 @@ share/doc/libgnome-control-center/up.png
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
 %%DATADIR%%/pixmaps/window-theme-thumbnailing.png
 %%DATADIR%%/ui/appearance.ui
-%%DATADIR%%/ui/at-enable-dialog.ui
 %%DATADIR%%/ui/display-capplet.ui
 %%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-dialog.ui
 %%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-fingerprint.ui
@@ -139,6 +140,7 @@ share/doc/libgnome-control-center/up.png
 %%DATADIR%%/ui/gnome-mouse-properties.ui
 %%DATADIR%%/ui/gnome-network-properties.ui
 %%DATADIR%%/ui/shell.ui
+%%DATADIR%%/ui/uap.ui
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf