Excise "screensaver" capplet from control-center, in order to resolve

conflict with xscreensaver-gnome, as discussed (briefly) on tech-pkg.
Also, reorder some dependencies: gnome-core (rather than gnome) depends
on xscreensaver-gnome, which depends on control-center; bump teeny
version of xscreensaver-gnome so control-center won't try to go with
old binary packages of xscreensaver-gnome, which would lead to circular
dependencies.

9 files changed, 29 insertions, 148 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 28d84904698..39fde2d2c75 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/01 21:39:21 tron Exp $
+# $NetBSD: Makefile,v 1.23 2000/09/11 20:46:36 fredb Exp $
 
 DISTNAME=		control-center-1.2.0
 CATEGORIES=		x11 gnome
@@ -7,7 +7,7 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=		gnome-libs>=1.2.0:../../x11/gnome-libs
 
 GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
diff --git a/x11/controlcenter/files/patch-sum b/x11/controlcenter/files/patch-sum
index 23cc6f24201..3412ea8a371 100644
--- a/x11/controlcenter/files/patch-sum
+++ b/x11/controlcenter/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/07/25 06:18:47 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/09/11 20:46:37 fredb Exp $
 
 MD5 (patch-aa) = cd325a544a883a4c3102c043e3ca384c
 MD5 (patch-ab) = 39d098654b763f2cc765c4d609857c6a
+MD5 (patch-ac) = 392dc2b4eacdaabd03427418ea93cd85
diff --git a/x11/controlcenter/patches/patch-ac b/x11/controlcenter/patches/patch-ac
new file mode 100644
index 00000000000..5330263e85d
--- /dev/null
+++ b/x11/controlcenter/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/09/11 20:46:38 fredb Exp $
+
+--- capplets/Makefile.in.orig	Tue May 23 18:09:46 2000
++++ capplets/Makefile.in	Mon Sep 11 08:53:43 2000
+@@ -129,7 +129,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-always_built_SUBDIRS = desktop-links mouse-properties 	screensaver-properties background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	session-properties wm-properties keyboard-properties 	mime-type
++always_built_SUBDIRS = desktop-links mouse-properties 	background-properties         theme-switcher sound-properties 	ui-properties url-properties gnome-edit-properties 	session-properties wm-properties keyboard-properties 	mime-type
+ 
+ 
+ SUBDIRS = $(always_built_SUBDIRS)
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index bcdde5c750a..1506060a811 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2000/07/31 10:49:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/09/11 20:46:38 fredb Exp $
 bin/background-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mime-type-capplet
 bin/mouse-properties-capplet
-bin/screensaver-properties-capplet
 bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
