From nobody Sun May 22 05:58:13 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 28E671B417EE; Sun, 22 May 2022 05:58:14 +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 4L5VBG0c36z4XNl; Sun, 22 May 2022 05:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653199094; 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=fFy5dg5Oz7fXom7NKgfj6LSTvK7ypp7miCqlBldaFZk=; b=na53TQFAzc8ck9SstLPXQUO/k84h/dmgIVWM1dqvZSZfDtT2vLPlVVSlJPH5GgTd+ifSYx o1rUBUnCSUXRPW3qRggW/d4BkkzmNoZC6SHsUX6DpYfSsieT8lUbJOZus65xVWUi/g4REo 997/xAtUE8zbLNVU1IAT5TA39Iza06uoZxnrk+Py7PVDG9bmZlOwECMfrYsWxpGrXKuEsZ SucFKms5RZBnicnXLAyT0cgXWHQlkGtwX+tFQitWW2MCQGsggruY60tSA0OwplAyKFRJS3 Y6B0MdQCk7KvGJOiXetMdRYJu2SLSS3FUHAAEWWkSor2Uz/v/1WuI2DXgqJdjw== 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 E4F2A15938; Sun, 22 May 2022 05:58:13 +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 24M5wDjU020095; Sun, 22 May 2022 05:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M5wDkB020094; Sun, 22 May 2022 05:58:13 GMT (envelope-from git) Date: Sun, 22 May 2022 05:58:13 GMT Message-Id: <202205220558.24M5wDkB020094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 1d244c00f3ec - main - Mk/Uses/tar.mk: revert "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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d244c00f3ec8a406b921592edc121a4d103f16d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653199094; 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=fFy5dg5Oz7fXom7NKgfj6LSTvK7ypp7miCqlBldaFZk=; b=XxbKILBA+RWteIuxbLj+TEC9AnNkGz/I2eg2dFaIEKqNvLWqt0Yp49qa3o8/mSkL9oak2z tGshIU86VkvHUFJrTa0fgw1/TODFMokW9O19rzwvVW33ak2ZCxDUJ4dUmTeVwoRDSyR74B vZ1x36oMi4/wmlz349ophyqdUQMXj9/k0TkmweJbiu3PScus/hfE+WwR0EjF5p/xMW8nD5 hwKM02DJ6UraBOX4cXAzNmxF45QifxXFcjqQf/Vws9Ik9xf+x/bxTIH5y2AUX/WnQ/npjS KzaN3xG2Zm/xq7fk3Py1vkJLfIc+l9OxSqTEa3pClriFev8xZGvCLGRj/ugm+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653199094; a=rsa-sha256; cv=none; b=If5mgN5SCaR8DtkRJ9MdEiq7QpEBqrxkBmAJ/BeI8muDwQ4jKjyZcJeZUNqWBZwksuhnHH kgEstjVeOhTdGsspcQKnO4g1QQjEr1Q4U/K66dWN1AGdkezjtL2jDL5LjzV3Lqzlgwb+th iURiMyyFLfN/JkZIWKm/l1ClEtl9jU5BWIfqj/hpQ3Jf+PQvdBFBOiM4BV8PmoYWszxHzh pEoAxhZC5PBQZdIUvCMADq16FSZZn96BxPZ2EHbwInBezSP6wJpfyKOHOFRHN6HEBtGjba YLtYMFJYziZ3mX3b1wiS6oKXc6maJP5ifR24IMxcorxgkjbjfpmaKtznrKUnTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d244c00f3ec8a406b921592edc121a4d103f16d commit 1d244c00f3ec8a406b921592edc121a4d103f16d Author: Tobias C. Berner AuthorDate: 2022-05-22 05:56:04 +0000 Commit: Tobias C. Berner CommitDate: 2022-05-22 05:57:49 +0000 Mk/Uses/tar.mk: revert "Add .tar.zst support (USES=tar:zst or USES=tar:zstd)" This reverts commit 863e0d46e6fac215477cf3f9787fb89bd216191c. Reverted due to error: ===> libmtdev-1.1.6_1 Incorrect 'USES+=tar:bz2'. *** Error code 1 Stop. Please fix, test, and readd. With hat: portmgr --- Mk/Uses/tar.mk | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Mk/Uses/tar.mk b/Mk/Uses/tar.mk index ff1d471360a3..a847cb540616 100644 --- a/Mk/Uses/tar.mk +++ b/Mk/Uses/tar.mk @@ -1,35 +1,33 @@ # handle tar archives # # Feature: tar -# Usage: USES=tar[:[Z|bz2|bzip2|lz|lzma|tbz|tbz2|tgz|txz|xz|zst|zstd] +# Usage: USES=tar[:[xz|lz|lzma|txz|bz[ip]2|tgz|tbz|tbz2|Z]] # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_TAR_MK) _INCLUDE_USES_TAR_MK= yes -. 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 +. if ${tar_ARGS} == xz +EXTRACT_SUFX?= .tar.xz . 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} == 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 +. elif ${tar_ARGS} == Z +EXTRACT_SUFX?= .tar.Z +. elif empty(tar_ARGS) +EXTRACT_SUFX?= .tar . else IGNORE= Incorrect 'USES+=tar:${tar_ARGS}' . endif