<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/8725302f5b41184703d93d4cd8bb96ffce7f014a">https://github.com/macports/macports-ports/commit/8725302f5b41184703d93d4cd8bb96ffce7f014a</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 8725302 minivmac-devel: Show configure errors to the user
</span>8725302 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8725302f5b41184703d93d4cd8bb96ffce7f014a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 19 04:41:13 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac-devel: Show configure errors to the user
</span>---
emulators/minivmac-devel/Portfile | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 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 987c2b7..c9473bd 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;'>@@ -89,7 +89,7 @@ set my_app_dir "${applications_dir}/Mini vMac"
</span> set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
set my_bootstrap_app "Mini vMac Bootstrap.app"
set my_rom_file vMac.ROM
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_base_options "-maintainer MacPorts -homepage https://www.macports.org -cl -eol unx -sony-sum 1 -sony-tag 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_base_options "-ef 1 -maintainer MacPorts -homepage https://www.macports.org -cl -eol unx -sony-sum 1 -sony-tag 1"
</span> set my_archs {}
options my_variations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,6 +249,24 @@ configure {
</span> }
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if a configuration error occurred. This can happen if invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configuration flags were specified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${my_mnvm_dat}/disk3.dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln ${my_mnvm_dat}/disk3.dsk ${my_mnvm_dat}/disk3.dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mountpoint [exec mktemp -d /tmp/mnvm.XXXXXXXX]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "hdiutil attach '${my_mnvm_dat}/disk3.dmg' -readonly -mountpoint '${mountpoint}' -nobrowse"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${mountpoint}/output/minivmac.err.txt]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${mountpoint}/output/minivmac.err.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "hdiutil detach '${mountpoint}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${mountpoint}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${worksrcpath}/minivmac.err.txt]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/minivmac.err.txt r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set error_text [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error ${error_text}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file mkdir ${build.dir}
set my_variation_dirs {}
foreach my_arch ${my_archs} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,8 +303,8 @@ post-configure {
</span> xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
reinplace "s|@SUBDIRS@|[join ${my_variation_dirs}]|" ${build.dir}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If no variation directories were produced by configuration, the flags we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # passed in may have been bad.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If no variation directories were produced by configuration, something went
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # horribly wrong.
</span> if {${my_variation_dirs} eq ""} {
return -code error "configuration failed!"
}
</pre><pre style='margin:0'>
</pre>