<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/30d36ce0143086cd7fea2afb350a3482836dafb8">https://github.com/macports/macports-base/commit/30d36ce0143086cd7fea2afb350a3482836dafb8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 30d36ce0143086cd7fea2afb350a3482836dafb8
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Apr 18 17:38:27 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Add hfscompression option to macports.conf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This can be used to control whether the transparent HFS+ compression
</span><span style='display:block; white-space:pre;color:#404040;'> will be applied. The default value is yes. If enabled, bsdtar from
</span><span style='display:block; white-space:pre;color:#404040;'> libarchive is required or it will do nothing.
</span>---
doc/macports.conf.in | 6 ++++++
src/macports1.0/macports.tcl | 10 ++++++++--
src/registry2.0/portimage.tcl | 4 +++-
3 files changed, 17 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/macports.conf.in b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f969d9..cf37d61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,12 @@ variants_conf @MPCONFIGDIR_EXPANDED@/variants.conf
</span> # cpio, tar, tbz, tbz2, tgz, tlz, txz, xar, zip.
#portarchivetype tbz2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Apply transparent filesystem compression to files on activation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Requires bsdtar with support for --hfsCompression in binpath, which can be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# provided by installing the libarchive port. This will work with HFS+ or APFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# volumes only and will be ignored on other filesystems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#hfscompression yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # CPU architecture to target. Supported values are "ppc", "ppc64",
# "i386", and "x86_64". Defaults to:
# - OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 52f554f..b2fce2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ namespace eval macports {
</span> namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities
variable bootstrap_options "\
portdbpath binpath auto_path extra_env sources_conf prefix portdbformat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portarchivetype portautoclean \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portarchivetype hfscompression portautoclean \
</span> porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \
rsync_dir startupitem_autostart startupitem_type startupitem_install \
place_worksymlink xcodeversion xcodebuildcmd \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,7 +656,8 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> macports::ping_cache \
macports::host_cache \
macports::delete_la_files \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports::cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::hfscompression
</span>
# Set the system encoding to utf-8
encoding system utf-8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -969,6 +970,11 @@ Please edit sources.conf and change '$url' to '[string range $url 0 end-6]tarbal
</span> set macports::portarchivetype [lindex $portarchivetype 0]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable HFS+ compression by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists macports::hfscompression]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::hfscompression yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set rync options
if {![info exists rsync_server]} {
global macports::rsync_server
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b895f5..f12f541 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,9 +350,11 @@ proc extract_archive_to_tmpdir {location} {
</span> }
}
t(ar|bz|lz|xz|gz) {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global macports::hfscompression
</span> # Opportunistic HFS compression. bsdtar will automatically
# disable this if filesystem does not support compression.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {macports::binaryInPath bsdtar}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::hfscompression} &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![catch {macports::binaryInPath bsdtar}] &&
</span> ![catch {exec bsdtar -x --hfsCompression < /dev/null >& /dev/null}]} {
ui_debug "Using bsdtar with HFS+ compression (if valid)"
set unarchive.cmd "bsdtar"
</pre><pre style='margin:0'>
</pre>