summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorAlejandro Pulver <alepulver@FreeBSD.org>2006-12-29 20:15:45 +0000
committerAlejandro Pulver <alepulver@FreeBSD.org>2006-12-29 20:15:45 +0000
commit980bb5389487be090d45fc99c64291b0fd825e3c (patch)
tree115319d97823b67cb9b00e01da1dd7fdfd3523da /games
parent- Update to 1.0. (diff)
- Update to version 6964.
Notes
Notes: svn path=/head/; revision=180992
Diffstat (limited to 'games')
-rw-r--r--games/r1q2/Makefile2
-rw-r--r--games/r1q2/distinfo6
-rw-r--r--games/r1q2/files/patch-linux__net_udp.c49
3 files changed, 53 insertions, 4 deletions
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 9a7868581fa4..b1dfe3a6ca14 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= r1q2
-PORTVERSION= 6908
+PORTVERSION= 6964
CATEGORIES= games
MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/
DISTNAME= ${PORTNAME}-b${PORTVERSION}-src
diff --git a/games/r1q2/distinfo b/games/r1q2/distinfo
index 22e169ae6838..fafb8fc7558d 100644
--- a/games/r1q2/distinfo
+++ b/games/r1q2/distinfo
@@ -1,3 +1,3 @@
-MD5 (r1q2-b6908-src.zip) = e134feab8313f69ed4ac48da726c33f2
-SHA256 (r1q2-b6908-src.zip) = 30e57c23dafaaba9b91674d84955eb0d8db5dd091b9efefe893711433fda2ab6
-SIZE (r1q2-b6908-src.zip) = 1117270
+MD5 (r1q2-b6964-src.zip) = 926af18798f4e36c1bf75f94569c1d08
+SHA256 (r1q2-b6964-src.zip) = e4c2764dc07f38295c389c0ab60f362dc024934c667c6d4db03d55204908824c
+SIZE (r1q2-b6964-src.zip) = 1120296
diff --git a/games/r1q2/files/patch-linux__net_udp.c b/games/r1q2/files/patch-linux__net_udp.c
new file mode 100644
index 000000000000..94538d4a97cf
--- /dev/null
+++ b/games/r1q2/files/patch-linux__net_udp.c
@@ -0,0 +1,49 @@
+--- linux/net_udp.c.orig Fri Dec 29 17:10:28 2006
++++ linux/net_udp.c Fri Dec 29 17:11:42 2006
+@@ -13,8 +13,12 @@
+ #include <sys/uio.h>
+ #include <errno.h>
+
++#ifdef __linux__
+ #include <linux/types.h>
+ #include <linux/errqueue.h>
++#else
++#include <sys/types.h>
++#endif
+
+ #ifdef NeXT
+ #include <libc.h>
+@@ -191,6 +195,7 @@
+
+ if (err == ECONNREFUSED)
+ {
++#ifdef __linux__
+ //linux makes this needlessly complex, couldn't just return the source of the error in from, oh no...
+ struct probehdr rcvbuf;
+ struct iovec iov;
+@@ -243,6 +248,11 @@
+ }
+
+ return 0;
++#else
++ SockadrToNetadr (&from, net_from);
++ Com_Printf ("NET_GetPacket: %s from %s\n", LOG_NET, NET_ErrorString(), NET_AdrToString (net_from));
++ return -1;
++#endif
+ }
+ Com_Printf ("NET_GetPacket: %s\n", LOG_NET, NET_ErrorString());
+ return 0;
+@@ -359,11 +369,13 @@
+ return 0;
+ }
+
++#ifdef __linux__
+ // r1: accept icmp unreachables for quick disconnects
+ if (setsockopt (newsocket, IPPROTO_IP, IP_RECVERR, (char *)&i, sizeof(i)) == -1)
+ {
+ Com_Printf ("UDP_OpenSocket: Couldn't set IP_RECVERR: %s\n", LOG_NET, NET_ErrorString());
+ }
++#endif
+
+ if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost"))
+ address.sin_addr.s_addr = INADDR_ANY;