(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.

9 files changed, 349 insertions, 144 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 84e60a1a281..38acd64bf02 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -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 @@ CONFLICTS+=	xscreensaver-gnome<4.14
 .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 @@ 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 pt_BR.po
+	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 72ecd61d9ed..9cb1223c6e0 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -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 --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 7c5e6173055..407926ccd66 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -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/atlantis
 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/carousel
 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/atlantis.xml
 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/carousel.xml
 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/fuzzyflakes.xml
 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/vidwhacker.xml
 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/fuzzyflakes
 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/vidwhacker
 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/atlantis.6
 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/carousel.6
 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/fuzzyflakes.6
 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/vidwhacker.6
 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/nb/LC_MESSAGES/xscreensaver.mo
 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 --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 37746588c04..7e9112175c5 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -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-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
 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 --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
deleted file mode 100644
index a3caa036e81..00000000000
--- a/x11/xscreensaver/patches/patch-aa
+++ /dev/null
@@ -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 --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 440544392f2..17e9ab525c3 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -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 $
 
---- configure.in.orig	2013-01-15 00:48:04.000000000 +0000
-+++ configure.in
-@@ -1187,7 +1187,7 @@ AC_GETTIMEOFDAY_ARGS
+(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
- 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>
-     # (who got it from amu@mit.edu)
- 
--    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 --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index ad2be5051d4..a98310b94f8 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -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 $
 
---- 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"
+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 @@
+ 
+ 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]
+   --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 @@
+   --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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+          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_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 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
  
-+# Disable c89 options, since these trigger more errors than expected and
-+# cause build failures.
-+if false; then
- if test -n "$GCC"; then
+-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 @@
+   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_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 @@
+ 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
  
-   case "$host" in
-@@ -4468,6 +4471,7 @@ $as_echo "Disabling C++ comments in ANSI
- #     CC="$CC -Wp,-lang-c89"
-    fi
+ fi
+@@ -4582,7 +4586,7 @@
+   # 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 @@
+ 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 @@
+   # 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 @@
+ 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 @@
+   *)
+     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 @@
+     # 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 @@
+     # 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 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -rf conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -5192,7 +5196,7 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -rf conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -5687,7 +5691,7 @@
+ 	 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
+@@ -5862,12 +5866,13 @@
+ 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
+@@ -6247,7 +6252,7 @@
    fi
-+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
  
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -7568,7 +7572,7 @@ _ACEOF
+ if test "$ac_x_libraries" = no; then
+@@ -7650,7 +7655,7 @@
  
  
  
 -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"
  
     for ac_header in locale.h
  do :
-@@ -10793,7 +10797,7 @@ if ${ac_cv_lib_krb4_krb_get_tf_realm+:} 
+@@ -10188,7 +10193,7 @@
+   { $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"
+ 
+@@ -12546,7 +12551,7 @@
+ 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
+ 
+@@ -12601,7 +12606,7 @@
+ 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
+ 
+@@ -12935,7 +12940,7 @@
+   $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
+@@ -13203,7 +13208,7 @@
    $as_echo_n "(cached) " >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lkrb4  $LIBS"
-+LIBS="-lkrb4 -lcrypto -lroken -lcom_err $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10851,7 +10855,7 @@ $as_echo "$as_me: WARNING: Cannot find c
-     # from Matt Knopp <mhat@infocalypse.netlag.com>
-     # (who got it from amu@mit.edu)
- 
--    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
- 
-@@ -11612,7 +11616,7 @@ fi
- #
- if test "$enable_locking" = yes ; then
-   case "$host" in
--    *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* )
-+    *-hpux* | *-aix* | *-freebsd* | *-openbsd* )
-       need_setuid=yes
-     ;;
-   esac
-@@ -12131,11 +12135,7 @@ $as_echo "$ac_cv_gtk_config_libs" >&6; }
-   ac_gtk_config_libs=$ac_cv_gtk_config_libs
- 
-   GTK_EXTRA_OBJS=""
--  GTK_DATADIR=""
--  if test "$have_gtk" = yes; then
--    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
--    GTK_DATADIR="$GTK_DATADIR/share"
--  fi
-+  GTK_DATADIR="$datadir"
- 
-   if test "$have_gtk" = yes; then
-     INCLUDES="$INCLUDES $ac_gtk_config_cflags"
+   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 @@
+              '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-hacks_Makefile.in b/x11/xscreensaver/patches/patch-hacks_Makefile.in
deleted file mode 100644
index 3ba065e5bb9..00000000000
--- a/x11/xscreensaver/patches/patch-hacks_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-hacks_Makefile.in,v 1.1 2014/08/12 15:57:14 hauke Exp $
-
---- hacks/Makefile.in.orig	2014-06-08 21:43:53.000000000 +0000
-+++ hacks/Makefile.in
-@@ -671,7 +671,7 @@ truchet:	 truchet.o	$(HACK_OBJS) $(COL)
- 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
- 
- bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
--	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
-+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS) $(THRL)
- 
- apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
- 	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS) $(THRL)
diff --git a/x11/xscreensaver/patches/patch-hacks_memscroller.c b/x11/xscreensaver/patches/patch-hacks_memscroller.c
deleted file mode 100644
index bf09141314c..00000000000
--- a/x11/xscreensaver/patches/patch-hacks_memscroller.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-hacks_memscroller.c,v 1.1 2014/08/12 15:57:14 hauke Exp $
-
---- hacks/memscroller.c.orig	2014-05-31 00:56:20.000000000 +0000
-+++ hacks/memscroller.c
-@@ -301,6 +301,11 @@ open_file (state *st)
- }
- #endif
- 
-+#ifdef HAVE_SBRK  /* re-get it each time through */
-+#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) ) /* gcc >= 4.2 */
-+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-+#  endif
-+#endif
- 
- static unsigned int
- more_bits (state *st, scroller *sc)
-@@ -349,9 +354,6 @@ more_bits (state *st, scroller *sc)
-          from earlier days before the advent of virtual memory management."
-             -- sbrk(2) man page on MacOS
-        */
--#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
--#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--#  endif
-       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
- # endif
-