UPdate to 3.1.91.

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

7 files changed, 89 insertions, 27 deletions

diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index 7523eebd9..b3fd07c55 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.27 2011/06/10 21:14:05 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.28 2011/06/10 22:59:08 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTVERSION=	3.1.91
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,16 +15,20 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 3 project
 
-BUILD_DEPENDS=	gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
+BUILD_DEPENDS=	gnome-settings-daemon>=3.1.90:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
+		gsettings-desktop-schemas>=3.1.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
 		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		upower-glib.1:${PORTSDIR}/sysutils/upower \
+		colord.1:${PORTSDIR}/graphics/colord \
+		goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
 		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
-		gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
+		gnome-settings-daemon>=3.1.90:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
+		gsettings-desktop-schemas>=3.1.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
 		apg:${PORTSDIR}/security/apg \
@@ -34,7 +37,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 LATEST_LINK=	gnome-control-center3
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
diff --git a/sysutils/gnome-control-center3/distinfo b/sysutils/gnome-control-center3/distinfo
index 48e1adb71..c8e784012 100644
--- a/sysutils/gnome-control-center3/distinfo
+++ b/sysutils/gnome-control-center3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-3.0.2.tar.bz2) = 477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896
-SIZE (gnome3/gnome-control-center-3.0.2.tar.bz2) = 4567179
+SHA256 (gnome3/gnome-control-center-3.1.91.tar.xz) = 486faa402aeacf5a25f55bbfae5e797094dba59d19ffd0c58cc0d7da5b4f8f94
+SIZE (gnome3/gnome-control-center-3.1.91.tar.xz) = 4203920
diff --git a/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in b/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in
new file mode 100644
index 000000000..e9301462a
--- /dev/null
+++ b/sysutils/gnome-control-center3/files/patch-panels_info_Makefile.in
@@ -0,0 +1,11 @@
+--- panels/info/Makefile.in.orig	2011-09-17 14:54:25.000000000 +0200
++++ panels/info/Makefile.in	2011-09-17 14:54:44.000000000 +0200
+@@ -775,7 +775,7 @@
+ 	uninstall-dist_uiDATA
+ 
+ 
+-all-local: check-local
++all-local:
+ 
+ check-local: test-hostname
+ 	$(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null
diff --git a/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c b/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
index de992ccaa..736466217 100644
--- a/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
+++ b/sysutils/gnome-control-center3/files/patch-panels_info_cc-info-panel.c
@@ -1,15 +1,15 @@
---- panels/info/cc-info-panel.c.orig	2011-02-02 20:05:49.000000000 +0100
-+++ panels/info/cc-info-panel.c	2011-02-02 20:06:21.000000000 +0100
-@@ -21,7 +21,12 @@
+--- panels/info/cc-info-panel.c.orig	2011-08-29 16:08:11.000000000 +0200
++++ panels/info/cc-info-panel.c	2011-09-17 14:35:53.000000000 +0200
+@@ -23,7 +23,12 @@
  
  #include "cc-info-panel.h"
  
-+#ifdef __FreeBSD__
++#ifdef __linux__
+ #include <sys/vfs.h>
++#else
 +#include <sys/param.h>
 +#include <sys/mount.h>
-+#else
- #include <sys/vfs.h>
 +#endif
+ #include <polkit/polkit.h>
  
  #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c b/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c
new file mode 100644
index 000000000..f20d005a3
--- /dev/null
+++ b/sysutils/gnome-control-center3/files/patch-panels_region_gnome-region-panel-formats.c
@@ -0,0 +1,19 @@
+--- panels/region/gnome-region-panel-formats.c.orig	2011-09-17 14:42:28.000000000 +0200
++++ panels/region/gnome-region-panel-formats.c	2011-09-17 14:46:49.000000000 +0200
+@@ -131,6 +131,8 @@ update_examples_cb (GtkTreeSelection *se
+ 	setlocale (LC_MONETARY, locale);
+ 	g_free (locale);
+ 
++// FreeBSD doesn't have LC_MEASUREMENT (yet)
++#if 0
+ 	/* Display measurement */
+ 	locale = g_strdup (setlocale (LC_MEASUREMENT, NULL));
+ 	setlocale (LC_MEASUREMENT, active_id);
+@@ -143,6 +145,7 @@ update_examples_cb (GtkTreeSelection *se
+ 
+ 	setlocale (LC_MEASUREMENT, locale);
+ 	g_free (locale);
++#endif
+         g_free (active_id);
+ }
+ 
diff --git a/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-account-dialog.c b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-utils.c
index 82c112019..b52aa9a1f 100644
--- a/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-account-dialog.c
+++ b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-utils.c
@@ -1,6 +1,6 @@
---- panels/user-accounts/um-account-dialog.c.orig	2011-01-21 09:07:21.000000000 +0100
-+++ panels/user-accounts/um-account-dialog.c	2011-01-21 09:16:37.000000000 +0100
-@@ -24,7 +24,16 @@
+--- panels/user-accounts/um-utils.c.orig	2011-09-17 14:55:58.000000000 +0200
++++ panels/user-accounts/um-utils.c	2011-09-17 14:57:01.000000000 +0200
+@@ -25,7 +25,16 @@
  #include <stdlib.h>
  #include <sys/types.h>
  #include <pwd.h>
diff --git a/sysutils/gnome-control-center3/pkg-plist b/sysutils/gnome-control-center3/pkg-plist
index 7c868ebbf..334f32fde 100644
--- a/sysutils/gnome-control-center3/pkg-plist
+++ b/sysutils/gnome-control-center3/pkg-plist
@@ -2,13 +2,12 @@ bin/gnome-control-center
 bin/gnome-sound-applet
 etc/xdg/autostart/gnome-sound-applet.desktop
 etc/xdg/menus/gnomecc.menu
-include/gnome-control-center-1/libgnome-control-center/cc-lockbutton.h
-include/gnome-control-center-1/libgnome-control-center/cc-panel.h
-include/gnome-control-center-1/libgnome-control-center/cc-shell.h
-include/gnome-control-center-1/libgnome-control-center/gconf-property-editor.h
 lib/control-center-1/panels/libbackground.a
 lib/control-center-1/panels/libbackground.la
 lib/control-center-1/panels/libbackground.so
+lib/control-center-1/panels/libcolor.a
+lib/control-center-1/panels/libcolor.la
+lib/control-center-1/panels/libcolor.so
 lib/control-center-1/panels/libdate_time.a
 lib/control-center-1/panels/libdate_time.la
 lib/control-center-1/panels/libdate_time.so
@@ -27,6 +26,9 @@ lib/control-center-1/panels/libmedia.so
 lib/control-center-1/panels/libmouse-properties.a
 lib/control-center-1/panels/libmouse-properties.la
 lib/control-center-1/panels/libmouse-properties.so
+lib/control-center-1/panels/libonline-accounts.a
+lib/control-center-1/panels/libonline-accounts.la
+lib/control-center-1/panels/libonline-accounts.so
 lib/control-center-1/panels/libpower.a
 lib/control-center-1/panels/libpower.la
 lib/control-center-1/panels/libpower.so
@@ -48,12 +50,15 @@ lib/control-center-1/panels/libuniversal-access.so
 lib/control-center-1/panels/libuser-accounts.a
 lib/control-center-1/panels/libuser-accounts.la
 lib/control-center-1/panels/libuser-accounts.so
+lib/control-center-1/panels/libwacom-properties.a
+lib/control-center-1/panels/libwacom-properties.la
+lib/control-center-1/panels/libwacom-properties.so
 lib/libgnome-control-center.la
 lib/libgnome-control-center.so
 lib/libgnome-control-center.so.1
 libdata/pkgconfig/gnome-keybindings.pc
-libdata/pkgconfig/libgnome-control-center.pc
 share/applications/gnome-background-panel.desktop
+share/applications/gnome-color-panel.desktop
 share/applications/gnome-control-center.desktop
 share/applications/gnome-datetime-panel.desktop
 share/applications/gnome-display-panel.desktop
@@ -61,6 +66,7 @@ share/applications/gnome-info-panel.desktop
 share/applications/gnome-keyboard-panel.desktop
 share/applications/gnome-media-panel.desktop
 share/applications/gnome-mouse-panel.desktop
+share/applications/gnome-online-accounts-panel.desktop
 %%CUPS%%share/applications/gnome-printers-panel.desktop
 share/applications/gnome-power-panel.desktop
 share/applications/gnome-region-panel.desktop
@@ -68,6 +74,7 @@ share/applications/gnome-screen-panel.desktop
 share/applications/gnome-sound-panel.desktop
 share/applications/gnome-universal-access-panel.desktop
 share/applications/gnome-user-accounts-panel.desktop
+share/applications/gnome-wacom-panel.desktop
 share/desktop-directories/gnomecc.directory
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
@@ -164,11 +171,14 @@ share/pixmaps/faces/yellow-rose.jpg
 %%DATADIR%%/pixmaps/right-ring-finger.svg
 %%DATADIR%%/pixmaps/right-thumb.png
 %%DATADIR%%/pixmaps/right-thumb.svg
+%%DATADIR%%/pixmaps/wacom-stylus.png
+%%DATADIR%%/pixmaps/wacom-tablet.png
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 %%DATADIR%%/ui/GnomeLogoVerticalMedium.svg
 %%DATADIR%%/ui/background/background.ui
 %%DATADIR%%/ui/background/display-base.png
 %%DATADIR%%/ui/background/display-overlay.png
+%%DATADIR%%/ui/color.ui
 %%DATADIR%%/ui/datetime/bg.png
 %%DATADIR%%/ui/datetime/cc.png
 %%DATADIR%%/ui/datetime/datetime.ui
@@ -220,8 +230,11 @@ share/pixmaps/faces/yellow-rose.jpg
 %%DATADIR%%/ui/gnome-region-panel-layout-chooser.ui
 %%DATADIR%%/ui/gnome-region-panel-options-dialog.ui
 %%DATADIR%%/ui/gnome-region-panel.ui
+%%DATADIR%%/ui/gnome-wacom-properties.ui
 %%DATADIR%%/ui/info.ui
+%%DATADIR%%/ui/language-chooser.ui
 %%CUPS%%%%DATADIR%%/ui/printers/new-printer-dialog.ui
+%%DATADIR%%/ui/online-accounts.ui
 %%CUPS%%%%DATADIR%%/ui/printers/printers.ui
 %%DATADIR%%/ui/power.ui
 %%DATADIR%%/ui/screen.ui
@@ -229,7 +242,6 @@ share/pixmaps/faces/yellow-rose.jpg
 %%DATADIR%%/ui/uap.ui
 %%DATADIR%%/ui/user-accounts/account-dialog.ui
 %%DATADIR%%/ui/user-accounts/account-fingerprint.ui
-%%DATADIR%%/ui/user-accounts/language-chooser.ui
 %%DATADIR%%/ui/user-accounts/password-dialog.ui
 %%DATADIR%%/ui/user-accounts/photo-dialog.ui
 %%DATADIR%%/ui/user-accounts/user-accounts-dialog.ui
@@ -272,25 +284,45 @@ share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
 share/gnome/help/control-center/zh_HK/control-center.xml
 share/gnome/help/control-center/zh_TW/control-center.xml
+share/icons/hicolor/16x16/apps/gnome-power-manager.png
+share/icons/hicolor/16x16/apps/goa-panel.png
 share/icons/hicolor/16x16/apps/multimedia-volume-control.png
 share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
+share/icons/hicolor/16x16/apps/preferences-color.png
 share/icons/hicolor/16x16/apps/preferences-desktop-display.png
 share/icons/hicolor/16x16/apps/preferences-system-time.png
+share/icons/hicolor/22x22/apps/gnome-power-manager.png
+share/icons/hicolor/22x22/apps/goa-panel.png
 share/icons/hicolor/22x22/apps/multimedia-volume-control.png
 share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
+share/icons/hicolor/22x22/apps/preferences-color.png
 share/icons/hicolor/22x22/apps/preferences-desktop-display.png
 share/icons/hicolor/22x22/apps/preferences-system-time.png
+share/icons/hicolor/24x24/apps/gnome-power-manager.png
+share/icons/hicolor/24x24/apps/goa-panel.png
 share/icons/hicolor/24x24/apps/multimedia-volume-control.png
+share/icons/hicolor/24x24/apps/preferences-color.png
 share/icons/hicolor/24x24/apps/preferences-desktop-display.png
+share/icons/hicolor/256x256/apps/gnome-power-manager.png
+share/icons/hicolor/256x256/apps/goa-panel.png
+share/icons/hicolor/256x256/apps/preferences-color.png
 share/icons/hicolor/256x256/apps/preferences-system-time.png
+share/icons/hicolor/32x32/apps/gnome-power-manager.png
+share/icons/hicolor/32x32/apps/goa-panel.png
 share/icons/hicolor/32x32/apps/multimedia-volume-control.png
 share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
+share/icons/hicolor/32x32/apps/preferences-color.png
 share/icons/hicolor/32x32/apps/preferences-desktop-display.png
 share/icons/hicolor/32x32/apps/preferences-system-time.png
+share/icons/hicolor/48x48/apps/gnome-power-manager.png
+share/icons/hicolor/48x48/apps/goa-panel.png
 share/icons/hicolor/48x48/apps/multimedia-volume-control.png
+share/icons/hicolor/48x48/apps/preferences-color.png
 share/icons/hicolor/48x48/apps/preferences-system-time.png
 share/icons/hicolor/48x48/devices/audio-headset.svg
+share/icons/hicolor/64x64/apps/preferences-color.png
 share/icons/hicolor/scalable/apps/multimedia-volume-control.svg
+share/icons/hicolor/scalable/apps/preferences-color.svg
 share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
 share/icons/hicolor/scalable/apps/preferences-system-time.svg
 share/icons/hicolor/scalable/categories/slideshow-symbolic.svg
@@ -410,7 +442,6 @@ share/locale/nl/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
@@ -554,8 +585,6 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrmtry share/applications
 @dirrm lib/control-center-1/panels
 @dirrm lib/control-center-1
-@dirrm include/gnome-control-center-1/libgnome-control-center
-@dirrm include/gnome-control-center-1
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES