[pkgsrc/trunk]: pkgsrc/x11 Update to 4.14. While here, change xscreensaver t...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd304aeb29b8
branches:  trunk
changeset: 464622:cd304aeb29b8
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Dec 13 19:22:12 2003 +0000

description:
Update to 4.14.  While here, change xscreensaver to not install the
xscreensaver-demo program (which requires GTK).  This is done to allow
xscreensaver coexist with xscreensaver-gnome, and to avoid a dependancy
on GTK when installing kdeartwork3.

Changes since 4.13:
* New hacks, `fontglide', `apple2', `xanalogtv', `pong',
  `gleidescope', `mirrorblob', and `blinkbox'.
* New version of `glsnake' (with many more models.)
* Another Windows crash in `bsod'; also HVX/GCOS6/TPS6.
* New version of `endgame'.
* Screen grabbing works on MacOS X.
* Various minor fixes.

Ok'ed by wiz@.

diffstat:

 x11/xscreensaver-gnome/DESCR      |   14 +
 x11/xscreensaver-gnome/Makefile   |   16 +-
 x11/xscreensaver-gnome/PLIST      |  563 +-------------------------------------
 x11/xscreensaver/Makefile         |   12 +-
 x11/xscreensaver/Makefile.common  |   11 +-
 x11/xscreensaver/PLIST            |   34 +-
 x11/xscreensaver/buildlink2.mk    |    6 +-
 x11/xscreensaver/distinfo         |    9 +-
 x11/xscreensaver/patches/patch-ad |   23 +-
 x11/xscreensaver/patches/patch-af |   16 -
 10 files changed, 80 insertions(+), 624 deletions(-)

diffs (truncated from 1010 to 300 lines):

diff -r 05978b3da159 -r cd304aeb29b8 x11/xscreensaver-gnome/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver-gnome/DESCR      Sat Dec 13 19:22:12 2003 +0000
@@ -0,0 +1,14 @@
+The xscreensaver program waits until the keyboard and mouse have been idle
+for a period, and then runs a graphics demo chosen at random.  It turns off
+as soon as there is any mouse or keyboard activity.
+
+The purpose of xscreensaver is to display pretty pictures on your screen
+when it is not in use, in keeping with the philosophy that unattended
+monitors should always be doing something interesting, just like they do
+in the movies.
+
+However, xscreensaver can also be used as a screen locker, to prevent
+others from using your terminal while your are away.
+
+This package provies xscreensaver-gnome linked against gnome-libs, required
+to get GNOME 1.4 support.
diff -r 05978b3da159 -r cd304aeb29b8 x11/xscreensaver-gnome/Makefile
--- a/x11/xscreensaver-gnome/Makefile   Sat Dec 13 19:19:56 2003 +0000
+++ b/x11/xscreensaver-gnome/Makefile   Sat Dec 13 19:22:12 2003 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2003/12/04 19:48:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2003/12/13 19:22:13 jmmv Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
-PKGREVISION=   2
-COMMENT=       Screen saver and locker for the X window system (with GNOME support)
+COMMENT=       Screen saver and locker for the X window system (GNOME applet)
 
-CONFLICTS+=    xscreensaver-[0-9]*
+CONFLICTS+=    xscreensaver<4.14 xscreensaver-demo-[0-9]*
 
 .include "../../x11/xscreensaver/Makefile.common"
 
@@ -18,7 +17,9 @@
 CONFIGURE_ARGS+=       --with-gnome=${BUILDLINK_PREFIX.gnome-libs}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/share/control-center/screensavers
 
-PLIST_SRC=     ${.CURDIR}/PLIST
+BUILD_DIRS=            ${WRKSRC}/utils ${WRKSRC}/driver
+INSTALL_DIRS=          ${WRKSRC}/driver
+INSTALL_TARGET=                install-gnome xxxinstall-gnome
 
 # Very ugly hack so that GTK2 is not found, since the package does not support
 # choosing GTK1 over GTK2 (which is needed, since gnome-libs link against GTK1).
@@ -29,9 +30,12 @@
        ${MV} configure.patched configure && ${CHMOD} 755 configure
 
 post-install:
