Add missing includes. Don't conflict with sync(2).

4 files changed, 212 insertions, 16 deletions

diff --git a/math/xfractint/distinfo b/math/xfractint/distinfo
index a159cdd34a0..df65db8b926 100644
--- a/math/xfractint/distinfo
+++ b/math/xfractint/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.8 2009/12/11 17:47:28 asau Exp $
+$NetBSD: distinfo,v 1.9 2012/10/26 20:39:15 joerg Exp $
 
 SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
 RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
 Size (xfrac310.zip) = 1074760 bytes
-SHA1 (patch-aa) = 43815e2af79a7b438992169fa5f0b9afe30d9b2e
+SHA1 (patch-aa) = 51d654407fc5621ba69bb5656f7ff7ba65d8ef39
 SHA1 (patch-ab) = d9e793dfe453cb097d671eb764cdf71f95a87eb8
 SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
 SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
 SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
 SHA1 (patch-af) = d95099b13cdef7421fd09be09627e4db5646e948
 SHA1 (patch-ag) = bf0ce10e27b29022890bc292daf72a09974a3aa0
-SHA1 (patch-ah) = f0599bb9f59921938784a866d27205abaef6a964
+SHA1 (patch-ah) = e43c1da5381778cd2c5bc76e9a5c8e86ff0c343a
 SHA1 (patch-ai) = e6b4ef5637cc8d05d6dd9b0f1e098d51bc692310
 SHA1 (patch-aj) = 578a8a0dcff9021f65bd5368ae8232c89a325081
 SHA1 (patch-ak) = 2d128d7575070d3452702f219aa51c468928f38a
@@ -19,7 +19,7 @@ SHA1 (patch-am) = ae214e36ff64009d18724e80638f1fa55544d19e
 SHA1 (patch-an) = d4effdac0afa8efc68cc3eae80e62bfe8c9281a1
 SHA1 (patch-ao) = c9fb472e44bbc4d939fe00725be9b06fd8cecb26
 SHA1 (patch-ap) = 87f6bc9db67554f600428e3369f83849b81d23fa
-SHA1 (patch-aq) = 8202b8a7adc3e3badee6de0b395d912910aa6710
+SHA1 (patch-aq) = 58fdcdcf92c6d1a5bd63f0652d74d73b98a2c0a6
 SHA1 (patch-ar) = 6052e96b0b008c75ca43f71dd26452195d9b96de
 SHA1 (patch-as) = e35ce93cb4ef9785eb144e7a8b4d26b2b323d8c9
 SHA1 (patch-at) = 01a906fe87d2bd56f2fc3dd2196445c6c2b3cc40
diff --git a/math/xfractint/patches/patch-aa b/math/xfractint/patches/patch-aa
index 31e64075e3e..18c8fa741e2 100644
--- a/math/xfractint/patches/patch-aa
+++ b/math/xfractint/patches/patch-aa
@@ -1,8 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2012/10/26 20:39:16 joerg Exp $
 
---- unixscr.c.orig	1999-04-29 04:12:03.000000000 +0000
+--- unixscr.c.orig	1999-04-28 23:12:04.000000000 +0000
 +++ unixscr.c
-@@ -44,6 +44,8 @@
+@@ -17,10 +17,13 @@
+ #include <stdlib.h>
+ #include <curses.h>
+ #include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/keysym.h>
+ #include <X11/Xatom.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <string.h>
++#include <unistd.h>
+ #ifdef _AIX
+ #include <sys/select.h>
+ #endif
+@@ -44,6 +47,8 @@
  # define FNDELAY O_NONBLOCK
  #endif
  
@@ -11,7 +25,25 @@ $NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $
  /* Check if there is a character waiting for us.  */
  #define input_pending() (ioctl(0,FIONREAD,&iocount),(int)iocount)
  