@@ -18,139 +17,9 @@ lib/cappletConf.sh
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so.0.0
-share/control-center/.data/3d.desktop
-share/control-center/.data/3d.png
-share/control-center/.data/Ant.desktop
-share/control-center/.data/Atlantis.desktop
-share/control-center/.data/Attraction.desktop
-share/control-center/.data/Blitspin.desktop
-share/control-center/.data/Bouboule.desktop
-share/control-center/.data/Braid.desktop
-share/control-center/.data/Bsod.desktop
-share/control-center/.data/Bubble3d.desktop
-share/control-center/.data/Bubbles.desktop
-share/control-center/.data/Cage.desktop
-share/control-center/.data/Coral.desktop
-share/control-center/.data/Cynosure.desktop
-share/control-center/.data/Decayscreen.desktop
-share/control-center/.data/Deco.desktop
-share/control-center/.data/Demon.desktop
-share/control-center/.data/Discrete.desktop
-share/control-center/.data/Distort.desktop
-share/control-center/.data/Drift.desktop
-share/control-center/.data/Epicycle.desktop
-share/control-center/.data/Fadeplot.desktop
-share/control-center/.data/Flag.desktop
-share/control-center/.data/Flame.desktop
-share/control-center/.data/Flow.desktop
-share/control-center/.data/Forest.desktop
-share/control-center/.data/GLPlanet.desktop
-share/control-center/.data/Galaxy.desktop
-share/control-center/.data/Gears.desktop
-share/control-center/.data/Goop.desktop
-share/control-center/.data/Grav.desktop
-share/control-center/.data/Greynetic.desktop
-share/control-center/.data/Halo.desktop
-share/control-center/.data/Helix.desktop
-share/control-center/.data/Hopalong.desktop
-share/control-center/.data/Hypercube.desktop
-share/control-center/.data/Ifs.desktop
-share/control-center/.data/Imsmap.desktop
-share/control-center/.data/Interference.desktop
-share/control-center/.data/Jigsaw.desktop
-share/control-center/.data/Julia.desktop
-share/control-center/.data/Kaleidescope.desktop
-share/control-center/.data/Kumppa.desktop
-share/control-center/.data/Lament.desktop
-share/control-center/.data/Laser.desktop
-share/control-center/.data/Lightning.desktop
-share/control-center/.data/Lisa.desktop
-share/control-center/.data/Lissie.desktop
-share/control-center/.data/Lmorph.desktop
-share/control-center/.data/Loop.desktop
-share/control-center/.data/Maze.desktop
-share/control-center/.data/Moebius.desktop
-share/control-center/.data/Moire.desktop
-share/control-center/.data/Moire2.desktop
-share/control-center/.data/Morph3d.desktop
-share/control-center/.data/Mountain.desktop
-share/control-center/.data/Munch.desktop
-share/control-center/.data/Noseguy.desktop
-share/control-center/.data/Pedal.desktop
-share/control-center/.data/Penrose.desktop
-share/control-center/.data/Pipes.desktop
-share/control-center/.data/Pyro.desktop
-share/control-center/.data/Qix.desktop
-share/control-center/.data/Rd-bomb.desktop
-share/control-center/.data/Rocks.desktop
-share/control-center/.data/Rorschach.desktop
-share/control-center/.data/Rotor.desktop
-share/control-center/.data/Rubik.desktop
-share/control-center/.data/Sierpinski.desktop
-share/control-center/.data/Slidescreen.desktop
-share/control-center/.data/Slip.desktop
-share/control-center/.data/Sonar.desktop
-share/control-center/.data/Sphere.desktop
-share/control-center/.data/Spiral.desktop
-share/control-center/.data/Sproingies.desktop
-share/control-center/.data/Stairs.desktop
-share/control-center/.data/Starfish.desktop
-share/control-center/.data/Strange.desktop
-share/control-center/.data/Superquadrics.desktop
-share/control-center/.data/Swirl.desktop
-share/control-center/.data/Triangle.desktop
-share/control-center/.data/Truchet.desktop
-share/control-center/.data/Vines.desktop
-share/control-center/.data/Worm.desktop
-share/control-center/.data/Xjack.desktop
-share/control-center/.data/Xlyap.desktop
-share/control-center/.data/Xmatrix.desktop
-share/control-center/.data/Xroger.desktop
-share/control-center/.data/ant.png
-share/control-center/.data/attraction.png
-share/control-center/.data/blitspin.png
-share/control-center/.data/bouboule.png
-share/control-center/.data/braid.png
-share/control-center/.data/bsod.png
-share/control-center/.data/bubbles.png
-share/control-center/.data/coral.png
-share/control-center/.data/cynosure.png
-share/control-center/.data/decayscreen.png
-share/control-center/.data/deco.png
-share/control-center/.data/discrete.png
-share/control-center/.data/drift.png
-share/control-center/.data/epicycle.png
-share/control-center/.data/flag.png
-share/control-center/.data/flame.png
-share/control-center/.data/forest.png
-share/control-center/.data/goop.png
-share/control-center/.data/grav.png
-share/control-center/.data/greynetic.png
-share/control-center/.data/halo.png
-share/control-center/.data/helix.png
-share/control-center/.data/hopalong.png
-share/control-center/.data/hypercube.png
-share/control-center/.data/ifs.png
-share/control-center/.data/julia.png
-share/control-center/.data/kaleidescope.png
-share/control-center/.data/laser.png
-share/control-center/.data/lightning.png
-share/control-center/.data/lisa.png
-share/control-center/.data/lmorph.png
-share/control-center/.data/maze.png
-share/control-center/.data/moire.png
-share/control-center/.data/munch.png
-share/control-center/.data/pedal.png
-share/control-center/.data/qix.png
-share/control-center/.data/sierpinski.png
-share/control-center/.data/spiral.png
-share/control-center/.data/starfish.png
-share/control-center/.data/vines.png
-share/control-center/.data/xroger.png
 share/control-center/.directory
 share/control-center/Desktop/.directory
 share/control-center/Desktop/background-properties.desktop
