- update to 2014.1.4

- sort pkg-plist with `make makeplist'

Salt 2014.1.4 Release Notes
===========================
- Fix setup.py dependency issue (:issue:`12031`)
- Fix handling for IOErrors under certain circumstances (:issue:`11783` and :issue:`11853`)
- Fix fatal exception when ``/proc/1/cgroup`` is not readable (:issue:`11619`)
- Fix os grains for OpenSolaris (:issue:`11907`)
- Fix ``lvs.zero`` module argument pass-through (:issue:`9001`)
- Fix bug in ``debian_ip`` interaction with ``network.system`` state (:issue:`11164`)
- Remove bad binary package verification code (:issue:`12177`)
- Fix traceback in solaris package installation (:issue:`12237`)
- Fix ``file.directory`` state symlink handling (:issue:`12209`)
- Remove ``external_ip`` grain
- Fix ``file.managed`` makedirs issues (:issue:`10446`)
- Fix hang on non-existent Windows drive letter for ``file`` module (:issue:`9880`)
- Fix salt minion caching all users on the server (:issue:`9743`)

PR:		ports/189377
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)

3 files changed, 37 insertions, 40 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 8eb38ce75e66..5b48769e4f78 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2014.1.3
+PORTVERSION=	2014.1.4
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -54,15 +54,14 @@ post-patch:
 	doc/man/salt-call.1 salt/config.py \
 	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|${PREFIX}/etc/salt|' \
-		-e 's|/srv/salt|${PREFIX}/etc/salt/states|' \
-		-e 's|/srv/pillar|${PREFIX}/etc/salt/pillar|' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
+		-e 's|/srv/salt|${ETCDIR}/states|' \
+		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
 .endfor
 
 post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index af8779b01712..ef4ea4d56ddf 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-2014.1.3.tar.gz) = 25ea80e459a64cf5bd4699f385253310e9db507bb5b6b5814e4bb22d836ba201
-SIZE (salt-2014.1.3.tar.gz) = 2815036
+SHA256 (salt-2014.1.4.tar.gz) = bc501c50cef7af9ce857b6f4a7c34b0238cc6a2810e4bd6e3ff7e0bfb082343f
+SIZE (salt-2014.1.4.tar.gz) = 2812489
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 364940798309..27005a75030a 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -154,8 +154,6 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/grains/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/core.py
 %%PYTHON_SITELIBDIR%%/salt/grains/core.pyc
-%%PYTHON_SITELIBDIR%%/salt/grains/external_ip.py
-%%PYTHON_SITELIBDIR%%/salt/grains/external_ip.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/extra.py
 %%PYTHON_SITELIBDIR%%/salt/grains/extra.pyc
 %%PYTHON_SITELIBDIR%%/salt/grains/junos.py
@@ -1085,37 +1083,37 @@ man/man1/salt-ssh.1.gz
 man/man1/salt-syndic.1.gz
 man/man1/salt.1.gz
 man/man7/salt.7.gz
-@dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/validate
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/decorators
-@dirrm %%PYTHON_SITELIBDIR%%/salt/utils
-@dirrm %%PYTHON_SITELIBDIR%%/salt/transport
-@dirrm %%PYTHON_SITELIBDIR%%/salt/tops
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/virt
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
-@dirrm %%PYTHON_SITELIBDIR%%/salt/templates
-@dirrm %%PYTHON_SITELIBDIR%%/salt/states
-@dirrm %%PYTHON_SITELIBDIR%%/salt/search
-@dirrm %%PYTHON_SITELIBDIR%%/salt/runners
-@dirrm %%PYTHON_SITELIBDIR%%/salt/roster
-@dirrm %%PYTHON_SITELIBDIR%%/salt/returners
-@dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
-@dirrm %%PYTHON_SITELIBDIR%%/salt/pillar
-@dirrm %%PYTHON_SITELIBDIR%%/salt/output
-@dirrm %%PYTHON_SITELIBDIR%%/salt/modules
-@dirrm %%PYTHON_SITELIBDIR%%/salt/log/handlers
-@dirrm %%PYTHON_SITELIBDIR%%/salt/log
-@dirrm %%PYTHON_SITELIBDIR%%/salt/grains
-@dirrm %%PYTHON_SITELIBDIR%%/salt/fileserver
-@dirrm %%PYTHON_SITELIBDIR%%/salt/ext
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud
+@dirrmtry %%ETCDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/salt/auth
+@dirrm %%PYTHON_SITELIBDIR%%/salt/cli
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client
-@dirrm %%PYTHON_SITELIBDIR%%/salt/cli
-@dirrm %%PYTHON_SITELIBDIR%%/salt/auth
+@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
+@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
+@dirrm %%PYTHON_SITELIBDIR%%/salt/cloud
+@dirrm %%PYTHON_SITELIBDIR%%/salt/ext
+@dirrm %%PYTHON_SITELIBDIR%%/salt/fileserver
+@dirrm %%PYTHON_SITELIBDIR%%/salt/grains
+@dirrm %%PYTHON_SITELIBDIR%%/salt/log/handlers
+@dirrm %%PYTHON_SITELIBDIR%%/salt/log
+@dirrm %%PYTHON_SITELIBDIR%%/salt/modules
+@dirrm %%PYTHON_SITELIBDIR%%/salt/output
+@dirrm %%PYTHON_SITELIBDIR%%/salt/pillar
+@dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
+@dirrm %%PYTHON_SITELIBDIR%%/salt/returners
+@dirrm %%PYTHON_SITELIBDIR%%/salt/roster
+@dirrm %%PYTHON_SITELIBDIR%%/salt/runners
+@dirrm %%PYTHON_SITELIBDIR%%/salt/search
+@dirrm %%PYTHON_SITELIBDIR%%/salt/states
+@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
+@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
+@dirrm %%PYTHON_SITELIBDIR%%/salt/templates/virt
+@dirrm %%PYTHON_SITELIBDIR%%/salt/templates
+@dirrm %%PYTHON_SITELIBDIR%%/salt/tops
+@dirrm %%PYTHON_SITELIBDIR%%/salt/transport
+@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/decorators
+@dirrm %%PYTHON_SITELIBDIR%%/salt/utils/validate
+@dirrm %%PYTHON_SITELIBDIR%%/salt/utils
+@dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
 @dirrm %%PYTHON_SITELIBDIR%%/salt
-@dirrmtry %%ETCDIR%%