diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-19 07:40:00 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-19 07:40:00 +0000 |
| commit | 36f6324e7b5c44ae13e9210e389aecd078ed619b (patch) | |
| tree | a058164de353615ebfd238af1043454de3a9427b /graphics/xfractint | |
| parent | dbe3af3ceccf29cadadb1659590233ec91cc36fb (diff) | |
| download | ports-36f6324e7b5c44ae13e9210e389aecd078ed619b.tar.gz ports-36f6324e7b5c44ae13e9210e389aecd078ed619b.zip | |
graphics/xfractint: Update to 20.04p16
ChangeLog: https://fractint.net/ftp/current/dos/whatsnew.txt
PR: 253107
Submitted by: m.ne@gmx.net
Approved by: onemda@gmail.com (maintainer, timeout > 2 weeks)
Notes
Notes:
svn path=/head/; revision=566034
Diffstat (limited to 'graphics/xfractint')
21 files changed, 93 insertions, 91 deletions
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index a80308f07f1f..00514581b168 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -2,20 +2,27 @@ # $FreeBSD$ PORTNAME= xfractint -PORTVERSION= 20.04p14 +PORTVERSION= 20.04p16 CATEGORIES= graphics -MASTER_SITES= http://www.fractint.org/ftp/current/linux/ \ - http://twegner.dyndns.org/fractint/ftp/current/linux/ +MASTER_SITES= http://www.fractint.net/ftp/current/linux/ \ + http://www.fractint.org/ftp/current/linux/ MAINTAINER= onemda@gmail.com COMMENT= Unix port of FractInt +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig + USES= gmake xorg USE_XORG= x11 xft ALL_TARGET= ${PORTNAME} -DESKTOP_ENTRIES= "Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" +DESKTOP_ENTRIES= "Xfracint" \ + "${COMMENT}" \ + "" \ + "${PORTNAME}" \ + "" \ + "false" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin diff --git a/graphics/xfractint/distinfo b/graphics/xfractint/distinfo index 532787392469..f1157fddfac8 100644 --- a/graphics/xfractint/distinfo +++ b/graphics/xfractint/distinfo @@ -1,2 +1,3 @@ -SHA256 (xfractint-20.04p14.tar.gz) = 0e2856e596a44f5a8dbd4cb389683ead484776cdba4cce75c6c2a09f86c9b849 -SIZE (xfractint-20.04p14.tar.gz) = 1336285 +TIMESTAMP = 1612016110 +SHA256 (xfractint-20.04p16.tar.gz) = 4e5401cfec0e6ffa1dab38e3c177e1445772096cbe554200c512edeea23c47ad +SIZE (xfractint-20.04p16.tar.gz) = 1356976 diff --git a/graphics/xfractint/files/patch-Makefile b/graphics/xfractint/files/patch-Makefile index b1a03108ccff..4badfc2a7f10 100644 --- a/graphics/xfractint/files/patch-Makefile +++ b/graphics/xfractint/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-05-08 14:39:40.000000000 -0500 -+++ Makefile 2012-03-10 17:22:45.000000000 -0500 -@@ -20,7 +20,7 @@ +--- Makefile.orig 2020-08-01 23:19:09 UTC ++++ Makefile +@@ -20,7 +20,7 @@ NCURSES = # Use Xft/fontconfig libraries WITHXFT = -DWITH_XFT @@ -9,7 +9,7 @@ # Or not # WITHXFT = # XFTHFD = -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ endif # SRCDIR should be a path to the directory that will hold fractint.hlp # SRCDIR should also hold the .par, .frm, etc. files @@ -18,13 +18,14 @@ SHRDIR = $(PREFIX)/share/xfractint # BINDIR is where you put your X11 binaries BINDIR = $(DESTDIR)/bin -@@ -123,22 +123,18 @@ +@@ -123,24 +123,20 @@ AFLAGS = -f elf -w+orphan-labels #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) --CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin +-CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin + #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin #CFLAGS = -I. -D_CONST $(DEFINES) #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ # -march=$(ARCH) -DNASM -fno-builtin @@ -32,8 +33,9 @@ -else --CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin -+CFLAGS += -I$(LOCALBASE)/include -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin +-CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin ++CFLAGS = -I$(LOCALBASE)/include -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin + #CFLAGS = -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 @@ -42,24 +44,28 @@ # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE -@@ -147,7 +143,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 = /usr/bin/gcc - - # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap - # For AIX or OSF/1, add -lbsd -@@ -159,11 +154,7 @@ +@@ -162,11 +158,7 @@ CC ?= # LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses # LIBS = -lX11 -lm -lcurses -ifeq ($(ARCH),athlon64) --LIBS = -L/usr/X11R6/lib64 -lX11 -lm +-LIBS = -L/usr/X11R6/lib64 -lX11 -lm -no-pie -else --LIBS = -L/usr/X11R6/lib -lX11 -lm +-LIBS = -L/usr/X11R6/lib -lX11 -lm -no-pie -endif +LIBS = -L${LOCALBASE}/lib -lX11 -lm ifeq ($(NCURSES),-DNCURSES) LIBS += -lncurses +@@ -324,9 +316,9 @@ fractint: + rm -f unix/unixscr.o unix/video.o unix/xfcurses.o + make NCURSES=-DNCURSES ; mv xfractint fractint + rm -f common/encoder.o common/help.o common/realdos.o +- rm -f unix/unixscr.o unix/video.o unix/xfcurses.o ++ rm -f unix/unixscr.o unix/video.o unix/xfcurses.o + if [ -x xfractint.x11 ] ; then mv -f xfractint.x11 xfractint ; fi +- ++ + # tar: $(FILES) + # tar cvfj xfractint.tar.bz2 $(FILES) + diff --git a/graphics/xfractint/files/patch-common__biginit.c b/graphics/xfractint/files/patch-common__biginit.c index 67a5e1800319..330d4b6280c6 100644 --- a/graphics/xfractint/files/patch-common__biginit.c +++ b/graphics/xfractint/files/patch-common__biginit.c @@ -1,6 +1,6 @@ ---- common/biginit.c.orig 2011-05-07 15:28:14.000000000 -0500 -+++ common/biginit.c 2012-03-10 17:13:34.000000000 -0500 -@@ -9,7 +9,7 @@ +--- common/biginit.c.orig 2017-02-04 17:11:46 UTC ++++ common/biginit.c +@@ -9,7 +9,7 @@ is in the allocations of memory for the big numbers. #include <string.h> #ifdef __APPLE__ #include <malloc/malloc.h> diff --git a/graphics/xfractint/files/patch-common__fractalb.c b/graphics/xfractint/files/patch-common__fractalb.c index 55e40226f0e2..20a71136f2fe 100644 --- a/graphics/xfractint/files/patch-common__fractalb.c +++ b/graphics/xfractint/files/patch-common__fractalb.c @@ -1,6 +1,6 @@ ---- common/fractalb.c.orig 2011-05-07 15:31:02.000000000 -0500 -+++ common/fractalb.c 2012-03-10 16:31:30.000000000 -0500 -@@ -12,7 +12,7 @@ +--- common/fractalb.c.orig 2020-07-05 20:02:50 UTC ++++ common/fractalb.c +@@ -12,7 +12,7 @@ fractal routines. #include <alloc.h> #elif defined(__APPLE__) #include <malloc/malloc.h> diff --git a/graphics/xfractint/files/patch-common__fractals.c b/graphics/xfractint/files/patch-common__fractals.c index 08cbfe51558c..6043337a95a0 100644 --- a/graphics/xfractint/files/patch-common__fractals.c +++ b/graphics/xfractint/files/patch-common__fractals.c @@ -9,12 +9,3 @@ #include <malloc.h> #endif /* see Fractint.c for a description of the "include" hierarchy */ -@@ -3437,7 +3437,7 @@ MandelbrotMix4fpFractal(void) /* from formula by Jim M - #undef K - #undef L - --double b_const; -+extern double b_const; - - int DivideBrot5Setup(void) - { diff --git a/graphics/xfractint/files/patch-common__frasetup.c b/graphics/xfractint/files/patch-common__frasetup.c index bfe0eb2c5124..9480dce4bbbb 100644 --- a/graphics/xfractint/files/patch-common__frasetup.c +++ b/graphics/xfractint/files/patch-common__frasetup.c @@ -1,5 +1,5 @@ ---- common/frasetup.c.orig 2011-05-07 15:32:06.000000000 -0500 -+++ common/frasetup.c 2012-03-10 16:35:22.000000000 -0500 +--- common/frasetup.c.orig 2014-05-03 13:12:35 UTC ++++ common/frasetup.c @@ -4,7 +4,7 @@ #include <alloc.h> #elif defined(__APPLE__) diff --git a/graphics/xfractint/files/patch-common__lsys.c b/graphics/xfractint/files/patch-common__lsys.c index f1c6ac799389..472a7d092416 100644 --- a/graphics/xfractint/files/patch-common__lsys.c +++ b/graphics/xfractint/files/patch-common__lsys.c @@ -1,5 +1,5 @@ ---- common/lsys.c.orig 2011-05-07 15:34:46.000000000 -0500 -+++ common/lsys.c 2012-03-10 16:37:40.000000000 -0500 +--- common/lsys.c.orig 2015-01-19 18:35:16 UTC ++++ common/lsys.c @@ -4,7 +4,7 @@ #include <alloc.h> #elif defined(__APPLE__) diff --git a/graphics/xfractint/files/patch-common__lsysf.c b/graphics/xfractint/files/patch-common__lsysf.c index de1039b6b943..64503796d745 100644 --- a/graphics/xfractint/files/patch-common__lsysf.c +++ b/graphics/xfractint/files/patch-common__lsysf.c @@ -1,5 +1,5 @@ ---- common/lsysf.c.orig 2011-05-07 15:35:02.000000000 -0500 -+++ common/lsysf.c 2012-03-10 16:50:40.000000000 -0500 +--- common/lsysf.c.orig 2014-05-03 13:12:35 UTC ++++ common/lsysf.c @@ -3,7 +3,7 @@ #include <alloc.h> #elif defined(__APPLE__) diff --git a/graphics/xfractint/files/patch-common__memory.c b/graphics/xfractint/files/patch-common__memory.c index fd53097a5873..6aa22e246b8e 100644 --- a/graphics/xfractint/files/patch-common__memory.c +++ b/graphics/xfractint/files/patch-common__memory.c @@ -1,5 +1,5 @@ ---- common/memory.c.orig 2012-03-10 16:57:05.000000000 -0500 -+++ common/memory.c 2012-03-10 16:57:36.000000000 -0500 +--- common/memory.c.orig 2014-05-03 13:12:35 UTC ++++ common/memory.c @@ -2,7 +2,7 @@ #include <limits.h> #ifdef __APPLE__ diff --git a/graphics/xfractint/files/patch-common__miscres.c b/graphics/xfractint/files/patch-common__miscres.c index be2f253d8d25..1fe57416acdf 100644 --- a/graphics/xfractint/files/patch-common__miscres.c +++ b/graphics/xfractint/files/patch-common__miscres.c @@ -1,5 +1,5 @@ ---- common/miscres.c.orig 2011-05-08 10:19:52.000000000 -0500 -+++ common/miscres.c 2012-03-10 16:58:44.000000000 -0500 +--- common/miscres.c.orig 2014-05-03 13:12:35 UTC ++++ common/miscres.c @@ -7,7 +7,7 @@ #include <time.h> #ifdef __APPLE__ diff --git a/graphics/xfractint/files/patch-common__prompts1.c b/graphics/xfractint/files/patch-common__prompts1.c index 69f56e40cf20..14feac6aa8d2 100644 --- a/graphics/xfractint/files/patch-common__prompts1.c +++ b/graphics/xfractint/files/patch-common__prompts1.c @@ -1,5 +1,5 @@ ---- common/prompts1.c.orig 2011-05-07 15:32:26.000000000 -0500 -+++ common/prompts1.c 2012-03-10 17:02:06.000000000 -0500 +--- common/prompts1.c.orig 2014-05-03 13:12:35 UTC ++++ common/prompts1.c @@ -14,7 +14,7 @@ #include <alloc.h> #elif defined(__APPLE__) diff --git a/graphics/xfractint/files/patch-common__prompts2.c b/graphics/xfractint/files/patch-common__prompts2.c index 077dc9e8a918..724d490f3ea1 100644 --- a/graphics/xfractint/files/patch-common__prompts2.c +++ b/graphics/xfractint/files/patch-common__prompts2.c @@ -1,5 +1,5 @@ ---- common/prompts2.c.orig 2011-05-08 10:20:02.000000000 -0500 -+++ common/prompts2.c 2012-03-10 17:04:43.000000000 -0500 +--- common/prompts2.c.orig 2015-08-08 13:22:41 UTC ++++ common/prompts2.c @@ -12,7 +12,7 @@ #ifdef DIRENT diff --git a/graphics/xfractint/files/patch-common__soi.c b/graphics/xfractint/files/patch-common__soi.c index 2c3e5f00fddb..d1d54f5992f1 100644 --- a/graphics/xfractint/files/patch-common__soi.c +++ b/graphics/xfractint/files/patch-common__soi.c @@ -1,5 +1,5 @@ ---- common/soi.c.orig 2011-05-07 15:36:36.000000000 -0500 -+++ common/soi.c 2012-03-10 17:08:47.000000000 -0500 +--- common/soi.c.orig 2014-05-03 13:12:35 UTC ++++ common/soi.c @@ -15,7 +15,7 @@ #include <string.h> #ifdef __APPLE__ diff --git a/graphics/xfractint/files/patch-common__soi1.c b/graphics/xfractint/files/patch-common__soi1.c index fbb0c5a285be..d7b844c2c6c1 100644 --- a/graphics/xfractint/files/patch-common__soi1.c +++ b/graphics/xfractint/files/patch-common__soi1.c @@ -1,5 +1,5 @@ ---- common/soi1.c.orig 2011-05-07 15:36:50.000000000 -0500 -+++ common/soi1.c 2012-03-10 17:10:37.000000000 -0500 +--- common/soi1.c.orig 2014-05-03 13:12:35 UTC ++++ common/soi1.c @@ -15,7 +15,7 @@ #include <string.h> #ifdef __APPLE__ diff --git a/graphics/xfractint/files/patch-headers__port.h b/graphics/xfractint/files/patch-headers__port.h index a1d227fde511..975c00981589 100644 --- a/graphics/xfractint/files/patch-headers__port.h +++ b/graphics/xfractint/files/patch-headers__port.h @@ -1,5 +1,5 @@ ---- ./headers/port.h.orig 2008-02-17 17:26:16.000000000 -0500 -+++ ./headers/port.h 2010-01-27 13:52:46.000000000 -0500 +--- headers/port.h.orig 2015-07-04 13:09:32 UTC ++++ headers/port.h @@ -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. */ @@ -7,9 +7,9 @@ -#if defined(sgi) +#if defined(sgi) || defined(__FreeBSD__) #include <sys/endian.h> - #else - #include <endian.h> -@@ -319,7 +319,7 @@ + #elif defined(__APPLE__) + #include <machine/endian.h> +@@ -333,7 +333,7 @@ extern struct DIR_SEARCH DTA; /* Disk Transfer Area /* 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) */ diff --git a/graphics/xfractint/files/patch-unix__general.c b/graphics/xfractint/files/patch-unix__general.c index 339bde92c8f7..422fdb3db74a 100644 --- a/graphics/xfractint/files/patch-unix__general.c +++ b/graphics/xfractint/files/patch-unix__general.c @@ -1,6 +1,6 @@ ---- ./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 @@ +--- unix/general.c.orig 2015-06-24 00:31:32 UTC ++++ unix/general.c +@@ -319,7 +319,7 @@ int delaytime; static struct timeval delay; delay.tv_sec = delaytime/1000; delay.tv_usec = (delaytime%1000)*1000; diff --git a/graphics/xfractint/files/patch-unix__unixscr.c b/graphics/xfractint/files/patch-unix__unixscr.c index 6be470754ec8..277ec387b460 100644 --- a/graphics/xfractint/files/patch-unix__unixscr.c +++ b/graphics/xfractint/files/patch-unix__unixscr.c @@ -1,5 +1,5 @@ ---- ./unix/unixscr.c.orig 2008-05-03 13:52:03.000000000 -0400 -+++ ./unix/unixscr.c 2010-01-27 13:52:46.000000000 -0500 +--- unix/unixscr.c.orig 2015-08-09 13:46:52 UTC ++++ unix/unixscr.c @@ -54,7 +54,7 @@ #define FNDELAY O_NDELAY #endif @@ -9,7 +9,7 @@ # include <sys/filio.h> # define FNDELAY O_NONBLOCK #endif -@@ -339,7 +339,7 @@ +@@ -337,7 +337,7 @@ UnixInit() initdacbox(); if (!simple_input) { diff --git a/graphics/xfractint/files/patch-unix_video.c b/graphics/xfractint/files/patch-unix_video.c deleted file mode 100644 index a81ce195420b..000000000000 --- a/graphics/xfractint/files/patch-unix_video.c +++ /dev/null @@ -1,20 +0,0 @@ ---- unix/video.c.orig 2014-05-03 13:12:33 UTC -+++ unix/video.c -@@ -11,7 +11,7 @@ - * Copyright 1992 Ken Shirriff - */ - --WINDOW *curwin; -+extern WINDOW *curwin; - - extern unsigned char *xgetfont (void); - extern int startdisk (void); -@@ -44,7 +44,7 @@ int color_dark = 0; /* darkest color in palette */ - int color_bright = 0; /* brightest color in palette */ - int color_medium = 0; /* nearest to medbright grey in palette - Zoom-Box values (2K x 2K screens max) */ --int boxcolor = 0; /* Zoom-Box color */ -+extern int boxcolor; /* Zoom-Box color */ - int reallyega = 0; /* 1 if its an EGA posing as a VGA */ - int gotrealdac = 0; /* 1 if loaddac has a dacbox */ - int rowcount = 0; /* row-counter for decoder and out_line */ diff --git a/graphics/xfractint/pkg-descr b/graphics/xfractint/pkg-descr index 0760fa576d5d..41f3117c63bd 100644 --- a/graphics/xfractint/pkg-descr +++ b/graphics/xfractint/pkg-descr @@ -3,4 +3,4 @@ the Stone Soup Group. The Unix port was done by Ken Shirriff and modified by Scott D. Boyd. -WWW: http://www.nahee.com/spanky/www/fractint/ +WWW: https://fractint.net/ diff --git a/graphics/xfractint/pkg-plist b/graphics/xfractint/pkg-plist index 40e9ab655385..3769c8d2a429 100644 --- a/graphics/xfractint/pkg-plist +++ b/graphics/xfractint/pkg-plist @@ -1,22 +1,29 @@ bin/xfractint man/man1/xfractint.1.gz +%%DATADIR%%/formulas/fierce.frm +%%DATADIR%%/formulas/fract_sy.frm %%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/mfr_10.frm +%%DATADIR%%/formulas/MFR_12.frm +%%DATADIR%%/formulas/MFR_13_o.frm +%%DATADIR%%/formulas/MFR_13.frm %%DATADIR%%/formulas/new_if.frm %%DATADIR%%/formulas/newton.frm +%%DATADIR%%/formulas/test.frm %%DATADIR%%/fractint.hlp %%DATADIR%%/ifs/fract205.ifs %%DATADIR%%/ifs/fractint.ifs %%DATADIR%%/lsystem/fract205.l %%DATADIR%%/lsystem/fractint.l %%DATADIR%%/lsystem/penrose.l +%%DATADIR%%/lsystem/test.l %%DATADIR%%/lsystem/tiling.l %%DATADIR%%/maps/altern.map %%DATADIR%%/maps/blues.map @@ -45,17 +52,27 @@ man/man1/xfractint.1.gz %%DATADIR%%/maps/royal.map %%DATADIR%%/maps/topo.map %%DATADIR%%/maps/volcano.map +%%DATADIR%%/pars/58484w7a.par %%DATADIR%%/pars/cellular.par %%DATADIR%%/pars/demo.par +%%DATADIR%%/pars/fierce.par %%DATADIR%%/pars/fract18.par %%DATADIR%%/pars/fract19.par %%DATADIR%%/pars/fract200.par %%DATADIR%%/pars/fract205.par %%DATADIR%%/pars/fractint.par +%%DATADIR%%/pars/fun.par +%%DATADIR%%/pars/HalLane.par %%DATADIR%%/pars/icons.par %%DATADIR%%/pars/lyapunov.par +%%DATADIR%%/pars/MFR_13_2.par +%%DATADIR%%/pars/MFR_13.par %%DATADIR%%/pars/music.par %%DATADIR%%/pars/newphoen.par %%DATADIR%%/pars/orbits.par %%DATADIR%%/pars/phoenix.par +%%DATADIR%%/pars/RoundTrp.par +%%DATADIR%%/pars/test.par +%%DATADIR%%/pars/Test.par +%%DATADIR%%/pars/testsave.par %%DATADIR%%/sstools.ini |