xscreensaver: update to 6.04.

New hacks, nakagin and chompytower.
Settings dialog shows diagnostics for bad image folders and feeds.
URLs for imageDirectory can now point at archive.org collections.
Sliders for various “Speed” preferences are easier to use.
X11: Settings dialog shows saver description below embedded preview.
X11: Better behavior when zero monitors are attached.
X11: Improvements to inhibiting blanking while videos are playing: No longer necessary to hack GNOME and KDE to get them to not usurp the org.freedesktop.ScreenSaver endpoint.
X11: unicrud displays character names.
Updated webcollage.

3 files changed, 17 insertions, 11 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index d44893a6635..e304699853a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.140 2022/05/31 08:14:44 abs Exp $
+# $NetBSD: Makefile,v 1.141 2022/06/13 09:46:47 wiz Exp $
 
-DISTNAME=		xscreensaver-6.03
-PKGREVISION=		3
+DISTNAME=		xscreensaver-6.04
 CATEGORIES=		x11
 MASTER_SITES=		https://www.jwz.org/xscreensaver/
-DIST_SUBDIR=		xscreensaver
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Screen saver and locker for the X window system
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 9de09a49c42..3310123f03f 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.55 2022/05/11 10:29:48 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.56 2022/06/13 09:46:47 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -36,6 +36,7 @@ libexec/xscreensaver/cage
 libexec/xscreensaver/carousel
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/celtic
+libexec/xscreensaver/chompytower
 libexec/xscreensaver/circuit
 libexec/xscreensaver/cityflow
 libexec/xscreensaver/cloudlife
@@ -74,6 +75,7 @@ libexec/xscreensaver/config/cage.xml
 libexec/xscreensaver/config/carousel.xml
 libexec/xscreensaver/config/ccurve.xml
 libexec/xscreensaver/config/celtic.xml
+libexec/xscreensaver/config/chompytower.xml
 libexec/xscreensaver/config/circuit.xml
 libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/cloudlife.xml
@@ -195,6 +197,7 @@ libexec/xscreensaver/config/molecule.xml
 libexec/xscreensaver/config/morph3d.xml
 libexec/xscreensaver/config/mountain.xml
 libexec/xscreensaver/config/munch.xml
+libexec/xscreensaver/config/nakagin.xml
 libexec/xscreensaver/config/nerverot.xml
 libexec/xscreensaver/config/noof.xml
 libexec/xscreensaver/config/noseguy.xml
@@ -404,6 +407,7 @@ libexec/xscreensaver/molecule
 libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
+libexec/xscreensaver/nakagin
 libexec/xscreensaver/nerverot
 libexec/xscreensaver/noof
 libexec/xscreensaver/noseguy
@@ -540,6 +544,7 @@ man/man6/cage.6
 man/man6/carousel.6
 man/man6/ccurve.6
 man/man6/celtic.6
+man/man6/chompytower.6
 man/man6/circuit.6
 man/man6/cityflow.6
 man/man6/cloudlife.6
@@ -660,6 +665,7 @@ man/man6/molecule.6
 man/man6/morph3d.6
 man/man6/mountain.6
 man/man6/munch.6
+man/man6/nakagin.6
 man/man6/nerverot.6
 man/man6/noof.6
 man/man6/noseguy.6
@@ -759,14 +765,15 @@ man/man6/xscreensaver-systemd.6
 man/man6/xscreensaver-text.6
 man/man6/xspirograph.6
 man/man6/zoom.6
-share/applications/xscreensaver-properties.desktop
+share/applications/xscreensaver-settings.desktop
+share/applications/xscreensaver.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/pixmaps/xscreensaver.xpm
+share/pixmaps/xscreensaver.png
 share/xscreensaver/ui/screensaver-cmndln.png
 share/xscreensaver/ui/screensaver-colorselector.png
 share/xscreensaver/ui/screensaver-diagnostic.png
@@ -774,3 +781,4 @@ share/xscreensaver/ui/screensaver-locking.png
 share/xscreensaver/ui/screensaver-power.png
 share/xscreensaver/ui/screensaver-snap.png
 share/xscreensaver/ui/xscreensaver.ui
+share/xscreensaver/xscreensaver.service
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index f1c4781f8ff..279cbbc6360 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.89 2022/05/31 08:14:44 abs Exp $
+$NetBSD: distinfo,v 1.90 2022/06/13 09:46:47 wiz Exp $
 
-BLAKE2s (xscreensaver/xscreensaver-6.03.tar.gz) = de81815922c9ae70ea281c694d414b0fa6d88a597755f68d96a596423641b0ce
-SHA512 (xscreensaver/xscreensaver-6.03.tar.gz) = 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
-Size (xscreensaver/xscreensaver-6.03.tar.gz) = 25703584 bytes
+BLAKE2s (xscreensaver-6.04.tar.gz) = 6b96ca53961edbd0c1ea97096920d769702a340d442b34f143182e3a2e25e7b8
+SHA512 (xscreensaver-6.04.tar.gz) = 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
+Size (xscreensaver-6.04.tar.gz) = 26112437 bytes
 SHA1 (patch-configure) = 4821b6f4400976990b6042677960a53e25f03a24
 SHA1 (patch-driver_passwd-pwent.c) = 599a63eda4b890d4673b0e2763d980afb4d44a4e