From 84a948c6a85a749825d4e064fafe47c201fd13e5 Mon Sep 17 00:00:00 2001 From: jdc Date: Sun, 1 May 2005 10:34:49 +0000 Subject: Make netmaze build on linux systems. Fixes PR pkg/29426 from A L Meyers. --- games/netmaze/patches/patch-ab | 12 +++++++---- games/netmaze/patches/patch-ac | 46 +++++++++++++++++++++++++++++++++++++----- games/netmaze/patches/patch-ae | 37 ++++++++++++++++++++++++++------- games/netmaze/patches/patch-af | 33 +++++++++++++++++++++++++----- 4 files changed, 107 insertions(+), 21 deletions(-) (limited to 'games') diff --git a/games/netmaze/patches/patch-ab b/games/netmaze/patches/patch-ab index 2d75bcb7563..b802e40fa15 100644 --- a/games/netmaze/patches/patch-ab +++ b/games/netmaze/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/08/29 10:09:43 jdc Exp $ +$NetBSD: patch-ab,v 1.2 2005/05/01 10:34:49 jdc Exp $ --- config.h.dist Fri Apr 15 21:51:44 1994 +++ config.h Tue Feb 29 14:28:44 2000 -@@ -4,12 +4,16 @@ +@@ -4,12 +4,20 @@ */ /* #define HPUX 1 */ @@ -13,6 +13,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/29 10:09:43 jdc Exp $ /* #define RS6000 1 */ /* look at CREDITS */ /* #define NeXT 1 */ /* look at CREDITS */ ++#if defined (linux) ++#define Linux 1 ++#endif ++ +#if (sun && SVR4) +#define Solaris2 1 +#endif @@ -20,7 +24,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/29 10:09:43 jdc Exp $ /* #define USE_SOUND 1 */ /* set the paths, according to your environment: */ -@@ -20,7 +24,7 @@ +@@ -20,7 +28,7 @@ * Setup machinedepend configuration */ @@ -29,7 +33,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/29 10:09:43 jdc Exp $ # define ITIMERVAL #else # undef ITIMERVAL /* not on all machines available */ -@@ -39,7 +43,7 @@ +@@ -39,7 +47,7 @@ # define HAVE_FDSET # define USE_IPC #else diff --git a/games/netmaze/patches/patch-ac b/games/netmaze/patches/patch-ac index 9d1904c2ff8..e88f9aa6b50 100644 --- a/games/netmaze/patches/patch-ac +++ b/games/netmaze/patches/patch-ac @@ -1,8 +1,30 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ - ---- iocntl.c.dist Mon Mar 21 21:42:49 1994 -+++ iocntl.c Fri Jan 7 11:28:43 2000 -@@ -63,7 +63,7 @@ +$NetBSD: patch-ac,v 1.2 2005/05/01 10:34:49 jdc Exp $ +--- iocntl.c.dist 1994-03-21 21:42:49.000000000 +0000 ++++ iocntl.c 2005-04-05 15:15:23.000000000 +0100 +@@ -4,7 +4,7 @@ + + #include "netmaze.h" + +-#ifdef RS6000 ++#if (RS6000 || Linux) + #include + #endif + +@@ -16,8 +16,13 @@ + #include + + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask; ++ fd_set writemask; ++# else + struct fd_set readmask; + struct fd_set writemask; ++# endif + #else + struct fd_mask readmask; + struct fd_mask writemask; +@@ -63,7 +68,7 @@ #ifdef RS6000 /* ibm rs/6000 */ sigemptyset(&vec.sa_mask); #else @@ -11,3 +33,17 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ #endif vec.sa_flags = 0; if ( sigaction(SIGIO, &vec, (struct sigaction *) 0) == -1) +@@ -144,8 +149,13 @@ + static char buf[256]; + + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask1; ++ fd_set writemask1; ++# else + struct fd_set readmask1; + struct fd_set writemask1; ++# endif + #else + struct fd_mask readmask1; + struct fd_mask writemask1; diff --git a/games/netmaze/patches/patch-ae b/games/netmaze/patches/patch-ae index 7798f3f55e1..b288514d955 100644 --- a/games/netmaze/patches/patch-ae +++ b/games/netmaze/patches/patch-ae @@ -1,8 +1,19 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ - ---- netserv.c.dist Sun Apr 10 11:07:23 1994 -+++ netserv.c Fri Mar 3 15:07:05 2000 -@@ -629,7 +629,7 @@ +$NetBSD: patch-ae,v 1.2 2005/05/01 10:34:49 jdc Exp $ +--- netserv.c.dist 1994-04-10 11:07:23.000000000 +0100 ++++ netserv.c 2005-04-05 15:25:17.000000000 +0100 +@@ -106,7 +106,11 @@ + + + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask; ++# else + struct fd_set readmask; ++# endif + #else + struct fd_mask readmask; + #endif +@@ -629,7 +633,7 @@ #ifdef RS6000 /* ibm rs/6000 */ sigemptyset(&vec1.sa_mask); #else @@ -11,7 +22,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ #endif vec1.sa_flags = 0; if ( sigaction(SIGALRM, &vec1, (struct sigaction *) 0) == -1) perror("SIGALRM\n"); -@@ -652,7 +652,7 @@ +@@ -652,7 +656,7 @@ #ifdef RS6000 /* ibm rs/6000 */ sigemptyset(&svec1.sa_mask); #else @@ -20,7 +31,19 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ #endif svec1.sa_flags = 0; if(sigaction(SIGCHLD,&svec1,(struct sigaction *)0) == -1) perror("SIGCHLD\n"); -@@ -914,7 +914,7 @@ +@@ -779,7 +783,11 @@ + void io_cntl(void) + { + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask1; ++# else + struct fd_set readmask1; ++# endif + #else + struct fd_mask readmask1; + #endif +@@ -914,7 +922,7 @@ char *saddr = (char *) &(((struct sockaddr_in *) &(q->remoteaddr))->sin_addr.s_addr); hp = gethostbyaddr(saddr,4,AF_INET); diff --git a/games/netmaze/patches/patch-af b/games/netmaze/patches/patch-af index 751fb95c964..d12ffda288f 100644 --- a/games/netmaze/patches/patch-af +++ b/games/netmaze/patches/patch-af @@ -1,8 +1,19 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ - ---- robot.c.dist Tue Mar 22 11:06:17 1994 -+++ robot.c Fri Jan 7 11:38:30 2000 -@@ -97,7 +97,7 @@ +$NetBSD: patch-af,v 1.2 2005/05/01 10:34:49 jdc Exp $ +--- robot.c.dist 1994-03-22 11:06:17.000000000 +0000 ++++ robot.c 2005-04-05 15:25:37.000000000 +0100 +@@ -49,7 +49,11 @@ + extern void ident_player(void); + + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask; ++# else + struct fd_set readmask; ++# endif + #else + struct fd_mask readmask; + #endif +@@ -97,7 +101,7 @@ #ifdef RS6000 /* ibm rs/6000 */ sigemptyset(&vec.sa_mask); #else @@ -11,3 +22,15 @@ $NetBSD: patch-af,v 1.1.1.1 2000/08/29 10:09:44 jdc Exp $ #endif vec.sa_flags = 0; if ( sigaction(SIGIO, &vec, (struct sigaction *) 0) == -1) +@@ -139,7 +143,11 @@ + int numfds; + + #ifdef HAVE_FDSET ++# ifdef Linux ++ fd_set readmask1; ++# else + struct fd_set readmask1; ++# endif + #else + struct fd_mask readmask1; + #endif -- cgit v1.2.3