From nobody Wed Apr 24 21:21:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPsPQ519Yz5J7cC; Wed, 24 Apr 2024 21:21:46 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPsPQ1fCrz4R8M; Wed, 24 Apr 2024 21:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713993706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QHvS/a+FKSqY5S0nw98awfKXGI6z6OK9z9nqxHLccl0=; b=gPb/uzrfNoRtl3rsCF37GGc0isIGblL4JLWARN5+lgh2KRrI+IOGfN3sSTXNxOE4hVh7jo 2te70DeS9QUbiE8DLSqyf0AeyGzPpB5pvdmx+zk/GCn0zevcHjA6qgJudD6KgPOoEeNerw kt1nYQ3h7nKdlp2HQRjmQl4DBGi70GUcv+5iThs3ZE+MVj9iUsPgSEmREHTcqeqpC9ADz+ 3zUoQb27dJI8Iz2rOy2QiUBHoSAP+AqbypUL6oBUiP3UfEV3pFP41fdi2aDwloYyFdCyAN YPgoZjhvTrciuSq/sppW5TLy8Pc74Q2c7Ab3bT3098dDaqJ/zBbZ/hRAKY35Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713993706; a=rsa-sha256; cv=none; b=M6G8y7it1kOpQ/zTAfR3TraQV+AZnprRrFO1Owvxt4ITKgCkIJPjg1S6TvcJu6YPmJxQEe RD/vGmBv2PyIaRv5gxh/JvTftB9upU/M6u1p3j8/R4lwWTxdKLZ+EyaRT+Z2DxtPcV0Sr8 Jyq7L6ldMugALqfJTMMDdW3ix5nph6kW/XzP+dpyPHWsVc5xiFQVj2zGIyct0RDLJtswgQ eUH84mTvVLFnbQqJfJ2cJ93JgCp0MRJLhZ6YpCBYD6e0Gcl+lzUYM1o8bO0ZO4Y94VDGdh rixu1XRn9znddFxtzp6K7uFoGUghOxD/a/X2gnlV2eYEcdQ5KHnS4t6/J7wl9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713993706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QHvS/a+FKSqY5S0nw98awfKXGI6z6OK9z9nqxHLccl0=; b=Oz2Qm6ZKBBG+uKMee1lKHSNrc1dQhOSvlg5PLu1TStX1mUqxjBcGtJGORPC+0SQHVsja+P r63w8//0nlUFtNt2744fEqk4W/jn3BOZf8SQNvIRDuK//72WQ7Gvdy5nE4OxE8v4D+PSZq +zi+ahMu5es7K1fODiUu60FeW2Cz7TvlYt8m8MXMjb1K71/kKK4tNusQyjKA6dHEbLfhQ/ ORAJ7GK19XjDWczGRamXikrDnJx+OsRefV1z2EYQIPL9YoGuKeZz9ScbwYYxcqUXpVELot rs8ENnJNdWbx3k2limApIMj5hqGMauCxTjldF7iLOjrqsB4WTf5g0FSLh9nstA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsPQ1DqbzXlD; Wed, 24 Apr 2024 21:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OLLk3w081617; Wed, 24 Apr 2024 21:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLLk2t081607; Wed, 24 Apr 2024 21:21:46 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:21:46 GMT Message-Id: <202404242121.43OLLk2t081607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: a0f774de061d - main - games/iortcw: fix build on powerpc* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0f774de061d2c484393fcadeda2817bc5fda19b Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0f774de061d2c484393fcadeda2817bc5fda19b commit a0f774de061d2c484393fcadeda2817bc5fda19b Author: Piotr Kubaj AuthorDate: 2024-04-19 17:17:22 +0000 Commit: Piotr Kubaj CommitDate: 2024-04-24 21:21:13 +0000 games/iortcw: fix build on powerpc* --- games/iortcw/Makefile | 2 +- games/iortcw/files/patch-MP_Makefile | 11 +++++++++++ games/iortcw/files/patch-SP_Makefile | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/games/iortcw/Makefile b/games/iortcw/Makefile index 9c20425cd256..86dff84e9df0 100644 --- a/games/iortcw/Makefile +++ b/games/iortcw/Makefile @@ -30,7 +30,7 @@ MAKE_ARGS= BINDIR="${STAGEDIR}${PREFIX}/bin" \ LDFLAGS_i386= -Wl,-znotext -PLIST_SUB= ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc/ppc/}" \ +PLIST_SUB= ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/}" \ WOLFDIR="${WOLFDIR}" SUB_FILES= iowolfded iowolfmp iowolfsp pkg-message diff --git a/games/iortcw/files/patch-MP_Makefile b/games/iortcw/files/patch-MP_Makefile index be11bab35ea7..195d8804563a 100644 --- a/games/iortcw/files/patch-MP_Makefile +++ b/games/iortcw/files/patch-MP_Makefile @@ -1,5 +1,16 @@ --- MP/Makefile.orig 2019-03-16 18:09:48 UTC +++ MP/Makefile +@@ -5,8 +5,8 @@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr + # + + COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g') +-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') +-ARM_VER_CHECK=$(shell uname -m) ++COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') ++ARM_VER_CHECK=$(shell uname -p) + + ifeq ($(COMPILE_PLATFORM),sunos) + # Solaris uname and GNU uname differ @@ -101,14 +101,6 @@ export ARCH endif export ARCH diff --git a/games/iortcw/files/patch-SP_Makefile b/games/iortcw/files/patch-SP_Makefile index 294a9b7c76d6..40cd99e00098 100644 --- a/games/iortcw/files/patch-SP_Makefile +++ b/games/iortcw/files/patch-SP_Makefile @@ -1,5 +1,16 @@ --- SP/Makefile.orig 2019-03-16 18:09:48 UTC +++ SP/Makefile +@@ -5,8 +5,8 @@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr + # + + COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g') +-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') +-ARM_VER_CHECK=$(shell uname -m) ++COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') ++ARM_VER_CHECK=$(shell uname -p) + + ifeq ($(COMPILE_PLATFORM),sunos) + # Solaris uname and GNU uname differ @@ -98,14 +98,6 @@ export ARCH endif export ARCH