diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2017-12-12 21:35:38 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2017-12-12 21:35:38 +0800 |
| commit | 5a08f4d732c7d0382ecb6544819d0bfd439c57fa (patch) | |
| tree | b75bd9b7eeec40967407311f01ef05f7031f4a2e | |
| parent | b3423398b88237072147abd69e700e84be2c84eb (diff) | |
| download | freebsd-ports-gnome-5a08f4d732c7d0382ecb6544819d0bfd439c57fa.tar.gz freebsd-ports-gnome-5a08f4d732c7d0382ecb6544819d0bfd439c57fa.tar.zst freebsd-ports-gnome-5a08f4d732c7d0382ecb6544819d0bfd439c57fa.zip | |
Fix packaging on Python 3+ and unbreak this port
PR: 224029
Reported by: Henrik Hudson <ports@thelanman.net>
Approved by: portmgr (blanket)
| -rw-r--r-- | sysutils/py-salt/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/py-salt/pkg-plist | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 3b573a0827bc..e4e8ca07ce92 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -13,10 +13,6 @@ COMMENT= Distributed remote execution and configuration management system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -py34_BROKEN= fails to package -py35_BROKEN= fails to package -py36_BROKEN= fails to package - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist index 506af4b90f5e..533d5c0c29d5 100644 --- a/sysutils/py-salt/pkg-plist +++ b/sysutils/py-salt/pkg-plist @@ -1,5 +1,7 @@ @sample %%ETCDIR%%/master.sample @sample %%ETCDIR%%/minion.sample %%PYTHON_SITELIBDIR%%/salt/_syspaths.py -%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc -%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% |