xscreensaver*: update to 5.39

5.39    * New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'.
        * More heuristics for using RSS feeds as image sources.
        * Android: Image loading works.
        * Built-in image assets are now PNG instead of XPM or XBM.
        * X11: Better font-loading fallback heuristics on systems with a
          terrible selection of installed fonts.
        * macOS: Retina display-related bug fixes.

5.38    * New hack, 'esper'.
        * macOS: Support for Retina displays.
        * X11: `webcollage' now works with ImageMagick instead of with
          pbmtools if `webcollage-helper' is not installed.
        * 'bsod' now accepts Dunning-Krugerrands.
        * Android: These hacks work now: 'anemone', 'anemotaxis', 'atlantis',
          'bouboule', 'celtic', 'compass', 'crackberg', 'epicycle',
          'fuzzyflakes', 'goop', 'kumppa' 'munch', 'pacman', 'polyominoes',
          'slip'.
        * Android: Thick lines work better for: 'anemone', 'anemotaxis',
          'celtic', 'compass', 'deluxe', 'epicycle', 'fuzzyflakes', 'pacman'
        * Android: Assorted performance improvements, especially for 'kumppa'
          and 'slip'.
        * Android TV: Daydreams work.
        * iOS: Tweaks for iPhone X.
        * Lots of xlockmore-derived hacks now have animated erase routines.
        * 'crystal' works properly on non-X11 systems.
        * 'm6502' now includes 'texture.asm'.
        * X11: Try harder to find sensible fonts for the password dialog.

6 files changed, 51 insertions, 12 deletions

diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 4c224d996a8..1aaba83e568 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2018/04/16 14:35:28 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/06/25 08:42:39 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
-PKGREVISION=	2
 COMMENT=	Demo viewer and configuration tool for xscreensaver
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-gnome-[0-9]*
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4ee1c5fcba6..dd5a484d485 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.111 2017/08/16 21:44:05 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2018/06/25 08:42:39 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 84b14b75dc3..383a675545a 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.124 2018/06/09 03:51:02 youri Exp $
+# $NetBSD: Makefile.common,v 1.125 2018/06/25 08:42:39 wiz Exp $
 #
 # used by x11/xscreensaver/Makefile
 # used by x11/xscreensaver-demo/Makefile
 
-DISTNAME=		xscreensaver-5.37
+DISTNAME=		xscreensaver-5.39
 CATEGORIES=		x11
 MASTER_SITES=		https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=		xscreensaver
diff --git a/x11/xscreensaver/PLIST.opengl b/x11/xscreensaver/PLIST.opengl
index e3f1a150ed0..1eb40184107 100644
--- a/x11/xscreensaver/PLIST.opengl
+++ b/x11/xscreensaver/PLIST.opengl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opengl,v 1.4 2018/06/24 05:51:58 wiz Exp $
+@comment $NetBSD: PLIST.opengl,v 1.5 2018/06/25 08:42:39 wiz Exp $
 bin/xscreensaver-gl-helper
 libexec/xscreensaver/antinspect
 libexec/xscreensaver/antmaze
@@ -33,6 +33,7 @@ libexec/xscreensaver/config/circuit.xml
 libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/companioncube.xml
 libexec/xscreensaver/config/crackberg.xml
+libexec/xscreensaver/config/crumbler.xml
 libexec/xscreensaver/config/cube21.xml
 libexec/xscreensaver/config/cubenetic.xml
 libexec/xscreensaver/config/cubestack.xml
@@ -45,6 +46,7 @@ libexec/xscreensaver/config/dymaxionmap.xml
 libexec/xscreensaver/config/endgame.xml
 libexec/xscreensaver/config/energystream.xml
 libexec/xscreensaver/config/engine.xml
+libexec/xscreensaver/config/esper.xml
 libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/flipflop.xml
 libexec/xscreensaver/config/flipscreen3d.xml
@@ -79,6 +81,7 @@ libexec/xscreensaver/config/klein.xml
 libexec/xscreensaver/config/lament.xml
 libexec/xscreensaver/config/lavalite.xml
 libexec/xscreensaver/config/lockward.xml
+libexec/xscreensaver/config/maze3d.xml
 libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/mirrorblob.xml
 libexec/xscreensaver/config/moebius.xml
@@ -86,6 +89,7 @@ libexec/xscreensaver/config/moebiusgears.xml
 libexec/xscreensaver/config/molecule.xml
 libexec/xscreensaver/config/morph3d.xml
 libexec/xscreensaver/config/noof.xml
+libexec/xscreensaver/config/peepers.xml
 libexec/xscreensaver/config/photopile.xml
 libexec/xscreensaver/config/pinion.xml
 libexec/xscreensaver/config/pipes.xml
@@ -97,6 +101,7 @@ libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/quasicrystal.xml
 libexec/xscreensaver/config/queens.xml
 libexec/xscreensaver/config/raverhoop.xml
+libexec/xscreensaver/config/razzledazzle.xml
 libexec/xscreensaver/config/romanboy.xml
 libexec/xscreensaver/config/rubik.xml
 libexec/xscreensaver/config/rubikblocks.xml
@@ -123,6 +128,7 @@ libexec/xscreensaver/config/vigilance.xml
 libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/winduprobot.xml
 libexec/xscreensaver/crackberg
+libexec/xscreensaver/crumbler
 libexec/xscreensaver/cube21
 libexec/xscreensaver/cubenetic
 libexec/xscreensaver/cubestack
