CVS commit: pkgsrc/x11/xscreensaver

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/xscreensaver
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 17 Feb 2022 15:46:52 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 17 15:46:52 UTC 2022

Modified Files:
        pkgsrc/x11/xscreensaver: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/x11/xscreensaver: Makefile.common PLIST.Darwin PLIST.opengl
            PLIST.webcollage
        pkgsrc/x11/xscreensaver/patches: patch-ad patch-af
            patch-driver_screens.c patch-hacks_Makefile.in
            patch-hacks_images_Makefile.in patch-utils_Makefile.in

Log Message:
xscreensaver: update to 6.02.

Merge xscreensaver-demo into this package.

6.02    11-Oct-2021

    New hacks, marbling and binaryhorizon.
    atlantis behaviors are more random and lifelike.
    headroom is now Mask Headroom.
    X11: fontglide skips fonts that can't display ASCII.
    X11: Use asterisks in the password dialog if the system fonts
    don't have bullets in them.
    X11: “Disable Screen Saver” was behaving like “Blank Screen
    Only”.
    Android: These hacks work now: antinspect, barcode, energystream,
    fliptext, fontglide, glsnake, raverhoop, starwars, unicrud.

6.01    09-Jun-2021

    X11: Properly disable the server's built-in screen saver.
    X11: The passwdTimeout option was being ignored.
    X11: The display of the unlock thermometer was weird.
    X11: Fixed password entry on old-school multi-screen setups
    (:0.1).
    X11: Worked around a KDE 5 compositor bug that caused the
    desktop to momentarily become visible when cycling.
    X11: Fixed possible high CPU usage in xscreensaver-systemd.
    X11: Fixed some spurious warnings in xscreensaver-text.
    X11: Warn when Wayland is in use, since it makes both screen
    saving and locking impossible.

