Update XaoS to version 3.6. From Olaf 'Rhialto' Seibert, thanks!

Closes PR/48836.

5 files changed, 16 insertions, 152 deletions

diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index 2755fef6795..48ca6b0fa85 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.35 2013/02/16 11:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/07/13 09:17:04 mbalmer Exp $
 #
 
-DISTNAME=		xaos-3.5
-PKGREVISION=		1
+DISTNAME=		xaos-3.6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xaos/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://xaos.sourceforge.net/
+HOMEPAGE=		http://matek.hu/xaos/
 COMMENT=		Zoomable fractal rendering doodad
 LICENSE=		gnu-gpl-v2
 
diff --git a/x11/XaoS/PLIST b/x11/XaoS/PLIST
index c6f266c6128..3a2ca1d9350 100644
--- a/x11/XaoS/PLIST
+++ b/x11/XaoS/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/07/30 01:19:15 dholland Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/07/13 09:17:04 mbalmer Exp $
 bin/xaos
 info/xaos.info
 man/man6/xaos.6
@@ -49,6 +49,7 @@ share/XaoS/examples/beatle2.xpf
 share/XaoS/examples/bolygo.xpf
 share/XaoS/examples/brown.xpf
 share/XaoS/examples/burnship.xpf
+share/XaoS/examples/butterfly-langston.xpf
 share/XaoS/examples/butterfly.xpf
 share/XaoS/examples/checker.xpf
 share/XaoS/examples/circle.xpf
@@ -57,6 +58,7 @@ share/XaoS/examples/csiga2.xpf
 share/XaoS/examples/csiga3.xpf
 share/XaoS/examples/csiga4.xpf
 share/XaoS/examples/csiga5.xpf
+share/XaoS/examples/dark.xpf
 share/XaoS/examples/dblspira.xpf
 share/XaoS/examples/dragons.xpf
 share/XaoS/examples/dragons2.xpf
@@ -114,6 +116,7 @@ share/XaoS/examples/kovzsi8.xpf
 share/XaoS/examples/kovzsi9.2.xpf
 share/XaoS/examples/kovzsi9.xpf
 share/XaoS/examples/lemon.xpf
+share/XaoS/examples/light-kovzsi.xpf
 share/XaoS/examples/light.xpf
 share/XaoS/examples/lighting.xpf
 share/XaoS/examples/magnet.xpf
diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo
index 557c8786a06..b238790032b 100644
--- a/x11/XaoS/distinfo
+++ b/x11/XaoS/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2012/07/30 01:19:15 dholland Exp $
+$NetBSD: distinfo,v 1.16 2014/07/13 09:17:04 mbalmer Exp $
 
-SHA1 (xaos-3.5.tar.gz) = 6d16a58187fba7276e6bd0547cc2fd6bb073b801
-RMD160 (xaos-3.5.tar.gz) = 193553818646fbf2d7c9f0c855ca3123446e16bc
-Size (xaos-3.5.tar.gz) = 2930590 bytes
-SHA1 (patch-aa) = fd6fee93b6591e1daee2e2a47876e66e36e68110
-SHA1 (patch-ab) = dcc67d834235b6189e9c2853943af2e78d2e5195
+SHA1 (xaos-3.6.tar.gz) = 0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0
+RMD160 (xaos-3.6.tar.gz) = 4cfe8e7f5b98d28cd320f9ab21a9c2d76d122133
+Size (xaos-3.6.tar.gz) = 2040707 bytes
+SHA1 (patch-aa) = b7f9bf3bf002cf43808e5cadf95c3418de0aec12
diff --git a/x11/XaoS/patches/patch-aa b/x11/XaoS/patches/patch-aa
index b90377e8e9b..3d5ca135428 100644
--- a/x11/XaoS/patches/patch-aa
+++ b/x11/XaoS/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2012/07/30 01:19:16 dholland Exp $
+$NetBSD: patch-aa,v 1.5 2014/07/13 09:17:04 mbalmer Exp $
 
 Rip out the 16 bit i387 specific code.
 
---- src/engine/fractal.c.orig	2009-07-17 23:50:31.000000000 +0000
+--- src/engine/fractal.c.orig	2013-11-01 07:54:21.000000000 +0000
 +++ src/engine/fractal.c
-@@ -49,13 +49,6 @@
+@@ -47,13 +47,6 @@
  #include <complex.h>
  #include <plane.h>
  #include "../include/timers.h"