-       cd ${WRKSRC}/driver && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xxxinstall-gnome
+       ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
+       ${LN} -s ${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver/config \
+               ${PREFIX}/share/control-center/screensavers
 
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/controlcenter/buildlink2.mk"
+.include "../../x11/xscreensaver/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 05978b3da159 -r cd304aeb29b8 x11/xscreensaver-gnome/PLIST
--- a/x11/xscreensaver-gnome/PLIST      Sat Dec 13 19:19:56 2003 +0000
+++ b/x11/xscreensaver-gnome/PLIST      Sat Dec 13 19:22:12 2003 +0000
@@ -1,564 +1,10 @@
-@comment $NetBSD: PLIST,v 1.16 2003/11/14 15:05:09 fredb Exp $
+@comment $NetBSD: PLIST,v 1.17 2003/12/13 19:22:13 jmmv Exp $
 bin/screensaver-properties-capplet
-bin/xscreensaver
-bin/xscreensaver-command
 bin/xscreensaver-demo
-bin/xscreensaver-getimage
-bin/xscreensaver-getimage-file
-bin/xscreensaver-getimage-video
-bin/xscreensaver-gl-helper
-bin/xscreensaver.kss
-lib/X11/app-defaults/XScreenSaver
-libexec/xscreensaver/anemone
-libexec/xscreensaver/ant
-libexec/xscreensaver/antspotlight
-libexec/xscreensaver/apollonian
-libexec/xscreensaver/atlantis
-libexec/xscreensaver/attraction
-libexec/xscreensaver/atunnel
-libexec/xscreensaver/barcode
-libexec/xscreensaver/blaster
-libexec/xscreensaver/blitspin
-libexec/xscreensaver/blocktube
-libexec/xscreensaver/bouboule
-libexec/xscreensaver/bouncingcow
-libexec/xscreensaver/boxed
-libexec/xscreensaver/braid
-libexec/xscreensaver/bsod
-libexec/xscreensaver/bubble3d
-libexec/xscreensaver/bubbles
-libexec/xscreensaver/bumps
-libexec/xscreensaver/cage
-libexec/xscreensaver/ccurve
-libexec/xscreensaver/circuit
-libexec/xscreensaver/cloudlife
-libexec/xscreensaver/compass
-libexec/xscreensaver/coral
-libexec/xscreensaver/critical
-libexec/xscreensaver/crystal
-libexec/xscreensaver/cubenetic
-libexec/xscreensaver/cubestorm
-libexec/xscreensaver/cynosure
-libexec/xscreensaver/dangerball
-libexec/xscreensaver/decayscreen
-libexec/xscreensaver/deco
-libexec/xscreensaver/deluxe
-libexec/xscreensaver/demon
-libexec/xscreensaver/discrete
-libexec/xscreensaver/distort
-libexec/xscreensaver/drift
-libexec/xscreensaver/endgame
-libexec/xscreensaver/engine
-libexec/xscreensaver/epicycle
-libexec/xscreensaver/eruption
-libexec/xscreensaver/euler2d
-libexec/xscreensaver/extrusion
-libexec/xscreensaver/fadeplot
-libexec/xscreensaver/flag
-libexec/xscreensaver/flame
-libexec/xscreensaver/flipflop
-libexec/xscreensaver/flipscreen3d
-libexec/xscreensaver/flow
-libexec/xscreensaver/fluidballs
-libexec/xscreensaver/flurry
-libexec/xscreensaver/flyingtoasters
-libexec/xscreensaver/forest
-libexec/xscreensaver/galaxy
-libexec/xscreensaver/gears
-libexec/xscreensaver/gflux
-libexec/xscreensaver/glblur
-libexec/xscreensaver/glforestfire
-libexec/xscreensaver/glknots
-libexec/xscreensaver/glmatrix
-libexec/xscreensaver/glplanet
-libexec/xscreensaver/glslideshow
-libexec/xscreensaver/glsnake
-libexec/xscreensaver/gltext
-libexec/xscreensaver/goop
-libexec/xscreensaver/grav
-libexec/xscreensaver/greynetic
-libexec/xscreensaver/halftone
-libexec/xscreensaver/halo
-libexec/xscreensaver/helix
-libexec/xscreensaver/hopalong
-libexec/xscreensaver/hyperball
-libexec/xscreensaver/hypercube
-libexec/xscreensaver/hypertorus
-libexec/xscreensaver/ifs
-libexec/xscreensaver/imsmap
-libexec/xscreensaver/interference
-libexec/xscreensaver/jigglypuff
-libexec/xscreensaver/jigsaw
-libexec/xscreensaver/juggle
-libexec/xscreensaver/julia
-libexec/xscreensaver/kaleidescope
-libexec/xscreensaver/klein
-libexec/xscreensaver/kumppa
-libexec/xscreensaver/lament
-libexec/xscreensaver/laser
-libexec/xscreensaver/lavalite
-libexec/xscreensaver/lightning
-libexec/xscreensaver/lisa
-libexec/xscreensaver/lissie
-libexec/xscreensaver/ljlatest
-libexec/xscreensaver/lmorph
-libexec/xscreensaver/loop
-libexec/xscreensaver/maze
-libexec/xscreensaver/menger
-libexec/xscreensaver/metaballs
-libexec/xscreensaver/moebius
-libexec/xscreensaver/moire
-libexec/xscreensaver/moire2
-libexec/xscreensaver/molecule
-libexec/xscreensaver/morph3d
-libexec/xscreensaver/mountain
-libexec/xscreensaver/munch
-libexec/xscreensaver/nerverot
-libexec/xscreensaver/noseguy
-libexec/xscreensaver/pedal
-libexec/xscreensaver/penetrate
-libexec/xscreensaver/penrose
-libexec/xscreensaver/petri
-libexec/xscreensaver/phosphor
-libexec/xscreensaver/piecewise
-libexec/xscreensaver/pipes
-libexec/xscreensaver/polyominoes
-libexec/xscreensaver/polytopes
-libexec/xscreensaver/popsquares
-libexec/xscreensaver/pulsar
-libexec/xscreensaver/pyro
-libexec/xscreensaver/qix
-libexec/xscreensaver/queens
-libexec/xscreensaver/rd-bomb
-libexec/xscreensaver/ripples
-libexec/xscreensaver/rocks
-libexec/xscreensaver/rorschach
-libexec/xscreensaver/rotor
-libexec/xscreensaver/rotzoomer
-libexec/xscreensaver/rubik
-libexec/xscreensaver/sballs
-libexec/xscreensaver/shadebobs
-libexec/xscreensaver/sierpinski
-libexec/xscreensaver/sierpinski3d
-libexec/xscreensaver/slidescreen
-libexec/xscreensaver/slip
-libexec/xscreensaver/sonar
-libexec/xscreensaver/speedmine
-libexec/xscreensaver/sphere
-libexec/xscreensaver/spheremonics
-libexec/xscreensaver/spiral
-libexec/xscreensaver/spotlight
-libexec/xscreensaver/sproingies
-libexec/xscreensaver/squiral
-libexec/xscreensaver/stairs
-libexec/xscreensaver/starfish
-libexec/xscreensaver/starwars
-libexec/xscreensaver/stonerview
-libexec/xscreensaver/strange
-libexec/xscreensaver/superquadrics
-libexec/xscreensaver/swirl
-libexec/xscreensaver/t3d
-libexec/xscreensaver/thornbird
-libexec/xscreensaver/triangle
-libexec/xscreensaver/truchet
-libexec/xscreensaver/twang
-libexec/xscreensaver/vermiculate
-libexec/xscreensaver/vidwhacker
-libexec/xscreensaver/vines
-libexec/xscreensaver/wander
-libexec/xscreensaver/webcollage
-libexec/xscreensaver/webcollage-helper
-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/xspirograph
-libexec/xscreensaver/xsublim
-libexec/xscreensaver/xteevee
-libexec/xscreensaver/zoom
-man/man1/anemone.1
-man/man1/ant.1
-man/man1/antspotlight.1
-man/man1/apollonian.1
-man/man1/atlantis.1
-man/man1/attraction.1
-man/man1/atunnel.1
-man/man1/barcode.1
-man/man1/blaster.1
-man/man1/blitspin.1
-man/man1/blocktube.1
-man/man1/bouboule.1
-man/man1/bouncingcow.1
-man/man1/boxed.1
-man/man1/braid.1
-man/man1/bsod.1
-man/man1/bubble3d.1
-man/man1/bubbles.1
-man/man1/bumps.1
-man/man1/cage.1
-man/man1/ccurve.1
-man/man1/circuit.1
-man/man1/cloudlife.1
-man/man1/compass.1
-man/man1/coral.1
-man/man1/critical.1
-man/man1/crystal.1
-man/man1/cubenetic.1
-man/man1/cubestorm.1
-man/man1/cynosure.1
-man/man1/dangerball.1
-man/man1/decayscreen.1
-man/man1/deco.1
-man/man1/deluxe.1
-man/man1/demon.1
-man/man1/discrete.1
-man/man1/distort.1
-man/man1/drift.1
-man/man1/endgame.1
-man/man1/engine.1
-man/man1/epicycle.1
-man/man1/eruption.1
-man/man1/euler2d.1
-man/man1/extrusion.1
-man/man1/fadeplot.1
-man/man1/flag.1
-man/man1/flame.1
-man/man1/flipflop.1
-man/man1/flipscreen3d.1
-man/man1/flow.1
-man/man1/fluidballs.1
-man/man1/flurry.1