CVS commit: pkgsrc/x11/xscreensaver

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar  8 07:27:11 UTC 2022

Modified Files:
        pkgsrc/x11/xscreensaver: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/xscreensaver/patches: patch-configure
Removed Files:
        pkgsrc/x11/xscreensaver/patches: patch-hacks_marbling.c

Log Message:
xscreensaver: update to 6.03.

6.03    * New hack, `squirtorus'.
        * New hack, `mapscroller' (X11 and macOS only).
        * `sphereeversion' now has corrugation-mode, and can evert the Earth.
        * `glplanet' is higher resolution, and displays time zones.
        * `glslideshow' displays relative pathnames again.
        * iOS: Apple broke drag-to-rotate again. Fixed.
        * macOS: fixed spurious error message in auto-update installer.
        * X11: fixed `sonar' failing to ping on some Linux systems.
        * X11: Touch-screens work.
        * X11: Hold down Backspace to clear the whole password field.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -u -r1.87 -r1.88 pkgsrc/x11/xscreensaver/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xscreensaver/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xscreensaver/patches/patch-hacks_marbling.c

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.135 pkgsrc/x11/xscreensaver/Makefile:1.136
--- pkgsrc/x11/xscreensaver/Makefile:1.135      Fri Feb 18 22:58:05 2022
+++ pkgsrc/x11/xscreensaver/Makefile    Tue Mar  8 07:27:11 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.135 2022/02/18 22:58:05 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2022/03/08 07:27:11 wiz Exp $
 
-DISTNAME=              xscreensaver-6.02
-PKGREVISION=           2
+DISTNAME=              xscreensaver-6.03
 CATEGORIES=            x11
 MASTER_SITES=          https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=           xscreensaver
@@ -13,7 +12,7 @@ HOMEPAGE=             https://www.jwz.org/xscreensa
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c99
-USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=            gmake intltool msgfmt perl:run pkg-config
 
 CHECK_PORTABILITY_SKIP+=       OSX/fuzztest.sh
 CHECK_PORTABILITY_SKIP+=       OSX/installer.sh
@@ -53,6 +52,8 @@ INSTALL_MAKE_FLAGS=   install_prefix=${DES
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}
 
+REPLACE_PERL+= hacks/*.pl hacks/*/*.pl
+
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 

Index: pkgsrc/x11/xscreensaver/PLIST
diff -u pkgsrc/x11/xscreensaver/PLIST:1.53 pkgsrc/x11/xscreensaver/PLIST:1.54
--- pkgsrc/x11/xscreensaver/PLIST:1.53  Thu Feb 17 15:46:52 2022
+++ pkgsrc/x11/xscreensaver/PLIST       Tue Mar  8 07:27:11 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2022/02/17 15:46:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.54 2022/03/08 07:27:11 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -178,6 +178,7 @@ libexec/xscreensaver/config/lcdscrub.xml
 libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/m6502.xml
+libexec/xscreensaver/config/mapscroller.xml
 libexec/xscreensaver/config/marbling.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/maze3d.xml
@@ -221,7 +222,7 @@ libexec/xscreensaver/config/quasicrystal
 libexec/xscreensaver/config/queens.xml
 libexec/xscreensaver/config/raverhoop.xml
 libexec/xscreensaver/config/razzledazzle.xml
-libexec/xscreensaver/config/rd-bomb.xml
+libexec/xscreensaver/config/rdbomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
 libexec/xscreensaver/config/romanboy.xml
@@ -246,6 +247,7 @@ libexec/xscreensaver/config/splodesic.xm
 libexec/xscreensaver/config/spotlight.xml
 libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.xml
+libexec/xscreensaver/config/squirtorus.xml
 libexec/xscreensaver/config/stairs.xml
 libexec/xscreensaver/config/starfish.xml
 libexec/xscreensaver/config/starwars.xml
@@ -384,6 +386,8 @@ libexec/xscreensaver/lcdscrub
 libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
 libexec/xscreensaver/m6502
+libexec/xscreensaver/mapscroller
+libexec/xscreensaver/mapscroller.pl
 libexec/xscreensaver/marbling
 libexec/xscreensaver/maze
 libexec/xscreensaver/maze3d
