aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2022-01-12 21:24:02 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2022-01-12 21:24:02 +0000
commit88cbdd9c25e9af87860167f9a705bdabd82ee5cc (patch)
tree700b8bade3286722d4b7b16a537ad5818ccc8844
parent880c0dcf1f01f11a9553ad56a68a7350ba1394b1 (diff)
downloadports-88cbdd9c25e9af87860167f9a705bdabd82ee5cc.tar.gz
ports-88cbdd9c25e9af87860167f9a705bdabd82ee5cc.zip
archivers/xarchiver: switch from p7zip to 7-zip
PR: 260866
-rw-r--r--archivers/xarchiver/Makefile3
-rw-r--r--archivers/xarchiver/files/patch-src_main.c15
2 files changed, 14 insertions, 4 deletions
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 65c9406a47f5..b43c3daca37d 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xarchiver
PORTVERSION= 0.5.4.16
+PORTREVISION= 1
CATEGORIES= archivers
MAINTAINER= ports@FreeBSD.org
@@ -12,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-RUN_DEPENDS= 7zr:archivers/p7zip \
+RUN_DEPENDS= 7zz:archivers/7-zip \
gtar:archivers/gtar \
gzip:archivers/gzip \
${LOCALBASE}/bin/unzip:archivers/unzip \
diff --git a/archivers/xarchiver/files/patch-src_main.c b/archivers/xarchiver/files/patch-src_main.c
index aacadce39eb4..e477c8a29856 100644
--- a/archivers/xarchiver/files/patch-src_main.c
+++ b/archivers/xarchiver/files/patch-src_main.c
@@ -1,6 +1,15 @@
---- src/main.c.orig 2020-05-30 14:10:55 UTC
+--- src/main.c.orig 2020-12-12 13:32:03 UTC
+++ src/main.c
-@@ -387,7 +387,7 @@ static void xa_check_available_archivers ()
+@@ -103,7 +103,7 @@ static void xa_check_available_archivers ()
+
+ /* (un)compressors that can handle various types */
+
+- sevenz = g_find_program_in_path("7z");
++ sevenz = g_find_program_in_path("7zz");
+
+ if (!sevenz)
+ {
+@@ -388,7 +388,7 @@ static void xa_check_available_archivers ()
/* GNU zip */
type = XARCHIVETYPE_GZIP;
@@ -9,7 +18,7 @@
if (path)
archiver[type].is_compressor = TRUE;
-@@ -799,11 +799,11 @@ static void xa_check_available_archivers ()
+@@ -812,11 +812,11 @@ static void xa_check_available_archivers ()
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->prefer_unzip)) ||
(!is7za && !lsar))
{