git: 1f22065032ea - main - games/battletanks: attempt to unbreak the build on the cluster

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f22065032ead94afcd3865ad766180d01696d8b

commit 1f22065032ead94afcd3865ad766180d01696d8b
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-08-11 14:37:18 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
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 \