<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/7b61e0d6feb4dc5e61e9e7b88c50346bebf33327">https://github.com/macports/macports-ports/commit/7b61e0d6feb4dc5e61e9e7b88c50346bebf33327</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 7b61e0d6feb salt: Install all startupitems in main port
</span>7b61e0d6feb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b61e0d6feb4dc5e61e9e7b88c50346bebf33327
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 16 17:29:03 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> salt: Install all startupitems in main port
</span>---
sysutils/salt/Portfile | 77 ++++++++++++++++++++++++++++----------------------
1 file changed, 43 insertions(+), 34 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 5931c6c089d..012204be5e3 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;'>@@ -1,9 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup saltstack salt 3000.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f1c2a4f0609c3cd64f3b98c3a3bf8efe39703c75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5c16a328b7971fecf1dc8902f2315387894613b198581c090063abc67df8fb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15255885
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3000.3
</span> categories sysutils python
platforms darwin
maintainers {gmail.com:jeremy.mcmillan @aphor} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,21 +22,6 @@ long_description SaltStack is fast, scalable and flexible software for data \
</span> to the entire application stack.
homepage https://saltstack.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup saltstack salt ${version} v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- categories sysutils python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f1c2a4f0609c3cd64f3b98c3a3bf8efe39703c75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5c16a328b7971fecf1dc8902f2315387894613b198581c090063abc67df8fb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15255885
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
default_variants +python38
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +51,6 @@ if {$subport eq $name} {
</span> port:py${python.version}-zmq
destroot.cmd-append --with-salt-version=${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
</span> }
variant python36 conflicts python35 python37 python38 description {python-3.6 support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,6 +134,16 @@ if {$subport eq $name} {
</span> destroot.cmd-append --with-salt-version=${version}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setting startupitems' executable with args didn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # work in MacPorts 2.6.2 and earlier. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-base/pull/191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.6.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} @${version} requires MacPorts 2.6.3 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible MacPorts version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-macports_syspaths.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,21 +178,31 @@ test.args --log-file=${worksrcpath}/build/minion.log \
</span> --local \
--id=local
<span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.logevents yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set daemons {minion master syndic api}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach daemon ${daemons} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitems-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name ${name}-${daemon} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logfile ${prefix}/var/log/${name}/${daemon} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ executable "${prefix}/bin/${name}-${daemon} --config-dir=${prefix}/etc/${name} --pid-file=${prefix}/var/run/${name}-${daemon}.pid"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These subports and deactivate hacks can be removed after July 2021.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-${daemon} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach daemon [list minion master syndic api] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport salt-${daemon} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name salt-${daemon}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logevents yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logfile ${prefix}/var/log/salt/${daemon}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.executable ${prefix}/bin/salt-${daemon} --config-dir=${prefix}/etc/salt --pid-file=${prefix}/var/run/salt-${daemon}.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description install startupitem for salt-${daemon}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach daemon ${daemons} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${name}-${daemon} <= 3000.3_0 installed plists now installed by ${name}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active ${name}-${daemon}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_revision [lindex ${installed} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ registry_deactivate_composite ${name}-${daemon} {} [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>