svn commit: r555161 - in head/games/ioquake3: . files

[Piotr Kubaj]

Author: pkubaj
Date: Sun Nov 15 02:00:13 2020
New Revision: 555161
URL: https://svnweb.freebsd.org/changeset/ports/555161

Log:
  games/ioquake3: fix build on powerpc64
  
  MFH:		2020Q4 (fix build blanket)

Modified:
  head/games/ioquake3/Makefile
  head/games/ioquake3/files/patch-Makefile
  head/games/ioquake3/files/patch-code-qcommon-q_platform.h

Modified: head/games/ioquake3/Makefile
==============================================================================
--- head/games/ioquake3/Makefile	Sun Nov 15 01:32:09 2020	(r555160)
+++ head/games/ioquake3/Makefile	Sun Nov 15 02:00:13 2020	(r555161)
@@ -20,7 +20,7 @@ USES=		pkgconfig gmake
 # Port configuration flags:
 #	CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
 IOQ3?=		CLIENT TOOLS GAMELIBS
-IOQ3ARCH?=	${ARCH}
+IOQ3ARCH?=	${ARCH:S/powerpc/ppc/}
 IOQ3SDL?=	sdl
 
 .if ! ${IOQ3:MCLIENT} && ! ${IOQ3:MSERVER}
@@ -87,7 +87,7 @@ Q3INSTALL?=
 Q3ENGINEVER?=	${DISTVERSION}
 IOQUAKE3VER=	1.36
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
 DEBUG_VARS=		ALL_TARGET=debug
 SERVER_RUN_DEPENDS=	${Q3SERVER}${BINSUFFIX}:games/${PORTNAME}-server

Modified: head/games/ioquake3/files/patch-Makefile
==============================================================================
--- head/games/ioquake3/files/patch-Makefile	Sun Nov 15 01:32:09 2020	(r555160)
+++ head/games/ioquake3/files/patch-Makefile	Sun Nov 15 02:00:13 2020	(r555161)
@@ -1,5 +1,16 @@
 --- Makefile.orig	2009-04-22 18:54:48 UTC
 +++ Makefile
+@@ -16,6 +16,10 @@ ifeq ($(COMPILE_PLATFORM),darwin)
+   # Apple does some things a little differently...
+   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
+ endif
++ifeq ($(COMPILE_PLATFORM),freebsd)
++  # FreeBSD does some things a little differently...
++  COMPILE_ARCH=$(shell uname -p)
++endif
+ 
+ ifeq ($(COMPILE_PLATFORM),mingw32)
+   ifeq ($(COMPILE_ARCH),i386)
 @@ -187,6 +187,8 @@ ifeq ($(shell which pkg-config > /dev/nu
    # FIXME: introduce CLIENT_CFLAGS
    SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')

Modified: head/games/ioquake3/files/patch-code-qcommon-q_platform.h
==============================================================================
--- head/games/ioquake3/files/patch-code-qcommon-q_platform.h	Sun Nov 15 01:32:09 2020	(r555160)
+++ head/games/ioquake3/files/patch-code-qcommon-q_platform.h	Sun Nov 15 02:00:13 2020	(r555161)
@@ -1,6 +1,6 @@
 --- code/qcommon/q_platform.h.orig	2009-03-02 17:29:30 UTC
 +++ code/qcommon/q_platform.h
-@@ -199,6 +199,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -199,8 +199,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  
  #ifdef __i386__
  #define ARCH_STRING "i386"
@@ -8,4 +8,10 @@
 +#define ARCH_STRING "amd64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
++#elif defined __powerpc64__
++#define ARCH_STRING "ppc64"
++#elif defined __powerpc__
++#define ARCH_STRING "ppc"
  #endif
+ 
+ #if BYTE_ORDER == BIG_ENDIAN