-@@ -241,7 +243,7 @@ UnixInit()
+@@ -82,7 +87,7 @@ static int fullscreen = 0;
+ static int sharecolor = 0;
+ static int privatecolor = 0;
+ static int fixcolors = 0;
+-static int sync = 0; /* Run X events synchronously (debugging) */
++static int my_sync = 0; /* Run X events synchronously (debugging) */
+ int slowdisplay = 0; /* We have a slow display, so don't print too much */
+ static int simple_input = 0; /* Use simple input (debugging) */
+ static char *Xdisplay = "";
+@@ -179,7 +184,7 @@ int *i;
+ 	slowdisplay = 1;
+ 	return 1;
+     } else if (strcmp(argv[*i],"-sync")==0) {
+-	sync = 1;
++	my_sync = 1;
+ 	return 1;
+     } else if (strcmp(argv[*i],"-private")==0) {
+ 	privatecolor = 1;
+@@ -241,7 +246,7 @@ UnixInit()
      initdacbox();
  
      if (!simple_input) {
@@ -20,7 +52,154 @@ $NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $
      }
      signal(SIGFPE, fpe_handler);
      /*
-@@ -2068,12 +2070,12 @@ xgetfont()
+@@ -446,7 +451,7 @@ initUnixWindow()
+ 	    XGeometry(Xdp, Xdscreen, Xgeometry, DEFXY, 0, 1, 1, 0, 0,
+ 		    &Xwinx, &Xwiny, &Xwinwidth, &Xwinheight);
+ 	}
+-	if (sync) {
++	if (my_sync) {
+ 	    XSynchronize(Xdp,True);
+ 	}
+ 	XSetErrorHandler(errhand);
+@@ -1579,7 +1584,7 @@ xhandleevents()
+ 		    case XK_Control_L:
+ 		    case XK_Control_R:
+ 			ctl_mode = 1;
+-			return;
++			return 0;
+ 		    case XK_Shift_L:
+ 		    case XK_Shift_R:
+ 			shift_mode = 1;
+@@ -1587,95 +1592,95 @@ xhandleevents()
+ 		    case XK_Home:
+ 		    case XK_R7:
+ 			xbufkey = ctl_mode ? CTL_HOME : HOME;
+-			return;
++			return 0;
+ 		    case XK_Left:
+ 		    case XK_R10:
+ 			xbufkey = ctl_mode ? LEFT_ARROW_2 : LEFT_ARROW;
+-			return;
++			return 0;
+ 		    case XK_Right:
+ 		    case XK_R12:
+ 			xbufkey = ctl_mode ? RIGHT_ARROW_2 : RIGHT_ARROW;
+-			return;
++			return 0;
+ 		    case XK_Down:
+ 		    case XK_R14:
+ 			xbufkey = ctl_mode ? DOWN_ARROW_2 : DOWN_ARROW;
+-			return;
++			return 0;
+ 		    case XK_Up:
+ 		    case XK_R8:
+ 			xbufkey = ctl_mode ? UP_ARROW_2 : UP_ARROW;
+-			return;
++			return 0;
+ 		    case XK_Insert:
+ 			xbufkey = ctl_mode ? CTL_INSERT : INSERT;
+-			return;
++			return 0;
+ 		    case XK_Delete:
+ 			xbufkey = ctl_mode ? CTL_DEL : DELETE;
+-			return;
++			return 0;
+ 		    case XK_End:
+ 		    case XK_R13:
+ 			xbufkey = ctl_mode ? CTL_END : END;
+-			return;
++			return 0;
+ 		    case XK_Help:
+ 			xbufkey = F1;
+-			return;
++			return 0;
+ 		    case XK_Prior:
+ 		    case XK_R9:
+ 			xbufkey = ctl_mode ? CTL_PAGE_UP : PAGE_UP;
+-			 return;
++			 return 0;
+ 		    case XK_Next:
+ 		    case XK_R15:
+ 			xbufkey = ctl_mode ? CTL_PAGE_DOWN : PAGE_DOWN;
+-			 return;
++			 return 0;
+ 		    case XK_F1:
+ 		    case XK_L1:
+ 			xbufkey = shift_mode ? SF1: F1;
+-			return;
++			return 0;
+ 		    case XK_F2:
+ 		    case XK_L2:
+ 			xbufkey = shift_mode ? SF2: F2;
+-			return;
++			return 0;
+ 		    case XK_F3:
+ 		    case XK_L3:
+ 			xbufkey = shift_mode ? SF3: F3;
+-			return;
++			return 0;
+ 		    case XK_F4:
+ 		    case XK_L4:
+ 			xbufkey = shift_mode ? SF4: F4;
+-			return;
++			return 0;
+ 		    case XK_F5:
+ 		    case XK_L5:
+ 			xbufkey = shift_mode ? SF5: F5;
+-			return;
++			return 0;
+ 		    case XK_F6:
+ 		    case XK_L6:
+ 			xbufkey = shift_mode ? SF6: F6;
+-			return;
++			return 0;
+ 		    case XK_F7:
+ 		    case XK_L7:
+ 			xbufkey = shift_mode ? SF7: F7;
+-			return;
++			return 0;
+ 		    case XK_F8:
+ 		    case XK_L8:
+ 			xbufkey = shift_mode ? SF8: F8;
+-			return;
++			return 0;
+ 		    case XK_F9:
+ 		    case XK_L9:
+ 			xbufkey = shift_mode ? SF9: F9;
+-			return;
++			return 0;
+ 		    case XK_F10:
+ 		    case XK_L10:
+ 			xbufkey = shift_mode ? SF10: F10;
+-			return;
++			return 0;
+ 		    case '+':
+ 			 xbufkey = ctl_mode ? CTL_PLUS : '+';
+-			 return;
++			 return 0;
+ 		    case '-':
+ 			 xbufkey = ctl_mode ? CTL_MINUS : '-';
+-			 return;
++			 return 0;
+ 			 break;
+ 		    case XK_Return:
+ 		    case XK_KP_Enter:
+ 			 xbufkey = ctl_mode ? CTL('T') : '\n';
+-			 return;
++			 return 0;
+ 		}
+ 		if (charcount==1) {
+ 		    xbufkey = buffer[0];
+@@ -1847,7 +1852,7 @@ xhandleevents()
+ 	    }
+ 	}
+     }
+-
++    return 0;
+ }
+ 
+ #define w_root Xroot
+@@ -2068,12 +2073,12 @@ xgetfont()
  void
  shell_to_dos()
  {
@@ -35,7 +214,7 @@ $NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $
      shell = getenv("SHELL");
      if (shell==NULL) {
  	shell = SHELL;
-@@ -2121,7 +2123,7 @@ shell_to_dos()
+@@ -2121,7 +2126,7 @@ shell_to_dos()
  	fcntl(0,F_SETFL,FNDELAY);
      }
  
@@ -44,7 +223,7 @@ $NetBSD: patch-aa,v 1.3 2006/06/14 14:34:10 joerg Exp $
      putchar('\n');
  }
  
-@@ -2146,7 +2148,7 @@ schedulealarm(soon)
+@@ -2146,7 +2151,7 @@ schedulealarm(soon)
  int soon;
  {
      if (!fastmode) return;
diff --git a/math/xfractint/patches/patch-ah b/math/xfractint/patches/patch-ah
index c8f17c5a0fc..47c0b487937 100644
--- a/math/xfractint/patches/patch-ah
+++ b/math/xfractint/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2006/06/14 09:07:45 rillig Exp $
+$NetBSD: patch-ah,v 1.2 2012/10/26 20:39:16 joerg Exp $
 
---- fractint.c.orig	2006-06-15 07:57:40.000000000 +0200
-+++ fractint.c	2006-06-15 08:32:32.000000000 +0200
+--- fractint.c.orig	1999-09-06 10:38:10.000000000 +0000
++++ fractint.c
 @@ -3,14 +3,17 @@
                          Main Routine
  */
@@ -23,6 +23,15 @@ $NetBSD: patch-ah,v 1.1 2006/06/14 09:07:45 rillig Exp $
  #endif
  #include <ctype.h>
  
+@@ -202,7 +205,7 @@ static void my_floating_point_err(int si
+       overflow = 1;
+ }
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int     resumeflag;
+    int     kbdchar;                     /* keyboard key-hit value       */
 @@ -540,7 +543,7 @@ int check_key()
       timer(1,NULL,int width)            decoder
       timer(2)                           encoder
diff --git a/math/xfractint/patches/patch-aq b/math/xfractint/patches/patch-aq
index 6722a5683a2..dc9c364dc6e 100644
--- a/math/xfractint/patches/patch-aq
+++ b/math/xfractint/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1 2006/06/14 09:07:45 rillig Exp $
+$NetBSD: patch-aq,v 1.2 2012/10/26 20:39:16 joerg Exp $
 
 --- prototyp.h.orig	2006-06-15 07:57:40.000000000 +0200
 +++ prototyp.h	2006-06-15 08:33:52.000000000 +0200
@@ -11,7 +11,15 @@ $NetBSD: patch-aq,v 1.1 2006/06/14 09:07:45 rillig Exp $
  extern int put_resume(int ,... );
  extern int get_resume(int ,... );
  #else
-@@ -604,11 +604,14 @@ extern int main_menu_switch(int *,int *,
+@@ -591,7 +591,6 @@ extern void set_pixel_calc_functions(voi
+ 
+ /*  fractint -- C file prototypes */
+ 
+-extern void main(int argc,char **argv );
+ extern int elapsed_time(int);
+ 
+ /*  framain2 -- C file prototypes */
+@@ -604,11 +603,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);