Update xscreensaver to 2.26.

3 files changed, 91 insertions, 87 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3a2e30ed5aa..7e913269bc2 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.4 1998/07/13 21:31:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/07/26 20:24:16 frueauf Exp $
 #
 
-DISTNAME=	xscreensaver-2.24
+DISTNAME=	xscreensaver-2.26
 CATEGORIES=	x11
 MASTER_SITES=	http://people.netscape.com/jwz/xscreensaver/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	frueauf@netbsd.org
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
 DEPENDS+=	Mesa-2.6:../../graphics/Mesa
 
-CONFLICTS=	xscreensaver-2.23
+CONFLICTS=	xscreensaver-2.23 xscreensaver-2.24
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune
+CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune \
+		--enable-subdir=${PREFIX}/libexec/xscreensaver
 
 USE_X11=	yes
 USE_MOTIF=	yes
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index aca3f7c64c4..368213bbc9f 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1 +1 @@
-MD5 (xscreensaver-2.24.tar.gz) = 4bc7785d87bad627637b0377350d1d23
+MD5 (xscreensaver-2.26.tar.gz) = 3c5c8e14aa5dfaa4661cd910ba669e6e
diff --git a/x11/xscreensaver/pkg/PLIST b/x11/xscreensaver/pkg/PLIST
index 8c715548d9f..901994e330d 100644
--- a/x11/xscreensaver/pkg/PLIST
+++ b/x11/xscreensaver/pkg/PLIST
@@ -1,86 +1,87 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/13 21:31:27 frueauf Exp $
-bin/ant
-bin/atlantis
-bin/attraction
-bin/blitspin
-bin/bouboule
-bin/braid
-bin/bsod
-bin/bubbles
-bin/cage
-bin/coral
-bin/crystal
-bin/cynosure
-bin/decayscreen
-bin/deco
-bin/discrete
-bin/distort
-bin/drift
-bin/epicycle
-bin/fadeplot
-bin/flag
-bin/flame
-bin/flow
-bin/forest
-bin/galaxy
-bin/gears
-bin/goop
-bin/grav
-bin/greynetic
-bin/halo
-bin/helix
-bin/hopalong
-bin/hypercube
-bin/ifs
-bin/imsmap
-bin/interference
-bin/jigsaw
-bin/julia
-bin/kaleidescope
-bin/kumppa
-bin/laser
-bin/lightning
-bin/lisa
-bin/lissie
-bin/lmorph
-bin/maze
-bin/moebius
-bin/moire
-bin/moire2
-bin/morph3d
-bin/mountain
-bin/munch
-bin/noseguy
-bin/pipes
-bin/pedal
-bin/penrose
-bin/pyro
-bin/qix
-bin/rd-bomb
-bin/rocks
-bin/rorschach
-bin/rotor
-bin/rubik
-bin/sierpinski
-bin/slidescreen
-bin/slip
-bin/sphere
-bin/spiral
-bin/sproingies
-bin/stairs
-bin/starfish
-bin/strange
-bin/superquadrics
-bin/swirl
-bin/triangle
-bin/truchet
-bin/vines
-bin/worm
-bin/xjack
-bin/xlyap
-bin/xroger
+@comment $NetBSD: PLIST,v 1.3 1998/07/26 20:24:17 frueauf Exp $
 bin/xscreensaver
 bin/xscreensaver-command
+libexec/xscreensaver/ant
+libexec/xscreensaver/atlantis
+libexec/xscreensaver/attraction
+libexec/xscreensaver/blitspin
+libexec/xscreensaver/bouboule
+libexec/xscreensaver/braid
+libexec/xscreensaver/bsod
+libexec/xscreensaver/bubbles
+libexec/xscreensaver/cage
+libexec/xscreensaver/coral
+libexec/xscreensaver/crystal
+libexec/xscreensaver/cynosure
+libexec/xscreensaver/decayscreen
+libexec/xscreensaver/deco
+libexec/xscreensaver/discrete
+libexec/xscreensaver/distort
+libexec/xscreensaver/drift
+libexec/xscreensaver/epicycle
+libexec/xscreensaver/fadeplot
+libexec/xscreensaver/flag
+libexec/xscreensaver/flame
+libexec/xscreensaver/flow
+libexec/xscreensaver/forest
+libexec/xscreensaver/galaxy
+libexec/xscreensaver/gears
+libexec/xscreensaver/goop
+libexec/xscreensaver/grav
+libexec/xscreensaver/greynetic
+libexec/xscreensaver/halo
+libexec/xscreensaver/helix
+libexec/xscreensaver/hopalong
+libexec/xscreensaver/hypercube
+libexec/xscreensaver/ifs
+libexec/xscreensaver/imsmap
+libexec/xscreensaver/interference
+libexec/xscreensaver/jigsaw
+libexec/xscreensaver/julia
+libexec/xscreensaver/kaleidescope
+libexec/xscreensaver/kumppa
+libexec/xscreensaver/lament
+libexec/xscreensaver/laser
+libexec/xscreensaver/lightning
+libexec/xscreensaver/lisa
+libexec/xscreensaver/lissie
+libexec/xscreensaver/lmorph
+libexec/xscreensaver/maze
+libexec/xscreensaver/moebius
+libexec/xscreensaver/moire
+libexec/xscreensaver/moire2
+libexec/xscreensaver/morph3d
+libexec/xscreensaver/mountain
+libexec/xscreensaver/munch
+libexec/xscreensaver/noseguy
+libexec/xscreensaver/pipes
+libexec/xscreensaver/pedal
+libexec/xscreensaver/penrose
+libexec/xscreensaver/pyro
+libexec/xscreensaver/qix
+libexec/xscreensaver/rd-bomb
+libexec/xscreensaver/rocks
+libexec/xscreensaver/rorschach
+libexec/xscreensaver/rotor
+libexec/xscreensaver/rubik
+libexec/xscreensaver/sierpinski
+libexec/xscreensaver/slidescreen
+libexec/xscreensaver/slip
+libexec/xscreensaver/sphere
+libexec/xscreensaver/spiral
+libexec/xscreensaver/sproingies
+libexec/xscreensaver/stairs
+libexec/xscreensaver/starfish
+libexec/xscreensaver/strange
+libexec/xscreensaver/superquadrics
+libexec/xscreensaver/swirl
+libexec/xscreensaver/triangle
+libexec/xscreensaver/truchet
+libexec/xscreensaver/vines
+libexec/xscreensaver/worm
+libexec/xscreensaver/xjack
+libexec/xscreensaver/xlyap
+libexec/xscreensaver/xroger
 lib/X11/app-defaults/XScreenSaver
 man/man1/attraction.1
 man/man1/blitspin.1
@@ -107,6 +108,7 @@ man/man1/imsmap.1
 man/man1/jigsaw.1
 man/man1/julia.1
 man/man1/kaleidescope.1
+man/man1/lament.1
 man/man1/laser.1
 man/man1/lightning.1
 man/man1/lisa.1
@@ -136,3 +138,4 @@ man/man1/xlyap.1
 man/man1/xroger.1
 man/man1/xscreensaver-command.1
 man/man1/xscreensaver.1
+@dirrm libexec/xscreensaver