Updated XaoS to 3.2.2.

Changes since 3.1:

RELEASE NOTES FOR XAOS VERSION 3.2.2
------------------------------------

This release contains a rewritten Mac OS X port by J. B. Langston III,
and some small fixes for pipes by Marton Torok. For more details
please read the ChangeLog file.


RELEASE NOTES FOR XAOS VERSION 3.2.1
------------------------------------

A new fractal type, the Spidron hornflake has appeared. We changed
the web site to a dokuwiki database, so the help system contains
now a converter for dokuwiki (not completely working yet).

STICKY/DESTDIR is now supported (by Claudio Fontana). The French
translation is updated (by Philippe Wautelet). Bigger fonts are
available for Latin-2 based usage if the user changes the screen
resolution more than 800x600 or 1000x720.

Some small fixes have been done in the catalog files.


RELEASE NOTES FOR XAOS VERSION 3.2
----------------------------------

Main points are the classic Sierpinski and Koch fractals, but still
other formulas are introduced. Some 'oldie but goldie' fractals are
included from the Fractint formula database. The keystroke order has been
changed a little bit. Now gcc-4.0.x is also supported (-mcpu is deprecated
now and the source had to be modified for this).

The new formulas are demonstrated with 3 new tutorial movies. These are
also available in Hungarian language. Volunteers are requested to
translate the new movies into other languages.


RELEASE NOTES FOR XAOS VERSION 3.1.3
------------------------------------

Using this release gcc version 4.0 should also compile the code, not only
the 3.x versions.

Two new fractal types were also added. In addition, the DirectX header
files have been fixed. The French translations are updated.


RELEASE NOTES FOR XAOS VERSION 3.1.2
------------------------------------

This release is a fast bugfix for some gcc versions (or more precisely,
there is a workaround for the B-B bug, see the ChangeLog for details).
The example files were not able to load in version 3.1.1 and msgmerge
was not recognized (this is fixed, however not tested yet).

There are other small but irrelevant fixes (see ChangeLog), too.


RELEASE NOTES FOR XAOS VERSION 3.1.1
------------------------------------

This release is a CVS snapshot freeze for those who are using newer
systems. The most important update is a fix for gcc-3.4. There are also

- improvements in French and Spanish translations,
- some more example files (contributed by Zsigmond Kovács),
- some fixes which patch annoying problems.

13 files changed, 75 insertions, 319 deletions

diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index cb0fefb9c1b..4985c5fd37e 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/06/08 12:24:55 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/10/02 23:03:33 rillig Exp $
 #
 
-DISTNAME=		XaoS-3.1
-PKGREVISION=		4
+DISTNAME=		XaoS-3.2.2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xaos/}
 
@@ -13,6 +12,7 @@ COMMENT=		Zoomable fractal rendering doodad
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	YES
+WRKSRC=			${WRKDIR}/XaoS
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-curses-driver=no
 # DGA fails to link somehow, XXX should be fixed
@@ -25,6 +25,8 @@ SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	configure
 SUBST_SED.paths=	-e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g'
 
+INSTALLATION_DIRS=	${PKGINFODIR}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/XaoS/PLIST b/x11/XaoS/PLIST
index b0930147579..9a4f8604c0c 100644
--- a/x11/XaoS/PLIST
+++ b/x11/XaoS/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/10/02 23:03:33 rillig Exp $
 bin/xaos
 info/xaos.info
 man/man6/xaos.6
@@ -39,9 +39,14 @@ share/XaoS/examples/barnsl8.xpf
 share/XaoS/examples/barnsl9.xpf
 share/XaoS/examples/beatle.xpf
 share/XaoS/examples/beatle2.xpf
+share/XaoS/examples/bolygo.xpf
 share/XaoS/examples/brown.xpf
 share/XaoS/examples/checker.xpf
 share/XaoS/examples/crone.xpf
+share/XaoS/examples/csiga2.xpf
+share/XaoS/examples/csiga3.xpf
+share/XaoS/examples/csiga4.xpf
+share/XaoS/examples/csiga5.xpf
 share/XaoS/examples/dblspira.xpf
 share/XaoS/examples/dragons.xpf
 share/XaoS/examples/dragons2.xpf
