Update to 1.4.0.5:

- the screensaver capplet is no more - we are to use xscreensaver-demo
- a new default-applications capplet is replacing the old
gnome-editor-properties capplet. This also lets you do some new things
wrt changing the users preferred webbrowser etc.

6 files changed, 79 insertions, 61 deletions

diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index b1d8087ec7b..4df7777ebe1 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/24 21:26:24 wiz Exp $
 
-DISTNAME=		control-center-1.4.0.4
-PKGREVISION=		10
+DISTNAME=		control-center-1.4.0.5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
@@ -11,7 +10,7 @@ COMMENT=		GNOME control-center development library
 
 BUILD_USES_MSGFMT=	YES
 
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		xdg-1.1 gnome1-1.5
 USE_X11BASE=		YES
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
diff --git a/x11/control-center/PLIST b/x11/control-center/PLIST
index fa57fb6f220..778305fc982 100644
--- a/x11/control-center/PLIST
+++ b/x11/control-center/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/06/24 21:26:24 wiz Exp $
 bin/background-properties-capplet
+bin/default-application-properties-capplet
 bin/file-types-capplet
-bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
@@ -32,8 +32,8 @@ share/control-center/Desktop/background-properties.desktop
 share/control-center/Desktop/theme-selector.desktop
 share/control-center/Desktop/wm-properties.desktop
 share/control-center/Documents/.directory
+share/control-center/Documents/default-application-properties.desktop
 share/control-center/Documents/file-types-capplet.desktop
-share/control-center/Documents/gnome-edit-properties.desktop
 share/control-center/Documents/url-properties.desktop
 share/control-center/Multimedia/.directory
 share/control-center/Multimedia/sound-properties.desktop
@@ -50,7 +50,7 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
-share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
+share/gnome/apps/Settings/Documents/default-applicaiton-properties.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -101,6 +101,46 @@ share/gnome/help/control-center/C/stylesheet-images/up.gif
 share/gnome/help/control-center/C/stylesheet-images/warning.gif
 share/gnome/help/control-center/C/topic.dat
 share/gnome/help/control-center/C/usage.html
+share/gnome/help/control-center/eu/control-center.sgml
+share/gnome/help/control-center/eu/desktop-intro.html
+share/gnome/help/control-center/eu/doc-handlers.html
+share/gnome/help/control-center/eu/figures/bg-capplet.png
+share/gnome/help/control-center/eu/figures/gccalf.png
+share/gnome/help/control-center/eu/figures/gccappdef.png
+share/gnome/help/control-center/eu/figures/gccdialog.png
+share/gnome/help/control-center/eu/figures/gccedit.png
+share/gnome/help/control-center/eu/figures/gcchints.png
+share/gnome/help/control-center/eu/figures/gccmdi.png
+share/gnome/help/control-center/eu/figures/gccmime.png
+share/gnome/help/control-center/eu/figures/gccsession-props.png
+share/gnome/help/control-center/eu/figures/gccsessopt.png
+share/gnome/help/control-center/eu/figures/gccsound1.png
+share/gnome/help/control-center/eu/figures/gccsound2.png
+share/gnome/help/control-center/eu/figures/gccstartup.png
+share/gnome/help/control-center/eu/figures/gccurl.png
+share/gnome/help/control-center/eu/figures/glob_pref_anim.png
+share/gnome/help/control-center/eu/figures/keyboard-capplet.png
+share/gnome/help/control-center/eu/figures/mouse-capplet.png
+share/gnome/help/control-center/eu/figures/screensave-capplet.png
+share/gnome/help/control-center/eu/figures/theme-select.png
+share/gnome/help/control-center/eu/figures/wm-add.png
+share/gnome/help/control-center/eu/figures/wm-main.png
+share/gnome/help/control-center/eu/index.html
+share/gnome/help/control-center/eu/ln7.html
+share/gnome/help/control-center/eu/stylesheet-images/caution.gif
+share/gnome/help/control-center/eu/stylesheet-images/home.gif
+share/gnome/help/control-center/eu/stylesheet-images/important.gif
+share/gnome/help/control-center/eu/stylesheet-images/next.gif
+share/gnome/help/control-center/eu/stylesheet-images/note.gif
+share/gnome/help/control-center/eu/stylesheet-images/prev.gif
+share/gnome/help/control-center/eu/stylesheet-images/tip.gif
+share/gnome/help/control-center/eu/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/eu/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/eu/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/eu/stylesheet-images/up.gif
+share/gnome/help/control-center/eu/stylesheet-images/warning.gif
+share/gnome/help/control-center/eu/topic.dat
+share/gnome/help/control-center/eu/usage.html
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
@@ -145,22 +185,30 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/control-center.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/control-center.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/control-center.mo
 share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-eu.omf
 share/pixmaps/ccsplash.png
 share/pixmaps/control-center.png
+@comment in xdg-x11-dirs: @dirrm share/pixmaps
 @exec ${MKDIR} -m 0755 %D/share/control-center/capplets
 @dirrm share/omf/control-center
 @comment in scrollkeeper: @dirrm share/omf
+@comment in ORBit or below: @dirrm share/idl
+@comment ? @dirrm share/gnome/wm-properties
 @dirrm share/gnome/help/control-center/C/stylesheet-images
 @dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center/eu/stylesheet-images
+@dirrm share/gnome/help/control-center/eu/figures
+@dirrm share/gnome/help/control-center/eu
 @dirrm share/gnome/help/control-center
+@comment in gnome1-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/apps/Settings/UIOptions
-@comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Session
-@comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Peripherals
+@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Session
+@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Peripherals
 @dirrm share/gnome/apps/Settings/Multimedia
 @dirrm share/gnome/apps/Settings/Documents
