update to 2.28.1

This switches to the gnome-2.28 release branch.

6 files changed, 44 insertions, 72 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index f3d1fe009c5..2826410475f 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: Makefile,v 1.27 2009/10/22 17:25:44 drochner Exp $
 #
 
-DISTNAME=	gnome-control-center-2.26.0
-PKGREVISION=	2
+DISTNAME=	gnome-control-center-2.28.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -35,6 +34,7 @@ INSTALLATION_DIRS=	${EGDIR}
 
 GCONF_SCHEMAS+=	control-center.schemas
 GCONF_SCHEMAS+=	fontilus.schemas
+GCONF_SCHEMAS+=	gnome-control-center.schemas
 
 EGDIR=			${PREFIX}/share/examples/gnome-control-center
 CONF_FILES+=		${EGDIR}/gnomecc.menu \
@@ -49,11 +49,6 @@ _TOOLS_USE_MSGFMT_SH=	yes
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.glib2=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gstreamer0.10=		gstreamer0.10>=0.10.1.2
@@ -86,7 +81,9 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../x11/libXxf86misc/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxklavier=	libxklavier>=4.0
 .include "../../x11/libxklavier/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.28.0
 .include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index 85beacad30f..b6ae26fe667 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:24:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/10/22 17:25:44 drochner Exp $
 ${PLIST.evolution}bin/gnome-about-me
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
@@ -38,18 +38,8 @@ share/desktop-directories/gnomecc.directory
 share/examples/gnome-control-center/gnomecc.menu
 share/gconf/schemas/control-center.schemas
 share/gconf/schemas/fontilus.schemas
+share/gconf/schemas/gnome-control-center.schemas
 share/gnome-control-center/default-apps/gnome-default-applications.xml
-share/gnome-control-center/glade/appearance.glade
-share/gnome-control-center/glade/at-enable-dialog.glade
-share/gnome-control-center/glade/display-capplet.glade
-${PLIST.evolution}share/gnome-control-center/glade/gnome-about-me.glade
-share/gnome-control-center/glade/gnome-about-me-fingerprint.glade
-share/gnome-control-center/glade/gnome-default-applications-properties.glade
-share/gnome-control-center/glade/gnome-keybinding-properties.glade
-share/gnome-control-center/glade/gnome-keyboard-properties.glade
-share/gnome-control-center/glade/gnome-mouse-properties.glade
-share/gnome-control-center/glade/gnome-network-properties.glade
-share/gnome-control-center/glade/gnome-window-properties.glade
 share/gnome-control-center/keybindings/00-multimedia-key.xml
 share/gnome-control-center/keybindings/01-desktop-key.xml
 share/gnome-control-center/pixmaps/at-startup.png
