CVS commit: pkgsrc/games/armagetronad

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 25 11:50:40 UTC 2025

Modified Files:
        pkgsrc/games/armagetronad: Makefile distinfo
Added Files:
        pkgsrc/games/armagetronad/patches: patch-src_tron_gParser.cpp

Log Message:
armagetronad: fix build with libxml2 2.14


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/armagetronad/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/armagetronad/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/armagetronad/patches/patch-src_tron_gParser.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/armagetronad/Makefile
diff -u pkgsrc/games/armagetronad/Makefile:1.20 pkgsrc/games/armagetronad/Makefile:1.21
--- pkgsrc/games/armagetronad/Makefile:1.20     Thu Apr 24 14:13:53 2025
+++ pkgsrc/games/armagetronad/Makefile  Fri Apr 25 11:50:40 2025
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2025/04/24 14:13:53 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2025/04/25 11:50:40 wiz Exp $
 
 PKGREVISION= 14
 .include "Makefile.common"
 
-PKGNAME=       ${DISTNAME:S/.src//}
 COMMENT=       Tron clone in 3D with advanced gameplay and multiplayer
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/armagetronad/distinfo
diff -u pkgsrc/games/armagetronad/distinfo:1.7 pkgsrc/games/armagetronad/distinfo:1.8
--- pkgsrc/games/armagetronad/distinfo:1.7      Tue Oct 26 10:43:46 2021
+++ pkgsrc/games/armagetronad/distinfo  Fri Apr 25 11:50:40 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:43:46 nia Exp $
+$NetBSD: distinfo,v 1.8 2025/04/25 11:50:40 wiz Exp $
 
 BLAKE2s (armagetronad-0.2.9.0.1.tbz) = 286bd2df948f7082e0fe486dfa4ecc558487bedeb7e66ec91c0ad07df887356c
 SHA512 (armagetronad-0.2.9.0.1.tbz) = d0bf8a973aafc6dd41f2dd41e29d34cebae1829d9e050948045c68a2a408595dda7cc94eb3169ed5c470770a01eb93744760a2b83146ab7813dc513bb5b26279
 Size (armagetronad-0.2.9.0.1.tbz) = 1907392 bytes
+SHA1 (patch-src_tron_gParser.cpp) = 6cc79c80a56cb5fdc3ca18d3f0358a6417c75ce3

Added files:

Index: pkgsrc/games/armagetronad/patches/patch-src_tron_gParser.cpp
diff -u /dev/null pkgsrc/games/armagetronad/patches/patch-src_tron_gParser.cpp:1.1
--- /dev/null   Fri Apr 25 11:50:40 2025
+++ pkgsrc/games/armagetronad/patches/patch-src_tron_gParser.cpp        Fri Apr 25 11:50:40 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_tron_gParser.cpp,v 1.1 2025/04/25 11:50:40 wiz Exp $
+
+Fix build with libxml2 2.14.
+
+--- src/tron/gParser.cpp.orig  2025-04-25 11:46:40.610636641 +0000
++++ src/tron/gParser.cpp
+@@ -1120,8 +1120,10 @@ gParser::LoadAndValidateMapXML(char cons
+ 
+ #ifndef DEDICATED
+     /* reset error handler */
++#if 0
+     initGenericErrorDefaultFunc( NULL );
+ #endif
++#endif
+ 
+     return validated;
+ }