On Feb 11, 2018, at 09:00, Jeremy McMillan wrote:

> Perry E. Metzger (pmetzger) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/3cd009ad04d35fb24f51381565bd46154d8aadca
> 
> The following commit(s) were added to refs/heads/master by this push:
> 
>      new 3cd009a  salt: update to version 2017.7.3
> 
> 3cd009a is described below
> 
> 
> commit 3cd009ad04d35fb24f51381565bd46154d8aadca
> 
> Author: Jeremy McMillan <jeremy.mcmil...@sap.com>
> AuthorDate: Fri Feb 9 22:48:29 2018 -0600
> 
>     salt: update to version 2017.7.3
>     
>     * update to version 2017.7.3
>     * fix default config/path locations
>     
>     Closes: https://trac.macports.org/ticket/54348


> +++ b/sysutils/salt/files/patch-macports_syspaths.diff
> @@ -0,0 +1,19 @@
> +--- setup.cfg        1969-12-31 18:00:00.000000000 -0600
> ++++ setup.cfg        2018-02-09 19:17:18.000000000 -0600
> +@@ -0,0 +1,16 @@
> ++[global]
> ++salt-root-dir=/opt/local
> ++salt-share-dir=/opt/local/share
> ++salt-config-dir=/opt/local/etc/salt
> ++salt-cache-dir=/opt/local/var/cache/salt
> ++salt-sock-dir=/opt/local/var/run
> ++salt-srv-root-dir=/opt/local/srv
> ++salt-base-file-roots-dir=/opt/local/srv/salt
> ++salt-base-pillar-roots-dir=/opt/local/srv/pillar
> ++salt-base-master-roots-dir=/opt/local/srv/salt-master
> ++salt-base-thorium-roots-dir=/opt/local/srv/thorium
> ++salt-logs-dir=/opt/local/var/log/salt
> ++salt-pidfile-dir=/opt/local/var/run
> ++salt-spm-formula-dir=/opt/local/srv/spm/salt
> ++salt-spm-pillar-dir=/opt/local/srv/spm/pillar
> ++salt-spm-reactor-dir=/opt/local/srv/spm/reactor

This will not work on systems where the prefix is not /opt/local. Customarily 
you would put a placeholder string like "@PREFIX@" into the patch files, then 
in the Portfile you write e.g.

post-patch {
    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.cfg
}

Reply via email to