<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/5ef1bf3de410c26d125928a090557201827230e2">https://github.com/macports/macports-ports/commit/5ef1bf3de410c26d125928a090557201827230e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5ef1bf3de410c26d125928a090557201827230e2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jul 2 22:35:34 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    minivmac*: Ensure universal variant exists
</span>---
 emulators/minivmac-devel/Portfile | 8 ++++----
 emulators/minivmac/Portfile       | 8 ++++----
 2 files changed, 8 insertions(+), 8 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 307ebac..b34e17d 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;'>@@ -321,7 +321,7 @@ if {${my_subport} eq ${my_name}} {
</span>                     system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
 
                     # Prevent merge error.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[variant_exists universal] && [variant_isset universal]} {
</span>                         reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
                     }
                 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,7 +341,7 @@ if {${my_subport} eq ${my_name}} {
</span> 
     destroot {
         foreach my_arch [get_canonical_archs] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[variant_exists universal] && [variant_isset universal]} {
</span>                 set my_dest ${workpath}/pre-dest/${my_arch}
             } else {
                 set my_dest ${destroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,7 +352,7 @@ if {${my_subport} eq ${my_name}} {
</span>                     "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
             }
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_exists universal] && [variant_isset universal]} {
</span>             merge ${workpath}/pre-dest
         }
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,7 +529,7 @@ if {[tbool bootstrap]} {
</span>             ui_msg
             ui_msg "${output_archive}"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {![variant_isset universal] || "ppc" ni ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![variant_exists universal] || ![variant_isset universal] || "ppc" ni ${configure.universal_archs}} {
</span>                 ui_msg
                 ui_warn "DON'T DISTRIBUTE THIS FILE! It doesn't contain all the"
                 ui_warn "necessary architectures. To build a distributable"
<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 1a702b6..9b5f842 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;'>@@ -311,7 +311,7 @@ if {${my_subport} eq ${my_name}} {
</span>                     system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
 
                     # Prevent merge error.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[variant_exists universal] && [variant_isset universal]} {
</span>                         reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
                     }
                 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +331,7 @@ if {${my_subport} eq ${my_name}} {
</span> 
     destroot {
         foreach my_arch [get_canonical_archs] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[variant_exists universal] && [variant_isset universal]} {
</span>                 set my_dest ${workpath}/pre-dest/${my_arch}
             } else {
                 set my_dest ${destroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,7 +342,7 @@ if {${my_subport} eq ${my_name}} {
</span>                     "${my_dest}${my_app_dir}/Mini vMac ${my_machine}.app"
             }
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_exists universal] && [variant_isset universal]} {
</span>             merge ${workpath}/pre-dest
         }
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,7 +517,7 @@ if {[tbool bootstrap]} {
</span>             ui_msg
             ui_msg "${output_archive}"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {![variant_isset universal] || "ppc" ni ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![variant_exists universal] || ![variant_isset universal] || "ppc" ni ${configure.universal_archs}} {
</span>                 ui_msg
                 ui_warn "DON'T DISTRIBUTE THIS FILE! It doesn't contain all the"
                 ui_warn "necessary architectures. To build a distributable"
</pre><pre style='margin:0'>

</pre>