<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3cd009ad04d35fb24f51381565bd46154d8aadca">https://github.com/macports/macports-ports/commit/3cd009ad04d35fb24f51381565bd46154d8aadca</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 3cd009a  salt: update to version 2017.7.3
</span>3cd009a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3cd009ad04d35fb24f51381565bd46154d8aadca
</span>Author: Jeremy McMillan <jeremy.mcmillan@sap.com>
AuthorDate: Fri Feb 9 22:48:29 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    salt: update to version 2017.7.3
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * update to version 2017.7.3
</span><span style='display:block; white-space:pre;color:#404040;'>    * fix default config/path locations
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/54348
</span>---
 sysutils/salt/Portfile                           | 46 +++++++++++++++---------
 sysutils/salt/files/patch-macports_syspaths.diff | 19 ++++++++++
 2 files changed, 49 insertions(+), 16 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 101fad0..ca6f925 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,7 @@
</span> PortSystem        1.0
 
 name               salt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version            2017.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version            2017.7.3
</span> categories         sysutils python
 platforms          darwin
 maintainers        {@aphor gmail.com:jeremy.mcmillan}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,11 @@ if {$subport eq $name} {
</span>     python.versions         27 34 35 36
     categories              sysutils python
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  fd01c7bfc2878cab7d02dfb5fdf93d23faffa9d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  1643dc8906d1ee10bea93fb39a979cbdbfd1895691c409d5d7eeebc4f09e8af2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160  a50e20349ac6feea60a122f1b01aaa2f2224fb9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  249cfbd895c9cfb5283812d6e2ca047c643244cd9b02d030d3e20b8dd0ec2c8e
</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;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     if {![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
         default_variants +python27
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,62 +37,76 @@ if {$subport eq $name} {
</span>     variant python27 conflicts python34 python35 python36 description {experimental python-2.7 support} {
         python.default_version 27
         depends_build       port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_lib-append  port:py${python.version}-yaml \
                             port:py${python.version}-jinja2 \
                             port:py${python.version}-msgpack \
               port:py${python.version}-tornado \
               port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            
</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>         notes    "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     variant python34 conflicts python27 python35 python36 description {experimental python-3.4 support} {
         python.default_version 34
         depends_build       port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_lib-append  port:py${python.version}-yaml \
                             port:py${python.version}-jinja2 \
                             port:py${python.version}-msgpack \
               port:py${python.version}-tornado \
               port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            
</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>         notes    "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
                 "Support for Python 3 versions is experimental."
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     variant python35 conflicts python27 python34 python36 description {experimental python-3.5 support} {
         python.default_version 35
         depends_build       port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_lib-append  port:py${python.version}-yaml \
                             port:py${python.version}-jinja2 \
                             port:py${python.version}-msgpack \
               port:py${python.version}-tornado \
               port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            
</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>         notes    "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
                 "Support for Python 3 versions is experimental."
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     variant python36 conflicts python27 python34 python35 description {experimental python-3.6 support} {
         python.default_version 36
         depends_build       port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_lib-append  port:py${python.version}-yaml \
                             port:py${python.version}-jinja2 \
                             port:py${python.version}-msgpack \
               port:py${python.version}-tornado \
               port:py${python.version}-zmq
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            
</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>         notes    "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
                 "Support for Python 3 versions is experimental."
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles patch-macports_syspaths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
 
 test {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath}/build "cp -r ${worksrcpath}/conf ${worksrcpath}/test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath}/build "mkdir ${worksrcpath}/test/cache"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath}/build "echo cachedir: ${worksrcpath}/test/cache >> ${worksrcpath}/test/minion"
</span>     system -W ${worksrcpath}/build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "PYTHONPATH=${worksrcpath}/build/lib ${python.bin} scripts-${python.branch}/salt-call --log-file=${worksrcpath}/build/minion.log --config-dir=${worksrcpath}/conf --local test.versions_information"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "PYTHONPATH=${worksrcpath}/build/lib ${python.bin} scripts-${python.branch}/salt-call --log-file=${worksrcpath}/build/minion.log --config-dir=${worksrcpath}/test --hard-crash --local --id=local test.versions_information"
</span> }
 
 foreach daemon [list minion master syndic api] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/salt/files/patch-macports_syspaths.diff b/sysutils/salt/files/patch-macports_syspaths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..600b2a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/salt/files/patch-macports_syspaths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.cfg      1969-12-31 18:00:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.cfg      2018-02-09 19:17:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[global]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-root-dir=/opt/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-share-dir=/opt/local/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-config-dir=/opt/local/etc/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-cache-dir=/opt/local/var/cache/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-sock-dir=/opt/local/var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-srv-root-dir=/opt/local/srv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-file-roots-dir=/opt/local/srv/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-pillar-roots-dir=/opt/local/srv/pillar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-master-roots-dir=/opt/local/srv/salt-master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-thorium-roots-dir=/opt/local/srv/thorium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-logs-dir=/opt/local/var/log/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-pidfile-dir=/opt/local/var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-formula-dir=/opt/local/srv/spm/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-pillar-dir=/opt/local/srv/spm/pillar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-reactor-dir=/opt/local/srv/spm/reactor
</span></pre><pre style='margin:0'>

</pre>