From nobody Sun May 22 06:39:10 2022 X-Original-To: dev-commits-ports-all@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 CCE501B4A202; Sun, 22 May 2022 06:39:13 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from unimail.uni-dortmund.de (mx1.hrz.uni-dortmund.de [129.217.128.51]) (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 (2048 bits) client-digest SHA256) (Client CN "unimail.tu-dortmund.de", Issuer "DFN-Verein Global Issuing CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L5W5X70QJz4f2v; Sun, 22 May 2022 06:39:12 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from mandree.no-ip.org (p54a0398f.dip0.t-ipconnect.de [84.160.57.143]) (authenticated bits=0) by unimail.uni-dortmund.de (8.17.1.9/8.17.1) with ESMTPSA id 24M6dBl2013962 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 22 May 2022 08:39:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tu-dortmund.de; s=unimail; t=1653201551; bh=IXn4xCP8frvkoBwNzaKnG44oZGqxzkQBL6/LOTEKL+M=; h=Date:Subject:To:References:Cc:From:In-Reply-To; b=BgAIbvqTntOzutOV9VBr0GZsyZbBjQMd8u1ckb11YNs09UEVymVMP3Zgq8j0hgRYs M9/vw0HXGPBGcrjr6y7zsXogwulyYQ2p6ZJSScyPuwXYl1hDojK+zacSlAPBCtyNM8 JsiVH27Jh/FWHCEPBYc99/59NRGqcA6AbwI4iFfI= Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id 05BF246C260; Sun, 22 May 2022 08:39:11 +0200 (CEST) Message-ID: <51999588-cb77-ef3b-391e-d138aed59e68@tu-dortmund.de> Date: Sun, 22 May 2022 08:39:10 +0200 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: git: c088899ebb34 - main - Mk/Uses/tar.mk: Add .tar.zst support (USES=tar:zst or USES=tar:zstd) Content-Language: en-US To: Po-Chuan Hsieh , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202205220614.24M6ECR2047137@gitrepo.freebsd.org> Cc: "Tobias C. Berner" From: Matthias Andree In-Reply-To: <202205220614.24M6ECR2047137@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4L5W5X70QJz4f2v X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tu-dortmund.de header.s=unimail header.b=BgAIbvqT; dmarc=none; spf=pass (mx1.freebsd.org: domain of matthias.andree@tu-dortmund.de designates 129.217.128.51 as permitted sender) smtp.mailfrom=matthias.andree@tu-dortmund.de X-Spamd-Result: default: False [-5.18 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:129.217.128.0/24]; RWL_MAILSPIKE_GOOD(0.00)[129.217.128.51:from]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[tu-dortmund.de:+]; RCVD_IN_DNSWL_MED(-0.20)[129.217.128.51:from]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:680, ipnet:129.217.0.0/16, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[84.160.57.143:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.987]; R_DKIM_ALLOW(-0.20)[tu-dortmund.de:s=unimail]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[tu-dortmund.de]; DWL_DNSWL_LOW(-1.00)[tu-dortmund.de:dkim]; MLMMJ_DEST(0.00)[dev-commits-ports-main,dev-commits-ports-all] X-ThisMailContainsUnwantedMimeParts: N Am 22.05.22 um 08:14 schrieb Po-Chuan Hsieh: > The branch main has been updated by sunpoet: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=c088899ebb347656e57e2cab0bcf0133cd34c332 > > commit c088899ebb347656e57e2cab0bcf0133cd34c332 > Author: Po-Chuan Hsieh > AuthorDate: 2022-05-22 06:13:22 +0000 > Commit: Po-Chuan Hsieh > CommitDate: 2022-05-22 06:13:22 +0000 > > Mk/Uses/tar.mk: Add .tar.zst support (USES=tar:zst or USES=tar:zstd) > > - While I'm here, sort tar arguments for easier lookup > --- > Mk/Uses/tar.mk | 28 +++++++++++++++------------- > 1 file changed, 15 insertions(+), 13 deletions(-) > > diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk > index a847cb540616..c5b07ac3aa0b 100644 > --- a/Mk/Uses/tar.mk > +++ b/Mk/Uses/tar.mk > @@ -1,33 +1,35 @@ > # handle tar archives > # > # Feature: tar > -# Usage: USES=tar[:[xz|lz|lzma|txz|bz[ip]2|tgz|tbz|tbz2|Z]] > +# Usage: USES=tar[:[Z|bz2|bzip2|lz|lzma|tbz|tbz2|tgz|txz|xz|zst|zstd] > # > # MAINTAINER: ports@FreeBSD.org > > .if !defined(_INCLUDE_USES_TAR_MK) > _INCLUDE_USES_TAR_MK= yes > > -. if ${tar_ARGS} == xz > -EXTRACT_SUFX?= .tar.xz > +. if empty(tar_ARGS) > +EXTRACT_SUFX?= .tar > +. elif ${tar_ARGS} == Z > +EXTRACT_SUFX?= .tar.Z > +. elif ${tar_ARGS} == bz2 || ${tar_ARGS} == bzip2 It would have been good to point out this line was the culprit and the earlier commit that got reverted was comparing against bz: $ git diff 863e0d46e6fac215477cf3f9787fb89bd216191c..c088899ebb347656e57e2cab0bcf0133cd34c332 Mk/Uses/tar.mk ... -. elif ${tar_ARGS} == bz || ${tar_ARGS} == bzip2 +. elif ${tar_ARGS} == bz2 || ${tar_ARGS} == bzip2