Fri Oct 26 20:39:16 2012 UTC ()
Add missing includes. Don't conflict with sync(2).


(joerg)
diff -r1.8 -r1.9 pkgsrc/math/xfractint/distinfo
diff -r1.3 -r1.4 pkgsrc/math/xfractint/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/math/xfractint/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/math/xfractint/patches/patch-aq
cvs diff -r1.8 -r1.9 pkgsrc/math/xfractint/distinfo (expand / switch to unified diff)

--- pkgsrc/math/xfractint/distinfo 2009/12/11 17:47:28 1.8
+++ pkgsrc/math/xfractint/distinfo 2012/10/26 20:39:15 1.9
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.8 2009/12/11 17:47:28 asau Exp $ 1$NetBSD: distinfo,v 1.9 2012/10/26 20:39:15 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) = 43815e2af79a7b438992169fa5f0b9afe30d9b2e 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) = bf0ce10e27b29022890bc292daf72a09974a3aa0
13SHA1 (patch-ah) = f0599bb9f59921938784a866d27205abaef6a964 13SHA1 (patch-ah) = e43c1da5381778cd2c5bc76e9a5c8e86ff0c343a
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) = 8202b8a7adc3e3badee6de0b395d912910aa6710 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
cvs diff -r1.3 -r1.4 pkgsrc/math/xfractint/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/math/xfractint/patches/Attic/patch-aa 2006/06/14 14:34:10 1.3
+++ pkgsrc/math/xfractint/patches/Attic/patch-aa 2012/10/26 20:39:16 1.4
@@ -1,55 +1,234 @@ @@ -1,55 +1,234 @@
1$NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2012/10/26 20:39:16 joerg Exp $
2 2
3--- unixscr.c.orig 1999-04-29 04:12:03.000000000 +0000 3--- unixscr.c.orig 1999-04-28 23:12:04.000000000 +0000
4+++ unixscr.c 4+++ unixscr.c
5@@ -44,6 +44,8 @@ 5@@ -17,10 +17,13 @@
 6 #include <stdlib.h>
 7 #include <curses.h>
 8 #include <X11/Xlib.h>
 9+#include <X11/Xutil.h>
 10 #include <X11/keysym.h>
 11 #include <X11/Xatom.h>
 12 #include <signal.h>
 13 #include <sys/types.h>
 14+#include <string.h>
 15+#include <unistd.h>
 16 #ifdef _AIX
 17 #include <sys/select.h>
 18 #endif
 19@@ -44,6 +47,8 @@
