diff options
| -rw-r--r-- | math/xfractint/Makefile | 3 | ||||
| -rw-r--r-- | math/xfractint/distinfo | 17 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-aa | 8 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ab | 22 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-af | 31 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ag | 58 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ah | 43 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ai | 21 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-aj | 119 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ak | 19 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-al | 22 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-am | 54 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-an | 17 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ao | 31 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-ap | 41 | ||||
| -rw-r--r-- | math/xfractint/patches/patch-aq | 30 |
16 files changed, 506 insertions, 30 deletions
diff --git a/math/xfractint/Makefile b/math/xfractint/Makefile index d4c1cfe50d8..dbf2f04442c 100644 --- a/math/xfractint/Makefile +++ b/math/xfractint/Makefile @@ -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 @@ BUILDLINK_TRANSFORM+= l:ncurses:curses INSTALLATION_DIRS= share/xfractint .include "../../mk/curses.buildlink3.mk" +.include "../../pkgtools/x11-links/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/xfractint/distinfo b/math/xfractint/distinfo index 9952a89e009..e061af157ba 100644 --- a/math/xfractint/distinfo +++ b/math/xfractint/distinfo @@ -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 --git a/math/xfractint/patches/patch-aa b/math/xfractint/patches/patch-aa index 1eac45f85a0..11ade3a1dbc 100644 --- a/math/xfractint/patches/patch-aa +++ b/math/xfractint/patches/patch-aa @@ -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 --git a/math/xfractint/patches/patch-ab b/math/xfractint/patches/patch-ab deleted file mode 100644 index 60c4cd0972c..00000000000 --- a/math/xfractint/patches/patch-ab +++ /dev/null @@ -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 --git a/math/xfractint/patches/patch-af b/math/xfractint/patches/patch-af new file mode 100644 index 00000000000..c7d45ae1cbd --- /dev/null +++ b/math/xfractint/patches/patch-af @@ -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 --git a/math/xfractint/patches/patch-ag b/math/xfractint/patches/patch-ag new file mode 100644 index 00000000000..d0abc791bc2 --- /dev/null +++ b/math/xfractint/patches/patch-ag @@ -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 --git a/math/xfractint/patches/patch-ah b/math/xfractint/patches/patch-ah new file mode 100644 index 00000000000..c8f17c5a0fc --- /dev/null +++ b/math/xfractint/patches/patch-ah @@ -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 --git a/math/xfractint/patches/patch-ai b/math/xfractint/patches/patch-ai new file mode 100644 index 00000000000..e8b6cc082c4 --- /dev/null +++ b/math/xfractint/patches/patch-ai @@ -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 --git a/math/xfractint/patches/patch-aj b/math/xfractint/patches/patch-aj new file mode 100644 index 00000000000..fde03cad25c --- /dev/null +++ b/math/xfractint/patches/patch-aj @@ -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 + int diff; +@@ -324,7 +327,7 @@ void fatal(va_alist) + } + + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + void error(int diff, char *format, ...) + #else + void error(va_alist) +@@ -333,7 +336,7 @@ void error(va_alist) + { + va_list arg; + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(arg, format); + #else + int diff; +@@ -350,7 +353,7 @@ void error(va_alist) + } + + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + void warn(int diff, char *format, ...) + #else + void warn(va_alist) +@@ -358,7 +361,7 @@ void warn(va_alist) + #endif + { + va_list arg; +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(arg, format); + #else + int diff; +@@ -375,7 +378,7 @@ void warn(va_alist) + } + + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + void notice(char *format, ...) + #else + void notice(va_alist) +@@ -383,7 +386,7 @@ void notice(va_alist) + #endif + { + va_list arg; +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(arg, format); + #else + char *format; +@@ -396,7 +399,7 @@ void notice(va_alist) + } + + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + void msg(char *format, ...) + #else + void msg(va_alist) +@@ -404,13 +407,13 @@ va_dcl + #endif + { + va_list arg; +-#ifdef XFRACT ++#if defined(USE_VARARGS) + char *format; + #endif + + if (quiet_mode) + return; +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(arg, format); + #else + va_start(arg); diff --git a/math/xfractint/patches/patch-ak b/math/xfractint/patches/patch-ak new file mode 100644 index 00000000000..4e259fe6422 --- /dev/null +++ b/math/xfractint/patches/patch-ak @@ -0,0 +1,19 @@ +$NetBSD: patch-ak,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +This file does not use variable arguments at all. + +--- jiim.c.orig 2006-06-15 07:57:40.000000000 +0200 ++++ jiim.c 2006-06-15 08:35:20.000000000 +0200 +@@ -40,12 +40,6 @@ + + #include <string.h> + +-#ifndef XFRACT +-#include <stdarg.h> +-#else +-#include <varargs.h> +-#endif +- + #ifdef __TURBOC__ + # include <mem.h> /* to get mem...() declarations */ + #endif diff --git a/math/xfractint/patches/patch-al b/math/xfractint/patches/patch-al new file mode 100644 index 00000000000..af27b76a1ec --- /dev/null +++ b/math/xfractint/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +--- memory.c.orig 2006-06-15 07:57:40.000000000 +0200 ++++ memory.c 2006-06-15 08:35:53.000000000 +0200 +@@ -1,11 +1,14 @@ ++#if !defined(USE_VARARGS) ++#include <stdarg.h> ++#else ++#include <varargs.h> ++#endif ++ + #include <string.h> + #include <limits.h> + #include <malloc.h> + #ifndef XFRACT + #include <io.h> +-#include <stdarg.h> +-#else +-#include <varargs.h> + #endif + #include <ctype.h> + diff --git a/math/xfractint/patches/patch-am b/math/xfractint/patches/patch-am new file mode 100644 index 00000000000..32aa9e9fab1 --- /dev/null +++ b/math/xfractint/patches/patch-am @@ -0,0 +1,54 @@ +$NetBSD: patch-am,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +--- miscovl.c.orig 2006-06-15 07:57:40.000000000 +0200 ++++ miscovl.c 2006-06-15 08:37:08.000000000 +0200 +@@ -2,16 +2,19 @@ + Overlayed odds and ends that don't fit anywhere else. + */ + ++#if !defined(USE_VARARGS) ++#include <stdarg.h> ++#else ++#include <varargs.h> ++#endif ++ + #include <string.h> + #include <ctype.h> + #include <time.h> + #ifndef XFRACT + #include <malloc.h> + #include <process.h> +-#include <stdarg.h> + #include <io.h> +-#else +-#include <varargs.h> + #endif + /* see Fractint.c for a description of the "include" hierarchy */ + #include "port.h" +@@ -24,7 +27,7 @@ + static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j); + static void expand_comments(char far *target, char far *source); + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + static void put_parm(char *parm,...); + #else + static void put_parm(); +@@ -1175,7 +1178,7 @@ static void put_filename(char *keyword,c + } + } + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + static void put_parm(char *parm,...) + #else + static void put_parm(va_alist) +@@ -1185,7 +1188,7 @@ va_dcl + char *bufptr; + va_list args; + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(args,parm); + #else + char * parm; diff --git a/math/xfractint/patches/patch-an b/math/xfractint/patches/patch-an new file mode 100644 index 00000000000..ecfff8036d5 --- /dev/null +++ b/math/xfractint/patches/patch-an @@ -0,0 +1,17 @@ +$NetBSD: patch-an,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +This file does not use variable arguments at all. + +--- miscres.c.orig 2006-06-15 07:57:40.000000000 +0200 ++++ miscres.c 2006-06-15 08:37:41.000000000 +0200 +@@ -7,10 +7,7 @@ + #include <time.h> + #include <malloc.h> + #ifndef XFRACT +-#include <stdarg.h> + #include <io.h> +-#else +-#include <varargs.h> + #endif + /*#ifdef __TURBOC__ + #include <dir.h> diff --git a/math/xfractint/patches/patch-ao b/math/xfractint/patches/patch-ao new file mode 100644 index 00000000000..f868272faac --- /dev/null +++ b/math/xfractint/patches/patch-ao @@ -0,0 +1,31 @@ +$NetBSD: patch-ao,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +--- port.h.orig 1999-09-06 17:38:10.000000000 +0200 ++++ port.h 2006-06-15 08:52:47.000000000 +0200 +@@ -42,7 +42,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__) + #include <sys/endian.h> + #else + #include <endian.h> +@@ -290,6 +290,9 @@ typedef int sigfunc(int); + #ifdef sun + #define DO_NOT_USE_LONG_DOUBLE + #endif ++#if defined(__NetBSD__) ++#define DO_NOT_USE_LONG_DOUBLE ++#endif + + #ifndef DO_NOT_USE_LONG_DOUBLE + #ifdef LDBL_DIG +@@ -353,6 +356,7 @@ typedef int sigfunc(int); + #define fabsl fabs + #define sinl sin + #define cosl cos ++#define frexpl frexp + #endif + + #endif /* PORT_H */ diff --git a/math/xfractint/patches/patch-ap b/math/xfractint/patches/patch-ap new file mode 100644 index 00000000000..45b431e4e0c --- /dev/null +++ b/math/xfractint/patches/patch-ap @@ -0,0 +1,41 @@ +$NetBSD: patch-ap,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +--- printer.c.orig 2006-06-15 07:57:40.000000000 +0200 ++++ printer.c 2006-06-15 08:38:59.000000000 +0200 +@@ -89,6 +89,9 @@ + + #ifndef XFRACT + #include <conio.h> ++#endif ++ ++#if !defined(USE_VARARGS) + #include <stdarg.h> + #else + #include <varargs.h> +@@ -136,7 +139,7 @@ + + /******** PROTOTYPES ********/ + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + static void Printer_printf(char far *fmt,...); + #else + static void Printer_printf(); +@@ -1335,7 +1338,7 @@ static void _fastcall print_title(int pt + + /* This function prints a string to the the printer with BIOS calls. */ + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + static void Printer_printf(char far *fmt,...) + #else + static void Printer_printf(va_alist) +@@ -1347,7 +1350,7 @@ char s[500]; + int x=0; + va_list arg; + +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + va_start(arg,fmt); + #else + char far *fmt; diff --git a/math/xfractint/patches/patch-aq b/math/xfractint/patches/patch-aq new file mode 100644 index 00000000000..6722a5683a2 --- /dev/null +++ b/math/xfractint/patches/patch-aq @@ -0,0 +1,30 @@ +$NetBSD: patch-aq,v 1.1 2006/06/14 09:07:45 rillig Exp $ + +--- prototyp.h.orig 2006-06-15 07:57:40.000000000 +0200 ++++ prototyp.h 2006-06-15 08:33:52.000000000 +0200 +@@ -372,7 +372,7 @@ extern int t16_getline(FILE *,int ,U16 * + + extern void calcfracinit(void); + extern void adjust_corner(void); +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + extern int put_resume(int ,... ); + extern int get_resume(int ,... ); + #else +@@ -604,11 +604,14 @@ extern int main_menu_switch(int *,int *, + extern int pot_line(BYTE *,int ); + extern int sound_line(BYTE *,int ); + extern int sound_line(unsigned char *pixels,int linelen); +-#ifndef XFRACT ++#if !defined(USE_VARARGS) + extern int timer(int,int (*subrtn)(),...); +-extern int _cdecl _matherr(struct exception *); + #else + extern int timer(); ++#endif ++#ifndef XFRACT ++extern int _cdecl _matherr(struct exception *); ++#else + extern int XZoomWaiting; + #endif + |