CONFLICTS between python modules

10 files changed, 27 insertions, 11 deletions

diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile
index 51172b11214..5fa71b9d0ba 100644
--- a/textproc/py-4Suite/Makefile
+++ b/textproc/py-4Suite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/02/06 11:47:25 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/03 23:40:36 cheusov Exp $
 #
 
 VER=		1.0.2
@@ -29,6 +29,8 @@ SUBST_FILES.python+=	test/test.py
 SUBST_STAGE.python=	post-build
 SUBST_SED.python=	-e 's,\#![^ ]* python,\#! ${PYTHONBIN},'
 
+#PYTHON_SELF_CONFLICT=	yes
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 	${PYTHONBIN} setup.py config --prefix=${PREFIX}
diff --git a/textproc/py-Excelerator/Makefile b/textproc/py-Excelerator/Makefile
index 4d1c5c61301..bf9f2f6a298 100644
--- a/textproc/py-Excelerator/Makefile
+++ b/textproc/py-Excelerator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/02/04 12:03:32 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/03 23:40:37 cheusov Exp $
 #
 
 DISTNAME=	pyexcelerator-${VERSION}
@@ -37,6 +37,8 @@ REPLACE_PYTHON+=	pyExcelerator/__init__.py
 
 INSTALLATION_DIRS=	share/doc/py-Excelerator share/examples/py-Excelerator
 
+PYTHON_SELF_CONFLICT=	yes
+
 post-install:
 	for f in CHANGES.txt LICENSE.txt README.txt THANKS.txt TODO.txt ; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/py-Excelerator/ ; \
diff --git a/textproc/py-X/Makefile b/textproc/py-X/Makefile
index eeec38839cf..0ae0feeb302 100644
--- a/textproc/py-X/Makefile
+++ b/textproc/py-X/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/02/06 11:06:42 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/03 23:40:38 cheusov Exp $
 #
 
 DISTNAME=	PyX-0.9
@@ -32,6 +32,8 @@ SUBST_SED.conf+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 
 INSTALLATION_DIRS=	share/examples/PyX
 
+PYTHON_SELF_CONFLICT=	yes
+
 pre-install:
 	${CP} ${WRKSRC}/pyxrc ${WRKSRC}/pyxrc.default
 
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 7f1d47b6f41..f603617f577 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/02/07 11:25:46 obache Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/03 23:40:39 cheusov Exp $
 #
 
 VERS=		0.2.5
@@ -16,7 +16,9 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LANGUAGES=	#none
+USE_LANGUAGES=		#none
+
+PYTHON_SELF_CONFLICT=	yes
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile
index c3fe17763fc..ce7c8af60be 100644
--- a/textproc/py-empy/Makefile
+++ b/textproc/py-empy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/07/14 21:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/03 23:40:36 cheusov Exp $
 #
 
 DISTNAME=	empy-3.3
@@ -19,6 +19,8 @@ USE_TOOLS+=		pax
 PYDISTUTILSPKG=		# yes
 PLIST_SUBST+=		PYVERSSUFFIX="${PYVERSSUFFIX}"
 
+PYTHON_SELF_CONFLICT=	yes
+
 # Fix html path in documentation
 SUBST_CLASSES+=		doc
 SUBST_STAGE.doc=	post-configure
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index 716e3bcb590..2d4bec1b023 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/12/03 00:02:17 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/03 23:40:36 cheusov Exp $
 #
 
 DISTNAME=		aaronsw-${GHNAME}-${GHVERSION}-0-g${GHCOMMIT}
@@ -19,6 +19,7 @@ FETCH_USING=		curl
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYTHON_VERSIONS_INCLUDE_3X=	yes
+PYTHON_SELF_CONFLICT=		yes
 
 WRKSRC=			${WRKDIR}/aaronsw-${GHNAME}-${GHCOMMIT}
 
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 8a9a63696da..d38cbae107e 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/08 12:37:19 adam Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/03 23:40:38 cheusov Exp $
 
 DISTNAME=	Markdown-2.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,6 +14,7 @@ LICENSE=	modified-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=		yes
+PYTHON_SELF_CONFLICT=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 89fd91cd5e5..fc1bb9f73df 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/08/15 09:27:34 obache Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/03 23:40:37 cheusov Exp $
 #
 
 DISTNAME=	markdown2-2.0.1
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCLUDE_3X=	yes
+PYTHON_SELF_CONFLICT=		yes
 
 do-test:
 	${RUN}cd ${WRKSRC}/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
diff --git a/textproc/py-pdf-parser/Makefile b/textproc/py-pdf-parser/Makefile
index 0774e36a696..e75218316a5 100644
--- a/textproc/py-pdf-parser/Makefile
+++ b/textproc/py-pdf-parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 22:14:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/03 23:40:39 cheusov Exp $
 #
 
 DISTNAME=	pdf-parser_V0_3_7
@@ -22,6 +22,7 @@ REPLACE_PYTHON=	pdf-parser.py
 INSTALLATION_DIRS=	bin
 
 PYTHON_VERSIONS_ACCEPTED=	26
+PYTHON_SELF_CONFLICT=	yes
 
 do-build:
 
diff --git a/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile
index 5bd03ba51bc..31be36da226 100644
--- a/textproc/py-xlrd/Makefile
+++ b/textproc/py-xlrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/04/23 13:13:44 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/03 23:40:36 cheusov Exp $
 #
 
 DISTNAME=		xlrd-0.7.7
@@ -15,5 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		#none
 
+PYTHON_SELF_CONFLICT=	yes
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"