-@comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Desktop
-@comment in gnome-dirs: @dirrm share/gnome/apps/Settings
+@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Desktop
+@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings
 @comment in gnome-dirs: @dirrm share/gnome/apps
 @dirrm share/control-center/capplets
 @dirrm share/control-center/UIOptions
@@ -171,3 +219,4 @@ share/pixmaps/control-center.png
 @dirrm share/control-center/Desktop
 @dirrm share/control-center
 @dirrm include/libcapplet1
+@comment in gnome-libs: @dirrm etc/CORBA/servers
diff --git a/x11/control-center/distinfo b/x11/control-center/distinfo
index 001d85d5ff4..11d5bddece2 100644
--- a/x11/control-center/distinfo
+++ b/x11/control-center/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/06/24 21:26:24 wiz Exp $
 
-SHA1 (control-center-1.4.0.4.tar.gz) = 7f18cbcdadcebfc967d4a9abac7804d513d4298f
-RMD160 (control-center-1.4.0.4.tar.gz) = f797111400ed00eba89789e7634af2517e7cdad2
-Size (control-center-1.4.0.4.tar.gz) = 3567130 bytes
+SHA1 (control-center-1.4.0.5.tar.gz) = ffb2e917bddcd38f9392289c5ac3f18ae2d4ef4b
+RMD160 (control-center-1.4.0.5.tar.gz) = 74df82cc4a8f1876e9cba705dddb86c3863edc29
+Size (control-center-1.4.0.5.tar.gz) = 3837552 bytes
 SHA1 (patch-aa) = 423ad6c931885f1975311b8cc90d9de636e9c808
-SHA1 (patch-ab) = a2462d2b79f0bc496ab57c4ce1981f25476faf6b
-SHA1 (patch-ac) = 2fc67976315b8a203233e71d1f311f3e097aa499
+SHA1 (patch-ab) = 36ba5c92cfc5ab61837355d43ee87378cd22d7a8
 SHA1 (patch-ad) = eed73e2eb48bb837ff97fc80901171902b8f2a5c
-SHA1 (patch-af) = fa276788e2ff16fd82674c7031b8ed806cc37ddf
+SHA1 (patch-af) = 946c765bf1e0d8b2e1d47a0eff224468f125fa76
diff --git a/x11/control-center/patches/patch-ab b/x11/control-center/patches/patch-ab
index 6b6d1ac5503..064ee8c01f0 100644
--- a/x11/control-center/patches/patch-ab
+++ b/x11/control-center/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/06/24 21:26:24 wiz Exp $
 
---- configure.orig	Sun Feb 10 16:36:55 2002
+--- configure.orig	2002-04-06 17:40:28.000000000 +0200
 +++ configure
-@@ -7570,7 +7570,7 @@
+@@ -7384,7 +7384,7 @@ fi
  
                                
     for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -8506,6 +8506,11 @@
+@@ -8320,6 +8320,11 @@ fi
  
  
  
diff --git a/x11/control-center/patches/patch-ac b/x11/control-center/patches/patch-ac
deleted file mode 100644
index b7b7a7c1b0b..00000000000
--- a/x11/control-center/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
-
---- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
-+++ capplets/Makefile.in
-@@ -152,7 +152,7 @@
- l = @l@
- 
- always_built_SUBDIRS = desktop-links mouse-properties \
--	screensaver-properties background-properties \
-+	background-properties \
-         theme-switcher sound-properties \
- 	ui-properties url-properties gnome-edit-properties \
- 	wm-properties keyboard-properties\
diff --git a/x11/control-center/patches/patch-af b/x11/control-center/patches/patch-af
index 4380624a989..77218958227 100644
--- a/x11/control-center/patches/patch-af
+++ b/x11/control-center/patches/patch-af
@@ -1,33 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+$NetBSD: patch-af,v 1.2 2005/06/24 21:26:24 wiz Exp $
 
---- capplets/background-properties/app-background.c.orig	Wed Nov  8 23:11:17 2000
+--- capplets/background-properties/app-background.c.orig	2002-04-06 17:44:02.000000000 +0200
 +++ capplets/background-properties/app-background.c
-@@ -7,13 +7,13 @@
- #include <locale.h>
- 
- extern void background_init(void);
-+extern void background_properties_init(void);
+@@ -11,7 +11,7 @@ extern void background_init(void);
  
  static gchar *background_image = NULL;
  
--const struct poptOption options [] = {
--	{ "background-image", 'b', POPT_ARG_STRING, &background_image, 0,
--	  N_("Set background image."), N_("IMAGE-FILE") },
--	{NULL, '\0', 0, NULL, 0}
-+static struct poptOption options = {
-+	"background-image", 'b', POPT_ARG_STRING, &background_image, 0,
-+	 N_("Set background image."), N_("IMAGE-FILE"),
- };
- 
- gint
-@@ -24,14 +24,13 @@
- 	gchar *session_args[3];
- 	int token, init_results;
- 	poptContext ctx;
--	char **args;
- 
- 	setlocale(LC_ALL, "");	
- 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+-struct poptOption options [] = {
++static struct poptOption options [] = {
+ 	{ "background-image", 'b', POPT_ARG_STRING, &background_image, 0,
+ 	  N_("Set background image."), N_("IMAGE-FILE") },
+ 	{NULL, '\0', 0, NULL, 0}
+@@ -31,7 +31,7 @@ main (gint argc, char *argv[])
  	textdomain (PACKAGE);
  
  	init_results = gnome_capplet_init("background-properties", VERSION,