@@ -49,11 +54,18 @@ share/XaoS/examples/edge.xpf
 share/XaoS/examples/edge2.xpf
 share/XaoS/examples/edge3.xpf
 share/XaoS/examples/eifell.xpf
+share/XaoS/examples/fract0.xpf
+share/XaoS/examples/fract1.xpf
 share/XaoS/examples/galaxy.xpf
+share/XaoS/examples/gamma.xpf
+share/XaoS/examples/golden.xpf
 share/XaoS/examples/goldrive.xpf
 share/XaoS/examples/head.xpf
 share/XaoS/examples/head2.xpf
 share/XaoS/examples/head3.xpf
+share/XaoS/examples/hornflake1.xpf
+share/XaoS/examples/hornflake2.xpf
+share/XaoS/examples/impulzus.xpf
 share/XaoS/examples/incolor1.xpf
 share/XaoS/examples/incolor2.xpf
 share/XaoS/examples/incolor3.xpf
@@ -65,8 +77,31 @@ share/XaoS/examples/julia3.xpf
 share/XaoS/examples/julia4.xpf
 share/XaoS/examples/julia5.xpf
 share/XaoS/examples/juliaanim.xaf
+share/XaoS/examples/kovzsi10.2.xpf
+share/XaoS/examples/kovzsi12.xpf
+share/XaoS/examples/kovzsi14.xpf
+share/XaoS/examples/kovzsi15.xpf
+share/XaoS/examples/kovzsi16.xpf
+share/XaoS/examples/kovzsi17.xpf
+share/XaoS/examples/kovzsi2.1.xpf
+share/XaoS/examples/kovzsi2.xpf
+share/XaoS/examples/kovzsi3.1.xpf
+share/XaoS/examples/kovzsi3.2.xpf
+share/XaoS/examples/kovzsi4.xpf
+share/XaoS/examples/kovzsi6.1.xpf
+share/XaoS/examples/kovzsi6.2.xpf
+share/XaoS/examples/kovzsi6.xpf
+share/XaoS/examples/kovzsi7.1.xpf
+share/XaoS/examples/kovzsi7.2.xpf
+share/XaoS/examples/kovzsi7.3.xpf
+share/XaoS/examples/kovzsi7.4.xpf
+share/XaoS/examples/kovzsi7.5.xpf
+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.xpf
+share/XaoS/examples/lighting.xpf
 share/XaoS/examples/magnet.xpf
 share/XaoS/examples/magnet1.xpf
 share/XaoS/examples/magnet2.xpf
@@ -82,12 +117,17 @@ share/XaoS/examples/mand8.xpf
 share/XaoS/examples/mand9.xpf
 share/XaoS/examples/mandanim.xaf
 share/XaoS/examples/minibrot.xpf
+share/XaoS/examples/nap.xpf
 share/XaoS/examples/newton.xaf
 share/XaoS/examples/newton.xpf
 share/XaoS/examples/newton2.xpf
 share/XaoS/examples/newton3.xpf
 share/XaoS/examples/octo.xpf
+share/XaoS/examples/orveny.xpf
 share/XaoS/examples/palace.xpf
+share/XaoS/examples/pavaszem.xpf
+share/XaoS/examples/pavaszem2.xpf
+share/XaoS/examples/pepita.xpf
 share/XaoS/examples/perb1.xpf
 share/XaoS/examples/perb2.xpf
 share/XaoS/examples/perb3.xpf
@@ -119,11 +159,16 @@ share/XaoS/examples/truecol5.xpf
 share/XaoS/examples/truecol6.xpf
 share/XaoS/examples/truecol7.xpf
 share/XaoS/examples/ufo.xpf
+share/XaoS/examples/zsigapro.xpf
 share/XaoS/help/xaos.hlp
 share/XaoS/tutorial/3dtutor.xaf
+share/XaoS/tutorial/Bclosing.xaf
+share/XaoS/tutorial/Bintro.xaf
+share/XaoS/tutorial/Bolyai.xaf
 share/XaoS/tutorial/anim.xaf
 share/XaoS/tutorial/anim.xhf
 share/XaoS/tutorial/barnsley.xaf
+share/XaoS/tutorial/classic.xaf
 share/XaoS/tutorial/coast.xhf
 share/XaoS/tutorial/dimension.xaf
 share/XaoS/tutorial/escape.xaf
