Update of x11/XaoS to 3.1, as requested in PR#26323.

5 files changed, 136 insertions, 68 deletions

diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index 544d2da4a85..143ff5c97ae 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/03/24 11:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/14 21:06:57 ben Exp $
 #
 
-DISTNAME=		XaoS-3.0
-PKGREVISION=		1
+DISTNAME=		XaoS-3.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xaos/}
 
@@ -10,11 +9,16 @@ MAINTAINER=		atatat@NetBSD.org
 HOMEPAGE=		http://xaos.theory.org/
 COMMENT=		Zoomable fractal rendering doodad
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BUILDLINK3=		YES
+USE_GNU_TOOLS=		make
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-curses-driver=no
+# DGA fails to link somehow, XXX should be fixed
+CONFIGURE_ARGS+=	--with-dga-driver=no
 INFO_FILES=		xaos.info
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XaoS/PLIST b/x11/XaoS/PLIST
index 919e4ef7b8e..e268de9bf83 100644
--- a/x11/XaoS/PLIST
+++ b/x11/XaoS/PLIST
@@ -1,37 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/11 15:42:21 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/07/14 21:06:57 ben Exp $
 bin/xaos
 man/man6/xaos.6
-share/XaoS/tutorial/anim.xaf
-share/XaoS/tutorial/anim.xhf
-share/XaoS/tutorial/barnsley.xaf
-share/XaoS/tutorial/features.xaf
-share/XaoS/tutorial/filter.xaf
-share/XaoS/tutorial/filter.xhf
-share/XaoS/tutorial/fractal.xaf
-share/XaoS/tutorial/head.xhf
-share/XaoS/tutorial/incolor.xaf
-share/XaoS/tutorial/innew.xhf
-share/XaoS/tutorial/intro.xaf
-share/XaoS/tutorial/keys.xhf
-share/XaoS/tutorial/magnet.xaf
-share/XaoS/tutorial/new30.xaf
-share/XaoS/tutorial/newton.xaf
-share/XaoS/tutorial/octo.xaf
-share/XaoS/tutorial/other.xaf
-share/XaoS/tutorial/outcolor.xaf
-share/XaoS/tutorial/outnew.xhf
-share/XaoS/tutorial/palette.xaf
-share/XaoS/tutorial/palette.xhf
-share/XaoS/tutorial/pause.xhf
-share/XaoS/tutorial/pert.xaf
-share/XaoS/tutorial/pert.xhf
-share/XaoS/tutorial/phoenix.xaf
-share/XaoS/tutorial/plane.xaf
-share/XaoS/tutorial/power.xaf
-share/XaoS/tutorial/truecol.xaf
-share/XaoS/tutorial/truecol.xhf
+share/XaoS/catalogs/README
+share/XaoS/catalogs/cesky.cat
+share/XaoS/catalogs/deutsch.cat
+share/XaoS/catalogs/english.cat
+share/XaoS/catalogs/espanhol.cat
+share/XaoS/catalogs/francais.cat
+share/XaoS/catalogs/magyar.cat
+share/XaoS/doc/AUTHORS
+share/XaoS/doc/PROBLEMS
+share/XaoS/doc/README
+share/XaoS/doc/README.bugs
+share/XaoS/doc/compilers.txt
 share/XaoS/examples/0rfel1.xpf
 share/XaoS/examples/0rfel2.xpf
+share/XaoS/examples/2spirals.xpf
+share/XaoS/examples/3d1.xpf
+share/XaoS/examples/3d2.xpf
+share/XaoS/examples/3d3.xpf
+share/XaoS/examples/3d4.xpf
+share/XaoS/examples/3d5.xpf
+share/XaoS/examples/3d6.xpf
+share/XaoS/examples/3d7.xpf
+share/XaoS/examples/3d8.xpf
+share/XaoS/examples/3d9.xpf
 share/XaoS/examples/README
 share/XaoS/examples/axe.xpf
 share/XaoS/examples/barnsl1.xpf
@@ -46,9 +39,11 @@ share/XaoS/examples/barnsl9.xpf
 share/XaoS/examples/beatle.xpf
 share/XaoS/examples/beatle2.xpf
 share/XaoS/examples/brown.xpf
+share/XaoS/examples/checker.xpf
 share/XaoS/examples/crone.xpf
 share/XaoS/examples/dblspira.xpf
 share/XaoS/examples/dragons.xpf
+share/XaoS/examples/dragons2.xpf
 share/XaoS/examples/edge.xpf
 share/XaoS/examples/edge2.xpf
 share/XaoS/examples/edge3.xpf
