<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/c582d68761ca6aa81fb5ae17cc7d7313c15d5570">https://github.com/macports/macports-ports/commit/c582d68761ca6aa81fb5ae17cc7d7313c15d5570</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c582d68761ca6aa81fb5ae17cc7d7313c15d5570
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 11 19:17:37 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac*: Combine configure phase
</span>---
emulators/minivmac-devel/Portfile | 6 +-----
emulators/minivmac/Portfile | 6 +-----
2 files changed, 2 insertions(+), 10 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 f2acf40..83810db 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;'>@@ -212,7 +212,7 @@ if {${subport} eq ${name}} {
</span> move -force "${worksrcpath}/Disk Tools.image.tmp" "${worksrcpath}/Disk Tools.image"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure {
</span> # Copy the disk images into the data directory with sequentially-numbered
# names so Mini vMac will find them and automatically mount them.
copy -force "${worksrcpath}/Disk Tools.image" "${my_mnvm_dat}/disk1.dsk"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,15 +248,11 @@ if {${subport} eq ${name}} {
</span> # Set the number of seconds to wait before killing the bootstrap Mini vMac
# app, in case it gets stuck.
configure.pre_args [expr 10 * ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure {
</span> # Launch the bootstrap Mini vMac to run the configuration. When it's done
# it should automatically quit, but if not, we time out after awhile.
exec -ignorestderr ${prefix}/bin/timeout ${configure.pre_args} "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" 2>/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span> # Sandbox didn't used to allow access to the ptys Expect needs.
# https://github.com/macports/macports-base/commit/8765c14223c2826c958cddd4e33c17801d63ddb4
if {[vercmp [macports_version] 2.4.99] >= 0} {
<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 d50a28b..915cefa 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;'>@@ -205,7 +205,7 @@ if {${subport} eq ${name}} {
</span> move -force "${worksrcpath}/Disk Tools.image.tmp" "${worksrcpath}/Disk Tools.image"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure {
</span> # Copy the disk images into the data directory with sequentially-numbered
# names so Mini vMac will find them and automatically mount them.
copy -force "${worksrcpath}/Disk Tools.image" "${my_mnvm_dat}/disk1.dsk"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,15 +241,11 @@ if {${subport} eq ${name}} {
</span> # Set the number of seconds to wait before killing the bootstrap Mini vMac
# app, in case it gets stuck.
configure.pre_args [expr 10 * ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure {
</span> # Launch the bootstrap Mini vMac to run the configuration. When it's done
# it should automatically quit, but if not, we time out after awhile.
exec -ignorestderr ${prefix}/bin/timeout ${configure.pre_args} "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" 2>/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span> file mkdir ${build.dir}
set my_variation_dirs {}
foreach my_arch [get_canonical_archs] {
</pre><pre style='margin:0'>
</pre>