@@ -137,6 +182,7 @@ share/XaoS/tutorial/flake4.xhf
 share/XaoS/tutorial/flake5.xhf
 share/XaoS/tutorial/flaketh.xhf
 share/XaoS/tutorial/fmath.xaf
+share/XaoS/tutorial/fourfr.xaf
 share/XaoS/tutorial/fractal.xaf
 share/XaoS/tutorial/head.xhf
 share/XaoS/tutorial/incolor.xaf
@@ -152,6 +198,7 @@ share/XaoS/tutorial/new30.xaf
 share/XaoS/tutorial/newton.xaf
 share/XaoS/tutorial/octo.xaf
 share/XaoS/tutorial/other.xaf
+share/XaoS/tutorial/otherfr.xaf
 share/XaoS/tutorial/outcolor.xaf
 share/XaoS/tutorial/outnew.xhf
 share/XaoS/tutorial/palette.xaf
@@ -165,6 +212,7 @@ share/XaoS/tutorial/power.xaf
 share/XaoS/tutorial/render.xaf
 share/XaoS/tutorial/square.xhf
 share/XaoS/tutorial/tree.xhf
+share/XaoS/tutorial/trice.xaf
 share/XaoS/tutorial/truecol.xaf
 share/XaoS/tutorial/truecol.xhf
 share/locale/cs/LC_MESSAGES/xaos.mo
diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo
index b1136ed53fd..82286009314 100644
--- a/x11/XaoS/distinfo
+++ b/x11/XaoS/distinfo
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/05/20 18:09:49 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/10/02 23:03:33 rillig Exp $
 
-SHA1 (XaoS-3.1.tar.gz) = c9956dbea463040efc46c67f32b3d0e6b3bc4bfe
-RMD160 (XaoS-3.1.tar.gz) = b9761e160dbbbbc5c6aea1cb0f47e0efeac4e9de
-Size (XaoS-3.1.tar.gz) = 1182143 bytes
-SHA1 (patch-aa) = edace84b4c18ca5b596c79a6f4e77d2879f3fc3b
-SHA1 (patch-ab) = 537dedf39e3c5ae50a91f31715fcb28e30f002ee
-SHA1 (patch-ac) = 51329d932053b4f46acef29837f5648c8cb81589
+SHA1 (XaoS-3.2.2.tar.gz) = 517e36cd97be002eb1503ceda3f9be702af17fbe
+RMD160 (XaoS-3.2.2.tar.gz) = 3e2532127e592a8a3b920e19d0d1d076d213599d
+Size (XaoS-3.2.2.tar.gz) = 1371955 bytes
+SHA1 (patch-aa) = f4327652392714bbe27e4655de40f7208a528990
+SHA1 (patch-ac) = 98355581b4d45f927d58722cacb39ec83b7a540e
 SHA1 (patch-ad) = e783ed91ba611af333256a660d537bcf77992893
-SHA1 (patch-ae) = b775be83c1c52483382d046e77a61f51ab4294eb
-SHA1 (patch-af) = e6f22d72957099fcec643053ebbdc9fee1713fcc
-SHA1 (patch-ag) = e8d1b883a51f280f87bb9fb9ef527cf0a727f922
-SHA1 (patch-ah) = c95feb77f3a904ca82df3af7208590eeec2fbc8a
-SHA1 (patch-ai) = 96061838c91e33cfb01068303ac96231de392a4b
-SHA1 (patch-aj) = 300fd90a11abc846449504904e5cc48879a748b5
-SHA1 (patch-ak) = 1eb210b672e18b437f400fde40fc18b23d850e0e
+SHA1 (patch-al) = dc5adebc2220aa1f76920570d1212730adb2e7e7
diff --git a/x11/XaoS/patches/patch-aa b/x11/XaoS/patches/patch-aa
index 9e30b254921..53b67b27e92 100644
--- a/x11/XaoS/patches/patch-aa
+++ b/x11/XaoS/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2004/07/14 21:06:57 ben Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/02 23:03:33 rillig Exp $
 
 Rip out the 16 bit i387 specific code.
 
