Package x11/xscreensaver{,-demo} 5.33

According to the release notes:

 * New hacks, splitflap and romanboy.
 * Better detection of user activity on modern GNOME systems.
 * Sonar now does asynchronous host name resolution.
 * Improved Unicode support.
 * Updated webcollage for recent changes.
 * Various minor fixes.

8 files changed, 60 insertions, 65 deletions

diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 1b3c557ee2b..43b0210477d 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2015/04/25 14:25:25 tnn Exp $
+# $NetBSD: Makefile,v 1.61 2015/07/02 18:47:57 khorben Exp $
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
-PKGREVISION=	5
 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 dd0bd64cca3..1820dae39c8 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2015/06/12 10:52:19 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2015/07/02 18:47:57 khorben 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 9cb1223c6e0..a5ec493b995 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.115 2015/05/09 03:58:15 mef Exp $
+# $NetBSD: Makefile.common,v 1.116 2015/07/02 18:47:57 khorben 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.32
+DISTNAME=		xscreensaver-5.33
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 407926ccd66..b4fa085d1cc 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2015/05/09 03:58:15 mef Exp $
+@comment $NetBSD: PLIST,v 1.42 2015/07/02 18:47:57 khorben Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -201,6 +201,7 @@ libexec/xscreensaver/config/queens.xml
 libexec/xscreensaver/config/rd-bomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
+libexec/xscreensaver/config/romanboy.xml
 libexec/xscreensaver/config/rorschach.xml
 libexec/xscreensaver/config/rotzoomer.xml
 libexec/xscreensaver/config/rubik.xml
@@ -215,6 +216,7 @@ libexec/xscreensaver/config/slip.xml
 libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/speedmine.xml
 libexec/xscreensaver/config/spheremonics.xml
+libexec/xscreensaver/config/splitflap.xml
 libexec/xscreensaver/config/spotlight.xml
 libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.xml
@@ -376,6 +378,7 @@ libexec/xscreensaver/queens
 libexec/xscreensaver/rd-bomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
+libexec/xscreensaver/romanboy
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotzoomer
 libexec/xscreensaver/rubik
@@ -390,6 +393,7 @@ libexec/xscreensaver/slip
 libexec/xscreensaver/sonar
 libexec/xscreensaver/speedmine
 libexec/xscreensaver/spheremonics
+libexec/xscreensaver/splitflap
 libexec/xscreensaver/spotlight
 libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
@@ -590,6 +594,7 @@ man/man6/queens.6
 man/man6/rd-bomb.6
 man/man6/ripples.6
 man/man6/rocks.6
+man/man6/romanboy.6
 man/man6/rorschach.6
 man/man6/rotzoomer.6
 man/man6/rubik.6
@@ -604,6 +609,7 @@ man/man6/slip.6
 man/man6/sonar.6
 man/man6/speedmine.6
 man/man6/spheremonics.6
+man/man6/splitflap.6
 man/man6/spotlight.6
 man/man6/sproingies.6
 man/man6/squiral.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 7e9112175c5..f9b8bb233bc 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.67 2015/05/09 03:58:15 mef Exp $
+$NetBSD: distinfo,v 1.68 2015/07/02 18:47:57 khorben Exp $
 
-SHA1 (xscreensaver-5.32.tar.gz) = 3131d45295b9a18a2901737c9b95f1c5434f53a6
-RMD160 (xscreensaver-5.32.tar.gz) = 1db8aede14b62a65f4d5798e4346335c2dd5b820
-Size (xscreensaver-5.32.tar.gz) = 10571502 bytes
+SHA1 (xscreensaver-5.33.tar.gz) = 1aa269a967761f81fa30113c06ecac8a445a5de2
+RMD160 (xscreensaver-5.33.tar.gz) = bb0a223f73af32b3cba8407ba43aa1b66c0d3892
+Size (xscreensaver-5.33.tar.gz) = 20668552 bytes
 SHA1 (patch-ab) = c520709327ae6bf500243ca044e84a2d527ddf1d
-SHA1 (patch-ac) = c55ee279fe0613bc278a56f10db51b42546dcffe
+SHA1 (patch-ac) = 2355a2954c61db134e623ab0656c2bb2f9e6238a
 SHA1 (patch-ad) = 33e41981d9b703dcec0df9f238a5e440d1401dff
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
 SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
-SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1
-SHA1 (patch-al) = 0c1ceba4bea29026298d1d1903f32f2a14958c8a
+SHA1 (patch-ak) = e87576d457b9d5344f48bca2a6c9894d8290ce39
+SHA1 (patch-al) = 2d19b2aa5100424a00b260b53916d58ac14e0051
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index a98310b94f8..d0e592dd9fa 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.25 2015/05/09 03:58:15 mef Exp $
+$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	2014-11-19 16:24:01.000000000 +0900
-+++ configure	2015-05-09 12:37:36.000000000 +0900
-@@ -1420,9 +1420,7 @@
+--- 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.
  
@@ -14,7 +14,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    -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 @@
+@@ -1448,13 +1446,17 @@ For better control, use the options belo
  
  Fine tuning of the installation directories:
    --bindir=DIR            user executables [EPREFIX/bin]
@@ -34,7 +34,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
    --mandir=DIR            man documentation [DATAROOTDIR/man]
    --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-@@ -1503,6 +1505,8 @@
+@@ -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.
@@ -43,7 +43,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
  Installation options:
    --with-hackdir=DIR      Where to install the hundreds of demo executables.
-@@ -1660,7 +1664,7 @@
+@@ -1660,7 +1664,7 @@ fi
  ac_fn_c_try_compile ()
  {
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -52,7 +52,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    if { { ac_try="$ac_compile"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -1698,7 +1702,7 @@
+@@ -1698,7 +1702,7 @@ fi
  ac_fn_c_try_link ()
  {
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -61,7 +61,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    if { { ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -1864,7 +1868,7 @@
+@@ -1864,7 +1868,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
  else
    ac_header_preproc=no
  fi
@@ -70,7 +70,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  $as_echo "$ac_header_preproc" >&6; }
  
-@@ -3285,7 +3289,7 @@
+@@ -3285,7 +3289,7 @@ $as_echo "$ac_try_echo"; } >&5
           10q' conftest.err >conftest.er1
      cat conftest.er1 >&5
    fi
@@ -79,7 +79,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }
  done
-@@ -3423,11 +3427,11 @@
+@@ -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
@@ -93,7 +93,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3487,7 +3491,7 @@
+@@ -3487,7 +3491,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  $as_echo "$cross_compiling" >&6; }
  
@@ -102,7 +102,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  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 @@
+@@ -3505,7 +3509,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -111,7 +111,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  if { { ac_try="$ac_compile"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -3534,7 +3538,7 @@
+@@ -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
@@ -120,7 +120,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  $as_echo "$ac_cv_objext" >&6; }
-@@ -3724,7 +3728,7 @@
+@@ -3724,7 +3728,7 @@ fi
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
@@ -129,7 +129,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  CC=$ac_save_CC
  
  fi
-@@ -4582,7 +4586,7 @@
+@@ -4582,7 +4586,7 @@ else
    # Broken: fails on valid input.
  continue
  fi
@@ -138,7 +138,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -4598,11 +4602,11 @@
+@@ -4598,11 +4602,11 @@ else
  ac_preproc_ok=:
  break
  fi
@@ -152,7 +152,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  if $ac_preproc_ok; then :
    break
  fi
-@@ -4641,7 +4645,7 @@
+@@ -4641,7 +4645,7 @@ else
    # Broken: fails on valid input.
  continue
  fi
@@ -161,7 +161,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -4657,11 +4661,11 @@
+@@ -4657,11 +4661,11 @@ else
  ac_preproc_ok=:
  break
  fi
@@ -175,7 +175,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  if $ac_preproc_ok; then :
  
  else
-@@ -4983,7 +4987,7 @@
+@@ -4983,7 +4987,7 @@ case `${MAKE-make} -f conftest.make 2>/d
    *)
      eval ac_cv_prog_make_${ac_make}_set=no;;
  esac
@@ -184,7 +184,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  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 @@
+@@ -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
@@ -193,7 +193,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  esac
  
        $ac_path_GREP_found && break 3
-@@ -5113,7 +5117,7 @@
+@@ -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
@@ -202,7 +202,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  esac
  
        $ac_path_EGREP_found && break 3
-@@ -5175,7 +5179,7 @@
+@@ -5175,7 +5179,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  else
    ac_cv_header_stdc=no
  fi
@@ -211,7 +211,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
  fi
  
-@@ -5192,7 +5196,7 @@
+@@ -5192,7 +5196,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  else
    ac_cv_header_stdc=no
  fi
@@ -220,7 +220,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
  fi
  
-@@ -5687,7 +5691,7 @@
+@@ -5688,7 +5692,7 @@ rm -f core conftest.err conftest.$ac_obj
  	 break
         done
         CC=$ac_save_CC
@@ -229,7 +229,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
      fi
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-@@ -5862,12 +5866,13 @@
+@@ -5863,12 +5867,13 @@ _ACEOF
  fi
  done
  
@@ -247,7 +247,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  _ACEOF
  
  fi
-@@ -6247,7 +6252,7 @@
+@@ -6248,7 +6253,7 @@ else
    fi
  done
  fi
@@ -256,7 +256,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
-@@ -7650,7 +7655,7 @@
+@@ -7651,7 +7656,7 @@ _ACEOF
  
  
  
@@ -265,7 +265,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
     for ac_header in locale.h
  do :
-@@ -10188,7 +10193,7 @@
+@@ -10189,7 +10194,7 @@ else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
@@ -274,7 +274,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
    CPPFLAGS="$ac_save_CPPFLAGS"
  
-@@ -12546,7 +12551,7 @@
+@@ -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; }
@@ -283,7 +283,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    lesstif_version=$ac_cv_lesstif_version
    lesstif_version_string=$ac_cv_lesstif_version_string
  
-@@ -12601,7 +12606,7 @@
+@@ -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; }
@@ -292,7 +292,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
    motif_version=$ac_cv_motif_version
    motif_version_string=$ac_cv_motif_version_string
  
-@@ -12935,7 +12940,7 @@
+@@ -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
@@ -301,16 +301,7 @@ Regenerated by autoconf-2.69 after patch-ab is applied.
  
    CPPFLAGS="$ac_save_CPPFLAGS"
         fi
-@@ -13203,7 +13208,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 13210 "configure"
-+#line 13211 "configure"
- #include "confdefs.h"
- #include <GL/gl.h>
- #ifndef MESA_MAJOR_VERSION
-@@ -13249,7 +13254,7 @@
+@@ -13353,7 +13358,7 @@ EOF
               's/^configure: *\([0-9][0-9]*\)  *\([0-9].*\)$/\1.\2/p'`
  
  
diff --git a/x11/xscreensaver/patches/patch-ak b/x11/xscreensaver/patches/patch-ak
index 269c925a7ce..63f6293c769 100644
--- a/x11/xscreensaver/patches/patch-ak
+++ b/x11/xscreensaver/patches/patch-ak
@@ -1,18 +1,18 @@
-$NetBSD: patch-ak,v 1.2 2011/02/05 20:33:43 markd Exp $
+$NetBSD: patch-ak,v 1.3 2015/07/02 18:47:57 khorben Exp $
 
 fix build on solaris 9
 
---- hacks/m6502.c.orig	Mon Mar 22 15:24:30 2010
-+++ hacks/m6502.c	Mon Mar 22 15:27:33 2010
+--- 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> 
++#include <stdint.h> 
 +#elif defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
+ #include <inttypes.h>
 +#endif
  #include <string.h>
  #include "screenhack.h"
diff --git a/x11/xscreensaver/patches/patch-al b/x11/xscreensaver/patches/patch-al
index a99c7e6b421..3a0246501b4 100644
--- a/x11/xscreensaver/patches/patch-al
+++ b/x11/xscreensaver/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2012/08/01 12:22:14 drochner Exp $
+$NetBSD: patch-al,v 1.4 2015/07/02 18:47:57 khorben Exp $
 
 fix build on solaris 9
 
---- hacks/asm6502.c.orig	2012-06-24 04:49:43.000000000 +0000
+--- hacks/asm6502.c.orig	2015-03-02 03:59:21.000000000 +0000
 +++ hacks/asm6502.c
 @@ -31,7 +31,12 @@
  #include <assert.h>
@@ -10,9 +10,9 @@ fix build on solaris 9
  #include <math.h>
 +#include <config.h>
 +#if defined(HAVE_STDINT_H)
- #include <stdint.h>
++#include <stdint.h>
 +#elif defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
+ #include <inttypes.h>
 +#endif
  #include <unistd.h>