update to 1.2.0

Sorry, no useful Changelog.

5 files changed, 55 insertions, 25 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 4fb8c0e453e..6c620735bd3 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2000/01/15 12:06:24 tron Exp $
+# $NetBSD: Makefile,v 1.18 2000/05/30 19:26:22 drochner Exp $
 
-DISTNAME=		control-center-1.0.51
+DISTNAME=		control-center-1.2.0
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=		gnome-core-*:../../x11/gnome-core
-DEPENDS+=		xscreensaver-3.*:../../x11/xscreensaver
+DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
diff --git a/x11/controlcenter/files/md5 b/x11/controlcenter/files/md5
index b6fdad5edcd..b6887c21592 100644
--- a/x11/controlcenter/files/md5
+++ b/x11/controlcenter/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/11/08 21:50:40 tron Exp $
+$NetBSD: md5,v 1.5 2000/05/30 19:26:23 drochner Exp $
 
-MD5 (control-center-1.0.51.tar.gz) = ae746d0109a5f6e057587bc86315a5a4
+MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
diff --git a/x11/controlcenter/files/patch-sum b/x11/controlcenter/files/patch-sum
index e1baa42126f..7481bfbafb9 100644
--- a/x11/controlcenter/files/patch-sum
+++ b/x11/controlcenter/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/10/04 22:06:51 hubertf Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/30 19:26:23 drochner Exp $
 
-MD5 (patch-aa) = 56972ff72efd09ae7fdcf27766432171
+MD5 (patch-aa) = cd325a544a883a4c3102c043e3ca384c
+MD5 (patch-an) = 4845f73d5f773a0a688154f5762cda23
diff --git a/x11/controlcenter/patches/patch-aa b/x11/controlcenter/patches/patch-aa
index b2ddf7689c5..d560f86d4e2 100644
--- a/x11/controlcenter/patches/patch-aa
+++ b/x11/controlcenter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 1999/10/04 22:06:53 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/30 19:26:23 drochner Exp $
 
---- capplets/sound-properties/Makefile.in.orig	Mon Oct  4 23:59:53 1999
-+++ capplets/sound-properties/Makefile.in	Tue Oct  5 00:00:01 1999
-@@ -139,7 +139,7 @@
+--- capplets/sound-properties/Makefile.in.orig	Wed May 24 01:09:51 2000
++++ capplets/sound-properties/Makefile.in	Tue May 30 18:38:33 2000
+@@ -136,7 +136,7 @@
  
  sound_properties_SOURCES = sound-properties.c
  
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index ec2af44dbb4..2a96c08411e 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 1999/11/08 21:50:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/05/30 19:26:24 drochner 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
@@ -16,7 +15,6 @@ bin/mime-type-capplet
 etc/CORBA/servers/gnomecc.gnorba
 include/capplet-widget.h
 lib/libcapplet.so.0.0
-lib/libcapplet.la
 lib/libcapplet.a
 lib/cappletConf.sh
 share/pixmaps/control-center.png
@@ -27,9 +25,14 @@ share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 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/url-properties.desktop
+share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
+share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-share/gnome/apps/Settings/Multimedia/bell-properties.desktop
+share/gnome/apps/Settings/Session/.directory
+share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/UIOptions/application.desktop
 share/gnome/apps/Settings/UIOptions/dialogs.desktop
@@ -37,10 +40,26 @@ share/gnome/apps/Settings/UIOptions/mdi.desktop
 share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-share/gnome/apps/Settings/url-properties.desktop
-share/gnome/apps/Settings/gnome-edit-properties.desktop
-share/gnome/apps/Settings/session-properties.desktop
-share/gnome/apps/Settings/mime-type.desktop
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/figs/bg-capplet.png
+share/gnome/help/control-center/C/figs/gccappdef.png
+share/gnome/help/control-center/C/figs/gccdialog.png
+share/gnome/help/control-center/C/figs/gccedit.png
+share/gnome/help/control-center/C/figs/gcchints.png
+share/gnome/help/control-center/C/figs/gccmdi.png
+share/gnome/help/control-center/C/figs/gccmime.png
+share/gnome/help/control-center/C/figs/gccsession-props.png
+share/gnome/help/control-center/C/figs/gccsound1.png
+share/gnome/help/control-center/C/figs/gccsound2.png
+share/gnome/help/control-center/C/figs/gccstartup.png
+share/gnome/help/control-center/C/figs/gccurl.png
+share/gnome/help/control-center/C/figs/glob_pref_anim.png
+share/gnome/help/control-center/C/figs/keyboard-capplet.png
+share/gnome/help/control-center/C/figs/mouse-capplet.png
+share/gnome/help/control-center/C/figs/screensave-capplet.png
+share/gnome/help/control-center/C/figs/theme-select.png
+share/gnome/help/control-center/C/figs/wm-main.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
@@ -51,9 +70,14 @@ share/control-center/Desktop/screensaver-properties.desktop
 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/gnome-edit-properties.desktop
+share/control-center/Documents/mime-type.desktop
+share/control-center/Documents/url-properties.desktop
 share/control-center/Multimedia/.directory
 share/control-center/Multimedia/sound-properties.desktop
-share/control-center/Multimedia/bell-properties.desktop
+share/control-center/Session/.directory
+share/control-center/Session/session-properties.desktop
 share/control-center/UIOptions/.directory
 share/control-center/UIOptions/application.desktop
 share/control-center/UIOptions/dialogs.desktop
@@ -191,17 +215,23 @@ 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
-share/control-center/mime-type.desktop
+share/pixmaps/ccsplash.png
 @dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Session
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
 @dirrm share/gnome/wm-properties
 @dirrm share/control-center/Desktop
+@dirrm share/control-center/Documents
 @dirrm share/control-center/Multimedia
+@dirrm share/control-center/Session
 @dirrm share/control-center/UIOptions
 @dirrm share/control-center/Peripherals
 @dirrm share/control-center/.data