>Number:         13233
>Category:       pkg
>Synopsis:       update xscreensaver* packages to xscreensaver-3.33
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 17 16:40:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Hagerty
>Release:        N/A
>Organization:
	Lack of Organization
>Environment:
	
System: NetBSD perdition.linnaean.org 1.5.1_BETA NetBSD 1.5.1_BETA (NEURALGIA) #94: Thu May 3 21:37:00 EDT 2001 hag@perdition.linnaean.org:/disks/stripe/hag/work/hacking/os/netbsd/src/sys/arch/i386/compile/NEURALGIA i386


>Description:
	I've updated my local xscreensaver package to 3.33 (mmm, molecules)
>How-To-Repeat:
	Apply attached patch.  Note also that you must remove
x11/xscreensaver/patches/patch-aa .

>Fix:

Index: xscreensaver/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver/Makefile.common,v
retrieving revision 1.16
diff -u -w -B -r1.16 Makefile.common
--- Makefile.common	2001/05/18 12:54:06	1.16
+++ Makefile.common	2001/06/17 23:38:10
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.16 2001/05/18 12:54:06 abs Exp $
 #
 
-DISTNAME=		xscreensaver-3.28
+DISTNAME=		xscreensaver-3.33
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
@@ -10,6 +10,7 @@
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		gle-*:../../graphics/gle
 
 USE_MESA=		yes
 USE_X11BASE=		yes
Index: xscreensaver/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver/distinfo,v
retrieving revision 1.3
diff -u -w -B -r1.3 distinfo
--- distinfo	2001/05/18 13:26:23	1.3
+++ distinfo	2001/06/17 23:38:10
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.3 2001/05/18 13:26:23 abs Exp $
 
-SHA1 (xscreensaver-3.28.tar.gz) = c1a0de2966f30d56c1660519d450b87e4892c95a
-Size (xscreensaver-3.28.tar.gz) = 1497039 bytes
-SHA1 (patch-aa) = 397e55a520f1e10e5a1bb1595b6b42e4b70674f1
+SHA1 (xscreensaver-3.33.tar.gz) = b338583c8bf75307883684a427980d9d203fe363
+Size (xscreensaver-3.28.tar.gz) = 1630284 bytes
 SHA1 (patch-ab) = fe0c6c387ce5956c7851f8e1f31777961b8bd69a
 SHA1 (patch-ae) = c3e7ddffb2caab5c545b0834c93238455852dea6
Index: xscreensaver/pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver/pkg/PLIST,v
retrieving revision 1.23
diff -u -w -B -r1.23 PLIST
--- PLIST	2001/02/08 06:25:16	1.23
+++ PLIST	2001/06/17 23:38:10
@@ -23,6 +23,7 @@
 libexec/xscreensaver/critical
 libexec/xscreensaver/crystal
 libexec/xscreensaver/cynosure
+libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
 libexec/xscreensaver/deluxe
@@ -31,6 +32,7 @@
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
 libexec/xscreensaver/epicycle
+libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/flag
 libexec/xscreensaver/flame
@@ -40,6 +42,7 @@
 libexec/xscreensaver/gears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glplanet
+libexec/xscreensaver/gltext
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
 libexec/xscreensaver/greynetic
@@ -66,6 +69,7 @@
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
+libexec/xscreensaver/molecule
 libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
@@ -85,6 +89,7 @@
 libexec/xscreensaver/rocks
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotor
+libexec/xscreensaver/rotzoomer
 libexec/xscreensaver/rubik
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
@@ -92,6 +97,7 @@
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
 libexec/xscreensaver/sonar
+libexec/xscreensaver/speedmine
 libexec/xscreensaver/sphere
 libexec/xscreensaver/spiral
 libexec/xscreensaver/spotlight
@@ -112,13 +118,13 @@
 libexec/xscreensaver/wander
 libexec/xscreensaver/webcollage
 libexec/xscreensaver/whirlwindwarp
+libexec/xscreensaver/whirlygig
 libexec/xscreensaver/worm
 libexec/xscreensaver/xflame
 libexec/xscreensaver/xjack
 libexec/xscreensaver/xlyap
 libexec/xscreensaver/xmatrix
 libexec/xscreensaver/xrayswarm
-libexec/xscreensaver/xscreensaver-gl-helper
 libexec/xscreensaver/xspirograph
 libexec/xscreensaver/xsublim
 libexec/xscreensaver/xteevee
@@ -129,6 +135,7 @@
 man/man1/braid.1
 man/man1/bsod.1
 man/man1/bubbles.1
+man/man1/bumps.1
 man/man1/critical.1
 man/man1/decayscreen.1
 man/man1/deco.1
@@ -140,6 +147,7 @@
 man/man1/forest.1
 man/man1/galaxy.1
 man/man1/gflux.1
+man/man1/gltext.1
 man/man1/goop.1
 man/man1/grav.1
 man/man1/greynetic.1
@@ -160,6 +168,7 @@
 man/man1/lmorph.1
 man/man1/maze.1
 man/man1/moire.1
