From nobody Thu Nov 18 21:17:29 2021 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 52E3718334EB; Thu, 18 Nov 2021 21:17:30 +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 4HwCLL0TZKz3Hyl; Thu, 18 Nov 2021 21:17:30 +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 C54E81C312; Thu, 18 Nov 2021 21:17:29 +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 1AILHTYY046244; Thu, 18 Nov 2021 21:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AILHTbY046243; Thu, 18 Nov 2021 21:17:29 GMT (envelope-from git) Date: Thu, 18 Nov 2021 21:17:29 GMT Message-Id: <202111182117.1AILHTbY046243@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: fea0e6e8f848 - main - games/lander: fix build on 14 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fea0e6e8f848623a36a15f3da886ba0dde4fc79c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=fea0e6e8f848623a36a15f3da886ba0dde4fc79c commit fea0e6e8f848623a36a15f3da886ba0dde4fc79c Author: Dmitry Marakasov AuthorDate: 2021-11-18 13:50:14 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-18 20:51:08 +0000 games/lander: fix build on 14 While here, convert REINPLACE_CMD to a patch and change MASTER_SITES to https --- games/lander/Makefile | 7 ++----- games/lander/files/patch-configure | 20 ++++++++++++++++++++ games/lander/files/patch-src_Platform.hpp | 12 ++++++++++++ games/lander/pkg-descr | 2 +- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/games/lander/Makefile b/games/lander/Makefile index 1dd5e0d1c244..8d3aa0ca5cde 100644 --- a/games/lander/Makefile +++ b/games/lander/Makefile @@ -2,8 +2,8 @@ PORTNAME= lander PORTVERSION= 0.6.6 PORTREVISION= 21 CATEGORIES= games -MASTER_SITES= http://www.nickg.me.uk/files/ \ - http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= https://www.nickg.me.uk/files/ \ + https://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lunar Lander clone @@ -37,9 +37,6 @@ DESKTOP_ENTRIES="Lunar Lander" \ OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's|-R$$found_dir||g' ${WRKSRC}/configure - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ diff --git a/games/lander/files/patch-configure b/games/lander/files/patch-configure new file mode 100644 index 000000000000..b28b60d5a3e0 --- /dev/null +++ b/games/lander/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2014-02-02 18:26:47 UTC ++++ configure +@@ -5960,7 +5960,7 @@ fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }" + done + fi + +@@ -6844,7 +6844,7 @@ fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" ++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }" + done + fi + diff --git a/games/lander/files/patch-src_Platform.hpp b/games/lander/files/patch-src_Platform.hpp new file mode 100644 index 000000000000..605ebd9056ac --- /dev/null +++ b/games/lander/files/patch-src_Platform.hpp @@ -0,0 +1,12 @@ +--- src/Platform.hpp.orig 2014-02-02 18:23:11 UTC ++++ src/Platform.hpp +@@ -90,9 +90,6 @@ + #include + #include + +-// Probably using GCC +-#include +- + #endif /* #ifdef WIN32 */ + + // Mac OS X specifics */ diff --git a/games/lander/pkg-descr b/games/lander/pkg-descr index f9875a4a8cca..b4ab7a273579 100644 --- a/games/lander/pkg-descr +++ b/games/lander/pkg-descr @@ -4,4 +4,4 @@ Collect all the spinning keys and then land the ship on one of the landing pads. The levels are randomly generated and become progressively harder. -WWW: http://www.doof.me.uk/lunar-lander/ +WWW: https://www.doof.me.uk/lunar-lander/