Updated xscreensaver to 5.36.

    New hacks, discoball, cubetwist, cubestack, splodesic and hexstrut.
    OSX: loading image files works in dymaxionmap, glplanet, lavalite, pulsar, gleidescope and extrusion.
    Several new programs in m6502.
    rotzoomer -mode circle.
    Better titles in photopile.

6 files changed, 24 insertions, 42 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 9268f74b805..332ef51b4de 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2016/07/09 06:39:18 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2016/10/19 20:10:20 wiz Exp $
 
 COMMENT=	Screen saver and locker for the X window system
-PKGREVISION=	1
 
 CONFLICTS+=	xscreensaver-gnome<4.14
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 8bfe96bf889..370f9e32a7f 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.119 2016/06/06 12:41:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.120 2016/10/19 20:10:20 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.35
+DISTNAME=		xscreensaver-5.36
 CATEGORIES=		x11
 MASTER_SITES=		https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=		xscreensaver
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 90c7fe6eb2a..15afba08ba1 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2016/06/06 12:41:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.44 2016/10/19 20:10:20 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -83,7 +83,9 @@ libexec/xscreensaver/config/crackberg.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
@@ -92,6 +94,7 @@ libexec/xscreensaver/config/decayscreen.xml
 libexec/xscreensaver/config/deco.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
@@ -139,6 +142,7 @@ libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.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
@@ -221,6 +225,7 @@ libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/speedmine.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
@@ -264,7 +269,9 @@ libexec/xscreensaver/crackberg
 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
@@ -273,6 +280,7 @@ libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
 libexec/xscreensaver/deluxe
 libexec/xscreensaver/demon
+libexec/xscreensaver/discoball
 libexec/xscreensaver/discrete
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
@@ -320,6 +328,7 @@ libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
 libexec/xscreensaver/helix
 libexec/xscreensaver/hexadrop
+libexec/xscreensaver/hexstrut
 libexec/xscreensaver/hilbert
 libexec/xscreensaver/hopalong
 libexec/xscreensaver/hydrostat
@@ -403,6 +412,7 @@ libexec/xscreensaver/sonar
 libexec/xscreensaver/speedmine
 libexec/xscreensaver/spheremonics
 libexec/xscreensaver/splitflap
+libexec/xscreensaver/splodesic
 libexec/xscreensaver/spotlight
 libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
@@ -487,7 +497,9 @@ man/man6/crackberg.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
@@ -496,6 +508,7 @@ man/man6/decayscreen.6
 man/man6/deco.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
@@ -543,6 +556,7 @@ man/man6/halftone.6
 man/man6/halo.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
@@ -624,6 +638,7 @@ man/man6/sonar.6
 man/man6/speedmine.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
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index f25ddfbab54..8aeb9d0db12 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.71 2016/06/06 12:41:42 wiz Exp $
+$NetBSD: distinfo,v 1.72 2016/10/19 20:10:20 wiz Exp $
 
-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 (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
@@ -13,5 +13,3 @@ 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
deleted file mode 100644
index 207cf1923d4..00000000000
--- a/x11/xscreensaver/patches/patch-hacks_glx_molecules.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 8d7fe294c06..00000000000
--- a/x11/xscreensaver/patches/patch-hacks_m6502.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
-