Update to 2.91.6.

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

3 files changed, 12 insertions, 22 deletions

diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index 4d1181e7f..a58c552be 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.5 2011/01/20 17:06:11 kwm Exp $
+#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.6 2011/01/25 14:44:09 kwm Exp $
 #
 
 # add cheese suppor when it gets gtk3 version
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.91.5
-PORTREVISION=	1
+PORTVERSION=	2.91.6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -23,6 +22,7 @@ BUILD_DEPENDS=	gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings
 LIB_DEPENDS=	canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
 		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		upower-glib.1:${PORTSDIR}/sysutils/upower \
+		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 \
diff --git a/sysutils/gnome-control-center3/distinfo b/sysutils/gnome-control-center3/distinfo
index f4cf350d6..6843fa45c 100644
--- a/sysutils/gnome-control-center3/distinfo
+++ b/sysutils/gnome-control-center3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-2.91.5.tar.bz2) = e1229329066dabf51d00a587e92a90b0d1c8c0661f93249a98f24e88dd083d39
-SIZE (gnome3/gnome-control-center-2.91.5.tar.bz2) = 4282324
+SHA256 (gnome3/gnome-control-center-2.91.6.tar.bz2) = befccae38ff25a036225b843bfa67a02f6708ed097f79dba344a1606f3180c27
+SIZE (gnome3/gnome-control-center-2.91.6.tar.bz2) = 4336598
diff --git a/sysutils/gnome-control-center3/pkg-plist b/sysutils/gnome-control-center3/pkg-plist
index b3230af71..a03eb9c75 100644
--- a/sysutils/gnome-control-center3/pkg-plist
+++ b/sysutils/gnome-control-center3/pkg-plist
@@ -1,8 +1,5 @@
-bin/gnome-at-mobility
-bin/gnome-at-visual
 bin/gnome-control-center
 bin/gnome-sound-applet
-etc/xdg/autostart/gnome-at-session.desktop
 etc/xdg/autostart/gnome-sound-applet.desktop
 etc/xdg/menus/gnomecc.menu
 include/gnome-control-center-1/libgnome-control-center/cc-panel.h
@@ -14,9 +11,6 @@ lib/control-center-1/panels/libbackground.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
-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
@@ -38,6 +32,9 @@ lib/control-center-1/panels/libnetwork.so
 lib/control-center-1/panels/libpower.a
 lib/control-center-1/panels/libpower.la
 lib/control-center-1/panels/libpower.so
+lib/control-center-1/panels/libprinters.a
+lib/control-center-1/panels/libprinters.la
+lib/control-center-1/panels/libprinters.so
 lib/control-center-1/panels/libregion.a
 lib/control-center-1/panels/libregion.la
 lib/control-center-1/panels/libregion.so
@@ -56,13 +53,11 @@ lib/control-center-1/panels/libuser-accounts.so
 lib/libgnome-control-center.la
 lib/libgnome-control-center.so
 lib/libgnome-control-center.so.1
-libdata/pkgconfig/gnome-default-applications.pc
 libdata/pkgconfig/gnome-keybindings.pc
 libdata/pkgconfig/libgnome-control-center.pc
 share/applications/gnome-background-panel.desktop
 share/applications/gnome-control-center.desktop
 share/applications/gnome-datetime-panel.desktop
-share/applications/gnome-default-applications-panel.desktop
 share/applications/gnome-display-panel.desktop
 share/applications/gnome-info-panel.desktop
 share/applications/gnome-keyboard-panel.desktop
@@ -70,6 +65,7 @@ share/applications/gnome-media-panel.desktop
 share/applications/gnome-mouse-panel.desktop
 share/applications/gnome-network-panel.desktop
 share/applications/gnome-power-panel.desktop
+share/applications/gnome-printers-panel.desktop
 share/applications/gnome-region-panel.desktop
 share/applications/gnome-screen-panel.desktop
 share/applications/gnome-sound-panel.desktop
@@ -90,7 +86,6 @@ share/doc/libgnome-control-center/object-tree.html
 share/doc/libgnome-control-center/right.png
 share/doc/libgnome-control-center/style.css
 share/doc/libgnome-control-center/up.png
-%%DATADIR%%/default-apps/gnome-default-applications.xml
 %%DATADIR%%/icons/hicolor/16x16/devices/audio-headset.svg
 %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
 %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
@@ -207,17 +202,16 @@ share/doc/libgnome-control-center/up.png
 %%DATADIR%%/ui/datetime/timezone_9.5.png
 %%DATADIR%%/ui/datetime/timezone_9.png
 %%DATADIR%%/ui/display-capplet.ui
-%%DATADIR%%/ui/gnome-default-applications-properties.ui
 %%DATADIR%%/ui/gnome-keyboard-panel.ui
 %%DATADIR%%/ui/gnome-media-properties.ui
 %%DATADIR%%/ui/gnome-mouse-properties.ui
 %%DATADIR%%/ui/gnome-region-panel-layout-chooser.ui
-%%DATADIR%%/ui/gnome-region-panel-model-chooser.ui
 %%DATADIR%%/ui/gnome-region-panel-options-dialog.ui
 %%DATADIR%%/ui/gnome-region-panel.ui
 %%DATADIR%%/ui/info.ui
 %%DATADIR%%/ui/network.ui
 %%DATADIR%%/ui/power.ui
+%%DATADIR%%/ui/printers/printers.ui
 %%DATADIR%%/ui/screen.ui
 %%DATADIR%%/ui/shell.ui
 %%DATADIR%%/ui/uap.ui
@@ -264,26 +258,21 @@ share/gnome/help/control-center/th/control-center.xml
 share/gnome/help/control-center/uk/control-center.xml
 share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
-share/icons/hicolor/16x16/apps/gnome-settings-default-applications.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-desktop-display.png
 share/icons/hicolor/16x16/apps/preferences-system-time.png
-share/icons/hicolor/22x22/apps/gnome-settings-default-applications.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-desktop-display.png
 share/icons/hicolor/22x22/apps/preferences-system-time.png
-share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
 share/icons/hicolor/24x24/apps/multimedia-volume-control.png
 share/icons/hicolor/24x24/apps/preferences-desktop-display.png
 share/icons/hicolor/256x256/apps/preferences-system-time.png
-share/icons/hicolor/32x32/apps/gnome-settings-default-applications.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-desktop-display.png
 share/icons/hicolor/32x32/apps/preferences-system-time.png
-share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
 share/icons/hicolor/48x48/apps/multimedia-volume-control.png
 share/icons/hicolor/48x48/apps/preferences-system-time.png
 share/icons/hicolor/48x48/devices/audio-headset.svg
@@ -333,6 +322,7 @@ share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -519,6 +509,7 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm %%DATADIR%%/ui/user-accounts
+@dirrm %%DATADIR%%/ui/printers
 @dirrm %%DATADIR%%/ui/datetime
 @dirrm %%DATADIR%%/ui/background
 @dirrm %%DATADIR%%/ui
@@ -540,7 +531,6 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrm %%DATADIR%%/icons/hicolor/16x16
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/default-apps
 @dirrm %%DATADIR%%
 @dirrm share/doc/libgnome-control-center
 @dirrmtry share/desktop-directories