From nobody Sun May 22 05:17:31 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 185821AEE62F; Sun, 22 May 2022 05:17:35 +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 4L5THK3NQjz3R3k; Sun, 22 May 2022 05:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196654; 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=p+NtR1SgyN+34GXNXPdAa4ofzuYTW9CHJCp9lgWIOBE=; b=SNeKiFfcR/5QEVXIw3pybWgbu+r2+tBRJmv4Xtk/NR1ICp7ijhs9IBo92ixkScViwz/TVt 3AYpVPoVJaKO4t4YphqaFu7KlalZdhPLv8H0tXxWLb2LrVBYnEmp45QIAFVyl4FUdQEcS/ BjhP8naM0yXfsWJenoLID1ZWL4K5jLeK7+JxkeEK4YomZ3H7pOr4ZiuLCh5Z6WZ+qEXyOy 05HKTp5fBF8uPlGZAAGB56pnl2PXnPk0nrDXtvD/m5xpwgv79Syi8AP6dPSCyp0puLoiPI L36RnBj+c4OGw76qZe6+hPrzVOW/BMPx+6bkh8odsJV8EHu5z8nSywog1kAlsA== 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 8FBFA15241; Sun, 22 May 2022 05:17:31 +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 24M5HVcD064755; Sun, 22 May 2022 05:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M5HV1c064754; Sun, 22 May 2022 05:17:31 GMT (envelope-from git) Date: Sun, 22 May 2022 05:17:31 GMT Message-Id: <202205220517.24M5HV1c064754@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: 863e0d46e6fa - main - Mk/Uses/tar.mk: Add .tar.zst support (USES=tar:zst or USES=tar:zstd) 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: 863e0d46e6fac215477cf3f9787fb89bd216191c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196654; 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=p+NtR1SgyN+34GXNXPdAa4ofzuYTW9CHJCp9lgWIOBE=; b=JN8w9ij4qZD/L5hILm0BTz8YnujGYorbOPnI0NXxUFqfQIj7QDiAAzGLy7DFdUocYM/lEO DRMNQwkK3SS1oZozM93IrzVkH8C8AWpTWYp9RC3k+hT/x9D2TuqFhTNaNmJfOFzYwrQudC jvbAeRAcqWqc/faD60ZSliJD5eDe6tvPLxb/iVKhHzjEiaWfiem1ssYY8KCFn9U7XQsTWo r49H9TxSZjXXgBaCVKTSJE9VIJ9zrKHzYr88Gw3vrhLCXKgGRdnzVgs0SO8Tz4JfLmGLrd PEBXjJRn/29Nu67bbtpOL+m8PmfOVshGvBTpFBKEgi9tTsjTWnETu1cozc32zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653196654; a=rsa-sha256; cv=none; b=mzh2rQbFQ5koUqgnhj1XfSu4Eq8INFmw/FYBaku/Hz3pCI0e72FqQvhCGqQMN35YoB5Id+ ag/GqnlqnjZOK+kWMt6OEo3cs+SiuuwUsKrtSkQrGLHD/WjLDmXWgWWXVNqjdLk+2b3UNO +l5E0zXzFQqOdGuDOT4XHbAPuvOecevUnNzprTXxgbCdxNCnvn6gWLgP2M6bRBzM8AFrn+ i92Qt1yAWxkjBLUjb9H370F8WmXKyQ7eZY5dJi+yKl9wHWZXpBJtJjH57RsavgWzl6edyZ oyyVJoIzjXwGdiElyg0VDqbB/iEU8j44JM3LdaFzYgS0lpYnJhONSzWEkaaPbw== 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=863e0d46e6fac215477cf3f9787fb89bd216191c commit 863e0d46e6fac215477cf3f9787fb89bd216191c Author: Po-Chuan Hsieh AuthorDate: 2022-05-22 04:27:24 +0000 Commit: Po-Chuan Hsieh 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