Thu Jun 27 16:05:11 2019 UTC ()
etlegacy: Do not hardcode an x86_64 ARCH_STRING.


(nia)
diff -r1.5 -r1.6 pkgsrc/games/etlegacy/Makefile
diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.Darwin
diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.FreeBSD
diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.Linux
diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.NetBSD
diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.OpenBSD
cvs diff -r1.5 -r1.6 pkgsrc/games/etlegacy/Makefile (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/Makefile 2019/06/23 13:28:04 1.5
+++ pkgsrc/games/etlegacy/Makefile 2019/06/27 16:05:11 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2019/06/23 13:28:04 nia Exp $ 1# $NetBSD: Makefile,v 1.6 2019/06/27 16:05:11 nia Exp $
2 2
3PKGNAME= etlegacy-2.76 3PKGNAME= etlegacy-2.76
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= games 5CATEGORIES= games
6 6
7DIST_SUBDIR= etlegacy-${PKGVERSION_NOREV} 7DIST_SUBDIR= etlegacy-${PKGVERSION_NOREV}
8 8
9DISTFILES+= etlegacy.tar.gz 9DISTFILES+= etlegacy.tar.gz
10DISTFILES+= etlegacy-libs.tar.gz 10DISTFILES+= etlegacy-libs.tar.gz
11 11
12LIBS_TAG= f04f846898a92d36fd9cfe7425b1ab4d31bca794 12LIBS_TAG= f04f846898a92d36fd9cfe7425b1ab4d31bca794
13 13
14SITES.etlegacy.tar.gz= \ 14SITES.etlegacy.tar.gz= \
15 -https://github.com/etlegacy/etlegacy/archive/v${PKGVERSION_NOREV}.tar.gz 15 -https://github.com/etlegacy/etlegacy/archive/v${PKGVERSION_NOREV}.tar.gz
16 16
17SITES.etlegacy-libs.tar.gz= \ 17SITES.etlegacy-libs.tar.gz= \
@@ -53,26 +53,54 @@ CMAKE_ARGS+= -DFEATURE_AUTOUPDATE=OFF @@ -53,26 +53,54 @@ CMAKE_ARGS+= -DFEATURE_AUTOUPDATE=OFF
53CMAKE_ARGS+= -DFEATURE_OMNIBOT=OFF 53CMAKE_ARGS+= -DFEATURE_OMNIBOT=OFF
54CMAKE_ARGS+= -DINSTALL_OMNIBOT=OFF 54CMAKE_ARGS+= -DINSTALL_OMNIBOT=OFF
55 55
56CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" 56CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
57CMAKE_ARGS+= -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy" 57CMAKE_ARGS+= -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy"
58CMAKE_ARGS+= -DINSTALL_DEFAULT_BINDIR="bin" 58CMAKE_ARGS+= -DINSTALL_DEFAULT_BINDIR="bin"
59CMAKE_ARGS+= -DINSTALL_DEFAULT_MODDIR="share/etlegacy" 59CMAKE_ARGS+= -DINSTALL_DEFAULT_MODDIR="share/etlegacy"
60 60
61# don't use fopen64 etc 61# don't use fopen64 etc
62CFLAGS+= -DIOAPI_NO_64 62CFLAGS+= -DIOAPI_NO_64
63 63
64CHECK_PORTABILITY_SKIP+= libs/sdl2/build-scripts/* 64CHECK_PORTABILITY_SKIP+= libs/sdl2/build-scripts/*
65 65
 66.include "../../mk/bsd.prefs.mk"
 67
 68.if ${MACHINE_ARCH} == "x86_64"
 69PLIST_SUBST+= ARCH_STRING="x86_64"
 70.elif ${MACHINE_ARCH} == "i386"
 71PLIST_SUBST+= ARCH_STRING="i386"
 72.elif ${MACHINE_ARCH} == "alpha"
 73PLIST_SUBST+= ARCH_STRING="alpha"
 74.elif ${MACHINE_ARCH} == "hppa"
 75PLIST_SUBST+= ARCH_STRING="hppa"
 76.elif !empty(MACHINE_ARCH:Mpowerpc64*)
 77PLIST_SUBST+= ARCH_STRING="ppc64"
 78.elif !empty(MACHINE_ARCH:Mpowerpc*)
 79PLIST_SUBST+= ARCH_STRING="ppc"
 80.elif !empty(MACHINE_ARCH:Msh3*)
 81PLIST_SUBST+= ARCH_STRING="sh"
 82.elif !empty(MACHINE_ARCH:Mmips*)
 83PLIST_SUBST+= ARCH_STRING="mips"
 84.elif !empty(MACHINE_ARCH:Msparc*)
 85PLIST_SUBST+= ARCH_STRING="sparc"
 86.elif !empty(MACHINE_ARCH:M*arm*)
 87PLIST_SUBST+= ARCH_STRING="arm"
 88.else
 89# maybe architecture-neutral shared objects could be generated
 90PKG_SKIP_REASON+=\
 91 "unsupported MACHINE_ARCH, maybe needs to be added to q_platform.h"
 92.endif
 93
66post-extract: 94post-extract:
67 ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \ 95 ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \
68 ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs 96 ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs
69 97
70.include "options.mk" 98.include "options.mk"
71.include "../../audio/openal-soft/buildlink3.mk" 99.include "../../audio/openal-soft/buildlink3.mk"
72.include "../../graphics/glew/buildlink3.mk" 100.include "../../graphics/glew/buildlink3.mk"
73.include "../../graphics/glu/buildlink3.mk" 101.include "../../graphics/glu/buildlink3.mk"
74.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 102.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
75.include "../../graphics/MesaLib/buildlink3.mk" 103.include "../../graphics/MesaLib/buildlink3.mk"
76.include "../../devel/SDL2/buildlink3.mk" 104.include "../../devel/SDL2/buildlink3.mk"
77.include "../../devel/zlib/buildlink3.mk" 105.include "../../devel/zlib/buildlink3.mk"
78.include "../../x11/libX11/buildlink3.mk" 106.include "../../x11/libX11/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/PLIST.Darwin 2019/06/23 11:20:23 1.1
+++ pkgsrc/games/etlegacy/PLIST.Darwin 2019/06/27 16:05:11 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.Darwin,v 1.1 2019/06/23 11:20:23 maya Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.2 2019/06/27 16:05:11 nia Exp $
2share/etlegacy/legacy/qagame_mac.x86_64.so 2share/etlegacy/legacy/qagame_mac.${ARCH_STRING}.so
cvs diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.FreeBSD (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/PLIST.FreeBSD 2019/06/23 11:20:23 1.1
+++ pkgsrc/games/etlegacy/PLIST.FreeBSD 2019/06/27 16:05:11 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.FreeBSD,v 1.1 2019/06/23 11:20:23 maya Exp $ 1@comment $NetBSD: PLIST.FreeBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
2share/etlegacy/legacy/qagame.mp.fbsd.x86_64.so 2share/etlegacy/legacy/qagame.mp.fbsd.${ARCH_STRING}.so
cvs diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.Linux (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/PLIST.Linux 2019/06/23 11:20:23 1.1
+++ pkgsrc/games/etlegacy/PLIST.Linux 2019/06/27 16:05:11 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.Linux,v 1.1 2019/06/23 11:20:23 maya Exp $ 1@comment $NetBSD: PLIST.Linux,v 1.2 2019/06/27 16:05:11 nia Exp $
2share/etlegacy/legacy/qagame.mp.x86_64.so 2share/etlegacy/legacy/qagame.mp.${ARCH_STRING}.so
cvs diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.NetBSD (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/PLIST.NetBSD 2019/06/23 11:20:23 1.1
+++ pkgsrc/games/etlegacy/PLIST.NetBSD 2019/06/27 16:05:11 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.NetBSD,v 1.1 2019/06/23 11:20:23 maya Exp $ 1@comment $NetBSD: PLIST.NetBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
2share/etlegacy/legacy/qagame.mp.nbsd.x86_64.so 2share/etlegacy/legacy/qagame.mp.nbsd.${ARCH_STRING}.so
cvs diff -r1.1 -r1.2 pkgsrc/games/etlegacy/PLIST.OpenBSD (expand / switch to unified diff)

--- pkgsrc/games/etlegacy/PLIST.OpenBSD 2019/06/23 11:20:23 1.1
+++ pkgsrc/games/etlegacy/PLIST.OpenBSD 2019/06/27 16:05:11 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST.OpenBSD,v 1.1 2019/06/23 11:20:23 maya Exp $ 1@comment $NetBSD: PLIST.OpenBSD,v 1.2 2019/06/27 16:05:11 nia Exp $
2share/etlegacy/legacy/qagame.mp.obsd.x86_64.so 2share/etlegacy/legacy/qagame.mp.obsd.${ARCH_STRING}.so