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.

11 files changed, 23 insertions, 438 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 332ef51b4de..8945c6728cc 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -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=${PREFIX}/libexec/xscreensaver/config
 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
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 370f9e32a7f..fc7285bfd33 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -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
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 15afba08ba1..df4ab0d8b7f 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -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
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 5ba0219018a..57e45f4a0c9 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -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
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
deleted file mode 100644
index 17e9ab525c3..00000000000
--- a/x11/xscreensaver/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.22 2015/05/09 03:58:15 mef Exp $
-
-(1)
-fix build on solaris 9
-make opengl an option (on by default)
-from PR#43047
-http://gnats.netbsd.org/43047
-
-(2) 
-make: make: don't know how to make ca.po. Stop
-Remove useless locale files that have no translations in them.
-See post-extract: target in Makefile 
-
---- configure.in.orig	2014-10-09 03:09:41.000000000 +0900
-+++ configure.in	2015-05-09 11:20:14.000000000 +0900
-@@ -1245,7 +1245,7 @@ AC_GETTIMEOFDAY_ARGS
- AC_SYS_LARGEFILE
- AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
- AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
--AC_CHECK_FUNCS(setlocale)
-+AC_CHECK_FUNCS(setlocale sqrtf)
- AC_CHECK_FUNCS(getaddrinfo)
- AC_CHECK_MEMBERS([struct sockaddr.sa_len],,, [[#include <sys/socket.h>]])
- AC_CHECK_ICMP
-@@ -1294,7 +1294,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
- 		   generated code.])
- AC_SUBST(GETTEXT_PACKAGE)
- 
--ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
-+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
- MKINSTALLDIRS="$INSTALL_DIRS"
- 
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
deleted file mode 100644
index d0e592dd9fa..00000000000
--- a/x11/xscreensaver/patches/patch-ac
+++ /dev/null
@@ -1,312 +0,0 @@
-$NetBSD: patch-ac,v 1.26 2015/07/02 18:47:57 khorben Exp $
-
-Regenerated by autoconf-2.69 after patch-ab is applied.
-
---- configure.orig	2015-06-25 18:58:52.000000000 +0000
-+++ configure
-@@ -1420,9 +1420,7 @@ VAR=VALUE.  See below for descriptions o
- 
- Defaults for the options are specified in brackets.
- 
--
- Configuration:
--
-   -h, --help              display this help and exit
-       --help=short        display options specific to this package
-       --help=recursive    display the short help of all the included packages
-@@ -1448,13 +1446,17 @@ For better control, use the options belo
- 
- Fine tuning of the installation directories:
-   --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
--  --x-includes=DIR        X include files are in DIR
--  --x-libraries=DIR       X library files are in DIR
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-   --mandir=DIR            man documentation [DATAROOTDIR/man]
-   --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-@@ -1503,6 +1505,8 @@ Optional Packages:
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
- 
-   --with-pthread          Enables POSIX threads, for SMP support.
-+  --with-x                use the X Window System
-+
- 
- Installation options:
-   --with-hackdir=DIR      Where to install the hundreds of demo executables.
-@@ -1660,7 +1664,7 @@ fi
- ac_fn_c_try_compile ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  rm -rf conftest.$ac_objext
-+  rm -f conftest.$ac_objext
-   if { { ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -1698,7 +1702,7 @@ fi
- ac_fn_c_try_link ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  rm -rf conftest.$ac_objext conftest$ac_exeext
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-   if { { ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -1864,7 +1868,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
- else
-   ac_header_preproc=no
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -3285,7 +3289,7 @@ $as_echo "$ac_try_echo"; } >&5
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
-   fi
--  rm -rf conftest.er1 conftest.err
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
-@@ -3423,11 +3427,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
- as_fn_error $? "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details" "$LINENO" 5; }
- fi
--rm -rf conftest conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
--rm -rf conftest.$ac_ext
-+rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3487,7 +3491,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- 
--rm -rf conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
- ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
-@@ -3505,7 +3509,7 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -rf conftest.o conftest.obj
-+rm -f conftest.o conftest.obj
- if { { ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -3534,7 +3538,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
- as_fn_error $? "cannot compute suffix of object files: cannot compile
- See \`config.log' for more details" "$LINENO" 5; }
- fi
--rm -rf conftest.$ac_cv_objext conftest.$ac_ext
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
-@@ -3724,7 +3728,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext
-   test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -rf conftest.$ac_ext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
- 
- fi
-@@ -4582,7 +4586,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4598,11 +4602,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -rf conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -4641,7 +4645,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4657,11 +4661,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -rf conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-@@ -4983,7 +4987,7 @@ case `${MAKE-make} -f conftest.make 2>/d
-   *)
-     eval ac_cv_prog_make_${ac_make}_set=no;;
- esac
--rm -rf conftest.make
-+rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -5047,7 +5051,7 @@ case `"$ac_path_GREP" --version 2>&1` in
-     # 10*(2^10) chars as input seems more than enough
-     test $ac_count -gt 10 && break
-   done
--  rm -rf conftest.in conftest.tmp conftest.nl conftest.out;;
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
-       $ac_path_GREP_found && break 3
-@@ -5113,7 +5117,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
-     # 10*(2^10) chars as input seems more than enough
-     test $ac_count -gt 10 && break
-   done
--  rm -rf conftest.in conftest.tmp conftest.nl conftest.out;;
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
-       $ac_path_EGREP_found && break 3
-@@ -5175,7 +5179,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- else
-   ac_cv_header_stdc=no
- fi
--rm -rf conftest*
-+rm -f conftest*
- 
- fi
- 
-@@ -5192,7 +5196,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- else
-   ac_cv_header_stdc=no
- fi
--rm -rf conftest*
-+rm -f conftest*
- 
- fi
- 
-@@ -5688,7 +5692,7 @@ rm -f core conftest.err conftest.$ac_obj
- 	 break
-        done
-        CC=$ac_save_CC
--       rm -rf conftest.$ac_ext
-+       rm -f conftest.$ac_ext
-     fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-@@ -5863,12 +5867,13 @@ _ACEOF
- fi
- done
- 
--for ac_func in setlocale
-+for ac_func in setlocale sqrtf
- do :
--  ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
--if test "x$ac_cv_func_setlocale" = xyes; then :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_SETLOCALE 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -6248,7 +6253,7 @@ else
-   fi
- done
- fi
--rm -rf conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- fi # $ac_x_includes = no
- 
- if test "$ac_x_libraries" = no; then
-@@ -7651,7 +7656,7 @@ _ACEOF
- 
- 
- 
--ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
-+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
- 
-    for ac_header in locale.h
- do :
-@@ -10189,7 +10194,7 @@ else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--rm -rf conftest*
-+rm -f conftest*
- 
-   CPPFLAGS="$ac_save_CPPFLAGS"
- 
-@@ -12650,7 +12655,7 @@ fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lesstif_version_string" >&5
- $as_echo "$ac_cv_lesstif_version_string" >&6; }
--  rm -rf conftest-lt
-+  rm -f conftest-lt
-   lesstif_version=$ac_cv_lesstif_version
-   lesstif_version_string=$ac_cv_lesstif_version_string
- 
-@@ -12705,7 +12710,7 @@ fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_motif_version_string" >&5
- $as_echo "$ac_cv_motif_version_string" >&6; }
--  rm -rf conftest-mt
-+  rm -f conftest-mt
-   motif_version=$ac_cv_motif_version
-   motif_version_string=$ac_cv_motif_version_string
- 
-@@ -13039,7 +13044,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
-   $EGREP "Mesa|MESA" >/dev/null 2>&1; then :
-   ac_cv_have_mesa_gl=yes
- fi
--rm -rf conftest*
-+rm -f conftest*
- 
-   CPPFLAGS="$ac_save_CPPFLAGS"
-        fi
-@@ -13353,7 +13358,7 @@ EOF
-              's/^configure: *\([0-9][0-9]*\)  *\([0-9].*\)$/\1.\2/p'`
- 
- 
--         rm -rf conftest.$ac_ext
-+         rm -f conftest.$ac_ext
- 
-          CPPFLAGS="$ac_save_CPPFLAGS"
- 
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 7bfab01ec2f..c4c18594111 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -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:57:14 hauke Exp $
  	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 ; \
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
index f91d70dee1f..efb6b69b8d9 100644
--- a/x11/xscreensaver/patches/patch-af
+++ b/x11/xscreensaver/patches/patch-af
@@ -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
diff --git a/x11/xscreensaver/patches/patch-aj b/x11/xscreensaver/patches/patch-aj
deleted file mode 100644
index 4ada0cefd4c..00000000000
--- a/x11/xscreensaver/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2013/07/22 14:24:17 drochner Exp $
-
---- hacks/fireworkx.c.orig	2013-07-05 18:54:55.000000000 +0000
-+++ hacks/fireworkx.c
-@@ -141,7 +141,11 @@ static void render_light_map(struct stat
- 		for (x = 0; x < st->width; x += 2, v += SHELLCOUNT)
- 		{
- 			float f;
-+#ifdef HAVE_SQRTF
- 			f = sqrtf((fs->cx - x) * (fs->cx - x) + (fs->cy - y) * (fs->cy - y)) + 4.0;
-+#else
-+			f = sqrt((fs->cx - x) * (fs->cx - x) + (fs->cy - y) * (fs->cy - y)) + 4.0;
-+#endif
- 			f = FLASH_ZOOM / f;
- 			f += pow(f,0.1) * frand(0.0001); /* dither */
- 			st->light_map[v] = f;
diff --git a/x11/xscreensaver/patches/patch-ak b/x11/xscreensaver/patches/patch-ak
deleted file mode 100644
index 63f6293c769..00000000000
--- a/x11/xscreensaver/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2015/07/02 18:47:57 khorben Exp $
-
-fix build on solaris 9
-
---- hacks/m6502.c.orig	2015-03-02 03:59:21.000000000 +0000
-+++ hacks/m6502.c
-@@ -12,7 +12,12 @@
-  * Created: 07-May-2007 
-  */
- 
-+#include <config.h>
-+#if defined(HAVE_STDINT_H)
-+#include <stdint.h> 
-+#elif defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
-+#endif
- #include <string.h>
- #include "screenhack.h"
- #include "analogtv.h"
diff --git a/x11/xscreensaver/patches/patch-al b/x11/xscreensaver/patches/patch-al
deleted file mode 100644
index 3a0246501b4..00000000000
--- a/x11/xscreensaver/patches/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.4 2015/07/02 18:47:57 khorben Exp $
-
-fix build on solaris 9
-
---- hacks/asm6502.c.orig	2015-03-02 03:59:21.000000000 +0000
-+++ hacks/asm6502.c
-@@ -31,7 +31,12 @@
- #include <assert.h>
- #include <ctype.h>
- #include <math.h>
-+#include <config.h>
-+#if defined(HAVE_STDINT_H)
-+#include <stdint.h>
-+#elif defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
-+#endif
- #include <unistd.h>
- 
- #include "yarandom.h"