diff options
| author | Kubilay Kocak <koobs@FreeBSD.org> | 2017-07-16 11:28:01 +0000 |
|---|---|---|
| committer | Kubilay Kocak <koobs@FreeBSD.org> | 2017-07-16 11:28:01 +0000 |
| commit | a83277cf5b3c1d19e20bbd6c4d664b48c924a57d (patch) | |
| tree | 436e21eb0a3437bf1321e41b3c27b103df2907cb /sysutils/py-ploy | |
| parent | www/libhtp-suricata: Delete port (no longer required) (diff) | |
sysutils/py-ploy: Switch to paramiko (2.x)
Chase the devel/py-fabric update made in r445866 [1], which switched the
paramiko dependency from security/paramiko1 to security/paramiko (2.x), by
updating this port to use paramiko 2.x as well.
This fixes an installation conflict and package failure of
sysutils/py_ploy_fabric, due to two ports, both dependencies of
py-ploy_fabric trying to install different versions of paramiko:
pkg-static: py27-paramiko-2.0.5 conflicts with py27-paramiko1-1.18.2 (installs files into the same place).
Problematic file: /usr/local/lib/python2.7/site-packages/paramiko/__init__.py
This has happened before [2][3] in the opposite direction (paramiko ->
paramiko1)
[1] https://svnweb.freebsd.org/changeset/ports/445866
[2] https://svnweb.freebsd.org/changeset/ports/425687
[3] https://bugs.freebsd.org/214379
PR: 214379 [3]
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=445996
Diffstat (limited to 'sysutils/py-ploy')
| -rw-r--r-- | sysutils/py-ploy/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile index 6add0ae56757..85aa76f51622 100644 --- a/sysutils/py-ploy/Makefile +++ b/sysutils/py-ploy/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}paramiko1>0:security/py-paramiko1 \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools USES= python |