@@ -427,7 +431,7 @@ libexec/xscreensaver/quasicrystal
 libexec/xscreensaver/queens
 libexec/xscreensaver/raverhoop
 libexec/xscreensaver/razzledazzle
-libexec/xscreensaver/rd-bomb
+libexec/xscreensaver/rdbomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
 libexec/xscreensaver/romanboy
@@ -452,6 +456,7 @@ libexec/xscreensaver/splodesic
 libexec/xscreensaver/spotlight
 libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
+libexec/xscreensaver/squirtorus
 libexec/xscreensaver/stairs
 libexec/xscreensaver/starfish
 libexec/xscreensaver/starwars
@@ -638,6 +643,7 @@ man/man6/lavalite.6
 man/man6/lcdscrub.6
 man/man6/lockward.6
 man/man6/loop.6
+man/man6/mapscroller.6
 man/man6/marbling.6
 man/man6/maze.6
 man/man6/maze3d.6
@@ -680,7 +686,7 @@ man/man6/quasicrystal.6
 man/man6/queens.6
 man/man6/raverhoop.6
 man/man6/razzledazzle.6
-man/man6/rd-bomb.6
+man/man6/rdbomb.6
 man/man6/ripples.6
 man/man6/rocks.6
 man/man6/romanboy.6
@@ -705,6 +711,7 @@ man/man6/splodesic.6
 man/man6/spotlight.6
 man/man6/sproingies.6
 man/man6/squiral.6
+man/man6/squirtorus.6
 man/man6/stairs.6
 man/man6/starfish.6
 man/man6/starwars.6
@@ -758,28 +765,6 @@ share/fonts/xscreensaver/SpecialElite.tt
 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
-share/locale/et/LC_MESSAGES/xscreensaver.mo
-share/locale/fi/LC_MESSAGES/xscreensaver.mo
-share/locale/fr/LC_MESSAGES/xscreensaver.mo
-share/locale/hu/LC_MESSAGES/xscreensaver.mo
-share/locale/it/LC_MESSAGES/xscreensaver.mo
-share/locale/ja/LC_MESSAGES/xscreensaver.mo
-share/locale/ko/LC_MESSAGES/xscreensaver.mo
-share/locale/nb/LC_MESSAGES/xscreensaver.mo
-share/locale/nl/LC_MESSAGES/xscreensaver.mo
-share/locale/pl/LC_MESSAGES/xscreensaver.mo
-share/locale/pt/LC_MESSAGES/xscreensaver.mo
-share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
-share/locale/sk/LC_MESSAGES/xscreensaver.mo
-share/locale/sv/LC_MESSAGES/xscreensaver.mo
-share/locale/vi/LC_MESSAGES/xscreensaver.mo
-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

Index: pkgsrc/x11/xscreensaver/distinfo
diff -u pkgsrc/x11/xscreensaver/distinfo:1.87 pkgsrc/x11/xscreensaver/distinfo:1.88
--- pkgsrc/x11/xscreensaver/distinfo:1.87       Sat Feb 19 17:58:21 2022
+++ pkgsrc/x11/xscreensaver/distinfo    Tue Mar  8 07:27:11 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.87 2022/02/19 17:58:21 wiz Exp $
+$NetBSD: distinfo,v 1.88 2022/03/08 07:27:11 wiz Exp $
 
-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
-SHA1 (patch-hacks_marbling.c) = 55be2ea8e788094bf4b15e7bfe0b6858b6a33a79
+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
+SHA1 (patch-configure) = 4821b6f4400976990b6042677960a53e25f03a24

Added files:

Index: pkgsrc/x11/xscreensaver/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xscreensaver/patches/patch-configure:1.1
--- /dev/null   Tue Mar  8 07:27:11 2022
+++ pkgsrc/x11/xscreensaver/patches/patch-configure     Tue Mar  8 07:27:11 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2022/03/08 07:27:11 wiz Exp $
+
+configure script is overzealous.
+
+--- configure.orig     2022-02-27 21:30:07.732273168 +0000
++++ configure
+@@ -21135,7 +21135,6 @@ elif test "$have_pam" = no ; then
+   if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+     warn  "Your system seems to have PAM, but PAM is not being used."
+     warn2 "That is probably not going to work out well."
+-    CONF_STATUS=1
+   fi
+ fi
+