[pkgsrc/trunk]: pkgsrc/net The Socks and SocksiPy-branch packages conflict.

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ddbb48c78b57
branches:  trunk
changeset: 309352:ddbb48c78b57
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jun 16 14:19:42 2018 +0000

description:
The Socks and SocksiPy-branch packages conflict.

They both install a Python module named "socks" :(

diffstat:

 net/py-Socks/Makefile           |  4 +++-
 net/py-socksipy-branch/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r bf4629c51d68 -r ddbb48c78b57 net/py-Socks/Makefile
--- a/net/py-Socks/Makefile     Sat Jun 16 14:17:21 2018 +0000
+++ b/net/py-Socks/Makefile     Sat Jun 16 14:19:42 2018 +0000
@@ -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 @@
 COMMENT=       Python SOCKS client module
 LICENSE=       modified-bsd
 
+CONFLICTS=     ${PYPKGPREFIX}-SocksiPy-branch-[0-9]*
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
diff -r bf4629c51d68 -r ddbb48c78b57 net/py-socksipy-branch/Makefile
--- a/net/py-socksipy-branch/Makefile   Sat Jun 16 14:17:21 2018 +0000
+++ b/net/py-socksipy-branch/Makefile   Sat Jun 16 14:19:42 2018 +0000
@@ -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 @@
 COMMENT=        Python SOCKS module
 LICENSE=        modified-bsd
 
+CONFLICTS=     ${PYPKGPREFIX}-Socks-branch-[0-9]*
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"