Update to 2.6.1:

Alex Larsson:
    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=119494
    * Fix reverting a size change.

Chris Lahey:
    * Fix ordering of themes in theme manager
    * Fix sizing of svg backgrounds

Glynn:
    * Toplevel window icons should use the icon themes

Jody:
    http://bugzilla.gnome.org/show_bug.cgi?id=139190
    * Fix uniqueness test for binding special keys with no name
    * Fix theme manager selection when not running metacity
    http://bugzilla.gnome.org/show_bug.cgi?id=139605
    * Mouse buttons are not valid modifiers for keybindings
    * Force libxklavier 1.0.2 so that we can work with x.org and xfree86
    * Match nautilus' interpretation of icons in desktop files

Padraig O'Briain:
    http://bugzilla.gnome.org/show_bug.cgi?id=131538.

gnome-control-center 2.6.0.3

Jody:
    http://bugzilla.gnome.org/show_bug.cgi?id=138701
    * Fix typo
    * Fix uniqueness test for keybindings
    * Merge in some build fixes for sun's forte and Irix

3 files changed, 14 insertions, 9 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 7aaf87f2cc5..99babc49dca 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2004/04/14 16:15:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2004/05/15 15:00:50 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.6.0
+DISTNAME=	control-center-2.6.1
 PKGNAME=	gnome2-${DISTNAME}
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.6/}
@@ -12,7 +12,8 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 configuration utility
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome-icon-theme>=1.1.7:../../graphics/gnome-icon-theme
+
+BUILDLINK_DEPENDS.libxklavier+=	libxklavier>=1.02
 
 USE_MSGFMT_PLURALS=	yes
 GNU_CONFIGURE=		yes
@@ -60,6 +61,7 @@ post-install:
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 53bacf712c6..e36f3c97981 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:40:09 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/05/15 15:00:50 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -143,6 +143,7 @@ share/gnome/vfolders/theme-method.directory
 share/icons/gnome/48x48/apps/accessibility-directory.png
 share/idl/ConfigArchiver.idl
 share/idl/GNOME_SettingsDaemon.idl
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -159,11 +160,13 @@ ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/control-center-2.0.mo
@@ -182,6 +185,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
@@ -215,7 +219,7 @@ share/pixmaps/gnomecc-2/title.png
 @comment in xdg-dirs: @dirrm share/mime-info
 @comment in ORBit2: @dirrm share/idl
 @dirrm share/icons/gnome/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/gnome/48x48
+@comment in gnome-icon-theme: @dirrm share/icons/gnome/48x48
 @comment in gnome-desktop: @dirrm share/gnome/vfolders
 @dirrm share/gnome/cursor-fonts
 @exec ${MKDIR} %D/share/gnome-background-properties
@@ -235,5 +239,4 @@ share/pixmaps/gnomecc-2/title.png
 @dirrm lib/window-manager-settings
 @comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
 @comment in libbonobo: @dirrm lib/bonobo/servers
-@comment in libbonobo: @dirrm lib/bonobo
 @dirrm include/gnome-window-settings-2.0
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 749852008fb..6bd307bf839 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/04/04 05:54:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2004/05/15 15:00:50 jmmv Exp $
 
-SHA1 (control-center-2.6.0.tar.bz2) = 1d082fc3cce616feac278a7f53487c5adf36103d
-Size (control-center-2.6.0.tar.bz2) = 2342706 bytes
+SHA1 (control-center-2.6.1.tar.bz2) = a7e367e24c65dcde65b36f014945acfb1261667d
+Size (control-center-2.6.1.tar.bz2) = 2487807 bytes
 SHA1 (patch-ab) = 15d24efe8e39d948b5663e641f47ea41b815e17d
 SHA1 (patch-ac) = e2df2c5ffc0841f409985eafbafb96c5c9a5551a