Fix build errors on -current.

8 files changed, 268 insertions, 0 deletions

diff --git a/games/xspacewarp/files/patch-aa b/games/xspacewarp/files/patch-aa
new file mode 100644
index 000000000000..ed3b8c118622
--- /dev/null
+++ b/games/xspacewarp/files/patch-aa
@@ -0,0 +1,11 @@
+--- c_endever.hh.orig	Sun Feb 27 12:21:09 2000
++++ c_endever.hh	Sun Feb 27 12:21:27 2000
+@@ -35,7 +35,7 @@
+   bool nomove() const {return (nomoveflag);}
+   void setnomove(bool nm) {nomoveflag = nm;}
+   static void seticon(const char *str);
+-  static geticon_len();
++  static int geticon_len();
+ private:
+   int torpedoes;
+   bool docked;			// whether docked to a base
diff --git a/games/xspacewarp/files/patch-ab b/games/xspacewarp/files/patch-ab
new file mode 100644
index 000000000000..95f91e2ed765
--- /dev/null
+++ b/games/xspacewarp/files/patch-ab
@@ -0,0 +1,101 @@
+--- xprep.hh.orig	Sun Feb 27 12:22:21 2000
++++ xprep.hh	Sun Feb 27 12:27:25 2000
+@@ -194,7 +194,7 @@
+     sizeof(Boolean),
+     XtOffsetOf(AppData, nomouse),
+     XtRString,
+-    "False"
++    (XtPointer) "False"
+   },
+   {
+     XtNrows,
+@@ -365,7 +365,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, foreground),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNbackground,
+@@ -374,7 +374,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, background),
+     XtRString,
+-    XtDefaultBackground
++    (XtPointer) XtDefaultBackground
+   },
+   {
+     XtNendeverColor,
+@@ -383,7 +383,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, endever_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNendeverIcon,
+@@ -401,7 +401,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, jovian_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNjovianIcon,
+@@ -419,7 +419,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, base_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNbaseIcon,
+@@ -437,7 +437,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, star_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNstarIcon,
+@@ -455,7 +455,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, blackhole_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNblackholeIcon,
+@@ -473,7 +473,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, faser_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNfaserWidth,
+@@ -518,7 +518,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, torpedo_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNtorpedoWidth,
+@@ -554,7 +554,7 @@
+     sizeof(Pixel),
+     XtOffsetOf(AppData, explosion_color),
+     XtRString,
+-    XtDefaultForeground
++    (XtPointer) XtDefaultForeground
+   },
+   {
+     XtNexplosionSpeed,
diff --git a/games/xspacewarp/files/patch-ac b/games/xspacewarp/files/patch-ac
new file mode 100644
index 000000000000..27a9c80ed361
--- /dev/null
+++ b/games/xspacewarp/files/patch-ac
@@ -0,0 +1,15 @@
+--- c_jovian.cc.orig	Fri Dec 29 01:41:56 1995
++++ c_jovian.cc	Sun Feb 27 12:30:41 2000
+@@ -22,10 +22,12 @@
+ 
+ // these AI functions are kept in separate file c_jovian_ai.cc
+ 
++#if 0
+ extern Action Jovian::pick_action();
+ extern Direction Jovian::pick_direction();
+ extern Ucoors Jovian::pick_sector();
+ extern Point Jovian::pick_target();
++#endif
+ 
+ 
+ Jovian::Jovian(): Combatant()
diff --git a/games/znibbles/files/patch-aa b/games/znibbles/files/patch-aa
new file mode 100644
index 000000000000..c74f800d8b65
--- /dev/null
+++ b/games/znibbles/files/patch-aa
@@ -0,0 +1,55 @@
+--- src/ServerInterface.C.orig	Sun Feb 27 12:09:00 2000
++++ src/ServerInterface.C	Sun Feb 27 12:13:13 2000
+@@ -48,6 +48,9 @@
+ #include <errno.h>
+ 
+ #include <sys/times.h>
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
+ 
+ #include "DLList.h" // Doubly linked lists
+ 
+@@ -230,9 +233,15 @@
+     socket_service = -1;
+     while (socket_service == -1) {
+       // wait for connection
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++      socket_service = accept(socket_ecoute, 
++			      (struct sockaddr *) &address, 
++			      (socklen_t *) &lg_address);
++#else
+       socket_service = accept(socket_ecoute, 
+ 			      (struct sockaddr *) &address, 
+ 			      &lg_address);
++#endif
+       
+       // Reception d'un signal (probablement SIGCHLD) 
+       if(socket_service == -1 && errno == EINTR) {
+@@ -305,8 +314,8 @@
+ 	} else if (strcmp(line, "p") == 0) { // pause
+ 	  xpaused = !xpaused;
+ 	  display_system_message(((xpaused) 
+-				  ? "Pausing...\n" 
+-				  : "Running...\n"));
++				  ? (char *)"Pausing...\n" 
++				  : (char *)"Running...\n"));
+ 	  continue;
+ 	} else if (strcmp(line, "-") == 0) { // slower...
+  	  if (debug) {
+@@ -433,9 +442,15 @@
+ 
+   while (read_ready(socketnum)) {
+ 
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++    socket_service = accept(socketnum, 
++			    (struct sockaddr *) &address, 
++			    (socklen_t *) &lg_address);
++#else
+     socket_service = accept(socketnum, 
+ 			    (struct sockaddr *) &address, 
+ 			    &lg_address);
++#endif
+ 
+     // s'il y a une erreur, ce n'est pas une EINTR (cf appel a read_ready())
+     if(socket_service == -1) { 
diff --git a/net-im/xicq/files/patch-ag b/net-im/xicq/files/patch-ag
new file mode 100644
index 000000000000..662d773579a1
--- /dev/null
+++ b/net-im/xicq/files/patch-ag
@@ -0,0 +1,17 @@
+--- src/libXicq/structs.h.orig	Sun Feb 27 12:34:45 2000
++++ src/libXicq/structs.h	Sun Feb 27 12:37:10 2000
+@@ -16,10 +16,10 @@
+ */
+ struct LIB_INFORMATION
+ {
+-    const char NAME[]		= "libXicq";
+-    const char VERSION[]	= "071298-snapshot";
+-    const char AUTHOR[]		= "tnc";
+-    const char CONTACT[]	= "xtrophy@it.dk";
++    static const char NAME[]	= "libXicq";
++    static const char VERSION[]	= "071298-snapshot";
++    static const char AUTHOR[]	= "tnc";
++    static const char CONTACT[]	= "xtrophy@it.dk";
+ };
+ 
+ 
diff --git a/net-im/xicq/files/patch-ah b/net-im/xicq/files/patch-ah
new file mode 100644
index 000000000000..3ac804237512
--- /dev/null
+++ b/net-im/xicq/files/patch-ah
@@ -0,0 +1,26 @@
+--- src/libXicq/net.cc.orig	Sun Feb 27 12:37:37 2000
++++ src/libXicq/net.cc	Sun Feb 27 12:38:59 2000
+@@ -6,6 +6,9 @@
+ **************************************************************************/
+ 
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
+ #include "net.h"
+ 
+ #define MAXWATCH 10
+@@ -144,8 +147,13 @@
+ int net_udpRecv(unsigned char *mesg, int length)
+ {
+     structlength = sizeof(client);
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++    recvd = recvfrom(net_information.sock, mesg, length, 0,
++                     (struct sockaddr *) &client, (socklen_t *) &structlength);
++#else
+     recvd = recvfrom(net_information.sock, mesg, length, 0,
+                      (struct sockaddr *) &client, &structlength);
++#endif
+     if (recvd < 0)
+     {
+         perror("libXicq: recvfrom");
diff --git a/net/xicq/files/patch-ag b/net/xicq/files/patch-ag
new file mode 100644
index 000000000000..662d773579a1
--- /dev/null
+++ b/net/xicq/files/patch-ag
@@ -0,0 +1,17 @@
+--- src/libXicq/structs.h.orig	Sun Feb 27 12:34:45 2000
++++ src/libXicq/structs.h	Sun Feb 27 12:37:10 2000
+@@ -16,10 +16,10 @@
+ */
+ struct LIB_INFORMATION
+ {
+-    const char NAME[]		= "libXicq";
+-    const char VERSION[]	= "071298-snapshot";
+-    const char AUTHOR[]		= "tnc";
+-    const char CONTACT[]	= "xtrophy@it.dk";
++    static const char NAME[]	= "libXicq";
++    static const char VERSION[]	= "071298-snapshot";
++    static const char AUTHOR[]	= "tnc";
++    static const char CONTACT[]	= "xtrophy@it.dk";
+ };
+ 
+ 
diff --git a/net/xicq/files/patch-ah b/net/xicq/files/patch-ah
new file mode 100644
index 000000000000..3ac804237512
--- /dev/null
+++ b/net/xicq/files/patch-ah
@@ -0,0 +1,26 @@
+--- src/libXicq/net.cc.orig	Sun Feb 27 12:37:37 2000
++++ src/libXicq/net.cc	Sun Feb 27 12:38:59 2000
+@@ -6,6 +6,9 @@
+ **************************************************************************/
+ 
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
+ #include "net.h"
+ 
+ #define MAXWATCH 10
+@@ -144,8 +147,13 @@
+ int net_udpRecv(unsigned char *mesg, int length)
+ {
+     structlength = sizeof(client);
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++    recvd = recvfrom(net_information.sock, mesg, length, 0,
++                     (struct sockaddr *) &client, (socklen_t *) &structlength);
++#else
+     recvd = recvfrom(net_information.sock, mesg, length, 0,
+                      (struct sockaddr *) &client, &structlength);
++#endif
+     if (recvd < 0)
+     {
+         perror("libXicq: recvfrom");