<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3564a9573a40f3900d7bb0927eb145e46d0fba28">https://github.com/macports/macports-ports/commit/3564a9573a40f3900d7bb0927eb145e46d0fba28</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 3564a95  salt: fix hardcoded PREFIX in patch
</span>3564a95 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3564a9573a40f3900d7bb0927eb145e46d0fba28
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue May 1 04:53:55 2018 +0000

<span style='display:block; white-space:pre;color:#404040;'>    salt: fix hardcoded PREFIX in patch
</span>---
 sysutils/salt/Portfile                           |  4 ++++
 sysutils/salt/files/patch-macports_syspaths.diff | 30 ++++++++++++------------
 2 files changed, 19 insertions(+), 15 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 c30efd8..d7402af 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;'>@@ -21,6 +21,7 @@ if {$subport eq $name} {
</span>     PortGroup               python 1.0
 
     github.setup            saltstack salt ${version} v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                1
</span> 
     python.versions         27 34 35 36
     categories              sysutils python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +91,9 @@ if {$subport eq $name} {
</span> 
     patchfiles patch-macports_syspaths.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 test {
<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><span style='display:block; white-space:pre;color:#808080;'>index 600b2a6..752ecc2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/salt/files/patch-macports_syspaths.diff
</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;'>@@ -2,18 +2,18 @@
</span> +++ setup.cfg     2018-02-09 19:17:18.000000000 -0600
 @@ -0,0 +1,16 @@
 +[global]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-root-dir=/opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-share-dir=/opt/local/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-config-dir=/opt/local/etc/salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-cache-dir=/opt/local/var/cache/salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-sock-dir=/opt/local/var/run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-srv-root-dir=/opt/local/srv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-base-file-roots-dir=/opt/local/srv/salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-base-pillar-roots-dir=/opt/local/srv/pillar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-base-master-roots-dir=/opt/local/srv/salt-master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-base-thorium-roots-dir=/opt/local/srv/thorium
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-logs-dir=/opt/local/var/log/salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-pidfile-dir=/opt/local/var/run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-spm-formula-dir=/opt/local/srv/spm/salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-spm-pillar-dir=/opt/local/srv/spm/pillar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+salt-spm-reactor-dir=/opt/local/srv/spm/reactor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-root-dir=@@PREFIX@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-share-dir=@@PREFIX@@/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-config-dir=@@PREFIX@@/etc/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-cache-dir=@@PREFIX@@/var/cache/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-sock-dir=@@PREFIX@@/var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-srv-root-dir=@@PREFIX@@/srv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-file-roots-dir=@@PREFIX@@/srv/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-pillar-roots-dir=@@PREFIX@@/srv/pillar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-master-roots-dir=@@PREFIX@@/srv/salt-master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-base-thorium-roots-dir=@@PREFIX@@/srv/thorium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-logs-dir=@@PREFIX@@/var/log/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-pidfile-dir=@@PREFIX@@/var/run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-formula-dir=@@PREFIX@@/srv/spm/salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-pillar-dir=@@PREFIX@@/srv/spm/pillar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++salt-spm-reactor-dir=@@PREFIX@@/srv/spm/reactor
</span></pre><pre style='margin:0'>

</pre>