<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/33eae776d3a1655c6863052862c0c0d46bdce9e5">https://github.com/macports/macports-ports/commit/33eae776d3a1655c6863052862c0c0d46bdce9e5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 33eae776d3a1655c6863052862c0c0d46bdce9e5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 20 20:47:47 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac*: Simplify subport matching
</span>---
emulators/minivmac-devel/Portfile | 12 ++++++------
emulators/minivmac/Portfile | 12 ++++++------
2 files changed, 12 insertions(+), 12 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 4f3d272..cb5696f 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;'>@@ -30,7 +30,7 @@ long_description Mini vMac emulates early Macintosh computers \
</span> options my_variations
default my_variations {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${my_subport} eq ${my_name}} {
</span> livecheck.type regex
livecheck.url ${homepage}
# livecheck.version ${my_version}-${branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,15 +42,15 @@ if {${subport} eq ${name}} {
</span> 128K, 512K, 512Ke, SE, SE FDHD, Classic, or \
Macintosh II.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> supported_archs noarch
depends_run port:${my_name}-plus${my_suffix}
distfiles
use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ${subport} is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${my_subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ${subport} is a stub port > ${destroot}${prefix}/share/doc/${my_subport}/README"
</span> }
notes "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -458,7 +458,7 @@ if {[tbool bootstrap]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ni [list "${my_name}${my_suffix}" "${my_name}-bootstrap${my_suffix}"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${my_subport} ni [list "${my_name}" "${my_name}-bootstrap"]} {
</span> description a Macintosh [lindex ${my_variations} 0] emulator
long_description-append This subport emulates a Macintosh \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -482,7 +482,7 @@ if {${subport} ni [list "${my_name}${my_suffix}" "${my_name}-bootstrap${my_suffi
</span> }
set screen_sizes {512x342 512x384}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "${my_name}-128k${my_suffix}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${my_subport} ne "${my_name}-128k"} {
</span> lappend screen_sizes 640x480 800x600 1024x768
}
foreach screen_size ${screen_sizes} {
<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 6ed5d68..d39f2c5 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;'>@@ -28,7 +28,7 @@ long_description Mini vMac emulates early Macintosh computers \
</span> options my_variations
default my_variations {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${my_subport} eq ${my_name}} {
</span> livecheck.type regex
livecheck.url ${homepage}doc/download.html
livecheck.regex ${my_name}-(\[0-9.\]+)\\.src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@ if {${subport} eq ${name}} {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ${subport} is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${my_subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ${subport} is a stub port > ${destroot}${prefix}/share/doc/${my_subport}/README"
</span> }
notes "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +269,7 @@ if {${subport} eq ${name}} {
</span> system -W ${build.dir} "tar xf '${my_src_tarball}'"
move ${build.dir}/${my_variation} ${build.dir}/${my_variation_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${my_name}-bootstrap${my_suffix}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${my_subport} eq "${my_name}-bootstrap"} {
</span> # Change the "export" function so that exported files
# are written to the "out" directory instead of
# prompting for a location.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -434,7 +434,7 @@ if {[tbool bootstrap]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ni [list "${my_name}${my_suffix}" "${my_name}-bootstrap${my_suffix}"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${my_subport} ni [list "${my_name}" "${my_name}-bootstrap"]} {
</span> description a Macintosh [lindex ${my_variations} 0] emulator
long_description-append This subport emulates a Macintosh \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -458,7 +458,7 @@ if {${subport} ni [list "${my_name}${my_suffix}" "${my_name}-bootstrap${my_suffi
</span> }
set screen_sizes {512x342 512x384}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "${my_name}-128k${my_suffix}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${my_subport} ne "${my_name}-128k"} {
</span> lappend screen_sizes 640x480 800x600 1024x768
}
foreach screen_size ${screen_sizes} {
</pre><pre style='margin:0'>
</pre>