Update to controlcenter 1.4.0.4:

- -Bug fixes, including a fix for a stack corruption bug
   in the file-types capplet
- -Updated documentation, man pages, new translations

7 files changed, 41 insertions, 69 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index ed34ecb3b87..e8f48addaa6 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:54 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2002/03/23 23:20:36 fredb Exp $
 
-DISTNAME=		control-center-1.4.0.1
-PKGREVISION=		1
+DISTNAME=		control-center-1.4.0.4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 
diff --git a/x11/controlcenter/PLIST b/x11/controlcenter/PLIST
index 9d3bec3910f..d3737d72732 100644
--- a/x11/controlcenter/PLIST
+++ b/x11/controlcenter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/23 23:20:36 fredb Exp $
 bin/background-properties-capplet
 bin/file-types-capplet
 bin/gnome-edit-properties-capplet
@@ -11,13 +11,25 @@ bin/ui-properties
 bin/url-properties
 bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
-include/capplet-widget.h
+include/libcapplet1/capplet-widget.h
 lib/cappletConf.sh
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
 lib/libcapplet.so.0
 lib/libcapplet.so.0.0
+man/man1/background-properties-capplet.1
+man/man1/file-types-capplet.1
+man/man1/gnomecc.1
+man/man1/gnome-edit-properties-capplet.1
+man/man1/keyboard-properties.1
+man/man1/mouse-properties-capplet.1
+man/man1/screensaver-properties-capplet.1
+man/man1/sound-properties.1
+man/man1/theme-selector-capplet.1
+man/man1/ui-properties.1
+man/man1/url-properties.1
+man/man1/wm-properties-capplet.1
 share/control-center/.directory
 share/control-center/Desktop/.directory
 share/control-center/Desktop/background-properties.desktop
@@ -54,12 +66,9 @@ share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
 share/gnome/help/control-center/C/topic.dat
-share/gnome/help/control-center/C/alf.html
-share/gnome/help/control-center/C/authors.html
 share/gnome/help/control-center/C/control-center.sgml
 share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/doc-handlers.html
-share/gnome/help/control-center/C/docbook.css
 share/gnome/help/control-center/C/figures/bg-capplet.png
 share/gnome/help/control-center/C/figures/gccalf.png
 share/gnome/help/control-center/C/figures/gccappdef.png
@@ -81,14 +90,8 @@ share/gnome/help/control-center/C/figures/screensave-capplet.png
 share/gnome/help/control-center/C/figures/theme-select.png
 share/gnome/help/control-center/C/figures/wm-add.png
 share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/filetypes.html
-share/gnome/help/control-center/C/gccui.html
 share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/license.html
 share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/multimedia-intro.html
-share/gnome/help/control-center/C/peripherals.html
-share/gnome/help/control-center/C/session.html
 share/gnome/help/control-center/C/stylesheet-images/caution.gif
 share/gnome/help/control-center/C/stylesheet-images/home.gif
 share/gnome/help/control-center/C/stylesheet-images/important.gif
@@ -130,6 +133,7 @@ share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
 share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
+share/locale/nn/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
@@ -142,8 +146,8 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
+share/locale/zh_TW/LC_MESSAGES/control-center.mo
 share/omf/control-center/control-center-C.omf
 share/pixmaps/ccsplash.png
 share/pixmaps/control-center.png
diff --git a/x11/controlcenter/distinfo b/x11/controlcenter/distinfo
index e2d55b2ac2a..5939e2846a4 100644
--- a/x11/controlcenter/distinfo
+++ b/x11/controlcenter/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/03/23 22:28:29 fredb Exp $
+$NetBSD: distinfo,v 1.5 2002/03/23 23:20:36 fredb Exp $
 
-SHA1 (control-center-1.4.0.1.tar.gz) = f1b8f9103f5be4ba916f629eaf47663427a97a68
-Size (control-center-1.4.0.1.tar.gz) = 3032482 bytes
-SHA1 (patch-aa) = 8ad0921b024aa4c627da302cf694fc9b1e9ac564
+SHA1 (control-center-1.4.0.4.tar.gz) = 7f18cbcdadcebfc967d4a9abac7804d513d4298f
+Size (control-center-1.4.0.4.tar.gz) = 3567130 bytes
+SHA1 (patch-aa) = 423ad6c931885f1975311b8cc90d9de636e9c808
 SHA1 (patch-ab) = 7c5bb9b267dda50de16586dc8074abb9485d8e67
