Pointers are not ordered relative to 0. Check the error of fopen

correctly. Share patches when sharing distinfo. Bump revision.

6 files changed, 39 insertions, 4 deletions

diff --git a/games/armagetronad-server/Makefile b/games/armagetronad-server/Makefile
index 18430759c9e..704f1629ef4 100644
--- a/games/armagetronad-server/Makefile
+++ b/games/armagetronad-server/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/07/24 15:44:49 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/15 23:52:43 joerg Exp $
 #
 
 .include "../../games/armagetronad/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//:S/armagetronad/armagetronad-server/}
+PKGREVISION=	1
 COMMENT=	Server for the armagetronad game
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile
index f8f1eae4b20..3e72c0d9825 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/07/24 15:43:50 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/15 23:52:43 joerg Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//}
+PKGREVISION=	1
 COMMENT=	Tron clone in 3D with advanced gameplay and multiplayer
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/games/armagetronad/Makefile.common b/games/armagetronad/Makefile.common
index 1bc420d45ed..a2e264f1958 100644
--- a/games/armagetronad/Makefile.common
+++ b/games/armagetronad/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2016/07/24 15:43:50 kamil Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/12/15 23:52:43 joerg Exp $
 #
 # used by games/armagetronad/Makefile
 # used by games/armagetronad-server/Makefile
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v2
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
 
 DISTINFO_FILE=	${.CURDIR}/../../games/armagetronad/distinfo
+PATCHDIR=	${.CURDIR}/../../games/armagetronad/patches
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
diff --git a/games/armagetronad/distinfo b/games/armagetronad/distinfo
index 41e1bf304e7..56852b32f71 100644
--- a/games/armagetronad/distinfo
+++ b/games/armagetronad/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/07/24 15:43:50 kamil Exp $
+$NetBSD: distinfo,v 1.2 2016/12/15 23:52:43 joerg Exp $
 
 SHA1 (armagetronad-0.2.8.3.3.src.tar.gz) = f27657dfcddce681915d48f55d7dde1959167d4a
 RMD160 (armagetronad-0.2.8.3.3.src.tar.gz) = 251c2253ff956207544b9dba6fd233630ed85efd
 SHA512 (armagetronad-0.2.8.3.3.src.tar.gz) = b83d109107887b41b8f26c3709c50e730bc4bdc30eac247002cfab661bece9b6af9e1e9808a2295df6ad38c99bb519d12e0ea7bbaef0ce0615e2d814ca69b04e
 Size (armagetronad-0.2.8.3.3.src.tar.gz) = 2230775 bytes
+SHA1 (patch-src_network_nNetObject.cpp) = ba694328894bccf9b82454276ccac146f89b55be
+SHA1 (patch-src_tools_tResourceManager.cpp) = 2963dc40af13cff052cd86d04b9a2a110f20156b
diff --git a/games/armagetronad/patches/patch-src_network_nNetObject.cpp b/games/armagetronad/patches/patch-src_network_nNetObject.cpp
new file mode 100644
index 00000000000..76bb53cb43c
--- /dev/null
+++ b/games/armagetronad/patches/patch-src_network_nNetObject.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_network_nNetObject.cpp,v 1.1 2016/12/15 23:52:43 joerg Exp $
+
+Pointers don't order with 0, check for non-NULL instead.
+
+--- src/network/nNetObject.cpp.orig	2016-12-15 17:38:01.972071566 +0000
++++ src/network/nNetObject.cpp
+@@ -1530,7 +1530,7 @@ void nNetObject::SyncAll(){
+             // con << sn_SyncRequestedObject.Len() << "/" << sn_netObjects.Len() << "\n";
+ 
+             int currentSync = sn_SyncRequestedObject.Len()-1;
+-            while(sn_Connections[user].socket>0 &&
++            while(sn_Connections[user].socket &&
+                     sn_Connections[user].bandwidthControl_.CanSend() &&
+                     sn_Connections[user].ackPending<sn_maxNoAck &&
+                     currentSync >= 0){
diff --git a/games/armagetronad/patches/patch-src_tools_tResourceManager.cpp b/games/armagetronad/patches/patch-src_tools_tResourceManager.cpp
new file mode 100644
index 00000000000..a296b6a64a8
--- /dev/null
+++ b/games/armagetronad/patches/patch-src_tools_tResourceManager.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tools_tResourceManager.cpp,v 1.1 2016/12/15 23:52:43 joerg Exp $
+
+fopen returns a NULL pointer on failure.
+
+--- src/tools/tResourceManager.cpp.orig	2016-12-15 17:37:32.864347941 +0000
++++ src/tools/tResourceManager.cpp
+@@ -44,7 +44,7 @@ static int myHTTPFetch(const char *URI, 
+     }
+ 
+     fd = fopen(savepath, "w");
+-    if (fd < 0) {
++    if (fd == NULL) {
+         xmlNanoHTTPClose(ctxt);
+         con << tOutput( "$resource_no_write", savepath );
+         return 3;