games/armegatron*: Update to 0.2.8.3.4

"This release is a compiler compatibility release only; we noticed
0.2.8.3.3 had severe problems with gcc 6, all our fault."

6 files changed, 9 insertions, 43 deletions

diff --git a/games/armagetronad-server/Makefile b/games/armagetronad-server/Makefile
index 704f1629ef4..345ded4327f 100644
--- a/games/armagetronad-server/Makefile
+++ b/games/armagetronad-server/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2016/12/15 23:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/02 12:58:54 nia 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 3e72c0d9825..c0c55956d34 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2016/12/15 23:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/02 12:58:54 nia 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 2fb001830a8..3f5aa14c618 100644
--- a/games/armagetronad/Makefile.common
+++ b/games/armagetronad/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2018/01/14 17:33:57 rillig Exp $
+# $NetBSD: Makefile.common,v 1.4 2019/07/02 12:58:54 nia Exp $
 #
 # used by games/armagetronad/Makefile
 # used by games/armagetronad-server/Makefile
 
-DISTNAME=	armagetronad-0.2.8.3.3.src
+DISTNAME=	armagetronad-0.2.8.3.4.src
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=armagetronad/}
 
diff --git a/games/armagetronad/distinfo b/games/armagetronad/distinfo
index 56852b32f71..8eca8c567c2 100644
--- a/games/armagetronad/distinfo
+++ b/games/armagetronad/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/12/15 23:52:43 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/07/02 12:58:54 nia 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
+SHA1 (armagetronad-0.2.8.3.4.src.tar.gz) = 1795c1dd649b22ac2ac9373b2eb01ddd9ab9c1b1
+RMD160 (armagetronad-0.2.8.3.4.src.tar.gz) = 5be0f37831545d8269f00c2d09881ee50555296b
+SHA512 (armagetronad-0.2.8.3.4.src.tar.gz) = b6564a67e37dae095f56fb0b98c5d80e09ea220e7416b549978e3ab4b018eb01026e4a5d339d46aaaf4edc7b5e1d707cf6a172f79ef367414a1c7636f14da234
+Size (armagetronad-0.2.8.3.4.src.tar.gz) = 2217387 bytes
diff --git a/games/armagetronad/patches/patch-src_network_nNetObject.cpp b/games/armagetronad/patches/patch-src_network_nNetObject.cpp
deleted file mode 100644
index 76bb53cb43c..00000000000
--- a/games/armagetronad/patches/patch-src_network_nNetObject.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index a296b6a64a8..00000000000
--- a/games/armagetronad/patches/patch-src_tools_tResourceManager.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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;