- Update to 2015.8.1

- While I'm here, add LICENSE_FILE

Changes:	https://docs.saltstack.com/en/latest/topics/releases/2015.8.1.html
PR:		203812
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)

4 files changed, 4 insertions, 89 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 86c6ee525ddd..4e70b6d9d541 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2015.8.0
-PORTREVISION=	1
+PORTVERSION=	2015.8.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,6 +11,7 @@ MAINTAINER=	christer.edwards@gmail.com
 COMMENT=	Distributed remote execution and configuration management system
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index cb5088a9dc2d..1367d2639d5f 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-2015.8.0.tar.gz) = 71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b
-SIZE (salt-2015.8.0.tar.gz) = 6584668
+SHA256 (salt-2015.8.1.tar.gz) = 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23
+SIZE (salt-2015.8.1.tar.gz) = 6527650
diff --git a/sysutils/py-salt/files/patch-salt__utils____init__.py b/sysutils/py-salt/files/patch-salt__utils____init__.py
deleted file mode 100644
index 45deec9ac3ce..000000000000
--- a/sysutils/py-salt/files/patch-salt__utils____init__.py
+++ /dev/null
@@ -1,83 +0,0 @@
---- salt/utils/__init__.py.orig
-+++ salt/utils/__init__.py
-@@ -1532,20 +1532,7 @@ def is_windows():
-     '''
-     Simple function to return if a host is Windows or not
-     '''
--    import __main__ as main
--    # This is a hack.  If a proxy minion is started by other
--    # means, e.g. a custom script that creates the minion objects
--    # then this will fail.
--    is_proxy = False
--    try:
--        if 'salt-proxy' in main.__file__:
--            is_proxy = True
--    except AttributeError:
--        pass
--    if is_proxy:
--        return False
--    else:
--        return sys.platform.startswith('win')
-+    return sys.platform.startswith('win')
- 
- 
- def sanitize_win_path_string(winpath):
-@@ -1571,15 +1558,6 @@ def is_proxy():
-     TODO: Need to extend this for proxies that might run on
-     other Unices
-     '''
--    return not (is_linux() or is_sunos() or is_windows())
--
--
--@real_memoize
--def is_linux():
--    '''
--    Simple function to return if a host is Linux or not.
--    Note for a proxy minion, we need to return something else
--    '''
-     import __main__ as main
-     # This is a hack.  If a proxy minion is started by other
-     # means, e.g. a custom script that creates the minion objects
-@@ -1590,10 +1568,16 @@ def is_linux():
-             is_proxy = True
-     except AttributeError:
-         pass
--    if is_proxy:
--        return False
--    else:
--        return sys.platform.startswith('linux')
-+    return is_proxy
-+
-+
-+@real_memoize
-+def is_linux():
-+    '''
-+    Simple function to return if a host is Linux or not.
-+    Note for a proxy minion, we need to return something else
-+    '''
-+    return sys.platform.startswith('linux')
- 
- 
- @real_memoize
-@@ -1609,20 +1593,7 @@ def is_sunos():
-     '''
-     Simple function to return if host is SunOS or not
-     '''
--    import __main__ as main
--    # This is a hack.  If a proxy minion is started by other
--    # means, e.g. a custom script that creates the minion objects
--    # then this will fail.
--    is_proxy = False
--    try:
--        if 'salt-proxy' in main.__file__:
--            is_proxy = True
--    except AttributeError:
--        pass
--    if is_proxy:
--        return False
--    else:
--        return sys.platform.startswith('sunos')
-+    return sys.platform.startswith('sunos')
- 
- 
- @real_memoize
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 152af1b3cc41..2da91b7064bb 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -889,8 +889,6 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py
 %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc
-%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.py
-%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
 %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/temp.py