@@ -135,6 +141,7 @@ libexec/xscreensaver/dymaxionmap
 libexec/xscreensaver/endgame
 libexec/xscreensaver/energystream
 libexec/xscreensaver/engine
+libexec/xscreensaver/esper
 libexec/xscreensaver/extrusion
 libexec/xscreensaver/flipflop
 libexec/xscreensaver/flipscreen3d
@@ -169,6 +176,7 @@ libexec/xscreensaver/klein
 libexec/xscreensaver/lament
 libexec/xscreensaver/lavalite
 libexec/xscreensaver/lockward
+libexec/xscreensaver/maze3d
 libexec/xscreensaver/menger
 libexec/xscreensaver/mirrorblob
 libexec/xscreensaver/moebius
@@ -176,6 +184,7 @@ libexec/xscreensaver/moebiusgears
 libexec/xscreensaver/molecule
 libexec/xscreensaver/morph3d
 libexec/xscreensaver/noof
+libexec/xscreensaver/peepers
 libexec/xscreensaver/photopile
 libexec/xscreensaver/pinion
 libexec/xscreensaver/pipes
@@ -187,6 +196,7 @@ libexec/xscreensaver/pulsar
 libexec/xscreensaver/quasicrystal
 libexec/xscreensaver/queens
 libexec/xscreensaver/raverhoop
+libexec/xscreensaver/razzledazzle
 libexec/xscreensaver/romanboy
 libexec/xscreensaver/rubik
 libexec/xscreensaver/rubikblocks
@@ -229,6 +239,7 @@ man/man6/circuit.6
 man/man6/cityflow.6
 man/man6/companioncube.6
 man/man6/crackberg.6
+man/man6/crumbler.6
 man/man6/cube21.6
 man/man6/cubenetic.6
 man/man6/cubestack.6
@@ -241,6 +252,7 @@ man/man6/dymaxionmap.6
 man/man6/endgame.6
 man/man6/energystream.6
 man/man6/engine.6
+man/man6/esper.6
 man/man6/extrusion.6
 man/man6/flipflop.6
 man/man6/flipscreen3d.6
@@ -275,6 +287,7 @@ man/man6/klein.6
 man/man6/lament.6
 man/man6/lavalite.6
 man/man6/lockward.6
+man/man6/maze3d.6
 man/man6/menger.6
 man/man6/mirrorblob.6
 man/man6/moebius.6
@@ -282,6 +295,7 @@ man/man6/moebiusgears.6
 man/man6/molecule.6
 man/man6/morph3d.6
 man/man6/noof.6
+man/man6/peepers.6
 man/man6/photopile.6
 man/man6/pinion.6
 man/man6/pipes.6
@@ -293,6 +307,7 @@ man/man6/pulsar.6
 man/man6/quasicrystal.6
 man/man6/queens.6
 man/man6/raverhoop.6
+man/man6/razzledazzle.6
 man/man6/romanboy.6
 man/man6/rubik.6
 man/man6/rubikblocks.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 57e45f4a0c9..7cc555aa04a 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.74 2017/08/16 07:33:39 wiz Exp $
+$NetBSD: distinfo,v 1.75 2018/06/25 08:42:39 wiz Exp $
 
-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 (xscreensaver/xscreensaver-5.39.tar.gz) = 7166c9f4a860785e0829df046f0328f5be74c0d7
+RMD160 (xscreensaver/xscreensaver-5.39.tar.gz) = 6fb6f51024fc052a92ef4dbe594d8ffb18dc9561
+SHA512 (xscreensaver/xscreensaver-5.39.tar.gz) = 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
+Size (xscreensaver/xscreensaver-5.39.tar.gz) = 12157285 bytes
 SHA1 (patch-ad) = ff03b044ca82964c3b9535b84a7dcca6d5f8f1bb
 SHA1 (patch-af) = 4ee300a205a0ac448939ac2776087db48d808ad8
+SHA1 (patch-utils_xft.c) = 786bbc3c75f1d51dc35c8140deed32fb9301cdb1
diff --git a/x11/xscreensaver/patches/patch-utils_xft.c b/x11/xscreensaver/patches/patch-utils_xft.c
new file mode 100644
index 00000000000..295dd9b888b
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-utils_xft.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-utils_xft.c,v 1.1 2018/06/25 08:42:39 wiz Exp $
+
+Fix build with libX11-1.6.5.
+
+--- utils/xft.c.orig	2017-11-02 20:05:48.000000000 +0000
++++ utils/xft.c
+@@ -198,12 +198,12 @@ XftColorAllocValue (Display *dpy,
+       int green_shift, green_len;
+       int blue_shift, blue_len;
+ 
+-      red_shift   = maskbase (visual->rgba_masks[0]);
+-      red_len     = masklen  (visual->rgba_masks[0]);
+-      green_shift = maskbase (visual->rgba_masks[1]);
+-      green_len   = masklen (visual->rgba_masks[1]);
+-      blue_shift  = maskbase (visual->rgba_masks[2]);
+-      blue_len    = masklen (visual->rgba_masks[2]);
++      red_shift   = maskbase (visual->red_mask);
++      red_len     = masklen  (visual->red_mask);
++      green_shift = maskbase (visual->green_mask);
++      green_len   = masklen (visual->green_mask);
++      blue_shift  = maskbase (visual->blue_mask);
++      blue_len    = masklen (visual->blue_mask);
+       result->pixel = (((color->red   >> (16 - red_len))   << red_shift)   |
+                        ((color->green >> (16 - green_len)) << green_shift) |
+                        ((color->blue  >> (16 - blue_len))  << blue_shift));