git: 6f3872ab47a6 - main - archivers/file-roller: switch from p7zip to 7-zip

The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6f3872ab47a6bbceb3743e022611ec838ad450d0

commit 6f3872ab47a6bbceb3743e022611ec838ad450d0
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-02-10 17:29:02 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2022-02-10 17:29:15 +0000

    archivers/file-roller: switch from p7zip to 7-zip
    
    PR:             260866 261839
    Approved by:    tcberner@
---
 archivers/file-roller/Makefile                        |  5 +++++
 archivers/file-roller/files/patch-src_fr-command-7z.c | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 10554cdcde03..51bb6b0f775b 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	file-roller
 PORTVERSION=	3.40.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
@@ -62,5 +63,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/fr-command-tar.c \
 		${WRKSRC}/src/fr-command-zip.c
+	@${REINPLACE_CMD} -e 's|"7z"|"7zz"|g' \
+		${WRKSRC}/src/fr-archive-libarchive.c \
+		${WRKSRC}/src/fr-command-7z.c \
+		${WRKSRC}/src/fr-command-tar.c
 
 .include <bsd.port.mk>
diff --git a/archivers/file-roller/files/patch-src_fr-command-7z.c b/archivers/file-roller/files/patch-src_fr-command-7z.c
new file mode 100644
index 000000000000..9a9297f2190f
--- /dev/null
+++ b/archivers/file-roller/files/patch-src_fr-command-7z.c
@@ -0,0 +1,16 @@
+--- src/fr-command-7z.c.orig	2021-05-01 19:02:13 UTC
++++ src/fr-command-7z.c
+@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand  *command,
+ 	fr_process_add_arg (command->process, "-bd");
+ 	fr_process_add_arg (command->process, "-bb1");
+ 	fr_process_add_arg (command->process, "-y");
+-	if (follow_links)
+-		fr_process_add_arg (command->process, "-l");
++	if (! follow_links)
++        {
++		fr_process_add_arg (command->process, "-snh");
++		fr_process_add_arg (command->process, "-snl");
++        }
+ 	add_password_arg (command, archive->password, FALSE);
+ 	if ((archive->password != NULL)
+ 	    && (*archive->password != 0)