<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/432796d1bef04aea1adb6a00343dba723f77815d">https://github.com/macports/macports-ports/commit/432796d1bef04aea1adb6a00343dba723f77815d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 432796d1bef04aea1adb6a00343dba723f77815d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 15 21:34:46 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    minivmac*: Absorb post-build into configure
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    And thus don't install icons that aren't needed, e.g. when the
</span><span style='display:block; white-space:pre;color:#404040;'>    icon_master variant has not been selected.
</span>---
 emulators/minivmac-devel/Portfile | 31 ++++++++++++-------------------
 emulators/minivmac/Portfile       | 31 ++++++++++++-------------------
 2 files changed, 24 insertions(+), 38 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 df5281d..0aeb8b6 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;'>@@ -62,7 +62,7 @@ if {${subport} eq ${name}} {
</span> } else {
     livecheck.type              none
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision                    3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                    4
</span>     supported_archs             i386 ppc x86_64
 #    distname                    ${my_name}${my_version}-${branch}
     distname                    ${my_name}${my_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,8 +312,19 @@ if {${subport} eq ${name}} {
</span>                     }
                     reinplace -E "s|-isysroot *\[^ \]+|${sdkflags}|g" ${build.dir}/${my_variation_dir}/Makefile
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    # Use prettier icons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    foreach icon {App Dsk Rom} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        copy -force ${worksrcpath}/${my_icons}/icons/${icon}Icon.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            ${build.dir}/${my_variation_dir}/src/ICON[string toupper ${icon}]O.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>                     # Enable Retina display support.
                     system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    # Prevent merge error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span>                 }
             }
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,24 +340,6 @@ if {${subport} eq ${name}} {
</span>         reinplace "s|@SUBDIRS@|[join ${my_variation_dirs}]|" ${build.dir}/Makefile
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach my_arch [get_canonical_archs] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach {my_machine unused} ${my_variations} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
</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;'>-                # Install the prettier icons.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/AppIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONAPPO.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/DskIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONDSKO.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/RomIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONROMO.icns
</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;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     destroot {
         foreach my_arch [get_canonical_archs] {
             if {[variant_isset universal]} {
<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 3392aa3..6851eef 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;'>@@ -58,7 +58,7 @@ if {${subport} eq ${name}} {
</span> } else {
     livecheck.type              none
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision                    3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                    4
</span>     supported_archs             i386 ppc x86_64
     distname                    ${my_name}-${my_version}
     use_zip                     yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,8 +290,19 @@ if {${subport} eq ${name}} {
</span>                     }
                     reinplace -E "s|-isysroot *\[^ \]+|${sdkflags}|g" ${build.dir}/${my_variation_dir}/Makefile
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    # Use prettier icons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    foreach icon {App Dsk Rom} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        copy -force ${worksrcpath}/${my_icons}/icons/${icon}Icon.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            ${build.dir}/${my_variation_dir}/src/ICON[string toupper ${icon}]O.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>                     # Enable Retina display support.
                     system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    # Prevent merge error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span>                 }
             }
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,24 +318,6 @@ if {${subport} eq ${name}} {
</span>         reinplace "s|@SUBDIRS@|[join ${my_variation_dirs}]|" ${build.dir}/Makefile
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach my_arch [get_canonical_archs] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach {my_machine unused} ${my_variations} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Info.plist
</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;'>-                # Install the prettier icons.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/AppIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONAPPO.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/DskIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONDSKO.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                xinstall -m 0644 ${worksrcpath}/${my_icons}/icons/RomIcon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${build.dir}/${my_arch}/${my_machine}/minivmac.app/Contents/Resources/ICONROMO.icns
</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;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     destroot {
         foreach my_arch [get_canonical_archs] {
             if {[variant_isset universal]} {
</pre><pre style='margin:0'>

</pre>