diff options
author | jkoshy <jkoshy@FreeBSD.org> | 1998-07-06 07:23:46 +0000 |
---|---|---|
committer | jkoshy <jkoshy@FreeBSD.org> | 1998-07-06 07:23:46 +0000 |
commit | 53c47b5648c56d626538fb649efe41083fd3d458 (patch) | |
tree | 7ffdbb7f115785abfed4bc091731da63bf620020 /graphics/xaos | |
parent | 6018d2a863035848712758b474f0198a202fe069 (diff) | |
download | FreeBSD-ports-53c47b5648c56d626538fb649efe41083fd3d458.zip FreeBSD-ports-53c47b5648c56d626538fb649efe41083fd3d458.tar.gz |
Upgrade to ver 3.0 of XaoS.
Reminded-by: Matthew Thyer <Matthew.Thyer@dsto.defence.gov.au>
Diffstat (limited to 'graphics/xaos')
-rw-r--r-- | graphics/xaos/Makefile | 33 | ||||
-rw-r--r-- | graphics/xaos/distinfo | 2 | ||||
-rw-r--r-- | graphics/xaos/files/patch-aa | 383 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ab | 49 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ac | 47 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ad | 77 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ae | 10 | ||||
-rw-r--r-- | graphics/xaos/files/patch-af | 45 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ag | 30 | ||||
-rw-r--r-- | graphics/xaos/files/patch-ah | 67 | ||||
-rw-r--r-- | graphics/xaos/pkg-comment | 2 | ||||
-rw-r--r-- | graphics/xaos/pkg-plist | 125 |
12 files changed, 777 insertions, 93 deletions
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 2057ced..857abae 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -3,11 +3,11 @@ # Date created: 24 February 1996 # Whom: Joseph Koshy <koshy@india.hp.com> # -# $Id: Makefile,v 1.3 1997/07/01 17:41:01 jfitz Exp $ +# $Id: Makefile,v 1.4 1998/07/03 07:02:54 jkoshy Exp $ # -DISTNAME= XaoS-2.2 -PKGNAME= xaos-2.2 +DISTNAME= XaoS-3.0 +PKGNAME= xaos-3.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} \ ftp://ftp.ta.jcu.cz/pub/linux/hubicka/XaoS/2.2/ \ @@ -16,27 +16,24 @@ MASTER_SITE_SUBDIR= graphics MAINTAINER= jkoshy@freebsd.org +LIB_DEPENDS= png:${PORTSDIR}/graphics/png + # This port will benefit from all-stops-out optimization of the code GNU_CONFIGURE= yes -CFLAGS+= -DHAVE_SYS_PARAM_H \ - -O6 -fstrength-reduce -ffast-math -fomit-frame-pointer\ - -fforce-mem -fforce-addr -funroll-loops +CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib +CFLAGS= -DHAVE_SYS_PARAM_H \ + -I${PREFIX}/include \ + -pipe -O6 -fstrength-reduce -ffast-math -fomit-frame-pointer\ + -fforce-mem -fforce-addr -funroll-loops MAN6= xaos.6 -# We need to supply our own install target as the distribution doesn't -# supply one by default - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xaos ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/xaos.6 ${PREFIX}/man/man6 - post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/XaoS - ${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${PREFIX}/share/doc/XaoS - ${INSTALL_DATA} ${WRKSRC}/doc/algorithm.txt ${PREFIX}/share/doc/XaoS -.endif + strip ${PREFIX}/bin/xaos + if [ ! -f ${PREFIX}/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + install-info ${PREFIX}/info/xaos.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/graphics/xaos/distinfo b/graphics/xaos/distinfo index 80ffd44..41f9466 100644 --- a/graphics/xaos/distinfo +++ b/graphics/xaos/distinfo @@ -1 +1 @@ -MD5 (XaoS-2.2.tar.gz) = d86a1f4143a7fd1e3dd773ebcc7f2c16 +MD5 (XaoS-3.0.tar.gz) = fa26ce9805d4889174c891b334da6d09 diff --git a/graphics/xaos/files/patch-aa b/graphics/xaos/files/patch-aa index ba8db54..205a171 100644 --- a/graphics/xaos/files/patch-aa +++ b/graphics/xaos/files/patch-aa @@ -1,111 +1,352 @@ ---- mktable.c-- Wed Jan 22 16:38:33 1997 -+++ mktable.c Mon Feb 24 14:37:28 1997 -@@ -20,10 +20,15 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +--- 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. */ -+#ifdef HAVE_SYS_PARAM_H ++#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 <ctype.h> - #include <stdlib.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 "mktable.h" - #include "config.h" - #ifdef CURSES_DRIVER -@@ -395,7 +400,11 @@ - #define postoparams(pos,i1,i2,i3,i4) \ - ((i1)=(pos)>>12),((i2)=((pos)>>8)&15),((i3)=((pos)>>4)&15),((i4)=((pos))&15) - -+#ifdef isset -+#undef isset -+#endif - #define isset(n,i) (((i)&1<<(n))!=0) -+ - #define canset(n,i) (!isset(n,i)&&isset(n+1,i)) - static int width = 8; - void values(int c, int *v1, int *v2, int *v3, int *v4) ---- timers.c-- Mon Jan 27 13:15:55 1997 -+++ timers.c Mon Feb 24 14:33:42 1997 -@@ -25,11 +25,18 @@ - #include <libc.h> + #include <stdio.h> /*for NULL */ #else - #include "aconfig.h" -+#ifdef HAVE_SYS_PARAM_H + #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> - #include <unistd.h> - #ifndef _MAC + #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-- Fri Jul 3 14:05:20 1998 ++++ src/engine/fractal.c Fri Jul 3 17:24:31 1998 +@@ -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,11 @@ + /*fcr &= ~(FPINEX | FPOVFL | FPUNFL | FPZDIV);*/ + setfcr (fcr); + } +#endif ++#ifdef BSD ++ /* ignore all possible exceptions */ ++ (void) fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | ++ FP_X_IMP | FP_X_DNML)); #endif - #ifdef HAVE_SETITIMER - #include <signal.h> ---- ui_curses.c-- Mon Feb 24 14:21:41 1997 -+++ ui_curses.c Mon Feb 24 12:57:00 1997 -@@ -21,9 +21,14 @@ + 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 */ - #include "aconfig.h" - #ifdef CURSES_DRIVER -+#ifdef HAVE_SYS_PARAM_H +@@ -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> - #include <stdlib.h> +@@ -5,7 +8,9 @@ + #else + #include <math.h> + #include <string.h> +#if (!defined(BSD) || (BSD < 199506)) #include <malloc.h> +#endif - #include <signal.h> - #include <sys/stat.h> - #include <unistd.h> ---- xlib.c-- Mon Feb 24 14:21:54 1997 -+++ xlib.c Mon Feb 24 14:34:38 1997 -@@ -26,7 +26,12 @@ #include <stdio.h> #include <stdlib.h> - #include <string.h> -+#ifdef HAVE_SYS_PARAM_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 "xlib.h" - #ifdef AMIGA - #define XFlush(x) while(0) -@@ -264,7 +269,9 @@ - XDestroyImage(d->image[0]); - XDestroyImage(d->image[1]); - } -+#ifndef MAX - #define MAX(x,y) ((x)>(y)?(x):(y)) + #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 - - - xdisplay *xalloc_display(char *s, int x, int y, xlibparam * params) ---- zoom.c-- Mon Feb 24 12:49:33 1997 -+++ zoom.c Mon Feb 24 12:56:18 1997 -@@ -25,10 +25,15 @@ + #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> - #include <stdio.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 -+#ifdef HAVE_SYS_PARAM_H +--- 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(BSD) || (BSD < 199506)) +-#ifndef _MAC ++#if (!defined(_MAC) && (!defined(BSD) || (BSD < 199506))) #include <malloc.h> -+#endif #endif - #include "aconfig.h" - #ifdef HAVE_LIMITS_H + #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 new file mode 100644 index 0000000..1f412c8 --- /dev/null +++ b/graphics/xaos/files/patch-ab @@ -0,0 +1,49 @@ +--- 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 new file mode 100644 index 0000000..0a426b1 --- /dev/null +++ b/graphics/xaos/files/patch-ac @@ -0,0 +1,47 @@ +--- 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 new file mode 100644 index 0000000..0776bb4 --- /dev/null +++ b/graphics/xaos/files/patch-ad @@ -0,0 +1,77 @@ +--- 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 new file mode 100644 index 0000000..c5e84c2 --- /dev/null +++ b/graphics/xaos/files/patch-ae @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000..1e89a84 --- /dev/null +++ b/graphics/xaos/files/patch-af @@ -0,0 +1,45 @@ +--- 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 new file mode 100644 index 0000000..3f4a643 --- /dev/null +++ b/graphics/xaos/files/patch-ag @@ -0,0 +1,30 @@ +--- 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 new file mode 100644 index 0000000..4f865c7 --- /dev/null +++ b/graphics/xaos/files/patch-ah @@ -0,0 +1,67 @@ +--- 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/pkg-comment b/graphics/xaos/pkg-comment index 0be9accd..a73d8bc 100644 --- a/graphics/xaos/pkg-comment +++ b/graphics/xaos/pkg-comment @@ -1 +1 @@ -A real time fractal browser for X11 and ASCII terminals. +A real-time fractal browser for X11 and ASCII terminals. diff --git a/graphics/xaos/pkg-plist b/graphics/xaos/pkg-plist index eb98fbe..cc90a6f 100644 --- a/graphics/xaos/pkg-plist +++ b/graphics/xaos/pkg-plist @@ -1,4 +1,125 @@ bin/xaos +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/examples/0rfel1.xpf +share/XaoS/examples/0rfel2.xpf +share/XaoS/examples/README +share/XaoS/examples/axe.xpf +share/XaoS/examples/barnsl1.xpf +share/XaoS/examples/barnsl2.xpf +share/XaoS/examples/barnsl3.xpf +share/XaoS/examples/barnsl4.xpf +share/XaoS/examples/barnsl5.xpf +share/XaoS/examples/barnsl6.xpf +share/XaoS/examples/barnsl7.xpf +share/XaoS/examples/barnsl8.xpf +share/XaoS/examples/barnsl9.xpf +share/XaoS/examples/beatle.xpf +share/XaoS/examples/beatle2.xpf +share/XaoS/examples/brown.xpf +share/XaoS/examples/crone.xpf +share/XaoS/examples/dblspira.xpf +share/XaoS/examples/dragons.xpf +share/XaoS/examples/edge.xpf +share/XaoS/examples/edge2.xpf +share/XaoS/examples/edge3.xpf +share/XaoS/examples/eifell.xpf +share/XaoS/examples/galaxy.xpf +share/XaoS/examples/goldrive.xpf +share/XaoS/examples/head.xpf +share/XaoS/examples/head2.xpf +share/XaoS/examples/head3.xpf +share/XaoS/examples/incolor1.xpf +share/XaoS/examples/incolor2.xpf +share/XaoS/examples/incolor3.xpf +share/XaoS/examples/incolor4.xpf +share/XaoS/examples/incolor5.xpf +share/XaoS/examples/julia.xpf +share/XaoS/examples/julia2.xpf +share/XaoS/examples/julia3.xpf +share/XaoS/examples/lemon.xpf +share/XaoS/examples/light.xpf +share/XaoS/examples/magnet.xpf +share/XaoS/examples/magnet1.xpf +share/XaoS/examples/magnet2.xpf +share/XaoS/examples/magnet3.xpf +share/XaoS/examples/magnet4.xpf +share/XaoS/examples/mand1.xpf +share/XaoS/examples/mand2.xpf +share/XaoS/examples/minibrot.xpf +share/XaoS/examples/newton.xpf +share/XaoS/examples/palace.xpf +share/XaoS/examples/perb1.xpf +share/XaoS/examples/perb2.xpf +share/XaoS/examples/perb3.xpf +share/XaoS/examples/perb4.xpf +share/XaoS/examples/perb5.xpf +share/XaoS/examples/phoenix1.xpf +share/XaoS/examples/phoenix2.xpf +share/XaoS/examples/redjulia.xpf +share/XaoS/examples/redmand.xpf +share/XaoS/examples/redmand2.xpf +share/XaoS/examples/rocks.xpf +share/XaoS/examples/something.xpf +share/XaoS/examples/spiral2.xpf +share/XaoS/examples/sprial.xpf +share/XaoS/examples/sun.xpf +share/XaoS/examples/thebug.xpf +share/XaoS/examples/tower.xpf +share/XaoS/examples/tree.xpf +share/XaoS/examples/triangle.xpf +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 man/man6/xaos.6.gz -share/doc/XaoS/tutorial.txt -share/doc/XaoS/algorithm.txt +@unexec install-info --delete %D/info/xaos.info %D/info/dir +info/xaos.info +@exec [ -f %D/info/dir ] || sed -ne '1,/Menu/p' /usr/share/info/dir > %D/info/dir +@exec install-info %D/info/xaos.info %D/info/dir +@dirrm share/XaoS/catalogs +@dirrm share/XaoS/examples +@dirrm share/XaoS/tutorial +@dirrm share/XaoS/doc +@dirrm share/XaoS |