Update to 20.4.14. The changelog, while extremely long, only reaches back
to 20.0. Please consult https://fractint.org/ftp/current/dos/whatsnew.txt
for an approximate understanding of what's new since 3.10 (the previous
version in pkgsrc).


(schmonz)

$NetBSD: patch-Makefile,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- Makefile.orig	2014-05-03 13:12:33.000000000 +0000
+++ Makefile
@@ -159,19 +159,21 @@ CC = /usr/bin/gcc
 # LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses
 # LIBS = -lX11 -lm -lcurses
 
-ifeq ($(ARCH),athlon64)
-LIBS = -L/usr/X11R6/lib64 -lX11 -lm
-else
-LIBS = -L/usr/X11R6/lib -lX11 -lm
-endif
+#ifeq ($(ARCH),athlon64)
+#LIBS = -L/usr/X11R6/lib64 -lX11 -lm
+#else
+#LIBS = -L/usr/X11R6/lib -lX11 -lm
+#endif
+#
+#ifeq ($(NCURSES),-DNCURSES)
+#LIBS += -lncurses
+#endif
+#
+#ifeq ($(WITHXFT),-DWITH_XFT)
+#LIBS += -lXft -lfontconfig
+#endif
 
-ifeq ($(NCURSES),-DNCURSES)
-LIBS += -lncurses
-endif
-
-ifeq ($(WITHXFT),-DWITH_XFT)
-LIBS += -lXft -lfontconfig
-endif
+LIBS = ${X11_LDFLAGS} ${LDFLAGS} -lX11 -lXft -lm -lcurses -ltermcap
 
 # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd.
 # AIX fixes thanks to David Sanderson & Elliot Jaffe.
@@ -343,18 +345,15 @@ clean:
 	cd $(UDIR) ; ${MAKE} clean
 
 install: xfractint fractint.hlp
-	$(STRIP) xfractint
-	$(INSTALL) -d $(BINDIR) $(MANDIR) $(SRCDIR)/$(PDIR) $(SRCDIR)/$(FDIR) \
-		$(SRCDIR)/$(IDIR) $(SRCDIR)/$(LDIR) $(SRCDIR)/$(MDIR) $(SRCDIR)/$(XDIR)
-	$(INSTALL) xfractint -T $(BINDIR)/xfractint;
-	$(INSTALL) -m 644 -T $(UDIR)/xfractint.man $(MANDIR)/xfractint.1;
-	$(INSTALL) -m 644 -t $(SRCDIR) fractint.hlp sstools.ini $(DOCS)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(PDIR) $(PARFILES)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(FDIR) $(FRMFILES)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(IDIR) $(IFSFILES)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(LDIR) $(LFILES)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(MDIR) $(MAPFILES)
-	$(INSTALL) -m 644 -t $(SRCDIR)/$(XDIR) $(XTRAFILES)
+	$(BSD_INSTALL_PROGRAM) xfractint $(DESTDIR)$(BINDIR)/xfractint;
+	$(BSD_INSTALL_MAN) $(UDIR)/xfractint.man $(DESTDIR)$(MANDIR)/xfractint.1;
+	$(BSD_INSTALL_DATA) fractint.hlp sstools.ini $(DOCS) $(DESTDIR)$(SRCDIR)
+	$(BSD_INSTALL_DATA) $(PARFILES) $(DESTDIR)$(SRCDIR)/$(PDIR)
+	$(BSD_INSTALL_DATA) $(FRMFILES) $(DESTDIR)$(SRCDIR)/$(FDIR)
+	$(BSD_INSTALL_DATA) $(IFSFILES) $(DESTDIR)$(SRCDIR)/$(IDIR)
+	$(BSD_INSTALL_DATA) $(LFILES) $(DESTDIR)$(SRCDIR)/$(LDIR)
+	$(BSD_INSTALL_DATA) $(MAPFILES) $(DESTDIR)$(SRCDIR)/$(MDIR)
+	$(BSD_INSTALL_DATA) $(XTRAFILES) $(DESTDIR)$(SRCDIR)/$(XDIR)
 
 uninstall:
 	cd $(SRCDIR); rm -f $(PARFILES)

$NetBSD: patch-common_biginit.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/biginit.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/biginit.c
@@ -7,11 +7,7 @@ is in the allocations of memory for the 
 */
 
 #include <string.h>
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
 #include "prototyp.h"

