- Update to 0.9.9.1

PR:		ports/167503
Submitted by:	Denis Generalov <gd _AT_ rambler-co.ru> (maintainer)

4 files changed, 38 insertions, 21 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index a8e5095a4595..4be96e276b85 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	salt
-PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTVERSION=	0.9.9.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://github.com/downloads/saltstack/salt/
 
@@ -58,10 +57,11 @@ post-patch:
 	    -e 's|/srv/salt|${PREFIX}/etc/salt/states|' ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
-	@${MV} ${WRKSRC}/conf/master.template ${WRKSRC}/conf/master.sample
-	@${MV} ${WRKSRC}/conf/minion.template ${WRKSRC}/conf/minion.sample
 
 post-install:
+	${MKDIR} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/master.template ${PREFIX}/etc/salt/master.sample
+	${INSTALL_DATA} ${WRKSRC}/conf/minion.template ${PREFIX}/etc/salt/minion.sample
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index a121522547d6..16936bf1dc47 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-0.9.8.tar.gz) = a00cb012b8caca3ce30ecf37a8bc9e0ba3048d5158ff6914918a913aae07ed15
-SIZE (salt-0.9.8.tar.gz) = 1641495
+SHA256 (salt-0.9.9.1.tar.gz) = 8b06bb19a65882b8dd3f8dcbeb27e3b4016825e8943b22ac8b6a77c5453b1340
+SIZE (salt-0.9.9.1.tar.gz) = 1760361
diff --git a/sysutils/salt/files/patch-setup.py b/sysutils/salt/files/patch-setup.py
index 0610e0e5a3bd..58cb063b643d 100644
--- a/sysutils/salt/files/patch-setup.py
+++ b/sysutils/salt/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py    2012-03-21 11:46:26.000000000 -0600
-+++ setup.py    2012-03-24 14:01:33.965200298 -0600
+--- setup.py	2012-04-28 08:33:41.000000000 +0400
++++ setup.py	2012-05-02 01:08:12.000000000 +0400
 @@ -47,7 +47,7 @@
  if 'SYSCONFDIR' in os.environ:
      etc_path = os.environ['SYSCONFDIR']
@@ -8,22 +8,17 @@
 +    etc_path = os.path.join('%%PREFIX%%', 'etc')
 
  libraries = ['ws2_32'] if sys.platform == 'win32' else []
-
-@@ -98,10 +98,10 @@
+ 
+@@ -100,7 +100,7 @@
+                'scripts/salt-call',
                 'scripts/salt-run',
                 'scripts/salt'],
-       data_files=[(os.path.join(etc_path, 'salt'),
--                    ['conf/master.template',
--                     'conf/minion.template',
-+                    ['conf/master.sample',
-+                     'conf/minion.sample',
-                     ]),
--                ('share/man/man1',
-+                ('man/man1',
+-      data_files=[('share/man/man1',
++      data_files=[('man/man1',
                      ['doc/man/salt-master.1',
                       'doc/man/salt-key.1',
                       'doc/man/salt.1',
-@@ -111,9 +111,8 @@
+@@ -110,7 +110,7 @@
                       'doc/man/salt-run.1',
                       'doc/man/salt-minion.1',
                      ]),
@@ -32,5 +27,3 @@
                      ['doc/man/salt.7',
                      ]),
                   ],
--      install_requires=requirements,
-      )
diff --git a/sysutils/salt/pkg-plist b/sysutils/salt/pkg-plist
index 81f1b5898968..63996bade4b5 100644
--- a/sysutils/salt/pkg-plist
+++ b/sysutils/salt/pkg-plist
@@ -65,6 +65,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/modules/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/modules/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/__init__.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/aliases.py
+%%PYTHON_SITELIBDIR%%/salt/modules/aliases.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/aliases.pyo
 %%PYTHON_SITELIBDIR%%/salt/modules/apache.py
 %%PYTHON_SITELIBDIR%%/salt/modules/apache.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/apache.pyo
@@ -194,6 +197,11 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/modules/reg.py
 %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/conf.jinja
+%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip/eth.jinja
+%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.py
+%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/rh_ip.pyo
 %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.py
 %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/rh_service.pyo
@@ -257,6 +265,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/modules/win_network.py
 %%PYTHON_SITELIBDIR%%/salt/modules/win_network.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/win_network.pyo
+%%PYTHON_SITELIBDIR%%/salt/modules/win_pkg.py
+%%PYTHON_SITELIBDIR%%/salt/modules/win_pkg.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/win_pkg.pyo
 %%PYTHON_SITELIBDIR%%/salt/modules/win_service.py
 %%PYTHON_SITELIBDIR%%/salt/modules/win_service.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/win_service.pyo
@@ -338,6 +349,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/states/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/states/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/__init__.pyo
+%%PYTHON_SITELIBDIR%%/salt/states/alias.py
+%%PYTHON_SITELIBDIR%%/salt/states/alias.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/alias.pyo
 %%PYTHON_SITELIBDIR%%/salt/states/cmd.py
 %%PYTHON_SITELIBDIR%%/salt/states/cmd.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cmd.pyo
@@ -371,6 +385,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_user.py
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_user.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/mysql_user.pyo
+%%PYTHON_SITELIBDIR%%/salt/states/network.py
+%%PYTHON_SITELIBDIR%%/salt/states/network.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/network.pyo
 %%PYTHON_SITELIBDIR%%/salt/states/pip.py
 %%PYTHON_SITELIBDIR%%/salt/states/pip.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/pip.pyo
@@ -383,6 +400,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/states/rvm.py
 %%PYTHON_SITELIBDIR%%/salt/states/rvm.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/rvm.pyo
+%%PYTHON_SITELIBDIR%%/salt/states/selinux.py
+%%PYTHON_SITELIBDIR%%/salt/states/selinux.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/selinux.pyo
 %%PYTHON_SITELIBDIR%%/salt/states/service.py
 %%PYTHON_SITELIBDIR%%/salt/states/service.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/service.pyo
@@ -416,6 +436,9 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.py
 %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyo
+%%PYTHON_SITELIBDIR%%/salt/utils/templates.py
+%%PYTHON_SITELIBDIR%%/salt/utils/templates.pyc
+%%PYTHON_SITELIBDIR%%/salt/utils/templates.pyo
 %%PYTHON_SITELIBDIR%%/salt/utils/verify.py
 %%PYTHON_SITELIBDIR%%/salt/utils/verify.pyc
 %%PYTHON_SITELIBDIR%%/salt/utils/verify.pyo
@@ -433,6 +456,7 @@ bin/salt-syndic
 @dirrm %%PYTHON_SITELIBDIR%%/salt/runners
 @dirrm %%PYTHON_SITELIBDIR%%/salt/returners
 @dirrm %%PYTHON_SITELIBDIR%%/salt/renderers
+@dirrm %%PYTHON_SITELIBDIR%%/salt/modules/rh_ip
 @dirrm %%PYTHON_SITELIBDIR%%/salt/modules
 @dirrm %%PYTHON_SITELIBDIR%%/salt/grains
 @dirrm %%PYTHON_SITELIBDIR%%/salt/ext