Received: by mail.netbsd.org (Postfix, from userid 605) id CF4A084EA3; Fri, 2 Aug 2019 11:48:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 573DF84EA2 for ; Fri, 2 Aug 2019 11:48:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id p5R4GvXjWYep for ; Fri, 2 Aug 2019 11:48:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CE41B84C6C for ; Fri, 2 Aug 2019 11:48:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C856FFBF4; Fri, 2 Aug 2019 11:48:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15647464976630" MIME-Version: 1.0 Date: Fri, 2 Aug 2019 11:48:17 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mk/extract To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190802114817.C856FFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15647464976630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Aug 2 11:48:17 UTC 2019 Modified Files: pkgsrc/mk/extract: bsd.extract-vars.mk extract Log Message: teach extract about .txz, a weird alias for .tar.xz. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/mk/extract/bsd.extract-vars.mk cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/extract/extract Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15647464976630 Content-Disposition: inline Content-Length: 2002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/extract/bsd.extract-vars.mk diff -u pkgsrc/mk/extract/bsd.extract-vars.mk:1.17 pkgsrc/mk/extract/bsd.extract-vars.mk:1.18 --- pkgsrc/mk/extract/bsd.extract-vars.mk:1.17 Fri Nov 30 18:38:19 2018 +++ pkgsrc/mk/extract/bsd.extract-vars.mk Fri Aug 2 11:48:17 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.extract-vars.mk,v 1.17 2018/11/30 18:38:19 rillig Exp $ +# $NetBSD: bsd.extract-vars.mk,v 1.18 2019/08/02 11:48:17 nia Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -60,7 +60,8 @@ USE_TOOLS+= lzip .if !empty(EXTRACT_ONLY:M*.lzma) USE_TOOLS+= xzcat .endif -.if !empty(EXTRACT_ONLY:M*.xz) +.if !empty(EXTRACT_ONLY:M*.xz) || \ + !empty(EXTRACT_ONLY:M*.txz) USE_TOOLS+= xzcat .endif .if !empty(EXTRACT_ONLY:M*.zip) Index: pkgsrc/mk/extract/extract diff -u pkgsrc/mk/extract/extract:1.18 pkgsrc/mk/extract/extract:1.19 --- pkgsrc/mk/extract/extract:1.18 Tue Oct 23 16:39:29 2018 +++ pkgsrc/mk/extract/extract Fri Aug 2 11:48:17 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: extract,v 1.18 2018/10/23 16:39:29 minskim Exp $ +# $NetBSD: extract,v 1.19 2019/08/02 11:48:17 nia Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -180,7 +180,7 @@ case "$distfile" in *.bz2|*.tbz|*.tbz2|*.bz) _cformat=bzip ;; *.lz) _cformat=lzip ;; *.lzma) _cformat=lzma ;; -*.xz) _cformat=xz ;; +*.xz|*.txz) _cformat=xz ;; *.Z) _cformat=compress ;; *) _cformat=none ;; esac @@ -202,7 +202,7 @@ esac # Derive the format of the archive based on the file extension. case "$distfile" in -*.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.tbz|*.tbz2|*.tar.lz|*.tar.lzma|*.tar.xz|*.tar.Z|*.tar.z|*.tar|*.tar.bz|*.tar.7z|*.crate) +*.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.txz|*.tbz|*.tbz2|*.tar.lz|*.tar.lzma|*.tar.xz|*.tar.Z|*.tar.z|*.tar|*.tar.bz|*.tar.7z|*.crate) _format=tar ;; *.cpio|*.cpio.gz|*.cpio.bz2) _format=cpio ;; --_----------=_15647464976630--