diff options
| -rw-r--r-- | x11/xscreensaver-gnome/DESCR | 14 | ||||
| -rw-r--r-- | x11/xscreensaver-gnome/Makefile | 16 | ||||
| -rw-r--r-- | x11/xscreensaver-gnome/PLIST | 563 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile | 12 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 11 | ||||
| -rw-r--r-- | x11/xscreensaver/PLIST | 34 | ||||
| -rw-r--r-- | x11/xscreensaver/buildlink2.mk | 6 | ||||
| -rw-r--r-- | x11/xscreensaver/distinfo | 9 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ad | 23 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-af | 16 |
10 files changed, 80 insertions, 624 deletions
diff --git a/x11/xscreensaver-gnome/DESCR b/x11/xscreensaver-gnome/DESCR new file mode 100644 index 00000000000..d70bb42184b --- /dev/null +++ b/x11/xscreensaver-gnome/DESCR @@ -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 --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 643ec03d3ef..b217408dc0e 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -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-xml=${BUILDLINK_PREFIX.libxml2} 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 @@ pre-configure: ${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 --git a/x11/xscreensaver-gnome/PLIST b/x11/xscreensaver-gnome/PLIST index 396bb6f1394..b1a38620d58 100644 --- a/x11/xscreensaver-gnome/PLIST +++ b/x11/xscreensaver-gnome/PLIST @@ -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 -man/man1/flyingtoasters.1 -man/man1/forest.1 -man/man1/galaxy.1 -man/man1/gears.1 -man/man1/gflux.1 -man/man1/glblur.1 -man/man1/glforestfire.1 -man/man1/glknots.1 -man/man1/glmatrix.1 -man/man1/glplanet.1 -man/man1/glslideshow.1 -man/man1/glsnake.1 -man/man1/gltext.1 -man/man1/goop.1 -man/man1/grav.1 -man/man1/greynetic.1 -man/man1/halftone.1 -man/man1/halo.1 -man/man1/helix.1 -man/man1/hopalong.1 -man/man1/hyperball.1 -man/man1/hypercube.1 -man/man1/hypertorus.1 -man/man1/ifs.1 -man/man1/imsmap.1 -man/man1/interference.1 -man/man1/jigglypuff.1 -man/man1/jigsaw.1 -man/man1/juggle.1 -man/man1/julia.1 -man/man1/kaleidescope.1 -man/man1/klein.1 -man/man1/kumppa.1 -man/man1/lament.1 -man/man1/laser.1 -man/man1/lavalite.1 -man/man1/lightning.1 -man/man1/lisa.1 -man/man1/lissie.1 -man/man1/ljlatest.1 -man/man1/lmorph.1 -man/man1/loop.1 -man/man1/maze.1 -man/man1/menger.1 -man/man1/metaballs.1 -man/man1/moebius.1 -man/man1/moire.1 -man/man1/moire2.1 -man/man1/molecule.1 -man/man1/morph3d.1 -man/man1/mountain.1 -man/man1/munch.1 -man/man1/nerverot.1 -man/man1/noseguy.1 -man/man1/pedal.1 -man/man1/penetrate.1 -man/man1/penrose.1 -man/man1/petri.1 -man/man1/phosphor.1 -man/man1/piecewise.1 -man/man1/pipes.1 -man/man1/polyominoes.1 -man/man1/polytopes.1 -man/man1/pulsar.1 -man/man1/pyro.1 -man/man1/qix.1 -man/man1/queens.1 -man/man1/rd-bomb.1 -man/man1/ripples.1 -man/man1/rocks.1 -man/man1/rorschach.1 -man/man1/rotor.1 -man/man1/rotzoomer.1 -man/man1/rubik.1 -man/man1/sballs.1 -man/man1/shadebobs.1 -man/man1/sierpinski.1 -man/man1/sierpinski3d.1 -man/man1/slidescreen.1 -man/man1/slip.1 -man/man1/sonar.1 -man/man1/speedmine.1 -man/man1/sphere.1 -man/man1/spheremonics.1 -man/man1/spiral.1 -man/man1/spotlight.1 -man/man1/sproingies.1 -man/man1/squiral.1 -man/man1/stairs.1 -man/man1/starfish.1 -man/man1/starwars.1 -man/man1/stonerview.1 -man/man1/strange.1 -man/man1/superquadrics.1 -man/man1/swirl.1 -man/man1/t3d.1 -man/man1/thornbird.1 -man/man1/triangle.1 -man/man1/truchet.1 -man/man1/twang.1 -man/man1/vermiculate.1 -man/man1/vidwhacker.1 -man/man1/vines.1 -man/man1/wander.1 -man/man1/webcollage.1 -man/man1/whirlwindwarp.1 -man/man1/whirlygig.1 -man/man1/worm.1 -man/man1/xflame.1 -man/man1/xjack.1 -man/man1/xlyap.1 -man/man1/xmatrix.1 -man/man1/xrayswarm.1 -man/man1/xscreensaver-command.1 -man/man1/xscreensaver-demo.1 -man/man1/xscreensaver-getimage-file.1 -man/man1/xscreensaver-getimage-video.1 -man/man1/xscreensaver-getimage.1 -man/man1/xscreensaver-gl-helper.1 -man/man1/xscreensaver.1 -man/man1/xspirograph.1 -man/man1/xsublim.1 -man/man1/xteevee.1 -man/man1/zoom.1 share/control-center-2.0/capplets/screensaver-properties.desktop share/control-center/Desktop/screensaver-properties.desktop -share/control-center/screensavers/README -share/control-center/screensavers/anemone.xml -share/control-center/screensavers/ant.xml -share/control-center/screensavers/antspotlight.xml -share/control-center/screensavers/apollonian.xml -share/control-center/screensavers/atlantis.xml -share/control-center/screensavers/attraction.xml -share/control-center/screensavers/atunnel.xml -share/control-center/screensavers/barcode.xml -share/control-center/screensavers/blaster.xml -share/control-center/screensavers/blitspin.xml -share/control-center/screensavers/blocktube.xml -share/control-center/screensavers/bouboule.xml -share/control-center/screensavers/bouncingcow.xml -share/control-center/screensavers/boxed.xml -share/control-center/screensavers/braid.xml -share/control-center/screensavers/bsod.xml -share/control-center/screensavers/bubble3d.xml -share/control-center/screensavers/bubbles.xml -share/control-center/screensavers/bumps.xml -share/control-center/screensavers/cage.xml -share/control-center/screensavers/ccurve.xml -share/control-center/screensavers/circuit.xml -share/control-center/screensavers/cloudlife.xml -share/control-center/screensavers/compass.xml -share/control-center/screensavers/coral.xml -share/control-center/screensavers/cosmos.xml -share/control-center/screensavers/critical.xml -share/control-center/screensavers/crystal.xml -share/control-center/screensavers/cubenetic.xml -share/control-center/screensavers/cubestorm.xml -share/control-center/screensavers/cynosure.xml -share/control-center/screensavers/dangerball.xml -share/control-center/screensavers/decayscreen.xml -share/control-center/screensavers/deco.xml -share/control-center/screensavers/deluxe.xml -share/control-center/screensavers/demon.xml -share/control-center/screensavers/discrete.xml -share/control-center/screensavers/distort.xml -share/control-center/screensavers/drift.xml -share/control-center/screensavers/electricsheep.xml -share/control-center/screensavers/endgame.xml -share/control-center/screensavers/engine.xml -share/control-center/screensavers/epicycle.xml -share/control-center/screensavers/eruption.xml -share/control-center/screensavers/euler2d.xml -share/control-center/screensavers/extrusion.xml -share/control-center/screensavers/fadeplot.xml -share/control-center/screensavers/fireflies.xml -share/control-center/screensavers/flag.xml -share/control-center/screensavers/flame.xml -share/control-center/screensavers/flipflop.xml -share/control-center/screensavers/flipscreen3d.xml -share/control-center/screensavers/flow.xml -share/control-center/screensavers/fluidballs.xml -share/control-center/screensavers/flurry.xml -share/control-center/screensavers/flyingtoasters.xml -share/control-center/screensavers/forest.xml -share/control-center/screensavers/galaxy.xml -share/control-center/screensavers/gears.xml -share/control-center/screensavers/gflux.xml -share/control-center/screensavers/glblur.xml -share/control-center/screensavers/glforestfire.xml -share/control-center/screensavers/glknots.xml -share/control-center/screensavers/glmatrix.xml -share/control-center/screensavers/glplanet.xml -share/control-center/screensavers/glslideshow.xml -share/control-center/screensavers/glsnake.xml -share/control-center/screensavers/gltext.xml -share/control-center/screensavers/goban.xml -share/control-center/screensavers/goop.xml -share/control-center/screensavers/grav.xml -share/control-center/screensavers/greynetic.xml -share/control-center/screensavers/halftone.xml -share/control-center/screensavers/halo.xml -share/control-center/screensavers/helix.xml -share/control-center/screensavers/hopalong.xml -share/control-center/screensavers/hyperball.xml -share/control-center/screensavers/hypercube.xml -share/control-center/screensavers/hypertorus.xml -share/control-center/screensavers/ifs.xml -share/control-center/screensavers/imsmap.xml -share/control-center/screensavers/interference.xml -share/control-center/screensavers/jigglypuff.xml -share/control-center/screensavers/jigsaw.xml -share/control-center/screensavers/juggle.xml -share/control-center/screensavers/julia.xml -share/control-center/screensavers/kaleidescope.xml -share/control-center/screensavers/klein.xml -share/control-center/screensavers/kumppa.xml -share/control-center/screensavers/lament.xml -share/control-center/screensavers/laser.xml -share/control-center/screensavers/lavalite.xml -share/control-center/screensavers/lightning.xml -share/control-center/screensavers/lisa.xml -share/control-center/screensavers/lissie.xml -share/control-center/screensavers/lmorph.xml -share/control-center/screensavers/loop.xml -share/control-center/screensavers/maze.xml -share/control-center/screensavers/menger.xml -share/control-center/screensavers/metaballs.xml -share/control-center/screensavers/moebius.xml -share/control-center/screensavers/moire.xml -share/control-center/screensavers/moire2.xml -share/control-center/screensavers/molecule.xml -share/control-center/screensavers/morph3d.xml -share/control-center/screensavers/mountain.xml -share/control-center/screensavers/munch.xml -share/control-center/screensavers/nerverot.xml -share/control-center/screensavers/noseguy.xml -share/control-center/screensavers/pedal.xml -share/control-center/screensavers/penetrate.xml -share/control-center/screensavers/penrose.xml -share/control-center/screensavers/petri.xml -share/control-center/screensavers/phosphor.xml -share/control-center/screensavers/piecewise.xml -share/control-center/screensavers/pipes.xml -share/control-center/screensavers/polyominoes.xml -share/control-center/screensavers/polytopes.xml -share/control-center/screensavers/popsquares.xml -share/control-center/screensavers/pulsar.xml -share/control-center/screensavers/pyro.xml -share/control-center/screensavers/qix.xml -share/control-center/screensavers/queens.xml -share/control-center/screensavers/rd-bomb.xml -share/control-center/screensavers/ripples.xml -share/control-center/screensavers/rocks.xml -share/control-center/screensavers/rorschach.xml -share/control-center/screensavers/rotor.xml -share/control-center/screensavers/rotzoomer.xml -share/control-center/screensavers/rubik.xml -share/control-center/screensavers/sballs.xml -share/control-center/screensavers/shadebobs.xml -share/control-center/screensavers/sierpinski.xml -share/control-center/screensavers/sierpinski3d.xml -share/control-center/screensavers/slidescreen.xml -share/control-center/screensavers/slip.xml -share/control-center/screensavers/sonar.xml -share/control-center/screensavers/speedmine.xml -share/control-center/screensavers/sphere.xml -share/control-center/screensavers/sphereEversion.xml -share/control-center/screensavers/spheremonics.xml -share/control-center/screensavers/spiral.xml -share/control-center/screensavers/spotlight.xml -share/control-center/screensavers/sproingies.xml -share/control-center/screensavers/squiral.xml -share/control-center/screensavers/ssystem.xml -share/control-center/screensavers/stairs.xml -share/control-center/screensavers/starfish.xml -share/control-center/screensavers/starwars.xml -share/control-center/screensavers/stonerview.xml -share/control-center/screensavers/strange.xml -share/control-center/screensavers/superquadrics.xml -share/control-center/screensavers/swirl.xml -share/control-center/screensavers/t3d.xml -share/control-center/screensavers/thornbird.xml -share/control-center/screensavers/triangle.xml -share/control-center/screensavers/truchet.xml -share/control-center/screensavers/twang.xml -share/control-center/screensavers/vermiculate.xml -share/control-center/screensavers/vidwhacker.xml -share/control-center/screensavers/vines.xml -share/control-center/screensavers/wander.xml -share/control-center/screensavers/webcollage.xml -share/control-center/screensavers/whirlwindwarp.xml -share/control-center/screensavers/whirlygig.xml -share/control-center/screensavers/worm.xml -share/control-center/screensavers/xaos.xml -share/control-center/screensavers/xdaliclock.xml -share/control-center/screensavers/xearth.xml -share/control-center/screensavers/xfishtank.xml -share/control-center/screensavers/xflame.xml -share/control-center/screensavers/xjack.xml -share/control-center/screensavers/xlyap.xml -share/control-center/screensavers/xmatrix.xml -share/control-center/screensavers/xmountains.xml -share/control-center/screensavers/xrayswarm.xml -share/control-center/screensavers/xsnow.xml -share/control-center/screensavers/xspirograph.xml -share/control-center/screensavers/xteevee.xml -share/control-center/screensavers/zoom.xml +share/control-center/screensavers share/gnome/apps/Settings/Desktop/screensaver-properties.desktop -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xscreensaver.mo -${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xscreensaver.mo share/pixmaps/xscreensaver.xpm share/xscreensaver/screensaver-cmndln.png share/xscreensaver/screensaver-colorselector.png @@ -569,9 +15,6 @@ share/xscreensaver/screensaver-snap.png share/xscreensaver/xscreensaver-demo.glade2 @dirrm share/xscreensaver @comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Desktop -@dirrm share/control-center/screensavers @comment in controlcenter: @dirrm share/control-center/Desktop @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets -@comment in gnome2-dirs: @dirrm share/control-center-2.0 -@comment in controlcenter: @dirrm share/control-center -@dirrm libexec/xscreensaver +@comment in gnome2-dirs: @dirrm share/control-center diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index ce99b9e4397..35cd199d402 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,20 +1,16 @@ -# $NetBSD: Makefile,v 1.61 2003/12/13 00:45:27 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2003/12/13 19:22:12 jmmv Exp $ # COMMENT= Screen saver and locker for the X window system -CONFLICTS+= xscreensaver-gnome-[0-9]* -PKGREVISION= 2 +CONFLICTS+= xscreensaver-gnome<1.14 .include "../../x11/xscreensaver/Makefile.common" CONFIGURE_ARGS+= --without-gnome -CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2} -CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} - +CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config -.include "../../devel/libglade2/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 07615eb776c..49e7d9cb15a 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.57 2003/11/14 14:58:15 fredb Exp $ +# $NetBSD: Makefile.common,v 1.58 2003/12/13 19:22:12 jmmv Exp $ # -DISTNAME= xscreensaver-4.13 +DISTNAME= xscreensaver-4.14 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} \ ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ @@ -28,10 +28,9 @@ CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults" CONFIGURE_ENV+= PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION}" MAKE_ENV+= KDEDIR=${PREFIX} -DISTINFO_FILE= ${.CURDIR}/../xscreensaver/distinfo -FILESDIR= ${.CURDIR}/../xscreensaver/files -PATCHDIR= ${.CURDIR}/../xscreensaver/patches -PKGDIR= ${.CURDIR}/../xscreensaver +DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo +FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files +PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches .include "../../mk/bsd.prefs.mk" diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 3de02999360..380a61132cd 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.15 2003/09/08 12:11:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.16 2003/12/13 19:22:12 jmmv Exp $ bin/xscreensaver bin/xscreensaver-command -bin/xscreensaver-demo bin/xscreensaver-getimage bin/xscreensaver-getimage-file bin/xscreensaver-getimage-video @@ -12,11 +11,13 @@ libexec/xscreensaver/anemone libexec/xscreensaver/ant libexec/xscreensaver/antspotlight libexec/xscreensaver/apollonian +libexec/xscreensaver/apple2 libexec/xscreensaver/atlantis libexec/xscreensaver/attraction libexec/xscreensaver/atunnel libexec/xscreensaver/barcode libexec/xscreensaver/blaster +libexec/xscreensaver/blinkbox libexec/xscreensaver/blitspin libexec/xscreensaver/blocktube libexec/xscreensaver/bouboule @@ -37,11 +38,13 @@ libexec/xscreensaver/config/anemone.xml libexec/xscreensaver/config/ant.xml libexec/xscreensaver/config/antspotlight.xml libexec/xscreensaver/config/apollonian.xml +libexec/xscreensaver/config/apple2.xml libexec/xscreensaver/config/atlantis.xml libexec/xscreensaver/config/attraction.xml libexec/xscreensaver/config/atunnel.xml libexec/xscreensaver/config/barcode.xml libexec/xscreensaver/config/blaster.xml +libexec/xscreensaver/config/blinkbox.xml libexec/xscreensaver/config/blitspin.xml libexec/xscreensaver/config/blocktube.xml libexec/xscreensaver/config/bouboule.xml @@ -89,11 +92,13 @@ libexec/xscreensaver/config/flow.xml libexec/xscreensaver/config/fluidballs.xml libexec/xscreensaver/config/flurry.xml libexec/xscreensaver/config/flyingtoasters.xml +libexec/xscreensaver/config/fontglide.xml libexec/xscreensaver/config/forest.xml libexec/xscreensaver/config/galaxy.xml libexec/xscreensaver/config/gears.xml libexec/xscreensaver/config/gflux.xml libexec/xscreensaver/config/glblur.xml +libexec/xscreensaver/config/gleidescope.xml libexec/xscreensaver/config/glforestfire.xml libexec/xscreensaver/config/glknots.xml libexec/xscreensaver/config/glmatrix.xml @@ -133,6 +138,7 @@ libexec/xscreensaver/config/loop.xml libexec/xscreensaver/config/maze.xml libexec/xscreensaver/config/menger.xml libexec/xscreensaver/config/metaballs.xml +libexec/xscreensaver/config/mirrorblob.xml libexec/xscreensaver/config/moebius.xml libexec/xscreensaver/config/moire.xml libexec/xscreensaver/config/moire2.xml @@ -151,6 +157,7 @@ libexec/xscreensaver/config/piecewise.xml libexec/xscreensaver/config/pipes.xml libexec/xscreensaver/config/polyominoes.xml libexec/xscreensaver/config/polytopes.xml +libexec/xscreensaver/config/pong.xml libexec/xscreensaver/config/popsquares.xml libexec/xscreensaver/config/pulsar.xml libexec/xscreensaver/config/pyro.xml @@ -199,6 +206,7 @@ libexec/xscreensaver/config/webcollage.xml libexec/xscreensaver/config/whirlwindwarp.xml libexec/xscreensaver/config/whirlygig.xml libexec/xscreensaver/config/worm.xml +libexec/xscreensaver/config/xanalogtv.xml libexec/xscreensaver/config/xaos.xml libexec/xscreensaver/config/xdaliclock.xml libexec/xscreensaver/config/xearth.xml @@ -242,11 +250,13 @@ libexec/xscreensaver/flow libexec/xscreensaver/fluidballs libexec/xscreensaver/flurry libexec/xscreensaver/flyingtoasters +libexec/xscreensaver/fontglide libexec/xscreensaver/forest libexec/xscreensaver/galaxy libexec/xscreensaver/gears libexec/xscreensaver/gflux libexec/xscreensaver/glblur +libexec/xscreensaver/gleidescope libexec/xscreensaver/glforestfire libexec/xscreensaver/glknots libexec/xscreensaver/glmatrix @@ -286,6 +296,7 @@ libexec/xscreensaver/loop libexec/xscreensaver/maze libexec/xscreensaver/menger libexec/xscreensaver/metaballs +libexec/xscreensaver/mirrorblob libexec/xscreensaver/moebius libexec/xscreensaver/moire libexec/xscreensaver/moire2 @@ -304,6 +315,7 @@ libexec/xscreensaver/piecewise libexec/xscreensaver/pipes libexec/xscreensaver/polyominoes libexec/xscreensaver/polytopes +libexec/xscreensaver/pong libexec/xscreensaver/popsquares libexec/xscreensaver/pulsar libexec/xscreensaver/pyro @@ -347,10 +359,10 @@ 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/xanalogtv libexec/xscreensaver/xflame libexec/xscreensaver/xjack libexec/xscreensaver/xlyap @@ -364,11 +376,13 @@ man/man1/anemone.1 man/man1/ant.1 man/man1/antspotlight.1 man/man1/apollonian.1 +man/man1/apple2.1 man/man1/atlantis.1 man/man1/attraction.1 man/man1/atunnel.1 man/man1/barcode.1 man/man1/blaster.1 +man/man1/blinkbox.1 man/man1/blitspin.1 man/man1/blocktube.1 man/man1/bouboule.1 @@ -413,11 +427,13 @@ man/man1/flow.1 man/man1/fluidballs.1 man/man1/flurry.1 man/man1/flyingtoasters.1 +man/man1/fontglide.1 man/man1/forest.1 man/man1/galaxy.1 man/man1/gears.1 man/man1/gflux.1 man/man1/glblur.1 +man/man1/gleidescope.1 man/man1/glforestfire.1 man/man1/glknots.1 man/man1/glmatrix.1 @@ -457,6 +473,7 @@ man/man1/loop.1 man/man1/maze.1 man/man1/menger.1 man/man1/metaballs.1 +man/man1/mirrorblob.1 man/man1/moebius.1 man/man1/moire.1 man/man1/moire2.1 @@ -475,6 +492,7 @@ man/man1/piecewise.1 man/man1/pipes.1 man/man1/polyominoes.1 man/man1/polytopes.1 +man/man1/pong.1 man/man1/pulsar.1 man/man1/pyro.1 man/man1/qix.1 @@ -520,6 +538,7 @@ man/man1/webcollage.1 man/man1/whirlwindwarp.1 man/man1/whirlygig.1 man/man1/worm.1 +man/man1/xanalogtv.1 man/man1/xflame.1 man/man1/xjack.1 man/man1/xlyap.1 @@ -555,14 +574,5 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xscreensaver.mo -share/pixmaps/xscreensaver.xpm -share/xscreensaver/screensaver-cmndln.png -share/xscreensaver/screensaver-colorselector.png -share/xscreensaver/screensaver-diagnostic.png -share/xscreensaver/screensaver-locking.png -share/xscreensaver/screensaver-power.png -share/xscreensaver/screensaver-snap.png -share/xscreensaver/xscreensaver-demo.glade2 -@dirrm share/xscreensaver @dirrm libexec/xscreensaver/config @dirrm libexec/xscreensaver diff --git a/x11/xscreensaver/buildlink2.mk b/x11/xscreensaver/buildlink2.mk index 60e87c210cb..92a54271b76 100644 --- a/x11/xscreensaver/buildlink2.mk +++ b/x11/xscreensaver/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:27 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 19:22:13 jmmv Exp $ # # This Makefile fragment is included by packages that use xscreensaver. # @@ -9,16 +9,14 @@ XSCREENSAVER_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= xscreensaver -BUILDLINK_DEPENDS.xscreensaver?= xscreensaver{,-gnome}>=4.13nb2 +BUILDLINK_DEPENDS.xscreensaver?= xscreensaver>=4.14 BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver EVAL_PREFIX+= BUILDLINK_PREFIX.xscreensaver=xscreensaver BUILDLINK_PREFIX.xscreensaver_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.xscreensaver+= lib/X11/app-defaults/XScreenSaver -.include "../../devel/libglade2/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" .include "../../graphics/gle/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index a7b3e9e1406..8ca6062c3ba 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.31 2003/11/14 15:25:16 fredb Exp $ +$NetBSD: distinfo,v 1.32 2003/12/13 19:22:13 jmmv Exp $ -SHA1 (xscreensaver-4.13.tar.gz) = 3d78b783fd1bc1e7f33fa7846fea6502217df802 -Size (xscreensaver-4.13.tar.gz) = 3902864 bytes +SHA1 (xscreensaver-4.14.tar.gz) = 4996718deaceeb578953f400e518b745c1dd32c4 +Size (xscreensaver-4.14.tar.gz) = 3988251 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d SHA1 (patch-ac) = 9b82326439791ecc8e05e85a4d691109b4e50e68 -SHA1 (patch-ad) = 6ec58b1ce447002dc62e2073f49c3e14bb7efcc0 +SHA1 (patch-ad) = 244908c3e4c278c878bf89e07bd68efb62b3fc4d SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 -SHA1 (patch-af) = f1f7659e7173349868434d6dd35363e305817fd7 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad index c0e47830928..7e805c2cf7e 100644 --- a/x11/xscreensaver/patches/patch-ad +++ b/x11/xscreensaver/patches/patch-ad @@ -1,8 +1,17 @@ -$NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ +$NetBSD: patch-ad,v 1.11 2003/12/13 19:22:13 jmmv Exp $ ---- driver/Makefile.in.orig 2003-09-07 19:00:00.000000000 -0500 +--- driver/Makefile.in.orig 2003-10-25 09:47:19.000000000 +0200 +++ driver/Makefile.in -@@ -456,7 +456,7 @@ install-pam: +@@ -287,7 +287,7 @@ install-program: $(EXES) + fi ; \ + echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ + $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver +- @for exe in xscreensaver-command xscreensaver-demo \ ++ @for exe in xscreensaver-command \ + xscreensaver-getimage @EXES_OSX@ ; do \ + echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ + $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ +@@ -462,7 +462,7 @@ install-pam: fi ; \ fi @@ -11,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ @lost="" ;\ if [ "$(GNOME_DATADIR)" != "" ]; then \ \ -@@ -464,10 +464,6 @@ install-gnome:: screensaver-properties.d +@@ -470,10 +470,6 @@ install-gnome:: screensaver-properties.d echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ fi ;\ @@ -22,7 +31,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ -@@ -488,16 +484,6 @@ install-gnome:: screensaver-properties.d +@@ -494,16 +490,6 @@ install-gnome:: screensaver-properties.d fi ;\ \ echo $(INSTALL_DATA) screensaver-properties.desktop \ @@ -39,7 +48,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ \ if $(INSTALL_DATA) screensaver-properties.desktop \ -@@ -531,7 +517,7 @@ install-gnome:: screensaver-properties.d +@@ -537,7 +523,7 @@ install-gnome:: screensaver-properties.d fi ;\ fi @@ -48,7 +57,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ @if [ "$(GNOME_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ -@@ -630,8 +616,6 @@ uninstall-gnome:: +@@ -636,8 +622,6 @@ uninstall-gnome:: f=screensaver-properties.desktop ;\ echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af deleted file mode 100644 index 81b7694dc19..00000000000 --- a/x11/xscreensaver/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.11 2003/09/08 12:11:16 wiz Exp $ - ---- driver/demo-Gtk.c.orig Thu Sep 4 04:02:03 2003 -+++ driver/demo-Gtk.c -@@ -4540,9 +4540,11 @@ main (int argc, char **argv) - free (window_title); - window_title = 0; - -+#ifdef HAVE_GTK2 - /* After picking the default size, allow -geometry to override it. */ - if (geom) - gtk_window_parse_geometry (GTK_WINDOW (s->toplevel_widget), geom); -+#endif - - gtk_widget_show (s->toplevel_widget); - init_icon (GTK_WIDGET (s->toplevel_widget)->window); /* after `show' */ |