From nobody Sun May 22 06:14:12 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 947111B446A6; Sun, 22 May 2022 06:14:12 +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 4L5VXh3kZzz4ZLV; Sun, 22 May 2022 06:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653200052; 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=0gWUf79W1yD4EDJFjmuoGIKTR5kRLSX+Lsu29LUDzao=; b=WJM1CDs0tBzSWimHyr8GYvReEFJao3O3Q87F9acneR6s8lAdlNgMKIrhT9QR+uVnV5I4l0 rXSgop1ep+WqDYF7DeWDXfKoFqLkSrW29o8LahikRZwEzz6dq2PhHpQG17fe2oul3ALNQv KaoW5gDuyHdoJBtWVaD1yt19ZvhtHzfX0YjKFCVr54656Wn1SnlUEVn8jQ6O7s2hhK5tVH ncVEtkjukZb9ph0E8BOMpQ0e6FN4SEF9PfVda3tR/UJ8T5AFvsYhJn4Vo5Bnh4Ii5Xmxwb bgzzuRATsrhP+GoVFtMavDFsojj3b7Syr2/KjHYfYd4UI/QcNw0C5tJGWeKatw== 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 6045C15DC6; Sun, 22 May 2022 06:14:12 +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 24M6ECg1047138; Sun, 22 May 2022 06:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M6ECR2047137; Sun, 22 May 2022 06:14:12 GMT (envelope-from git) Date: Sun, 22 May 2022 06:14:12 GMT Message-Id: <202205220614.24M6ECR2047137@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: c088899ebb34 - main - Mk/Uses/tar.mk: Add .tar.zst support (USES=tar:zst or USES=tar:zstd) 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 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: c088899ebb347656e57e2cab0bcf0133cd34c332 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653200052; 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=0gWUf79W1yD4EDJFjmuoGIKTR5kRLSX+Lsu29LUDzao=; b=rBEA4wO6WqEhEHysV36FfEsPem7DBsKyKIUE4JXpwgjf5NJlqS1NJxVWKVSjFLGLhghpvU IdSKI/i6+Kemo6WRilB2Nh+Ed6Cs2bjk+0fmf2/Krm7ZeUb/UgiZ5uVwrKpp2ceygOY2NQ D1WYozDhE57qu1AaQ3VN6jxi/OFkNWDmdWrMznWB/nv+jlt6I1InRorQyQjcT8noVaZb2e xyJlb6LIiRs2nVwsaahx5M8L+aU8p+wp8iSoUHsiiAyxvi4OcXAZXlwZ2TV+o4ReNHlOEy fSX1F3g69VAre/maJG6aA9k16uAHMSMOZOh3DNt6urzmiU8FdqnKwyFUmSR1GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653200052; a=rsa-sha256; cv=none; b=KRgF9iHgDI3nSkTYZmfCIUBW62+n5BgeHXvEWGmo0pwoaCdFepJ2reKfKq1kfUCXIKnu8Z O33+e4XUXZenk0smgABCIqDC0A2MK8Yr9ZA3IHGah4HzCmlu0g4Xv0anZVEnLqpoNSLp5o oBRTKLoYBIFF4gt/Ue1lVz1O2docuoC1Ta7tgsmr2GBUctU/bcaXHp/iyw4VnMiETa8CyS 8aqSYUPOeqIZ7ipQmel5ul4ZVnnYcv5byYh1cJxetKr8/N6lkSGinWdSqf8Rg252oaLB1+ iBvrdxqNLB701Qzy3UtVMgoGOcyF6/lgTPOFXkvD5zNujlPPpO/FHEMHCseiTA== 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=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 +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