From owner-svn-ports-all@freebsd.org Sun Nov 15 02:01:14 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C8E546DCB6; Sun, 15 Nov 2020 02:01:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CYb623RMyz4jCp; Sun, 15 Nov 2020 02:01:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68FF114375; Sun, 15 Nov 2020 02:01:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AF21Elb000445; Sun, 15 Nov 2020 02:01:14 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AF21DDS000443; Sun, 15 Nov 2020 02:01:13 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202011150201.0AF21DDS000443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 15 Nov 2020 02:01:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r555162 - in branches/2020Q4/games/ioquake3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in branches/2020Q4/games/ioquake3: . files X-SVN-Commit-Revision: 555162 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 02:01:14 -0000 Author: pkubaj Date: Sun Nov 15 02:01:13 2020 New Revision: 555162 URL: https://svnweb.freebsd.org/changeset/ports/555162 Log: MFH: r555161 games/ioquake3: fix build on powerpc64 Approved by: portmgr (fix build blanket) Modified: branches/2020Q4/games/ioquake3/Makefile branches/2020Q4/games/ioquake3/files/patch-Makefile branches/2020Q4/games/ioquake3/files/patch-code-qcommon-q_platform.h Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/games/ioquake3/Makefile ============================================================================== --- branches/2020Q4/games/ioquake3/Makefile Sun Nov 15 02:00:13 2020 (r555161) +++ branches/2020Q4/games/ioquake3/Makefile Sun Nov 15 02:01:13 2020 (r555162) @@ -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: branches/2020Q4/games/ioquake3/files/patch-Makefile ============================================================================== --- branches/2020Q4/games/ioquake3/files/patch-Makefile Sun Nov 15 02:00:13 2020 (r555161) +++ branches/2020Q4/games/ioquake3/files/patch-Makefile Sun Nov 15 02:01:13 2020 (r555162) @@ -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: branches/2020Q4/games/ioquake3/files/patch-code-qcommon-q_platform.h ============================================================================== --- branches/2020Q4/games/ioquake3/files/patch-code-qcommon-q_platform.h Sun Nov 15 02:00:13 2020 (r555161) +++ branches/2020Q4/games/ioquake3/files/patch-code-qcommon-q_platform.h Sun Nov 15 02:01:13 2020 (r555162) @@ -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