[pkgsrc/trunk]: pkgsrc/math/xfractint Made xfractint work on NetBSD.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70a674319ffc
branches:  trunk
changeset: 514554:70a674319ffc
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jun 14 09:07:45 2006 +0000

description:
Made xfractint work on NetBSD.

diffstat:

 math/xfractint/Makefile         |    3 +-
 math/xfractint/distinfo         |   17 ++++-
 math/xfractint/patches/patch-aa |    8 +-
 math/xfractint/patches/patch-ab |   22 -------
 math/xfractint/patches/patch-af |   31 ++++++++++
 math/xfractint/patches/patch-ag |   58 +++++++++++++++++++
 math/xfractint/patches/patch-ah |   43 ++++++++++++++
 math/xfractint/patches/patch-ai |   21 +++++++
 math/xfractint/patches/patch-aj |  119 ++++++++++++++++++++++++++++++++++++++++
 math/xfractint/patches/patch-ak |   19 ++++++
 math/xfractint/patches/patch-al |   22 +++++++
 math/xfractint/patches/patch-am |   54 ++++++++++++++++++
 math/xfractint/patches/patch-an |   17 +++++
 math/xfractint/patches/patch-ao |   31 ++++++++++
 math/xfractint/patches/patch-ap |   41 +++++++++++++
 math/xfractint/patches/patch-aq |   30 ++++++++++
 16 files changed, 506 insertions(+), 30 deletions(-)

diffs (truncated from 622 to 300 lines):

diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/Makefile
--- a/math/xfractint/Makefile   Wed Jun 14 07:55:02 2006 +0000
+++ b/math/xfractint/Makefile   Wed Jun 14 09:07:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/12 14:54:27 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/14 09:07:45 rillig Exp $
 #
 
 DISTNAME=              xfrac310
@@ -23,4 +23,5 @@
 INSTALLATION_DIRS=     share/xfractint
 
 .include "../../mk/curses.buildlink3.mk"
+.include "../../pkgtools/x11-links/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/distinfo
--- a/math/xfractint/distinfo   Wed Jun 14 07:55:02 2006 +0000
+++ b/math/xfractint/distinfo   Wed Jun 14 09:07:45 2006 +0000
@@ -1,7 +1,18 @@
-$NetBSD: distinfo,v 1.2 2006/06/12 14:54:27 rillig Exp $
+$NetBSD: distinfo,v 1.3 2006/06/14 09:07:45 rillig Exp $
 
 SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
 RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
 Size (xfrac310.zip) = 1074760 bytes
-SHA1 (patch-aa) = c3635fc834ab66888fae6bb6daf8d61864a53641
-SHA1 (patch-ab) = e6145260728fd00359ef5af1411f40c8e03d19a0
+SHA1 (patch-aa) = e5aa3ca9908871fbf59a7b0eee6be5c53c4b1a2e
+SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
+SHA1 (patch-ag) = db99fc9b6753bd5a4256a6275a4493bc67cd09a1
+SHA1 (patch-ah) = f0599bb9f59921938784a866d27205abaef6a964
+SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
+SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
+SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
+SHA1 (patch-al) = 1954f3243be20ceb03c0e9d6dba86c2fd101ce89
+SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e
+SHA1 (patch-an) = 5c4728b4d4ffa4ddd1ff904943af1484d75308f1
+SHA1 (patch-ao) = a432f9dbea726fe91c84ea77b246a3985e58108d
+SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa
+SHA1 (patch-aq) = 8202b8a7adc3e3badee6de0b395d912910aa6710
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-aa
--- a/math/xfractint/patches/patch-aa   Wed Jun 14 07:55:02 2006 +0000
+++ b/math/xfractint/patches/patch-aa   Wed Jun 14 09:07:45 2006 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/06/12 14:13:55 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/14 09:07:45 rillig Exp $
 
-Solaris does not define __sighandler_t.
+Some systems do not define __sighandler_t.
 
 --- unixscr.c.orig     1999-04-29 06:12:03.000000000 +0200
-+++ unixscr.c  2006-06-12 16:01:41.382816500 +0200
++++ unixscr.c  2006-06-15 08:43:15.000000000 +0200
 @@ -44,6 +44,10 @@
  # define FNDELAY O_NONBLOCK
  #endif
  
