Updated xscreensaver to 5.35.

5.35	24-May-2016

    New hacks, dymaxionmap, unicrud, energystream, raverhoop and
    hydrostat.
    Added Windows 10 to bsod.
    X11: ignore WM_USER_TIME property changes with days-old timestamps.
    Thanks, KDE.
    MacOS, iOS: Better fonts in BSOD and memscroller.
    MacOS 10.7 or later and iOS 6.0 or later are now required, since
    Xcode 6 can no longer build executables that work on older OSes.
    Many, many Android improvements.
    iOS: Fixed rotation to work with the new iOS 8+ API.
    X11: pong is now playable.

5 files changed, 58 insertions, 9 deletions

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 6b4ce419406..8bfe96bf889 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.118 2015/10/25 09:22:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.119 2016/06/06 12:41:42 wiz Exp $
 #
 # used by x11/xscreensaver/Makefile
 # used by x11/xscreensaver-demo/Makefile
@@ -6,9 +6,9 @@
 # When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=		xscreensaver-5.34
+DISTNAME=		xscreensaver-5.35
 CATEGORIES=		x11
-MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES=		https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=		xscreensaver
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -20,6 +20,8 @@ USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_TOOLS+=		msgfmt perl
 
+CHECK_PORTABILITY_SKIP+=	OSX/fuzztest.sh
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index b4fa085d1cc..90c7fe6eb2a 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2015/07/02 18:47:57 khorben Exp $
+@comment $NetBSD: PLIST,v 1.43 2016/06/06 12:41:42 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -95,7 +95,9 @@ libexec/xscreensaver/config/demon.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
@@ -139,6 +141,7 @@ libexec/xscreensaver/config/helix.xml
 libexec/xscreensaver/config/hexadrop.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
@@ -198,6 +201,7 @@ 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/rd-bomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
@@ -238,6 +242,7 @@ 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/vidwhacker.xml
@@ -271,7 +276,9 @@ libexec/xscreensaver/demon
 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
@@ -315,6 +322,7 @@ libexec/xscreensaver/helix
 libexec/xscreensaver/hexadrop
 libexec/xscreensaver/hilbert
 libexec/xscreensaver/hopalong
+libexec/xscreensaver/hydrostat
 libexec/xscreensaver/hypertorus
 libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/ifs
@@ -375,6 +383,7 @@ libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
 libexec/xscreensaver/quasicrystal
 libexec/xscreensaver/queens
+libexec/xscreensaver/raverhoop
 libexec/xscreensaver/rd-bomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
@@ -415,6 +424,7 @@ libexec/xscreensaver/triangle
 libexec/xscreensaver/tronbit
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
+libexec/xscreensaver/unicrud
 libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
@@ -489,7 +499,9 @@ man/man6/demon.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
@@ -533,6 +545,7 @@ man/man6/helix.6
 man/man6/hexadrop.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
@@ -591,6 +604,7 @@ man/man6/pyro.6
 man/man6/qix.6
 man/man6/quasicrystal.6
 man/man6/queens.6
+man/man6/raverhoop.6
 man/man6/rd-bomb.6
 man/man6/ripples.6
 man/man6/rocks.6
@@ -631,6 +645,7 @@ 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/vidwhacker.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index a7f8e64e8cf..f25ddfbab54 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2015/10/25 09:22:59 wiz Exp $
+$NetBSD: distinfo,v 1.71 2016/06/06 12:41:42 wiz Exp $
 
-SHA1 (xscreensaver/xscreensaver-5.34.tar.gz) = a6d9a391981730cedcd51e75c35ffb4101928cc2
-RMD160 (xscreensaver/xscreensaver-5.34.tar.gz) = e417a576f4f1aee9ff41d85d20d6f20f4508d1e4
-SHA512 (xscreensaver/xscreensaver-5.34.tar.gz) = 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75
-Size (xscreensaver/xscreensaver-5.34.tar.gz) = 10788657 bytes
+SHA1 (xscreensaver/xscreensaver-5.35.tar.gz) = 2918e9db7a6d24189c5bcc401cec2d3adbee644b
+RMD160 (xscreensaver/xscreensaver-5.35.tar.gz) = 61bfe99a9f15bb84806d2e119c7ce23f7a17d195
+SHA512 (xscreensaver/xscreensaver-5.35.tar.gz) = 3be3445c8cb4c6f88f713ead2bda4c74387558c7ceb0a2be47925d75b6fba585b9ae4c56c03060eb2e543e29b5b46e65c0d9ef469e73d25eeb5d97ba4ee58dcd
+Size (xscreensaver/xscreensaver-5.35.tar.gz) = 10502468 bytes
 SHA1 (patch-ab) = c520709327ae6bf500243ca044e84a2d527ddf1d
 SHA1 (patch-ac) = 2355a2954c61db134e623ab0656c2bb2f9e6238a
 SHA1 (patch-ad) = 33e41981d9b703dcec0df9f238a5e440d1401dff
@@ -13,3 +13,5 @@ SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
 SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
 SHA1 (patch-ak) = e87576d457b9d5344f48bca2a6c9894d8290ce39
 SHA1 (patch-al) = 2d19b2aa5100424a00b260b53916d58ac14e0051
+SHA1 (patch-hacks_glx_molecules.sh) = 33f70ad05de992ed9210b99031146da356095553
+SHA1 (patch-hacks_m6502.sh) = b296cf2b7bf48196c7012285f68cff7a3323e938
diff --git a/x11/xscreensaver/patches/patch-hacks_glx_molecules.sh b/x11/xscreensaver/patches/patch-hacks_glx_molecules.sh
new file mode 100644
index 00000000000..207cf1923d4
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-hacks_glx_molecules.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-hacks_glx_molecules.sh,v 1.1 2016/06/06 12:41:42 wiz Exp $
+
+NetBSD's sh(1) does not recognize the ERR signal.
+
+--- hacks/glx/molecules.sh.orig	2016-04-08 03:58:54.000000000 +0000
++++ hacks/glx/molecules.sh
+@@ -6,7 +6,7 @@ SRCS=$*
+ 
+ TMP=molecules.h.$$
+ rm -f $TMP
+-trap "rm -f $TMP" 1 2 3 15 ERR EXIT
++trap "rm -f $TMP" 1 2 3 15 EXIT
+ 
+ if [ -z "$UTILS_SRC" ]; then UTILS_SRC="../../utils"; fi
+ 
diff --git a/x11/xscreensaver/patches/patch-hacks_m6502.sh b/x11/xscreensaver/patches/patch-hacks_m6502.sh
new file mode 100644
index 00000000000..8d7fe294c06
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-hacks_m6502.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-hacks_m6502.sh,v 1.1 2016/06/06 12:41:42 wiz Exp $
+
+NetBSD's sh(1) does not recognize the ERR signal.
+
+--- hacks/m6502.sh.orig	2016-04-08 03:58:51.000000000 +0000
++++ hacks/m6502.sh
+@@ -7,7 +7,7 @@ SRCS=$*
+ TMP1=m6502.h.1.$$
+ TMP2=m6502.h.2.$$
+ rm -f $TMP1 $TMP2
+-trap "rm -f $TMP1 $TMP2" 1 2 3 15 ERR EXIT
++trap "rm -f $TMP1 $TMP2" 1 2 3 15 EXIT
+ 
+ if [ -z "$UTILS_SRC" ]; then UTILS_SRC="../utils"; fi
+