Update to 2.2.0.1. Changes since 2.0.1.1:

* gnome-keyboard-properties.c (accessibility_button_clicked) : fix
  minor typo that disables the error dialog in the event of failure.
* gnome-theme-info.c : Rewrite.  Now working
* gnome-theme-manager : Fix lots of bugs.  Use the rewrite.
* disable edit button when selecting mime catagory
* Tidy labels and accelerators in file-type edit dialogs
* Don't start esd just to stop it
* Add an image size label for background capplet.
* Some minor ui tweaks for accessx.
* Some aix portabiltiy patches
* fix accelerators for ui-properties capplet.

5 files changed, 63 insertions, 24 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 1ad34a97778..83b23984224 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/01/10 07:59:45 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/14 21:03:40 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.0.1.1
+DISTNAME=	control-center-2.2.0.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@netbsd.org
@@ -13,25 +12,30 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 configuration utility
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS=		gnome2-dirs>=1.0:../../gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
-USE_GNU_GETTEXT=	yes
 USE_X11=		yes
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
+GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
+
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../wm/metacity/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/gnome-desktop/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index d062fcf76ac..37374d9fb2a 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:03:40 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-background-properties
 bin/gnome-control-center
@@ -11,10 +11,9 @@ bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
-bin/gnome-theme-properties
+bin/gnome-theme-manager
 bin/gnome-ui-properties
-etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+bin/gnome-window-properties
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/bonobo/servers/GNOME_SettingsDaemon.server
@@ -24,6 +23,9 @@ lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
 lib/libgnome-window-settings.so.1.0
 lib/pkgconfig/gnome-window-settings-2.0.pc
+lib/window-manager-settings/libmetacity.a
+lib/window-manager-settings/libmetacity.la
+lib/window-manager-settings/libmetacity.so
 share/applications/gnomecc.desktop
 share/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/control-center-2.0/capplets/background.desktop
@@ -37,16 +39,16 @@ 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/advanced-directory.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/control-center.png
 share/control-center-2.0/icons/default-applications-capplet.png
 share/control-center-2.0/icons/font-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/background-properties.glade
 share/control-center-2.0/interfaces/file-types-properties.glade
 share/control-center-2.0/interfaces/font-properties.glade
@@ -57,6 +59,7 @@ share/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/control-center-2.0/interfaces/gnome-window-properties.glade
 share/control-center-2.0/interfaces/sound-properties.glade
 share/control-center-2.0/interfaces/theme-install.glade
 share/control-center-2.0/interfaces/theme-properties.glade
@@ -79,6 +82,14 @@ share/control-center-2.0/pixmaps/mouse-cursor-white-large.png
 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/subpixel-bgr.png
+share/control-center-2.0/pixmaps/subpixel-rgb.png
+share/control-center-2.0/pixmaps/subpixel-vbgr.png
+share/control-center-2.0/pixmaps/subpixel-vrgb.png
+share/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
@@ -87,8 +98,10 @@ share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/idl/ConfigArchiver.idl
 share/idl/GNOME_SettingsDaemon.idl
+${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
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/control-center-2.0.mo
@@ -102,6 +115,7 @@ ${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/he/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/control-center-2.0.mo
@@ -109,6 +123,8 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/control-center-2.0.mo
 ${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
@@ -121,6 +137,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -141,15 +158,18 @@ share/pixmaps/keyboard-capplet.png
 share/pixmaps/keyboard-shortcut.png
 share/pixmaps/mouse-capplet.png
 share/pixmaps/sound-capplet.png
+share/pixmaps/window-capplet.png
 @dirrm share/pixmaps/gnomecc-2
-@unexec ${RMDIR} %D/share/gnome/vfolders 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/cursor-fonts 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome-2.0/ui 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE}
+@comment in gnome-desktop: @dirrm share/gnome/vfolders
+@dirrm share/gnome/cursor-fonts
+@comment in gnome2-dirs:@dirrm share/gnome-2.0/ui
+@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm share/control-center-2.0/pixmaps
 @dirrm share/control-center-2.0/interfaces
 @dirrm share/control-center-2.0/icons
-@dirrm share/control-center-2.0/capplets
-@dirrm share/control-center-2.0
-@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}
+@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
+@dirrm lib/window-manager-settings
+@comment in bonobo-activation:@dirrm lib/bonobo/servers
 @dirrm include/gnome-window-settings-2.0
diff --git a/x11/gnome2-control-center/buildlink2.mk b/x11/gnome2-control-center/buildlink2.mk
index ff2b6c5758b..25e911f642d 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:32 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 21:03:41 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome2-control-center.
 #
@@ -9,7 +9,7 @@
 GNOME2_CONTROL_CENTER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome2-control-center
-BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.0.1.1nb1
+BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.2.0.1
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome2-control-center=gnome2-control-center
@@ -29,6 +29,7 @@ BUILDLINK_FILES.gnome2-control-center+=	share/idl/GNOME_SettingsDaemon.idl
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../wm/metacity/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/gnome-desktop/buildlink2.mk"
 
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index c3249c01dfb..ca1875aea63 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/15 05:48:52 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/02/14 21:03:41 jmmv Exp $
 
-SHA1 (control-center-2.0.1.1.tar.bz2) = f4be8cf54337f6a478648e8637fceb3d6481d8c0
-Size (control-center-2.0.1.1.tar.bz2) = 1177465 bytes
+SHA1 (control-center-2.2.0.1.tar.bz2) = 620dab3ee2e17124dff948cd362d83ca0ef28135
+Size (control-center-2.2.0.1.tar.bz2) = 1462388 bytes
+SHA1 (patch-aa) = 7e84fc5046e6e2401f40004ddf2aea69b13dd4a6
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa
new file mode 100644
index 00000000000..d95dee8d882
--- /dev/null
+++ b/x11/gnome2-control-center/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/02/14 21:03:41 jmmv Exp $
+
+--- schemas/Makefile.in.orig	2003-02-14 15:11:06.000000000 +0100
++++ schemas/Makefile.in
+@@ -280,7 +280,7 @@ maintainer-clean
+ 
+ # don't do this if we are building in eg. rpm
+ install-data-local:
+-	if test -z "$(DESTDIR)" ; then \
++	if false; then \
+ 		for p in $(schema_DATA) ; do \
+ 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+ 		done \