[pkgsrc/trunk]: pkgsrc/x11/xscreensaver (pkgsrc)

[mef <mef%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b00b176c3eac
branches:  trunk
changeset: 651672:b00b176c3eac
user:      mef <mef%pkgsrc.org@localhost>
date:      Sat May 09 03:58:15 2015 +0000

description:
(pkgsrc)
 - Drop three patches, those are now included in upstream code.
    patch-aa
    patch-hacks_Makefile.in
    patch-hacks_memscroller.c
 -  recover pt_BR.po (seems not empty) Makefile and patch-ab

(upstream)
 - Update 5.29 to 5.32
-------------------
5.32    * Fixed some X11 compilation problems.
        * Fixed display size and shake gestures on iOS.
5.31    * New hacks, `geodesicgears', `binaryring' and `cityflow'.
        * UTF-8 text support (instead of only Latin1) and antialiased text
          on X11 with Xft (instead of only on OSX/iOS) in `fontglide',
          `noseguy', `fliptext', `starwars', and `winduprobot'.
          The other text-displaying hacks (`apple2', `phosphor', `xmatrix',
          and `gltext') also now accept UTF-8 input, though they convert it
          to Latin1 or ASCII.
        * `glplanet' now has both day and night maps, and a sharp terminator.
        * Fixed `webcollage' on OSX.
        * Fixed a transparency glitch in `winduprobot'.
        * `lockward' works on iOS.
        * Text and image loading work on OSX 10.10.
        * Rotation works properly on iOS 8.
        * Added a search field on iOS.
        * Preliminary, unfinished support for Android.

5.30    * New hack, `winduprobot'.
        * Many improvements to `lament', including Leviathan.
        * Fixed the normals in `flyingtoasters': shading is correct now.
        * Implemented TEXTURE_GEN in GLES: flying toast is now toasted on iOS.
        * Make cel-shading sort-of work in `skytentacles' on iOS.
        * Fixed dragging-to-rotate on rotated iOS devices, I think.
        * Dragging has inertia now.
        * Most hacks respond to mouse-clicks, double-taps and swipes as
          meaning "do something different now".
        * Reworked OpenGL fonts.
        * The OSX auto-update installer wasn't working. This time for sure?
        * Various minor fixes.

diffstat:

 x11/xscreensaver/Makefile                          |    7 +-
 x11/xscreensaver/Makefile.common                   |    4 +-
 x11/xscreensaver/PLIST                             |   15 +-
 x11/xscreensaver/distinfo                          |   16 +-
 x11/xscreensaver/patches/patch-aa                  |   14 -
 x11/xscreensaver/patches/patch-ab                  |   36 +-
 x11/xscreensaver/patches/patch-ac                  |  356 +++++++++++++++++---
 x11/xscreensaver/patches/patch-hacks_Makefile.in   |   13 -
 x11/xscreensaver/patches/patch-hacks_memscroller.c |   26 -
 9 files changed, 346 insertions(+), 141 deletions(-)

diffs (truncated from 686 to 300 lines):

diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/Makefile Sat May 09 03:58:15 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2015/04/25 14:25:25 tnn Exp $
+# $NetBSD: Makefile,v 1.105 2015/05/09 03:58:15 mef Exp $
 
 COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   1
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 
@@ -9,8 +8,6 @@
 .include "options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-#PKGREVISION=  1
-
 CONFIGURE_ARGS+=       --without-gtk
 #CONFIGURE_ARGS+=      --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
@@ -21,7 +18,7 @@
 # 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 pt_BR.po
+       cd ${WRKSRC}/po && ${RM} -f ca.po
        ${CP} ${FILESDIR}/pipes.c ${WRKSRC}/hacks/glx
 
 INSTALLATION_DIRS=     ${EGDIR}/pam.d
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/Makefile.common  Sat May 09 03:58:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.114 2014/08/12 15:57:13 hauke Exp $
+# $NetBSD: Makefile.common,v 1.115 2015/05/09 03:58:15 mef 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.29
+DISTNAME=              xscreensaver-5.32
 CATEGORIES=            x11
 MASTER_SITES=          ${HOMEPAGE}
 
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/PLIST    Sat May 09 03:58:15 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2014/08/12 15:57:14 hauke Exp $
+@comment $NetBSD: PLIST,v 1.41 2015/05/09 03:58:15 mef Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -19,6 +19,7 @@
 libexec/xscreensaver/attraction
 libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
+libexec/xscreensaver/binaryring
 libexec/xscreensaver/blaster
 libexec/xscreensaver/blinkbox
 libexec/xscreensaver/blitspin
@@ -37,6 +38,7 @@
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/celtic
 libexec/xscreensaver/circuit
+libexec/xscreensaver/cityflow
 libexec/xscreensaver/cloudlife
 libexec/xscreensaver/companioncube
 libexec/xscreensaver/compass
@@ -53,6 +55,7 @@
 libexec/xscreensaver/config/attraction.xml
 libexec/xscreensaver/config/atunnel.xml
 libexec/xscreensaver/config/barcode.xml
+libexec/xscreensaver/config/binaryring.xml
 libexec/xscreensaver/config/blaster.xml
 libexec/xscreensaver/config/blinkbox.xml
 libexec/xscreensaver/config/blitspin.xml
@@ -71,6 +74,7 @@
 libexec/xscreensaver/config/ccurve.xml
 libexec/xscreensaver/config/celtic.xml
 libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/cloudlife.xml
 libexec/xscreensaver/config/companioncube.xml
 libexec/xscreensaver/config/compass.xml
@@ -113,6 +117,7 @@
 libexec/xscreensaver/config/galaxy.xml
 libexec/xscreensaver/config/gears.xml
 libexec/xscreensaver/config/geodesic.xml
+libexec/xscreensaver/config/geodesicgears.xml
 libexec/xscreensaver/config/gflux.xml
 libexec/xscreensaver/config/glblur.xml
 libexec/xscreensaver/config/glcells.xml
@@ -237,6 +242,7 @@
 libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
+libexec/xscreensaver/config/winduprobot.xml
 libexec/xscreensaver/config/wormhole.xml
 libexec/xscreensaver/config/xanalogtv.xml
 libexec/xscreensaver/config/xflame.xml
@@ -285,6 +291,7 @@
 libexec/xscreensaver/galaxy
 libexec/xscreensaver/gears
 libexec/xscreensaver/geodesic
+libexec/xscreensaver/geodesicgears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glblur
 libexec/xscreensaver/glcells
@@ -410,6 +417,7 @@
 libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
+libexec/xscreensaver/winduprobot
 libexec/xscreensaver/wormhole
 libexec/xscreensaver/xanalogtv
 libexec/xscreensaver/xflame
@@ -437,6 +445,7 @@
 man/man6/attraction.6
 man/man6/atunnel.6
 man/man6/barcode.6
+man/man6/binaryring.6
 man/man6/blaster.6
 man/man6/blinkbox.6
 man/man6/blitspin.6
@@ -455,6 +464,7 @@
 man/man6/ccurve.6
 man/man6/celtic.6
 man/man6/circuit.6
+man/man6/cityflow.6
 man/man6/cloudlife.6
 man/man6/companioncube.6
 man/man6/compass.6
@@ -497,6 +507,7 @@
 man/man6/galaxy.6
 man/man6/gears.6
 man/man6/geodesic.6
+man/man6/geodesicgears.6
 man/man6/gflux.6
 man/man6/glblur.6
 man/man6/glcells.6
@@ -620,6 +631,7 @@
 man/man6/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
+man/man6/winduprobot.6
 man/man6/wormhole.6
 man/man6/xanalogtv.6
 man/man6/xflame.6
@@ -645,6 +657,7 @@
 share/locale/nl/LC_MESSAGES/xscreensaver.mo
 share/locale/pl/LC_MESSAGES/xscreensaver.mo
 share/locale/pt/LC_MESSAGES/xscreensaver.mo
+share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
 share/locale/ru/LC_MESSAGES/xscreensaver.mo
 share/locale/sk/LC_MESSAGES/xscreensaver.mo
 share/locale/sv/LC_MESSAGES/xscreensaver.mo
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/distinfo Sat May 09 03:58:15 2015 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.66 2014/08/12 15:57:14 hauke Exp $
+$NetBSD: distinfo,v 1.67 2015/05/09 03:58:15 mef Exp $
 
-SHA1 (xscreensaver-5.29.tar.gz) = a27a10c6eed024c458e927ee0dc1e6cb306d3335
-RMD160 (xscreensaver-5.29.tar.gz) = fcd526611e9ad25c329458682c4cec31612724b9
-Size (xscreensaver-5.29.tar.gz) = 8774562 bytes
-SHA1 (patch-Makefile.in) = 34d363c48cc2ef28edb158fce3c8830b56ad1be6
-SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
-SHA1 (patch-ab) = a5c15ee8c0427ed5feae6196a11a6d84ba58b5c7
-SHA1 (patch-ac) = 5788371702f6db3db39e1795d3a6350fd8fb21ff
+SHA1 (xscreensaver-5.32.tar.gz) = 3131d45295b9a18a2901737c9b95f1c5434f53a6
+RMD160 (xscreensaver-5.32.tar.gz) = 1db8aede14b62a65f4d5798e4346335c2dd5b820
+Size (xscreensaver-5.32.tar.gz) = 10571502 bytes
+SHA1 (patch-ab) = c520709327ae6bf500243ca044e84a2d527ddf1d
+SHA1 (patch-ac) = c55ee279fe0613bc278a56f10db51b42546dcffe
 SHA1 (patch-ad) = 33e41981d9b703dcec0df9f238a5e440d1401dff
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
@@ -14,5 +12,3 @@
 SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
 SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1
 SHA1 (patch-al) = 0c1ceba4bea29026298d1d1903f32f2a14958c8a
-SHA1 (patch-hacks_Makefile.in) = 204bea1a7d9e5396397d6d7acf8ac7733e10dc6e
-SHA1 (patch-hacks_memscroller.c) = eff919398127266c906f0ebd7d22872ca2699874
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/patches/patch-aa
--- a/x11/xscreensaver/patches/patch-aa Sat May 09 02:21:19 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.25 2008/03/10 12:37:12 drochner Exp $
-
---- config.guess.orig  2007-11-10 09:12:11.000000000 +0100
-+++ config.guess
-@@ -398,6 +398,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
-     powerpc:machten:*:*)
-       echo powerpc-apple-machten${UNAME_RELEASE}
-       exit ;;
-+    macppc:NetBSD:*:*)
-+      echo powerpc-apple-netbsd${UNAME_RELEASE}
-+      exit ;;
-     RISC*:Mach:*:*)
-       echo mips-dec-mach_bsd4.3
-       exit ;;
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/patches/patch-ab
--- a/x11/xscreensaver/patches/patch-ab Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/patches/patch-ab Sat May 09 03:58:15 2015 +0000
@@ -1,31 +1,33 @@
-$NetBSD: patch-ab,v 1.21 2013/07/22 14:24:17 drochner Exp $
+$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
 
---- configure.in.orig  2013-01-15 00:48:04.000000000 +0000
-+++ configure.in
-@@ -1187,7 +1187,7 @@ AC_GETTIMEOFDAY_ARGS
+(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
- AC_CHECK_ICMPHDR
- AC_CHECK_GETIFADDRS
-@@ -1234,7 +1234,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
+@@ -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 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"
  
-@@ -2110,7 +2110,7 @@ if test "$enable_locking" = yes -a "$wit
-     # from Matt Knopp <mhat%infocalypse.netlag.com@localhost>
-     # (who got it from amu%mit.edu@localhost)
- 
--    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
-+    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
- 
-     # jwz: MacOS X uses -lkrb5, but not -lcrypt
-     AC_CHECK_X_LIB(crypt, crypt, [PASSWD_LIBS="$PASSWD_LIBS -lcrypt"])
diff -r 75e2c4a97cc1 -r b00b176c3eac x11/xscreensaver/patches/patch-ac
--- a/x11/xscreensaver/patches/patch-ac Sat May 09 02:21:19 2015 +0000
+++ b/x11/xscreensaver/patches/patch-ac Sat May 09 03:58:15 2015 +0000
@@ -1,71 +1,321 @@
-$NetBSD: patch-ac,v 1.24 2014/08/12 15:57:14 hauke Exp $
+$NetBSD: patch-ac,v 1.25 2015/05/09 03:58:15 mef Exp $
+
+Regenerated by autoconf-2.69 after patch-ab is applied.
 
---- configure.orig     2014-06-08 21:43:53.000000000 +0000
-+++ configure
-@@ -4408,6 +4408,9 @@ $as_echo "$ac_cv_gcc_accepts_no_cpp_prec
-    ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
+--- configure.orig     2014-11-19 16:24:01.000000000 +0900
++++ configure  2015-05-09 12:37:36.000000000 +0900
+@@ -1420,9 +1420,7 @@
+ 
+ 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 @@
+ 
+ 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]