CVS commit: pkgsrc/net/py-socksipy-branch

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jun 16 20:33:21 UTC 2018

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

Log Message:
Correct CONFLICTS entry, thanks wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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-socksipy-branch/Makefile
diff -u pkgsrc/net/py-socksipy-branch/Makefile:1.3 pkgsrc/net/py-socksipy-branch/Makefile:1.4
--- pkgsrc/net/py-socksipy-branch/Makefile:1.3  Sat Jun 16 14:19:42 2018
+++ pkgsrc/net/py-socksipy-branch/Makefile      Sat Jun 16 20:33:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/06/16 14:19:42 bsiegert Exp $
+# $NetBSD: Makefile,v 1.4 2018/06/16 20:33:21 bsiegert Exp $
 
 DISTNAME=      SocksiPy-branch-1.01
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://pypi.python.org/pypi/S
 COMMENT=        Python SOCKS module
 LICENSE=        modified-bsd
 
-CONFLICTS=     ${PYPKGPREFIX}-Socks-branch-[0-9]*
+CONFLICTS=     ${PYPKGPREFIX}-Socks-[0-9]*
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"