Re: git: c088899ebb34 - main - Mk/Uses/tar.mk: Add .tar.zst support (USES=tar:zst or USES=tar:zstd)

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 <sunpoet@FreeBSD.org>
> AuthorDate: 2022-05-22 06:13:22 +0000
> Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> 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