update to 2.32.1

This switches to the gnome-2.32 release branch.

4 files changed, 49 insertions, 59 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 19295750ee1..178000b5bb7 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2010/11/15 22:58:56 abs Exp $
+# $NetBSD: Makefile,v 1.37 2010/11/24 20:52:41 drochner Exp $
 #
 
-DISTNAME=	gnome-control-center-2.30.1
-PKGREVISION=	3
+DISTNAME=	gnome-control-center-2.32.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index 7f5be05ec9c..c83b1c98f29 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.14 2010/07/13 09:15:45 drochner Exp $
-${PLIST.evolution}bin/gnome-about-me
+@comment $NetBSD: PLIST,v 1.15 2010/11/24 20:52:41 drochner Exp $
+bin/gnome-about-me
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
 bin/gnome-at-properties
@@ -20,10 +20,11 @@ include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/libgnome-window-settings.la
 lib/pkgconfig/gnome-window-settings-2.0.pc
 lib/window-manager-settings/libmetacity.la
+sbin/gnome-display-properties-install-systemwide
 share/applications/at-properties.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
-${PLIST.evolution}share/applications/gnome-about-me.desktop
+share/applications/gnome-about-me.desktop
 share/applications/gnome-appearance-properties.desktop
 share/applications/gnome-at-session.desktop
 share/applications/gnome-font-viewer.desktop
@@ -51,39 +52,37 @@ share/gnome-control-center/pixmaps/bar.png
 share/gnome-control-center/pixmaps/double-click-maybe.png
 share/gnome-control-center/pixmaps/double-click-off.png
 share/gnome-control-center/pixmaps/double-click-on.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock.png
 share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png
 share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-index-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-index-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-little-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-little-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-middle-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-middle-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-ring-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-ring-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-thumb.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/left-thumb.svg
+share/gnome-control-center/pixmaps/left-index-finger.png
+share/gnome-control-center/pixmaps/left-index-finger.svg
+share/gnome-control-center/pixmaps/left-little-finger.png
+share/gnome-control-center/pixmaps/left-little-finger.svg
+share/gnome-control-center/pixmaps/left-middle-finger.png
+share/gnome-control-center/pixmaps/left-middle-finger.svg
+share/gnome-control-center/pixmaps/left-ring-finger.png
+share/gnome-control-center/pixmaps/left-ring-finger.svg
+share/gnome-control-center/pixmaps/left-thumb.png
+share/gnome-control-center/pixmaps/left-thumb.svg
 share/gnome-control-center/pixmaps/mouse-cursor-normal-large.png
 share/gnome-control-center/pixmaps/mouse-cursor-normal.png
 share/gnome-control-center/pixmaps/mouse-cursor-white-large.png
 share/gnome-control-center/pixmaps/mouse-cursor-white.png
 share/gnome-control-center/pixmaps/ocean-stripes.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/print_error.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/print_error.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/print_ok.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/print_ok.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-index-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-index-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-little-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-little-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-middle-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-middle-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-ring-finger.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-ring-finger.svg
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-thumb.png
-${PLIST.evolution}share/gnome-control-center/pixmaps/right-thumb.svg
+share/gnome-control-center/pixmaps/print_error.png
+share/gnome-control-center/pixmaps/print_error.svg
+share/gnome-control-center/pixmaps/print_ok.png
+share/gnome-control-center/pixmaps/print_ok.svg
+share/gnome-control-center/pixmaps/right-index-finger.png
+share/gnome-control-center/pixmaps/right-index-finger.svg
+share/gnome-control-center/pixmaps/right-little-finger.png
+share/gnome-control-center/pixmaps/right-little-finger.svg
+share/gnome-control-center/pixmaps/right-middle-finger.png
+share/gnome-control-center/pixmaps/right-middle-finger.svg
+share/gnome-control-center/pixmaps/right-ring-finger.png
+share/gnome-control-center/pixmaps/right-ring-finger.svg
+share/gnome-control-center/pixmaps/right-thumb.png
+share/gnome-control-center/pixmaps/right-thumb.svg
 share/gnome-control-center/pixmaps/subpixel-bgr.png
 share/gnome-control-center/pixmaps/subpixel-rgb.png
 share/gnome-control-center/pixmaps/subpixel-vbgr.png
@@ -93,9 +92,9 @@ share/gnome-control-center/pixmaps/window-theme-thumbnailing.png
 share/gnome-control-center/ui/appearance.ui
 share/gnome-control-center/ui/at-enable-dialog.ui
 share/gnome-control-center/ui/display-capplet.ui
