diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2018-06-16 14:19:42 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2018-06-16 14:19:42 +0000 |
| commit | eb82fa390ff170af3acbef1be89ddd203574ef12 (patch) | |
| tree | e6dd5d870756a2acdfd4d1fc66b4784ae57bfa61 /net | |
| parent | 8e57597d02830260b54465f95fa827d73afc11df (diff) | |
| download | pkgsrc-eb82fa390ff170af3acbef1be89ddd203574ef12.tar.gz | |
The Socks and SocksiPy-branch packages conflict.
They both install a Python module named "socks" :(
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-Socks/Makefile | 4 | ||||
| -rw-r--r-- | net/py-socksipy-branch/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/py-Socks/Makefile b/net/py-Socks/Makefile index 6d5fe428a8e..8801aa5596e 100644 --- a/net/py-Socks/Makefile +++ b/net/py-Socks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/12/21 13:49:13 adam Exp $ +# $NetBSD: Makefile,v 1.4 2018/06/16 14:19:42 bsiegert Exp $ DISTNAME= PySocks-1.6.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//} @@ -10,6 +10,8 @@ HOMEPAGE= https://github.com/Anorov/PySocks COMMENT= Python SOCKS client module LICENSE= modified-bsd +CONFLICTS= ${PYPKGPREFIX}-SocksiPy-branch-[0-9]* + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" diff --git a/net/py-socksipy-branch/Makefile b/net/py-socksipy-branch/Makefile index 2db4cae1d5b..7218ced9b03 100644 --- a/net/py-socksipy-branch/Makefile +++ b/net/py-socksipy-branch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/03/04 16:24:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2018/06/16 14:19:42 bsiegert Exp $ DISTNAME= SocksiPy-branch-1.01 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,5 +10,7 @@ HOMEPAGE= https://pypi.python.org/pypi/SocksiPy-branch/ COMMENT= Python SOCKS module LICENSE= modified-bsd +CONFLICTS= ${PYPKGPREFIX}-Socks-branch-[0-9]* + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" |