git: 8528974c364c - main - polish/napi: switch from p7zip to 7-zip

The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8528974c364ce257d975e32f94ce1bd8af246926

commit 8528974c364ce257d975e32f94ce1bd8af246926
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-01-17 16:45:40 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2022-01-17 16:45:40 +0000

    polish/napi: switch from p7zip to 7-zip
    
    PR:             260866, 261264
    Submitted by:   Dominik Lisiak (maintainer)
---
 polish/napi/Makefile                           |  3 ++-
 polish/napi/files/patch-libs_libnapi__fs.sh    | 19 ++++++++++++++-----
 polish/napi/files/patch-libs_libnapi__tools.sh | 11 +++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/polish/napi/Makefile b/polish/napi/Makefile
index e6db02445bed..378a2d5ab22a 100644
--- a/polish/napi/Makefile
+++ b/polish/napi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	napi
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	polish multimedia
 
 MAINTAINER=	dominik.lisiak@bemsoft.pl
@@ -7,7 +8,7 @@ COMMENT=	Command line subtitles downloader for napiprojekt.pl
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	7z:archivers/p7zip \
+RUN_DEPENDS=	7zz:archivers/7-zip \
 		base64:converters/base64 \
 		bash:shells/bash \
 		mediainfo:multimedia/mediainfo \
diff --git a/polish/napi/files/patch-libs_libnapi__fs.sh b/polish/napi/files/patch-libs_libnapi__fs.sh
index 755e942821a3..8326cdf5ab86 100644
--- a/polish/napi/files/patch-libs_libnapi__fs.sh
+++ b/polish/napi/files/patch-libs_libnapi__fs.sh
@@ -1,4 +1,4 @@
---- libs/libnapi_fs.sh.orig	2020-04-24 07:22:41 UTC
+--- libs/libnapi_fs.sh.orig	2022-01-17 05:41:41 UTC
 +++ libs/libnapi_fs.sh
 @@ -54,7 +54,7 @@ _fs_configureStat_GV() {
      # verify stat tool
@@ -18,12 +18,21 @@
  }
  
  #
-@@ -83,6 +85,8 @@ _fs_configureMd5_GV() {
-     # verify md5 tool
+@@ -84,6 +86,8 @@ _fs_configureMd5_GV() {
      ___g_fsWrappers[$___g_fsMd5]="md5sum"
      wrappers_isSystemDarwin &&
-+        ___g_fsWrappers[$___g_fsMd5]="md5"
-+    wrappers_isSystemFreeBSD &&
          ___g_fsWrappers[$___g_fsMd5]="md5"
++    wrappers_isSystemFreeBSD &&
++        ___g_fsWrappers[$___g_fsMd5]="md5"
  }
  
+ #
+@@ -105,7 +109,7 @@ _fs_configure7z_GV() {
+     local k=''
+ 
+     # use 7z or 7za only, 7zr doesn't support passwords
+-    declare -a t7zs=( '7za' '7z' )
++    declare -a t7zs=( '7za' '7z' '7zz' )
+ 
+     for k in "${t7zs[@]}"; do
+         tools_isDetected "$k" &&
diff --git a/polish/napi/files/patch-libs_libnapi__tools.sh b/polish/napi/files/patch-libs_libnapi__tools.sh
new file mode 100644
index 000000000000..090ae4cbf2cf
--- /dev/null
+++ b/polish/napi/files/patch-libs_libnapi__tools.sh
@@ -0,0 +1,11 @@
+--- libs/libnapi_tools.sh.orig	2022-01-17 07:45:13 UTC
++++ libs/libnapi_tools.sh
+@@ -42,7 +42,7 @@ declare -a ___g_tools=( 'tr=1' 'printf=1' 'mktemp=1' '
+     'wc=1' 'dd=1' 'grep=1' 'seq=1' 'sed=1' 'cut=1' \
+     'base64=1' 'unlink=0' 'stat=1' 'basename=1' \
+     'dirname=1' 'cat=1' 'cp=1' 'mv=1' 'awk=1' \
+-    'file=0' 'iconv=0' '7z|7za=0' 'md5|md5sum=1' \
++    'file=0' 'iconv=0' '7z|7za|7zz=0' 'md5|md5sum=1' \
+     'fps:mediainfo=0' 'fps:mplayer|mplayer2=0' 'fps:ffmpeg|ffprobe=0' )
+ 
+ ########################################################################