6.00    01-Apr-2021

    X11: Major refactor of the xscreensaver daemon for improved
    security, dividing it into three programs: xscreensaver,
    xscreensaver-gfx and xscreensaver-auth.
    X11: Dropped support for systems older than X11R7 (2009).
    X11: Renamed xscreensaver-demo to xscreensaver-settings.
    X11: Unlock dialog has user-selectable color schemes.
    X11: Everything uses XFreeType for fonts now.
    X11: Install a few custom fonts needed by some savers.
    X11: Fading works on systems without gamma (e.g. Raspberry Pi).
    X11: Use EGL instead of GLX when available.
    X11: xscreensaver-systemd now detects when a video player has
    inhibited screen blanking and then exits without uninhibiting.
    Improved GLSL and GLES3 support: Phong shading in etruscanvenus,
    hypertorus, klein, projectiveplane,`romanboy' and sphereeversion.
    Updates to cubicgrid.
    macOS: Added a Random XScreenSaver screen saver, which implements
    cycle mode, among other things.
    iOS: Also added cycle mode.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.131 -r0 pkgsrc/x11/xscreensaver/Makefile.common
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xscreensaver/PLIST.Darwin
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/xscreensaver/PLIST.opengl
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xscreensaver/PLIST.webcollage
cvs rdiff -u -r1.85 -r1.86 pkgsrc/x11/xscreensaver/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xscreensaver/options.mk
cvs rdiff -u -r1.25 -r0 pkgsrc/x11/xscreensaver/patches/patch-ad
cvs rdiff -u -r1.15 -r0 pkgsrc/x11/xscreensaver/patches/patch-af
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xscreensaver/patches/patch-driver_screens.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/x11/xscreensaver/patches/patch-hacks_Makefile.in
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/x11/xscreensaver/patches/patch-hacks_images_Makefile.in \
    pkgsrc/x11/xscreensaver/patches/patch-utils_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xscreensaver/Makefile
diff -u pkgsrc/x11/xscreensaver/Makefile:1.132 pkgsrc/x11/xscreensaver/Makefile:1.133
--- pkgsrc/x11/xscreensaver/Makefile:1.132      Wed Dec  8 16:03:04 2021
+++ pkgsrc/x11/xscreensaver/Makefile    Thu Feb 17 15:46:52 2022
@@ -1,28 +1,78 @@
-# $NetBSD: Makefile,v 1.132 2021/12/08 16:03:04 adam Exp $
+# $NetBSD: Makefile,v 1.133 2022/02/17 15:46:52 wiz Exp $
 
-COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   5
+DISTNAME=              xscreensaver-6.02
+CATEGORIES=            x11
+MASTER_SITES=          https://www.jwz.org/xscreensaver/
+DIST_SUBDIR=           xscreensaver
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+COMMENT=               Screen saver and locker for the X window system
+HOMEPAGE=              https://www.jwz.org/xscreensaver/
+
+GNU_CONFIGURE=         yes
+USE_PKGLOCALEDIR=      yes
+USE_LANGUAGES=         c99
+USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
+
+CHECK_PORTABILITY_SKIP+=       OSX/fuzztest.sh
+CHECK_PORTABILITY_SKIP+=       OSX/installer.sh
+CHECK_PORTABILITY_SKIP+=       android/Makefile
 
-CONFLICTS+=    xscreensaver-gnome<4.14
-
-.include "Makefile.common"
-.include "options.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-
-CONFIGURE_ARGS+=       --without-gtk
-#CONFIGURE_ARGS+=      --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
+CONFIGURE_ARGS+=       --with-gl
+CONFIGURE_ARGS+=       --with-gle
+CONFIGURE_ARGS+=       --with-gtk=${BUILDLINK_PREFIX.gtk2}
+CONFIGURE_ARGS+=       --with-hackdir=${PREFIX}/libexec/xscreensaver
+CONFIGURE_ARGS+=       --with-jpeg=${JPEGBASE}
+CONFIGURE_ARGS+=       --without-motif
+
+CONFIGURE_ARGS.NetBSD+=        --without-kerberos
+
+#CONFIGURE_ARGS+=      --with-pthread
+#CONFIGURE_ENV+=       ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
+#CONFIGURE_ENV+=       ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
+#CONFIGURE_ENV+=       INTLTOOL_PERL=${PERL5:Q}
+#.if defined(PKGREVISION)
+#CONFIGURE_ENV+=       X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
+#.endif
+#CONFIGURE_ARGS+=      ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
+
+CONFLICTS+=    xscreensaver-gnome<4.14 xscreensaver-demo-[0-9]*
+
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc*)
+CFLAGS+=               -fno-strict-aliasing
+.endif
+
+.if !exists(/usr/bin/bc)
+BUILD_DEPENDS+=                bc-[0-9]*:../../math/bc
+.endif
+
+INSTALL_MAKE_FLAGS=    install_prefix=${DESTDIR}
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
+.include "options.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xscreensaver/PLIST
diff -u pkgsrc/x11/xscreensaver/PLIST:1.52 pkgsrc/x11/xscreensaver/PLIST:1.53
--- pkgsrc/x11/xscreensaver/PLIST:1.52  Mon May  3 23:31:40 2021
+++ pkgsrc/x11/xscreensaver/PLIST       Thu Feb 17 15:46:52 2022
@@ -1,142 +1,280 @@
-@comment $NetBSD: PLIST,v 1.52 2021/05/03 23:31:40 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.53 2022/02/17 15:46:52 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
-bin/xscreensaver-getimage
-bin/xscreensaver-getimage-file
-bin/xscreensaver-getimage-video
-bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
+bin/xscreensaver-demo
+bin/xscreensaver-settings
 libexec/xscreensaver/abstractile
 libexec/xscreensaver/anemone
 libexec/xscreensaver/anemotaxis
+libexec/xscreensaver/antinspect
+libexec/xscreensaver/antmaze
+libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/apple2
+libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
+libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
+libexec/xscreensaver/beats
+libexec/xscreensaver/binaryhorizon
 libexec/xscreensaver/binaryring
 libexec/xscreensaver/blaster
+libexec/xscreensaver/blinkbox
 libexec/xscreensaver/blitspin
+libexec/xscreensaver/blocktube
+libexec/xscreensaver/boing
 libexec/xscreensaver/bouboule
+libexec/xscreensaver/bouncingcow
+libexec/xscreensaver/boxed
 libexec/xscreensaver/boxfit
 libexec/xscreensaver/braid
 libexec/xscreensaver/bsod
+libexec/xscreensaver/bubble3d
 libexec/xscreensaver/bumps
+libexec/xscreensaver/cage
+libexec/xscreensaver/carousel
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/celtic
+libexec/xscreensaver/circuit
+libexec/xscreensaver/cityflow
 libexec/xscreensaver/cloudlife
+libexec/xscreensaver/companioncube
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/abstractile.xml
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/anemotaxis.xml
+libexec/xscreensaver/config/antinspect.xml
+libexec/xscreensaver/config/antmaze.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/beats.xml
+libexec/xscreensaver/config/binaryhorizon.xml
 libexec/xscreensaver/config/binaryring.xml
 libexec/xscreensaver/config/blaster.xml
+libexec/xscreensaver/config/blinkbox.xml
 libexec/xscreensaver/config/blitspin.xml
+libexec/xscreensaver/config/blocktube.xml
+libexec/xscreensaver/config/boing.xml
 libexec/xscreensaver/config/bouboule.xml
+libexec/xscreensaver/config/bouncingcow.xml
+libexec/xscreensaver/config/boxed.xml
 libexec/xscreensaver/config/boxfit.xml
 libexec/xscreensaver/config/braid.xml
 libexec/xscreensaver/config/bsod.xml
+libexec/xscreensaver/config/bubble3d.xml
 libexec/xscreensaver/config/bumps.xml
+libexec/xscreensaver/config/cage.xml
+libexec/xscreensaver/config/carousel.xml
 libexec/xscreensaver/config/ccurve.xml
 libexec/xscreensaver/config/celtic.xml
+libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/cloudlife.xml
+libexec/xscreensaver/config/companioncube.xml
 libexec/xscreensaver/config/compass.xml
 libexec/xscreensaver/config/coral.xml
+libexec/xscreensaver/config/covid19.xml
+libexec/xscreensaver/config/crackberg.xml
+libexec/xscreensaver/config/crumbler.xml
 libexec/xscreensaver/config/crystal.xml
+libexec/xscreensaver/config/cube21.xml
+libexec/xscreensaver/config/cubenetic.xml
+libexec/xscreensaver/config/cubestack.xml
+libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubetwist.xml
+libexec/xscreensaver/config/cubicgrid.xml
 libexec/xscreensaver/config/cwaves.xml
 libexec/xscreensaver/config/cynosure.xml
+libexec/xscreensaver/config/dangerball.xml
 libexec/xscreensaver/config/decayscreen.xml
 libexec/xscreensaver/config/deco.xml
+libexec/xscreensaver/config/deepstars.xml
 libexec/xscreensaver/config/deluxe.xml
 libexec/xscreensaver/config/demon.xml
+libexec/xscreensaver/config/discoball.xml
 libexec/xscreensaver/config/discrete.xml
 libexec/xscreensaver/config/distort.xml
 libexec/xscreensaver/config/drift.xml
+libexec/xscreensaver/config/dymaxionmap.xml
+libexec/xscreensaver/config/endgame.xml
+libexec/xscreensaver/config/energystream.xml
+libexec/xscreensaver/config/engine.xml
 libexec/xscreensaver/config/epicycle.xml
 libexec/xscreensaver/config/eruption.xml
+libexec/xscreensaver/config/esper.xml
+libexec/xscreensaver/config/etruscanvenus.xml
 libexec/xscreensaver/config/euler2d.xml
+libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/fadeplot.xml
 libexec/xscreensaver/config/fiberlamp.xml
 libexec/xscreensaver/config/filmleader.xml
 libexec/xscreensaver/config/fireworkx.xml
 libexec/xscreensaver/config/flame.xml
+libexec/xscreensaver/config/flipflop.xml
+libexec/xscreensaver/config/flipscreen3d.xml
+libexec/xscreensaver/config/fliptext.xml
 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/fuzzyflakes.xml
 libexec/xscreensaver/config/galaxy.xml
+libexec/xscreensaver/config/gears.xml
+libexec/xscreensaver/config/geodesic.xml
+libexec/xscreensaver/config/geodesicgears.xml
+libexec/xscreensaver/config/gflux.xml
+libexec/xscreensaver/config/gibson.xml
+libexec/xscreensaver/config/glblur.xml
+libexec/xscreensaver/config/glcells.xml
+libexec/xscreensaver/config/gleidescope.xml
+libexec/xscreensaver/config/glhanoi.xml
 libexec/xscreensaver/config/glitchpeg.xml
+libexec/xscreensaver/config/glknots.xml
+libexec/xscreensaver/config/glmatrix.xml
+libexec/xscreensaver/config/glplanet.xml
+libexec/xscreensaver/config/glschool.xml
+libexec/xscreensaver/config/glslideshow.xml
+libexec/xscreensaver/config/glsnake.xml
+libexec/xscreensaver/config/gltext.xml
 libexec/xscreensaver/config/goop.xml
 libexec/xscreensaver/config/grav.xml
+libexec/xscreensaver/config/gravitywell.xml
 libexec/xscreensaver/config/greynetic.xml
 libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.xml
+libexec/xscreensaver/config/handsy.xml
+libexec/xscreensaver/config/headroom.xml
 libexec/xscreensaver/config/helix.xml
 libexec/xscreensaver/config/hexadrop.xml
+libexec/xscreensaver/config/hexstrut.xml
+libexec/xscreensaver/config/hilbert.xml
 libexec/xscreensaver/config/hopalong.xml
+libexec/xscreensaver/config/hydrostat.xml
+libexec/xscreensaver/config/hypertorus.xml
+libexec/xscreensaver/config/hypnowheel.xml
 libexec/xscreensaver/config/ifs.xml
 libexec/xscreensaver/config/imsmap.xml
 libexec/xscreensaver/config/interaggregate.xml
 libexec/xscreensaver/config/interference.xml
 libexec/xscreensaver/config/intermomentary.xml
+libexec/xscreensaver/config/jigglypuff.xml
+libexec/xscreensaver/config/jigsaw.xml
+libexec/xscreensaver/config/juggler3d.xml
 libexec/xscreensaver/config/julia.xml
 libexec/xscreensaver/config/kaleidescope.xml
+libexec/xscreensaver/config/kaleidocycle.xml
+libexec/xscreensaver/config/klein.xml
 libexec/xscreensaver/config/kumppa.xml
+libexec/xscreensaver/config/lament.xml
+libexec/xscreensaver/config/lavalite.xml
 libexec/xscreensaver/config/lcdscrub.xml
+libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/m6502.xml
+libexec/xscreensaver/config/marbling.xml
 libexec/xscreensaver/config/maze.xml
+libexec/xscreensaver/config/maze3d.xml
 libexec/xscreensaver/config/memscroller.xml
+libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
+libexec/xscreensaver/config/mirrorblob.xml
+libexec/xscreensaver/config/moebius.xml
+libexec/xscreensaver/config/moebiusgears.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
+libexec/xscreensaver/config/molecule.xml
+libexec/xscreensaver/config/morph3d.xml
 libexec/xscreensaver/config/mountain.xml
 libexec/xscreensaver/config/munch.xml
 libexec/xscreensaver/config/nerverot.xml
+libexec/xscreensaver/config/noof.xml
 libexec/xscreensaver/config/noseguy.xml
 libexec/xscreensaver/config/pacman.xml
 libexec/xscreensaver/config/pedal.xml
+libexec/xscreensaver/config/peepers.xml
 libexec/xscreensaver/config/penetrate.xml
 libexec/xscreensaver/config/penrose.xml
 libexec/xscreensaver/config/petri.xml
 libexec/xscreensaver/config/phosphor.xml
+libexec/xscreensaver/config/photopile.xml
 libexec/xscreensaver/config/piecewise.xml
+libexec/xscreensaver/config/pinion.xml
+libexec/xscreensaver/config/pipes.xml
+libexec/xscreensaver/config/polyhedra.xml
 libexec/xscreensaver/config/polyominoes.xml
+libexec/xscreensaver/config/polytopes.xml
 libexec/xscreensaver/config/pong.xml
 libexec/xscreensaver/config/popsquares.xml
+libexec/xscreensaver/config/projectiveplane.xml
+libexec/xscreensaver/config/providence.xml
+libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
 libexec/xscreensaver/config/qix.xml
+libexec/xscreensaver/config/quasicrystal.xml
+libexec/xscreensaver/config/queens.xml
+libexec/xscreensaver/config/raverhoop.xml
+libexec/xscreensaver/config/razzledazzle.xml
 libexec/xscreensaver/config/rd-bomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
+libexec/xscreensaver/config/romanboy.xml
 libexec/xscreensaver/config/rorschach.xml
 libexec/xscreensaver/config/rotzoomer.xml
+libexec/xscreensaver/config/rubik.xml
+libexec/xscreensaver/config/rubikblocks.xml
+libexec/xscreensaver/config/sballs.xml
 libexec/xscreensaver/config/scooter.xml
 libexec/xscreensaver/config/shadebobs.xml
 libexec/xscreensaver/config/sierpinski.xml
+libexec/xscreensaver/config/sierpinski3d.xml
+libexec/xscreensaver/config/skytentacles.xml
 libexec/xscreensaver/config/slidescreen.xml
 libexec/xscreensaver/config/slip.xml
+libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/speedmine.xml
+libexec/xscreensaver/config/sphereeversion.xml
+libexec/xscreensaver/config/spheremonics.xml
+libexec/xscreensaver/config/splitflap.xml
+libexec/xscreensaver/config/splodesic.xml
 libexec/xscreensaver/config/spotlight.xml
+libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.xml
+libexec/xscreensaver/config/stairs.xml
 libexec/xscreensaver/config/starfish.xml
+libexec/xscreensaver/config/starwars.xml
+libexec/xscreensaver/config/stonerview.xml
 libexec/xscreensaver/config/strange.xml
 libexec/xscreensaver/config/substrate.xml
+libexec/xscreensaver/config/superquadrics.xml
+libexec/xscreensaver/config/surfaces.xml
 libexec/xscreensaver/config/swirl.xml
+libexec/xscreensaver/config/tangram.xml
 libexec/xscreensaver/config/tessellimage.xml
 libexec/xscreensaver/config/thornbird.xml
+libexec/xscreensaver/config/timetunnel.xml
+libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/triangle.xml
+libexec/xscreensaver/config/tronbit.xml
 libexec/xscreensaver/config/truchet.xml
 libexec/xscreensaver/config/twang.xml
+libexec/xscreensaver/config/unicrud.xml
+libexec/xscreensaver/config/unknownpleasures.xml
 libexec/xscreensaver/config/vermiculate.xml
 libexec/xscreensaver/config/vfeedback.xml
 libexec/xscreensaver/config/vidwhacker.xml
+libexec/xscreensaver/config/vigilance.xml
+libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
+libexec/xscreensaver/config/webcollage.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
+libexec/xscreensaver/config/winduprobot.xml
 libexec/xscreensaver/config/wormhole.xml
 libexec/xscreensaver/config/xanalogtv.xml
 libexec/xscreensaver/config/xflame.xml
@@ -147,98 +285,203 @@ libexec/xscreensaver/config/xrayswarm.xm
 libexec/xscreensaver/config/xspirograph.xml
 libexec/xscreensaver/config/zoom.xml
 libexec/xscreensaver/coral
+libexec/xscreensaver/covid19
+libexec/xscreensaver/crackberg
+libexec/xscreensaver/crumbler
 libexec/xscreensaver/crystal
+libexec/xscreensaver/cube21
+libexec/xscreensaver/cubenetic
+libexec/xscreensaver/cubestack
+libexec/xscreensaver/cubestorm
+libexec/xscreensaver/cubetwist
+libexec/xscreensaver/cubicgrid
 libexec/xscreensaver/cwaves
 libexec/xscreensaver/cynosure
+libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
+libexec/xscreensaver/deepstars
 libexec/xscreensaver/deluxe
 libexec/xscreensaver/demon
+libexec/xscreensaver/discoball
 libexec/xscreensaver/discrete
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
+libexec/xscreensaver/dymaxionmap
+libexec/xscreensaver/endgame
+libexec/xscreensaver/energystream
+libexec/xscreensaver/engine
 libexec/xscreensaver/epicycle
 libexec/xscreensaver/eruption
+libexec/xscreensaver/esper
+libexec/xscreensaver/etruscanvenus
 libexec/xscreensaver/euler2d
+libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/fiberlamp
 libexec/xscreensaver/filmleader
 libexec/xscreensaver/fireworkx
 libexec/xscreensaver/flame
+libexec/xscreensaver/flipflop
+libexec/xscreensaver/flipscreen3d
+libexec/xscreensaver/fliptext
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
+libexec/xscreensaver/flurry
+libexec/xscreensaver/flyingtoasters
 libexec/xscreensaver/fontglide
 libexec/xscreensaver/fuzzyflakes
 libexec/xscreensaver/galaxy
+libexec/xscreensaver/gears
+libexec/xscreensaver/geodesic
+libexec/xscreensaver/geodesicgears
+libexec/xscreensaver/gflux
+libexec/xscreensaver/gibson
+libexec/xscreensaver/glblur
+libexec/xscreensaver/glcells
+libexec/xscreensaver/gleidescope
+libexec/xscreensaver/glhanoi
 libexec/xscreensaver/glitchpeg
+libexec/xscreensaver/glknots
+libexec/xscreensaver/glmatrix
+libexec/xscreensaver/glplanet
+libexec/xscreensaver/glschool
+libexec/xscreensaver/glslideshow
+libexec/xscreensaver/glsnake
+libexec/xscreensaver/gltext
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
+libexec/xscreensaver/gravitywell
 libexec/xscreensaver/greynetic
 libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
+libexec/xscreensaver/handsy
+libexec/xscreensaver/headroom
 libexec/xscreensaver/helix
 libexec/xscreensaver/hexadrop
+libexec/xscreensaver/hexstrut
+libexec/xscreensaver/hilbert
 libexec/xscreensaver/hopalong
+libexec/xscreensaver/hydrostat
+libexec/xscreensaver/hypertorus
+libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/ifs
 libexec/xscreensaver/imsmap
 libexec/xscreensaver/interaggregate
 libexec/xscreensaver/interference
 libexec/xscreensaver/intermomentary
+libexec/xscreensaver/jigglypuff
+libexec/xscreensaver/jigsaw
+libexec/xscreensaver/juggler3d
 libexec/xscreensaver/julia
 libexec/xscreensaver/kaleidescope
+libexec/xscreensaver/kaleidocycle
+libexec/xscreensaver/klein
 libexec/xscreensaver/kumppa
+libexec/xscreensaver/lament
+libexec/xscreensaver/lavalite
 libexec/xscreensaver/lcdscrub
-libexec/xscreensaver/ljlatest
+libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
 libexec/xscreensaver/m6502
+libexec/xscreensaver/marbling
 libexec/xscreensaver/maze
+libexec/xscreensaver/maze3d
 libexec/xscreensaver/memscroller
+libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
+libexec/xscreensaver/mirrorblob
+libexec/xscreensaver/moebius
+libexec/xscreensaver/moebiusgears
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
+libexec/xscreensaver/molecule
+libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
 libexec/xscreensaver/nerverot
+libexec/xscreensaver/noof
 libexec/xscreensaver/noseguy
 libexec/xscreensaver/pacman
 libexec/xscreensaver/pedal
+libexec/xscreensaver/peepers
 libexec/xscreensaver/penetrate
 libexec/xscreensaver/penrose
 libexec/xscreensaver/petri
 libexec/xscreensaver/phosphor
+libexec/xscreensaver/photopile
 libexec/xscreensaver/piecewise
+libexec/xscreensaver/pinion
+libexec/xscreensaver/pipes
+libexec/xscreensaver/polyhedra
 libexec/xscreensaver/polyominoes
+libexec/xscreensaver/polytopes
 libexec/xscreensaver/pong
 libexec/xscreensaver/popsquares
+libexec/xscreensaver/projectiveplane
+libexec/xscreensaver/providence
+libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
+libexec/xscreensaver/quasicrystal
+libexec/xscreensaver/queens
+libexec/xscreensaver/raverhoop
+libexec/xscreensaver/razzledazzle
 libexec/xscreensaver/rd-bomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
+libexec/xscreensaver/romanboy
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotzoomer
+libexec/xscreensaver/rubik
+libexec/xscreensaver/rubikblocks
+libexec/xscreensaver/sballs
 libexec/xscreensaver/scooter
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
+libexec/xscreensaver/sierpinski3d
+libexec/xscreensaver/skytentacles
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
+libexec/xscreensaver/sonar
 libexec/xscreensaver/speedmine
+libexec/xscreensaver/sphereeversion
+libexec/xscreensaver/spheremonics
+libexec/xscreensaver/splitflap
+libexec/xscreensaver/splodesic
 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/substrate
+libexec/xscreensaver/superquadrics
+libexec/xscreensaver/surfaces
 libexec/xscreensaver/swirl
+libexec/xscreensaver/tangram
 libexec/xscreensaver/tessellimage
 libexec/xscreensaver/thornbird
+libexec/xscreensaver/timetunnel
+libexec/xscreensaver/topblock
 libexec/xscreensaver/triangle
+libexec/xscreensaver/tronbit
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
+libexec/xscreensaver/unicrud
+libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vfeedback
 libexec/xscreensaver/vidwhacker
+libexec/xscreensaver/vigilance
+libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
+libexec/xscreensaver/webcollage
+libexec/xscreensaver/webcollage-helper
 libexec/xscreensaver/whirlwindwarp
+libexec/xscreensaver/winduprobot
 libexec/xscreensaver/wormhole
 libexec/xscreensaver/xanalogtv
 libexec/xscreensaver/xflame
@@ -246,125 +489,251 @@ libexec/xscreensaver/xjack
 libexec/xscreensaver/xlyap
 libexec/xscreensaver/xmatrix
 libexec/xscreensaver/xrayswarm
+libexec/xscreensaver/xscreensaver-auth
+libexec/xscreensaver/xscreensaver-getimage
+libexec/xscreensaver/xscreensaver-getimage-file
+libexec/xscreensaver/xscreensaver-getimage-video
+libexec/xscreensaver/xscreensaver-gfx
+libexec/xscreensaver/xscreensaver-gl-visual
+libexec/xscreensaver/xscreensaver-text
 libexec/xscreensaver/xspirograph
 libexec/xscreensaver/zoom
 man/man1/xscreensaver-command.1
-man/man1/xscreensaver-getimage-file.1
-man/man1/xscreensaver-getimage-video.1
-man/man1/xscreensaver-getimage.1
-man/man1/xscreensaver-systemd.1
-man/man1/xscreensaver-text.1
+man/man1/xscreensaver-demo.1
+man/man1/xscreensaver-settings.1
 man/man1/xscreensaver.1
 man/man6/abstractile.6
 man/man6/anemone.6
 man/man6/anemotaxis.6
+man/man6/antinspect.6
+man/man6/antmaze.6
+man/man6/antspotlight.6
 man/man6/apollonian.6
 man/man6/apple2.6
+man/man6/atlantis.6
 man/man6/attraction.6
+man/man6/atunnel.6
 man/man6/barcode.6
+man/man6/beats.6
+man/man6/binaryhorizon.6
 man/man6/binaryring.6
 man/man6/blaster.6
+man/man6/blinkbox.6
 man/man6/blitspin.6
+man/man6/blocktube.6
+man/man6/boing.6
 man/man6/bouboule.6
+man/man6/bouncingcow.6
+man/man6/boxed.6
 man/man6/boxfit.6
 man/man6/braid.6
 man/man6/bsod.6
+man/man6/bubble3d.6
 man/man6/bumps.6
+man/man6/cage.6
+man/man6/carousel.6
 man/man6/ccurve.6
 man/man6/celtic.6
+man/man6/circuit.6
+man/man6/cityflow.6
 man/man6/cloudlife.6
+man/man6/companioncube.6
 man/man6/compass.6
 man/man6/coral.6
+man/man6/covid19.6
+man/man6/crackberg.6
+man/man6/crumbler.6
 man/man6/crystal.6
+man/man6/cube21.6
+man/man6/cubenetic.6
+man/man6/cubestack.6
+man/man6/cubestorm.6
+man/man6/cubetwist.6
+man/man6/cubicgrid.6
 man/man6/cwaves.6
 man/man6/cynosure.6
+man/man6/dangerball.6
 man/man6/decayscreen.6
 man/man6/deco.6
+man/man6/deepstars.6
 man/man6/deluxe.6
 man/man6/demon.6
+man/man6/discoball.6
 man/man6/discrete.6
 man/man6/distort.6
 man/man6/drift.6
+man/man6/dymaxionmap.6
+man/man6/endgame.6
+man/man6/energystream.6
+man/man6/engine.6
 man/man6/epicycle.6
 man/man6/eruption.6
+man/man6/esper.6
+man/man6/etruscanvenus.6
 man/man6/euler2d.6
+man/man6/extrusion.6
 man/man6/fadeplot.6
 man/man6/fiberlamp.6
 man/man6/filmleader.6
 man/man6/fireworkx.6
 man/man6/flame.6
+man/man6/flipflop.6
+man/man6/flipscreen3d.6
+man/man6/fliptext.6
 man/man6/flow.6
 man/man6/fluidballs.6
+man/man6/flurry.6
+man/man6/flyingtoasters.6
 man/man6/fontglide.6
 man/man6/fuzzyflakes.6
 man/man6/galaxy.6
+man/man6/gears.6
+man/man6/geodesic.6
+man/man6/geodesicgears.6
+man/man6/gflux.6
+man/man6/gibson.6
+man/man6/glblur.6
+man/man6/glcells.6
+man/man6/gleidescope.6
+man/man6/glhanoi.6
 man/man6/glitchpeg.6
+man/man6/glknots.6
+man/man6/glmatrix.6
+man/man6/glplanet.6
+man/man6/glschool.6
+man/man6/glslideshow.6
+man/man6/glsnake.6
+man/man6/gltext.6
 man/man6/goop.6
 man/man6/grav.6
+man/man6/gravitywell.6
 man/man6/greynetic.6
 man/man6/halftone.6
 man/man6/halo.6
+man/man6/handsy.6
+man/man6/headroom.6
 man/man6/helix.6
 man/man6/hexadrop.6
+man/man6/hexstrut.6
+man/man6/hilbert.6
 man/man6/hopalong.6
+man/man6/hydrostat.6
+man/man6/hypertorus.6
+man/man6/hypnowheel.6
 man/man6/ifs.6
 man/man6/imsmap.6
 man/man6/interaggregate.6
 man/man6/interference.6
 man/man6/intermomentary.6
+man/man6/jigglypuff.6
+man/man6/jigsaw.6
+man/man6/juggler3d.6
 man/man6/julia.6
 man/man6/kaleidescope.6
+man/man6/kaleidocycle.6
+man/man6/klein.6
 man/man6/kumppa.6
+man/man6/lament.6
+man/man6/lavalite.6
 man/man6/lcdscrub.6
-man/man6/ljlatest.6
+man/man6/lockward.6
 man/man6/loop.6
+man/man6/marbling.6
 man/man6/maze.6
+man/man6/maze3d.6
 man/man6/memscroller.6
+man/man6/menger.6
 man/man6/metaballs.6
+man/man6/mirrorblob.6
+man/man6/moebius.6
+man/man6/moebiusgears.6
 man/man6/moire.6
 man/man6/moire2.6
+man/man6/molecule.6
+man/man6/morph3d.6
 man/man6/mountain.6
 man/man6/munch.6
 man/man6/nerverot.6
+man/man6/noof.6
 man/man6/noseguy.6
 man/man6/pacman.6
 man/man6/pedal.6
+man/man6/peepers.6
 man/man6/penetrate.6
 man/man6/penrose.6
 man/man6/petri.6
 man/man6/phosphor.6
+man/man6/photopile.6
 man/man6/piecewise.6
+man/man6/pinion.6
+man/man6/pipes.6
+man/man6/polyhedra.6
 man/man6/polyominoes.6
+man/man6/polytopes.6
 man/man6/pong.6
+man/man6/projectiveplane.6
+man/man6/providence.6
+man/man6/pulsar.6
 man/man6/pyro.6
 man/man6/qix.6
+man/man6/quasicrystal.6
+man/man6/queens.6
+man/man6/raverhoop.6
+man/man6/razzledazzle.6
 man/man6/rd-bomb.6
 man/man6/ripples.6
 man/man6/rocks.6
+man/man6/romanboy.6
 man/man6/rorschach.6
 man/man6/rotzoomer.6
+man/man6/rubik.6
+man/man6/rubikblocks.6
+man/man6/sballs.6
 man/man6/scooter.6
 man/man6/shadebobs.6
 man/man6/sierpinski.6
+man/man6/sierpinski3d.6
+man/man6/skytentacles.6
 man/man6/slidescreen.6
 man/man6/slip.6
+man/man6/sonar.6
 man/man6/speedmine.6
+man/man6/sphereeversion.6
+man/man6/spheremonics.6
+man/man6/splitflap.6
+man/man6/splodesic.6
 man/man6/spotlight.6
+man/man6/sproingies.6
 man/man6/squiral.6
+man/man6/stairs.6
 man/man6/starfish.6
+man/man6/starwars.6
+man/man6/stonerview.6
 man/man6/strange.6
 man/man6/substrate.6
+man/man6/superquadrics.6
+man/man6/surfaces.6
 man/man6/swirl.6
+man/man6/tangram.6
 man/man6/tessellimage.6
 man/man6/thornbird.6
+man/man6/timetunnel.6
+man/man6/topblock.6
 man/man6/triangle.6
+man/man6/tronbit.6
 man/man6/truchet.6
 man/man6/twang.6
+man/man6/unicrud.6
+man/man6/unknownpleasures.6
 man/man6/vermiculate.6
 man/man6/vfeedback.6
 man/man6/vidwhacker.6
+man/man6/vigilance.6
+man/man6/voronoi.6
 man/man6/wander.6
+man/man6/webcollage.6
 man/man6/whirlwindwarp.6
+man/man6/winduprobot.6
 man/man6/wormhole.6
 man/man6/xanalogtv.6
 man/man6/xflame.6
@@ -372,9 +741,23 @@ man/man6/xjack.6
 man/man6/xlyap.6
 man/man6/xmatrix.6
 man/man6/xrayswarm.6
+man/man6/xscreensaver-auth.6
+man/man6/xscreensaver-getimage-file.6
+man/man6/xscreensaver-getimage-video.6
+man/man6/xscreensaver-getimage.6
+man/man6/xscreensaver-gfx.6
+man/man6/xscreensaver-gl-visual.6
+man/man6/xscreensaver-systemd.6
+man/man6/xscreensaver-text.6
 man/man6/xspirograph.6
 man/man6/zoom.6
+share/applications/xscreensaver-properties.desktop
 share/doc/xscreensaver/README.pkgsrc
+share/fonts/xscreensaver/OCRAStd.otf
+share/fonts/xscreensaver/SpecialElite.ttf
+share/fonts/xscreensaver/clacon.ttf
+share/fonts/xscreensaver/gallant12x22.ttf
+share/fonts/xscreensaver/luximr.ttf
 share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/LC_MESSAGES/xscreensaver.mo
 share/locale/es/LC_MESSAGES/xscreensaver.mo
@@ -397,3 +780,11 @@ share/locale/vi/LC_MESSAGES/xscreensaver
 share/locale/wa/LC_MESSAGES/xscreensaver.mo
 share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
 share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
+share/pixmaps/xscreensaver.xpm
+share/xscreensaver/ui/screensaver-cmndln.png
+share/xscreensaver/ui/screensaver-colorselector.png
+share/xscreensaver/ui/screensaver-diagnostic.png
+share/xscreensaver/ui/screensaver-locking.png
+share/xscreensaver/ui/screensaver-power.png
+share/xscreensaver/ui/screensaver-snap.png
+share/xscreensaver/ui/xscreensaver.ui

Index: pkgsrc/x11/xscreensaver/distinfo
diff -u pkgsrc/x11/xscreensaver/distinfo:1.85 pkgsrc/x11/xscreensaver/distinfo:1.86
--- pkgsrc/x11/xscreensaver/distinfo:1.85       Tue Oct 26 11:34:56 2021
+++ pkgsrc/x11/xscreensaver/distinfo    Thu Feb 17 15:46:52 2022
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.85 2021/10/26 11:34:56 nia Exp $
+$NetBSD: distinfo,v 1.86 2022/02/17 15:46:52 wiz Exp $
 
-BLAKE2s (xscreensaver/xscreensaver-5.45.tar.gz) = d01e3bf3ce75949ef8dc580522a06da6f7192ea5c792cf4e118275d43d99187e
-SHA512 (xscreensaver/xscreensaver-5.45.tar.gz) = 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
-Size (xscreensaver/xscreensaver-5.45.tar.gz) = 27729147 bytes
-SHA1 (patch-ad) = 675b8e30b08b64279d0112cdc7b202878736a6d1
-SHA1 (patch-af) = 4ee300a205a0ac448939ac2776087db48d808ad8
-SHA1 (patch-driver_screens.c) = 22d197b0ca42f531cdc4de5222c3e93f2877915a
-SHA1 (patch-hacks_Makefile.in) = 8dbc1c4674c1c10cdaa7954b019384505977cb69
-SHA1 (patch-hacks_images_Makefile.in) = bc071812df74cbb6826cfb65bad4dfcf94e0d68d
-SHA1 (patch-utils_Makefile.in) = 785112970eb71334d89e560b2b251e5053374748
+BLAKE2s (xscreensaver/xscreensaver-6.02.tar.gz) = 080ff4236605bd59b82c6dc1f3da8120848d66468e5218c00e4230d29cb51d27
+SHA512 (xscreensaver/xscreensaver-6.02.tar.gz) = 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
+Size (xscreensaver/xscreensaver-6.02.tar.gz) = 22672643 bytes

Index: pkgsrc/x11/xscreensaver/options.mk
diff -u pkgsrc/x11/xscreensaver/options.mk:1.12 pkgsrc/x11/xscreensaver/options.mk:1.13
--- pkgsrc/x11/xscreensaver/options.mk:1.12     Wed May  1 02:51:49 2019
+++ pkgsrc/x11/xscreensaver/options.mk  Thu Feb 17 15:46:52 2022
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.12 2019/05/01 02:51:49 gutteridge Exp $
+# $NetBSD: options.mk,v 1.13 2022/02/17 15:46:52 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
-PKG_SUPPORTED_OPTIONS= pam webcollage opengl
-PKG_SUGGESTED_OPTIONS= opengl
+PKG_SUPPORTED_OPTIONS= pam
+PKG_SUGGESTED_OPTIONS= pam
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,25 +20,3 @@ CONFIGURE_ARGS+=     --without-pam
 #CONFIGURE_ARGS+=      --without-shadow
 SPECIAL_PERMS+=                bin/xscreensaver ${SETUID_ROOT_PERMS}
 .endif
-
-PLIST_SRC+=    PLIST
-.if !empty(PKG_OPTIONS:Mwebcollage)
-PLIST_SRC+=    PLIST.webcollage
-.else
-.PHONY: delwebcollage
-post-install: delwebcollage
-delwebcollage:
-       rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/config/webcollage.xml
-       rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/webcollage
-       rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/webcollage.6
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
-PLIST_SRC+=            PLIST.opengl
-CONFIGURE_ARGS+=       --with-gl
-CONFIGURE_ARGS+=       --with-gle
-.include "../../graphics/gle/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-gl
-CONFIGURE_ARGS+=       --without-gle
-.endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index