From nobody Tue Feb 8 17:40:11 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 7720B19AD84C; Tue, 8 Feb 2022 17:40:11 +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 4JtVdl2gQTz4sCt; Tue, 8 Feb 2022 17:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644342011; 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=u2JUSzLoUtwPNkL7OaPQknD6lzQYmRpEJ8TJRFZW5qY=; b=E1xLTlOtxGSFSXalY4J1Rpk7ixcOB8MVJ5nVwp5T5E25vFrkSQaPhovadjZ8huGoEOOjZY A5EcHFVhdmVD7DfcIamkiu4SCWSkkiApyFDgFqj0WzT5e2GRE0Os07nRXGSPQzXnZWb/oH jijJibjbmCC+vA303XiP3vuKdwINwCq3Uq8YxfAoyXEZA150kLESVDoWYCWxFdocpcY4M4 mcvRiublLc9VVaph5e5+nGTtkCcCHeAyRKycmHVD+GUgWF0+56UcX8//6dUBs2T5RCmT03 F49tigb85CthHu2Z+Wwu+o9pHo6vVH4hhnB9CMPHS2b7o98VPHrArRctTj8OfA== 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 3C9AF1D266; Tue, 8 Feb 2022 17:40:11 +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 218HeBRa012498; Tue, 8 Feb 2022 17:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218HeBdx012491; Tue, 8 Feb 2022 17:40:11 GMT (envelope-from git) Date: Tue, 8 Feb 2022 17:40:11 GMT Message-Id: <202202081740.218HeBdx012491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 5bb882788ca0 - main - archivers/xarchive: 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bb882788ca0b6f3ccd17f9c83f69e1863a79d92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644342011; 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=u2JUSzLoUtwPNkL7OaPQknD6lzQYmRpEJ8TJRFZW5qY=; b=K7hmCW5hj1dpvM3x7oG6X6XrFnNGIDilpmVu5tt3ShqutCUUE0H8odddGf6nvYqUdgW/97 klVG9+md04MfIm+iyQWZNpFtPUEx2ITMH3fBa7Z+mKXRDkcGZqWBMmjFczFCgfYNJN8W6L nwZQcaWLT+oEZZroxxkBg483jU7lH5AwJEK4TC6WHb3HHkhGmXHAqPlBDVTrzMjOWZUw7k djV0MIs9vby/ztDgVZyl6QkX5yyPQy9NLU/VCWF+BpNPCkYejtyB3keF/9A6nhPIDbUUd0 96QIL4Y2MLG8DvcM/LUjoqYcyJ+dxpJPqKDj/AaT8ad+m+UZXEI25a9a51/0VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644342011; a=rsa-sha256; cv=none; b=VVgIDRDwaqveM20h+YUNRNxhdG6tkya/sCZYoDh5KrAiEjkWLFuKceDruPr78IWUL7qGWd ej+TcHFhbum9ffj2luNiLcjeaa6BicqmQ4ZJWVs8VgSfl0namp6G1lYDWDdeUM6awYgSJv 7Y/zS9/huIMzOKur8WcPS0C9CNkcnI5/tG5ifYxo7XZJdVIrvfzqwfAxbqV5ducm/434Ly kYOJzYmKQcltW2fy+bGzLniWiJRh+kjxkpJFvvTvmLDL35lzHxON3JNjinT/+/BjAGNepb fqoYVQpMNhHySnUy/vY5RmwelA8Opk+PKQH5B5Ya/A7sZbR+cFOoLzYc0De+Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=5bb882788ca0b6f3ccd17f9c83f69e1863a79d92 commit 5bb882788ca0b6f3ccd17f9c83f69e1863a79d92 Author: Max Brazhnikov AuthorDate: 2022-02-08 17:38:33 +0000 Commit: Max Brazhnikov CommitDate: 2022-02-08 17:38:33 +0000 archivers/xarchive: switch from p7zip to 7-zip PR: 260866, 261314 Approved by: maintainer timeout (3 weeks) --- archivers/xarchive/Makefile | 2 +- archivers/xarchive/files/patch-doc_xarchive.1 | 11 +++++++++++ archivers/xarchive/files/patch-wrappers_7za.src | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile index da2f874d81cc..a78e016e1aa0 100644 --- a/archivers/xarchive/Makefile +++ b/archivers/xarchive/Makefile @@ -25,7 +25,7 @@ RAR_DESC= RAR archive support RPM_DESC= RPM archive support ZIP_DESC= ZIP archive support -7ZIP_RUN_DEPENDS= 7z:archivers/p7zip +7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip ARJ_RUN_DEPENDS= arj:archivers/arj ACE_RUN_DEPENDS= unace:archivers/unace DEB_RUN_DEPENDS= dpkg-deb:archivers/dpkg diff --git a/archivers/xarchive/files/patch-doc_xarchive.1 b/archivers/xarchive/files/patch-doc_xarchive.1 new file mode 100644 index 000000000000..d67f2910ece4 --- /dev/null +++ b/archivers/xarchive/files/patch-doc_xarchive.1 @@ -0,0 +1,11 @@ +--- doc/xarchive.1.orig 2006-02-27 17:30:13 UTC ++++ doc/xarchive.1 +@@ -26,7 +26,7 @@ using unzip, zipinfo(from unzip), and zip + using unace (extraction only) + .TP + \fB7zip\fR +-using 7za from p7zip ++using 7zz from 7-Zip + .TP + \fBarj\fR + using arj diff --git a/archivers/xarchive/files/patch-wrappers_7za.src b/archivers/xarchive/files/patch-wrappers_7za.src new file mode 100644 index 000000000000..a5615e1ff1be --- /dev/null +++ b/archivers/xarchive/files/patch-wrappers_7za.src @@ -0,0 +1,11 @@ +--- wrappers/7za.src.orig 2005-11-15 11:59:51 UTC ++++ wrappers/7za.src +@@ -25,7 +25,7 @@ E_UNSUPPORTED=65 + EXTS="7z" + + # Programs to wrap +-P7Z_PROG="7za" ++P7Z_PROG="7zz" + + # Setup awk program to use + AWK_PROGS="mawk gawk awk"