diff -ruN py-salt/Makefile py-salt-2018.3.0/Makefile
--- py-salt/Makefile	2018-04-22 12:29:51.000000000 -0600
+++ py-salt-2018.3.0/Makefile	2018-04-22 14:03:51.588974000 -0600
@@ -1,9 +1,8 @@
 # Created by: Christer Edwards <christer.edwards@gmail.com>
-# $FreeBSD: head/sysutils/py-salt/Makefile 468048 2018-04-22 18:29:51Z sunpoet $
+# $FreeBSD: head/sysutils/py-salt/Makefile 467246 2018-04-13 16:06:33Z garga $
 
 PORTNAME=	salt
-PORTVERSION=	2017.7.4
-PORTREVISION=	3
+PORTVERSION=	2018.3.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff -ruN py-salt/distinfo py-salt-2018.3.0/distinfo
--- py-salt/distinfo	2018-03-07 05:44:29.000000000 -0700
+++ py-salt-2018.3.0/distinfo	2018-04-13 21:14:01.881095000 -0600
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520059286
-SHA256 (salt-2017.7.4.tar.gz) = 1d573095776ba052eec7d7cae1472f4b1d4c15f16e1d79c2dc48db3129dbae97
-SIZE (salt-2017.7.4.tar.gz) = 11718327
+TIMESTAMP = 1523675641
+SHA256 (salt-2018.3.0.tar.gz) = a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31
+SIZE (salt-2018.3.0.tar.gz) = 13448567
diff -ruN py-salt/files/patch-salt_grains_marathon.py py-salt-2018.3.0/files/patch-salt_grains_marathon.py
--- py-salt/files/patch-salt_grains_marathon.py	1969-12-31 17:00:00.000000000 -0700
+++ py-salt-2018.3.0/files/patch-salt_grains_marathon.py	2018-04-12 17:51:25.145468000 -0600
@@ -0,0 +1,16 @@
+--- salt/grains/marathon.py.old	2018-04-02 10:35:12.000000000 -0600
++++ salt/grains/marathon.py	2018-04-12 17:50:24.018368000 -0600
+@@ -14,10 +14,10 @@
+ 
+ 
+ def __virtual__():
+-    if not salt.utils.platform.is_proxy() or 'proxy' not in __opts__:
+-        return False
+-    else:
++    if salt.utils.platform.is_proxy() and 'proxy' in __opts__:
+         return __virtualname__
++    else:
++        return False
+ 
+ 
+ def kernel():
diff -ruN py-salt/files/patch-salt_modules_freebsdservice.py py-salt-2018.3.0/files/patch-salt_modules_freebsdservice.py
--- py-salt/files/patch-salt_modules_freebsdservice.py	2017-08-22 17:02:21.000000000 -0600
+++ py-salt-2018.3.0/files/patch-salt_modules_freebsdservice.py	1969-12-31 17:00:00.000000000 -0700
@@ -1,18 +0,0 @@
---- salt/modules/freebsdservice.py.orig	2017-08-15 15:26:36 UTC
-+++ salt/modules/freebsdservice.py
-@@ -16,7 +16,6 @@ import os
- 
- # Import salt libs
- import salt.utils
--import salt.utils.decorators as decorators
- from salt.exceptions import CommandNotFoundError
- 
- __func_alias__ = {
-@@ -39,7 +38,6 @@ def __virtual__():
-     return (False, 'The freebsdservice execution module cannot be loaded: only available on FreeBSD systems.')
- 
- 
--@decorators.memoize
- def _cmd(jail=None):
-     '''
-     Return full path to service command
diff -ruN py-salt/files/patch-salt_modules_pkgng.py py-salt-2018.3.0/files/patch-salt_modules_pkgng.py
--- py-salt/files/patch-salt_modules_pkgng.py	2017-12-28 01:53:53.000000000 -0700
+++ py-salt-2018.3.0/files/patch-salt_modules_pkgng.py	1969-12-31 17:00:00.000000000 -0700
@@ -1,92 +0,0 @@
---- salt/modules/pkgng.py.orig	2017-10-09 16:37:42 UTC
-+++ salt/modules/pkgng.py
-@@ -1154,8 +1154,6 @@ def upgrade(*names, **kwargs):
-         opts += 'n'
-     if not dryrun:
-         opts += 'y'
--    if opts:
--        opts = '-' + opts
- 
-     cmd = _pkg(jail, chroot, root)
-     cmd.append('upgrade')
-@@ -1181,7 +1179,11 @@ def upgrade(*names, **kwargs):
-     return ret
- 
- 
--def clean(jail=None, chroot=None, root=None):
-+def clean(jail=None,
-+          chroot=None,
-+          root=None,
-+          clean_all=False,
-+          dryrun=False):
-     '''
-     Cleans the local cache of fetched remote packages
- 
-@@ -1190,11 +1192,64 @@ def clean(jail=None, chroot=None, root=None):
-     .. code-block:: bash
- 
-         salt '*' pkg.clean
--        salt '*' pkg.clean jail=<jail name or id>
--        salt '*' pkg.clean chroot=/path/to/chroot
-+
-+    jail
-+        Cleans the package cache in the specified jail
-+
-+        CLI Example:
-+
-+        .. code-block:: bash
-+
-+            salt '*' pkg.clean jail=<jail name or id>
-+
-+    chroot
-+        Cleans the package cache in the specified chroot (ignored if ``jail``
-+        is specified)
-+
-+    root
-+        Cleans the package cache in the specified root (ignored if ``jail``
-+        is specified)
-+
-+        CLI Example:
-+
-+        .. code-block:: bash
-+
-+            salt '*' pkg.clean chroot=/path/to/chroot
-+
-+    clean_all
-+        Clean all packages from the local cache (not just those that have been
-+        superseded by newer versions).
-+
-+        CLI Example:
-+
-+        .. code-block:: bash
-+
-+        salt '*' pkg.clean clean_all=True
-+
-+    dryrun
-+        Dry-run mode. This list of changes to the local cache is always
-+        printed, but no changes are actually made.
-+
-+        CLI Example:
-+
-+        .. code-block:: bash
-+
-+            salt '*' pkg.clean dryrun=True
-     '''
-+    opts = ''
-+    if clean_all:
-+        opts += 'a'
-+    if dryrun:
-+        opts += 'n'
-+    else:
-+        opts += 'y'
-+
-+    cmd = _pkg(jail, chroot, root)
-+    cmd.append('clean')
-+    if opts:
-+        cmd.append('-' + opts)
-     return __salt__['cmd.run'](
--        _pkg(jail, chroot, root) + ['clean'],
-+        cmd,
-         output_loglevel='trace',
-         python_shell=False
-     )