From 0f15446dffdf5cc4848e6012689fd68bee3f8b41 Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Sun, 7 Dec 2003 16:09:49 +0000 Subject: - Fix build on -current PR: 60011 Submitted by: Ports Fury --- graphics/xfractint/Makefile | 8 +- graphics/xfractint/files/patch-Makefile | 77 +++++++++++++++++ graphics/xfractint/files/patch-aa | 77 ----------------- graphics/xfractint/files/patch-ab | 21 ----- graphics/xfractint/files/patch-ac | 58 ------------- graphics/xfractint/files/patch-biginit.c | 12 +++ graphics/xfractint/files/patch-editpal.c | 46 +++++++++++ graphics/xfractint/files/patch-fracsubr.c | 71 ++++++++++++++++ graphics/xfractint/files/patch-fractalb.c | 11 +++ graphics/xfractint/files/patch-fractals.c | 11 +++ graphics/xfractint/files/patch-fractint.c | 40 +++++++++ graphics/xfractint/files/patch-framain2.c | 14 ++++ graphics/xfractint/files/patch-frasetup.c | 11 +++ graphics/xfractint/files/patch-hc.c | 133 ++++++++++++++++++++++++++++++ graphics/xfractint/files/patch-jiim.c | 15 ++++ graphics/xfractint/files/patch-lsys.c | 11 +++ graphics/xfractint/files/patch-lsysf.c | 11 +++ graphics/xfractint/files/patch-memory.c | 16 ++++ graphics/xfractint/files/patch-miscovl.c | 56 +++++++++++++ graphics/xfractint/files/patch-miscres.c | 18 ++++ graphics/xfractint/files/patch-port.h | 21 +++++ graphics/xfractint/files/patch-printer.c | 54 ++++++++++++ graphics/xfractint/files/patch-prompts1.c | 20 +++++ graphics/xfractint/files/patch-prompts2.c | 20 +++++ graphics/xfractint/files/patch-prototyp.h | 29 +++++++ graphics/xfractint/files/patch-soi.c | 22 +++++ graphics/xfractint/files/patch-soi1.c | 12 +++ graphics/xfractint/files/patch-unixscr.c | 44 ++++++++++ 28 files changed, 777 insertions(+), 162 deletions(-) create mode 100644 graphics/xfractint/files/patch-Makefile delete mode 100644 graphics/xfractint/files/patch-aa delete mode 100644 graphics/xfractint/files/patch-ab delete mode 100644 graphics/xfractint/files/patch-ac create mode 100644 graphics/xfractint/files/patch-biginit.c create mode 100644 graphics/xfractint/files/patch-editpal.c create mode 100644 graphics/xfractint/files/patch-fracsubr.c create mode 100644 graphics/xfractint/files/patch-fractalb.c create mode 100644 graphics/xfractint/files/patch-fractals.c create mode 100644 graphics/xfractint/files/patch-fractint.c create mode 100644 graphics/xfractint/files/patch-framain2.c create mode 100644 graphics/xfractint/files/patch-frasetup.c create mode 100644 graphics/xfractint/files/patch-hc.c create mode 100644 graphics/xfractint/files/patch-jiim.c create mode 100644 graphics/xfractint/files/patch-lsys.c create mode 100644 graphics/xfractint/files/patch-lsysf.c create mode 100644 graphics/xfractint/files/patch-memory.c create mode 100644 graphics/xfractint/files/patch-miscovl.c create mode 100644 graphics/xfractint/files/patch-miscres.c create mode 100644 graphics/xfractint/files/patch-port.h create mode 100644 graphics/xfractint/files/patch-printer.c create mode 100644 graphics/xfractint/files/patch-prompts1.c create mode 100644 graphics/xfractint/files/patch-prompts2.c create mode 100644 graphics/xfractint/files/patch-prototyp.h create mode 100644 graphics/xfractint/files/patch-soi.c create mode 100644 graphics/xfractint/files/patch-soi1.c create mode 100644 graphics/xfractint/files/patch-unixscr.c (limited to 'graphics/xfractint') diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index 6a6f69749eb6..45dc2f7145b7 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -15,14 +15,10 @@ DISTNAME= xfrac310 MAINTAINER= ports@FreeBSD.org COMMENT= The Unix port of fractint -USE_REINPLACE= yes +NO_WRKSUBDIR= yes + USE_ZIP= yes USE_XLIB= yes -NO_WRKSUBDIR= yes MAN1= xfractint.1 -pre-patch: - @${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|malloc\.h|stdlib.h|' - .include diff --git a/graphics/xfractint/files/patch-Makefile b/graphics/xfractint/files/patch-Makefile new file mode 100644 index 000000000000..fc842b80f84d --- /dev/null +++ b/graphics/xfractint/files/patch-Makefile @@ -0,0 +1,77 @@ +--- Makefile.orig Sun Sep 12 10:32:16 1999 ++++ Makefile Tue Oct 12 20:41:38 1999 +@@ -2,11 +2,11 @@ + # SRCDIR should be a path to the directory that will hold fractint.hlp + # You will have to copy fractint.hlp to SRCDIR and make it world readable. + # SRCDIR should also hold the .par, .frm, etc. files +-SRCDIR = /usr/src/xfractint ++SRCDIR = ${PREFIX}/share/fractint + # BINDIR is where you put your X11 binaries +-BINDIR = /usr/X11R6/bin ++BINDIR = ${PREFIX}/bin + # MANDIR is where you put your chapter 1 man pages +-MANDIR = /usr/X11R6/man/man1 ++MANDIR = ${PREFIX}/man/man1 + + NOBSTRING = + HAVESTRI = +@@ -51,7 +51,7 @@ + #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g + + #CFLAGS = -I. -D_CONST $(DEFINES) +-CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX ++CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${X11BASE}/include + + # Gcc is often the only compiler that works for this + # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE +@@ -60,7 +60,7 @@ + # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc. + # For Sun Solaris 2.x w/GNU gcc, use CC = gcc + #CC = gcc +-CC = cc ++CC ?= cc + + # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap + # For AIX or OSF/1, add -lbsd +@@ -68,8 +68,8 @@ + # For Apollo, change -lX11 to -L/usr/X11/libX11 + # For Solaris, add -L/usr/openwin/lib + # For Linux, use +-LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap +-#LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap ++#LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap ++LIBS = -L${X11BASE}/lib -lX11 -lm -lcurses -ltermcap + #LIBS = -lX11 -lm -lcurses -ltermcap + + # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd. +@@ -166,6 +166,8 @@ + .SUFFIXES: + .SUFFIXES: .o .c .s .h + ++all: xfractint ++ + xfractint: fractint.hlp .WAIT $(OBJS) + $(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS) + # strip xfractint +@@ -180,13 +182,14 @@ + rm -f $(OBJS) $(HOBJS) fractint.doc fractint.hlp hc xfractint helpdefs.h + + install: xfractint fractint.hlp +- cp xfractint $(BINDIR)/xfractint +- strip $(BINDIR)/xfractint +- chmod a+x $(BINDIR)/xfractint +- cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR) +- (cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) ) +- cp xfractint.man $(MANDIR)/xfractint.1 +- chmod a+r $(MANDIR)/xfractint.1 ++ ${BSD_INSTALL_PROGRAM} xfractint $(BINDIR)/xfractint ++ if [ ! -d $(SRCDIR) ]; then \ ++ echo "Making $(SRCDIR)"; \ ++ ${INSTALL} -d -m 555 $(SRCDIR); \ ++ else true; \ ++ fi; ++ ${BSD_INSTALL_DATA} fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR) ++ ${BSD_INSTALL_MAN} xfractint.man $(MANDIR)/xfractint.1 + + fractint.hlp: hc $(HELP) + ./hc /c diff --git a/graphics/xfractint/files/patch-aa b/graphics/xfractint/files/patch-aa deleted file mode 100644 index fc842b80f84d..000000000000 --- a/graphics/xfractint/files/patch-aa +++ /dev/null @@ -1,77 +0,0 @@ ---- Makefile.orig Sun Sep 12 10:32:16 1999 -+++ Makefile Tue Oct 12 20:41:38 1999 -@@ -2,11 +2,11 @@ - # SRCDIR should be a path to the directory that will hold fractint.hlp - # You will have to copy fractint.hlp to SRCDIR and make it world readable. - # SRCDIR should also hold the .par, .frm, etc. files --SRCDIR = /usr/src/xfractint -+SRCDIR = ${PREFIX}/share/fractint - # BINDIR is where you put your X11 binaries --BINDIR = /usr/X11R6/bin -+BINDIR = ${PREFIX}/bin - # MANDIR is where you put your chapter 1 man pages --MANDIR = /usr/X11R6/man/man1 -+MANDIR = ${PREFIX}/man/man1 - - NOBSTRING = - HAVESTRI = -@@ -51,7 +51,7 @@ - #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g - - #CFLAGS = -I. -D_CONST $(DEFINES) --CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -+CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${X11BASE}/include - - # Gcc is often the only compiler that works for this - # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE -@@ -60,7 +60,7 @@ - # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc. - # For Sun Solaris 2.x w/GNU gcc, use CC = gcc - #CC = gcc --CC = cc -+CC ?= cc - - # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap - # For AIX or OSF/1, add -lbsd -@@ -68,8 +68,8 @@ - # For Apollo, change -lX11 to -L/usr/X11/libX11 - # For Solaris, add -L/usr/openwin/lib - # For Linux, use --LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap --#LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap -+#LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap -+LIBS = -L${X11BASE}/lib -lX11 -lm -lcurses -ltermcap - #LIBS = -lX11 -lm -lcurses -ltermcap - - # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd. -@@ -166,6 +166,8 @@ - .SUFFIXES: - .SUFFIXES: .o .c .s .h - -+all: xfractint -+ - xfractint: fractint.hlp .WAIT $(OBJS) - $(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS) - # strip xfractint -@@ -180,13 +182,14 @@ - rm -f $(OBJS) $(HOBJS) fractint.doc fractint.hlp hc xfractint helpdefs.h - - install: xfractint fractint.hlp -- cp xfractint $(BINDIR)/xfractint -- strip $(BINDIR)/xfractint -- chmod a+x $(BINDIR)/xfractint -- cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR) -- (cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) ) -- cp xfractint.man $(MANDIR)/xfractint.1 -- chmod a+r $(MANDIR)/xfractint.1 -+ ${BSD_INSTALL_PROGRAM} xfractint $(BINDIR)/xfractint -+ if [ ! -d $(SRCDIR) ]; then \ -+ echo "Making $(SRCDIR)"; \ -+ ${INSTALL} -d -m 555 $(SRCDIR); \ -+ else true; \ -+ fi; -+ ${BSD_INSTALL_DATA} fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR) -+ ${BSD_INSTALL_MAN} xfractint.man $(MANDIR)/xfractint.1 - - fractint.hlp: hc $(HELP) - ./hc /c diff --git a/graphics/xfractint/files/patch-ab b/graphics/xfractint/files/patch-ab deleted file mode 100644 index 8baa4a66376e..000000000000 --- a/graphics/xfractint/files/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ ---- port.h.orig Mon Sep 6 10:38:10 1999 -+++ port.h Fri Oct 8 18:19:32 1999 -@@ -45,7 +45,7 @@ - #if defined(sgi) - #include - #else --#include -+#include - #endif - #endif - #ifndef BIG_ENDIAN -@@ -288,6 +288,9 @@ - #define DO_NOT_USE_LONG_DOUBLE - #endif - #ifdef sun -+#define DO_NOT_USE_LONG_DOUBLE -+#endif -+#ifdef __FreeBSD__ - #define DO_NOT_USE_LONG_DOUBLE - #endif - diff --git a/graphics/xfractint/files/patch-ac b/graphics/xfractint/files/patch-ac deleted file mode 100644 index 9c7273250166..000000000000 --- a/graphics/xfractint/files/patch-ac +++ /dev/null @@ -1,58 +0,0 @@ ---- soi.c.orig Mon Sep 6 10:38:10 1999 -+++ soi.c Fri Oct 8 18:25:33 1999 -@@ -19,7 +19,11 @@ - - #define DBLS LDBL - #define FABS(x) fabsl(x) -+#ifdef __FreeBSD__ -+#define FREXP(x,y) frexp(x,y) -+#else - #define FREXP(x,y) frexpl(x,y) -+#endif - - #define TRUE 1 - #define FALSE 0 ---- unixscr.c.orig Wed Apr 28 23:12:03 1999 -+++ unixscr.c Fri Oct 8 18:24:15 1999 -@@ -241,7 +241,7 @@ - initdacbox(); - - if (!simple_input) { -- signal(SIGINT,(__sighandler_t)goodbye); -+ signal(SIGINT,(sig_t)goodbye); - } - signal(SIGFPE, fpe_handler); - /* -@@ -2068,12 +2068,12 @@ - void - shell_to_dos() - { -- __sighandler_t sigint; -+ sig_t sigint; - char *shell; - char *argv[2]; - int pid, donepid; - -- sigint = (__sighandler_t)signal(SIGINT, SIG_IGN); -+ sigint = signal(SIGINT, SIG_IGN); - shell = getenv("SHELL"); - if (shell==NULL) { - shell = SHELL; -@@ -2121,7 +2121,7 @@ - fcntl(0,F_SETFL,FNDELAY); - } - -- signal(SIGINT, (__sighandler_t)sigint); -+ signal(SIGINT, sigint); - putchar('\n'); - } - -@@ -2146,7 +2146,7 @@ - int soon; - { - if (!fastmode) return; -- signal(SIGALRM, (__sighandler_t)setredrawscreen); -+ signal(SIGALRM, (sig_t)setredrawscreen); - if (soon) { - alarm(1); - } else { diff --git a/graphics/xfractint/files/patch-biginit.c b/graphics/xfractint/files/patch-biginit.c new file mode 100644 index 000000000000..1dc6acf9c35d --- /dev/null +++ b/graphics/xfractint/files/patch-biginit.c @@ -0,0 +1,12 @@ +--- biginit.c.orig Tue Sep 7 00:38:10 1999 ++++ biginit.c Sun Dec 7 10:50:07 2003 +@@ -7,7 +7,9 @@ + */ + + #include ++#ifndef BIG_ANSI_C + #include ++#endif + /* see Fractint.c for a description of the "include" hierarchy */ + #include "port.h" + #include "prototyp.h" diff --git a/graphics/xfractint/files/patch-editpal.c b/graphics/xfractint/files/patch-editpal.c new file mode 100644 index 000000000000..c86973983735 --- /dev/null +++ b/graphics/xfractint/files/patch-editpal.c @@ -0,0 +1,46 @@ +--- editpal.c.orig Tue Sep 7 00:38:10 1999 ++++ editpal.c Sun Dec 7 02:53:19 2003 +@@ -114,11 +114,7 @@ + #endif + + #include +-#ifndef XFRACT + #include +-#else +-#include +-#endif + + #ifdef __TURBOC__ + # include /* to get mem...() declarations */ +@@ -410,31 +406,14 @@ + } + + +-#ifndef XFRACT + static void displayf(int x, int y, int fg, int bg, char *format, ...) +-#else +-static void displayf(va_alist) +-va_dcl +-#endif + { + char buff[81]; + int ctr; + + va_list arg_list; + +-#ifndef XFRACT + va_start(arg_list, format); +-#else +- int x,y,fg,bg; +- char *format; +- +- va_start(arg_list); +- x = va_arg(arg_list,int); +- y = va_arg(arg_list,int); +- fg = va_arg(arg_list,int); +- bg = va_arg(arg_list,int); +- format = va_arg(arg_list,char *); +-#endif + vsprintf(buff, format, arg_list); + va_end(arg_list); + diff --git a/graphics/xfractint/files/patch-fracsubr.c b/graphics/xfractint/files/patch-fracsubr.c new file mode 100644 index 000000000000..2c72d163cb54 --- /dev/null +++ b/graphics/xfractint/files/patch-fracsubr.c @@ -0,0 +1,71 @@ +--- fracsubr.c.orig Tue Sep 7 00:38:10 1999 ++++ fracsubr.c Sun Dec 7 11:55:41 2003 +@@ -4,11 +4,9 @@ + */ + + #ifndef XFRACT +-#include + #include +-#else +-#include + #endif ++#include + #include + #include + /* see Fractint.c for a description of the "include" hierarchy */ +@@ -1050,27 +1048,14 @@ + + */ + +-#ifndef XFRACT + int put_resume(int len, ...) +-#else +-int put_resume(va_alist) +-va_dcl +-#endif + { + va_list arg_marker; /* variable arg list */ + BYTE *source_ptr; +-#ifdef XFRACT +- int len; +-#endif + + if (resume_info == 0) + return(-1); +-#ifndef XFRACT + va_start(arg_marker,len); +-#else +- va_start(arg_marker); +- len = va_arg(arg_marker,int); +-#endif + while (len) + { + source_ptr = (BYTE *)va_arg(arg_marker,char *); +@@ -1101,27 +1086,14 @@ + return(0); + } + +-#ifndef XFRACT + int get_resume(int len, ...) +-#else +-int get_resume(va_alist) +-va_dcl +-#endif + { + va_list arg_marker; /* variable arg list */ + BYTE *dest_ptr; +-#ifdef XFRACT +- int len; +-#endif + + if (resume_info == 0) + return(-1); +-#ifndef XFRACT + va_start(arg_marker,len); +-#else +- va_start(arg_marker); +- len = va_arg(arg_marker,int); +-#endif + while (len) + { + dest_ptr = (BYTE *)va_arg(arg_marker,char *); diff --git a/graphics/xfractint/files/patch-fractalb.c b/graphics/xfractint/files/patch-fractalb.c new file mode 100644 index 000000000000..a8324cba2a4d --- /dev/null +++ b/graphics/xfractint/files/patch-fractalb.c @@ -0,0 +1,11 @@ +--- fractalb.c.orig Tue Sep 7 00:38:10 1999 ++++ fractalb.c Sun Dec 7 10:40:04 2003 +@@ -10,7 +10,7 @@ + #include + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + /* see Fractint.c for a description of the "include" hierarchy */ diff --git a/graphics/xfractint/files/patch-fractals.c b/graphics/xfractint/files/patch-fractals.c new file mode 100644 index 000000000000..6e02c20d82e6 --- /dev/null +++ b/graphics/xfractint/files/patch-fractals.c @@ -0,0 +1,11 @@ +--- fractals.c.orig Tue Sep 7 00:38:10 1999 ++++ fractals.c Sun Dec 7 10:42:38 2003 +@@ -41,7 +41,7 @@ + #include + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + /* see Fractint.c for a description of the "include" hierarchy */ diff --git a/graphics/xfractint/files/patch-fractint.c b/graphics/xfractint/files/patch-fractint.c new file mode 100644 index 000000000000..e9fea5a958d1 --- /dev/null +++ b/graphics/xfractint/files/patch-fractint.c @@ -0,0 +1,40 @@ +--- fractint.c.orig Tue Sep 7 00:38:10 1999 ++++ fractint.c Sun Dec 7 12:15:08 2003 +@@ -10,7 +10,7 @@ + #include + #include + #else +-#include ++#include + #endif + #include + +@@ -540,12 +540,7 @@ + timer(1,NULL,int width) decoder + timer(2) encoder + */ +-#ifndef XFRACT + int timer(int timertype,int(*subrtn)(),...) +-#else +-int timer(va_alist) +-va_dcl +-#endif + { + va_list arg_marker; /* variable arg list */ + char *timestring; +@@ -555,15 +550,7 @@ + int i; + int do_bench; + +-#ifndef XFRACT + va_start(arg_marker,subrtn); +-#else +- int timertype; +- int (*subrtn)(); +- va_start(arg_marker); +- timertype = va_arg(arg_marker, int); +- subrtn = (int (*)())va_arg(arg_marker, int *); +-#endif + + do_bench = timerflag; /* record time? */ + if (timertype == 2) /* encoder, record time only if debug=200 */ diff --git a/graphics/xfractint/files/patch-framain2.c b/graphics/xfractint/files/patch-framain2.c new file mode 100644 index 000000000000..ac0036f309a7 --- /dev/null +++ b/graphics/xfractint/files/patch-framain2.c @@ -0,0 +1,14 @@ +--- framain2.c.orig Tue Sep 7 00:38:10 1999 ++++ framain2.c Sun Dec 7 11:37:30 2003 +@@ -1,10 +1,8 @@ + #include + #include ++#include + #ifndef XFRACT + #include +-#include +-#else +-#include + #endif + #include + /* see Fractint.c for a description of the "include" hierarchy */ diff --git a/graphics/xfractint/files/patch-frasetup.c b/graphics/xfractint/files/patch-frasetup.c new file mode 100644 index 000000000000..56329987fa96 --- /dev/null +++ b/graphics/xfractint/files/patch-frasetup.c @@ -0,0 +1,11 @@ +--- frasetup.c.orig Tue Sep 7 00:38:10 1999 ++++ frasetup.c Sun Dec 7 10:43:26 2003 +@@ -2,7 +2,7 @@ + #include + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + /* see Fractint.c for a description of the "include" hierarchy */ diff --git a/graphics/xfractint/files/patch-hc.c b/graphics/xfractint/files/patch-hc.c new file mode 100644 index 000000000000..3b1f0e11b7c2 --- /dev/null +++ b/graphics/xfractint/files/patch-hc.c @@ -0,0 +1,133 @@ +--- hc.c.orig Tue Sep 7 00:38:10 1999 ++++ hc.c Sun Dec 7 12:16:31 2003 +@@ -56,7 +56,7 @@ + #include + #include + #else +-#include ++#include + #define strupr strlwr + #endif + #include +@@ -295,24 +295,11 @@ + } + + +-#ifndef XFRACT + void fatal(int diff, char *format, ...) +-#else +-void fatal(va_alist) +- va_dcl +-#endif + { + va_list arg; + +-#ifndef XFRACT + va_start(arg, format); +-#else +- int diff; +- char *format; +- va_start(arg); +- diff = va_arg(arg,int); +- format = va_arg(arg,char *); +-#endif + + print_msg("Fatal", srcline-diff, format, arg); + va_end(arg); +@@ -324,24 +311,11 @@ + } + + +-#ifndef XFRACT + void error(int diff, char *format, ...) +-#else +-void error(va_alist) +- va_dcl +-#endif + { + va_list arg; + +-#ifndef XFRACT + va_start(arg, format); +-#else +- int diff; +- char *format; +- va_start(arg); +- diff = va_arg(arg,int); +- format = va_arg(arg,char *); +-#endif + print_msg("Error", srcline-diff, format, arg); + va_end(arg); + +@@ -350,23 +324,10 @@ + } + + +-#ifndef XFRACT + void warn(int diff, char *format, ...) +-#else +-void warn(va_alist) +- va_dcl +-#endif + { + va_list arg; +-#ifndef XFRACT + va_start(arg, format); +-#else +- int diff; +- char *format; +- va_start(arg); +- diff = va_arg(arg, int); +- format = va_arg(arg, char *); +-#endif + print_msg("Warning", srcline-diff, format, arg); + va_end(arg); + +@@ -375,47 +336,22 @@ + } + + +-#ifndef XFRACT + void notice(char *format, ...) +-#else +-void notice(va_alist) +- va_dcl +-#endif + { + va_list arg; +-#ifndef XFRACT + va_start(arg, format); +-#else +- char *format; +- +- va_start(arg); +- format = va_arg(arg,char *); +-#endif + print_msg("Note", srcline, format, arg); + va_end(arg); + } + + +-#ifndef XFRACT + void msg(char *format, ...) +-#else +-void msg(va_alist) +-va_dcl +-#endif + { + va_list arg; +-#ifdef XFRACT +- char *format; +-#endif + + if (quiet_mode) + return; +-#ifndef XFRACT + va_start(arg, format); +-#else +- va_start(arg); +- format = va_arg(arg,char *); +-#endif + print_msg(NULL, 0, format, arg); + va_end(arg); + } diff --git a/graphics/xfractint/files/patch-jiim.c b/graphics/xfractint/files/patch-jiim.c new file mode 100644 index 000000000000..47aa584ac084 --- /dev/null +++ b/graphics/xfractint/files/patch-jiim.c @@ -0,0 +1,15 @@ +--- jiim.c.orig Tue Sep 7 00:38:10 1999 ++++ jiim.c Sun Dec 7 11:38:56 2003 +@@ -39,12 +39,7 @@ + */ + + #include +- +-#ifndef XFRACT + #include +-#else +-#include +-#endif + + #ifdef __TURBOC__ + # include /* to get mem...() declarations */ diff --git a/graphics/xfractint/files/patch-lsys.c b/graphics/xfractint/files/patch-lsys.c new file mode 100644 index 000000000000..f33be2928836 --- /dev/null +++ b/graphics/xfractint/files/patch-lsys.c @@ -0,0 +1,11 @@ +--- lsys.c.orig Tue Sep 7 00:38:10 1999 ++++ lsys.c Sun Dec 7 10:44:28 2003 +@@ -2,7 +2,7 @@ + #include + #ifdef __TURBOC__ + #include +-#else ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-lsysf.c b/graphics/xfractint/files/patch-lsysf.c new file mode 100644 index 000000000000..8b0958843b68 --- /dev/null +++ b/graphics/xfractint/files/patch-lsysf.c @@ -0,0 +1,11 @@ +--- lsysf.c.orig Tue Sep 7 00:38:10 1999 ++++ lsysf.c Sun Dec 7 10:45:24 2003 +@@ -1,7 +1,7 @@ + #include + #ifdef __TURBOC__ + #include +-#else ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-memory.c b/graphics/xfractint/files/patch-memory.c new file mode 100644 index 000000000000..982c0f976c56 --- /dev/null +++ b/graphics/xfractint/files/patch-memory.c @@ -0,0 +1,16 @@ +--- memory.c.orig Tue Sep 7 00:38:10 1999 ++++ memory.c Sun Dec 7 02:51:11 2003 +@@ -1,12 +1,9 @@ + #include + #include +-#include + #ifndef XFRACT + #include +-#include +-#else +-#include + #endif ++#include + #include + + #include "port.h" diff --git a/graphics/xfractint/files/patch-miscovl.c b/graphics/xfractint/files/patch-miscovl.c new file mode 100644 index 000000000000..5d70b04f7b7e --- /dev/null +++ b/graphics/xfractint/files/patch-miscovl.c @@ -0,0 +1,56 @@ +--- miscovl.c.orig Tue Sep 7 00:38:10 1999 ++++ miscovl.c Sun Dec 7 10:54:31 2003 +@@ -5,13 +5,13 @@ + #include + #include + #include ++#include + #ifndef XFRACT ++#ifndef BIG_ANSI_C + #include ++#endif + #include +-#include + #include +-#else +-#include + #endif + /* see Fractint.c for a description of the "include" hierarchy */ + #include "port.h" +@@ -24,11 +24,7 @@ + static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j); + static void expand_comments(char far *target, char far *source); + +-#ifndef XFRACT + static void put_parm(char *parm,...); +-#else +-static void put_parm(); +-#endif + + static void put_parm_line(void); + static int getprec(double,double,double); +@@ -1175,24 +1171,12 @@ + } + } + +-#ifndef XFRACT + static void put_parm(char *parm,...) +-#else +-static void put_parm(va_alist) +-va_dcl +-#endif + { + char *bufptr; + va_list args; + +-#ifndef XFRACT + va_start(args,parm); +-#else +- char * parm; +- +- va_start(args); +- parm = va_arg(args,char *); +-#endif + if (*parm == ' ' /* starting a new parm */ + && wbdata->len == 0) /* skip leading space */ + ++parm; diff --git a/graphics/xfractint/files/patch-miscres.c b/graphics/xfractint/files/patch-miscres.c new file mode 100644 index 000000000000..f659908f7dcc --- /dev/null +++ b/graphics/xfractint/files/patch-miscres.c @@ -0,0 +1,18 @@ +--- miscres.c.orig Tue Sep 7 00:38:10 1999 ++++ miscres.c Sun Dec 7 10:48:38 2003 +@@ -5,12 +5,12 @@ + #include + #include + #include ++#include ++#ifndef BIG_ANSI_C + #include ++#endif + #ifndef XFRACT +-#include + #include +-#else +-#include + #endif + /*#ifdef __TURBOC__ + #include diff --git a/graphics/xfractint/files/patch-port.h b/graphics/xfractint/files/patch-port.h new file mode 100644 index 000000000000..252e957e0b9b --- /dev/null +++ b/graphics/xfractint/files/patch-port.h @@ -0,0 +1,21 @@ +--- port.h.orig Tue Sep 7 00:38:10 1999 ++++ port.h Sun Dec 7 02:46:07 2003 +@@ -42,7 +42,7 @@ + /* If endian.h is not present, it can be handled in the code below, */ + /* but if you have this file, it can make it more fool proof. */ + #if (defined(XFRACT) && !defined(__sun)) +-#if defined(sgi) ++#if defined(sgi) || defined(__FreeBSD__) + #include + #else + #include +@@ -288,6 +288,9 @@ + #define DO_NOT_USE_LONG_DOUBLE + #endif + #ifdef sun ++#define DO_NOT_USE_LONG_DOUBLE ++#endif ++#ifdef __FreeBSD__ + #define DO_NOT_USE_LONG_DOUBLE + #endif + diff --git a/graphics/xfractint/files/patch-printer.c b/graphics/xfractint/files/patch-printer.c new file mode 100644 index 000000000000..fe962059bb79 --- /dev/null +++ b/graphics/xfractint/files/patch-printer.c @@ -0,0 +1,54 @@ +--- printer.c.orig Tue Sep 7 00:38:10 1999 ++++ printer.c Sun Dec 7 11:42:07 2003 +@@ -86,12 +86,10 @@ + #include + #include + #include ++#include + + #ifndef XFRACT + #include +-#include +-#else +-#include + #endif + + #include +@@ -136,11 +134,7 @@ + + /******** PROTOTYPES ********/ + +-#ifndef XFRACT + static void Printer_printf(char far *fmt,...); +-#else +-static void Printer_printf(); +-#endif + static int _fastcall printer(int c); + static void _fastcall print_title(int,int,char *); + static void printer_reset(void); +@@ -1335,25 +1329,14 @@ + + /* This function prints a string to the the printer with BIOS calls. */ + +-#ifndef XFRACT + static void Printer_printf(char far *fmt,...) +-#else +-static void Printer_printf(va_alist) +-va_dcl +-#endif + { + int i; + char s[500]; + int x=0; + va_list arg; + +-#ifndef XFRACT + va_start(arg,fmt); +-#else +-char far *fmt; +-va_start(arg); +-fmt = va_arg(arg,char far *); +-#endif + + { + /* copy far to near string */ diff --git a/graphics/xfractint/files/patch-prompts1.c b/graphics/xfractint/files/patch-prompts1.c new file mode 100644 index 000000000000..e4a0b316b20b --- /dev/null +++ b/graphics/xfractint/files/patch-prompts1.c @@ -0,0 +1,20 @@ +--- prompts1.c.orig Tue Sep 7 00:38:10 1999 ++++ prompts1.c Sun Dec 7 02:48:35 2003 +@@ -8,7 +8,7 @@ + #ifndef __386BSD__ + #include + #include +-#ifndef __SVR4 ++#if !defined(__SVR4) && !defined(__FreeBSD__) + # include + #else + # include +@@ -20,7 +20,7 @@ + #endif + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-prompts2.c b/graphics/xfractint/files/patch-prompts2.c new file mode 100644 index 000000000000..b92ec9c0eb88 --- /dev/null +++ b/graphics/xfractint/files/patch-prompts2.c @@ -0,0 +1,20 @@ +--- prompts2.c.orig Tue Sep 7 00:38:10 1999 ++++ prompts2.c Sun Dec 7 03:01:01 2003 +@@ -9,7 +9,7 @@ + #elif !defined(__386BSD__) + #include + #include +-#ifndef __SVR4 ++#if !defined(__SVR4) && !defined(__FreeBSD__) + # include + #else + # include +@@ -20,7 +20,7 @@ + #endif + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-prototyp.h b/graphics/xfractint/files/patch-prototyp.h new file mode 100644 index 000000000000..8cb17eeea852 --- /dev/null +++ b/graphics/xfractint/files/patch-prototyp.h @@ -0,0 +1,29 @@ +--- prototyp.h.orig Tue Sep 7 00:38:10 1999 ++++ prototyp.h Sun Dec 7 11:36:26 2003 +@@ -372,13 +372,8 @@ + + extern void calcfracinit(void); + extern void adjust_corner(void); +-#ifndef XFRACT + extern int put_resume(int ,... ); + extern int get_resume(int ,... ); +-#else +-extern int put_resume(); +-extern int get_resume(); +-#endif + extern int alloc_resume(int ,int ); + extern int start_resume(void); + extern void end_resume(void); +@@ -604,11 +599,10 @@ + extern int pot_line(BYTE *,int ); + extern int sound_line(BYTE *,int ); + extern int sound_line(unsigned char *pixels,int linelen); +-#ifndef XFRACT + extern int timer(int,int (*subrtn)(),...); ++#ifndef XFRACT + extern int _cdecl _matherr(struct exception *); + #else +-extern int timer(); + extern int XZoomWaiting; + #endif + diff --git a/graphics/xfractint/files/patch-soi.c b/graphics/xfractint/files/patch-soi.c new file mode 100644 index 000000000000..bfc6b7bd26bd --- /dev/null +++ b/graphics/xfractint/files/patch-soi.c @@ -0,0 +1,22 @@ +--- soi.c.orig Tue Sep 7 00:38:10 1999 ++++ soi.c Sun Dec 7 02:59:00 2003 +@@ -13,13 +13,19 @@ + */ + #include + #include ++#ifndef BIG_ANSI_C + #include ++#endif + #include "port.h" + #include "prototyp.h" + + #define DBLS LDBL + #define FABS(x) fabsl(x) ++#ifdef __FreeBSD__ ++#define FREXP(x,y) frexp(x,y) ++#else + #define FREXP(x,y) frexpl(x,y) ++#endif + + #define TRUE 1 + #define FALSE 0 diff --git a/graphics/xfractint/files/patch-soi1.c b/graphics/xfractint/files/patch-soi1.c new file mode 100644 index 000000000000..8c29936ea00d --- /dev/null +++ b/graphics/xfractint/files/patch-soi1.c @@ -0,0 +1,12 @@ +--- soi1.c.orig Tue Sep 7 00:38:10 1999 ++++ soi1.c Sun Dec 7 02:58:25 2003 +@@ -13,7 +13,9 @@ + */ + #include + #include ++#ifndef BIG_ANSI_C + #include ++#endif + #include "port.h" + #include "prototyp.h" + diff --git a/graphics/xfractint/files/patch-unixscr.c b/graphics/xfractint/files/patch-unixscr.c new file mode 100644 index 000000000000..44611a5bfc64 --- /dev/null +++ b/graphics/xfractint/files/patch-unixscr.c @@ -0,0 +1,44 @@ +--- unixscr.c.orig Wed Apr 28 23:12:03 1999 ++++ unixscr.c Fri Oct 8 18:24:15 1999 +@@ -241,7 +241,7 @@ + initdacbox(); + + if (!simple_input) { +- signal(SIGINT,(__sighandler_t)goodbye); ++ signal(SIGINT,(sig_t)goodbye); + } + signal(SIGFPE, fpe_handler); + /* +@@ -2068,12 +2068,12 @@ + void + shell_to_dos() + { +- __sighandler_t sigint; ++ sig_t sigint; + char *shell; + char *argv[2]; + int pid, donepid; + +- sigint = (__sighandler_t)signal(SIGINT, SIG_IGN); ++ sigint = signal(SIGINT, SIG_IGN); + shell = getenv("SHELL"); + if (shell==NULL) { + shell = SHELL; +@@ -2121,7 +2121,7 @@ + fcntl(0,F_SETFL,FNDELAY); + } + +- signal(SIGINT, (__sighandler_t)sigint); ++ signal(SIGINT, sigint); + putchar('\n'); + } + +@@ -2146,7 +2146,7 @@ + int soon; + { + if (!fastmode) return; +- signal(SIGALRM, (__sighandler_t)setredrawscreen); ++ signal(SIGALRM, (sig_t)setredrawscreen); + if (soon) { + alarm(1); + } else { -- cgit v1.2.3