[pkgsrc/trunk]: pkgsrc/mk/extract teach extract about .txz, a weird alias for...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b7e12ef96f48
branches:  trunk
changeset: 337286:b7e12ef96f48
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 02 11:48:17 2019 +0000

description:
teach extract about .txz, a weird alias for .tar.xz.

diffstat:

 mk/extract/bsd.extract-vars.mk |  5 +++--
 mk/extract/extract             |  6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r fd4010a4807b -r b7e12ef96f48 mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Fri Aug 02 11:27:35 2019 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Fri Aug 02 11:48:17 2019 +0000
@@ -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 @@
 .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)
diff -r fd4010a4807b -r b7e12ef96f48 mk/extract/extract
--- a/mk/extract/extract        Fri Aug 02 11:27:35 2019 +0000
+++ b/mk/extract/extract        Fri Aug 02 11:48:17 2019 +0000
@@ -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 @@
 *.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 @@
 
 # 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 ;;