---- src/engine/fractal.c-orig	Wed Mar  4 16:49:12 1998
-+++ src/engine/fractal.c	Sun Mar 10 16:29:06 2002
+--- src/engine/fractal.c.orig	2003-02-03 17:16:37.000000000 +0100
++++ src/engine/fractal.c	2006-10-03 00:29:20.000000000 +0200
 @@ -49,13 +49,6 @@
  #include <complex.h>
  #include <plane.h>
@@ -18,7 +18,7 @@ Rip out the 16 bit i387 specific code.
  #ifdef __alpha__
  #ifdef __linux__
  #include <asm/fpu.h>
-@@ -382,15 +375,6 @@
+@@ -382,15 +375,6 @@ make_fractalc (CONST int formula, float 
  {
    fractal_context *new_ctxt;
  
@@ -34,15 +34,3 @@ Rip out the 16 bit i387 specific code.
  #ifdef __alpha__
  #ifdef __linux__
    extern void ieee_set_fp_control (unsigned long);
---- src/engine/Makefile.in-orig	Wed Mar  4 16:49:12 1998
-+++ src/engine/Makefile.in	Sun Mar 10 16:27:30 2002
-@@ -24,8 +24,7 @@ SRCS = formulas.c \
-        3d.c \
-        subwindow.c \
-        plane.c \
--       julia.c \
--       i386.c
-+       julia.c
- 
- 
- OBJS = $(SRCS:.c=.o)
diff --git a/x11/XaoS/patches/patch-ab b/x11/XaoS/patches/patch-ab
deleted file mode 100644
index 0feeb9a54bf..00000000000
--- a/x11/XaoS/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/07/14 21:06:57 ben Exp $
-
---- Makefile.in.orig	Wed Mar  4 22:49:12 1998
-+++ Makefile.in
-@@ -35,6 +35,7 @@ install: 
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
- 	@INSTALL@ -d $(DESTDIR)$(bindir)
-+	@INSTALL@ -d $(DESTDIR)$(infodir)
- 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
- 	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
- 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
-@@ -43,7 +44,6 @@ install: 
- 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
- 	@INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
- 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
--	@STICKY@
- 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)
- 	#install-info doc/xaos.info 
- 	if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi
diff --git a/x11/XaoS/patches/patch-ac b/x11/XaoS/patches/patch-ac
index 508bacbbf08..b9dca0f0406 100644
--- a/x11/XaoS/patches/patch-ac
+++ b/x11/XaoS/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2006/03/03 18:47:25 kristerw Exp $
+$NetBSD: patch-ac,v 1.3 2006/10/02 23:03:33 rillig Exp $
 
---- src/ui/ui.c.orig	2003-03-19 23:09:31.000000000 +1100
-+++ src/ui/ui.c
-@@ -169,6 +169,10 @@ CONST struct params global_params[] = {
-   {NULL, 0, NULL, NULL}

- };

- 

+--- src/ui/ui.c.orig	2006-07-09 10:47:42.000000000 +0200
++++ src/ui/ui.c	2006-10-03 00:46:05.000000000 +0200
+@@ -176,6 +176,10 @@ main_loop (void)
+        {NULL, 0, NULL, NULL}
+      };
+ 
 +
 +static void ui_mkimages (int, int);
 +static void main_loop (void);
 +
- static int resizeregistered = 0;

- static void

- ui_updatemenus (uih_context * c, CONST char *name)

