pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc CONFLICTS between python modules
details: https://anonhg.NetBSD.org/pkgsrc/rev/5af9c610b472
branches: trunk
changeset: 609488:5af9c610b472
user: cheusov <cheusov%pkgsrc.org@localhost>
date: Wed Oct 03 23:40:35 2012 +0000
description:
CONFLICTS between python modules
diffstat:
audio/py-dynampd/Makefile | 4 +++-
audio/py-musicbrainz/Makefile | 4 +++-
biology/py-mol/Makefile | 5 +++--
devel/py-InlineEgg/Makefile | 4 +++-
devel/py-ipython/Makefile | 4 +++-
devel/py-ipython012/Makefile | 3 ++-
devel/py-subversion/Makefile | 3 ++-
devel/py-subvertpy/Makefile | 4 +++-
devel/py-unit/Makefile | 4 +++-
filesystems/py-filesystem/Makefile | 4 +++-
fonts/py-fonttools/Makefile | 4 +++-
graphics/py-aafigure/Makefile | 4 +++-
graphics/py-cairo/Makefile | 4 +++-
graphics/py-uniconvertor/Makefile | 3 ++-
lang/py-pyrex/Makefile | 4 +++-
mail/py-sendmail-admin/Makefile | 3 ++-
math/py-networkx/Makefile | 4 +++-
net/py-ORBit/Makefile | 4 +++-
net/py-omniORBpy/Makefile | 4 +++-
net/py-s3cmd/Makefile | 4 +++-
security/py-denyhosts/Makefile | 4 +++-
security/py-tlslite/Makefile | 3 ++-
textproc/py-4Suite/Makefile | 4 +++-
textproc/py-Excelerator/Makefile | 4 +++-
textproc/py-X/Makefile | 4 +++-
textproc/py-creole/Makefile | 6 ++++--
textproc/py-empy/Makefile | 4 +++-
textproc/py-html2text/Makefile | 3 ++-
textproc/py-markdown/Makefile | 3 ++-
textproc/py-markdown2/Makefile | 3 ++-
textproc/py-pdf-parser/Makefile | 3 ++-
textproc/py-xlrd/Makefile | 4 +++-
wm/py-tyle/Makefile | 4 +++-
www/py-moin/Makefile | 4 +++-
x11/py-wxWidgets/Makefile | 5 +++--
35 files changed, 97 insertions(+), 38 deletions(-)
diffs (truncated from 619 to 300 lines):
diff -r d1f1d771299c -r 5af9c610b472 audio/py-dynampd/Makefile
--- a/audio/py-dynampd/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/audio/py-dynampd/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/02 23:48:05 asau Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/03 23:40:37 cheusov Exp $
#
DISTNAME= dynampd
@@ -22,6 +22,8 @@
INSTALLATION_DIRS= bin
REPLACE_PYTHON= dynampd.py
+PYTHON_SELF_CONFLICT= yes
+
do-build:
do-install:
diff -r d1f1d771299c -r 5af9c610b472 audio/py-musicbrainz/Makefile
--- a/audio/py-musicbrainz/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/audio/py-musicbrainz/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/02 23:48:06 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/03 23:40:38 cheusov Exp $
DISTNAME= python-musicbrainz2-0.4.1
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -11,6 +11,8 @@
COMMENT= Python interface to the MusicBrainz XML web service
LICENSE= modified-bsd
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/pyversion.mk"
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
diff -r d1f1d771299c -r 5af9c610b472 biology/py-mol/Makefile
--- a/biology/py-mol/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/biology/py-mol/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/09/11 20:32:14 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/03 23:40:35 cheusov Exp $
DISTNAME= pymol-v1.4.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/}
@@ -19,7 +19,8 @@
WRKSRC= ${WRKDIR}/pymol
-CONFLICTS= pymol-[0-9]*
+CONFLICTS= pymol-[0-9]*
+PYTHON_SELF_CONFLICT= yes
USE_LANGUAGES= c c++
diff -r d1f1d771299c -r 5af9c610b472 devel/py-InlineEgg/Makefile
--- a/devel/py-InlineEgg/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-InlineEgg/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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 @@
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 -r d1f1d771299c -r 5af9c610b472 devel/py-ipython/Makefile
--- a/devel/py-ipython/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-ipython/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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 @@
PKG_DESTDIR_SUPPORT= user-destdir
+PYTHON_SELF_CONFLICT= yes
+
USE_LANGUAGES= # none
USE_TOOLS+= gunzip
diff -r d1f1d771299c -r 5af9c610b472 devel/py-ipython012/Makefile
--- a/devel/py-ipython012/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-ipython012/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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}-pexpect-[0-9]*:../../devel/py-pexpect
PKG_DESTDIR_SUPPORT= user-destdir
+PYTHON_SELF_CONFLICT= yes
USE_LANGUAGES= # none
USE_TOOLS+= gunzip
diff -r d1f1d771299c -r 5af9c610b472 devel/py-subversion/Makefile
--- a/devel/py-subversion/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-subversion/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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 @@
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 -r d1f1d771299c -r 5af9c610b472 devel/py-subvertpy/Makefile
--- a/devel/py-subvertpy/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-subvertpy/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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 @@
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 -r d1f1d771299c -r 5af9c610b472 devel/py-unit/Makefile
--- a/devel/py-unit/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/devel/py-unit/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -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 @@
EGG_NAME= PyUnit-${PKGVERSION_NOREV}
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d1f1d771299c -r 5af9c610b472 filesystems/py-filesystem/Makefile
--- a/filesystems/py-filesystem/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/filesystems/py-filesystem/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/03 23:40:37 cheusov Exp $
#
VERSION= 0.4.0
@@ -14,5 +14,7 @@
USE_LANGUAGES= # none
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d1f1d771299c -r 5af9c610b472 fonts/py-fonttools/Makefile
--- a/fonts/py-fonttools/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/fonts/py-fonttools/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/03 18:28:30 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/03 23:40:36 cheusov Exp $
#
DISTNAME= fonttools-2.3
@@ -13,6 +13,8 @@
DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_SELF_CONFLICT= yes
+
SUBST_CLASSES+= fix-mandir
SUBST_STAGE.fix-mandir= pre-configure
SUBST_FILES.fix-mandir= setup.py
diff -r d1f1d771299c -r 5af9c610b472 graphics/py-aafigure/Makefile
--- a/graphics/py-aafigure/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/graphics/py-aafigure/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/01 10:14:31 obache Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/03 23:40:36 cheusov Exp $
#
DISTNAME= aafigure-0.5
@@ -18,5 +18,7 @@
USE_LANGUAGES= # none
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d1f1d771299c -r 5af9c610b472 graphics/py-cairo/Makefile
--- a/graphics/py-cairo/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/graphics/py-cairo/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/02 17:11:16 tron Exp $
+# $NetBSD: Makefile,v 1.35 2012/10/03 23:40:36 cheusov Exp $
#
DISTNAME= py2cairo-1.8.10
@@ -25,6 +25,8 @@
PKGCONFIG_OVERRIDE+= pycairo.pc.in
PY_PATCHPLIST= yes
+PYTHON_SELF_CONFLICT= yes
+
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-2*) || \
diff -r d1f1d771299c -r 5af9c610b472 graphics/py-uniconvertor/Makefile
--- a/graphics/py-uniconvertor/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/graphics/py-uniconvertor/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/04/08 19:08:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/03 23:40:36 cheusov Exp $
DISTNAME= uniconvertor-1.1.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,6 +14,7 @@
USE_LANGUAGES= c
PYDISTUTILSPKG= yes
+PYTHON_SELF_CONFLICT= yes
DEPENDS+= ${PYPKGPREFIX}-sk1libs-[0-9]*:../../graphics/py-sk1libs
diff -r d1f1d771299c -r 5af9c610b472 lang/py-pyrex/Makefile
--- a/lang/py-pyrex/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/lang/py-pyrex/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/02 20:11:50 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/03 23:40:38 cheusov Exp $
DISTNAME= Pyrex-0.9.9
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/}
@@ -13,5 +13,7 @@
PYDISTUTILSPKG= yes
USE_TOOLS+= pax
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d1f1d771299c -r 5af9c610b472 mail/py-sendmail-admin/Makefile
--- a/mail/py-sendmail-admin/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/mail/py-sendmail-admin/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/01/24 11:10:59 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/03 23:40:36 cheusov Exp $
#
VER= 1.0
@@ -14,6 +14,7 @@
LICENSE= 2-clause-bsd
PYTHON_VERSIONS_INCLUDE_3X= yes
+PYTHON_SELF_CONFLICT= yes
USE_LANGUAGES= # none
diff -r d1f1d771299c -r 5af9c610b472 math/py-networkx/Makefile
--- a/math/py-networkx/Makefile Wed Oct 03 23:39:21 2012 +0000
+++ b/math/py-networkx/Makefile Wed Oct 03 23:40:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 22:14:02 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/03 23:40:37 cheusov Exp $
#
DISTNAME= networkx-1.7
@@ -12,5 +12,7 @@
COMMENT= Python package for creating and manipulating graphs and networks
LICENSE= modified-bsd
+PYTHON_SELF_CONFLICT= yes
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d1f1d771299c -r 5af9c610b472 net/py-ORBit/Makefile
--- a/net/py-ORBit/Makefile Wed Oct 03 23:39:21 2012 +0000
Home |
Main Index |
Thread Index |
Old Index