update to 2.30.1

This switches to the gnome-2.30 release branch.

4 files changed, 29 insertions, 14 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 3337169713e..a214ab49706 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/07/12 15:54:09 drochner Exp $
 #
 
-DISTNAME=	gnome-control-center-2.28.1
-PKGREVISION=	4
+DISTNAME=	gnome-control-center-2.30.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index b6ae26fe667..05b8a809801 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/10/22 17:25:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/07/12 15:54:09 drochner Exp $
 ${PLIST.evolution}bin/gnome-about-me
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
@@ -55,22 +55,34 @@ ${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.pn
 ${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
+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
+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
@@ -128,6 +140,7 @@ share/gnome/help/control-center/pt/control-center.xml
 share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
+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
@@ -171,6 +184,7 @@ share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.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_CA/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -204,6 +218,7 @@ share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -257,6 +272,7 @@ share/omf/control-center/control-center-pt.omf
 share/omf/control-center/control-center-pt_BR.omf
 share/omf/control-center/control-center-ru.omf
 share/omf/control-center/control-center-sv.omf
+share/omf/control-center/control-center-th.omf
 share/omf/control-center/control-center-uk.omf
 share/omf/control-center/control-center-vi.omf
 share/omf/control-center/control-center-zh_CN.omf
diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo
index fddfa25edf3..b607b6e392a 100644
--- a/x11/gnome-control-center/distinfo
+++ b/x11/gnome-control-center/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2009/10/22 17:25:44 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/07/12 15:54:09 drochner Exp $
 
-SHA1 (gnome-control-center-2.28.1.tar.bz2) = ab41e211c507b9b781199f57ca87c704d07175c1
-RMD160 (gnome-control-center-2.28.1.tar.bz2) = a9620e2f227124bb81b7a3a811ac74cec193ac41
-Size (gnome-control-center-2.28.1.tar.bz2) = 2287398 bytes
-SHA1 (patch-ad) = fe6ae649237fe3b07a449b92c35d8a803b4533fb
+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 (patch-ad) = e2e1a71fff8e59d36b47ff28f994321e9eb5c60f
 SHA1 (patch-ae) = fc38771eef736338a70038cf0218005cd0bffb56
diff --git a/x11/gnome-control-center/patches/patch-ad b/x11/gnome-control-center/patches/patch-ad
index 57d18061477..7deab871c73 100644
--- a/x11/gnome-control-center/patches/patch-ad
+++ b/x11/gnome-control-center/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2008/05/29 11:28:46 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2010/07/12 15:54:09 drochner Exp $
 
---- configure.orig	1974-05-18 09:35:11.000000000 +0100
+--- configure.orig	2010-04-26 14:31:49.000000000 +0000
 +++ configure
-@@ -25729,7 +25729,7 @@ if test `eval 'as_val=${'$as_ac_Header'}
+@@ -14276,7 +14276,7 @@ if test "x$ac_cv_header_X11_extensions_x
    cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_X11_EXTENSIONS_XF86MISC_H 1
  _ACEOF
 - XF86MISC_LIBS="-lXxf86misc"
 + XF86MISC_LIBS="-lXxf86misc -lXext"