+ static int resizeregistered = 0;
+ static void
+ ui_updatemenus (uih_context * c, CONST char *name)
diff --git a/x11/XaoS/patches/patch-ae b/x11/XaoS/patches/patch-ae
deleted file mode 100644
index 2411185a36c..00000000000
--- a/x11/XaoS/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/05/20 18:09:49 joerg Exp $
-
---- src/engine/formulas.c.orig	2003-01-10 10:26:12.000000000 +0000
-+++ src/engine/formulas.c
-@@ -247,13 +247,10 @@ hsv_to_rgb (int h, int s, int v, int *re
-     }
- }
- 
-+CONSTF REGISTERS (3)
- static unsigned int
- truecolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
- 		  int mode, int inset)
--     CONSTF REGISTERS (3);
--     static unsigned int
--       truecolor_output (number_t zre, number_t zim, number_t pre,
--			 number_t pim, int mode, int inset)
- {
-   /*WARNING r and b fiends are swapped for HISTORICAL REASONS (BUG :) */
-   int r = 0, g = 0, b = 0, w = 0;
-@@ -441,11 +438,9 @@ truecolor_output (number_t zre, number_t
- #ifdef __alpha__
- #define __TEST__
- #endif
-+CONSTF REGISTERS (3)
- static unsigned int
- color_output (number_t zre, number_t zim, unsigned int iter)
--     CONSTF REGISTERS (3);
--     static unsigned int
--       color_output (number_t zre, number_t zim, unsigned int iter)
- {
-   int i;
-   iter <<= SHIFT;
-@@ -525,13 +520,10 @@ color_output (number_t zre, number_t zim
- 
- }
- 
-+CONSTF REGISTERS (3)
- static unsigned int
- incolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
- 		unsigned int iter)
--     CONSTF REGISTERS (3);
--     static unsigned int
--       incolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
--		       unsigned int iter)
- {
-   int i = iter;
-   switch (cfractalc.incoloringmode)
diff --git a/x11/XaoS/patches/patch-af b/x11/XaoS/patches/patch-af
deleted file mode 100644
index addc1106422..00000000000
--- a/x11/XaoS/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/05/20 18:09:49 joerg Exp $
-
---- src/util/timers.c.orig	2006-05-20 17:38:48.000000000 +0000
-+++ src/util/timers.c
-@@ -331,6 +331,7 @@ __lookup_timer (tl_timer * t)
- #endif
- }
- 
-+REGISTERS (3)
- int
- tl_lookup_timer (tl_timer * t)
- {
-@@ -409,6 +410,7 @@ tl_sleep (int time)
- #endif
- }
- 
-+REGISTERS (3)
- void
- tl_reset_timer (tl_timer * t)
- {
diff --git a/x11/XaoS/patches/patch-ag b/x11/XaoS/patches/patch-ag
deleted file mode 100644
index d83eb2551fe..00000000000
--- a/x11/XaoS/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/05/20 18:09:49 joerg Exp $
-
---- src/ui-hlp/save.c.orig	2006-05-20 17:40:43.000000000 +0000
-+++ src/ui-hlp/save.c
-@@ -293,8 +293,6 @@ ndecimals (struct uih_context *uih)
- }
- static void
- savepos (struct uih_context *uih)
--REGISTERS (3);
--     static void savepos (struct uih_context *uih)
- {
-   int n = ndecimals (uih);
-   start_save (uih, "view");
-@@ -307,8 +305,6 @@ REGISTERS (3);
- }
- static void
- savepos2 (struct uih_context *uih)
--REGISTERS (3);
--     static void savepos2 (struct uih_context *uih)
- {
-   int n = ndecimals (uih);
-   start_save (uih, "animateview");
-@@ -321,8 +317,6 @@ REGISTERS (3);
- }
- static void
- savepos3 (struct uih_context *uih)
--REGISTERS (3);
--     static void savepos3 (struct uih_context *uih)
- {
-   int n = ndecimals (uih);
-   start_save (uih, "morphview");
diff --git a/x11/XaoS/patches/patch-ah b/x11/XaoS/patches/patch-ah
deleted file mode 100644
index 19cbe7aa0d2..00000000000
--- a/x11/XaoS/patches/patch-ah
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/05/20 18:09:49 joerg Exp $
-
---- src/engine/docalc.c.orig	2006-05-20 17:48:28.000000000 +0000
-+++ src/engine/docalc.c
-@@ -115,21 +115,15 @@
- #ifdef UNCOMPRESS
- /*uncompressed version of loop */
- #ifdef SMOOTHMODE
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- SCALC (register number_t zre, register number_t zim, register number_t pre,
-        register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       SCALC (register number_t zre, register number_t zim,
--	      register number_t pre, register number_t pim)
- #else
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- CALC (register number_t zre, register number_t zim, register number_t pre,
-       register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned
--       CALC (register number_t zre, register number_t zim,
--	     register number_t pre, register number_t pim)
- #endif
- {
-   register unsigned int iter = cfractalc.maxiter;
-@@ -252,21 +246,15 @@ CALC (register number_t zre, register nu
- }
- #else
- #ifdef SMOOTHMODE
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- SCALC (register number_t zre, register number_t zim, register number_t pre,
-        register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       SCALC (register number_t zre, register number_t zim,
--	      register number_t pre, register number_t pim)
- #else
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- CALC (register number_t zre, register number_t zim, register number_t pre,
-       register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       CALC (register number_t zre, register number_t zim,
--	     register number_t pre, register number_t pim)
- #endif
- {
-   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ ;
-@@ -344,21 +332,15 @@ CALC (register number_t zre, register nu
- #ifndef UNCOMPRESS
- 
- #ifdef SMOOTHMODE
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- SPERI (register number_t zre, register number_t zim, register number_t pre,
-        register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       SPERI (register number_t zre, register number_t zim,
--	      register number_t pre, register number_t pim)
- #else
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- PERI (register number_t zre, register number_t zim, register number_t pre,
-       register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       PERI (register number_t zre, register number_t zim,
--	     register number_t pre, register number_t pim)
- #endif
- {
-   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ , iter1 =
-@@ -467,21 +449,15 @@ end:
- /*F. : this macros definitions are really strange, but after a while, it's good */
- 
- #ifdef SMOOTHMODE
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- SPERI (register number_t zre, register number_t zim, register number_t pre,
-        register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       SPERI (register number_t zre, register number_t zim,
--	      register number_t pre, register number_t pim)
- #else
-+CONSTF REGISTERS (3)
- static unsigned int FUNCTYPE
- PERI (register number_t zre, register number_t zim, register number_t pre,
-       register number_t pim)
--     CONSTF REGISTERS (3);
--     static unsigned int FUNCTYPE
--       PERI (register number_t zre, register number_t zim,
--	     register number_t pre, register number_t pim)
- #endif
- {
-   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ ;
diff --git a/x11/XaoS/patches/patch-ai b/x11/XaoS/patches/patch-ai
deleted file mode 100644
index 1a301eeb281..00000000000
--- a/x11/XaoS/patches/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/05/20 18:09:49 joerg Exp $
-
---- src/engine/zoomd.c.orig	2006-05-20 17:54:37.000000000 +0000
-+++ src/engine/zoomd.c
-@@ -25,10 +25,9 @@
-  *  points 1 2 3 4 5 6 8 must be the same (point 8 is not yet calculated)
-  *
-  */
-+REGISTERS (3)
- static void
- calcline (realloc_t * RESTRICT ry)
--REGISTERS (3);
--     static void calcline (realloc_t * RESTRICT ry)
- {
-   number_t y;
-   int range = cfractalc.range;
-@@ -137,10 +136,9 @@ REGISTERS (3);
-   ry->recalculate = 0;
-   ry->dirty = 0;
- }
-+REGISTERS (3)
- static void
- calccolumn (realloc_t * RESTRICT rx)
--REGISTERS (3);
--     static void calccolumn (realloc_t * RESTRICT rx)
- {
-   number_t x;
-   int range = cfractalc.range;
diff --git a/x11/XaoS/patches/patch-aj b/x11/XaoS/patches/patch-aj
deleted file mode 100644
index 189e526cc9f..00000000000
--- a/x11/XaoS/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/05/20 18:09:50 joerg Exp $
-
---- src/engine/zoom.c.orig	2006-05-20 17:56:29.000000000 +0000
-+++ src/engine/zoom.c
-@@ -1324,10 +1324,9 @@ calculatenew (void /*@unused@ */ *data, 
- 	frames2 += 1);
- }
- 
-+REGISTERS (3)
- static void
- addprices (realloc_t * r, realloc_t * r2)
--REGISTERS (3);
--     static void addprices (realloc_t * r, realloc_t * r2)
- {
-   realloc_t *r3;
-   while (r < r2)
diff --git a/x11/XaoS/patches/patch-ak b/x11/XaoS/patches/patch-ak
deleted file mode 100644
index 1b591de8861..00000000000
--- a/x11/XaoS/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/05/20 18:09:50 joerg Exp $
-
---- src/engine/plane.c.orig	2006-05-20 17:57:12.000000000 +0000
-+++ src/engine/plane.c
-@@ -52,7 +52,7 @@ CONST char *CONST planename[] = {
-   NULL
- };
- 
--
-+REGISTERS(3)
- void
- recalculate (int plane, number_t * x1, number_t * y1)
- {