@@ -65,17 +55,45 @@ ${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.svg
+share/gnome-control-center/pixmaps/left-little-finger.svg
+share/gnome-control-center/pixmaps/left-middle-finger.svg
+share/gnome-control-center/pixmaps/left-ring-finger.svg
+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.svg
+share/gnome-control-center/pixmaps/print_ok.svg
+share/gnome-control-center/pixmaps/right-index-finger.svg
+share/gnome-control-center/pixmaps/right-little-finger.svg
+share/gnome-control-center/pixmaps/right-middle-finger.svg
+share/gnome-control-center/pixmaps/right-ring-finger.svg
+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
 share/gnome-control-center/pixmaps/subpixel-vrgb.png
 share/gnome-control-center/pixmaps/theme-thumbnailing.png
 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-default-applications-properties.ui
+share/gnome-control-center/ui/gnome-keybinding-properties.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui
+share/gnome-control-center/ui/gnome-mouse-properties.ui
+share/gnome-control-center/ui/gnome-network-properties.ui
+share/gnome-control-center/ui/gnome-window-properties.ui
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -97,6 +115,7 @@ share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/ca@valencia/control-center.xml
 share/gnome/help/control-center/cs/control-center.xml
 share/gnome/help/control-center/de/control-center.xml
+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
@@ -145,6 +164,7 @@ share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -224,6 +244,7 @@ share/omf/control-center/control-center-ca.omf
 share/omf/control-center/control-center-ca@valencia.omf
 share/omf/control-center/control-center-cs.omf
 share/omf/control-center/control-center-de.omf
+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
diff --git a/x11/gnome-control-center/buildlink3.mk b/x11/gnome-control-center/buildlink3.mk
index 9910921321f..a47ea3ea047 100644
--- a/x11/gnome-control-center/buildlink3.mk
+++ b/x11/gnome-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/10/22 17:25:44 drochner Exp $
 
 BUILDLINK_TREE+=	gnome-control-center
 
@@ -9,10 +9,6 @@ BUILDLINK_API_DEPENDS.gnome-control-center+=	gnome-control-center>=2.20.0.1
 BUILDLINK_ABI_DEPENDS.gnome-control-center?=	gnome-control-center>=2.26.0nb2
 BUILDLINK_PKGSRCDIR.gnome-control-center?=	../../x11/gnome-control-center
 
-.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo
index b1c2dd8f84d..fddfa25edf3 100644
--- a/x11/gnome-control-center/distinfo
+++ b/x11/gnome-control-center/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.9 2009/08/15 14:48:34 wiz Exp $
+$NetBSD: distinfo,v 1.10 2009/10/22 17:25:44 drochner Exp $
 
-SHA1 (gnome-control-center-2.26.0.tar.bz2) = 4730780aaab599869a2dfe2d72d68dd54bb77058
-RMD160 (gnome-control-center-2.26.0.tar.bz2) = d22c75b21d63bad9321ad1221e442f381da8dd35
-Size (gnome-control-center-2.26.0.tar.bz2) = 2262324 bytes
-SHA1 (patch-aa) = 94fc634e164c6c5398fe8cfdeb8c01372ae87aac
-SHA1 (patch-ab) = 82e7da7e90d8c30aa061c49f9f26ae270c122462
+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 (patch-ae) = fc38771eef736338a70038cf0218005cd0bffb56
diff --git a/x11/gnome-control-center/patches/patch-aa b/x11/gnome-control-center/patches/patch-aa
deleted file mode 100644
index c37595d187a..00000000000
--- a/x11/gnome-control-center/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/08/15 14:48:34 wiz Exp $
-
---- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig	2008-11-04 16:09:47.000000000 +0000
-+++ capplets/keyboard/gnome-keyboard-properties-xkb.c
-@@ -155,7 +155,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
- 
- 	engine = xkl_engine_get_instance (GDK_DISPLAY ());
- 	config_registry = xkl_config_registry_get_instance (engine);
--	xkl_config_registry_load (config_registry);
-+	xkl_config_registry_load (config_registry, FALSE);
- 
- 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
- 				   engine);
diff --git a/x11/gnome-control-center/patches/patch-ab b/x11/gnome-control-center/patches/patch-ab
deleted file mode 100644
index 3ec09da9dcf..00000000000
--- a/x11/gnome-control-center/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/10/16 15:24:01 drochner Exp $
-
---- capplets/about-me/gnome-about-me.c.orig	2008-09-24 18:36:23.000000000 +0200
-+++ capplets/about-me/gnome-about-me.c
-@@ -329,17 +329,12 @@ about_me_focus_out (GtkWidget *widget, G
- static char *
- get_user_login (void)
- {
--	char buf[LINE_MAX * 4];
--	struct passwd pwd, *err;
-+	struct passwd *pwd;
- 
--	int i;
--#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
--	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
--	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
--#else
--	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
--	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
--#endif
-+	pwd = getpwuid (getuid ());
-+	if (pwd == NULL)
-+		return NULL;
-+	return g_strdup (pwd->pw_name);
- }
- 
- /*