-SHA1 (patch-ac) = f2d952d26c383a47cd6ac8dfc061946bf74b5fbc
-SHA1 (patch-ad) = df1e1ee9ee03a627e3f7b9106b5747648254570e
-SHA1 (patch-ae) = a8c99df3de1831326182f0812c184ba24df153a1
+SHA1 (patch-ac) = 2fc67976315b8a203233e71d1f311f3e097aa499
 SHA1 (patch-af) = fa276788e2ff16fd82674c7031b8ed806cc37ddf
diff --git a/x11/controlcenter/patches/patch-aa b/x11/controlcenter/patches/patch-aa
index f85f7e8f9b8..b23f61ecb2d 100644
--- a/x11/controlcenter/patches/patch-aa
+++ b/x11/controlcenter/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2001/04/06 22:08:10 rh Exp $
+$NetBSD: patch-aa,v 1.5 2002/03/23 23:20:36 fredb Exp $
 
---- capplets/sound-properties/Makefile.in.orig	Wed Mar 28 22:01:50 2001
+--- capplets/sound-properties/Makefile.in.orig	Sun Feb 10 15:48:00 2002
 +++ capplets/sound-properties/Makefile.in
-@@ -144,7 +144,7 @@
+@@ -165,7 +165,7 @@
  
- sound_properties_SOURCES = sound-properties.c
+ sound_properties_LDADD = ../../control-center/libcapplet.la \
+ 		     $(GNOME_LIBDIR) $(ORB_LIBS) \
+-		     $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba
++		     $(GNOMEUI_LIBS) $(ESD_LIBS) $(INTLLIBS) -lgnorba
  
--sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba
-+sound_properties_LDADD = ../../control-center/libcapplet.la 		     $(GNOME_LIBDIR) $(ORB_LIBS) 		     $(GNOMEUI_LIBS) $(ESD_LIBS) $(INTLLIBS) -lgnorba
  
- 
- EXTRA_DIST =  	sound-properties.desktop.in			sound-properties.desktop
+ EXTRA_DIST = \
diff --git a/x11/controlcenter/patches/patch-ac b/x11/controlcenter/patches/patch-ac
index 39a953d3a7e..f48466ba9c9 100644
--- a/x11/controlcenter/patches/patch-ac
+++ b/x11/controlcenter/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2001/04/06 22:08:10 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/03/23 23:20:36 fredb Exp $
 
---- capplets/Makefile.in.orig	Wed Mar 28 21:57:00 2001
+--- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
 +++ capplets/Makefile.in
-@@ -137,7 +137,7 @@
- cxxflags_set = @cxxflags_set@
+@@ -152,7 +152,7 @@
  l = @l@
  
--always_built_SUBDIRS = desktop-links mouse-properties 	screensaver-properties background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	wm-properties keyboard-properties 	file-types
-+always_built_SUBDIRS = desktop-links mouse-properties 	background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	wm-properties keyboard-properties 	file-types
- 
- 
- SUBDIRS = $(always_built_SUBDIRS)
+ 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/controlcenter/patches/patch-ad b/x11/controlcenter/patches/patch-ad
deleted file mode 100644
index 8d07d1bb574..00000000000
--- a/x11/controlcenter/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/03/23 04:54:14 fredb Exp $
-
---- config.h.in.orig	Fri Mar 22 22:15:41 2002
-+++ config.h.in
-@@ -150,6 +150,9 @@
- /* Define if you have the <sys/param.h> header file.  */
- #undef HAVE_SYS_PARAM_H
- 
-+/* Define if you have the <sys/wait.h> header file.  */
-+#undef HAVE_SYS_WAIT_H
-+
- /* Define if you have the <unistd.h> header file.  */
- #undef HAVE_UNISTD_H
- 
diff --git a/x11/controlcenter/patches/patch-ae b/x11/controlcenter/patches/patch-ae
deleted file mode 100644
index 5a2a1cc425d..00000000000
--- a/x11/controlcenter/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/03/23 04:54:14 fredb Exp $
-
---- capplets/theme-switcher/main.c.orig	Wed Nov  8 23:11:22 2000
-+++ capplets/theme-switcher/main.c
-@@ -4,6 +4,10 @@
- #include <locale.h>
- #include "da.h"
- 
-+#ifdef HAVE_SYS_WAIT_H
-+#include <sys/wait.h>
-+#endif
-+
- #define THEME_SWITCHER_VERSION "0.1"
- 
- int