Wed Oct 14 15:46:34 2015 UTC ()
Ensure pkgsrc directories are in PATH, fixes pkg module load failures.  Fix
submitted by Travis Paul.

Bump PKGREVISION.


(jperkin)
diff -r1.27 -r1.28 pkgsrc/sysutils/salt/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/salt/files/smf/manifest.xml
cvs diff -r1.27 -r1.28 pkgsrc/sysutils/salt/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/salt/Makefile 2015/07/24 10:24:27 1.27
+++ pkgsrc/sysutils/salt/Makefile 2015/10/14 15:46:34 1.28
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.27 2015/07/24 10:24:27 jperkin Exp $ 1# $NetBSD: Makefile,v 1.28 2015/10/14 15:46:34 jperkin Exp $
2 2
3DISTNAME= salt-2014.7.2 3DISTNAME= salt-2014.7.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= https://pypi.python.org/packages/source/s/salt/ 6MASTER_SITES= https://pypi.python.org/packages/source/s/salt/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://saltstack.org/ 9HOMEPAGE= http://saltstack.org/
10COMMENT= Remote execution and configuration management system 10COMMENT= Remote execution and configuration management system
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13DEPENDS+= zeromq>=2.1.9:../../net/zeromq 13DEPENDS+= zeromq>=2.1.9:../../net/zeromq
14DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq 14DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
15DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto 15DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
16DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto 16DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
17DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack 17DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/salt/files/smf/manifest.xml (expand / switch to unified diff)

--- pkgsrc/sysutils/salt/files/smf/manifest.xml 2015/07/24 10:24:27 1.1
+++ pkgsrc/sysutils/salt/files/smf/manifest.xml 2015/10/14 15:46:34 1.2
@@ -2,26 +2,27 @@ @@ -2,26 +2,27 @@
2<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> 2<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
3<service_bundle type="manifest" name="@SMF_NAME@"> 3<service_bundle type="manifest" name="@SMF_NAME@">
4 <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1"> 4 <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
5 <dependency name='network' grouping='require_all' restart_on='error' type='service'> 5 <dependency name='network' grouping='require_all' restart_on='error' type='service'>
6 <service_fmri value='svc:/milestone/network:default' /> 6 <service_fmri value='svc:/milestone/network:default' />
7 </dependency> 7 </dependency>
8 <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'> 8 <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
9 <service_fmri value='svc:/system/filesystem/local:default' /> 9 <service_fmri value='svc:/system/filesystem/local:default' />
10 </dependency> 10 </dependency>
11 <method_context> 11 <method_context>
12 <method_credential user='root' group='root' /> 12 <method_credential user='root' group='root' />
13 <method_environment> 13 <method_environment>
14 <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" /> 14 <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
 15 <envvar name="PATH" value="@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin" />
15 </method_environment> 16 </method_environment>
16 </method_context> 17 </method_context>
17 <instance name='master' enabled='false'> 18 <instance name='master' enabled='false'>
18 <exec_method type="method" name="start" exec="@PREFIX@/bin/salt-master -d" timeout_seconds="60" /> 19 <exec_method type="method" name="start" exec="@PREFIX@/bin/salt-master -d" timeout_seconds="60" />
19 <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" /> 20 <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
20 <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" /> 21 <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
21 <property_group name="startd" type="framework"> 22 <property_group name="startd" type="framework">
22 <propval name="duration" type="astring" value="contract" /> 23 <propval name="duration" type="astring" value="contract" />
23 <propval name="ignore_error" type="astring" value="core,signal" /> 24 <propval name="ignore_error" type="astring" value="core,signal" />
24 </property_group> 25 </property_group>
25 <property_group name="application" type="application"> 26 <property_group name="application" type="application">
26 <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/salt/master" /> 27 <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/salt/master" />
27 </property_group> 28 </property_group>