git: 5bb882788ca0 - main - archivers/xarchive: switch from p7zip to 7-zip
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Feb 2022 17:40:11 UTC
The branch main has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5bb882788ca0b6f3ccd17f9c83f69e1863a79d92
commit 5bb882788ca0b6f3ccd17f9c83f69e1863a79d92
Author: Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-02-08 17:38:33 +0000
Commit: Max Brazhnikov <makc@FreeBSD.org>
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"