<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6134e10054c00b32b0328f8969e0a0a05e27174">https://github.com/macports/macports-ports/commit/c6134e10054c00b32b0328f8969e0a0a05e27174</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c6134e10054c00b32b0328f8969e0a0a05e27174
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 20 21:09:02 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac*: New mnvm_output_dir variable
</span>---
emulators/minivmac-devel/Portfile | 7 ++++---
emulators/minivmac/Portfile | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/Portfile b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b95cf2..4648eba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,6 +175,7 @@ if {${my_subport} eq ${my_name}} {
</span> build.dir ${workpath}/build
extract.mkdir yes
set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mnvm_output_dir ${worksrcpath}
</span>
post-extract {
# Decompress the system disk container image.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,14 +270,14 @@ if {${my_subport} eq ${my_name}} {
</span>
# Check if a configuration error occurred. This can happen if
# invalid configuration options were specified.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${worksrcpath}/minivmac.err.txt]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${worksrcpath}/minivmac.err.txt r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${mnvm_output_dir}/minivmac.err.txt]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${mnvm_output_dir}/minivmac.err.txt r]
</span> set error_text [read ${fp}]
close ${fp}
return -code error ${error_text}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_src_tarball ${worksrcpath}/${my_variation}.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_src_tarball ${mnvm_output_dir}/${my_variation}.tar
</span> if {[file isfile ${my_src_tarball}]} {
set my_variation_dir ${my_arch}/${my_machine}
lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/Portfile b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d39f2c5..75205f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +169,7 @@ if {${my_subport} eq ${my_name}} {
</span> build.dir ${workpath}/build
extract.mkdir yes
set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mnvm_output_dir ${worksrcpath}
</span>
post-extract {
# Decompress the system disk container image.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +261,7 @@ if {${my_subport} eq ${my_name}} {
</span> # it should automatically quit, but if not, we time out after awhile.
exec -ignorestderr ${prefix}/bin/timeout ${my_bootstrap_timeout} "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" 2>/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_src_tarball ${worksrcpath}/${my_variation}.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_src_tarball ${mnvm_output_dir}/${my_variation}.tar
</span> if {[file isfile ${my_src_tarball}]} {
set my_variation_dir ${my_arch}/${my_machine}
lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
</pre><pre style='margin:0'>
</pre>