CONFLICTS between python modules

6 files changed, 16 insertions, 6 deletions

diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index f443189d39a..e5ab4e6f8e9 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/10/15 12:03:21 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/03 23:40:38 cheusov Exp $
 #
 
 DISTNAME=		InlineEgg-1.08
@@ -19,6 +19,8 @@ PYTHON_PATCH_SCRIPTS=		examples/example1.py examples/example2.py \
 				examples/example5.py examples/example6.py \
 				xored_shell_client.py
 
+PYTHON_SELF_CONFLICT=		yes
+
 INSTALLATION_DIRS=	share/doc/InlineEgg share/examples/InlineEgg
 
 post-install:
diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile
index 9df9f96cea1..e380694aacc 100644
--- a/devel/py-ipython/Makefile
+++ b/devel/py-ipython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/01/29 13:22:51 obache Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/03 23:40:37 cheusov Exp $
 #
 
 DISTNAME=	ipython-0.10.2
@@ -16,6 +16,8 @@ DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+PYTHON_SELF_CONFLICT=	yes
+
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gunzip
 
diff --git a/devel/py-ipython012/Makefile b/devel/py-ipython012/Makefile
index db86387b643..8c05e4ecaa2 100644
--- a/devel/py-ipython012/Makefile
+++ b/devel/py-ipython012/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 22:14:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/03 23:40:35 cheusov Exp $
 #
 
 DISTNAME=	ipython-0.12
@@ -15,6 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PYTHON_SELF_CONFLICT=	yes
 
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gunzip
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 2be1daea9ac..2cce862c78c 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/04/27 12:31:46 obache Exp $
+# $NetBSD: Makefile,v 1.45 2012/10/03 23:40:38 cheusov Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 PKGREVISION=	4
@@ -14,6 +14,7 @@ CONFIGURE_ENV+=		PYTHON2=${PYTHONBIN:Q}
 
 PY_PATCHPLIST=		YES
 PYTHON_PATCH_SCRIPTS=	tools/hook-scripts/mailer/mailer.py
+PYTHON_SELF_CONFLICT=	YES
 
 BUILD_TARGET=		swig-py
 INSTALL_TARGET=		install-swig-py
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index 80d5f7ab5e1..ca9170b3ba6 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/04/27 12:31:46 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/03 23:40:37 cheusov Exp $
 
 DISTNAME=	subvertpy-0.8.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_ENV+=	SVN_PREFIX=${BUILDLINK_PREFIX.subversion-base}
 
+PYTHON_SELF_CONFLICT=	yes
+
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index 93e59811120..f6a5b4b364a 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/10/15 08:16:50 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/03 23:40:38 cheusov Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unit-1.4.1
@@ -14,5 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 EGG_NAME=	PyUnit-${PKGVERSION_NOREV}
 
+PYTHON_SELF_CONFLICT=	yes
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"