CVS commit: pkgsrc/x11/xscreensaver

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 16 07:33:39 UTC 2017

Modified Files:
        pkgsrc/x11/xscreensaver: Makefile Makefile.common PLIST distinfo
        pkgsrc/x11/xscreensaver/patches: patch-ad patch-af
Removed Files:
        pkgsrc/x11/xscreensaver/patches: patch-ab patch-ac patch-aj patch-ak
            patch-al

Log Message:
Updated xscreensaver to 5.37.

Most patches merged upstream.

5.37    05-Jul-2017

    New hack, vigilance.
    Added Mac Software Update and VMware to bsod.
    OSX: Grabbing the desktop works again.
    OSX: Pinch to zoom.
    Android: Both Daydreams and Live Wallpapers are implemented.
    Updated webcollage for recent changes.
    Various bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/x11/xscreensaver/Makefile.common
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/x11/xscreensaver/distinfo
cvs rdiff -u -r1.22 -r0 pkgsrc/x11/xscreensaver/patches/patch-ab
cvs rdiff -u -r1.26 -r0 pkgsrc/x11/xscreensaver/patches/patch-ac
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xscreensaver/patches/patch-ad
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xscreensaver/patches/patch-af
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xscreensaver/patches/patch-aj \
    pkgsrc/x11/xscreensaver/patches/patch-al
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xscreensaver/patches/patch-ak

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.109 pkgsrc/x11/xscreensaver/Makefile:1.110
--- pkgsrc/x11/xscreensaver/Makefile:1.109      Wed Oct 19 20:10:20 2016
+++ pkgsrc/x11/xscreensaver/Makefile    Wed Aug 16 07:33:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2016/10/19 20:10:20 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2017/08/16 07:33:39 wiz Exp $
 
 COMMENT=       Screen saver and locker for the X window system
 
