CVS commit: pkgsrc/games/etlegacy

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 27 16:05:11 UTC 2019

Modified Files:
        pkgsrc/games/etlegacy: Makefile PLIST.Darwin PLIST.FreeBSD PLIST.Linux
            PLIST.NetBSD PLIST.OpenBSD

Log Message:
etlegacy: Do not hardcode an x86_64 ARCH_STRING.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.Darwin \
    pkgsrc/games/etlegacy/PLIST.FreeBSD pkgsrc/games/etlegacy/PLIST.Linux \
    pkgsrc/games/etlegacy/PLIST.NetBSD pkgsrc/games/etlegacy/PLIST.OpenBSD

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

Modified files:

Index: pkgsrc/games/etlegacy/Makefile
diff -u pkgsrc/games/etlegacy/Makefile:1.5 pkgsrc/games/etlegacy/Makefile:1.6
--- pkgsrc/games/etlegacy/Makefile:1.5  Sun Jun 23 13:28:04 2019
+++ pkgsrc/games/etlegacy/Makefile      Thu Jun 27 16:05:11 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/06/23 13:28:04 nia Exp $
+# $NetBSD: Makefile,v 1.6 2019/06/27 16:05:11 nia Exp $
 
 PKGNAME=       etlegacy-2.76
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games
 
 DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
@@ -63,6 +63,34 @@ CFLAGS+=     -DIOAPI_NO_64
 
 CHECK_PORTABILITY_SKIP+=       libs/sdl2/build-scripts/*
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST_SUBST+=  ARCH_STRING="x86_64"
+.elif ${MACHINE_ARCH} == "i386"
+PLIST_SUBST+=  ARCH_STRING="i386"
+.elif ${MACHINE_ARCH} == "alpha"
+PLIST_SUBST+=  ARCH_STRING="alpha"
+.elif ${MACHINE_ARCH} == "hppa"
+PLIST_SUBST+=  ARCH_STRING="hppa"
+.elif !empty(MACHINE_ARCH:Mpowerpc64*)
+PLIST_SUBST+=  ARCH_STRING="ppc64"
+.elif !empty(MACHINE_ARCH:Mpowerpc*)
+PLIST_SUBST+=  ARCH_STRING="ppc"
+.elif !empty(MACHINE_ARCH:Msh3*)
+PLIST_SUBST+=  ARCH_STRING="sh"
+.elif !empty(MACHINE_ARCH:Mmips*)
+PLIST_SUBST+=  ARCH_STRING="mips"
+.elif !empty(MACHINE_ARCH:Msparc*)
+PLIST_SUBST+=  ARCH_STRING="sparc"
+.elif !empty(MACHINE_ARCH:M*arm*)
+PLIST_SUBST+=  ARCH_STRING="arm"
+.else
+# maybe architecture-neutral shared objects could be generated
+PKG_SKIP_REASON+=\
+       "unsupported MACHINE_ARCH, maybe needs to be added to q_platform.h"
+.endif
+
 post-extract:
        ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \
            ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs

Index: pkgsrc/games/etlegacy/PLIST.Darwin
diff -u pkgsrc/games/etlegacy/PLIST.Darwin:1.1 pkgsrc/games/etlegacy/PLIST.Darwin:1.2
--- pkgsrc/games/etlegacy/PLIST.Darwin:1.1      Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST.Darwin  Thu Jun 27 16:05:11 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2019/06/23 11:20:23 maya Exp $
-share/etlegacy/legacy/qagame_mac.x86_64.so
+@comment $NetBSD: PLIST.Darwin,v 1.2 2019/06/27 16:05:11 nia Exp $
+share/etlegacy/legacy/qagame_mac.${ARCH_STRING}.so
Index: pkgsrc/games/etlegacy/PLIST.FreeBSD
diff -u pkgsrc/games/etlegacy/PLIST.FreeBSD:1.1 pkgsrc/games/etlegacy/PLIST.FreeBSD:1.2
--- pkgsrc/games/etlegacy/PLIST.FreeBSD:1.1     Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST.FreeBSD Thu Jun 27 16:05:11 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
-share/etlegacy/legacy/qagame.mp.fbsd.x86_64.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
+share/etlegacy/legacy/qagame.mp.fbsd.${ARCH_STRING}.so
Index: pkgsrc/games/etlegacy/PLIST.Linux
diff -u pkgsrc/games/etlegacy/PLIST.Linux:1.1 pkgsrc/games/etlegacy/PLIST.Linux:1.2
--- pkgsrc/games/etlegacy/PLIST.Linux:1.1       Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST.Linux   Thu Jun 27 16:05:11 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2019/06/23 11:20:23 maya Exp $
-share/etlegacy/legacy/qagame.mp.x86_64.so
+@comment $NetBSD: PLIST.Linux,v 1.2 2019/06/27 16:05:11 nia Exp $
+share/etlegacy/legacy/qagame.mp.${ARCH_STRING}.so
Index: pkgsrc/games/etlegacy/PLIST.NetBSD
diff -u pkgsrc/games/etlegacy/PLIST.NetBSD:1.1 pkgsrc/games/etlegacy/PLIST.NetBSD:1.2
--- pkgsrc/games/etlegacy/PLIST.NetBSD:1.1      Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST.NetBSD  Thu Jun 27 16:05:11 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
-share/etlegacy/legacy/qagame.mp.nbsd.x86_64.so
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
+share/etlegacy/legacy/qagame.mp.nbsd.${ARCH_STRING}.so
Index: pkgsrc/games/etlegacy/PLIST.OpenBSD
diff -u pkgsrc/games/etlegacy/PLIST.OpenBSD:1.1 pkgsrc/games/etlegacy/PLIST.OpenBSD:1.2
--- pkgsrc/games/etlegacy/PLIST.OpenBSD:1.1     Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST.OpenBSD Thu Jun 27 16:05:11 2019
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
-share/etlegacy/legacy/qagame.mp.obsd.x86_64.so
+@comment $NetBSD: PLIST.OpenBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
+share/etlegacy/legacy/qagame.mp.obsd.${ARCH_STRING}.so