CVS commit: pkgsrc/games/ioquake3

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat Jan 25 16:07:15 UTC 2020

Modified Files:
        pkgsrc/games/ioquake3: Makefile distinfo
        pkgsrc/games/ioquake3/patches: patch-aa
Added Files:
        pkgsrc/games/ioquake3/patches: patch-code_tools_lcc_cpp_unix.c

Log Message:
Add aarch64 support.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/ioquake3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/ioquake3/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/ioquake3/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c

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

Modified files:

Index: pkgsrc/games/ioquake3/Makefile
diff -u pkgsrc/games/ioquake3/Makefile:1.7 pkgsrc/games/ioquake3/Makefile:1.8
--- pkgsrc/games/ioquake3/Makefile:1.7  Fri Apr 12 18:39:34 2019
+++ pkgsrc/games/ioquake3/Makefile      Sat Jan 25 16:07:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/12 18:39:34 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/25 16:07:15 jmcneill Exp $
 #
 
 DISTNAME=      ioquake3-1.36
@@ -21,7 +21,7 @@ do-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
+.if ${OPSYS} == "NetBSD" && ${MACHINE:U} == "evbarm"
 QUAKE_ARCH!=   uname -m
 .else
 QUAKE_ARCH=    ${MACHINE_ARCH}

Index: pkgsrc/games/ioquake3/distinfo
diff -u pkgsrc/games/ioquake3/distinfo:1.6 pkgsrc/games/ioquake3/distinfo:1.7
--- pkgsrc/games/ioquake3/distinfo:1.6  Tue Nov  3 20:56:53 2015
+++ pkgsrc/games/ioquake3/distinfo      Sat Jan 25 16:07:15 2020
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 20:56:53 agc Exp $
+$NetBSD: distinfo,v 1.7 2020/01/25 16:07:15 jmcneill Exp $
 
 SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4
 RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293
 SHA512 (ioquake3-1.36.tar.bz2) = fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645
 Size (ioquake3-1.36.tar.bz2) = 3503058 bytes
-SHA1 (patch-aa) = 6faee94e1a194b904d1ad72968f0b652ab7d8ec2
+SHA1 (patch-aa) = c259a5261704d3b71824de60667cdc4287fe7ae7
 SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
 SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978
 SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800
+SHA1 (patch-code_tools_lcc_cpp_unix.c) = 7d9e4bf34dd0c6df0c0267449d3365604d972fdd

Index: pkgsrc/games/ioquake3/patches/patch-aa
diff -u pkgsrc/games/ioquake3/patches/patch-aa:1.3 pkgsrc/games/ioquake3/patches/patch-aa:1.4
--- pkgsrc/games/ioquake3/patches/patch-aa:1.3  Sat Apr 18 20:44:08 2015
+++ pkgsrc/games/ioquake3/patches/patch-aa      Sat Jan 25 16:07:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2015/04/18 20:44:08 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2020/01/25 16:07:15 jmcneill Exp $
 
 --- code/qcommon/q_platform.h.orig     2009-03-02 17:29:30.000000000 +0000
 +++ code/qcommon/q_platform.h
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.3 2015/04/18 20:44
  #endif
  
  #define ID_INLINE inline
-@@ -201,6 +205,10 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -201,6 +205,12 @@ Foundation, Inc., 51 Franklin St, Fifth 
  #define ARCH_STRING "i386"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
@@ -37,6 +37,8 @@ $NetBSD: patch-aa,v 1.3 2015/04/18 20:44
 +#define ARCH_STRING "x86_64"
 +#elif defined __arm__
 +#define ARCH_STRING "arm"
++#elif defined __aarch64__
++#define ARCH_STRING "aarch64"
  #endif
  
  #if BYTE_ORDER == BIG_ENDIAN

Added files:

Index: pkgsrc/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c
diff -u /dev/null pkgsrc/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c:1.1
--- /dev/null   Sat Jan 25 16:07:15 2020
+++ pkgsrc/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c       Sat Jan 25 16:07:15 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-code_tools_lcc_cpp_unix.c,v 1.1 2020/01/25 16:07:15 jmcneill Exp $
+
+Use built-in memmove on NetBSD.
+
+--- code/tools/lcc/cpp/unix.c.orig     2008-04-23 17:39:39.000000000 +0000
++++ code/tools/lcc/cpp/unix.c
+@@ -99,7 +99,7 @@ char *basepath( char *fname )
+ /* memmove is defined here because some vendors don't provide it at
+    all and others do a terrible job (like calling malloc) */
+ // -- ouch, that hurts -- ln
+-#ifndef MACOS_X   /* always use the system memmove() on Mac OS X. --ryan. */
++#if !defined(MACOS_X) && !defined(__NetBSD__)   /* always use the system memmove() */
+ #ifdef memmove
+ #undef memmove
+ #endif