Update to 2.6.0. Changes since previous stable branch (list may be

incomplete):

gnome-control-center 2.5.4

* Improve layout of display capplet
* quote the AC_DEFUN properly
* Add a test for ngettext
* Delete some of the unused file cluttering the tree
* Trivial string consistency adjustment
* Handle sorted trees
* Fix incorrect string in gnome-settings-daemon
* Do not popup the logout dialog when the close button (X)
* Move a few capplets to the new file selector
* Fix the ATK relations for the file-type capplet
* Make fontilus and themus respect the gconf install settings
* Fix transtions for titles of colour pickers.
* Warn before deleting a type
* Improve Dr Wright.
* Another typo in the new a11y settings daemon extensions

gnome-control-center 2.5.1

* Fix the build and configure on older X servers.
* Use icon themes
* Merge gswitchit into gnome-settings-daemon and keyboard capplet

gnome-control-center 2.5.0

* Add libxklavier and prep for inclusion of gswitchit's xkb-properties-capplet
* http://bugzilla.gnome.org/show_bug.cgi?id=120842
  [HIGification broke accessx]
* http://bugzilla.gnome.org/show_bug.cgi?id=106489
  [protect against gconf failure]
* http://bugzilla.gnome.org/show_bug.cgi?id=124513
  [Handle TruColor Displays]
* http://bugzilla.gnome.org/show_bug.cgi?id=116710
  [smarter maximum dpi]

7 files changed, 66 insertions, 96 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index d380d2c7ba1..5de7baf5c49 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/01 18:40:09 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.4.0
+DISTNAME=	control-center-2.6.0
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	10
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -14,7 +13,9 @@ COMMENT=	GNOME2 configuration utility
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
+DEPENDS+=		gnome-icon-theme>=1.1.7:../../graphics/gnome-icon-theme
 
+USE_MSGFMT_PLURALS=	yes
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
@@ -23,11 +24,14 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_X11=		yes
 
+CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
+GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_peripherals_keyboard_xkb.schemas
 GCONF2_SCHEMAS+=	themus.schemas
 GCONF2_SCHEMAS+=	fontilus.schemas
 
@@ -63,5 +67,6 @@ post-install:
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 817cf7685d8..53bacf712c6 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/02/15 18:37:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:40:09 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -12,7 +12,6 @@ bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
-bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
@@ -45,41 +44,33 @@ lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
 libexec/fontilus-context-menu
+libexec/gnome-settings-daemon
 share/application-registry/fontilus.applications
 share/application-registry/themus.applications
 share/applications/gnomecc.desktop
 share/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/control-center-2.0/capplets/at-properties.desktop
 share/control-center-2.0/capplets/background.desktop
-share/control-center-2.0/capplets/behavior.desktop
 share/control-center-2.0/capplets/default-applications.desktop
 share/control-center-2.0/capplets/display-properties.desktop
 share/control-center-2.0/capplets/file-types.desktop
 share/control-center-2.0/capplets/font-properties.desktop
 share/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/control-center-2.0/capplets/gnome-settings-mouse.desktop
+share/control-center-2.0/capplets/gnome-settings-sound.desktop
+share/control-center-2.0/capplets/gnome-ui-properties.desktop
 share/control-center-2.0/capplets/gtk-theme-selector.desktop
 share/control-center-2.0/capplets/keybinding.desktop
 share/control-center-2.0/capplets/keyboard.desktop
-share/control-center-2.0/capplets/mouse.desktop
-share/control-center-2.0/capplets/sound.desktop
 share/control-center-2.0/capplets/window-properties.desktop
-share/control-center-2.0/icons/accessibility-directory.png
-share/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/control-center-2.0/icons/at-enable-capplet.png
-share/control-center-2.0/icons/background-capplet.png
-share/control-center-2.0/icons/behavior-capplet.png
-share/control-center-2.0/icons/default-applications-capplet.png
 share/control-center-2.0/icons/display-capplet.png
-share/control-center-2.0/icons/font-capplet.png
-share/control-center-2.0/icons/gnome-network-capplet.png
-share/control-center-2.0/icons/mouse-capplet.png
-share/control-center-2.0/icons/sound-capplet.png
-share/control-center-2.0/icons/window-capplet.png
+share/control-center-2.0/interfaces/acme.glade
+share/control-center-2.0/interfaces/apply-font.glade
 share/control-center-2.0/interfaces/at-enable-dialog.glade
-share/control-center-2.0/interfaces/background-properties.glade
 share/control-center-2.0/interfaces/file-types-properties.glade
 share/control-center-2.0/interfaces/font-properties.glade
 share/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
