From b3c6f204baa0cd22f235a8a67f4643eb07142d0a Mon Sep 17 00:00:00 2001 From: fredb Date: Mon, 18 Jun 2001 15:41:49 +0000 Subject: Update xscreensaver package(s) to 3.33, with patches submitted by Daniel Hagerty in PR pkg/13233. --- x11/xscreensaver-gnome/pkg/PLIST | 19 ++++++++++++++----- x11/xscreensaver/Makefile.common | 7 ++++--- x11/xscreensaver/distinfo | 7 +++---- x11/xscreensaver/patches/patch-aa | 13 ------------- x11/xscreensaver/pkg/PLIST | 19 ++++++++++++++----- 5 files changed, 35 insertions(+), 30 deletions(-) delete mode 100644 x11/xscreensaver/patches/patch-aa diff --git a/x11/xscreensaver-gnome/pkg/PLIST b/x11/xscreensaver-gnome/pkg/PLIST index ba488a2d932..95acf4f528b 100644 --- a/x11/xscreensaver-gnome/pkg/PLIST +++ b/x11/xscreensaver-gnome/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2001/02/08 11:46:47 fredb Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/06/18 15:41:52 fredb Exp $ bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command @@ -24,6 +24,7 @@ libexec/xscreensaver/coral 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/discrete 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/galaxy 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/maze 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/ripples 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/sierpinski3d 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/vines 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/bouboule.1 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/flame.1 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/lisa.1 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/qix.1 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/vidwhacker.1 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 diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 1a4256ac911..5e7ba7dcc76 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.16 2001/05/18 12:54:06 abs Exp $ +# $NetBSD: Makefile.common,v 1.17 2001/06/18 15:41:49 fredb 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 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.jwz.org/xscreensaver/ DEPENDS+= gtk+-1.2.*:../../x11/gtk +DEPENDS+= gle-*:../../graphics/gle USE_MESA= yes USE_X11BASE= yes @@ -55,7 +56,7 @@ CONFIGURE_ARGS+= --without-kerberos .include "../../mk/bsd.pkg.mk" -# this has to come after bsd.pkg.mk for ECHO. +# this has to come after bsd.pkg.mk for ${ECHO}. PERL?= ${LOCALBASE}/bin/perl .ifndef (PERL_VERSION) diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 62ca0c58f23..ae20a899738 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/05/18 13:26:23 abs Exp $ +$NetBSD: distinfo,v 1.4 2001/06/18 15:41:50 fredb 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 diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa deleted file mode 100644 index d178ecaf3f8..00000000000 --- a/x11/xscreensaver/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2001/02/08 06:26:47 fredb Exp $ - ---- driver/Makefile.in.orig Fri Feb 2 03:01:03 2001 -+++ driver/Makefile.in Thu Feb 8 00:09:37 2001 -@@ -37,7 +37,7 @@ - INSTALL = @INSTALL@ - SUID_FLAGS = -o root -m 4755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_SETUID = @INSTALL_SETUID@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_DIRS = @INSTALL_DIRS@ diff --git a/x11/xscreensaver/pkg/PLIST b/x11/xscreensaver/pkg/PLIST index 607f3aa764d..5bb437cf0d6 100644 --- a/x11/xscreensaver/pkg/PLIST +++ b/x11/xscreensaver/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2001/02/08 06:25:16 fredb Exp $ +@comment $NetBSD: PLIST,v 1.24 2001/06/18 15:41:51 fredb Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -23,6 +23,7 @@ libexec/xscreensaver/coral 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/discrete 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/galaxy 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/maze 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/ripples 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/sierpinski3d 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/vines 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/bouboule.1 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/flame.1 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/lisa.1 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/qix.1 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/vidwhacker.1 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 -- cgit v1.2.3