6 # define FNDELAY O_NONBLOCK 20 # define FNDELAY O_NONBLOCK
7 #endif 21 #endif
8  22
9+typedef void (*sighandler_t)(int); 23+typedef void (*sighandler_t)(int);
10+ 24+
11 /* Check if there is a character waiting for us. */ 25 /* Check if there is a character waiting for us. */
12 #define input_pending() (ioctl(0,FIONREAD,&iocount),(int)iocount) 26 #define input_pending() (ioctl(0,FIONREAD,&iocount),(int)iocount)
13  27
14@@ -241,7 +243,7 @@ UnixInit() 28@@ -82,7 +87,7 @@ static int fullscreen = 0;
 29 static int sharecolor = 0;
 30 static int privatecolor = 0;
 31 static int fixcolors = 0;
 32-static int sync = 0; /* Run X events synchronously (debugging) */
 33+static int my_sync = 0; /* Run X events synchronously (debugging) */
 34 int slowdisplay = 0; /* We have a slow display, so don't print too much */
 35 static int simple_input = 0; /* Use simple input (debugging) */
 36 static char *Xdisplay = "";
 37@@ -179,7 +184,7 @@ int *i;
 38 slowdisplay = 1;
 39 return 1;
 40 } else if (strcmp(argv[*i],"-sync")==0) {
 41- sync = 1;
 42+ my_sync = 1;
 43 return 1;
 44 } else if (strcmp(argv[*i],"-private")==0) {
 45 privatecolor = 1;
 46@@ -241,7 +246,7 @@ UnixInit()
15 initdacbox(); 47 initdacbox();
16  48
17 if (!simple_input) { 49 if (!simple_input) {
18- signal(SIGINT,(__sighandler_t)goodbye); 50- signal(SIGINT,(__sighandler_t)goodbye);
19+ signal(SIGINT,(sighandler_t)goodbye); 51+ signal(SIGINT,(sighandler_t)goodbye);
20 } 52 }
21 signal(SIGFPE, fpe_handler); 53 signal(SIGFPE, fpe_handler);
22 /* 54 /*
23@@ -2068,12 +2070,12 @@ xgetfont() 55@@ -446,7 +451,7 @@ initUnixWindow()
 56 XGeometry(Xdp, Xdscreen, Xgeometry, DEFXY, 0, 1, 1, 0, 0,
 57 &Xwinx, &Xwiny, &Xwinwidth, &Xwinheight);
 58 }
 59- if (sync) {
 60+ if (my_sync) {
 61 XSynchronize(Xdp,True);
 62 }
 63 XSetErrorHandler(errhand);
 64@@ -1579,7 +1584,7 @@ xhandleevents()
 65 case XK_Control_L:
 66 case XK_Control_R:
 67 ctl_mode = 1;
 68- return;
 69+ return 0;
 70 case XK_Shift_L:
 71 case XK_Shift_R:
 72 shift_mode = 1;
 73@@ -1587,95 +1592,95 @@ xhandleevents()
 74 case XK_Home:
 75 case XK_R7:
 76 xbufkey = ctl_mode ? CTL_HOME : HOME;
 77- return;
 78+ return 0;
 79 case XK_Left:
 80 case XK_R10:
 81 xbufkey = ctl_mode ? LEFT_ARROW_2 : LEFT_ARROW;
 82- return;
 83+ return 0;
 84 case XK_Right:
 85 case XK_R12:
 86 xbufkey = ctl_mode ? RIGHT_ARROW_2 : RIGHT_ARROW;
 87- return;
 88+ return 0;
 89 case XK_Down:
 90 case XK_R14:
 91 xbufkey = ctl_mode ? DOWN_ARROW_2 : DOWN_ARROW;
 92- return;
 93+ return 0;
 94 case XK_Up:
 95 case XK_R8:
 96 xbufkey = ctl_mode ? UP_ARROW_2 : UP_ARROW;
 97- return;
 98+ return 0;
 99 case XK_Insert:
 100 xbufkey = ctl_mode ? CTL_INSERT : INSERT;
 101- return;
 102+ return 0;
 103 case XK_Delete:
 104 xbufkey = ctl_mode ? CTL_DEL : DELETE;
 105- return;
 106+ return 0;
 107 case XK_End:
 108 case XK_R13:
 109 xbufkey = ctl_mode ? CTL_END : END;
 110- return;
 111+ return 0;
 112 case XK_Help:
 113 xbufkey = F1;
 114- return;
 115+ return 0;
 116 case XK_Prior:
 117 case XK_R9:
 118 xbufkey = ctl_mode ? CTL_PAGE_UP : PAGE_UP;
 119- return;
 120+ return 0;
 121 case XK_Next:
 122 case XK_R15:
 123 xbufkey = ctl_mode ? CTL_PAGE_DOWN : PAGE_DOWN;
 124- return;
 125+ return 0;
 126 case XK_F1:
 127 case XK_L1:
 128 xbufkey = shift_mode ? SF1: F1;
 129- return;
 130+ return 0;
 131 case XK_F2:
 132 case XK_L2:
 133 xbufkey = shift_mode ? SF2: F2;
 134- return;
 135+ return 0;
 136 case XK_F3:
 137 case XK_L3:
 138 xbufkey = shift_mode ? SF3: F3;
 139- return;
 140+ return 0;
 141 case XK_F4:
 142 case XK_L4:
 143 xbufkey = shift_mode ? SF4: F4;
 144- return;
 145+ return 0;
 146 case XK_F5:
 147 case XK_L5:
 148 xbufkey = shift_mode ? SF5: F5;
 149- return;
 150+ return 0;
 151 case XK_F6:
 152 case XK_L6:
 153 xbufkey = shift_mode ? SF6: F6;
 154- return;
 155+ return 0;
 156 case XK_F7:
 157 case XK_L7:
 158 xbufkey = shift_mode ? SF7: F7;
 159- return;
 160+ return 0;
 161 case XK_F8:
 162 case XK_L8:
 163 xbufkey = shift_mode ? SF8: F8;
 164- return;
 165+ return 0;
 166 case XK_F9:
 167 case XK_L9:
 168 xbufkey = shift_mode ? SF9: F9;
 169- return;
 170+ return 0;
 171 case XK_F10:
 172 case XK_L10:
 173 xbufkey = shift_mode ? SF10: F10;
 174- return;
 175+ return 0;
 176 case '+':
 177 xbufkey = ctl_mode ? CTL_PLUS : '+';
 178- return;
 179+ return 0;
 180 case '-':
 181 xbufkey = ctl_mode ? CTL_MINUS : '-';
 182- return;
 183+ return 0;
 184 break;
 185 case XK_Return:
 186 case XK_KP_Enter:
 187 xbufkey = ctl_mode ? CTL('T') : '\n';
 188- return;
 189+ return 0;
 190 }
 191 if (charcount==1) {
 192 xbufkey = buffer[0];
 193@@ -1847,7 +1852,7 @@ xhandleevents()
 194 }
 195 }
 196 }
 197-
 198+ return 0;
 199 }
 200
 201 #define w_root Xroot
 202@@ -2068,12 +2073,12 @@ xgetfont()
24 void 203 void
25 shell_to_dos() 204 shell_to_dos()
26 { 205 {
27- __sighandler_t sigint; 206- __sighandler_t sigint;
28+ sighandler_t sigint; 207+ sighandler_t sigint;
29 char *shell; 208 char *shell;
30 char *argv[2]; 209 char *argv[2];
31 int pid, donepid; 210 int pid, donepid;
32  211
33- sigint = (__sighandler_t)signal(SIGINT, SIG_IGN); 212- sigint = (__sighandler_t)signal(SIGINT, SIG_IGN);
34+ sigint = (sighandler_t)signal(SIGINT, SIG_IGN); 213+ sigint = (sighandler_t)signal(SIGINT, SIG_IGN);
35 shell = getenv("SHELL"); 214 shell = getenv("SHELL");
36 if (shell==NULL) { 215 if (shell==NULL) {
37 shell = SHELL; 216 shell = SHELL;
38@@ -2121,7 +2123,7 @@ shell_to_dos() 217@@ -2121,7 +2126,7 @@ shell_to_dos()
39 fcntl(0,F_SETFL,FNDELAY); 218 fcntl(0,F_SETFL,FNDELAY);
40 } 219 }
41  220
42- signal(SIGINT, (__sighandler_t)sigint); 221- signal(SIGINT, (__sighandler_t)sigint);
43+ signal(SIGINT, (sighandler_t)sigint); 222+ signal(SIGINT, (sighandler_t)sigint);
44 putchar('\n'); 223 putchar('\n');
45 } 224 }
46  225
47@@ -2146,7 +2148,7 @@ schedulealarm(soon) 226@@ -2146,7 +2151,7 @@ schedulealarm(soon)
48 int soon; 227 int soon;
49 { 228 {
50 if (!fastmode) return; 229 if (!fastmode) return;
51- signal(SIGALRM, (__sighandler_t)setredrawscreen); 230- signal(SIGALRM, (__sighandler_t)setredrawscreen);
52+ signal(SIGALRM, (sighandler_t)setredrawscreen); 231+ signal(SIGALRM, (sighandler_t)setredrawscreen);
53 if (soon) { 232 if (soon) {
54 alarm(1); 233 alarm(1);
55 } else { 234 } else {
cvs diff -r1.1 -r1.2 pkgsrc/math/xfractint/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/math/xfractint/patches/Attic/patch-ah 2006/06/14 09:07:45 1.1
+++ pkgsrc/math/xfractint/patches/Attic/patch-ah 2012/10/26 20:39:16 1.2
@@ -1,38 +1,47 @@ @@ -1,38 +1,47 @@
1$NetBSD: patch-ah,v 1.1 2006/06/14 09:07:45 rillig Exp $ 1$NetBSD: patch-ah,v 1.2 2012/10/26 20:39:16 joerg Exp $
2 2
3--- fractint.c.orig 2006-06-15 07:57:40.000000000 +0200 3--- fractint.c.orig 1999-09-06 10:38:10.000000000 +0000
4+++ fractint.c 2006-06-15 08:32:32.000000000 +0200 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@@ -202,7 +205,7 @@ static void my_floating_point_err(int si
 27 overflow = 1;
 28 }
 29
 30-void main(int argc, char **argv)
 31+int main(int argc, char **argv)
 32 {
 33 int resumeflag;
 34 int kbdchar; /* keyboard key-hit value */
26@@ -540,7 +543,7 @@ int check_key() 35@@ -540,7 +543,7 @@ int check_key()
27 timer(1,NULL,int width) decoder 36 timer(1,NULL,int width) decoder
28 timer(2) encoder 37 timer(2) encoder
29 */ 38 */
30-#ifndef XFRACT 39-#ifndef XFRACT
31+#if !defined(USE_VARARGS) 40+#if !defined(USE_VARARGS)
32 int timer(int timertype,int(*subrtn)(),...) 41 int timer(int timertype,int(*subrtn)(),...)
33 #else 42 #else
34 int timer(va_alist) 43 int timer(va_alist)
35@@ -555,7 +558,7 @@ va_dcl 44@@ -555,7 +558,7 @@ va_dcl
36 int i; 45 int i;
37 int do_bench; 46 int do_bench;
38  47
cvs diff -r1.1 -r1.2 pkgsrc/math/xfractint/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/math/xfractint/patches/Attic/patch-aq 2006/06/14 09:07:45 1.1
+++ pkgsrc/math/xfractint/patches/Attic/patch-aq 2012/10/26 20:39:16 1.2
@@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
1$NetBSD: patch-aq,v 1.1 2006/06/14 09:07:45 rillig Exp $ 1$NetBSD: patch-aq,v 1.2 2012/10/26 20:39:16 joerg Exp $
2 2
3--- prototyp.h.orig 2006-06-15 07:57:40.000000000 +0200 3--- prototyp.h.orig 2006-06-15 07:57:40.000000000 +0200
4+++ prototyp.h 2006-06-15 08:33:52.000000000 +0200 4+++ prototyp.h 2006-06-15 08:33:52.000000000 +0200
5@@ -372,7 +372,7 @@ extern int t16_getline(FILE *,int ,U16 * 5@@ -372,7 +372,7 @@ extern int t16_getline(FILE *,int ,U16 *
6  6
7 extern void calcfracinit(void); 7 extern void calcfracinit(void);
8 extern void adjust_corner(void); 8 extern void adjust_corner(void);
9-#ifndef XFRACT 9-#ifndef XFRACT
10+#if !defined(USE_VARARGS) 10+#if !defined(USE_VARARGS)
11 extern int put_resume(int ,... ); 11 extern int put_resume(int ,... );
12 extern int get_resume(int ,... ); 12 extern int get_resume(int ,... );
13 #else 13 #else
14@@ -604,11 +604,14 @@ extern int main_menu_switch(int *,int *, 14@@ -591,7 +591,6 @@ extern void set_pixel_calc_functions(voi
 15
 16 /* fractint -- C file prototypes */
 17
 18-extern void main(int argc,char **argv );
 19 extern int elapsed_time(int);
 20
 21 /* framain2 -- C file prototypes */
 22@@ -604,11 +603,14 @@ extern int main_menu_switch(int *,int *,
15 extern int pot_line(BYTE *,int ); 23 extern int pot_line(BYTE *,int );
16 extern int sound_line(BYTE *,int ); 24 extern int sound_line(BYTE *,int );
17 extern int sound_line(unsigned char *pixels,int linelen); 25 extern int sound_line(unsigned char *pixels,int linelen);
18-#ifndef XFRACT 26-#ifndef XFRACT
19+#if !defined(USE_VARARGS) 27+#if !defined(USE_VARARGS)
20 extern int timer(int,int (*subrtn)(),...); 28 extern int timer(int,int (*subrtn)(),...);
21-extern int _cdecl _matherr(struct exception *); 29-extern int _cdecl _matherr(struct exception *);
22 #else 30 #else
23 extern int timer(); 31 extern int timer();
24+#endif 32+#endif
25+#ifndef XFRACT 33+#ifndef XFRACT
26+extern int _cdecl _matherr(struct exception *); 34+extern int _cdecl _matherr(struct exception *);
27+#else 35+#else