<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/15cba5abbcae7cba2f567a2e8c798eb88a46840a">https://github.com/macports/macports-ports/commit/15cba5abbcae7cba2f567a2e8c798eb88a46840a</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 15cba5abbca minivmac*: clean up
</span>15cba5abbca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15cba5abbcae7cba2f567a2e8c798eb88a46840a
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Nov 13 23:03:22 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> minivmac*: clean up
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove old pre-activate added over 3 years ago in f6eb5a8f82
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove handling for MacPorts < 2.7.0
</span>---
emulators/minivmac-devel/Portfile | 25 -------------------------
emulators/minivmac/Portfile | 23 -----------------------
2 files changed, 48 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 675c5e4deff..d8aa88903b3 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;'>@@ -127,11 +127,7 @@ if {${my_subport} eq ${my_name}} {
</span> build.dir ${workpath}/build
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,11 +165,7 @@ if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]
# Run the configure script.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' '${worksrcpath}/configure' ${all_configure_args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,23 +216,6 @@ if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> destroot.keepdirs-append ${my_dest_mnvm_dat}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active ${name}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_revision [lindex ${installed} 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_epoch [lindex ${installed} 5]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${installed_epoch} 4] < 0 || (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [vercmp ${installed_epoch} 4] == 0 && (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [vercmp ${installed_version} 36.00alpha-20180506] < 0 || (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [vercmp ${installed_version} 36.00alpha-20180506] == 0 && [vercmp ${installed_revision} 1] < 0
</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;'>- registry_deactivate_composite ${name} "" [list ports_nodepcheck 1]
</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> }
set default_screen_size 512x342
<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 cafb7f1053e..f158f48dd3e 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;'>@@ -112,11 +112,7 @@ if {${my_subport} eq ${my_name}} {
</span> build.dir ${workpath}/build
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,11 +160,7 @@ if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]
# Run the configure script.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' '${worksrcpath}/configure' ${all_configure_args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,21 +211,6 @@ if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> destroot.keepdirs-append ${my_dest_mnvm_dat}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active ${name}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_revision [lindex ${installed} 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_epoch [lindex ${installed} 5]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${installed_epoch} 0] == 0 && (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [vercmp ${installed_version} 3.5.8] < 0 || (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [vercmp ${installed_version} 3.5.8] == 0 && [vercmp ${installed_revision} 1] < 0
</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;'>- registry_deactivate_composite ${name} "" [list ports_nodepcheck 1]
</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> }
set default_screen_size 512x342
</pre><pre style='margin:0'>
</pre>