From owner-dev-commits-ports-main@freebsd.org Wed Aug 11 14:38:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 677726552F8; Wed, 11 Aug 2021 14:38:50 +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 4GlCB22NvDz3HV0; Wed, 11 Aug 2021 14:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3AAA411293; Wed, 11 Aug 2021 14:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17BEco0T098178; Wed, 11 Aug 2021 14:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17BEcoEU098177; Wed, 11 Aug 2021 14:38:50 GMT (envelope-from git) Date: Wed, 11 Aug 2021 14:38:50 GMT Message-Id: <202108111438.17BEcoEU098177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1f22065032ea - main - games/battletanks: attempt to unbreak the build on the cluster MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f22065032ead94afcd3865ad766180d01696d8b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2021 14:38:50 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f22065032ead94afcd3865ad766180d01696d8b commit 1f22065032ead94afcd3865ad766180d01696d8b Author: Alexey Dokuchaev AuthorDate: 2021-08-11 14:37:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-08-11 14:37:29 +0000 games/battletanks: attempt to unbreak the build on the cluster It turns that conversion to modern Python in r547168 was incomplete, one last has_key() call was left out. While here, shorten one line in the `pre-build' recipe by not repeating identical path component. Reported by: pkg-fallout --- games/battletanks/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index 69c7c313cb68..104601641ef9 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -36,6 +36,8 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's/lua5\.1/lua-${LUA_VER}/' \ ${WRKSRC}/engine/SConscript + @${REINPLACE_CMD} -e "s/env\.has_key('prefix')/'prefix' in env/" \ + ${WRKSRC}/mrt/SConscript # Prevent the clash with /usr/include/semaphore.h @${MV} ${WRKSRC}/sdlx/semaphore.h ${WRKSRC}/sdlx/sdlx_semaphore.h @${REINPLACE_CMD} -e 's/semaphore\.h"/sdlx_&/' \ @@ -44,7 +46,7 @@ post-patch: pre-build: # Regenerate `sl08.h' after we patch `sl08.py' (patching the header itself # would've resulted in a larger diff and gratuitous difference with Debian) - cd ${WRKSRC} && ${PYTHON_CMD} engine/sl08/sl08.py > engine/sl08/sl08.h + cd ${WRKSRC}/engine/sl08 && ${PYTHON_CMD} sl08.py > sl08.h post-install: ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.6 \