Index: branches/2018Q1/sysutils/py-salt/Makefile
===================================================================
--- branches/2018Q1/sysutils/py-salt/Makefile	(revision 462942)
+++ branches/2018Q1/sysutils/py-salt/Makefile	(revision 462943)
@@ -1,108 +1,107 @@
 # Created by: Christer Edwards <christer.edwards@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2017.7.2
-PORTREVISION=	1
+PORTVERSION=	2017.7.3
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	christer.edwards@gmail.com
 COMMENT=	Distributed remote execution and configuration management system
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
 USES=		cpe python
 
 CPE_VENDOR=	saltstack
 CPE_PRODUCT=	salt
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 # we must pass these options before the target name, and python.mk has no
 # early-arguments variable, so we have to manipulate the target
 PYDISTUTILS_INSTALL_TARGET=\
 	--salt-root-dir=/ \
 	--salt-config-dir=${ETCDIR} \
 	--salt-cache-dir=/var/cache/salt \
 	--salt-sock-dir=/var/run/salt \
 	--salt-srv-root-dir=${ETCDIR} \
 	--salt-base-file-roots-dir=${ETCDIR}/states \
 	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
 	--salt-base-master-roots-dir=${ETCDIR}/salt-master \
 	--salt-logs-dir=/var/log/salt \
 	--salt-pidfile-dir=/var/run \
 	install
 
 USE_RC_SUBR=	salt_api \
 		salt_master \
 		salt_minion \
 		salt_proxy \
 		salt_syndic
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	RAET TCP ZEROMQ
 OPTIONS_DEFAULT=ZEROMQ
 
 RAET_DESC=	Install dependencies required for RAET transport
 TCP_DESC=	Install dependencies required for TCP transport
 ZEROMQ_DESC=	Install dependencies required for ZeroMQ transport
 
 RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${FLAVOR}
 
 TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
 
 ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR}
 ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 # Python 2.7-3.3 require enum34, unnecessary for Python 3.4+
 .if ${PYTHON_REL} < 3400
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR}
 .endif
 
 # Python 3+ comes with futures built-in
 .if ${PYTHON_REL} < 3200
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures@${FLAVOR}
 .endif
 
 post-patch:
 .for file in conf/minion conf/master 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 \
 	doc/man/salt-call.1 \
 	salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \
 	salt/modules/postgres.py salt/utils/migrations.py
 	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
 		-e 's|/srv/salt|${ETCDIR}/states|' \
 		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
 
 .include <bsd.port.post.mk>
Index: branches/2018Q1/sysutils/py-salt/distinfo
===================================================================
--- branches/2018Q1/sysutils/py-salt/distinfo	(revision 462942)
+++ branches/2018Q1/sysutils/py-salt/distinfo	(revision 462943)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511447357
-SHA256 (salt-2017.7.2.tar.gz) = ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840
-SIZE (salt-2017.7.2.tar.gz) = 11471191
+TIMESTAMP = 1519436462
+SHA256 (salt-2017.7.3.tar.gz) = 3d4e1aefe4fa1e53bf132e84961cf46cef3e5d654f4231a2f2e30e786ab7dc07
+SIZE (salt-2017.7.3.tar.gz) = 36461646
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 462942)
+++ branches/2018Q1	(revision 462943)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r462766