+man/man1/molecule.1
 man/man1/munch.1
 man/man1/nerverot.1
 man/man1/noseguy.1
@@ -172,10 +181,12 @@
 man/man1/rd-bomb.1
 man/man1/rocks.1
 man/man1/rorschach.1
+man/man1/rotzoomer.1
 man/man1/sierpinski.1
 man/man1/slidescreen.1
 man/man1/slip.1
 man/man1/sonar.1
+man/man1/speedmine.1
 man/man1/sphere.1
 man/man1/spiral.1
 man/man1/spotlight.1
@@ -189,14 +200,12 @@
 man/man1/vines.1
 man/man1/webcollage.1
 man/man1/whirlwindwarp.1
+man/man1/whirlygig.1
 man/man1/xflame.1
 man/man1/xjack.1
 man/man1/xlyap.1
 man/man1/xmatrix.1
-man/man1/xscreensaver-command.1
-man/man1/xscreensaver-demo.1
 man/man1/xscreensaver-gl-helper.1
-man/man1/xscreensaver.1
 man/man1/xsublim.1
 man/man1/xteevee.1
 man/man1/zoom.1
Index: xscreensaver-gnome/pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver-gnome/pkg/PLIST,v
retrieving revision 1.6
diff -u -w -B -r1.6 PLIST
--- PLIST	2001/02/08 11:46:47	1.6
+++ PLIST	2001/06/17 23:38:10
@@ -24,6 +24,7 @@
 libexec/xscreensaver/critical
 libexec/xscreensaver/crystal
 libexec/xscreensaver/cynosure
+libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
 libexec/xscreensaver/deluxe
@@ -32,6 +33,7 @@
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
 libexec/xscreensaver/epicycle
+libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/flag
 libexec/xscreensaver/flame
@@ -41,6 +43,7 @@
 libexec/xscreensaver/gears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glplanet
+libexec/xscreensaver/gltext
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
 libexec/xscreensaver/greynetic
@@ -67,6 +70,7 @@
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
+libexec/xscreensaver/molecule
 libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
@@ -86,6 +90,7 @@
 libexec/xscreensaver/rocks
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotor
+libexec/xscreensaver/rotzoomer
 libexec/xscreensaver/rubik
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
@@ -93,6 +98,7 @@
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
 libexec/xscreensaver/sonar
+libexec/xscreensaver/speedmine
 libexec/xscreensaver/sphere
 libexec/xscreensaver/spiral
 libexec/xscreensaver/spotlight
@@ -113,13 +119,13 @@
 libexec/xscreensaver/wander
 libexec/xscreensaver/webcollage
 libexec/xscreensaver/whirlwindwarp
+libexec/xscreensaver/whirlygig
 libexec/xscreensaver/worm
 libexec/xscreensaver/xflame
 libexec/xscreensaver/xjack
 libexec/xscreensaver/xlyap
 libexec/xscreensaver/xmatrix
 libexec/xscreensaver/xrayswarm
-libexec/xscreensaver/xscreensaver-gl-helper
 libexec/xscreensaver/xspirograph
 libexec/xscreensaver/xsublim
 libexec/xscreensaver/xteevee
@@ -130,6 +136,7 @@
 man/man1/braid.1
 man/man1/bsod.1
 man/man1/bubbles.1
+man/man1/bumps.1
 man/man1/critical.1
 man/man1/decayscreen.1
 man/man1/deco.1
@@ -141,6 +148,7 @@
 man/man1/forest.1
 man/man1/galaxy.1
 man/man1/gflux.1
+man/man1/gltext.1
 man/man1/goop.1
 man/man1/grav.1
 man/man1/greynetic.1
@@ -161,6 +169,7 @@
 man/man1/lmorph.1
 man/man1/maze.1
 man/man1/moire.1
+man/man1/molecule.1
 man/man1/munch.1
 man/man1/nerverot.1
 man/man1/noseguy.1
@@ -173,10 +182,12 @@
 man/man1/rd-bomb.1
 man/man1/rocks.1
 man/man1/rorschach.1
+man/man1/rotzoomer.1
 man/man1/sierpinski.1
 man/man1/slidescreen.1
 man/man1/slip.1
 man/man1/sonar.1
+man/man1/speedmine.1
 man/man1/sphere.1
 man/man1/spiral.1
 man/man1/spotlight.1
@@ -190,14 +201,12 @@
 man/man1/vines.1
 man/man1/webcollage.1
 man/man1/whirlwindwarp.1
+man/man1/whirlygig.1
 man/man1/xflame.1
 man/man1/xjack.1
 man/man1/xlyap.1
 man/man1/xmatrix.1
-man/man1/xscreensaver-command.1
-man/man1/xscreensaver-demo.1
 man/man1/xscreensaver-gl-helper.1
-man/man1/xscreensaver.1
 man/man1/xsublim.1
 man/man1/xteevee.1
 man/man1/zoom.1

>Release-Note:
>Audit-Trail:
>Unformatted: