Fri Jan 11 13:29:34 2013 UTC ()
Don't conflict with libm.


(joerg)
diff -r1.9 -r1.10 pkgsrc/math/xfractint/distinfo
diff -r1.2 -r1.3 pkgsrc/math/xfractint/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/math/xfractint/patches/patch-ah
diff -r0 -r1.1 pkgsrc/math/xfractint/patches/patch-externs.h
cvs diff -r1.9 -r1.10 pkgsrc/math/xfractint/distinfo (expand / switch to unified diff)

--- pkgsrc/math/xfractint/distinfo 2012/10/26 20:39:15 1.9
+++ pkgsrc/math/xfractint/distinfo 2013/01/11 13:29:34 1.10
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: distinfo,v 1.9 2012/10/26 20:39:15 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2013/01/11 13:29:34 joerg Exp $
2 2
3SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af 3SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
4RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b 4RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
5Size (xfrac310.zip) = 1074760 bytes 5Size (xfrac310.zip) = 1074760 bytes
6SHA1 (patch-aa) = 51d654407fc5621ba69bb5656f7ff7ba65d8ef39 6SHA1 (patch-aa) = 51d654407fc5621ba69bb5656f7ff7ba65d8ef39
7SHA1 (patch-ab) = d9e793dfe453cb097d671eb764cdf71f95a87eb8 7SHA1 (patch-ab) = d9e793dfe453cb097d671eb764cdf71f95a87eb8
8SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847 8SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
9SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325 9SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
10SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5 10SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
11SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948 11SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
12SHA1 (patch-ag) = bf0ce10e27b29022890bc292daf72a09974a3aa0 12SHA1 (patch-ag) = 86e16be766422192b957ef413ed651ea0a1d4388
13SHA1 (patch-ah) = e43c1da5381778cd2c5bc76e9a5c8e86ff0c343a 13SHA1 (patch-ah) = ced928746cac6c07b7ad3c6cae6800179d8dc256
14SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310 14SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
15SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081 15SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
16SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a 16SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
17SHA1 (patch-al) = 73cf3be0f7cf656f8235acc1f9a0625179a8a36d 17SHA1 (patch-al) = 73cf3be0f7cf656f8235acc1f9a0625179a8a36d
18SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e 18SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e
19SHA1 (patch-an) = d4effdac0afa8efc68cc3eae80e62bfe8c9281a1 19SHA1 (patch-an) = d4effdac0afa8efc68cc3eae80e62bfe8c9281a1
20SHA1 (patch-ao) = c9fb472e44bbc4d939fe00725be9b06fd8cecb26 20SHA1 (patch-ao) = c9fb472e44bbc4d939fe00725be9b06fd8cecb26
21SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa 21SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa
22SHA1 (patch-aq) = 58fdcdcf92c6d1a5bd63f0652d74d73b98a2c0a6 22SHA1 (patch-aq) = 58fdcdcf92c6d1a5bd63f0652d74d73b98a2c0a6
23SHA1 (patch-ar) = 6052e96b0b008c75ca43f71dd26452195d9b96de 23SHA1 (patch-ar) = 6052e96b0b008c75ca43f71dd26452195d9b96de
24SHA1 (patch-as) = e35ce93cb4ef9785eb144e7a8b4d26b2b323d8c9 24SHA1 (patch-as) = e35ce93cb4ef9785eb144e7a8b4d26b2b323d8c9
25SHA1 (patch-at) = 01a906fe87d2bd56f2fc3dd2196445c6c2b3cc40 25SHA1 (patch-at) = 01a906fe87d2bd56f2fc3dd2196445c6c2b3cc40
26SHA1 (patch-au) = c2e983ba469379e910c695a56e1ace9c2e5ce791 26SHA1 (patch-au) = c2e983ba469379e910c695a56e1ace9c2e5ce791
27SHA1 (patch-av) = 9ea1fc10c51a4cf5d374c5dacbbabd85f1977819 27SHA1 (patch-av) = 9ea1fc10c51a4cf5d374c5dacbbabd85f1977819
28SHA1 (patch-aw) = 5aa67b824d005c5ba7a0d821422e627573370b10 28SHA1 (patch-aw) = 5aa67b824d005c5ba7a0d821422e627573370b10
29SHA1 (patch-ax) = 33169e3d0b2577b6c4ad2eda77e72ca2160a24fd 29SHA1 (patch-ax) = 33169e3d0b2577b6c4ad2eda77e72ca2160a24fd
 30SHA1 (patch-externs.h) = b3704abc87131ade8fbac96749e97f70a753c565
cvs diff -r1.2 -r1.3 pkgsrc/math/xfractint/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/math/xfractint/patches/Attic/patch-ag 2006/06/14 14:34:10 1.2
+++ pkgsrc/math/xfractint/patches/Attic/patch-ag 2013/01/11 13:29:34 1.3
@@ -1,35 +1,46 @@ @@ -1,35 +1,46 @@
1$NetBSD: patch-ag,v 1.2 2006/06/14 14:34:10 joerg Exp $ 1$NetBSD: patch-ag,v 1.3 2013/01/11 13:29:34 joerg Exp $
2 2
3--- fracsubr.c.orig 1999-09-06 15:38:10.000000000 +0000 3--- fracsubr.c.orig 1999-09-06 10:38:10.000000000 +0000
4+++ fracsubr.c 4+++ fracsubr.c
5@@ -3,12 +3,15 @@ FRACSUBR.C contains subroutines which be 5@@ -3,12 +3,15 @@ FRACSUBR.C contains subroutines which be
6 FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines. 6 FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
7 */ 7 */
8  8
9-#ifndef XFRACT 9-#ifndef XFRACT
10+#if !defined(USE_VARARGS) 10+#if !defined(USE_VARARGS)
11 #include <stdarg.h> 11 #include <stdarg.h>
12-#include <sys/timeb.h> 12-#include <sys/timeb.h>
13 #else 13 #else
14 #include <varargs.h> 14 #include <varargs.h>
15 #endif 15 #endif
16+ 16+
17+#ifndef XFRACT 17+#ifndef XFRACT
18+#include <sys/timeb.h> 18+#include <sys/timeb.h>
19+#endif 19+#endif
20 #include <sys/types.h> 20 #include <sys/types.h>
21 #include <time.h> 21 #include <time.h>
22 /* see Fractint.c for a description of the "include" hierarchy */ 22 /* see Fractint.c for a description of the "include" hierarchy */
 23@@ -326,8 +329,8 @@ init_restart:
 24
 25 if(fractype != CELLULAR && fractype != ANT) /* fudgetolong fails w >10 digits in double */
 26 {
 27- creal = fudgetolong(param[0]); /* integer equivs for it all */
 28- cimag = fudgetolong(param[1]);
 29+ my_creal = fudgetolong(param[0]); /* integer equivs for it all */
 30+ my_cimag = fudgetolong(param[1]);
 31 xmin = fudgetolong(xxmin);
 32 xmax = fudgetolong(xxmax);
 33 x3rd = fudgetolong(xx3rd);
23@@ -1050,7 +1053,7 @@ static int _fastcall ratio_bad(double ac 34@@ -1050,7 +1053,7 @@ static int _fastcall ratio_bad(double ac
24  35
25 */ 36 */
26  37
27-#ifndef XFRACT 38-#ifndef XFRACT
28+#if !defined(USE_VARARGS) 39+#if !defined(USE_VARARGS)
29 int put_resume(int len, ...) 40 int put_resume(int len, ...)
30 #else 41 #else
31 int put_resume(va_alist) 42 int put_resume(va_alist)
32@@ -1059,13 +1062,13 @@ va_dcl 43@@ -1059,13 +1062,13 @@ va_dcl
33 { 44 {
34 va_list arg_marker; /* variable arg list */ 45 va_list arg_marker; /* variable arg list */
35 BYTE *source_ptr; 46 BYTE *source_ptr;
cvs diff -r1.2 -r1.3 pkgsrc/math/xfractint/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/math/xfractint/patches/Attic/patch-ah 2012/10/26 20:39:16 1.2
+++ pkgsrc/math/xfractint/patches/Attic/patch-ah 2013/01/11 13:29:34 1.3
@@ -1,38 +1,47 @@ @@ -1,38 +1,47 @@
1$NetBSD: patch-ah,v 1.2 2012/10/26 20:39:16 joerg Exp $ 1$NetBSD: patch-ah,v 1.3 2013/01/11 13:29:34 joerg Exp $
2 2
3--- fractint.c.orig 1999-09-06 10:38:10.000000000 +0000 3--- fractint.c.orig 1999-09-06 10:38:10.000000000 +0000
4+++ fractint.c 4+++ fractint.c
5@@ -3,14 +3,17 @@ 5@@ -3,14 +3,17 @@
6 Main Routine 6 Main Routine
7 */ 7 */
8  8
9+#if !defined(USE_VARARGS) 9+#if !defined(USE_VARARGS)
10+#include <stdarg.h> 10+#include <stdarg.h>
11+#else 11+#else
12+#include <varargs.h> 12+#include <varargs.h>
13+#endif 13+#endif
14+ 14+
15 #include <string.h> 15 #include <string.h>
16 #include <time.h> 16 #include <time.h>
17 #include <signal.h> 17 #include <signal.h>
18 #ifndef XFRACT 18 #ifndef XFRACT
19 #include <io.h> 19 #include <io.h>
20-#include <stdarg.h> 20-#include <stdarg.h>
21-#else 21-#else
22-#include <varargs.h> 22-#include <varargs.h>
23 #endif 23 #endif
24 #include <ctype.h> 24 #include <ctype.h>
25  25
 26@@ -90,7 +93,7 @@ int compiled_by_turboc = 0;
 27
 28 int fractype; /* if == 0, use Mandelbrot */
 29 char stdcalcmode; /* '1', '2', 'g', 'b' */
 30- long creal, cimag; /* real, imag'ry parts of C */
 31+ long my_creal, my_cimag; /* real, imag'ry parts of C */
 32 long delx, dely; /* screen pixel increments */
 33 long delx2, dely2; /* screen pixel increments */
 34 LDBL delxx, delyy; /* screen pixel increments */
26@@ -202,7 +205,7 @@ static void my_floating_point_err(int si 35@@ -202,7 +205,7 @@ static void my_floating_point_err(int si
27 overflow = 1; 36 overflow = 1;
28 } 37 }
29  38
30-void main(int argc, char **argv) 39-void main(int argc, char **argv)
31+int main(int argc, char **argv) 40+int main(int argc, char **argv)
32 { 41 {
33 int resumeflag; 42 int resumeflag;
34 int kbdchar; /* keyboard key-hit value */ 43 int kbdchar; /* keyboard key-hit value */
35@@ -540,7 +543,7 @@ int check_key() 44@@ -540,7 +543,7 @@ int check_key()
36 timer(1,NULL,int width) decoder 45 timer(1,NULL,int width) decoder
37 timer(2) encoder 46 timer(2) encoder
38 */ 47 */
File Added: pkgsrc/math/xfractint/patches/Attic/patch-externs.h
$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;