pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/netmaze/patches Make netmaze build on linux syst...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1ea4f1ec7d35
branches: trunk
changeset: 493246:1ea4f1ec7d35
user: jdc <jdc%pkgsrc.org@localhost>
date: Sun May 01 10:34:49 2005 +0000
description:
Make netmaze build on linux systems.
Fixes PR pkg/29426 from A L Meyers.
diffstat:
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(-)
diffs (202 lines):
diff -r 32acbbaef34a -r 1ea4f1ec7d35 games/netmaze/patches/patch-ab
--- a/games/netmaze/patches/patch-ab Sun May 01 04:35:39 2005 +0000
+++ b/games/netmaze/patches/patch-ab Sun May 01 10:34:49 2005 +0000
@@ -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 @@
/* #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 @@
/* #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 @@
# 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 -r 32acbbaef34a -r 1ea4f1ec7d35 games/netmaze/patches/patch-ac
--- a/games/netmaze/patches/patch-ac Sun May 01 04:35:39 2005 +0000
+++ b/games/netmaze/patches/patch-ac Sun May 01 10:34:49 2005 +0000
@@ -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 <sys/select.h>
+ #endif
+
+@@ -16,8 +16,13 @@
+ #include <sys/ioctl.h>
+
+ #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 @@
#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 -r 32acbbaef34a -r 1ea4f1ec7d35 games/netmaze/patches/patch-ae
--- a/games/netmaze/patches/patch-ae Sun May 01 04:35:39 2005 +0000
+++ b/games/netmaze/patches/patch-ae Sun May 01 10:34:49 2005 +0000
@@ -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 @@
#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 @@
#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 -r 32acbbaef34a -r 1ea4f1ec7d35 games/netmaze/patches/patch-af
--- a/games/netmaze/patches/patch-af Sun May 01 04:35:39 2005 +0000
+++ b/games/netmaze/patches/patch-af Sun May 01 10:34:49 2005 +0000
@@ -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 @@
#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
Home |
Main Index |
Thread Index |
Old Index