From nobody Wed Feb 09 21:49:15 2022 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 0336B19C5EC0; Wed, 9 Feb 2022 21:49:16 +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 4JvD6g6dpNz3CSl; Wed, 9 Feb 2022 21:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644443355; 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=qFWhZGOcO5gPj0SvDWUbiPRH1w/yRyUHfkhIBHLK4JE=; b=KNFjslj+Ceht/+T6qF+nkQMLTA5XJ6yxsPpOCQUwXPpeslAkZcjd0KCs5gwVFkGKmQC9w7 luY+Re8uTBE3Qpp6jTdrIPXHZNnEZwOYTWJLud0uOh+ilMOsD9NFKqa9m7xYURX3rZMhPV gI+1h6NE2VxE/ENLXBXNQGVn3hdJtBK+RRbX1I55AH0mJ890j252BJOZqtLrzXLwdifcZL QZSMCn/jQi7s0Rvh+MvYtiATxMZCm9VXPvyhmlxb2otJbah9CIjfgRn+kDTrXEaH9U1Ix8 uSLhRWwUbiQh13WcdYGJ2Ooi9ROj6fvCuhnLzYNxNleDtJQnpKvlNDlx7VG5NA== 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 B963314B1B; Wed, 9 Feb 2022 21:49:15 +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 219LnFgE069068; Wed, 9 Feb 2022 21:49:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219LnFag069067; Wed, 9 Feb 2022 21:49:15 GMT (envelope-from git) Date: Wed, 9 Feb 2022 21:49:15 GMT Message-Id: <202202092149.219LnFag069067@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: 32621c81fd6f - main - games/warzone2100: switch from p7zip to 7-zip 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: 32621c81fd6fa7edff608945679b5c91faa00b26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644443355; 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=qFWhZGOcO5gPj0SvDWUbiPRH1w/yRyUHfkhIBHLK4JE=; b=NmbRS3m7XYHxYiP/pysgmB2GZcD4FHAVjWDWgySZ4XlTeMGMwPaTuxixZCUTIuF1TliDXm VTUYc6IGBZ3jO6YHjFUOF+dHcTwxASdlcLmGCJDRcn7Vzo3VmavwqxfwI5Qb3UmeDTFfAb Zo3SirpXyudRamgxIXEUhiM8UlN++VOZHxp7qgUEFGUzdcKQw49lhtDNHjEuSEQmmkqKt3 Q8veZR7Bl9zYjMFOPGXkSVWzuHfPKNl7Fdt57ujT/i/pJmG7V6ZmByZwtN9R3pLslZsgXs CuwZkVgMZQyLR9+j9eGD4FfX87khH7vBMzt6PCJpw4QOucMbhH4CqfWz/X2S2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644443355; a=rsa-sha256; cv=none; b=mf4XEKSnsg8QvOF99Q45NtmGIEDNjXZdG6HZCKmLcyxH+LSPP3WhMn6hOGYYyiD6zYbdq0 LBZ1hAr9xZBddHyc/mJREyGoqorKczJfCRFNKGr6QquNJEeVpOkxqsU5govz7nGTJ+5cbE aEXMmN33wM07kfcwSbACTsjUsqRo8qaCIsPXVAIkxuIAkyFocsiYS1wPc08aWWSV5U6dum Qv3qN9J403M+OnFlLKE8MVIUl3q/SywnIccQZ2LwcTBuhyM1B0ERPKsyAbg4TWpvDr/PV0 RUqcvzrhWR0kZtCH0eU8KF484yt/BAD2IVJn2zFMZNTt/RQBHxfPHHR4exemZQ== 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=32621c81fd6fa7edff608945679b5c91faa00b26 commit 32621c81fd6fa7edff608945679b5c91faa00b26 Author: Dmitry Marakasov AuthorDate: 2022-02-09 19:06:17 +0000 Commit: Dmitry Marakasov CommitDate: 2022-02-09 21:45:56 +0000 games/warzone2100: switch from p7zip to 7-zip PR: 261700 Reported by: makc --- games/warzone2100/Makefile | 2 +- games/warzone2100/files/patch-cmake_FindZIP.cmake | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index c3b1e1026a28..2b189d8791b9 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -12,7 +12,7 @@ COMMENT= Innovative 3D real-time strategy game LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= 7z:archivers/p7zip \ +BUILD_DEPENDS= 7zz:archivers/7-zip \ a2x:textproc/asciidoc LIB_DEPENDS= libphysfs.so:devel/physfs \ libpng.so:graphics/png \ diff --git a/games/warzone2100/files/patch-cmake_FindZIP.cmake b/games/warzone2100/files/patch-cmake_FindZIP.cmake new file mode 100644 index 000000000000..62eb09120fae --- /dev/null +++ b/games/warzone2100/files/patch-cmake_FindZIP.cmake @@ -0,0 +1,22 @@ +--- cmake/FindZIP.cmake.orig 2021-04-18 18:28:41 UTC ++++ cmake/FindZIP.cmake +@@ -29,8 +29,8 @@ set(_PF32BIT "ProgramFiles(x86)") + # + + # Search for 7-Zip +-find_program(ZIP_EXECUTABLE NAMES 7z 7za PATHS "$ENV{ProgramFiles}/7-Zip" "$ENV{${_PF32BIT}}/7-Zip" "$ENV{ProgramW6432}/7-Zip") +-if(ZIP_EXECUTABLE MATCHES "7z|7za") ++find_program(ZIP_EXECUTABLE NAMES 7zz REQUIRED) ++if(ZIP_EXECUTABLE MATCHES "7zz") + # Test whether 7-Zip supports the "-bb0" option to disable log output + execute_process(COMMAND ${ZIP_EXECUTABLE} i -bb0 + RESULT_VARIABLE 7z_bb_result +@@ -110,7 +110,7 @@ function(COMPRESS_ZIP) + message( FATAL_ERROR "Unsupported compression level \"${_parsedArguments_COMPRESSION_LEVEL}\" (must be: 0, 1, 3, 5, 7, 9)" ) + endif() + +- if(ZIP_EXECUTABLE MATCHES "7z|7za") ++ if(ZIP_EXECUTABLE MATCHES "7zz") + set(_zipExecutableOptions a -tzip -mtc=off) + if(DEFINED _parsedArguments_COMPRESSION_LEVEL) + # 7z command-line option for compression level (when in ZIP mode) is: "-mx=#"