CVS commit: pkgsrc/net

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jun 16 14:19:42 UTC 2018

Modified Files:
        pkgsrc/net/py-Socks: Makefile
        pkgsrc/net/py-socksipy-branch: Makefile

Log Message:
The Socks and SocksiPy-branch packages conflict.

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-Socks/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-socksipy-branch/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-Socks/Makefile
diff -u pkgsrc/net/py-Socks/Makefile:1.3 pkgsrc/net/py-Socks/Makefile:1.4
--- pkgsrc/net/py-Socks/Makefile:1.3    Thu Dec 21 13:49:13 2017
+++ pkgsrc/net/py-Socks/Makefile        Sat Jun 16 14:19:42 2018
@@ -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/PySo
 COMMENT=       Python SOCKS client module
 LICENSE=       modified-bsd
 
+CONFLICTS=     ${PYPKGPREFIX}-SocksiPy-branch-[0-9]*
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"

Index: pkgsrc/net/py-socksipy-branch/Makefile
diff -u pkgsrc/net/py-socksipy-branch/Makefile:1.2 pkgsrc/net/py-socksipy-branch/Makefile:1.3
--- pkgsrc/net/py-socksipy-branch/Makefile:1.2  Sun Mar  4 16:24:55 2018
+++ pkgsrc/net/py-socksipy-branch/Makefile      Sat Jun 16 14:19:42 2018
@@ -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/S
 COMMENT=        Python SOCKS module
 LICENSE=        modified-bsd
 
+CONFLICTS=     ${PYPKGPREFIX}-Socks-branch-[0-9]*
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"