From nobody Thu Mar 17 21:09:44 2022 X-Original-To: dev-commits-ports-all@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 129ED1A1F190; Thu, 17 Mar 2022 21:09:45 +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 4KKKXT0265z3nS0; Thu, 17 Mar 2022 21:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647551385; 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=1FHnPXGau0dZpN/G06DvUiL5ewleLDrtQG+pgQ2U3ls=; b=AsiZzf0e7MoeaJ0hN3N3bGwe+TCzk4DTqAVAzzkNNTM9qZ6lC+8468ef5MLXf1NJPA6YH+ 6cZ/gw/5Ym4J2Eqa5qqB4cm0sEkyMrnQqJXNIVKl7lGRjkguiCfWWVXnFz4Hyuz9orI4k2 Fb14B/cDs+gvVSbH9Pl4Bq7XfxBeok8VHdGxcT0kYL5CP8ySs+mLW2iJiPunGXW/ofQrSx f4GOd09T2++LBbFp6LEEYXUfAsr2xuoDapvfcGQNdmktd5QAxE20H2sl5APXjPdYyPeKyP N48XI3tbs5KjKKrTaSFLdmDY6ZF72fzVty2RS/X0iiSG9772xoixc6SO6dMGUw== 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 D605511E3D; Thu, 17 Mar 2022 21:09:44 +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 22HL9iwq083978; Thu, 17 Mar 2022 21:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HL9iCn083977; Thu, 17 Mar 2022 21:09:44 GMT (envelope-from git) Date: Thu, 17 Mar 2022 21:09:44 GMT Message-Id: <202203172109.22HL9iCn083977@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: 06a5762c9692 - main - games/spring: switch from p7zip to 7-Zip List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 06a5762c969217e08068e90e91c1edb171706fa5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647551385; 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=1FHnPXGau0dZpN/G06DvUiL5ewleLDrtQG+pgQ2U3ls=; b=JmBXgQJqRIScZVjFz86zuG8LnFJTWWSzoVpmPFJIJsLc3A9TfZZUCbLzLLh+JU3O9g+QWq 5zngq7fwdu7oykynfcIngu4qNBvNpNdoPYV8LHmJOjoKS2m+QDdiX6pIxcuqhwS9zTYyf2 +TMBH9MwOBW6c/y0ueR8Sx0evPKIIbQiq/MynwJqWo7C1okwe3FJdFF6Gyf+TtYBG6cjz/ QGSsFTktpEHdq88OoL6h+mtTe2WWI+toJq7QX7u05hDJGo4pwe70lfjQ0Rw1u1QlKviqoN CeqMSJQuAYvk2xtnas+zIyLrnVLoyap4NsD2EpolIVW8ES9TjPXqFVhBkr7q9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647551385; a=rsa-sha256; cv=none; b=IQkqW7/SKCMLO2+90HUxfi7njvZH8InfVn8pHv2RjQOyfhrRErWBH/lQ7zhaiO/s0LXiYW r1D7NeQ9BpsDqJsRvf4Uo+Xg8gXe2QcYLmUj1/JuN0xVQwEZZOAlYrD2gzizCI0DG19FR4 F2jvmUNI+gmtgN6AYfkCRQrk8yOFyAGEpuwGljbPw8BjWpaIDGfDcwAHrC72VeKxwGyzJr Q6srZPwcuNMi3Iwx/mXSabsn5nuQz+tU6LpSmdNSs1yUZbjh6OBW7MJiWktzDnogqQSnov MRY+xh2oS9uAmOJmx1vnvbJdvJx1pJd4h60w6xtd3NQXy+PLVqP1gPYWcbulxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=06a5762c969217e08068e90e91c1edb171706fa5 commit 06a5762c969217e08068e90e91c1edb171706fa5 Author: Dmitry Marakasov AuthorDate: 2022-03-17 18:13:20 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-17 21:08:57 +0000 games/spring: switch from p7zip to 7-Zip PR: 262592 Submitted by: makc --- games/spring/Makefile | 2 +- games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/games/spring/Makefile b/games/spring/Makefile index bdb8c17f7c19..0e25bcea07d6 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libcurl.so:ftp/curl \ libunwind.so:devel/libunwind \ libjsoncpp.so:devel/jsoncpp -BUILD_DEPENDS= 7z:archivers/p7zip +BUILD_DEPENDS= 7zz:archivers/7-zip BROKEN_FreeBSD_12= ld: error: undefined symbol: streflop_libm::__inline_isnanf(float) ONLY_FOR_ARCHS= amd64 diff --git a/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake new file mode 100644 index 000000000000..e75226c6175a --- /dev/null +++ b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake @@ -0,0 +1,11 @@ +--- rts/build/cmake/FindSevenZip.cmake.orig 2020-12-26 12:45:43 UTC ++++ rts/build/cmake/FindSevenZip.cmake +@@ -23,7 +23,7 @@ ENDIF (SEVENZIP_BIN) + set(progfilesx86 "ProgramFiles(x86)") + + find_program(SEVENZIP_BIN +- NAMES 7z 7za ++ NAMES 7zz + HINTS "${MINGWDIR}" "${MINGWLIBS}/bin" "$ENV{${progfilesx86}}/7-zip" "$ENV{ProgramFiles}/7-zip" "$ENV{ProgramW6432}/7-zip" + PATH_SUFFIXES bin + DOC "7zip executable"