+share/control-center-2.0/interfaces/gnome-background-properties.glade
 share/control-center-2.0/interfaces/gnome-default-applications-properties.glade
 share/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/control-center-2.0/interfaces/gnome-keyboard-properties.glade
@@ -95,7 +86,8 @@ share/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/control-center-2.0/pixmaps/at-enable-capplet.png
+share/control-center-2.0/pixmaps/acme-brightness.png
+share/control-center-2.0/pixmaps/acme-eject.png
 share/control-center-2.0/pixmaps/at-startup.png
 share/control-center-2.0/pixmaps/at-support.png
 share/control-center-2.0/pixmaps/bar-disabled.png
@@ -105,8 +97,9 @@ share/control-center-2.0/pixmaps/bar.png
 share/control-center-2.0/pixmaps/double-click-maybe.png
 share/control-center-2.0/pixmaps/double-click-off.png
 share/control-center-2.0/pixmaps/double-click-on.png
+share/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/control-center-2.0/pixmaps/keyboard-bell.png
-share/control-center-2.0/pixmaps/keyboard-capplet.png
 share/control-center-2.0/pixmaps/keyboard-cursor.png
 share/control-center-2.0/pixmaps/keyboard-repeat.png
 share/control-center-2.0/pixmaps/keyboard-volume.png
@@ -117,7 +110,6 @@ share/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/control-center-2.0/pixmaps/mouse-left.png
 share/control-center-2.0/pixmaps/mouse-right.png
 share/control-center-2.0/pixmaps/ocean-stripes.png
-share/control-center-2.0/pixmaps/sound-capplet.png
 share/control-center-2.0/pixmaps/stop.png
 share/control-center-2.0/pixmaps/subpixel-bgr.png
 share/control-center-2.0/pixmaps/subpixel-rgb.png
@@ -131,12 +123,13 @@ share/control-center-2.0/xrdb/General.ad
 share/control-center-2.0/xrdb/Motif.ad
 share/control-center-2.0/xrdb/Tk.ad
 share/control-center-2.0/xrdb/Xaw.ad
-share/control-center/apply-font.glade
 share/examples/gnome2-control-center/font-method.conf
 share/examples/gnome2-control-center/theme-method.conf
 share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
+share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 share/gconf/schemas/fontilus.schemas
 share/gconf/schemas/themus.schemas
 share/gnome-2.0/ui/gnomecc-ui.xml
