pkg/48836: [patch] almost trivial update of x11/XaoS to 3.6

[rhialto%falu.nl@localhost]

>Number:         48836
>Category:       pkg
>Synopsis:       [patch] almost trivial update of x11/XaoS to 3.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri May 23 14:50:00 +0000 2014
>Originator:     Rhialto
>Release:        NetBSD 6.1.1
>Organization:
        
>Environment:
        
        
System: NetBSD murthe.falu.nl 6.1.1 NetBSD 6.1.1 (MURTHE6.1.1) #4: Sat Sep 28 
12:38:49 CEST 2013 
rhialto%murthe.falu.nl@localhost:/usr/src/sys/arch/amd64/compile/MURTHE6.1.1 
amd64
Architecture: x86_64
Machine: amd64
>Description:
        x11/XaoS is out of date.
>How-To-Repeat:
        Inspection of the (new) website.
>Fix:
        Patch below.
        patches/patch-aa was shifted a few lines.
        Removed patches/patch-ab.

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile    16 Feb 2013 11:24:56 -0000      1.35
+++ Makefile    23 May 2014 14:43:10 -0000
@@ -1,13 +1,12 @@
 # $NetBSD: Makefile,v 1.35 2013/02/16 11:24:56 wiz Exp $
 #
 
-DISTNAME=              xaos-3.5
-PKGREVISION=           1
+DISTNAME=              xaos-3.6
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xaos/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://xaos.sourceforge.net/
+HOMEPAGE=              http://matek.hu/xaos/
 COMMENT=               Zoomable fractal rendering doodad
 LICENSE=               gnu-gpl-v2
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/PLIST,v
retrieving revision 1.12
diff -u -r1.12 PLIST
--- PLIST       30 Jul 2012 01:19:15 -0000      1.12
+++ PLIST       23 May 2014 14:43:10 -0000
@@ -49,6 +49,7 @@
 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/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/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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo    30 Jul 2012 01:19:15 -0000      1.15
+++ distinfo    23 May 2014 14:43:10 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.15 2012/07/30 01:19:15 dholland 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
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa    30 Jul 2012 01:19:16 -0000      1.4
+++ patches/patch-aa    23 May 2014 14:43:10 -0000
@@ -2,9 +2,9 @@
 
 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 @@
  #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;
  
cvs diff: cannot find patches/patch-ab

(since it was removed)

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'

>Unformatted: