<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/f10e0e371631a1a973d8988addaf98c3afb3f1db">https://github.com/macports/macports-base/commit/f10e0e371631a1a973d8988addaf98c3afb3f1db</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f10e0e3 Add use_tar option
</span>f10e0e3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f10e0e371631a1a973d8988addaf98c3afb3f1db
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Fri Apr 6 02:28:32 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Add use_tar option
</span>---
doc/portfile.7 | 16 +++++++++++++++-
src/port1.0/portextract.tcl | 10 +++++++---
src/port1.0/portfetch.tcl | 9 +++++++--
3 files changed, 29 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/portfile.7 b/doc/portfile.7
</span><span style='display:block; white-space:pre;color:#808080;'>index b19cecc..f4e5314 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> .\" portfile.7
.\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-.\" Copyright (c) 2004-2014 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.\" Copyright (c) 2004-2015, 2017-2018 The MacPorts Project
</span> .\" Copyright (c) 2002-2003 Apple Inc.
.\" All rights reserved.
.\"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -873,6 +873,20 @@ Sets extract.cmd to: lzma
</span> .br
.Sy Example:
.Dl use_lzma yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+.It Ic use_tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use an uncompressed tar archive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Sets extract.suffix to: .tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Sets extract.cmd to: tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Sets extract.pre_args to: -xf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.Sy Type:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.Em optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.br
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.Sy Example:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.Dl use_tar yes
</span> .It Ic use_xz
Use xz.
.br
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portextract.tcl b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d0aac51..04b8049 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # et:ts=4
# portextract.tcl
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2005, 2007-2011, 2013 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2005, 2007-2011, 2013-2014, 2016, 2018 The MacPorts Project
</span> # Copyright (c) 2002 - 2003 Apple Inc.
# Copyright (c) 2007 Markus W. Weissmann <mww@macports.org>
# All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ proc portextract::disttagclean {list} {
</span> }
proc portextract::extract_start {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global UI_PREFIX extract.dir extract.mkdir use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global UI_PREFIX extract.dir extract.mkdir use_tar use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg
</span>
ui_notice "$UI_PREFIX [format [msgcat::mc "Extracting %s"] [option subport]]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,11 @@ proc portextract::extract_start {args} {
</span> file mkdir ${worksrcpath}
set extract.dir ${worksrcpath}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_bzip2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_tar]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option extract.cmd [findBinary tar ${portutil::autoconf::tar_command}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option extract.pre_args -xf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option extract.post_args ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[tbool use_bzip2]} {
</span> if {![catch {findBinary lbzip2} result]} {
option extract.cmd $result
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3991dbb..2a58241 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004 - 2014, 2016 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004 - 2014, 2016-2018 The MacPorts Project
</span> # Copyright (c) 2002 - 2003 Apple Inc.
# All rights reserved.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ namespace eval portfetch {
</span> }
# define options: distname master_sites
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options master_sites patch_sites extract.suffix distfiles patchfiles use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg dist_subdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options master_sites patch_sites extract.suffix distfiles patchfiles use_tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg dist_subdir \
</span> fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \
master_sites.mirror_subdir patch_sites.mirror_subdir \
bzr.url bzr.revision \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,6 +121,7 @@ default mirror_sites.listfile {"mirror_sites.tcl"}
</span> default mirror_sites.listpath {"port1.0/fetch"}
# Option-executed procedures
<span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc use_tar portfetch::set_extract_type
</span> option_proc use_bzip2 portfetch::set_extract_type
option_proc use_lzma portfetch::set_extract_type
option_proc use_xz portfetch::set_extract_type
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +136,9 @@ proc portfetch::set_extract_type {option action args} {
</span> global extract.suffix
if {[string equal ${action} "set"] && [tbool args]} {
switch $option {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_tar {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extract.suffix .tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> use_bzip2 {
set extract.suffix .tar.bz2
if {![catch {findBinary lbzip2} result]} {
</pre><pre style='margin:0'>
</pre>