Update control-center to 1.0.6

Notable changes are:
        * *.desktop: The control-center now speaks Norwegian fluently.

        * Patch from Chyla Zbigniew <chyla@alice.ci.pwr.wroc.pl> to
        gettextize everything.  Sorry translators...

        * capplets/wm-properties/wm-desktops/*.desktop: Inserted
        Korean-translated strings.

        * capplets/mime-type/edit-window.c (initialize_main_win_vals): For
        easier i18n, used g_strdup_printf() instead of g_strconcat().

        * capplets/theme-switcher/demo.c (demo_main): move the new menubar.

        * capplets/screensaver-properties/callbacks.c:
          Simplify the execution of the screensaver demo thingies, and add
          /usr/X11R6/lib/xscreensaver to the PATH just before exec so we catch
          the Red Hat Linux-installed ones.

        * capplets/mime-type/edit-window.c (initialize_main_win_vals):
        Patch from Fabrice.Bellet@imag.fr for i18n and portability.

        * capplets/theme-switcher/lister.c (print_standard_stuff): made
        "~/" be gnome_util_user_home instead.

        * capplets/theme-switcher/demo.c (demo_main): patch from Akira
        Higuchi (a-higuti@math.sci.hokudai.ac.jp) to handle I18N in the
        preview window.

3 files changed, 51 insertions, 11 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 55c74e66cb9..4352a0a1804 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.8 1999/07/14 23:11:34 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/08/20 12:10:23 rh Exp $
 #
 
-DISTNAME=		control-center-1.0.5
+DISTNAME=		control-center-1.0.6
 CATEGORIES=		x11 gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
+MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME//sources/ \
 			ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ \
 			ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/control-center/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/ \
+			ftp://ftp.tuwien.ac.at/hci/gnome.org/GNOME/sources/control-center/ \
+			http://gd.tuwien.ac.at/hci/gnome.org/GNOME/sources/control-center/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 
 DEPENDS=		gnome-core-1.0.7:../../x11/gnome-core \
-			xscreensaver-3.16:../../x11/xscreensaver
+			xscreensaver-3.17:../../x11/xscreensaver
 
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
diff --git a/x11/controlcenter/files/md5 b/x11/controlcenter/files/md5
index ce91ab6e94a..86ede8c0334 100644
--- a/x11/controlcenter/files/md5
+++ b/x11/controlcenter/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/05/02 15:15:50 rh Exp $
+$NetBSD: md5,v 1.3 1999/08/20 12:10:24 rh Exp $
 
-MD5 (control-center-1.0.5.tar.gz) = b571f612d7837cf72e55d14622ef7314
+MD5 (control-center-1.0.6.tar.gz) = 2435a9adc823647296100086850ed262
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index cc748c06566..bda0988b659 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,4 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 1999/05/02 15:15:50 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/20 12:10:24 rh Exp $
+bin/gnomecc
+bin/mouse-properties-capplet
+bin/screensaver-properties-capplet
+bin/background-properties-capplet
+bin/theme-selector-capplet
+bin/sound-properties
+bin/bell-properties-capplet
+bin/ui-properties
+bin/url-properties
+bin/gnome-edit-properties-capplet
+bin/session-properties-capplet
+bin/wm-properties-capplet
+bin/keyboard-properties
+bin/mime-type-capplet
 etc/CORBA/servers/gnomecc.gnorba
 include/capplet-widget.h
 lib/libcapplet.so.0.0
@@ -30,6 +44,8 @@ share/gnome/apps/Settings/mime-type.desktop
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
+share/gnome/wm-properties/Scwm.desktop
+share/gnome/wm-properties/twm.desktop
 share/control-center/Desktop/.directory
 share/control-center/Desktop/screensaver-properties.desktop
 share/control-center/Desktop/background-properties.desktop
@@ -152,6 +168,28 @@ share/control-center/.data/Worm.desktop
 share/control-center/.data/Xjack.desktop
 share/control-center/.data/Xlyap.desktop
 share/control-center/.data/Xroger.desktop
+share/control-center/.data/3d.png
+share/control-center/.data/Atlantis.desktop
+share/control-center/.data/Bubble3d.desktop
+share/control-center/.data/Cage.desktop
+share/control-center/.data/Gears.desktop
+share/control-center/.data/GLPlanet.desktop
+share/control-center/.data/Lament.desktop
+share/control-center/.data/lmorph.png
+share/control-center/.data/Moebius.desktop
+share/control-center/.data/moire.png
+share/control-center/.data/Morph3d.desktop
+share/control-center/.data/munch.png
+share/control-center/.data/pedal.png
+share/control-center/.data/Pipes.desktop
+share/control-center/.data/Rubik.desktop
+share/control-center/.data/sierpinski.png
+share/control-center/.data/Sproingies.desktop
+share/control-center/.data/Stairs.desktop
+share/control-center/.data/Superquadrics.desktop
+share/control-center/.data/vines.png
+share/control-center/.data/xroger.png
+share/control-center/.data/Xmatrix.desktop
 share/control-center/url-properties.desktop
 share/control-center/gnome-edit-properties.desktop
 share/control-center/session-properties.desktop
@@ -160,7 +198,6 @@ share/control-center/mime-type.desktop
 @dirrm share/gnome/apps/Settings/Multimedia
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Peripherals
-@dirrm share/gnome/apps/Settings
 @dirrm share/gnome/wm-properties
 @dirrm share/control-center/Desktop
 @dirrm share/control-center/Multimedia
@@ -168,5 +205,6 @@ share/control-center/mime-type.desktop
 @dirrm share/control-center/Peripherals
 @dirrm share/control-center/.data
 @dirrm share/control-center
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
+@unexec rmdir %D/share/gnome/apps/Settings 2>/dev/null || true
+@unexec rmdir %D/etc/CORBA/servers 2>/dev/null || true
+@unexec rmdir %D/etc/CORBA 2>/dev/null || true