Tue Aug 28 11:54:54 2018 UTC ()
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)
diff -r1.14 -r1.15 pkgsrc/math/xfractint/Makefile
diff -r1.3 -r1.4 pkgsrc/math/xfractint/PLIST
diff -r1.12 -r1.13 pkgsrc/math/xfractint/distinfo
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_biginit.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_fracsubr.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_fractalb.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_fractals.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_fractint.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_frasetup.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_lsys.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_lsysf.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_memory.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_miscres.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_prompts1.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_prompts2.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_soi.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-common_soi1.c
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-headers_externs.h
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-headers_port.h
diff -r1.4 -r0 pkgsrc/math/xfractint/patches/patch-aa
diff -r1.5 -r0 pkgsrc/math/xfractint/patches/patch-ab
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ac
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ad
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ae
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-af
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ai
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-aj
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ak
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-am
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ap
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ar
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-as
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-at
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-au
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-av
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-aw
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-ax
diff -r1.1 -r0 pkgsrc/math/xfractint/patches/patch-externs.h
diff -r1.3 -r0 pkgsrc/math/xfractint/patches/patch-ag
diff -r1.3 -r0 pkgsrc/math/xfractint/patches/patch-ah
diff -r1.3 -r0 pkgsrc/math/xfractint/patches/patch-ao
diff -r1.2 -r0 pkgsrc/math/xfractint/patches/patch-al
diff -r1.2 -r0 pkgsrc/math/xfractint/patches/patch-an
diff -r1.2 -r0 pkgsrc/math/xfractint/patches/patch-aq
--- pkgsrc/math/xfractint/Makefile 2018/01/01 18:16:38 1.14
+++ pkgsrc/math/xfractint/Makefile 2018/08/28 11:54:54 1.15
@@ -1,38 +1,31 @@
-# $NetBSD: Makefile,v 1.14 2018/01/01 18:16:38 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2018/08/28 11:54:54 schmonz Exp $
-DISTNAME= xfrac310
-PKGNAME= xfractint-3.10
-PKGREVISION= 2
+DISTNAME= xfractint-20.04p14
+PKGNAME= ${DISTNAME:S/04p/4./}
CATEGORIES= math
MASTER_SITES= https://fractint.org/ftp/current/linux/
-EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://fractint.org/
COMMENT= Fractint for X11
-WRKSRC= ${WRKDIR}
USE_LIBTOOL= yes
+USE_TOOLS+= gmake
MAKE_FLAGS+= BINDIR=${PREFIX}/bin
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
MAKE_FLAGS+= SRCDIR=${PREFIX}/share/xfractint
BUILD_TARGET= xfractint
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/xfractint
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/xfractint/pars
+INSTALLATION_DIRS+= share/xfractint/formulas share/xfractint/ifs
+INSTALLATION_DIRS+= share/xfractint/lsystem share/xfractint/maps
+INSTALLATION_DIRS+= share/xfractint/extra
MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q}
-# xfractint sources assume <malloc.h> exists.
-# Create a fake one for platforms that don't have it.
-#
-post-wrapper:
- if ${TEST} ! -f /usr/include/malloc.h; then \
- ${ECHO} "#include <stdlib.h>" \
- > ${BUILDLINK_DIR}/include/malloc.h; \
- fi
-
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/math/xfractint/PLIST 2009/06/14 18:05:50 1.3
+++ pkgsrc/math/xfractint/PLIST 2018/08/28 11:54:54 1.4
@@ -1,167 +1,64 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:05:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/08/28 11:54:54 schmonz Exp $
bin/xfractint
man/man1/xfractint.1
-share/xfractint/Carlson1.map
-share/xfractint/Digiorg1.map
-share/xfractint/Digiorg2.map
-share/xfractint/Gallet01.map
-share/xfractint/Gallet02.map
-share/xfractint/Gallet03.map
-share/xfractint/Gallet04.map
-share/xfractint/Gallet05.map
-share/xfractint/Gallet06.map
-share/xfractint/Gallet07.map
-share/xfractint/Gallet08.map
-share/xfractint/Gallet09.map
-share/xfractint/Gallet10.map
-share/xfractint/Gallet11.map
-share/xfractint/Gallet12.map
-share/xfractint/Gallet13.map
-share/xfractint/Gallet14.map
-share/xfractint/Gallet15.map
-share/xfractint/Gallet16.map
-share/xfractint/Gallet17.map
-share/xfractint/Gallet18.map
-share/xfractint/Lindaa01.map
-share/xfractint/Lindaa02.map
-share/xfractint/Lindaa03.map
-share/xfractint/Lindaa04.map
-share/xfractint/Lindaa05.map
-share/xfractint/Lindaa06.map
-share/xfractint/Lindaa07.map
-share/xfractint/Lindaa08.map
-share/xfractint/Lindaa09.map
-share/xfractint/Lindaa10.map
-share/xfractint/Lindaa11.map
-share/xfractint/Lindaa12.map
-share/xfractint/Lindaa14.map
-share/xfractint/Lindaa15.map
-share/xfractint/Lindaa16.map
-share/xfractint/Lindaa17.map
-share/xfractint/Morgan1.map
-share/xfractint/Morgan2.map
-share/xfractint/Morgan3.map
-share/xfractint/Morgen3.map
-share/xfractint/Skydye01.map
-share/xfractint/Skydye02.map
-share/xfractint/Skydye03.map
-share/xfractint/Skydye04.map
-share/xfractint/Skydye05.map
-share/xfractint/Skydye06.map
-share/xfractint/Skydye07.map
-share/xfractint/Skydye08.map
-share/xfractint/Skydye09.map
-share/xfractint/Skydye10.map
-share/xfractint/Skydye11.map
-share/xfractint/Skydye12.map
-share/xfractint/Wizzl011.map
-share/xfractint/Wizzl012.map
-share/xfractint/Wizzl013.map
-share/xfractint/Wizzl014.map
-share/xfractint/Wizzl015.map
-share/xfractint/Wizzl016.map
-share/xfractint/Wizzl017.map
-share/xfractint/Wizzl018.map
-share/xfractint/Wizzl019.map
-share/xfractint/Wizzl020.map
-share/xfractint/altern.map
-share/xfractint/blues.map
-share/xfractint/bud2.map
-share/xfractint/bud3.map
-share/xfractint/bud4.map
-share/xfractint/bud5.map
-share/xfractint/bud6.map
-share/xfractint/bud7.map
-share/xfractint/cellular.par
-share/xfractint/chroma.map
-share/xfractint/damien1.map
-share/xfractint/damien2.map
-share/xfractint/damien3.map
-share/xfractint/damien4.map
-share/xfractint/damien5.map
-share/xfractint/default.map
-share/xfractint/demo.par
-share/xfractint/droz10.map
-share/xfractint/droz11.map
-share/xfractint/droz12.map
-share/xfractint/droz13.map
-share/xfractint/droz14.map
-share/xfractint/droz15.map
-share/xfractint/droz21.map
-share/xfractint/droz22.map
-share/xfractint/droz23.map
-share/xfractint/droz28.map
-share/xfractint/droz31.map
-share/xfractint/droz33.map
-share/xfractint/droz34.map
-share/xfractint/droz35.map
-share/xfractint/droz36.map
-share/xfractint/droz38.map
-share/xfractint/droz39.map
-share/xfractint/droz40.map
-share/xfractint/droz44.map
-share/xfractint/droz46.map
-share/xfractint/droz49.map
-share/xfractint/droz52.map
-share/xfractint/droz54.map
-share/xfractint/droz56.map
-share/xfractint/droz60.map
-share/xfractint/droz62.map
-share/xfractint/droz8.map
-share/xfractint/drozdis1.map
-share/xfractint/firestrm.map
-share/xfractint/fract18.par
-share/xfractint/fract19.par
-share/xfractint/fract200.frm
-share/xfractint/fract200.par
-share/xfractint/fractint.frm
+share/xfractint/debugfla.txt
+share/xfractint/extra/all_maps.zip
+share/xfractint/extra/frmtut.zip
+share/xfractint/extra/if_else.zip
+share/xfractint/extra/phctutor.zip
+share/xfractint/formulas/fract001.frm
+share/xfractint/formulas/fract002.frm
+share/xfractint/formulas/fract003.frm
+share/xfractint/formulas/fract196.frm
+share/xfractint/formulas/fract200.frm
+share/xfractint/formulas/fract_sy.frm
+share/xfractint/formulas/fractint.frm
+share/xfractint/formulas/ikenaga.frm
+share/xfractint/formulas/julitile.frm
+share/xfractint/formulas/new_if.frm
+share/xfractint/formulas/newton.frm
share/xfractint/fractint.hlp
-share/xfractint/fractint.ifs
+share/xfractint/fractsrc.txt
-share/xfractint/fractint.l
+share/xfractint/hc.txt
-share/xfractint/fractint.par
+share/xfractint/ifs/fractint.ifs
-share/xfractint/froth3.map
+share/xfractint/lsystem/fractint.l
-share/xfractint/froth316.map
+share/xfractint/lsystem/penrose.l
-share/xfractint/froth6.map
+share/xfractint/lsystem/tiling.l
-share/xfractint/froth616.map
+share/xfractint/maps/altern.map
-share/xfractint/gamma1.map
+share/xfractint/maps/blues.map
-share/xfractint/gamma2.map
+share/xfractint/maps/chroma.map
-share/xfractint/glasses1.map
+share/xfractint/maps/default.map
-share/xfractint/glasses2.map
+share/xfractint/maps/firestrm.map
-share/xfractint/goodega.map
+share/xfractint/maps/froth3.map
-share/xfractint/green.map
+share/xfractint/maps/froth316.map
-share/xfractint/grey.map
+share/xfractint/maps/froth6.map
-share/xfractint/grid.map
+share/xfractint/maps/froth616.map
-share/xfractint/headache.map
+share/xfractint/maps/gamma1.map
-share/xfractint/icons.par
+share/xfractint/maps/gamma2.map
-share/xfractint/landscap.map
+share/xfractint/maps/glasses1.map
-share/xfractint/lkmtch00.map
+share/xfractint/maps/glasses2.map
-share/xfractint/lkmtch01.map
+share/xfractint/maps/goodega.map
-share/xfractint/lkmtch02.map
+share/xfractint/maps/green.map
-share/xfractint/lkmtch03.map
+share/xfractint/maps/grey.map
-share/xfractint/lkmtch04.map
+share/xfractint/maps/grid.map
-share/xfractint/lkmtch05.map
+share/xfractint/maps/headache.map
-share/xfractint/lkmtch06.map
+share/xfractint/maps/landscap.map
-share/xfractint/lkmtch07.map
+share/xfractint/maps/lyapunov.map
-share/xfractint/lkmtch08.map
+share/xfractint/maps/neon.map
-share/xfractint/lkmtch09.map
+share/xfractint/maps/paintjet.map
-share/xfractint/lkmtch10.map
+share/xfractint/maps/royal.map
-share/xfractint/lkmtch11.map
+share/xfractint/maps/topo.map
-share/xfractint/lkmtch12.map
+share/xfractint/maps/volcano.map
-share/xfractint/lkmtch13.map
+share/xfractint/pars/cellular.par
-share/xfractint/lkmtch14.map
+share/xfractint/pars/demo.par
-share/xfractint/lkmtch15.map
+share/xfractint/pars/fract18.par
-share/xfractint/lkmtch16.map
+share/xfractint/pars/fract19.par
-share/xfractint/lkmtch17.map
+share/xfractint/pars/fract200.par
-share/xfractint/lkmtch18.map
+share/xfractint/pars/fractint.par
-share/xfractint/lkmtch19.map
+share/xfractint/pars/icons.par
-share/xfractint/lyapunov.map
+share/xfractint/pars/lyapunov.par
-share/xfractint/lyapunov.par
+share/xfractint/pars/music.par
-share/xfractint/music.par
+share/xfractint/pars/newphoen.par
-share/xfractint/neon.map
+share/xfractint/pars/orbits.par
-share/xfractint/paintjet.map
+share/xfractint/pars/phoenix.par
-share/xfractint/penrose.l
+share/xfractint/sstools.ini
-share/xfractint/phoenix.par
-share/xfractint/royal.map
-share/xfractint/tiling.l
-share/xfractint/topo.map
-share/xfractint/volcano.map
--- pkgsrc/math/xfractint/distinfo 2017/05/22 23:36:44 1.12
+++ pkgsrc/math/xfractint/distinfo 2018/08/28 11:54:54 1.13
@@ -1,31 +1,23 @@
-$NetBSD: distinfo,v 1.12 2017/05/22 23:36:44 joerg Exp $
+$NetBSD: distinfo,v 1.13 2018/08/28 11:54:54 schmonz Exp $
-SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
+SHA1 (xfractint-20.04p14.tar.gz) = fff0a713145ffd271c6ce4bf8ad657404959895a
-RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
+RMD160 (xfractint-20.04p14.tar.gz) = 8d69895ca3237caa76c9c1c93ee5abaeb77191c2
-SHA512 (xfrac310.zip) = 8ccc48ba445ed295b18f18234e4d60e78a739cf83f6594659a9ed43a279e5bba46e1de008db3ea33e01b9de430c74c4002f434cf9e7a2a8fbd1c0fdca1633872
+SHA512 (xfractint-20.04p14.tar.gz) = 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
-Size (xfrac310.zip) = 1074760 bytes
+Size (xfractint-20.04p14.tar.gz) = 1336285 bytes
-SHA1 (patch-aa) = 51d654407fc5621ba69bb5656f7ff7ba65d8ef39
+SHA1 (patch-Makefile) = 03a988a7e92d657ce127c86fe9ae5e096d8f496c
-SHA1 (patch-ab) = a68613c56f7ce81433aa73529e4eef7a9a9df694
+SHA1 (patch-common_biginit.c) = 41a1bdf7f9fe36ffb1a1b68cff680d0f325bc097
-SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
+SHA1 (patch-common_fracsubr.c) = 8b2b1229cf0b596fb2991237f834d1f756d6b3ce
-SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
+SHA1 (patch-common_fractalb.c) = 37c07f9721f7854bb7e731e583255bfa69e4602c
-SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
+SHA1 (patch-common_fractals.c) = 147ad7576a703d851b258dcf2285c921f00912c3
-SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
+SHA1 (patch-common_fractint.c) = e3deac60b59bf2bf510a422c7516f6fc40242a28
-SHA1 (patch-ag) = 86e16be766422192b957ef413ed651ea0a1d4388
+SHA1 (patch-common_frasetup.c) = 437fabb24fe719f8cef3a71e6752c9f2e0cc6c25
-SHA1 (patch-ah) = ced928746cac6c07b7ad3c6cae6800179d8dc256
+SHA1 (patch-common_lsys.c) = 45829daabf07f43ace1e5d5c76ae6a22a31f8e1c
-SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
+SHA1 (patch-common_lsysf.c) = 0f2a7420647c8c62b7ff0c549eeba03dad84b734
-SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
+SHA1 (patch-common_memory.c) = c3e9cf9f1056041a91bd77001025a61f3b1aa477
-SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
+SHA1 (patch-common_miscres.c) = 835135f844491b1dbdb61070d27ad12c380a5bd8
-SHA1 (patch-al) = 73cf3be0f7cf656f8235acc1f9a0625179a8a36d
+SHA1 (patch-common_prompts1.c) = 4ca3330a960a536d23e336609fce548d73fce92e
-SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e
+SHA1 (patch-common_prompts2.c) = 2f5dde94b79aeb18e4c7c9a548e5a9c7febe02cc
-SHA1 (patch-an) = d4effdac0afa8efc68cc3eae80e62bfe8c9281a1
+SHA1 (patch-common_soi.c) = d5c48bbc8d71c45e9ae98ac94dfd46ece6cee87d
-SHA1 (patch-ao) = c9fb472e44bbc4d939fe00725be9b06fd8cecb26
+SHA1 (patch-common_soi1.c) = 72d5cb187512b34d87e660e316e3d95ab023e4f0
-SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa
+SHA1 (patch-headers_externs.h) = fdd427cfe013f9d4e77486a537d60ade3488c493
-SHA1 (patch-aq) = 58fdcdcf92c6d1a5bd63f0652d74d73b98a2c0a6
+SHA1 (patch-headers_port.h) = 4f6be6b63369b5aa80400473ac82703de60dfd46
-SHA1 (patch-ar) = 6052e96b0b008c75ca43f71dd26452195d9b96de
-SHA1 (patch-as) = e35ce93cb4ef9785eb144e7a8b4d26b2b323d8c9
-SHA1 (patch-at) = 01a906fe87d2bd56f2fc3dd2196445c6c2b3cc40
-SHA1 (patch-au) = c2e983ba469379e910c695a56e1ace9c2e5ce791
-SHA1 (patch-av) = 9ea1fc10c51a4cf5d374c5dacbbabd85f1977819
-SHA1 (patch-aw) = 5aa67b824d005c5ba7a0d821422e627573370b10
-SHA1 (patch-ax) = 33169e3d0b2577b6c4ad2eda77e72ca2160a24fd
-SHA1 (patch-externs.h) = b3704abc87131ade8fbac96749e97f70a753c565
$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 */