CVS commit: pkgsrc/games

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  7 21:48:54 UTC 2024

Modified Files:
        pkgsrc/games/ioquake3: Makefile
        pkgsrc/games/openarena: Makefile
Added Files:
        pkgsrc/games/ioquake3: arch.mk

Log Message:
normalize ioquake3 arch checks, missed in previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/ioquake3/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/ioquake3/arch.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/openarena/Makefile

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.31 pkgsrc/games/ioquake3/Makefile:1.32
--- pkgsrc/games/ioquake3/Makefile:1.31 Sat Apr  6 08:05:27 2024
+++ pkgsrc/games/ioquake3/Makefile      Tue May  7 21:48:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/04/06 08:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/05/07 21:48:54 nia Exp $
 #
 
 DISTNAME=      ioquake3-1.36.20200125
@@ -25,25 +25,7 @@ MAKE_FLAGS+= USE_INTERNAL_OPUS=0
 MAKE_FLAGS+=   USE_INTERNAL_VORBIS=0
 MAKE_FLAGS+=   USE_INTERNAL_ZLIB=0
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_ARCH:M*arm*)
-QUAKE_ARCH=    arm
-.elif !empty(MACHINE_ARCH:M*mips*)
-QUAKE_ARCH=    mips
-.elif !empty(MACHINE_ARCH:M*sh3*)
-QUAKE_ARCH=    sh
-.elif ${MACHINE_ARCH} == "i386"
-QUAKE_ARCH=    x86
-.elif ${MACHINE_ARCH} == "powerpc"
-QUAKE_ARCH=    ppc
-.elif ${MACHINE_ARCH} == "powerpc64"
-QUAKE_ARCH=    ppc64
-.elif ${MACHINE_ARCH} == "sparc64"
-QUAKE_ARCH=    sparc
-.else
-QUAKE_ARCH=    ${MACHINE_ARCH}
-.endif
+.include "arch.mk"
 
 MAKE_FLAGS+=   COMPILE_ARCH=${QUAKE_ARCH:Q}
 

Index: pkgsrc/games/openarena/Makefile
diff -u pkgsrc/games/openarena/Makefile:1.2 pkgsrc/games/openarena/Makefile:1.3
--- pkgsrc/games/openarena/Makefile:1.2 Sat Apr  3 18:55:35 2021
+++ pkgsrc/games/openarena/Makefile     Tue May  7 21:48:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/04/03 18:55:35 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/05/07 21:48:54 nia Exp $
 
 #
 # There will be warnings about missing dependencies while building.
@@ -33,23 +33,7 @@ MAKE_FLAGS+= COPYDIR=${DESTDIR}${PREFIX}
 BUILD_TARGET=  release
 INSTALL_TARGET=        copyfiles
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_ARCH:M*arm*)
-QUAKE_ARCH=    arm
-.elif !empty(MACHINE_ARCH:M*mips*)
-QUAKE_ARCH=    mips
-.elif !empty(MACHINE_ARCH:M*sh3*)
-QUAKE_ARCH=    sh
-.elif ${MACHINE_ARCH} == "powerpc"
-QUAKE_ARCH=    ppc
-.elif ${MACHINE_ARCH} == "powerpc64"
-QUAKE_ARCH=    ppc64
-.elif ${MACHINE_ARCH} == "sparc64"
-QUAKE_ARCH=    sparc
-.else
-QUAKE_ARCH=    ${MACHINE_ARCH}
-.endif
+.include "../../games/ioquake3/arch.mk"
 
 .if ${MACHINE_ARCH} == "earmv6hf"
 DEPENDS+=      ioquake3-raspberrypi-[0-9]*:../../games/ioquake3-raspberrypi

Added files:

Index: pkgsrc/games/ioquake3/arch.mk
diff -u /dev/null pkgsrc/games/ioquake3/arch.mk:1.1
--- /dev/null   Tue May  7 21:48:54 2024
+++ pkgsrc/games/ioquake3/arch.mk       Tue May  7 21:48:54 2024
@@ -0,0 +1,23 @@
+# $NetBSD: arch.mk,v 1.1 2024/05/07 21:48:54 nia Exp $
+
+.if !defined(QUAKE_ARCH)
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${MACHINE_ARCH:M*arm*}
+QUAKE_ARCH=    arm
+.elif ${MACHINE_ARCH:M*mips*}
+QUAKE_ARCH=    mips
+.elif ${MACHINE_ARCH:M*sh3*}
+QUAKE_ARCH=    sh
+.elif ${MACHINE_ARCH} == "powerpc"
+QUAKE_ARCH=    ppc
+.elif ${MACHINE_ARCH} == "powerpc64"
+QUAKE_ARCH=    ppc64
+.elif ${MACHINE_ARCH} == "sparc64"
+QUAKE_ARCH=    sparc
+.else
+QUAKE_ARCH=    ${MACHINE_ARCH}
+.endif
+
+.endif