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

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=863e0d46e6fac215477cf3f9787fb89bd216191c

commit 863e0d46e6fac215477cf3f9787fb89bd216191c
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-05-22 04:27:24 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-05-22 05:11:37 +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..ff1d471360a3 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} == bz || ${tar_ARGS} == bzip2
+EXTRACT_SUFX?=	.tar.bz2
 .  elif ${tar_ARGS} == lz
 EXTRACT_SUFX?=	.tar.lz
 .  elif ${tar_ARGS} == lzma
 EXTRACT_SUFX?=	.tar.lzma
-.  elif ${tar_ARGS} == txz
-EXTRACT_SUFX?=	.txz
-.  elif ${tar_ARGS} == bzip2 || ${tar_ARGS} == bz2
-EXTRACT_SUFX?=	.tar.bz2
-.  elif ${tar_ARGS} == tgz
-EXTRACT_SUFX?=	.tgz
 .  elif ${tar_ARGS} == tbz
 EXTRACT_SUFX?=	.tbz
 .  elif ${tar_ARGS} == tbz2
 EXTRACT_SUFX?=	.tbz2
-.  elif ${tar_ARGS} == Z
-EXTRACT_SUFX?=	.tar.Z
-.  elif empty(tar_ARGS)
-EXTRACT_SUFX?=	.tar
+.  elif ${tar_ARGS} == tgz
+EXTRACT_SUFX?=	.tgz
+.  elif ${tar_ARGS} == txz
+EXTRACT_SUFX?=	.txz
+.  elif ${tar_ARGS} == xz
+EXTRACT_SUFX?=	.tar.xz
+.  elif ${tar_ARGS} == zst || ${tar_ARGS} == zstd
+EXTRACT_SUFX?=	.tar.zst
 .  else
 IGNORE=	Incorrect 'USES+=tar:${tar_ARGS}'
 .  endif