aboutsummaryrefslogtreecommitdiff
path: root/sysutils/salt/Makefile
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2012-01-25 07:16:18 +0000
committerDoug Barton <dougb@FreeBSD.org>2012-01-25 07:16:18 +0000
commitea47d1fb1e253f060c315d301eaf8f659004da3f (patch)
tree7f175876b36c98017489d38980adc02ec8c01ec0 /sysutils/salt/Makefile
parent01f239ee0ff9d6fdaf93d170c3dd893e02c705a7 (diff)
Update to version 0.9.6, which is primarily a documentation update to
new version 0.9.5. The upgrade to 0.9.5 includes a change from pickle to msgpack for request serialization. If you update the master and all the minions at the same time there is no problem. Otherwise follow the instructions in the release notes at: http://saltstack.org/topics/releases/0.9.5/ Submitted by: christer.edwards@gmail.com (maintainer) via private mail
Notes
Notes: svn path=/head/; revision=289765
Diffstat (limited to 'sysutils/salt/Makefile')
-rw-r--r--sysutils/salt/Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 063dbcc65acc..6dcf0fd3442f 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= salt
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.6
CATEGORIES= sysutils python
MASTER_SITES= https://github.com/downloads/saltstack/salt/
@@ -44,14 +44,23 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.9:${PORTSDIR}/devel/py-pyzmq \
${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.9:${PORTSDIR}/devel/py-msgpack \
${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto
RUN_DEPENDS:= ${BUILD_DEPENDS}
post-patch:
+.for file in conf/minion.template conf/master.template doc/man/salt-key.1 \
+ doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
+ doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
+ salt/cli/__init__.py salt/__init__.py salt/config.py salt/client.py \
+ salt/modules/mysql.py
+ @${REINPLACE_CMD} -e 's|/etc/salt|${PREFIX}/etc/salt|' \
+ -e 's|/srv/salt|${PREFIX}/etc/salt/states|' ${WRKSRC}/${file}
+.endfor
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
- ${MV} ${WRKSRC}/conf/master ${WRKSRC}/conf/master.sample
- ${MV} ${WRKSRC}/conf/minion ${WRKSRC}/conf/minion.sample
+ @${MV} ${WRKSRC}/conf/master.template ${WRKSRC}/conf/master.sample
+ @${MV} ${WRKSRC}/conf/minion.template ${WRKSRC}/conf/minion.sample
post-install:
@${CAT} ${PKGMESSAGE}