-${PLIST.evolution}share/gnome-control-center/ui/gnome-about-me-dialog.ui
-${PLIST.evolution}share/gnome-control-center/ui/gnome-about-me-fingerprint.ui
-${PLIST.evolution}share/gnome-control-center/ui/gnome-about-me-password.ui
+share/gnome-control-center/ui/gnome-about-me-dialog.ui
+share/gnome-control-center/ui/gnome-about-me-fingerprint.ui
+share/gnome-control-center/ui/gnome-about-me-password.ui
 share/gnome-control-center/ui/gnome-default-applications-properties.ui
 share/gnome-control-center/ui/gnome-keybinding-properties.ui
 share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui
@@ -131,6 +130,7 @@ share/gnome/help/control-center/el/control-center.xml
 share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/id/control-center.xml
 share/gnome/help/control-center/it/control-center.xml
 share/gnome/help/control-center/ja/control-center.xml
 share/gnome/help/control-center/oc/control-center.xml
@@ -144,23 +144,23 @@ 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-display-properties.png
 share/icons/hicolor/16x16/apps/gnome-network-properties.png
 share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
-share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/preferences-desktop-display.png
 share/icons/hicolor/22x22/apps/gnome-network-properties.png
 share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
-share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/preferences-desktop-display.png
 share/icons/hicolor/24x24/apps/gnome-network-properties.png
 share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
-share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/preferences-desktop-display.png
 share/icons/hicolor/32x32/apps/gnome-network-properties.png
 share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
+share/icons/hicolor/32x32/apps/preferences-desktop-display.png
 share/icons/hicolor/48x48/apps/gnome-network-properties.png
 share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
-share/icons/hicolor/scalable/apps/gnome-display-properties.svg
 share/icons/hicolor/scalable/apps/gnome-network-properties.svg
+share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
 share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -200,11 +200,13 @@ share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -243,6 +245,7 @@ share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -263,6 +266,7 @@ share/omf/control-center/control-center-el.omf
 share/omf/control-center/control-center-en_GB.omf
 share/omf/control-center/control-center-es.omf
 share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-id.omf
 share/omf/control-center/control-center-it.omf
 share/omf/control-center/control-center-ja.omf
 share/omf/control-center/control-center-oc.omf
@@ -278,3 +282,4 @@ share/omf/control-center/control-center-vi.omf
 share/omf/control-center/control-center-zh_CN.omf
 share/pkgconfig/gnome-default-applications.pc
 share/pkgconfig/gnome-keybindings.pc
+share/polkit-1/actions/org.gnome.randr.policy
diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo
index b607b6e392a..3c1ca98a7fd 100644
--- a/x11/gnome-control-center/distinfo
+++ b/x11/gnome-control-center/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2010/07/12 15:54:09 drochner Exp $
+$NetBSD: distinfo,v 1.12 2010/11/24 20:52:41 drochner Exp $
 
-SHA1 (gnome-control-center-2.30.1.tar.bz2) = f7d3f486e114871e53f3d7e743d53b041ebf2f1e
-RMD160 (gnome-control-center-2.30.1.tar.bz2) = 7323a59deb13a8017de4e9f6ee8499fad6b6d7aa
-Size (gnome-control-center-2.30.1.tar.bz2) = 2830194 bytes
+SHA1 (gnome-control-center-2.32.1.tar.bz2) = 1e5ba3117aba7f939de25dbed13e430b90968561
+RMD160 (gnome-control-center-2.32.1.tar.bz2) = 47515f3f96d5695b457a8363bac183fb2188a256
+Size (gnome-control-center-2.32.1.tar.bz2) = 2280217 bytes
 SHA1 (patch-ad) = e2e1a71fff8e59d36b47ff28f994321e9eb5c60f
-SHA1 (patch-ae) = fc38771eef736338a70038cf0218005cd0bffb56
diff --git a/x11/gnome-control-center/patches/patch-ae b/x11/gnome-control-center/patches/patch-ae
deleted file mode 100644
index 785161b15b6..00000000000
--- a/x11/gnome-control-center/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/12/10 11:57:18 dsainty Exp $
-
---- libslab/directory-tile.c.orig	2008-04-03 14:30:21.000000000 +0200
-+++ libslab/directory-tile.c
-@@ -623,7 +623,7 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- 	setsid  ();
--	setpgrp ();
-+	setpgid (0, 0);
- }
- 
- static void