update to 5.22

changes:
-New hacks, kaleidocycle, quasicrystal, unknownpleasures and hexadrop
-Performance improvements for interference
-bugfixes

7 files changed, 41 insertions, 30 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index cf2b243d0ac..78f24abab9c 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2013/05/31 12:42:57 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2013/07/22 14:24:17 drochner Exp $
 
 COMMENT=	Screen saver and locker for the X window system
-PKGREVISION=	2
 
 CONFLICTS+=	xscreensaver-gnome<4.14
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 933fb83cdc3..ace572654ad 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.112 2012/11/24 22:32:11 cheusov Exp $
+# $NetBSD: Makefile.common,v 1.113 2013/07/22 14:24:17 drochner 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.19
+DISTNAME=		xscreensaver-5.22
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 88819f0d9a8..4e8e5dc881b 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2011/12/07 20:09:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2013/07/22 14:24:17 drochner Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -72,6 +72,7 @@ libexec/xscreensaver/config/greynetic.xml
 libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.xml
 libexec/xscreensaver/config/helix.xml
+libexec/xscreensaver/config/hexadrop.xml
 libexec/xscreensaver/config/hopalong.xml
 libexec/xscreensaver/config/ifs.xml
 libexec/xscreensaver/config/imsmap.xml
@@ -167,6 +168,7 @@ libexec/xscreensaver/greynetic
 libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
 libexec/xscreensaver/helix
+libexec/xscreensaver/hexadrop
 libexec/xscreensaver/hopalong
 libexec/xscreensaver/ifs
 libexec/xscreensaver/imsmap
@@ -287,6 +289,7 @@ man/man6/greynetic.6
 man/man6/halftone.6
 man/man6/halo.6
 man/man6/helix.6
+man/man6/hexadrop.6
 man/man6/hopalong.6
 man/man6/ifs.6
 man/man6/imsmap.6
diff --git a/x11/xscreensaver/PLIST.opengl b/x11/xscreensaver/PLIST.opengl
index 57d0e329a4a..3e081811812 100644
--- a/x11/xscreensaver/PLIST.opengl
+++ b/x11/xscreensaver/PLIST.opengl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opengl,v 1.2 2011/12/07 20:09:19 drochner Exp $
+@comment $NetBSD: PLIST.opengl,v 1.3 2013/07/22 14:24:17 drochner Exp $
 bin/xscreensaver-gl-helper
 libexec/xscreensaver/antinspect
 libexec/xscreensaver/antmaze
@@ -63,6 +63,7 @@ libexec/xscreensaver/config/hypnowheel.xml
 libexec/xscreensaver/config/jigglypuff.xml
 libexec/xscreensaver/config/jigsaw.xml
 libexec/xscreensaver/config/juggler3d.xml
+libexec/xscreensaver/config/kaleidocycle.xml
 libexec/xscreensaver/config/klein.xml
 libexec/xscreensaver/config/lament.xml
 libexec/xscreensaver/config/lavalite.xml
@@ -81,6 +82,7 @@ libexec/xscreensaver/config/polyhedra.xml
 libexec/xscreensaver/config/polytopes.xml
 libexec/xscreensaver/config/providence.xml
 libexec/xscreensaver/config/pulsar.xml
+libexec/xscreensaver/config/quasicrystal.xml
 libexec/xscreensaver/config/queens.xml
 libexec/xscreensaver/config/rubik.xml
 libexec/xscreensaver/config/rubikblocks.xml
@@ -99,6 +101,7 @@ libexec/xscreensaver/config/tangram.xml
 libexec/xscreensaver/config/timetunnel.xml
 libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/tronbit.xml
+libexec/xscreensaver/config/unknownpleasures.xml
 libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/crackberg
 libexec/xscreensaver/cube21
@@ -133,6 +136,7 @@ libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/jigglypuff
 libexec/xscreensaver/jigsaw
 libexec/xscreensaver/juggler3d
+libexec/xscreensaver/kaleidocycle
 libexec/xscreensaver/klein
 libexec/xscreensaver/lament
 libexec/xscreensaver/lavalite
@@ -151,6 +155,7 @@ libexec/xscreensaver/polyhedra
 libexec/xscreensaver/polytopes
 libexec/xscreensaver/providence
 libexec/xscreensaver/pulsar
+libexec/xscreensaver/quasicrystal
 libexec/xscreensaver/queens
 libexec/xscreensaver/rubik
 libexec/xscreensaver/rubikblocks
@@ -169,6 +174,7 @@ libexec/xscreensaver/tangram
 libexec/xscreensaver/timetunnel
 libexec/xscreensaver/topblock
 libexec/xscreensaver/tronbit
+libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/voronoi
 man/man6/antinspect.6
 man/man6/antmaze.6
@@ -218,6 +224,7 @@ man/man6/hypnowheel.6
 man/man6/jigglypuff.6
 man/man6/jigsaw.6
 man/man6/juggler3d.6
