Update to v3.1.2, add OPTIONS support, add support for aalib, and

some minor fixes.

Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>

9 files changed, 34 insertions, 687 deletions

diff --git a/graphics/xaos/files/patch-aa b/graphics/xaos/files/patch-aa
deleted file mode 100644
index 05af514f3a3e..000000000000
--- a/graphics/xaos/files/patch-aa
+++ /dev/null
@@ -1,357 +0,0 @@
---- src/engine/blur.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/blur.c	Fri Jul  3 15:39:10 1998
-@@ -1,5 +1,10 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <math.h>
- #include <config.h>
-@@ -294,6 +299,7 @@
- }
- #define AMOUNT 0.005
- #define DIV 1000.0
-+#undef MAX
- #define MAX 800*1000		/*after 800 frames should be OK */
- static int
- doit (struct filter *f, int flags, int time1)
---- src/engine/btrace.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/btrace.c	Fri Jul  3 16:24:08 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <math.h>
- #include <stdio.h>
- #include <string.h>
---- src/engine/dither.c--	Fri Jul  3 14:15:34 1998
-+++ src/engine/dither.c	Fri Jul  3 15:36:23 1998
-@@ -13,8 +13,13 @@
-  * Note that quite interesting alg. is for preparing dithering table at
-  * fixedcolor displays.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <config.h>
- #include <stdio.h>
- #include <string.h>
-@@ -31,6 +36,7 @@
- #include <filter.h>
- #include <fractal.h>
- #include <xthread.h>
-+#undef MSIZE
- #define MSIZE 8
- static int matrix[MSIZE][MSIZE] =
- {
---- src/engine/edge.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/edge.c	Fri Jul  3 14:16:28 1998
-@@ -2,8 +2,15 @@
-  * This is very simple filter - it initializes smalliter image and then
-  * does an simple edge detection algo on it.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>		/*for NULL */
- #else
- #include <u.h>
---- src/engine/edge2.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/edge2.c	Fri Jul  3 14:17:40 1998
-@@ -2,8 +2,15 @@
-  * This is very simple filter - it initializes smalliter image and then
-  * does an simple edge detection algo on it.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>		/*for NULL */
- #else
- #include <u.h>
---- src/engine/emboss.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/emboss.c	Fri Jul  3 14:11:39 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>
- #else
- #include <u.h>
---- src/engine/fractal.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/fractal.c	Wed Sep  8 00:45:59 1999
-@@ -20,15 +20,21 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- /*#define STATISTICS */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifdef _plan9_
- #include <u.h>
- #include <libc.h>
- #include <stdio.h>
- #else
- #include <stdio.h>
--#ifndef _MAC
-+#if (!defined(_MAC) && (!defined(BSD) || (BSD < 199506)))
- #include <malloc.h>
- #endif
-+#if (defined(BSD) && (BSD >= 199506))
-+#include <stdlib.h>
-+#endif
- #include <aconfig.h>
- #include <string.h>
- #include <config.h>
-@@ -50,16 +56,21 @@
- #include <timers.h>
- #ifdef __GNUC__
- #ifdef __i386__
-+#ifdef __linux__
- #ifndef PC_64
- #include <i386/ctrl87.h>
- #endif
- #endif
- #endif
-+#endif
- #ifdef __alpha__
- #ifdef __linux__
- #include <asm/fpu.h>
- #endif
- #endif
-+#if (defined(BSD) && (BSD >= 199506))
-+#include <floatingpoint.h>
-+#endif
- #ifndef M_PI
- #define M_PI 3.1415
- #endif
-@@ -335,9 +346,11 @@
- 
- #ifdef __GNUC__
- #ifdef __i386__
-+#ifdef __linux__
-   _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC);
- #endif
- #endif
-+#endif
- #ifdef __alpha__
- #ifdef __linux__
-   extern void ieee_set_fp_control(unsigned long);
-@@ -352,6 +365,16 @@
-     /*fcr &= ~(FPINEX | FPOVFL | FPUNFL | FPZDIV);*/
-     setfcr (fcr);
-   }
-+#endif
-+#ifdef BSD
-+  /* ignore all possible exceptions */
-+#ifdef __alpha__
-+  (void) fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ |
-+		FP_X_IMP));
-+#else
-+  (void) fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ |
-+		FP_X_IMP | FP_X_DNML));
-+#endif
- #endif
-   new_ctxt = (fractal_context *) calloc (sizeof (fractal_context), 1);
-   if (new_ctxt == NULL)
---- src/engine/i386.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/i386.c	Fri Jul  3 17:48:38 1998
-@@ -1,4 +1,4 @@
--
-+#ifdef __linux__
- /*
-  * ctrl87.c
-  */
-@@ -211,6 +211,7 @@
-     }
-   return _to;
- }
-+#endif
- #endif
- #endif
- #endif
---- src/engine/interlace.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/interlace.c	Fri Jul  3 14:21:21 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>		/*for NULL */
- #include <string.h>		/*for memcpy */
- #else
---- src/engine/itersmall.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/itersmall.c	Fri Jul  3 14:22:29 1998
-@@ -1,5 +1,10 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <config.h>
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
---- src/engine/julia.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/julia.c	Fri Jul  3 14:24:57 1998
-@@ -1,3 +1,6 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifdef _plan9_
- #include <u.h>
- #include <stdio.h>
-@@ -5,7 +8,9 @@
- #else
- #include <math.h>
- #include <string.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #endif
---- src/engine/palettef.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/palettef.c	Fri Jul  3 14:09:38 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>
- #else
- #include <u.h>
---- src/engine/rotate.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/rotate.c	Fri Jul  3 16:24:16 1998
-@@ -4,12 +4,19 @@
-  * 'E' menu.
-  * It is used to implement fast rotation mode
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <string.h>
- #include <limits.h>
- #include <archaccel.h>
- #include <math.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #else
- #include <u.h>
- #include <libc.h>
---- src/engine/star.c--	Fri Jul  3 14:12:59 1998
-+++ src/engine/star.c	Fri Jul  3 14:51:59 1998
-@@ -1,5 +1,10 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <config.h>
- #include <limits.h>
- #ifdef HAVE_ALLOCA_H
---- src/engine/stereogram.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/stereogram.c	Fri Jul  3 14:22:55 1998
-@@ -1,5 +1,10 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <config.h>
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
---- src/engine/subwindow.c--	Fri Jul  3 14:24:23 1998
-+++ src/engine/subwindow.c	Fri Jul  3 14:23:57 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>		/*for NULL */
- #include <string.h>		/*for memcpy */
- #else
---- src/engine/zoom.c--	Thu Mar  5 03:19:12 1998
-+++ src/engine/zoom.c	Fri Jul  3 16:24:03 1998
-@@ -20,6 +20,9 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- /*#define DRAW */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifdef _plan9_
- #include <u.h>
- #include <libc.h>
-@@ -27,7 +30,7 @@
- #else
- #include <stdlib.h>
- #include <stdio.h>
--#ifndef _MAC
-+#if (!defined(_MAC) && (!defined(BSD) || (BSD < 199506)))
- #include <malloc.h>
- #endif
- #ifdef __EMX__
-@@ -61,6 +64,7 @@
- #include "calculate.h"		/*an inlined calulate function */
- 
- #define ASIZE 16
-+#undef ALIGN
- #define ALIGN(x) (((x)+ASIZE-1)&(~(ASIZE-1)))
- static int nsymetrized;
- static unsigned char *tmpdata, *tmpdata1;
diff --git a/graphics/xaos/files/patch-ab b/graphics/xaos/files/patch-ab
deleted file mode 100644
index 1f412c8d8f74..000000000000
--- a/graphics/xaos/files/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/filter/filter.c--	Thu Mar  5 03:19:12 1998
-+++ src/filter/filter.c	Fri Jul  3 13:43:18 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #else
- #include <u.h>
- #include <libc.h>
---- src/filter/image.c--	Thu Mar  5 03:19:12 1998
-+++ src/filter/image.c	Fri Jul  3 13:40:07 1998
-@@ -1,5 +1,12 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <string.h>
- #include <fconfig.h>
- #include <assert.h>
---- src/filter/palette.c--	Thu Mar  5 03:19:12 1998
-+++ src/filter/palette.c	Fri Jul  3 14:54:09 1998
-@@ -1,3 +1,6 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifdef _plan9_
- #include <u.h>
- #include <libc.h>
-@@ -10,7 +13,9 @@
- #include <config.h>
- #include <assert.h>
- #include <stdio.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <limits.h>
- #endif
- #include <fconfig.h>
diff --git a/graphics/xaos/files/patch-ac b/graphics/xaos/files/patch-ac
deleted file mode 100644
index 0a426b197548..000000000000
--- a/graphics/xaos/files/patch-ac
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/ui/play.c--	Fri Jul  3 15:42:09 1998
-+++ src/ui/play.c	Fri Jul  3 15:41:43 1998
-@@ -1,6 +1,13 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <limits.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <string.h>
- #else
- #include <u.h>
---- src/ui/save.c--	Thu Mar  5 03:19:12 1998
-+++ src/ui/save.c	Fri Jul  3 15:43:21 1998
-@@ -1,8 +1,15 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <limits.h>
- #include <string.h>
- #include <errno.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #else
- #include <u.h>
- #include <libc.h>
---- src/ui/ui_helper.c--	Thu Mar  5 03:19:12 1998
-+++ src/ui/ui_helper.c	Fri Jul  3 15:40:43 1998
-@@ -1,5 +1,10 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <ctype.h>
- #include <stdlib.h>
- #include <limits.h>
diff --git a/graphics/xaos/files/patch-ad b/graphics/xaos/files/patch-ad
deleted file mode 100644
index 0776bb463acb..000000000000
--- a/graphics/xaos/files/patch-ad
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/util/catalog.c--	Thu Mar  5 03:19:12 1998
-+++ src/util/catalog.c	Fri Jul  3 15:47:35 1998
-@@ -1,6 +1,13 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <string.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <string.h>
- #else
- #include <u.h>
---- src/util/png.c--	Thu Mar  5 03:19:12 1998
-+++ src/util/png.c	Fri Jul  3 15:46:07 1998
-@@ -1,3 +1,6 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <aconfig.h>
- #ifdef USE_PNG
-@@ -5,7 +8,9 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <errno.h>
- #else
- #include <u.h>
---- src/util/timers.c--	Fri Jul  3 16:35:49 1998
-+++ src/util/timers.c	Fri Jul  3 16:37:16 1998
-@@ -21,17 +21,26 @@
-  *
-  * All ugly architecture depended timing code is separated into this file..
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifdef _plan9_
- #include <u.h>
- #include <stdio.h>
- #include <libc.h>
- #else
- #include <aconfig.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>
- #include <unistd.h>
- #ifndef _MAC
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #endif
- #ifdef __BEOS__
- #include <OS.h>
---- src/util/xstdio.c--	Thu Mar  5 03:19:12 1998
-+++ src/util/xstdio.c	Fri Jul  3 15:49:40 1998
-@@ -1,6 +1,9 @@
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #ifndef _plan9_
- #include <string.h>
--#ifdef __EMX__
-+#if (defined(__EMX__) || defined(BSD))
- #include <sys/types.h>
- #endif
- #include <dirent.h>
diff --git a/graphics/xaos/files/patch-ae b/graphics/xaos/files/patch-ae
deleted file mode 100644
index c5e84c2122c8..000000000000
--- a/graphics/xaos/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/ui_helper.h--	Thu Mar  5 03:19:12 1998
-+++ src/include/ui_helper.h	Fri Jul  3 16:05:50 1998
-@@ -217,6 +217,7 @@
- 
- #define uih_needrecalculate(context) ((context)->recalculatemode)
- #define uih_needdisplay(context) ((context)->display)
-+#undef MAX
- #define MAX(a,b) ((a)>(b)?(a):(b))
- #define uih_newimage(c) (((c)->recalculatemode=MAX((c)->recalculatemode,UIH_NEW_IMAGE)))
- #define uih_animate_image(c) ((c)->recalculatemode=MAX((c)->recalculatemode,UIH_ANIMATION))
diff --git a/graphics/xaos/files/patch-af b/graphics/xaos/files/patch-af
deleted file mode 100644
index 1e89a84b7c88..000000000000
--- a/graphics/xaos/files/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/ui/ui-drv/curses/mktable.c--	Thu Mar  5 03:19:12 1998
-+++ src/ui/ui-drv/curses/mktable.c	Fri Jul  3 16:43:57 1998
-@@ -20,10 +20,15 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include "mktable.h"
- #include <config.h>
- #ifdef CURSES_DRIVER
-@@ -396,6 +401,7 @@
- #define postoparams(pos,i1,i2,i3,i4) \
-   ((i1)=(pos)>>12),((i2)=((pos)>>8)&15),((i3)=((pos)>>4)&15),((i4)=((pos))&15)
- 
-+#undef isset
- #define isset(n,i) (((i)&1<<(n))!=0)
- #define canset(n,i) (!isset(n,i)&&isset(n+1,i))
- static int width = 8;
---- src/ui/ui-drv/curses/ui_curses.c--	Fri Jul  3 16:40:53 1998
-+++ src/ui/ui-drv/curses/ui_curses.c	Fri Jul  3 16:40:24 1998
-@@ -19,11 +19,16 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #include "aconfig.h"
- #ifdef CURSES_DRIVER
- #include <stdio.h>
- #include <stdlib.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include <signal.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/graphics/xaos/files/patch-ag b/graphics/xaos/files/patch-ag
deleted file mode 100644
index 3f4a64300fca..000000000000
--- a/graphics/xaos/files/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/ui/ui-drv/x11/xlib.c--	Thu Mar  5 03:19:12 1998
-+++ src/ui/ui-drv/x11/xlib.c	Fri Jul  3 16:49:25 1998
-@@ -19,6 +19,9 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
- #include "aconfig.h"
- #ifdef X11_DRIVER
- #include <X11/Xlib.h>
-@@ -26,7 +29,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if (!defined(BSD) || (BSD < 199506))
- #include <malloc.h>
-+#endif
- #include "xlib.h"
- #ifdef AMIGA
- #define XFlush(x) while(0)
-@@ -230,6 +235,7 @@
-   XDestroyImage (d->image[0]);
-   XDestroyImage (d->image[1]);
- }
-+#undef	MAX
- #define MAX(x,y) ((x)>(y)?(x):(y))
- 
- 
diff --git a/graphics/xaos/files/patch-ah b/graphics/xaos/files/patch-ah
deleted file mode 100644
index 4f865c75bd7b..000000000000
--- a/graphics/xaos/files/patch-ah
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/include/i386/__math.h--	Thu Mar  5 03:19:12 1998
-+++ src/include/i386/__math.h	Fri Jul  3 13:59:51 1998
-@@ -179,7 +179,7 @@
-   __asm __volatile__
-     ("fldl	%%st(0)\n\t"
-      "frndint			# int(x)\n\t"
--     "fxch\n\t"
-+     "fxch	%%st(1)\n\t"
-      "fsub	%%st(1)		# fract(x)\n\t"
-      "f2xm1			# 2^(fract(x)) - 1\n\t"
-      : "=t" (__value), "=u" (__exponent) : "0" (__x));
-@@ -254,7 +254,7 @@
-      "fmul	%%st(1)		# x * log2(e)\n\t"			      \
-      "fstl	%%st(1)\n\t"						      \
-      "frndint			# int(x * log2(e))\n\t"			      \
--     "fxch\n\t"								      \
-+     "fxch	%%st(1)\n\t"						      \
-      "fsub	%%st(1)		# fract(x * log2(e))\n\t"		      \
-      "f2xm1			# 2^(fract(x * log2(e))) - 1\n\t"	      \
-      "fscale			# 2^(x * log2(e)) - 2^(int(x * log2(e)))\n\t" \
-@@ -275,7 +275,7 @@
-      "fmul	%%st(1)		# x * log2(e)\n\t"			      \
-      "fstl	%%st(1)\n\t"						      \
-      "frndint			# int(x * log2(e))\n\t"			      \
--     "fxch\n\t"								      \
-+     "fxch	%%st(1)\n\t"						      \
-      "fsub	%%st(1)		# fract(x * log2(e))\n\t"		      \
-      "f2xm1			# 2^(fract(x * log2(e))) - 1\n\t"	      \
-      : "=t" (__value), "=u" (__exponent) : "0" (__x));			      \
-@@ -350,7 +350,7 @@
-     ("fmul	%%st(1)		# y * log2(x)\n\t"
-      "fst	%%st(1)\n\t"
-      "frndint			# int(y * log2(x))\n\t"
--     "fxch\n\t"
-+     "fxch	%%st(1)\n\t"
-      "fsub	%%st(1)		# fract(y * log2(x))\n\t"
-      "f2xm1			# 2^(fract(y * log2(x))) - 1\n\t"
-      : "=t" (__value), "=u" (__exponent) : "0" (__y), "1" (__value));
-@@ -380,8 +380,8 @@
- __inline_mathop (cos, "fcos")
- 
- __inline_mathop (atan, "fld1; fpatan")
--__inline_mathop (log, "fldln2; fxch; fyl2x")
--__inline_mathop (log10, "fldlg2; fxch; fyl2x")
-+__inline_mathop (log, "fldln2; fxch %%st(1); fyl2x")
-+__inline_mathop (log10, "fldlg2; fxch %%st(1); fyl2x")
- 
- __inline_mathcode (asin, __x, return __atan2l (__x, __sqrtl (1.0 - __x * __x)))
- __inline_mathcode (acos, __x, return __atan2l (__sqrtl (1.0 - __x * __x), __x))
-@@ -441,7 +441,7 @@
- /* Optimized versions for some non-standardized functions.  */
- #if defined __USE_ISOC9X || defined __USE_MISC
- 
--__inline_mathop(log2, "fld1; fxch; fyl2x")
-+__inline_mathop(log2, "fld1; fxch %%st(1); fyl2x")
- 
- __inline_mathcode (expm1, __x, __expm1_code)
- 
-@@ -456,7 +456,7 @@
-   else
-     __asm __volatile__
-       ("fldln2\n\t"
--       "fxch\n\t"
-+       "fxch %%st(1)\n\t"
-        "fyl2xp1"
-        : "=t" (__value) : "0" (__x));
-   return __value)
diff --git a/graphics/xaos/files/patch-ai b/graphics/xaos/files/patch-ai
index 58ced0917560..18d5302ac49a 100644
--- a/graphics/xaos/files/patch-ai
+++ b/graphics/xaos/files/patch-ai
@@ -1,11 +1,40 @@
---- configure--	Thu Mar  5 03:19:12 1998
-+++ configure	Wed Feb 28 14:20:17 2001
-@@ -5522,7 +5522,7 @@
+--- configure.orig	Fri Feb 11 12:48:52 2005
++++ configure	Tue Jun 14 03:40:19 2005
+@@ -13597,7 +13597,7 @@
+ 
+     if $search_aalib
+     then
+-        if test -f /usr/include/aalib.h
++        if /usr/bin/true
+         then
+             LIBS1="$LIBS"
+             if test "x$no_x" = x; then
+@@ -13670,8 +13670,8 @@
+ fi
+ 
+             if test "x$ac_cv_lib_aa_aa_init" = xyes; then
+-              echo "$as_me:$LINENO: result: Found aalib on /usr/include/aalib.h" >&5
+-echo "${ECHO_T}Found aalib on /usr/include/aalib.h" >&6
++              echo "$as_me:$LINENO: result: Found aalib on ${PREFIX}/include/aalib.h" >&5
++echo "${ECHO_T}Found aalib on ${PREFIX}/include/aalib.h" >&6
+               echo "$as_me:$LINENO: checking whether aalib version >= 1.4" >&5
+ echo $ECHO_N "checking whether aalib version >= 1.4... $ECHO_C" >&6
+ if test "${ac_aalib_ver_ok+set}" = set; then
+@@ -13687,7 +13687,7 @@
+  */
+ #endif
+ }' > conftest.c
+-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then
++if test -z "`${CC-cc} ${CFLAGS} -c conftest.c 2>&1`"; then
+     ac_aalib_ver_ok=yes
+     else
+         ac_aalib_ver_ok=no
+@@ -17607,7 +17607,7 @@
  #define SVGA_DRIVER 1
- EOF
+ _ACEOF
  
 -  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp root $(bindir)/xaos'
 +  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp wheel $(bindir)/xaos'
    DRIVERDIRS="$DRIVERDIRS ui/ui-drv/svga"
    DRIVERLIBS="$DRIVERLIBS lib/libuisvga.a"
-   if test "x$ac_cv_func_pthread_sighandler" = xyes; then 
+   if test "x$ac_cv_func_pthread_sighandler" = xyes; then