From nobody Tue Jan 11 18:53:39 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 8F5FE194DBBA; Tue, 11 Jan 2022 18:53:40 +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 4JYKbS0zJXz4fZ3; Tue, 11 Jan 2022 18:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F0D2A1E894; Tue, 11 Jan 2022 18:53:39 +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 20BIrdrI061725; Tue, 11 Jan 2022 18:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BIrdpY061724; Tue, 11 Jan 2022 18:53:39 GMT (envelope-from git) Date: Tue, 11 Jan 2022 18:53:39 GMT Message-Id: <202201111853.20BIrdpY061724@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fba2e3af1da4 - main - archivers/p5-IO-Compress-Lzma: Use 7-zip instead of p7zip 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba2e3af1da46093efd74802bf2c34221a74ae05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641927220; 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=1YafozWpyLSND58FojPMLizqWz94v3lF8W4AYlbtRuI=; b=e7yQBabvX1ILUZUJi3OmxSviq0gSpYEe30pJHbsg+8A4v07ry/l1r2oKNqLHl0y13VIYoL G9ZjbsR6oHZd2AVEW3nmQXxVlAexiBj6yZcU6XM7uBMzH+QV5Jaj7qNA02N/bhrDS0lVbE mvBOKk6MF2qomWn3GRTNxSwOwVUbAr9fDu+RVjndbKPMn2koVU4/4M44m9MHWsqzxiAhNw 0/kv+9Q7a4036+rYIQ6oPz3tICqIkwrhaILq2qdluobsMEYNpOsVw4LAdA09Iow5byEy20 6GuTUnAM1+Qcx8+Yk4gDsTyXAcgGOuLiy4KSOpCZc4M0kgrL3GW+OmrS0t0+4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641927220; a=rsa-sha256; cv=none; b=VJmp5meET/RvMJzcPtHRBck9dNy4PNRShy8KjJrejBlko1NW4R+SYpyXikfGJERsnn4xGy rwO9I4Ih18RRrD6yaKy3R20+hP1/XtGHHrPILafRY//zTbDfo6SI1ap5WcJzvLO0SkKqyd J4dBlNGnt/OyDyy/NnPVxsI+FkV12X+k4iJ+zg8JuNVyHzdYI61efMgg3nhh6ekYiPewP0 6zNPoUN+u2G11y80V3Yt8omp1RBrxJMlJ+sQCGaa7utvq3eqUbQxirCpiw4zzEboy9OKk5 YgWCOTlVqakK/T1ys5DbP8cH2A0xHabC4RWdI75lFxtzflOWLigA0l0VELjkhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fba2e3af1da46093efd74802bf2c34221a74ae05 commit fba2e3af1da46093efd74802bf2c34221a74ae05 Author: Po-Chuan Hsieh AuthorDate: 2022-01-11 17:13:44 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-11 18:44:07 +0000 archivers/p5-IO-Compress-Lzma: Use 7-zip instead of p7zip Suggested by: makc --- archivers/p5-IO-Compress-Lzma/Makefile | 6 +++--- .../files/patch-t-050interop-zip-lzma.t | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile index 333496e7933e..fa76c76ea71e 100644 --- a/archivers/p5-IO-Compress-Lzma/Makefile +++ b/archivers/p5-IO-Compress-Lzma/Makefile @@ -15,9 +15,9 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Compress-Raw-Lzma>=${PORTVERSION}:archivers/p5-Compress-Raw-Lzma \ p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress -TEST_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \ - p5-Test-Pod>=1:devel/p5-Test-Pod \ - p7zip>=0:archivers/p7zip +TEST_DEPENDS= 7zz:archivers/7-zip \ + p5-IO-String>=0:devel/p5-IO-String \ + p5-Test-Pod>=1:devel/p5-Test-Pod USES= perl5 USE_PERL5= configure diff --git a/archivers/p5-IO-Compress-Lzma/files/patch-t-050interop-zip-lzma.t b/archivers/p5-IO-Compress-Lzma/files/patch-t-050interop-zip-lzma.t new file mode 100644 index 000000000000..b02b72750681 --- /dev/null +++ b/archivers/p5-IO-Compress-Lzma/files/patch-t-050interop-zip-lzma.t @@ -0,0 +1,20 @@ +--- t/050interop-zip-lzma.t.orig 2020-10-31 11:10:56 UTC ++++ t/050interop-zip-lzma.t +@@ -22,7 +22,7 @@ BEGIN { + use bytes; + use warnings; + +-my $P7ZIP ='7z'; ++my $P7ZIP ='7zz'; + + + sub ExternalP7ZipWorks +@@ -115,7 +115,7 @@ sub memError + BEGIN { + + # Check external 7za exists +- my $p7zip = '7z'; ++ my $p7zip = '7zz'; + for my $dir (reverse split ":", $ENV{PATH}) + { + $P7ZIP = "$dir/$p7zip"