svn commit: r353046 - head/sysutils/py-salt

Mon May 5 21:28:03 UTC 2014

Author: ohauer
Date: Mon May  5 21:28:02 2014
New Revision: 353046
URL: http://svnweb.freebsd.org/changeset/ports/353046
QAT: https://qat.redports.org/buildarchive/r353046/

Log:
  - 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 at gmail.com> (maintainer)

Modified:
  head/sysutils/py-salt/Makefile
  head/sysutils/py-salt/distinfo
  head/sysutils/py-salt/pkg-plist

Modified: head/sysutils/py-salt/Makefile
==============================================================================

--- head/sysutils/py-salt/Makefile	Mon May  5 21:27:35 2014	(r353045)
+++ head/sysutils/py-salt/Makefile	Mon May  5 21:28:02 2014	(r353046)
@@ -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>

Modified: head/sysutils/py-salt/distinfo
==============================================================================
--- head/sysutils/py-salt/distinfo	Mon May  5 21:27:35 2014	(r353045)
+++ head/sysutils/py-salt/distinfo	Mon May  5 21:28:02 2014	(r353046)
@@ -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

Modified: head/sysutils/py-salt/pkg-plist
==============================================================================
--- head/sysutils/py-salt/pkg-plist	Mon May  5 21:27:35 2014	(r353045)
+++ head/sysutils/py-salt/pkg-plist	Mon May  5 21:28:02 2014	(r353046)
@@ -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
- at dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
- at dirrm %%PYTHON_SITELIBDIR%%/salt/utils/validate
- at dirrm %%PYTHON_SITELIBDIR%%/salt/utils/decorators
- at dirrm %%PYTHON_SITELIBDIR%%/salt/utils
- at dirrm %%PYTHON_SITELIBDIR%%/salt/transport
- at dirrm %%PYTHON_SITELIBDIR%%/salt/tops
- at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/virt
- at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
- at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
- at dirrm %%PYTHON_SITELIBDIR%%/salt/templates
- at dirrm %%PYTHON_SITELIBDIR%%/salt/states
- at dirrm %%PYTHON_SITELIBDIR%%/salt/search
- at dirrm %%PYTHON_SITELIBDIR%%/salt/runners
- at dirrm %%PYTHON_SITELIBDIR%%/salt/roster
- at dirrm %%PYTHON_SITELIBDIR%%/salt/returners
- at dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
- at dirrm %%PYTHON_SITELIBDIR%%/salt/pillar
- at dirrm %%PYTHON_SITELIBDIR%%/salt/output
- at dirrm %%PYTHON_SITELIBDIR%%/salt/modules
- at dirrm %%PYTHON_SITELIBDIR%%/salt/log/handlers
- at dirrm %%PYTHON_SITELIBDIR%%/salt/log
- at dirrm %%PYTHON_SITELIBDIR%%/salt/grains
- at dirrm %%PYTHON_SITELIBDIR%%/salt/fileserver
- at dirrm %%PYTHON_SITELIBDIR%%/salt/ext
- at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
- at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
- at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud
+ at dirrmtry %%ETCDIR%%
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/auth
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/cli
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client/ssh
 @dirrm %%PYTHON_SITELIBDIR%%/salt/client
- at dirrm %%PYTHON_SITELIBDIR%%/salt/cli
- at dirrm %%PYTHON_SITELIBDIR%%/salt/auth
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/clouds
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud/deploy
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/cloud
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/ext
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/fileserver
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/grains
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/log/handlers
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/log
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/modules
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/output
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/pillar
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/returners
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/roster
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/runners
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/search
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/states
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/templates/virt
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/templates
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/tops
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/transport
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/utils/decorators
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/utils/validate
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/utils
+ at dirrm %%PYTHON_SITELIBDIR%%/salt/wheel
 @dirrm %%PYTHON_SITELIBDIR%%/salt
- at dirrmtry %%ETCDIR%%