@@ -66,6 +61,9 @@ share/XaoS/examples/incolor5.xpf
 share/XaoS/examples/julia.xpf
 share/XaoS/examples/julia2.xpf
 share/XaoS/examples/julia3.xpf
+share/XaoS/examples/julia4.xpf
+share/XaoS/examples/julia5.xpf
+share/XaoS/examples/juliaanim.xaf
 share/XaoS/examples/lemon.xpf
 share/XaoS/examples/light.xpf
 share/XaoS/examples/magnet.xpf
@@ -75,8 +73,19 @@ share/XaoS/examples/magnet3.xpf
 share/XaoS/examples/magnet4.xpf
 share/XaoS/examples/mand1.xpf
 share/XaoS/examples/mand2.xpf
+share/XaoS/examples/mand3.xpf
+share/XaoS/examples/mand4.xpf
+share/XaoS/examples/mand5.xpf
+share/XaoS/examples/mand7.xpf
+share/XaoS/examples/mand8.xpf
+share/XaoS/examples/mand9.xpf
+share/XaoS/examples/mandanim.xaf
 share/XaoS/examples/minibrot.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/palace.xpf
 share/XaoS/examples/perb1.xpf
 share/XaoS/examples/perb2.xpf
@@ -89,8 +98,12 @@ share/XaoS/examples/redjulia.xpf
 share/XaoS/examples/redmand.xpf
 share/XaoS/examples/redmand2.xpf
 share/XaoS/examples/rocks.xpf
+share/XaoS/examples/shell.xpf
 share/XaoS/examples/something.xpf
+share/XaoS/examples/spiral.xpf
 share/XaoS/examples/spiral2.xpf
+share/XaoS/examples/spiral3.xpf
+share/XaoS/examples/spiral4.xpf
 share/XaoS/examples/sprial.xpf
 share/XaoS/examples/sun.xpf
 share/XaoS/examples/thebug.xpf
@@ -101,22 +114,61 @@ share/XaoS/examples/truecol1.xpf
 share/XaoS/examples/truecol2.xpf
 share/XaoS/examples/truecol3.xpf
 share/XaoS/examples/truecol4.xpf
-share/XaoS/examples/ufo.xpf
 share/XaoS/examples/truecol5.xpf
-share/XaoS/catalogs/cesky.cat
-share/XaoS/catalogs/cesky2.cat
-share/XaoS/catalogs/deutsch.cat
-share/XaoS/catalogs/deutsch.cat.utf-8
-share/XaoS/catalogs/english.cat
-share/XaoS/catalogs/francais.cat
-share/XaoS/doc/README
-share/XaoS/doc/README.bugs
-share/XaoS/doc/compilers.txt
-share/XaoS/doc/ANNOUNCE
-share/XaoS/doc/PROBLEMS
-share/XaoS/doc/tutorial.txt
-@dirrm share/XaoS/tutorial
-@dirrm share/XaoS/examples
+share/XaoS/examples/truecol6.xpf
+share/XaoS/examples/truecol7.xpf
+share/XaoS/examples/ufo.xpf
+share/XaoS/help/xaos.hlp
+share/XaoS/tutorial/3dtutor.xaf
+share/XaoS/tutorial/anim.xaf
+share/XaoS/tutorial/anim.xhf
+share/XaoS/tutorial/barnsley.xaf
+share/XaoS/tutorial/coast.xhf
+share/XaoS/tutorial/dimension.xaf
+share/XaoS/tutorial/escape.xaf
+share/XaoS/tutorial/features.xaf
+share/XaoS/tutorial/filter.xaf
+share/XaoS/tutorial/filter.xhf
+share/XaoS/tutorial/flake1.xhf
+share/XaoS/tutorial/flake2.xhf
+share/XaoS/tutorial/flake3.xhf
+share/XaoS/tutorial/flake4.xhf
+share/XaoS/tutorial/flake5.xhf
+share/XaoS/tutorial/flaketh.xhf
+share/XaoS/tutorial/fmath.xaf
+share/XaoS/tutorial/fractal.xaf
+share/XaoS/tutorial/head.xhf
+share/XaoS/tutorial/incolor.xaf
+share/XaoS/tutorial/innew.xhf
+share/XaoS/tutorial/intro.xaf
+share/XaoS/tutorial/julia.xaf
+share/XaoS/tutorial/keys.xhf
+share/XaoS/tutorial/line1.xhf
+share/XaoS/tutorial/magnet.xaf
+share/XaoS/tutorial/mset.xaf
+share/XaoS/tutorial/msetren.xaf
+share/XaoS/tutorial/new30.xaf
+share/XaoS/tutorial/newton.xaf
+share/XaoS/tutorial/octo.xaf
+share/XaoS/tutorial/other.xaf
+share/XaoS/tutorial/outcolor.xaf
+share/XaoS/tutorial/outnew.xhf
+share/XaoS/tutorial/palette.xaf
+share/XaoS/tutorial/palette.xhf
+share/XaoS/tutorial/pause.xhf
+share/XaoS/tutorial/pert.xaf
+share/XaoS/tutorial/pert.xhf
+share/XaoS/tutorial/phoenix.xaf
+share/XaoS/tutorial/plane.xaf
+share/XaoS/tutorial/power.xaf
+share/XaoS/tutorial/render.xaf
+share/XaoS/tutorial/square.xhf
+share/XaoS/tutorial/tree.xhf
+share/XaoS/tutorial/truecol.xaf
+share/XaoS/tutorial/truecol.xhf
 @dirrm share/XaoS/catalogs
 @dirrm share/XaoS/doc