-share/control-center/Desktop/screensaver-properties.desktop
 share/control-center/Desktop/theme-selector.desktop
 share/control-center/Desktop/wm-properties.desktop
 share/control-center/Documents/.directory
@@ -170,7 +39,6 @@ share/control-center/UIOptions/dialogs.desktop
 share/control-center/UIOptions/mdi.desktop
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
@@ -264,5 +132,4 @@ share/pixmaps/control-center.png
 @dirrm share/control-center/Multimedia
 @dirrm share/control-center/Documents
 @dirrm share/control-center/Desktop
-@dirrm share/control-center/.data
 @dirrm share/control-center
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 2c7c90cb3b0..f15af732f67 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2000/08/30 21:44:27 tron Exp $
+# $NetBSD: Makefile,v 1.51 2000/09/11 20:46:38 fredb Exp $
 
 DISTNAME=		gnome-core-1.2.1
 CATEGORIES=		x11 gnome
@@ -7,10 +7,10 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-core/}
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=		control-center>=1.2.0:../../x11/controlcenter
 DEPENDS+=		gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
 DEPENDS+=		libghttp>=1.0.4:../../www/libghttp
 DEPENDS+=		libxml-*:../../textproc/libxml
+DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index 02b8f227ed0..f9fcb0bfac8 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/31 08:13:46 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/09/11 20:46:38 fredb Exp $
 
 DISTNAME=	gnome-1.2.1nb1
 CATEGORIES=	x11 gnome
@@ -28,7 +28,6 @@ DEPENDS+=	gtk-->=1.0.3:../gtk--
 DEPENDS+=	gtk-engines>=0.8:../gtk-engines
 DEPENDS+=	gtop>=1.0.9:../../sysutils/gtop
 DEPENDS+=	xchat>=1.5.6:../../net/xchat
-DEPENDS+=	xscreensaver-gnome>=3.24:../xscreensaver-gnome
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 3112cd5e815..91cc5cb0360 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/07/10 18:18:39 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/11 20:46:41 fredb Exp $
 #
 
-PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGNAME=	${DISTNAME:S/-/-gnome-/:S/$/nb1/}
 
-DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
+DEPENDS+=	control-center>=1.2.0:../../x11/controlcenter
 
 CONFLICTS+=	xscreensaver-[0-9]*
 
diff --git a/x11/xscreensaver-gnome/pkg/PLIST b/x11/xscreensaver-gnome/pkg/PLIST
index bd24615238a..aefd0159738 100644
--- a/x11/xscreensaver-gnome/pkg/PLIST
+++ b/x11/xscreensaver-gnome/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/09/11 13:49:15 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/09/11 20:46:41 fredb Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -187,6 +187,6 @@ man/man1/xscreensaver-demo.1
 man/man1/xscreensaver.1
 man/man1/xsublim.1
 man/man1/xteevee.1
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/control-center/Desktop/screensaver-properties.desktop
+share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 @dirrm libexec/xscreensaver
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 5636a76d80e..c32de1c4027 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2000/09/10 17:55:46 fredb Exp $
+# $NetBSD: Makefile.common,v 1.9 2000/09/11 20:46:41 fredb Exp $
 #
 
 DISTNAME=		xscreensaver-3.25
@@ -12,9 +12,10 @@ HOMEPAGE=		http://www.jwz.org/xscreensaver/
 DEPENDS+=		Mesa-*:../../graphics/Mesa
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 
+USE_MESA=		yes
+USE_PERL5=		yes
 USE_X11BASE=		yes
 USE_XPM=		yes
-USE_PERL5=		yes
 
 EVAL_PREFIX+=		GTKDIR=gtk+
 EVAL_PREFIX+=		XPMDIR=xpm