From nobody Mon Jan 17 16:46:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D9691194CEBE; Mon, 17 Jan 2022 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JcyTh4dxdz3Q3l; Mon, 17 Jan 2022 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642437976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hxqGRBlmn/VPeP8mp3vapjKMaW9cbc5RoQqjgZ+ruaA=; b=v+RaLPj5CmrJi+yyTmaoV5l55ZPlykzIIR1cWTcjHUgSPEreyYCAqAdwBUxFoS2NWdbPhP cTHUvjvKIx4NYFy0c54VgyH0eUc90uymO/HF1p3gYlPOA+BJTVGR13hhba5SVBNaOyFStu +XPARZJVOSM2ExgMQlWDIrpFdJMs0q+iPY/b+fbol8ClmyQXmqwJOmP+lkaWyIC+L3ufNN +ovMXvSKspPwjlbZ0uVaKwDaTx0FaG8zGkZkL26TpTMAq1WvkIU3LVDPJsue7879BnGOlf RhsYWMzCGQrAeDzZJj9MupyKt/2Lq+oJQ9ZgdA+ANVtxuj4rOVkpEpjwL/hCbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BEE61152C; Mon, 17 Jan 2022 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20HGkGZL045595; Mon, 17 Jan 2022 16:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HGkGqr045594; Mon, 17 Jan 2022 16:46:16 GMT (envelope-from git) Date: Mon, 17 Jan 2022 16:46:16 GMT Message-Id: <202201171646.20HGkGqr045594@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 8528974c364c - main - polish/napi: switch from p7zip to 7-zip List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8528974c364ce257d975e32f94ce1bd8af246926 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642437976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hxqGRBlmn/VPeP8mp3vapjKMaW9cbc5RoQqjgZ+ruaA=; b=sANSCmvYrrtN/fK5MGCHZ8vAPW6AsXVwFdFfaCNddcoYmcGqlOTpxkgw0zDlFLVRrh+Vmq thtLJTii0ubSBljzLJMJOBv9KgbBtm+AeOF5aFck8wFdn3qGddOXNE2lO9wAcQN1XiRCjb 7FVpPmJzRaOVw+zrNuEaeCPY+0oexP1RqcUl6yDqWFI2O16vVl9zyRBiN/mBVGMQAddjIV gS/H/Bkjxv+eZCOodocbtuPlnXwp6q4Bk2d26sty8kQwkhKRQgM7BOMIE7v8oVqTijSSc5 r6KDenO02YLX/D2Xsx+ofBtTv/I1oGa1N9c+iCu556xsb8vx5jKuSll0wTIEBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642437976; a=rsa-sha256; cv=none; b=q4Df+u5+2Jpa9JROHTORjecntYbZn5Z2nSQNLYSpF5c2vAKRprs3VULGs2E9SXMph4zzKe t7Je4l+nf3k0OciHPyPkQWkEPzkTOYccl0vGlyRSfze5TD8KYRG646pLgXr821NkwEL4VE L0HAxIfG/9wzAbeF0yHgWQDAmtv6KoCp+GbND5duaKqQWY7Troe7wM5IbaPP4jF5F43YPt Odt4eiDrYlF03H/YmgVRcugQw2BA8tF3TF3wNAdNbSj7th+Q8VSDoYk5RgJSq8+FzeE6I+ 3wuJhOEUdFCTo2CTPGwLuMmHXf17FiE4i6V0Vb5zdKuaeJpujv4arBXe1eZnZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=8528974c364ce257d975e32f94ce1bd8af246926 commit 8528974c364ce257d975e32f94ce1bd8af246926 Author: Max Brazhnikov AuthorDate: 2022-01-17 16:45:40 +0000 Commit: Max Brazhnikov 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' ) + + ########################################################################