Don't conflict with libm.

4 files changed, 49 insertions, 6 deletions

diff --git a/math/xfractint/distinfo b/math/xfractint/distinfo
index df65db8b926..07d8fceaa10 100644
--- a/math/xfractint/distinfo
+++ b/math/xfractint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/10/26 20:39:15 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/01/11 13:29:34 joerg Exp $
 
 SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
 RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
@@ -9,8 +9,8 @@ SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
 SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
 SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
 SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
-SHA1 (patch-ag) = bf0ce10e27b29022890bc292daf72a09974a3aa0
-SHA1 (patch-ah) = e43c1da5381778cd2c5bc76e9a5c8e86ff0c343a
+SHA1 (patch-ag) = 86e16be766422192b957ef413ed651ea0a1d4388
+SHA1 (patch-ah) = ced928746cac6c07b7ad3c6cae6800179d8dc256
 SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
 SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
 SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
@@ -27,3 +27,4 @@ SHA1 (patch-au) = c2e983ba469379e910c695a56e1ace9c2e5ce791
 SHA1 (patch-av) = 9ea1fc10c51a4cf5d374c5dacbbabd85f1977819
 SHA1 (patch-aw) = 5aa67b824d005c5ba7a0d821422e627573370b10
 SHA1 (patch-ax) = 33169e3d0b2577b6c4ad2eda77e72ca2160a24fd
+SHA1 (patch-externs.h) = b3704abc87131ade8fbac96749e97f70a753c565
diff --git a/math/xfractint/patches/patch-ag b/math/xfractint/patches/patch-ag
index a3314a7fbfa..8a39a00134e 100644
--- a/math/xfractint/patches/patch-ag
+++ b/math/xfractint/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2006/06/14 14:34:10 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2013/01/11 13:29:34 joerg Exp $
 
---- fracsubr.c.orig	1999-09-06 15:38:10.000000000 +0000
+--- fracsubr.c.orig	1999-09-06 10:38:10.000000000 +0000
 +++ fracsubr.c
 @@ -3,12 +3,15 @@ FRACSUBR.C contains subroutines which be
  FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
@@ -20,6 +20,17 @@ $NetBSD: patch-ag,v 1.2 2006/06/14 14:34:10 joerg Exp $
  #include <sys/types.h>
  #include <time.h>
    /* see Fractint.c for a description of the "include"  hierarchy */
+@@ -326,8 +329,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);
 @@ -1050,7 +1053,7 @@ static int _fastcall ratio_bad(double ac
  
     */
diff --git a/math/xfractint/patches/patch-ah b/math/xfractint/patches/patch-ah
index 47c0b487937..ef1c08c474b 100644
--- a/math/xfractint/patches/patch-ah
+++ b/math/xfractint/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2012/10/26 20:39:16 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2013/01/11 13:29:34 joerg Exp $
 
 --- fractint.c.orig	1999-09-06 10:38:10.000000000 +0000
 +++ fractint.c
@@ -23,6 +23,15 @@ $NetBSD: patch-ah,v 1.2 2012/10/26 20:39:16 joerg Exp $
  #endif
  #include <ctype.h>
  
+@@ -90,7 +93,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  */
 @@ -202,7 +205,7 @@ static void my_floating_point_err(int si
        overflow = 1;
  }
diff --git a/math/xfractint/patches/patch-externs.h b/math/xfractint/patches/patch-externs.h
new file mode 100644
index 00000000000..f6757154430
--- /dev/null
+++ b/math/xfractint/patches/patch-externs.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-externs.h,v 1.1 2013/01/11 13:29:34 joerg Exp $
+
+--- externs.h.orig	2013-01-11 00:41:19.000000000 +0000
++++ externs.h
+@@ -60,7 +60,7 @@ extern int (*                calctype)(v
+ extern int                   calc_status;
+ extern char                  calibrate;
+ extern int                   checkcurdir;
+-extern long                  cimag;
++extern long                  my_cimag;
+ extern double                closenuff;
+ extern double                closeprox;
+ extern _CMPLX                coefficient;
+@@ -82,7 +82,7 @@ extern int                   comparegif;
+ extern long                  con;
+ extern double                cosx;
+ extern int                   cpu;
+-extern long                  creal;
++extern long                  my_creal;
+ extern int                   curcol;
+ extern int                   curpass;
+ extern int                   currow;