@@ -18,7 +18,7 @@ Rip out the 16 bit i387 specific code.
  #ifdef __alpha__
  #ifdef __linux__
  #include <asm/fpu.h>
-@@ -357,15 +350,6 @@ fractal_context *make_fractalc(CONST int
+@@ -355,15 +348,6 @@ fractal_context *make_fractalc(const int
  {
      fractal_context *new_ctxt;
  
diff --git a/x11/XaoS/patches/patch-ab b/x11/XaoS/patches/patch-ab
deleted file mode 100644
index 10296faa76f..00000000000
--- a/x11/XaoS/patches/patch-ab
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2012/07/30 01:19:16 dholland Exp $
-
-Fix build with png-1.5 (untested, waiting for confirmation).
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- src/util/png.c.orig	2009-07-17 23:50:39.000000000 +0000
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@ CONST char *writepng(FILE * file, CONST 
-     png_structp png_ptr;
-     png_infop info_ptr;
-     png_color palette[256];
-+    png_color_8 sig_bit;
-+    int color_type;
-+    int bit_depth;
-     volatile unsigned short a = 255;
-     volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@ CONST char *writepng(FILE * file, CONST 
- 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	return "No memory to create png info structure";
-     }
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(file);
- 	return strerror(errno);
-@@ -78,57 +82,72 @@ CONST char *writepng(FILE * file, CONST 
-     png_set_compression_window_bits(png_ptr, 15);
-     png_set_compression_method(png_ptr, 8);
- 
--    info_ptr->width = image->width;
--    info_ptr->height = image->height;
--    /*info_ptr->gamma=1.0; */
--    info_ptr->gamma = 0.5;
--    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
--    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
--    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
--
-+    switch (image->palette->type)
-+      {
-+      case C256:
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+        bit_depth = image->bytesperpixel * 8;
-+        break;
-+      case SMALLITER:
-+      case LARGEITER:
-+      case GRAYSCALE:
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+        bit_depth = image->bytesperpixel * 8;
-+        break;
-+      case TRUECOLOR:
-+      case TRUECOLOR24:
-+      case TRUECOLOR16:
-+        color_type = PNG_COLOR_TYPE_RGB;
-+        bit_depth = 8;
-+        break;
-+      }
-+
-+    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+      color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+      PNG_FILTER_TYPE_BASE);
- 
-     switch (image->palette->type) {
-     case C256:
- 	{
- 	    int i;
--	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--	    info_ptr->bit_depth = image->bytesperpixel * 8;
--	    info_ptr->palette = palette;
--	    info_ptr->valid |= PNG_INFO_PLTE;
-+	    png_color png_palette[257];
-+	    int png_num_palette;
- 	    for (i = 0; i < image->palette->end; i++)
--		info_ptr->palette[i].red = image->palette->rgb[i][0],
--		    info_ptr->palette[i].green = image->palette->rgb[i][1],
--		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
--		    info_ptr->num_palette = image->palette->end;
-+		png_palette[i].red = image->palette->rgb[i][0],
-+		    png_palette[i].green = image->palette->rgb[i][1],
-+		    png_palette[i].blue = image->palette->rgb[i][2],
-+		    png_num_palette = image->palette->end;
-+	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- 	}
- 	break;
--    case SMALLITER:
--    case LARGEITER:
--    case GRAYSCALE:
--	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--	info_ptr->bit_depth = image->bytesperpixel * 8;
--	break;
-     case TRUECOLOR:
-     case TRUECOLOR24:
-     case TRUECOLOR16:
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->bit_depth = 8;
--	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
--	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
--	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	{
-+	    sig_bit.red = 8 - image->palette->info.truec.rprec;
-+	    sig_bit.green = 8 - image->palette->info.truec.gprec;
-+	    sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
-+	}
- 	break;
-     }
--    info_ptr->interlace_type = 0;
-+
-+    png_write_info(png_ptr, info_ptr);
-+
- #ifdef _undefined_
-     png_set_text(png_ptr, info_ptr, comments,
- 		 sizeof(comments) / sizeof(png_text));
- #endif
- 
--    png_write_info(png_ptr, info_ptr);
-+    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+	(png_uint_32) (100 / image->pixelheight), PNG_RESOLUTION_UNKNOWN);
-+
-+
-     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
-     png_set_packing(png_ptr);
-     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
--	png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+	png_set_shift(png_ptr, &sig_bit);
-     if (*b == 255)
- 	png_set_swap(png_ptr);
-     png_set_bgr(png_ptr);