@@ -147,6 +140,7 @@ share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 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/am/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +155,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/control-center-2.0.mo
+${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
@@ -209,34 +204,36 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/mime-info/fontilus.keys
 share/mime-info/fontilus.mime
 share/mime-info/themus.keys
-share/pixmaps/accessibility-keyboard-capplet.png
-share/pixmaps/at-enable-capplet.png
-share/pixmaps/background-capplet.png
-share/pixmaps/behavior-capplet.png
 share/pixmaps/control-center2.png
-share/pixmaps/default-applications-capplet.png
 share/pixmaps/display-capplet.png
-share/pixmaps/font-capplet.png
-share/pixmaps/gnome-ccthemes.png
 share/pixmaps/gnomecc-2/active.png
 share/pixmaps/gnomecc-2/bcg_top.png
 share/pixmaps/gnomecc-2/blank.png
 share/pixmaps/gnomecc-2/title.png
-share/pixmaps/keyboard-capplet.png
-share/pixmaps/keyboard-shortcut.png
-share/pixmaps/mouse-capplet.png
-share/pixmaps/window-capplet.png
 @dirrm share/pixmaps/gnomecc-2
+@comment in xdg-dirs: @dirrm share/pixmaps
+@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-desktop: @dirrm share/gnome/vfolders
 @dirrm share/gnome/cursor-fonts
-@comment in gnome2-dirs:@dirrm share/gnome-2.0/ui
+@exec ${MKDIR} %D/share/gnome-background-properties
+@dirrm share/gnome-background-properties
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in gnome2-dirs: @dirrm share/gnome
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/examples/gnome2-control-center
+@dirrm share/control-center-2.0/xrdb
 @dirrm share/control-center-2.0/pixmaps
 @dirrm share/control-center-2.0/interfaces
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/icons
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in gnome2-dirs: @dirrm share/control-center-2.0
-@comment in gnome2-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/window-manager-settings
-@comment in libbonobo:@dirrm lib/bonobo/servers
+@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/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index fdd4bf776f0..1259a06804b 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:40:09 jmmv Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
 BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.4.0nb2
-BUILDLINK_RECOMMENDED.gnome2-control-center?=	gnome2-control-center>=2.4.0nb10
+BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.6.0
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 11ad2472ea2..a6d4e10fcac 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/12/15 02:55:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/04/01 18:40:09 jmmv Exp $
 
-SHA1 (control-center-2.4.0.tar.bz2) = f858040bb793a7385100eadd2a9de68f387ed879
-Size (control-center-2.4.0.tar.bz2) = 2042574 bytes
-SHA1 (patch-aa) = a0fd0bff85be1b18cee001fe273b4a82efe8580a
-SHA1 (patch-ab) = 51b51831410ea1642dfbec1e540848e6c6ed08f9
-SHA1 (patch-ac) = a8b88935b80f0a96bda42f1b697b4c51bdd2868f
+SHA1 (control-center-2.6.0.tar.bz2) = 1d082fc3cce616feac278a7f53487c5adf36103d
+Size (control-center-2.6.0.tar.bz2) = 2342706 bytes
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa
deleted file mode 100644
index 514bdb6b0bb..00000000000
--- a/x11/gnome2-control-center/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/12/14 23:25:56 xtraeme Exp $
-
---- configure.orig	Sun Aug 31 16:33:12 2003
-+++ configure	Sun Aug 31 16:33:04 2003
-@@ -11136,7 +11136,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- XF86MISC_LIBS="-lXxf86misc"
-+ XF86MISC_LIBS="-lXxf86misc -lXext"
- fi
- 
- done
diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/gnome2-control-center/patches/patch-ab
index 95f198bb28a..f653e3e1281 100644
--- a/x11/gnome2-control-center/patches/patch-ab
+++ b/x11/gnome2-control-center/patches/patch-ab
@@ -1,20 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2003/12/15 02:55:53 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/01 18:40:09 jmmv Exp $
 
---- vfs-methods/fontilus/Makefile.in.orig	2003-12-15 03:25:37.000000000 +0100
-+++ vfs-methods/fontilus/Makefile.in	2003-12-15 03:28:58.000000000 +0100
-@@ -215,14 +215,13 @@
- appregdir = $(datadir)/application-registry
- appreg_DATA = fontilus.applications
+--- vfs-methods/fontilus/Makefile.in.orig	2004-03-11 06:35:26.000000000 +0100
++++ vfs-methods/fontilus/Makefile.in
+@@ -214,7 +214,7 @@ libexec_PROGRAMS = fontilus-context-menu
+ fontilus_context_menu_LDADD = $(FONT_CONTEXT_MENU_LIBS)
+ fontilus_context_menu_SOURCES = fontilus-context-menu.c
  
--schemasdir = $(sysconfdir)/gconf/schemas
-+schemasdir = $(datadir)/gconf/schemas
- schemas_DATA = fontilus.schemas
+-vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
++vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
+ vfsmoduleconf_DATA = font-method.conf
  
- serverdir = $(libdir)/bonobo/servers
- server_DATA = fontilus.server
- 
- EXTRA_DIST = \
--  font-method.conf \
-   font-method.directory.in \
-   fontilus.keys \
-   fontilus.mime \
+ vfsdirectorydir = $(datadir)/gnome/vfolders
diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac
index 0266cc58d58..176f1599003 100644
--- a/x11/gnome2-control-center/patches/patch-ac
+++ b/x11/gnome2-control-center/patches/patch-ac
@@ -1,21 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2003/12/15 02:55:53 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/01 18:40:09 jmmv Exp $
 
---- vfs-methods/themus/Makefile.in.orig	2003-12-15 03:29:42.000000000 +0100
-+++ vfs-methods/themus/Makefile.in	2003-12-15 03:30:13.000000000 +0100
-@@ -236,7 +236,7 @@
- vfsdirectorydir = $(datadir)/gnome/vfolders
- vfsdirectory_DATA = theme-method.directory
+--- vfs-methods/themus/Makefile.in.orig	2004-03-11 06:35:24.000000000 +0100
++++ vfs-methods/themus/Makefile.in
+@@ -229,7 +229,7 @@ libthemus_theme_properties_view_la_SOURC
+ Gladedir = $(GNOMECC_GLADE_DIR)
+ Glade_DATA = apply-font.glade
  
--schemasdir = $(sysconfdir)/gconf/schemas
-+schemasdir = $(datadir)/gconf/schemas
- schemas_in_files = themus.schemas.in
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+-vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
++vfsmoduleconfdir = $(datadir)/examples/gnome2-control-center
+ vfsmoduleconf_DATA = theme-method.conf
  
-@@ -255,7 +255,6 @@
- EXTRA_DIST = \
-   apply-font.glade \
-   theme-method.directory.in \
--  theme-method.conf \
-   themus.schemas.in \
-   Themus_Properties_View.server.in.in \
-   themus.applications \
+ vfsdirectorydir = $(datadir)/gnome/vfolders