$NetBSD: patch-common_fracsubr.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/fracsubr.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/fracsubr.c
@@ -352,8 +352,8 @@ init_restart:
 
    if(fractype != CELLULAR && fractype != ANT)  /* fudgetolong fails w >10 digits in double */
    {
-      creal = fudgetolong(param[0]); /* integer equivs for it all */
-      cimag = fudgetolong(param[1]);
+      my_creal = fudgetolong(param[0]); /* integer equivs for it all */
+      my_cimag = fudgetolong(param[1]);
       xmin  = fudgetolong(xxmin);
       xmax  = fudgetolong(xxmax);
       x3rd  = fudgetolong(xx3rd);

$NetBSD: patch-common_fractalb.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/fractalb.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/fractalb.c
@@ -8,13 +8,7 @@ fractal routines.
 
 #include <limits.h>
 #include <string.h>
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif !defined(__386BSD__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
 #include "prototyp.h"

$NetBSD: patch-common_fractals.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/fractals.c.orig	2015-01-19 18:35:16.000000000 +0000
+++ common/fractals.c
@@ -39,13 +39,7 @@ an appropriate setup, per_image, per_pix
 
 #include <limits.h>
 #include <string.h>
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif !defined(__386BSD__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
 #include "prototyp.h"

$NetBSD: patch-common_fractint.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/fractint.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/fractint.c
@@ -95,7 +95,7 @@ int compiled_by_turboc = 0;
 
         int     fractype;               /* if == 0, use Mandelbrot  */
         char    stdcalcmode;            /* '1', '2', 'g', 'b'       */
-        long    creal, cimag;           /* real, imag'ry parts of C */
+        long    my_creal, my_cimag;     /* real, imag'ry parts of C */
         long    delx, dely;             /* screen pixel increments  */
         long    delx2, dely2;           /* screen pixel increments  */
         LDBL    delxx, delyy;           /* screen pixel increments  */

$NetBSD: patch-common_frasetup.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/frasetup.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/frasetup.c
@@ -1,12 +1,6 @@
 #include <limits.h>
 #include <string.h>
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif !defined(__386BSD__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
 #include "prototyp.h"

$NetBSD: patch-common_lsys.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/lsys.c.orig	2015-01-19 18:35:16.000000000 +0000
+++ common/lsys.c
@@ -1,12 +1,6 @@
 
 #include <string.h>
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"

$NetBSD: patch-common_lsysf.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/lsysf.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/lsysf.c
@@ -1,11 +1,5 @@
 #include <string.h>
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"

$NetBSD: patch-common_memory.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/memory.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/memory.c
@@ -1,10 +1,6 @@
 #include <string.h>
 #include <limits.h>
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 #if (!defined(XFRACT) && !defined(WINFRACT))
 #include <io.h>

$NetBSD: patch-common_miscres.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/miscres.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/miscres.c
@@ -5,11 +5,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 #ifndef XFRACT
 #include <io.h>

$NetBSD: patch-common_prompts1.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/prompts1.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/prompts1.c
@@ -10,13 +10,7 @@
 #include <sys/stat.h>
 #endif
 #endif
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif !defined(__386BSD__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"

$NetBSD: patch-common_prompts2.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/prompts2.c.orig	2015-08-08 13:22:41.000000000 +0000
+++ common/prompts2.c
@@ -22,13 +22,7 @@
 #endif
 
 #endif
-#ifdef __TURBOC__
-#include <alloc.h>
-#elif defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif !defined(__386BSD__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 
 #ifdef XFRACT
 #include <fcntl.h>

$NetBSD: patch-common_soi.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/soi.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/soi.c
@@ -13,11 +13,7 @@
  */
 #include <time.h>
 #include <string.h>
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 #include "port.h"
 #include "prototyp.h"
 

$NetBSD: patch-common_soi1.c,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- common/soi1.c.orig	2014-05-03 13:12:35.000000000 +0000
+++ common/soi1.c
@@ -13,11 +13,7 @@
  */
 #include <time.h>
 #include <string.h>
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 #include "port.h"
 #include "prototyp.h"
 

$NetBSD: patch-headers_externs.h,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- headers/externs.h.orig	2015-04-26 13:25:57.000000000 +0000
+++ headers/externs.h
@@ -63,7 +63,7 @@ extern int                   calc_status
 extern char                  calibrate;
 extern int                   checkcurdir;
 extern int                   chkd_vvs;
-extern long                  cimag;
+extern long                  my_cimag;
 extern double                closenuff;
 extern double                closeprox;
 extern _CMPLX                coefficient;
@@ -89,7 +89,7 @@ extern double                cosx;
 extern LDBL                  cosx;
 #endif
 extern int                   cpu;
-extern long                  creal;
+extern long                  my_creal;
 extern int                   curcol;
 extern int                   curpass;
 extern int                   currow;

$NetBSD: patch-headers_port.h,v 1.1 2018/08/28 11:54:54 schmonz Exp $

--- headers/port.h.orig	2015-07-04 13:09:32.000000000 +0000
+++ 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. */
 #if (defined(XFRACT) && !defined(__sun))
-#if defined(sgi)
+#if defined(sgi) || defined(__NetBSD__) || defined(__DragonFly__)
 #include <sys/endian.h>
 #elif defined(__APPLE__)
 #include <machine/endian.h>
@@ -353,6 +353,10 @@ extern struct DIR_SEARCH DTA;   /* Disk 
 #define DO_NOT_USE_LONG_DOUBLE
 #endif
 
+#if defined(__NetBSD__) || defined(__DragonFly__)
+#define DO_NOT_USE_LONG_DOUBLE
+#endif
+
 #ifndef DO_NOT_USE_LONG_DOUBLE
 #ifdef LDBL_DIG
 /* this is what we're hoping for */