Update to 2.4.0

Changes:

	o Many bugfixes were solved and added new features.

Review Changelog to see a full list of changes.

5 files changed, 74 insertions, 14 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 1cce3461320..861db082986 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/14 23:25:56 xtraeme Exp $
 #
 
-DISTNAME=	control-center-2.2.1
+DISTNAME=	control-center-2.4.0
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	6
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -36,6 +35,7 @@ GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../sysutils/nautilus/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/PLIST b/x11/gnome2-control-center/PLIST
index 051b4d2407f..5770d9939a5 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2003/04/20 13:52:54 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/14 23:25:56 xtraeme Exp $
 bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
 bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
+bin/gnome-display-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
+bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
@@ -12,11 +15,23 @@ bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
 bin/gnome-ui-properties
 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/libthemus-theme-properties-view.a
+lib/bonobo/libthemus-theme-properties-view.la
 lib/bonobo/servers/GNOME_SettingsDaemon.server
+lib/bonobo/servers/Themus_Properties_View.server
+lib/bonobo/servers/fontilus.server
+lib/gnome-vfs-2.0/modules/libfont-method.a
+lib/gnome-vfs-2.0/modules/libfont-method.la
+lib/gnome-vfs-2.0/modules/libfont-method.so
+lib/gnome-vfs-2.0/modules/libtheme-method.a
+lib/gnome-vfs-2.0/modules/libtheme-method.la
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
@@ -26,11 +41,16 @@ 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
+libexec/fontilus-context-menu
+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
@@ -42,13 +62,17 @@ 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/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
@@ -68,6 +92,13 @@ 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/at-startup.png
+share/control-center-2.0/pixmaps/at-support.png
+share/control-center-2.0/pixmaps/bar-disabled.png
+share/control-center-2.0/pixmaps/bar-green.png
+share/control-center-2.0/pixmaps/bar-red.png
+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
@@ -82,11 +113,22 @@ 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/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
 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/control-center-2.0/pixmaps/visual-bell.png
+share/control-center-2.0/xrdb/Editres.ad
+share/control-center-2.0/xrdb/Emacs.ad
+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/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
@@ -96,6 +138,8 @@ share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
 share/idl/ConfigArchiver.idl
 share/idl/GNOME_SettingsDaemon.idl
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -103,8 +147,10 @@ ${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/bn/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
+${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
@@ -117,14 +163,18 @@ ${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/hi/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/id/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/control-center-2.0.mo
 ${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/ml/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
@@ -138,20 +188,29 @@ ${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/sq/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/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/th/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
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 ${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
@@ -159,7 +218,6 @@ share/pixmaps/gnomecc-2/title.png
 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
 @comment in gnome-desktop: @dirrm share/gnome/vfolders
@@ -173,5 +231,5 @@ share/pixmaps/window-capplet.png
 @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
+@comment in libbonobo:@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 0d0d08878dc..da96166bed6 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/14 23:25:56 xtraeme 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.2.1nb6
+BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.4.0
 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 "../../sysutils/nautilus/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 0dfc949d1f3..13a4b9f830f 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/09/27 20:01:17 danw Exp $
+$NetBSD: distinfo,v 1.6 2003/12/14 23:25:56 xtraeme Exp $
 
-SHA1 (control-center-2.2.1.tar.bz2) = ac57c86db7f6b5281386335f64fe4efcf46bfc7f
-Size (control-center-2.2.1.tar.bz2) = 1491602 bytes
-SHA1 (patch-aa) = af281a3da34aba364a6e09458f56b0e45895b13c
+SHA1 (control-center-2.4.0.tar.bz2) = f858040bb793a7385100eadd2a9de68f387ed879
+Size (control-center-2.4.0.tar.bz2) = 2042574 bytes
+SHA1 (patch-aa) = a0fd0bff85be1b18cee001fe273b4a82efe8580a
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa
index d2f87da7042..514bdb6b0bb 100644
--- a/x11/gnome2-control-center/patches/patch-aa
+++ b/x11/gnome2-control-center/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.4 2003/10/18 12:58:58 cjep Exp $
+$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 @@