<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05a7c27ada1ef9e020329d774c7a8065249f3d5c">https://github.com/macports/macports-ports/commit/05a7c27ada1ef9e020329d774c7a8065249f3d5c</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 05a7c27ada1 salt: clean up
</span>05a7c27ada1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05a7c27ada1ef9e020329d774c7a8065249f3d5c
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Nov 17 06:58:22 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> salt: clean up
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Changes were made in 7b61e0d6fe over a year ago:
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts < 2.6.3 error, pre-activate, obsoleted subports (replaced by salt)
</span>---
sysutils/salt/Portfile | 28 ----------------------------
1 file changed, 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/salt/Portfile b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 012204be5e3..5e0a10c94ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,16 +134,6 @@ homepage https://saltstack.com/
</span> destroot.cmd-append --with-salt-version=${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Setting startupitems' executable with args didn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # work in MacPorts 2.6.2 and earlier. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-base/pull/191
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.6.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires MacPorts 2.6.3 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible MacPorts version"
</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> patchfiles patch-macports_syspaths.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,22 +177,4 @@ foreach daemon ${daemons} {
</span> name ${name}-${daemon} \
logfile ${prefix}/var/log/${name}/${daemon} \
executable "${prefix}/bin/${name}-${daemon} --config-dir=${prefix}/etc/${name} --pid-file=${prefix}/var/run/${name}-${daemon}.pid"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These subports and deactivate hacks can be removed after July 2021.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ${name}-${daemon} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}
</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;'>-pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach daemon ${daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${name}-${daemon} <= 3000.3_0 installed plists now installed by ${name}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active ${name}-${daemon}] 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;'>- if {([vercmp ${installed_version} 3000.3] < 0) || ([vercmp ${installed_version} 3000.3] == 0 && ${installed_revision} == 0)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite ${name}-${daemon} {} [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> }
</pre><pre style='margin:0'>
</pre>