pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/etlegacy etlegacy: Do not hardcode an x86_64 ARC...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/495a4306b098
branches:  trunk
changeset: 335673:495a4306b098
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jun 27 16:05:11 2019 +0000

description:
etlegacy: Do not hardcode an x86_64 ARCH_STRING.

diffstat:

 games/etlegacy/Makefile      |  32 ++++++++++++++++++++++++++++++--
 games/etlegacy/PLIST.Darwin  |   4 ++--
 games/etlegacy/PLIST.FreeBSD |   4 ++--
 games/etlegacy/PLIST.Linux   |   4 ++--
 games/etlegacy/PLIST.NetBSD  |   4 ++--
 games/etlegacy/PLIST.OpenBSD |   4 ++--
 6 files changed, 40 insertions(+), 12 deletions(-)

diffs (88 lines):

diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/Makefile
--- a/games/etlegacy/Makefile   Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/Makefile   Thu Jun 27 16:05:11 2019 +0000
@@ -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 @@
 
 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
diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/PLIST.Darwin
--- a/games/etlegacy/PLIST.Darwin       Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/PLIST.Darwin       Thu Jun 27 16:05:11 2019 +0000
@@ -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
diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/PLIST.FreeBSD
--- a/games/etlegacy/PLIST.FreeBSD      Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/PLIST.FreeBSD      Thu Jun 27 16:05:11 2019 +0000
@@ -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
diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/PLIST.Linux
--- a/games/etlegacy/PLIST.Linux        Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/PLIST.Linux        Thu Jun 27 16:05:11 2019 +0000
@@ -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
diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/PLIST.NetBSD
--- a/games/etlegacy/PLIST.NetBSD       Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/PLIST.NetBSD       Thu Jun 27 16:05:11 2019 +0000
@@ -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
diff -r 85c3fcde1ee6 -r 495a4306b098 games/etlegacy/PLIST.OpenBSD
--- a/games/etlegacy/PLIST.OpenBSD      Thu Jun 27 14:19:51 2019 +0000
+++ b/games/etlegacy/PLIST.OpenBSD      Thu Jun 27 16:05:11 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index