+man/man6/kaleidocycle.6
 man/man6/klein.6
 man/man6/lament.6
 man/man6/lavalite.6
@@ -236,6 +243,7 @@ man/man6/polyhedra.6
 man/man6/polytopes.6
 man/man6/providence.6
 man/man6/pulsar.6
+man/man6/quasicrystal.6
 man/man6/queens.6
 man/man6/rubik.6
 man/man6/rubikblocks.6
@@ -254,5 +262,6 @@ man/man6/tangram.6
 man/man6/timetunnel.6
 man/man6/topblock.6
 man/man6/tronbit.6
+man/man6/unknownpleasures.6
 man/man6/voronoi.6
 man/man6/xscreensaver-gl-helper.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 8b837b18377..7d0c530e4d3 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.63 2012/08/01 12:22:14 drochner Exp $
+$NetBSD: distinfo,v 1.64 2013/07/22 14:24:17 drochner Exp $
 
-SHA1 (xscreensaver-5.19.tar.gz) = 16437d45f568ded8721a917e082f9b4d948954ec
-RMD160 (xscreensaver-5.19.tar.gz) = c0480652e3f2d50251d1cd73faed7ef439204322
-Size (xscreensaver-5.19.tar.gz) = 7373580 bytes
+SHA1 (xscreensaver-5.22.tar.gz) = b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec
+RMD160 (xscreensaver-5.22.tar.gz) = b05b7ed5fd4a6ef2ca770ff4784c6ea54435dd6b
+Size (xscreensaver-5.22.tar.gz) = 7411666 bytes
 SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
-SHA1 (patch-ab) = 937cf635ab544237f8cee9a5ccbbb9338c4a0f14
+SHA1 (patch-ab) = a5c15ee8c0427ed5feae6196a11a6d84ba58b5c7
 SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388
 SHA1 (patch-ad) = 45f739d70e2b4d96f491aa35ded3c9edfb745e18
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
-SHA1 (patch-aj) = 09c06207549ab5adf286dcf04e48a900f1ea9e1e
+SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
 SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1
 SHA1 (patch-al) = 0c1ceba4bea29026298d1d1903f32f2a14958c8a
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 22bc8d34df2..440544392f2 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.20 2012/08/01 12:22:14 drochner Exp $
+$NetBSD: patch-ab,v 1.21 2013/07/22 14:24:17 drochner Exp $
 
---- configure.in.orig	2012-06-30 22:50:43.000000000 +0000
+--- configure.in.orig	2013-01-15 00:48:04.000000000 +0000
 +++ configure.in
-@@ -1186,7 +1186,7 @@ AC_HEADER_DIRENT
- AC_GETTIMEOFDAY_ARGS
+@@ -1187,7 +1187,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)
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.20 2012/08/01 12:22:14 drochner Exp $
  AC_CHECK_ICMP
  AC_CHECK_ICMPHDR
  AC_CHECK_GETIFADDRS
-@@ -1233,7 +1233,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
+@@ -1234,7 +1234,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
  		   generated code.])
  AC_SUBST(GETTEXT_PACKAGE)
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.20 2012/08/01 12:22:14 drochner Exp $
  AM_GLIB_GNU_GETTEXT
  MKINSTALLDIRS="$INSTALL_DIRS"
  
-@@ -2109,7 +2109,7 @@ if test "$enable_locking" = yes -a "$wit
+@@ -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)
  
diff --git a/x11/xscreensaver/patches/patch-aj b/x11/xscreensaver/patches/patch-aj
index 115e39fd16a..4ada0cefd4c 100644
--- a/x11/xscreensaver/patches/patch-aj
+++ b/x11/xscreensaver/patches/patch-aj
@@ -1,16 +1,16 @@
-$NetBSD: patch-aj,v 1.3 2010/05/08 16:53:06 tez Exp $
+$NetBSD: patch-aj,v 1.4 2013/07/22 14:24:17 drochner Exp $
 
---- hacks/fireworkx.c.orig	Mon Mar 22 14:35:24 2010
-+++ hacks/fireworkx.c	Mon Mar 22 14:36:56 2010
-@@ -231,7 +231,11 @@
-   f++;
-   s += f->flash/(1+(f->cx - x)*(f->cx - x)+(f->cy - y)*(f->cy - y));
- 
+--- 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
-   l = sqrtf(s);
+ 			f = sqrtf((fs->cx - x) * (fs->cx - x) + (fs->cy - y) * (fs->cy - y)) + 4.0;
 +#else
-+  l = sqrt(s);
++			f = sqrt((fs->cx - x) * (fs->cx - x) + (fs->cy - y) * (fs->cy - y)) + 4.0;
 +#endif
- 
-   t = l + sim[0];
-   dim[0] = (t > 255 ? 255 : t);	
+ 			f = FLASH_ZOOM / f;
+ 			f += pow(f,0.1) * frand(0.0001); /* dither */
+ 			st->light_map[v] = f;