-+#if defined(__sun)
++#if defined(__sun) || defined(__NetBSD__)
 +typedef int (*__sighandler_t)(int);
 +#endif
 +
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-ab
--- a/math/xfractint/patches/patch-ab   Wed Jun 14 07:55:02 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/06/12 14:54:55 rillig Exp $
-
-Solaris 5.8 does not have the "long double" functions in libm.
-
---- soi.c.orig 1999-09-06 17:38:10.000000000 +0200
-+++ soi.c      2006-06-12 16:38:49.362108867 +0200
-@@ -17,9 +17,15 @@
- #include "port.h"
- #include "prototyp.h"
- 
-+#if defined(__sun) && defined(__SunOS_5_8)
-+#define DBLS          double
-+#define FREXP(x,y)    frexp((x), (y))
-+#define FABS(x)               fabs((x))
-+#else
- #define DBLS LDBL
- #define FABS(x)  fabsl(x)
- #define FREXP(x,y) frexpl(x,y)
-+#endif
- 
- #define TRUE 1
- #define FALSE 0
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xfractint/patches/patch-af   Wed Jun 14 09:07:45 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2006/06/14 09:07:45 rillig Exp $
+
+--- editpal.c.orig     2006-06-15 07:57:40.000000000 +0200
++++ editpal.c  2006-06-15 08:29:25.000000000 +0200
+@@ -114,7 +114,7 @@
+ #endif
+ 
+ #include <string.h>
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+@@ -410,7 +410,7 @@ void displayc(int x, int y, int fg, int 
+    }
+ 
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ static void displayf(int x, int y, int fg, int bg, char *format, ...)
+ #else
+ static void displayf(va_alist)
+@@ -422,7 +422,7 @@ va_dcl
+ 
+    va_list arg_list;
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+    va_start(arg_list, format);
+ #else
+    int x,y,fg,bg;
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xfractint/patches/patch-ag   Wed Jun 14 09:07:45 2006 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ag,v 1.1 2006/06/14 09:07:45 rillig Exp $
+
+--- fracsubr.c.orig    2006-06-15 07:57:40.000000000 +0200
++++ fracsubr.c 2006-06-15 08:30:43.000000000 +0200
+@@ -3,12 +3,15 @@ FRACSUBR.C contains subroutines which be
+ FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
+ */
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ #include <stdarg.h>
+-#include <sys/timeb.h>
+ #else
+ #include <varargs.h>
+ #endif
++
++#ifndef XFRACT
++#include <sys/timeb.h>
++#endif
+ #include <sys/types.h>
+ #include <time.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
+@@ -1050,7 +1053,7 @@ static int _fastcall ratio_bad(double ac
+ 
+    */
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ int put_resume(int len, ...)
+ #else
+ int put_resume(va_alist)
+@@ -1065,7 +1068,7 @@ va_dcl
+ 
+    if (resume_info == 0)
+       return(-1);
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+    va_start(arg_marker,len);
+ #else
+    va_start(arg_marker);
+@@ -1101,7 +1104,7 @@ You will not be able to resume calculati
+    return(0);
+ }
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ int get_resume(int len, ...)
+ #else
+ int get_resume(va_alist)
+@@ -1116,7 +1119,7 @@ va_dcl
+ 
+    if (resume_info == 0)
+       return(-1);
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+    va_start(arg_marker,len);
+ #else
+    va_start(arg_marker);
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xfractint/patches/patch-ah   Wed Jun 14 09:07:45 2006 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-ah,v 1.1 2006/06/14 09:07:45 rillig Exp $
+
+--- fractint.c.orig    2006-06-15 07:57:40.000000000 +0200
++++ fractint.c 2006-06-15 08:32:32.000000000 +0200
+@@ -3,14 +3,17 @@
+                         Main Routine
+ */
+ 
++#if !defined(USE_VARARGS)
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
++
+ #include <string.h>
+ #include <time.h>
+ #include <signal.h>
+ #ifndef XFRACT
+ #include <io.h>
+-#include <stdarg.h>
+-#else
+-#include <varargs.h>
+ #endif
+ #include <ctype.h>
+ 
+@@ -540,7 +543,7 @@ int check_key()
+      timer(1,NULL,int width)            decoder
+      timer(2)                           encoder
+   */
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ int timer(int timertype,int(*subrtn)(),...)
+ #else
+ int timer(va_alist)
+@@ -555,7 +558,7 @@ va_dcl
+    int i;
+    int do_bench;
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+    va_start(arg_marker,subrtn);
+ #else
+    int timertype;
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xfractint/patches/patch-ai   Wed Jun 14 09:07:45 2006 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2006/06/14 09:07:45 rillig Exp $
+
+--- framain2.c.orig    2006-06-15 07:57:40.000000000 +0200
++++ framain2.c 2006-06-15 08:34:42.000000000 +0200
+@@ -1,10 +1,13 @@
++#if !defined(USE_VARARGS)
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
++
+ #include <string.h>
+ #include <time.h>
+ #ifndef XFRACT
+ #include <io.h>
+-#include <stdarg.h>
+-#else
+-#include <varargs.h>
+ #endif
+ #include <ctype.h>
+   /* see Fractint.c for a description of the "include"  hierarchy */
diff -r e4d6faa3c330 -r 70a674319ffc math/xfractint/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/xfractint/patches/patch-aj   Wed Jun 14 09:07:45 2006 +0000
@@ -0,0 +1,119 @@
+$NetBSD: patch-aj,v 1.1 2006/06/14 09:07:45 rillig Exp $
+
+--- hc.c.orig  2006-06-15 07:57:40.000000000 +0200
++++ hc.c       2006-06-15 08:27:52.000000000 +0200
+@@ -51,12 +51,15 @@
+ 
+ #define INCLUDE_COMMON  /* tell helpcom.h to include common code */
+ 
++#if !defined(USE_VARARGS)
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
+ 
+ #ifndef XFRACT
+ #include <io.h>
+-#include <stdarg.h>
+ #else
+-#include <varargs.h>
+ #define strupr strlwr
+ #endif
+ #include <fcntl.h>
+@@ -295,7 +298,7 @@ void print_msg(char *type, int lnum, cha
+    }
+ 
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+ void fatal(int diff, char *format, ...)
+ #else
+ void fatal(va_alist)
+@@ -304,7 +307,7 @@ void fatal(va_alist)
+    {
+    va_list arg;
+ 
+-#ifndef XFRACT
++#if !defined(USE_VARARGS)
+    va_start(arg, format);
+ #else