@@ -15,10 +15,8 @@ CONFIGURE_ARGS+=     --with-configdir=${PREF
 EGDIR=                 ${PREFIX}/share/examples/xscreensaver
 MESSAGE_SUBST+=                EGDIR=${EGDIR:Q}
 
-# Remove useless locale files that have no translations in them.
 # use pipes from 5.17, the new version is too slow
 post-extract:
-       cd ${WRKSRC}/po && ${RM} -f ca.po
        ${CP} ${FILESDIR}/pipes.c ${WRKSRC}/hacks/glx
 
 INSTALLATION_DIRS=     ${EGDIR}/pam.d

Index: pkgsrc/x11/xscreensaver/Makefile.common
diff -u pkgsrc/x11/xscreensaver/Makefile.common:1.120 pkgsrc/x11/xscreensaver/Makefile.common:1.121
--- pkgsrc/x11/xscreensaver/Makefile.common:1.120       Wed Oct 19 20:10:20 2016
+++ pkgsrc/x11/xscreensaver/Makefile.common     Wed Aug 16 07:33:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.120 2016/10/19 20:10:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.121 2017/08/16 07:33:39 wiz Exp $
 #
 # used by x11/xscreensaver/Makefile
 # used by x11/xscreensaver-demo/Makefile
@@ -6,7 +6,7 @@
 # When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=              xscreensaver-5.36
+DISTNAME=              xscreensaver-5.37
 CATEGORIES=            x11
 MASTER_SITES=          https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=           xscreensaver

Index: pkgsrc/x11/xscreensaver/PLIST
diff -u pkgsrc/x11/xscreensaver/PLIST:1.44 pkgsrc/x11/xscreensaver/PLIST:1.45
--- pkgsrc/x11/xscreensaver/PLIST:1.44  Wed Oct 19 20:10:20 2016
+++ pkgsrc/x11/xscreensaver/PLIST       Wed Aug 16 07:33:39 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2016/10/19 20:10:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.45 2017/08/16 07:33:39 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -251,6 +251,7 @@ libexec/xscreensaver/config/unicrud.xml
 libexec/xscreensaver/config/unknownpleasures.xml
 libexec/xscreensaver/config/vermiculate.xml
 libexec/xscreensaver/config/vidwhacker.xml
+libexec/xscreensaver/config/vigilance.xml
 libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
@@ -438,6 +439,7 @@ libexec/xscreensaver/unicrud
 libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
+libexec/xscreensaver/vigilance
 libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
@@ -664,6 +666,7 @@ man/man6/unicrud.6
 man/man6/unknownpleasures.6
 man/man6/vermiculate.6
 man/man6/vidwhacker.6
+man/man6/vigilance.6
 man/man6/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6

Index: pkgsrc/x11/xscreensaver/distinfo
diff -u pkgsrc/x11/xscreensaver/distinfo:1.73 pkgsrc/x11/xscreensaver/distinfo:1.74
--- pkgsrc/x11/xscreensaver/distinfo:1.73       Wed Oct 19 20:22:31 2016
+++ pkgsrc/x11/xscreensaver/distinfo    Wed Aug 16 07:33:39 2017
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.73 2016/10/19 20:22:31 wiz Exp $
+$NetBSD: distinfo,v 1.74 2017/08/16 07:33:39 wiz Exp $
 
-SHA1 (xscreensaver/xscreensaver-5.36.tar.gz) = 0353cbe76cb5e8aa55d0142d8733bf2924772f95
-RMD160 (xscreensaver/xscreensaver-5.36.tar.gz) = a2135868fd22893099364e3ff1f7c4ffc3519fe0
-SHA512 (xscreensaver/xscreensaver-5.36.tar.gz) = 4f476135bbfdce0593bb6e5a6a48dd474fcce6031214ffbb3d43dc91bb8e1a28b3e59fc960d5f1a9ac0bdd3dc4531da26679bffbe47b7fb00b67ad74295b40f7
-Size (xscreensaver/xscreensaver-5.36.tar.gz) = 10600872 bytes
-SHA1 (patch-ab) = c520709327ae6bf500243ca044e84a2d527ddf1d
-SHA1 (patch-ac) = 2355a2954c61db134e623ab0656c2bb2f9e6238a
-SHA1 (patch-ad) = 33e41981d9b703dcec0df9f238a5e440d1401dff
-SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
-SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
-SHA1 (patch-ak) = e87576d457b9d5344f48bca2a6c9894d8290ce39
-SHA1 (patch-al) = 2d19b2aa5100424a00b260b53916d58ac14e0051
+SHA1 (xscreensaver/xscreensaver-5.37.tar.gz) = 22e438589c25a485a12ba5ae8462e38c5f5f0e07
+RMD160 (xscreensaver/xscreensaver-5.37.tar.gz) = 301c3ec03e76fee84801034ffd9cc01963942bff
+SHA512 (xscreensaver/xscreensaver-5.37.tar.gz) = 9bef3caf4eb495bebb4c1818ed0bb222be28a7a8d525e2bce70e92d7617bc8cf89750dfaa8cf7a3cd0c489b4831c95f9ff8a0164579cf047aa63681254c8e443
+Size (xscreensaver/xscreensaver-5.37.tar.gz) = 10598833 bytes
+SHA1 (patch-ad) = ff03b044ca82964c3b9535b84a7dcca6d5f8f1bb
+SHA1 (patch-af) = 4ee300a205a0ac448939ac2776087db48d808ad8

Index: pkgsrc/x11/xscreensaver/patches/patch-ad
diff -u pkgsrc/x11/xscreensaver/patches/patch-ad:1.23 pkgsrc/x11/xscreensaver/patches/patch-ad:1.24
--- pkgsrc/x11/xscreensaver/patches/patch-ad:1.23       Tue Aug 12 15:57:14 2014
+++ pkgsrc/x11/xscreensaver/patches/patch-ad    Wed Aug 16 07:33:39 2017
@@ -1,16 +1,9 @@
-$NetBSD: patch-ad,v 1.23 2014/08/12 15:57:14 hauke Exp $
+$NetBSD: patch-ad,v 1.24 2017/08/16 07:33:39 wiz Exp $
 
---- driver/Makefile.in.orig    2014-06-08 21:43:53.000000000 +0000
+Do not unconditionally install xscreensaver-demo nor GNOME files.
+
+--- driver/Makefile.in.orig    2017-07-05 17:52:56.000000000 +0000
 +++ driver/Makefile.in
-@@ -205,7 +205,7 @@ PDF2JPEG_LIBS      = -framework Cocoa
- SAVER_LIBS    = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
-                 $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
-                 -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
--                $(PASSWD_LIBS)
-+                $(PASSWD_LIBS) $(INTL_LIBS)
- 
- CMD_LIBS      = $(LIBS) $(X_LIBS) \
-                 $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
 @@ -226,7 +226,7 @@ SCRIPTS            = $(SCRIPTS_1) @SCRIPTS_OSX@
  HDRS          = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
                  xscreensaver.h prefs.h remote.h exec.h \
@@ -34,7 +27,7 @@ $NetBSD: patch-ad,v 1.23 2014/08/12 15:5
        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                                   \
++      @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 ; \

Index: pkgsrc/x11/xscreensaver/patches/patch-af
diff -u pkgsrc/x11/xscreensaver/patches/patch-af:1.14 pkgsrc/x11/xscreensaver/patches/patch-af:1.15
--- pkgsrc/x11/xscreensaver/patches/patch-af:1.14       Tue Jul 18 18:40:36 2006
+++ pkgsrc/x11/xscreensaver/patches/patch-af    Wed Aug 16 07:33:39 2017
@@ -1,19 +1,14 @@
-$NetBSD: patch-af,v 1.14 2006/07/18 18:40:36 wiz Exp $
+$NetBSD: patch-af,v 1.15 2017/08/16 07:33:39 wiz Exp $
 
 Make the password dialogue banner display the netbsd PKGREVISION
 number, if there was one.
 
---- driver/xscreensaver.c.orig 2006-05-17 23:35:54.000000000 +0000
+--- driver/xscreensaver.c.orig 2017-04-18 00:55:03.000000000 +0000
 +++ driver/xscreensaver.c
-@@ -448,9 +448,13 @@ set_version_string (saver_info *si, int 
-       *s = '_';
-   }
- 
--  si->version = (char *) malloc (5);
-+  si->version = (char *) malloc (32);
+@@ -533,6 +533,9 @@ set_version_string (saver_info *si, int 
+   si->version = (char *) malloc (32);
    memcpy (si->version, screensaver_id + 17, 4);
    si->version [4] = 0;
-+
 +#if PKGREVISION > 0
 +  (void)snprintf(si->version, 10, "%.4snb%d", screensaver_id + 17, PKGREVISION);
 +#endif