<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/caa213513f1b06520381d280c8edb72dbe333e08">https://github.com/macports/macports-ports/commit/caa213513f1b06520381d280c8edb72dbe333e08</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit caa213513f1b06520381d280c8edb72dbe333e08
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 20 21:02:47 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac-devel: Remove error file extraction code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 36.00alpha-20180520 and later automatically export the error file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reverts part of 8725302f5b41184703d93d4cd8bb96ffce7f014a and all of
</span><span style='display:block; white-space:pre;color:#404040;'> a9aef02445333b920b669974403f382999413f2b and
</span><span style='display:block; white-space:pre;color:#404040;'> 5ad90420696e22189d8d334fe5eeaeb8adc3d724.
</span>---
emulators/minivmac-devel/Portfile | 31 +------------------------------
emulators/minivmac-devel/files/attach.exp | 13 -------------
2 files changed, 1 insertion(+), 43 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 cb5696f..6b95cf2 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;'>@@ -118,11 +118,9 @@ if {${my_subport} eq ${my_name}} {
</span>
depends_extract port:bsdiff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build bin:expect:expect \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:timeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:timeout
</span>
depends_skip_archcheck bsdiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- expect \
</span> timeout
set my_app_dir "${applications_dir}/Mini vMac"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,25 +267,14 @@ 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;'>- # Sandbox didn't used to allow access to the ptys Expect needs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-base/commit/8765c14223c2826c958cddd4e33c17801d63ddb4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.4.99] >= 0} {
</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;'>- delete ${my_mnvm_dat}/disk3.dmg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln ${my_mnvm_dat}/disk3.dsk ${my_mnvm_dat}/disk3.dmg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mountpoint [my_attach_disk_image ${my_mnvm_dat}/disk3.dmg]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${mountpoint}/output/minivmac.err.txt]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${mountpoint}/output/minivmac.err.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_detach_disk_image ${mountpoint}
</span> if {[file exists ${worksrcpath}/minivmac.err.txt]} {
set fp [open ${worksrcpath}/minivmac.err.txt r]
set error_text [read ${fp}]
close ${fp}
return -code error ${error_text}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
set my_src_tarball ${worksrcpath}/${my_variation}.tar
if {[file isfile ${my_src_tarball}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,19 +529,3 @@ proc my_read_alias {file} {
</span> global filespath
return [exec osascript ${filespath}/readalias.applescript [file normalize ${file}]]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Mounts a disk image, using an Expect script that answers "yes" when some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# versions of hdiutil ask if we want to mount the image even though it may be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# damaged.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc my_attach_disk_image {disk_image} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global my_name filespath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mountpoint [mkdtemp "/tmp/${my_name}.XXXXXXXX"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "expect ${filespath}/attach.exp '${disk_image}' '${mountpoint}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${mountpoint}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Unmounts a disk image.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc my_detach_disk_image {mountpoint} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "hdiutil detach ${mountpoint} -force"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${mountpoint}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/attach.exp b/emulators/minivmac-devel/files/attach.exp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 32eb52b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/attach.exp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/usr/bin/env expect --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-spawn hdiutil attach "[lindex $argv 0]" -mountpoint "[lindex $argv 1]" -private -nobrowse -noautoopen -noautofsck -noverify -readonly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-expect {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Are you sure you want to open" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exp_send "Y\r"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exp_continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/dev/" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- interact
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>