CVS commit: pkgsrc/games/tyrquake

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan  9 23:02:01 UTC 2026

Modified Files:
        pkgsrc/games/tyrquake: Makefile distinfo
        pkgsrc/games/tyrquake/patches: patch-include_common.h

Log Message:
tyrquake: Fix NetBSD bswap workaround.

While here, mark unsafe for MKPIE, since this generates text relocations
on i386.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/tyrquake/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/tyrquake/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/tyrquake/patches/patch-include_common.h

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

Modified files:

Index: pkgsrc/games/tyrquake/Makefile
diff -u pkgsrc/games/tyrquake/Makefile:1.12 pkgsrc/games/tyrquake/Makefile:1.13
--- pkgsrc/games/tyrquake/Makefile:1.12 Thu Jun  6 17:33:14 2024
+++ pkgsrc/games/tyrquake/Makefile      Fri Jan  9 23:02:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2024/06/06 17:33:14 ktnb Exp $
+# $NetBSD: Makefile,v 1.13 2026/01/09 23:02:01 nia Exp $
 
 DISTNAME=      tyrquake-0.71
 CATEGORIES=    games x11
@@ -19,6 +19,9 @@ SUBST_MESSAGE.audio=  Fixing path to the 
 SUBST_FILES.audio=     common/snd_oss.c
 SUBST_SED.audio=       -e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
+# Not on i386, and we can't check for arch first.
+MKPIE_SUPPORTED=       no
+
 INSTALLATION_DIRS=     bin
 
 do-install:

Index: pkgsrc/games/tyrquake/distinfo
diff -u pkgsrc/games/tyrquake/distinfo:1.9 pkgsrc/games/tyrquake/distinfo:1.10
--- pkgsrc/games/tyrquake/distinfo:1.9  Thu Jun  6 17:33:14 2024
+++ pkgsrc/games/tyrquake/distinfo      Fri Jan  9 23:02:01 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2024/06/06 17:33:14 ktnb Exp $
+$NetBSD: distinfo,v 1.10 2026/01/09 23:02:01 nia Exp $
 
 BLAKE2s (tyrquake-0.71.tar.gz) = a3a1030f5b17bfbe6fd3d710d71a0b5b55096f2917f440d9acb1042cf3584d13
 SHA512 (tyrquake-0.71.tar.gz) = ecceeecb43866c10c0669b4362ce2eda7a790c502764b3d644566e7637ffbde0548676c9dcea07963db0d91d83c248e3497603c0a3a2e1a12a1418a82c07179a
 Size (tyrquake-0.71.tar.gz) = 2287864 bytes
 SHA1 (patch-Makefile) = d34b44cfa4c12cdda4a67dfddccd8e2a9ed1bec2
-SHA1 (patch-include_common.h) = e5b3402ff366da2c53fbeedafac83951b4f07ca7
+SHA1 (patch-include_common.h) = 80b0c72fd9a220b8999c00bb90c95ea5a4e11cc6

Index: pkgsrc/games/tyrquake/patches/patch-include_common.h
diff -u pkgsrc/games/tyrquake/patches/patch-include_common.h:1.1 pkgsrc/games/tyrquake/patches/patch-include_common.h:1.2
--- pkgsrc/games/tyrquake/patches/patch-include_common.h:1.1    Thu Jun  6 17:33:14 2024
+++ pkgsrc/games/tyrquake/patches/patch-include_common.h        Fri Jan  9 23:02:01 2026
@@ -1,8 +1,7 @@
-$NetBSD: patch-include_common.h,v 1.1 2024/06/06 17:33:14 ktnb Exp $
+$NetBSD: patch-include_common.h,v 1.2 2026/01/09 23:02:01 nia Exp $
 
-NetBSD has bswap in stdlib which conflicts with upstream's
-definitions. Using the upstream definitions causes a conflict
-throughout the rest of the program.
+Stable NetBSD releases leak bswap which conflicts with upstream's
+definition.
 
 --- include/common.h.orig      2022-09-06 10:23:53.000000000 +0000
 +++ include/common.h
@@ -11,7 +10,7 @@ throughout the rest of the program.
  #include <stdarg.h>
  #include <stdio.h>
 +#ifdef __NetBSD__
-+#include <stdlib.h>
++#include <sys/bswap.h>
 +#endif
  
  #include "qtypes.h"