diff options
| author | Dominik Lisiak <dominik.lisiak@bemsoft.pl> | 2022-01-17 09:03:01 +0100 |
|---|---|---|
| committer | Dominik Lisiak <dominik.lisiak@bemsoft.pl> | 2022-01-17 09:03:01 +0100 |
| commit | 111016911a32e56728bfac754a092db957d413c2 (patch) | |
| tree | 2a88e62687fb518d28f6403b69a52f27c82b6ed8 | |
| parent | Merged committter changes. (diff) | |
| download | napi-111016911a32e56728bfac754a092db957d413c2.tar.xz | |
Replaced p7zip with 7-zip2.0.1_1
| -rw-r--r-- | polish/napi/Makefile | 3 | ||||
| -rw-r--r-- | polish/napi/files/patch-libs_libnapi__fs.sh | 19 | ||||
| -rw-r--r-- | 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 e6db024..378a2d5 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 755e942..8326cdf 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 0000000..090ae4c --- /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' ) + + ######################################################################## |