<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c9275a41dc5b88655280ba5fe5f733fe0568181d">https://github.com/macports/macports-ports/commit/c9275a41dc5b88655280ba5fe5f733fe0568181d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c9275a41dc5b88655280ba5fe5f733fe0568181d
</span>Author: Jeremy McMillan <jeremy.mcmillan@gmail.com>
AuthorDate: Tue May 19 20:13:53 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> salt: update to version 3000.3
</span>---
sysutils/salt/Portfile | 119 ++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 97 insertions(+), 22 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 b8da943ba78..f816d0cdad8 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;'>@@ -3,7 +3,8 @@
</span> PortSystem 1.0
name salt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2019.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3000.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories sysutils python
platforms darwin
maintainers {gmail.com:jeremy.mcmillan @aphor} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,56 +24,120 @@ if {$subport eq $name} {
</span> github.setup saltstack salt ${version} v
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.versions 27 35 36
</span> categories sysutils python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 47b77490e40fdc2ec4c5d262003afecdb0b8e94a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a65913142577a70924a283a99dc67612630a9601fd5c83d660bad74b84357d4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14987367
</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>
notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python35] && ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python27 conflicts python35 python36 description {python-2.7 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python36 python37 python38 description {python-3.5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 35
</span> depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cherrypy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cryptography \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gitpython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gnupg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-idna \
</span> port:py${python.version}-jinja2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mako \
</span> port:py${python.version}-msgpack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycryptodome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span>
destroot.cmd-append --with-salt-version=${version}
notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python35 conflicts python27 python36 description {python-3.5 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python35 python37 python38 description {python-3.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 36
</span> depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cherrypy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cryptography \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gitpython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gnupg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-idna \
</span> port:py${python.version}-jinja2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mako \
</span> port:py${python.version}-msgpack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycryptodome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span>
destroot.cmd-append --with-salt-version=${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python36 conflicts python27 python35 description {python-3.6 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python37 conflicts python35 python36 python38 description {python-3.7 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cherrypy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cryptography \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gitpython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gnupg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-idna \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycryptodome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd-append --with-salt-version=${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;'>+ variant python38 conflicts python35 python36 python37 description {python-3.8 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 38
</span> depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-asn1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cherrypy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cryptography \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gitpython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gnupg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-idna \
</span> port:py${python.version}-jinja2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mako \
</span> port:py${python.version}-msgpack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycryptodome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setproctitle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span>
destroot.cmd-append --with-salt-version=${version}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +146,16 @@ if {$subport eq $name} {
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.cfg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|msgpack-python==.*|msgpack >= 1.0.0|" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|backports.ssl_match_hostname==.*||" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|ipaddress==.*||" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|timelib==.*||" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|linode-python==.*||" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|vultr==.*||" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|==| >= |" ${worksrcpath}/pkg/osx/req.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|==| >= |" ${worksrcpath}/pkg/osx/req_ext.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|pyobjc==.*||" ${worksrcpath}/pkg/osx/req_pyobjc.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|==| >= |" ${worksrcpath}/pkg/osx/req_pyobjc.txt
</span> }
}
</pre><pre style='margin:0'>
</pre>