+@dirrm share/XaoS/examples
+@dirrm share/XaoS/help
+@dirrm share/XaoS/tutorial
 @dirrm share/XaoS
diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo
index a9095bf00dc..db2d1b60951 100644
--- a/x11/XaoS/distinfo
+++ b/x11/XaoS/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/03/24 11:56:00 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/07/14 21:06:57 ben Exp $
 
-SHA1 (XaoS-3.0.tar.gz) = 1537e5ec5a60dd018bc3bf8ee6cc8f81943b539b
-Size (XaoS-3.0.tar.gz) = 491049 bytes
-SHA1 (patch-aa) = 6e176f87e319f05f46c234df303a1cdf818921bd
-SHA1 (patch-ab) = cc6e2b1b70637a40200f1500b6ab70bc9f1c9384
+SHA1 (XaoS-3.1.tar.gz) = c9956dbea463040efc46c67f32b3d0e6b3bc4bfe
+Size (XaoS-3.1.tar.gz) = 1182143 bytes
+SHA1 (patch-aa) = edace84b4c18ca5b596c79a6f4e77d2879f3fc3b
+SHA1 (patch-ab) = 537dedf39e3c5ae50a91f31715fcb28e30f002ee
diff --git a/x11/XaoS/patches/patch-aa b/x11/XaoS/patches/patch-aa
index 33f1a214c83..9e30b254921 100644
--- a/x11/XaoS/patches/patch-aa
+++ b/x11/XaoS/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2002/03/25 16:19:31 atatat Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/14 21:06:57 ben 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
-@@ -48,13 +48,6 @@
+@@ -49,13 +49,6 @@
  #include <complex.h>
  #include <plane.h>
- #include <timers.h>
+ #include "../include/timers.h"
 -#ifdef __GNUC__
 -#ifdef __i386__
 -#ifndef PC_64
@@ -18,27 +18,31 @@ Rip out the 16 bit i387 specific code.
  #ifdef __alpha__
  #ifdef __linux__
  #include <asm/fpu.h>
-@@ -333,11 +326,6 @@
+@@ -382,15 +375,6 @@
  {
    fractal_context *new_ctxt;
  
+-#ifndef __BEOS__
 -#ifdef __GNUC__
 -#ifdef __i386__
+-#ifndef NOASSEMBLY
 -  _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC);
 -#endif
 -#endif
+-#endif
+-#endif
  #ifdef __alpha__
  #ifdef __linux__
-   extern void ieee_set_fp_control(unsigned long);
+   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
-@@ -22,8 +22,7 @@
-        stereogram.c \
+@@ -24,8 +24,7 @@ SRCS = formulas.c \
+        3d.c \
         subwindow.c \
         plane.c \
 -       julia.c \
 -       i386.c
 +       julia.c
  
- OBJS = $(SRCS:.c=.o)
  
+ OBJS = $(SRCS:.c=.o)
diff --git a/x11/XaoS/patches/patch-ab b/x11/XaoS/patches/patch-ab
index 806f340f5ad..0feeb9a54bf 100644
--- a/x11/XaoS/patches/patch-ab
+++ b/x11/XaoS/patches/patch-ab
@@ -1,12 +1,20 @@
-$NetBSD: patch-ab,v 1.3 2004/03/24 11:56:00 wiz Exp $
+$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
-@@ -41,7 +41,6 @@ install: 
- 	@INSTALL@ -m 444 catalogs/* $(datadir)/XaoS/catalogs
- 	@INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(datadir)/XaoS/doc
- 	@INSTALL@ -m 444 doc/xaos.6 $(mandir)/man6
+@@ -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 $(infodir)
+ 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)
  	#install-info doc/xaos.info 
- 
+ 	if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi