From dd884f578cf6b64d1279ea684980506f8a1e0d8f Mon Sep 17 00:00:00 2001 From: garga Date: Fri, 1 Oct 2010 18:52:21 +0000 Subject: - Update to 20.04p09 - Pass maintainership to Paul B Mahol Submitted by: Paul B Mahol (by email) --- graphics/xfractint/Makefile | 30 ++-- graphics/xfractint/distinfo | 6 +- graphics/xfractint/files/patch-Makefile | 185 +++++----------------- graphics/xfractint/files/patch-biginit.c | 12 -- graphics/xfractint/files/patch-common__biginit.c | 12 ++ graphics/xfractint/files/patch-common__fractalb.c | 11 ++ graphics/xfractint/files/patch-common__fractals.c | 11 ++ graphics/xfractint/files/patch-common__frasetup.c | 11 ++ graphics/xfractint/files/patch-common__lsys.c | 11 ++ graphics/xfractint/files/patch-common__lsysf.c | 11 ++ graphics/xfractint/files/patch-common__memory.c | 9 ++ graphics/xfractint/files/patch-common__miscres.c | 10 ++ graphics/xfractint/files/patch-common__prompts1.c | 11 ++ graphics/xfractint/files/patch-common__prompts2.c | 20 +++ graphics/xfractint/files/patch-common__soi.c | 21 +++ graphics/xfractint/files/patch-common__soi1.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-general.c | 11 -- graphics/xfractint/files/patch-hc.c | 133 ---------------- graphics/xfractint/files/patch-headers__port.h | 20 +++ 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 | 67 -------- 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 | 29 ---- graphics/xfractint/files/patch-prompts2.c | 20 --- graphics/xfractint/files/patch-prototyp.h | 29 ---- graphics/xfractint/files/patch-soi.c | 21 --- graphics/xfractint/files/patch-soi1.c | 12 -- graphics/xfractint/files/patch-unix__general.c | 11 ++ graphics/xfractint/files/patch-unix__unixscr.c | 20 +++ graphics/xfractint/files/patch-unixscr.c | 53 ------- graphics/xfractint/pkg-plist | 84 +++++++--- 43 files changed, 327 insertions(+), 916 deletions(-) delete mode 100644 graphics/xfractint/files/patch-biginit.c create mode 100644 graphics/xfractint/files/patch-common__biginit.c create mode 100644 graphics/xfractint/files/patch-common__fractalb.c create mode 100644 graphics/xfractint/files/patch-common__fractals.c create mode 100644 graphics/xfractint/files/patch-common__frasetup.c create mode 100644 graphics/xfractint/files/patch-common__lsys.c create mode 100644 graphics/xfractint/files/patch-common__lsysf.c create mode 100644 graphics/xfractint/files/patch-common__memory.c create mode 100644 graphics/xfractint/files/patch-common__miscres.c create mode 100644 graphics/xfractint/files/patch-common__prompts1.c create mode 100644 graphics/xfractint/files/patch-common__prompts2.c create mode 100644 graphics/xfractint/files/patch-common__soi.c create mode 100644 graphics/xfractint/files/patch-common__soi1.c delete mode 100644 graphics/xfractint/files/patch-editpal.c delete mode 100644 graphics/xfractint/files/patch-fracsubr.c delete mode 100644 graphics/xfractint/files/patch-fractalb.c delete mode 100644 graphics/xfractint/files/patch-fractals.c delete mode 100644 graphics/xfractint/files/patch-fractint.c delete mode 100644 graphics/xfractint/files/patch-framain2.c delete mode 100644 graphics/xfractint/files/patch-frasetup.c delete mode 100644 graphics/xfractint/files/patch-general.c delete mode 100644 graphics/xfractint/files/patch-hc.c create mode 100644 graphics/xfractint/files/patch-headers__port.h delete mode 100644 graphics/xfractint/files/patch-jiim.c delete mode 100644 graphics/xfractint/files/patch-lsys.c delete mode 100644 graphics/xfractint/files/patch-lsysf.c delete mode 100644 graphics/xfractint/files/patch-memory.c delete mode 100644 graphics/xfractint/files/patch-miscovl.c delete mode 100644 graphics/xfractint/files/patch-miscres.c delete mode 100644 graphics/xfractint/files/patch-port.h delete mode 100644 graphics/xfractint/files/patch-printer.c delete mode 100644 graphics/xfractint/files/patch-prompts1.c delete mode 100644 graphics/xfractint/files/patch-prompts2.c delete mode 100644 graphics/xfractint/files/patch-prototyp.h delete mode 100644 graphics/xfractint/files/patch-soi.c delete mode 100644 graphics/xfractint/files/patch-soi1.c create mode 100644 graphics/xfractint/files/patch-unix__general.c create mode 100644 graphics/xfractint/files/patch-unix__unixscr.c delete mode 100644 graphics/xfractint/files/patch-unixscr.c diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index 1bfd4849151b..c513ca9bb951 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -6,20 +6,32 @@ # PORTNAME= xfractint -PORTVERSION= 20.2.04 -PORTREVISION= 1 +PORTVERSION= 20.04p09 CATEGORIES= graphics -MASTER_SITES= http://www.sdboyd56.com/xfractint/ -DISTNAME= xfract${PORTVERSION} +MASTER_SITES= http://www.fractint.org/ftp/current/linux/ \ + http://twegner.dyndns.org/fractint/ftp/current/linux/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= onemda@gmail.com COMMENT= The Unix port of fractint -NO_WRKSUBDIR= yes - -USE_ZIP= yes +USE_GMAKE= yes +USE_GZIP= yes USE_XORG= x11 -MAN1= xfractint.1 +ALL_TARGET= ${PORTNAME} + +MAN1= ${PORTNAME}.1 + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${PREFIX}/bin/${PORTNAME} + @${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man ${PREFIX}/man/man1/${MAN1} + @${MKDIR} ${DATADIR} + @${CP} ${WRKSRC}/fractint.hlp ${DATADIR} + @${CP} ${WRKSRC}/sstools.ini ${DATADIR} + @${CP} -R ${WRKSRC}/formulas ${DATADIR} + @${CP} -R ${WRKSRC}/ifs ${DATADIR} + @${CP} -R ${WRKSRC}/lsystem ${DATADIR} + @${CP} -R ${WRKSRC}/maps ${DATADIR} + @${CP} -R ${WRKSRC}/pars ${DATADIR} .include diff --git a/graphics/xfractint/distinfo b/graphics/xfractint/distinfo index 5abc40bbab11..b28781d81f98 100644 --- a/graphics/xfractint/distinfo +++ b/graphics/xfractint/distinfo @@ -1,3 +1,3 @@ -MD5 (xfract20.2.04.zip) = 458414ee6b27c7233f62563e24b6dee1 -SHA256 (xfract20.2.04.zip) = 4534476e3b038f51dc1f455f2962d2ed13c275df0900ac20dd176f5fb508331f -SIZE (xfract20.2.04.zip) = 972140 +MD5 (xfractint-20.04p09.tar.gz) = 098e5ef480a8e30146a977213b2c3a2d +SHA256 (xfractint-20.04p09.tar.gz) = 296e6da82a81210b2d9ccde0eb15059d27f561f23ef1221f39fbefe48ebe5d69 +SIZE (xfractint-20.04p09.tar.gz) = 1333141 diff --git a/graphics/xfractint/files/patch-Makefile b/graphics/xfractint/files/patch-Makefile index a13c00f8f11b..d50ea36a5509 100644 --- a/graphics/xfractint/files/patch-Makefile +++ b/graphics/xfractint/files/patch-Makefile @@ -1,166 +1,57 @@ ---- Makefile.orig Mon Apr 8 20:18:24 2002 -+++ Makefile Mon Sep 3 19:48:16 2007 -@@ -2,11 +2,11 @@ +--- ./Makefile.orig 2008-09-25 20:55:39.000000000 -0400 ++++ ./Makefile 2010-01-27 13:52:46.000000000 -0500 +@@ -27,8 +27,8 @@ + # 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 = . -+SRCDIR = ${PREFIX}/share/fractint +-SRCDIR = $(DESTDIR)/share/xfractint ++SRCDIR = $(PREFIX)/share/xfractint + SHRDIR = $(PREFIX)/share/xfractint # BINDIR is where you put your X11 binaries --BINDIR = /usr/X11R6/bin -+BINDIR = ${PREFIX}/bin + BINDIR = $(DESTDIR)/bin # MANDIR is where you put your chapter 1 man pages --MANDIR = /usr/X11R6/man/man1 -+MANDIR = ${PREFIX}/man/man1 +@@ -116,22 +116,18 @@ + #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g + #If you have the nasm assembler on your system add -DNASM to CFLAGS + +-ifeq ($(AS),/usr/bin/nasm) - NOBSTRING = - HAVESTRI = -@@ -55,7 +55,7 @@ +-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin #CFLAGS = -I. -D_CONST $(DEFINES) - #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -Wall -mpentium -DNASM - #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM --CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -+CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${LOCALBASE}/include + #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ + # -march=$(ARCH) -DNASM -fno-builtin + #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM -fno-builtin + +-else + +-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin ++CFLAGS += -I$(LOCALBASE)/include -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin + #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ + # -march=$(ARCH) -fno-builtin + #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin + +-endif # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE -@@ -64,7 +64,7 @@ +@@ -140,7 +136,6 @@ # 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 = gcc -+CC ?= cc +-CC = /usr/bin/gcc # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap # For AIX or OSF/1, add -lbsd -@@ -73,14 +73,14 @@ - # For Solaris, add -L/usr/openwin/lib - # For Linux, use - #LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses --LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -+LIBS = -L${LOCALBASE}/lib -lX11 -lm -lcurses - #LIBS = -lX11 -lm -lcurses - - # For using nasm, set: - #AS = nasm - # Note that because of the differences between the assembler syntaxes, - # nasm is the only one that will work. --AS = foo -+AS = nasm - - # Below is for Linux with output file type of elf, turn all warnings on - AFLAGS = -f elf -w+orphan-labels -@@ -123,31 +123,7 @@ - - LFILES = fractint.l penrose.l tiling.l - --MAPFILES = \ --Carlson1.map Digiorg1.map Digiorg2.map Gallet01.map Gallet02.map Gallet03.map \ --Gallet04.map Gallet05.map Gallet06.map Gallet07.map Gallet08.map Gallet09.map \ --Gallet10.map Gallet11.map Gallet12.map Gallet13.map Gallet14.map Gallet15.map \ --Gallet16.map Gallet17.map Gallet18.map Lindaa01.map Lindaa02.map Lindaa03.map \ --Lindaa04.map Lindaa05.map Lindaa06.map Lindaa07.map Lindaa08.map Lindaa09.map \ --Lindaa10.map Lindaa11.map Lindaa12.map Lindaa14.map Lindaa15.map Lindaa16.map \ --Lindaa17.map Morgan1.map Morgan2.map Morgan3.map Morgen3.map Skydye01.map \ --Skydye02.map Skydye03.map Skydye04.map Skydye05.map Skydye06.map Skydye07.map \ --Skydye08.map Skydye09.map Skydye10.map Skydye11.map Skydye12.map Wizzl011.map \ --Wizzl012.map Wizzl013.map Wizzl014.map Wizzl015.map Wizzl016.map Wizzl017.map \ --Wizzl018.map Wizzl019.map Wizzl020.map altern.map blues.map bud2.map bud3.map \ --bud4.map bud5.map bud6.map bud7.map chroma.map damien1.map damien2.map \ --damien3.map damien4.map damien5.map default.map droz10.map droz11.map \ --droz12.map droz13.map droz14.map droz15.map droz21.map droz22.map droz23.map \ --droz28.map droz31.map droz33.map droz34.map droz35.map droz36.map droz38.map \ --droz39.map droz40.map droz44.map droz46.map droz49.map droz52.map droz54.map \ --droz56.map droz60.map droz62.map droz8.map drozdis1.map firestrm.map \ --froth3.map froth316.map froth6.map froth616.map gamma1.map gamma2.map \ --glasses1.map glasses2.map goodega.map green.map grey.map grid.map headache.map \ --landscap.map lkmtch00.map lkmtch01.map lkmtch02.map lkmtch03.map lkmtch04.map \ --lkmtch05.map lkmtch06.map lkmtch07.map lkmtch08.map lkmtch09.map lkmtch10.map \ --lkmtch11.map lkmtch12.map lkmtch13.map lkmtch14.map lkmtch15.map lkmtch16.map \ --lkmtch17.map lkmtch18.map lkmtch19.map lyapunov.map neon.map paintjet.map \ --royal.map topo.map volcano.map -+MAPFILES = altern.map default.map - - OLDRUN = $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) \ - $(MAPFILES) demo.key -@@ -160,9 +136,7 @@ - - FILES = $(SRCFILES) $(RUNFILES) - --ifeq ($(AS),nasm) -- --OBJS = \ -+NASMOBJS = \ - 3d.o ant.o bigflt.o biginit.o bignum.o bignumc.o calcfrac.o \ - calcmand.o calmanfp.o cmdfiles.o decoder.o diskvidu.o editpal.o encoder.o \ - evolve.o f16.o fpu087.o fracsuba.o fracsubr.o fractalb.o fractalp.o fractals.o \ -@@ -173,8 +147,6 @@ - realdos.o rotate.o slideshw.o soi.o soi1.o stereo.o targa.o testpt.o tgaview.o \ - tplus.o tplus_a.o unix.o unixscr.o video.o zoom.o calmanfx.o +@@ -152,11 +147,7 @@ + # LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses + # LIBS = -lX11 -lm -lcurses +-ifeq ($(ARCH),athlon64) +-LIBS = -L/usr/X11R6/lib64 -lX11 -lm -else -- - OBJS = \ - 3d.o ant.o bigflt.o biginit.o bignum.o bignumc.o calcfrac.o \ - calcmand.o calmanfp.o cmdfiles.o decoder.o diskvidu.o editpal.o encoder.o \ -@@ -186,8 +158,6 @@ - realdos.o rotate.o slideshw.o soi.o soi1.o stereo.o targa.o testpt.o tgaview.o \ - tplus.o tplus_a.o unix.o unixscr.o video.o zoom.o - --endif -- - HOBJS = hc.o unix.o - - HELP = help.src help2.src help3.src help4.src help5.src -@@ -196,6 +166,8 @@ - .SUFFIXES: - .SUFFIXES: .o .c .s .h .asm - -+all: xfractint -+ - xfractint: fractint.hlp .WAIT $(OBJS) - $(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS) - # strip xfractint -@@ -210,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 -@@ -240,10 +213,8 @@ - help.o: help.c - $(CC) $(CFLAGS) -DSRCDIR=\"$(SRCDIR)\" -c help.c - --ifeq ($(AS),nasm) - calmanfx.o: calmanfx.asm - $(AS) $(AFLAGS) calmanfx.asm --endif - - sharsrc: $(SRCFILES) - shar -s shirriff@eng.sun.com $(SRCFILES) > xfsrc.shar -@@ -325,9 +296,7 @@ - - calmanfp.o: calmanfp.c fractint.h port.h fractype.h - --ifeq ($(AS),nasm) - calmanfx.o: calmanfx.asm xfract_a.inc +-LIBS = -L/usr/X11R6/lib -lX11 -lm -endif ++LIBS = -L${LOCALBASE}/lib -lX11 -lm - cmdfiles.o: cmdfiles.c fractint.h port.h fractype.h prototyp.h mpmath.h \ - helpcom.h + ifeq ($(NCURSES),-DNCURSES) + LIBS += -lncurses diff --git a/graphics/xfractint/files/patch-biginit.c b/graphics/xfractint/files/patch-biginit.c deleted file mode 100644 index 1dc6acf9c35d..000000000000 --- a/graphics/xfractint/files/patch-biginit.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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-common__biginit.c b/graphics/xfractint/files/patch-common__biginit.c new file mode 100644 index 000000000000..1115230d646c --- /dev/null +++ b/graphics/xfractint/files/patch-common__biginit.c @@ -0,0 +1,12 @@ +--- ./common/biginit.c.orig 2008-09-18 21:58:09.000000000 -0400 ++++ ./common/biginit.c 2010-01-27 13:52:46.000000000 -0500 +@@ -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-common__fractalb.c b/graphics/xfractint/files/patch-common__fractalb.c new file mode 100644 index 000000000000..d472b1fa36a5 --- /dev/null +++ b/graphics/xfractint/files/patch-common__fractalb.c @@ -0,0 +1,11 @@ +--- ./common/fractalb.c.orig 2008-09-17 21:52:35.000000000 -0400 ++++ ./common/fractalb.c 2010-01-27 13:52:46.000000000 -0500 +@@ -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-common__fractals.c b/graphics/xfractint/files/patch-common__fractals.c new file mode 100644 index 000000000000..ffe231c3c51b --- /dev/null +++ b/graphics/xfractint/files/patch-common__fractals.c @@ -0,0 +1,11 @@ +--- ./common/fractals.c.orig 2008-09-17 21:52:35.000000000 -0400 ++++ ./common/fractals.c 2010-01-27 13:52:46.000000000 -0500 +@@ -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-common__frasetup.c b/graphics/xfractint/files/patch-common__frasetup.c new file mode 100644 index 000000000000..2c756960162e --- /dev/null +++ b/graphics/xfractint/files/patch-common__frasetup.c @@ -0,0 +1,11 @@ +--- ./common/frasetup.c.orig 2004-11-23 08:13:37.000000000 -0500 ++++ ./common/frasetup.c 2010-01-27 13:52:46.000000000 -0500 +@@ -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-common__lsys.c b/graphics/xfractint/files/patch-common__lsys.c new file mode 100644 index 000000000000..9f00583c4263 --- /dev/null +++ b/graphics/xfractint/files/patch-common__lsys.c @@ -0,0 +1,11 @@ +--- ./common/lsys.c.orig 2005-12-21 21:15:40.000000000 -0500 ++++ ./common/lsys.c 2010-01-27 13:52:46.000000000 -0500 +@@ -2,7 +2,7 @@ + #include + #ifdef __TURBOC__ + #include +-#else ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-common__lsysf.c b/graphics/xfractint/files/patch-common__lsysf.c new file mode 100644 index 000000000000..1e1c479c5fb3 --- /dev/null +++ b/graphics/xfractint/files/patch-common__lsysf.c @@ -0,0 +1,11 @@ +--- ./common/lsysf.c.orig 2004-11-23 08:13:37.000000000 -0500 ++++ ./common/lsysf.c 2010-01-27 13:52:46.000000000 -0500 +@@ -1,7 +1,7 @@ + #include + #ifdef __TURBOC__ + #include +-#else ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-common__memory.c b/graphics/xfractint/files/patch-common__memory.c new file mode 100644 index 000000000000..3562852fd515 --- /dev/null +++ b/graphics/xfractint/files/patch-common__memory.c @@ -0,0 +1,9 @@ +--- ./common/memory.c.orig 2006-12-17 12:06:05.000000000 -0500 ++++ ./common/memory.c 2010-01-27 13:52:46.000000000 -0500 +@@ -1,6 +1,5 @@ + #include + #include +-#include + + #if (!defined(XFRACT) && !defined(WINFRACT)) + #include diff --git a/graphics/xfractint/files/patch-common__miscres.c b/graphics/xfractint/files/patch-common__miscres.c new file mode 100644 index 000000000000..06451bc6451e --- /dev/null +++ b/graphics/xfractint/files/patch-common__miscres.c @@ -0,0 +1,10 @@ +--- ./common/miscres.c.orig 2007-05-02 20:32:43.000000000 -0400 ++++ ./common/miscres.c 2010-01-27 13:52:46.000000000 -0500 +@@ -5,7 +5,6 @@ + #include + #include + #include +-#include + + #ifndef XFRACT + #include diff --git a/graphics/xfractint/files/patch-common__prompts1.c b/graphics/xfractint/files/patch-common__prompts1.c new file mode 100644 index 000000000000..2415ddc5e9d9 --- /dev/null +++ b/graphics/xfractint/files/patch-common__prompts1.c @@ -0,0 +1,11 @@ +--- ./common/prompts1.c.orig 2008-08-04 21:44:54.000000000 -0400 ++++ ./common/prompts1.c 2010-01-27 13:52:46.000000000 -0500 +@@ -12,7 +12,7 @@ + #endif + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-common__prompts2.c b/graphics/xfractint/files/patch-common__prompts2.c new file mode 100644 index 000000000000..cea9ae8748de --- /dev/null +++ b/graphics/xfractint/files/patch-common__prompts2.c @@ -0,0 +1,20 @@ +--- ./common/prompts2.c.orig 2008-02-17 11:10:04.000000000 -0500 ++++ ./common/prompts2.c 2010-01-27 13:52:46.000000000 -0500 +@@ -12,7 +12,7 @@ + + #ifdef DIRENT + #include +-#elif !defined(__SVR4) ++#elif !defined(__SVR4) && !defined(__FreeBSD__) + #include + #else + #include +@@ -24,7 +24,7 @@ + #endif + #ifdef __TURBOC__ + #include +-#elif !defined(__386BSD__) ++#elif !defined(BIG_ANSI_C) + #include + #endif + diff --git a/graphics/xfractint/files/patch-common__soi.c b/graphics/xfractint/files/patch-common__soi.c new file mode 100644 index 000000000000..5e3675523756 --- /dev/null +++ b/graphics/xfractint/files/patch-common__soi.c @@ -0,0 +1,21 @@ +--- ./common/soi.c.orig 2004-11-23 08:13:37.000000000 -0500 ++++ ./common/soi.c 2010-01-27 13:52:46.000000000 -0500 +@@ -13,7 +13,9 @@ + */ + #include + #include ++#ifndef BIG_ANSI_C + #include ++#endif + #include "port.h" + #include "prototyp.h" + +@@ -21,7 +23,7 @@ + #define FABS(x) fabsl(x) + /* the following needs to be changed back to frexpl once the portability + issue has been addressed JCO */ +-#ifndef XFRACT ++#ifndef __FreeBSD__ + #define FREXP(x,y) frexpl(x,y) + #else + #define FREXP(x,y) frexp(x,y) diff --git a/graphics/xfractint/files/patch-common__soi1.c b/graphics/xfractint/files/patch-common__soi1.c new file mode 100644 index 000000000000..e086d8a0cc4d --- /dev/null +++ b/graphics/xfractint/files/patch-common__soi1.c @@ -0,0 +1,12 @@ +--- ./common/soi1.c.orig 2004-11-23 08:13:37.000000000 -0500 ++++ ./common/soi1.c 2010-01-27 13:52:46.000000000 -0500 +@@ -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-editpal.c b/graphics/xfractint/files/patch-editpal.c deleted file mode 100644 index c86973983735..000000000000 --- a/graphics/xfractint/files/patch-editpal.c +++ /dev/null @@ -1,46 +0,0 @@ ---- 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 deleted file mode 100644 index 2c72d163cb54..000000000000 --- a/graphics/xfractint/files/patch-fracsubr.c +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 deleted file mode 100644 index a8324cba2a4d..000000000000 --- a/graphics/xfractint/files/patch-fractalb.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 6e02c20d82e6..000000000000 --- a/graphics/xfractint/files/patch-fractals.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index e9fea5a958d1..000000000000 --- a/graphics/xfractint/files/patch-fractint.c +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 deleted file mode 100644 index ac0036f309a7..000000000000 --- a/graphics/xfractint/files/patch-framain2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 56329987fa96..000000000000 --- a/graphics/xfractint/files/patch-frasetup.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-general.c b/graphics/xfractint/files/patch-general.c deleted file mode 100644 index bb76a68ec350..000000000000 --- a/graphics/xfractint/files/patch-general.c +++ /dev/null @@ -1,11 +0,0 @@ ---- general.c.orig Mon Sep 3 18:45:31 2007 -+++ general.c Mon Sep 3 18:46:25 2007 -@@ -314,7 +314,7 @@ - static struct timeval delay; - delay.tv_sec = delaytime/1000; - delay.tv_usec = (delaytime%1000)*1000; --#if defined( __SVR4) || defined(LINUX) -+#if defined( __SVR4) || defined(LINUX) || defined(__FreeBSD__) - (void) select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &delay); - #else - (void) select(0, (int *) 0, (int *) 0, (int *) 0, &delay); diff --git a/graphics/xfractint/files/patch-hc.c b/graphics/xfractint/files/patch-hc.c deleted file mode 100644 index 3b1f0e11b7c2..000000000000 --- a/graphics/xfractint/files/patch-hc.c +++ /dev/null @@ -1,133 +0,0 @@ ---- 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-headers__port.h b/graphics/xfractint/files/patch-headers__port.h new file mode 100644 index 000000000000..a1d227fde511 --- /dev/null +++ b/graphics/xfractint/files/patch-headers__port.h @@ -0,0 +1,20 @@ +--- ./headers/port.h.orig 2008-02-17 17:26:16.000000000 -0500 ++++ ./headers/port.h 2010-01-27 13:52:46.000000000 -0500 +@@ -44,7 +44,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 +@@ -319,7 +319,7 @@ + /* HP-UX support long doubles and allows them to be read in with */ + /* scanf(), but does not support the functions sinl, cosl, fabsl, etc. */ + /* CAE added this 26Jan95 so it would compile (altered by Wes to new macro) */ +-#ifdef _HPUX_SOURCE ++#if defined _HPUX_SOURCE || defined (__FreeBSD__) + #define DO_NOT_USE_LONG_DOUBLE + #endif + diff --git a/graphics/xfractint/files/patch-jiim.c b/graphics/xfractint/files/patch-jiim.c deleted file mode 100644 index 47aa584ac084..000000000000 --- a/graphics/xfractint/files/patch-jiim.c +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index f33be2928836..000000000000 --- a/graphics/xfractint/files/patch-lsys.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 8b0958843b68..000000000000 --- a/graphics/xfractint/files/patch-lsysf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 982c0f976c56..000000000000 --- a/graphics/xfractint/files/patch-memory.c +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index a5fe7a14884d..000000000000 --- a/graphics/xfractint/files/patch-miscovl.c +++ /dev/null @@ -1,67 +0,0 @@ ---- miscovl.c.orig Mon Apr 8 19:33:28 2002 -+++ miscovl.c Mon Sep 3 16:42:54 2007 -@@ -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,12 +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(); --extern int fake_lut; --#endif - - static void put_parm_line(void); - static int getprec(double,double,double); -@@ -1102,9 +1097,6 @@ - int curc,scanc,force,diffmag = -1; - int delta,diff1[4][3],diff2[4][3]; - curc = force = 0; --#ifdef XFRACT -- if (fake_lut && !truemode) loaddac(); /* stupid kludge JCO 6/23/2001 */ --#endif - for(;;) { - /* emit color in rgb 3 char encoded form */ - for (j = 0; j < 3; ++j) { -@@ -1200,24 +1192,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 deleted file mode 100644 index f659908f7dcc..000000000000 --- a/graphics/xfractint/files/patch-miscres.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 252e957e0b9b..000000000000 --- a/graphics/xfractint/files/patch-port.h +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 deleted file mode 100644 index fe962059bb79..000000000000 --- a/graphics/xfractint/files/patch-printer.c +++ /dev/null @@ -1,54 +0,0 @@ ---- 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 deleted file mode 100644 index 524306492f1b..000000000000 --- a/graphics/xfractint/files/patch-prompts1.c +++ /dev/null @@ -1,29 +0,0 @@ ---- prompts1.c.orig Mon Apr 8 19:33:28 2002 -+++ prompts1.c Mon Sep 3 19:16:50 2007 -@@ -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 - -@@ -1980,7 +1980,7 @@ - /* subrtn of get_file_entry, separated so that storage gets freed up */ - { - #ifdef XFRACT -- static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details, -+ static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details, \ - "FK_F4" to toggle sort "}; - /* keep the above split on two lines, the carriage return is needed to keep the - line length < 80 characters */ diff --git a/graphics/xfractint/files/patch-prompts2.c b/graphics/xfractint/files/patch-prompts2.c deleted file mode 100644 index b92ec9c0eb88..000000000000 --- a/graphics/xfractint/files/patch-prompts2.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 8cb17eeea852..000000000000 --- a/graphics/xfractint/files/patch-prototyp.h +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 deleted file mode 100644 index 17d47e726084..000000000000 --- a/graphics/xfractint/files/patch-soi.c +++ /dev/null @@ -1,21 +0,0 @@ ---- soi.c.orig Mon Apr 8 19:33:28 2002 -+++ soi.c Mon Sep 3 16:01:06 2007 -@@ -13,7 +13,9 @@ - */ - #include - #include -+#ifndef BIG_ANSI_C - #include -+#endif - #include "port.h" - #include "prototyp.h" - -@@ -21,7 +23,7 @@ - #define FABS(x) fabsl(x) - /* the following needs to be changed back to frexpl once the portability - issue has been addressed JCO */ --#ifndef XFRACT -+#ifndef __FreeBSD__ - #define FREXP(x,y) frexpl(x,y) - #else - #define FREXP(x,y) frexp(x,y) diff --git a/graphics/xfractint/files/patch-soi1.c b/graphics/xfractint/files/patch-soi1.c deleted file mode 100644 index 8c29936ea00d..000000000000 --- a/graphics/xfractint/files/patch-soi1.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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-unix__general.c b/graphics/xfractint/files/patch-unix__general.c new file mode 100644 index 000000000000..339bde92c8f7 --- /dev/null +++ b/graphics/xfractint/files/patch-unix__general.c @@ -0,0 +1,11 @@ +--- ./unix/general.c.orig 2008-04-11 10:36:28.000000000 -0400 ++++ ./unix/general.c 2010-01-27 13:52:46.000000000 -0500 +@@ -317,7 +317,7 @@ + static struct timeval delay; + delay.tv_sec = delaytime/1000; + delay.tv_usec = (delaytime%1000)*1000; +-#if defined( __SVR4) || defined(LINUX) ++#if defined( __SVR4) || defined(LINUX) || defined(__FreeBSD__) + (void) select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &delay); + #else + (void) select(0, (int *) 0, (int *) 0, (int *) 0, &delay); diff --git a/graphics/xfractint/files/patch-unix__unixscr.c b/graphics/xfractint/files/patch-unix__unixscr.c new file mode 100644 index 000000000000..6be470754ec8 --- /dev/null +++ b/graphics/xfractint/files/patch-unix__unixscr.c @@ -0,0 +1,20 @@ +--- ./unix/unixscr.c.orig 2008-05-03 13:52:03.000000000 -0400 ++++ ./unix/unixscr.c 2010-01-27 13:52:46.000000000 -0500 +@@ -54,7 +54,7 @@ + #define FNDELAY O_NDELAY + #endif + #endif +-#ifdef __SVR4 ++#if defined (__SVR4) || defined(__FreeBSD__) + # include + # define FNDELAY O_NONBLOCK + #endif +@@ -339,7 +339,7 @@ + initdacbox(); + + if (!simple_input) { +- signal(SIGINT,(SignalHandler)goodbye); ++ signal(SIGINT,(sig_t)goodbye); + } + signal(SIGFPE, fpe_handler); + /* diff --git a/graphics/xfractint/files/patch-unixscr.c b/graphics/xfractint/files/patch-unixscr.c deleted file mode 100644 index 62121a70e2e8..000000000000 --- a/graphics/xfractint/files/patch-unixscr.c +++ /dev/null @@ -1,53 +0,0 @@ ---- unixscr.c.orig Mon Apr 8 19:33:28 2002 -+++ unixscr.c Mon Sep 3 16:41:27 2007 -@@ -42,7 +42,7 @@ - #ifdef LINUX - #define FNDELAY O_NDELAY - #endif --#ifdef __SVR4 -+#if defined (__SVR4) || defined(__FreeBSD__) - # include - # define FNDELAY O_NONBLOCK - #endif -@@ -257,7 +257,7 @@ - initdacbox(); - - if (!simple_input) { -- signal(SIGINT,(SignalHandler)goodbye); -+ signal(SIGINT,(sig_t)goodbye); - } - signal(SIGFPE, fpe_handler); - /* -@@ -2277,12 +2277,12 @@ - void - shell_to_dos() - { -- SignalHandler sigint; -+ sig_t sigint; - char *shell; - char *argv[2]; - int pid, donepid; - -- sigint = (SignalHandler)signal(SIGINT, SIG_IGN); -+ sigint = (sig_t)signal(SIGINT, SIG_IGN); - shell = getenv("SHELL"); - if (shell==NULL) { - shell = SHELL; -@@ -2330,7 +2330,7 @@ - fcntl(0,F_SETFL,FNDELAY); - } - -- signal(SIGINT, (SignalHandler)sigint); -+ signal(SIGINT, (sig_t)sigint); - putchar('\n'); - } - -@@ -2355,7 +2355,7 @@ - int soon; - { - if (!fastmode) return; -- signal(SIGALRM, (SignalHandler)setredrawscreen); -+ signal(SIGALRM, (sig_t)setredrawscreen); - if (soon) { - alarm(1); - } else { diff --git a/graphics/xfractint/pkg-plist b/graphics/xfractint/pkg-plist index 6dd26c85bab1..6c460c6b4322 100644 --- a/graphics/xfractint/pkg-plist +++ b/graphics/xfractint/pkg-plist @@ -1,21 +1,65 @@ bin/xfractint -share/fractint/altern.map -share/fractint/cellular.par -share/fractint/default.map -share/fractint/demo.par -share/fractint/fract18.par -share/fractint/fract19.par -share/fractint/fract200.frm -share/fractint/fract200.par -share/fractint/fractint.frm -share/fractint/fractint.hlp -share/fractint/fractint.ifs -share/fractint/fractint.l -share/fractint/fractint.par -share/fractint/icons.par -share/fractint/lyapunov.par -share/fractint/music.par -share/fractint/penrose.l -share/fractint/phoenix.par -share/fractint/tiling.l -@dirrm share/fractint +%%DATADIR%%/fractint.hlp +%%DATADIR%%/sstools.ini +%%DATADIR%%/formulas/fract001.frm +%%DATADIR%%/formulas/fract002.frm +%%DATADIR%%/formulas/fract003.frm +%%DATADIR%%/formulas/fract196.frm +%%DATADIR%%/formulas/fract200.frm +%%DATADIR%%/formulas/fract_sy.frm +%%DATADIR%%/formulas/fractint.frm +%%DATADIR%%/formulas/ikenaga.frm +%%DATADIR%%/formulas/julitile.frm +%%DATADIR%%/formulas/new_if.frm +%%DATADIR%%/formulas/newton.frm +%%DATADIR%%/ifs/fract205.ifs +%%DATADIR%%/ifs/fractint.ifs +%%DATADIR%%/lsystem/fract205.l +%%DATADIR%%/lsystem/fractint.l +%%DATADIR%%/lsystem/penrose.l +%%DATADIR%%/lsystem/tiling.l +%%DATADIR%%/maps/altern.map +%%DATADIR%%/maps/blues.map +%%DATADIR%%/maps/chroma.map +%%DATADIR%%/maps/default.map +%%DATADIR%%/maps/defaultw.map +%%DATADIR%%/maps/firestrm.map +%%DATADIR%%/maps/froth3.map +%%DATADIR%%/maps/froth316.map +%%DATADIR%%/maps/froth6.map +%%DATADIR%%/maps/froth616.map +%%DATADIR%%/maps/gamma1.map +%%DATADIR%%/maps/gamma2.map +%%DATADIR%%/maps/glasses1.map +%%DATADIR%%/maps/glasses2.map +%%DATADIR%%/maps/goodega.map +%%DATADIR%%/maps/green.map +%%DATADIR%%/maps/grey.map +%%DATADIR%%/maps/grid.map +%%DATADIR%%/maps/headache.map +%%DATADIR%%/maps/landscap.map +%%DATADIR%%/maps/lyapunov.map +%%DATADIR%%/maps/neon.map +%%DATADIR%%/maps/paintjet.map +%%DATADIR%%/maps/royal.map +%%DATADIR%%/maps/topo.map +%%DATADIR%%/maps/volcano.map +%%DATADIR%%/pars/cellular.par +%%DATADIR%%/pars/demo.par +%%DATADIR%%/pars/fract18.par +%%DATADIR%%/pars/fract19.par +%%DATADIR%%/pars/fract200.par +%%DATADIR%%/pars/fract205.par +%%DATADIR%%/pars/fractint.par +%%DATADIR%%/pars/icons.par +%%DATADIR%%/pars/lyapunov.par +%%DATADIR%%/pars/music.par +%%DATADIR%%/pars/newphoen.par +%%DATADIR%%/pars/orbits.par +%%DATADIR%%/pars/phoenix.par +@dirrm %%DATADIR%%/formulas +@dirrm %%DATADIR%%/ifs +@dirrm %%DATADIR%%/lsystem +@dirrm %%DATADIR%%/maps +@dirrm %%DATADIR%%/pars +@dirrm %%DATADIR%% -- cgit