diff options
author | cheusov <cheusov@pkgsrc.org> | 2012-10-03 23:40:35 +0000 |
---|---|---|
committer | cheusov <cheusov@pkgsrc.org> | 2012-10-03 23:40:35 +0000 |
commit | 2144a22c157ca35b7a75a962a671a9c4d019bd76 (patch) | |
tree | 0671ee272f4e4f2a67b3b474811ea8104a1b37f4 | |
parent | d62241fc589197e6df5d480d00023edd4b612646 (diff) | |
download | pkgsrc-2144a22c157ca35b7a75a962a671a9c4d019bd76.tar.gz |
CONFLICTS between python modules
35 files changed, 97 insertions, 38 deletions
diff --git a/audio/py-dynampd/Makefile b/audio/py-dynampd/Makefile index 25dcefc143f..ff839874c8f 100644 --- a/audio/py-dynampd/Makefile +++ b/audio/py-dynampd/Makefile @@ -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 @@ USE_LANGUAGES= # none INSTALLATION_DIRS= bin REPLACE_PYTHON= dynampd.py +PYTHON_SELF_CONFLICT= yes + do-build: do-install: diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile index b048b3f5ef4..3cf83863fcd 100644 --- a/audio/py-musicbrainz/Makefile +++ b/audio/py-musicbrainz/Makefile @@ -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 @@ HOMEPAGE= http://musicbrainz.org/doc/PythonMusicBrainz2 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 --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile index bea64c8b79b..af9d6282563 100644 --- a/biology/py-mol/Makefile +++ b/biology/py-mol/Makefile @@ -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 @@ DEPENDS+= ${PYPKGPREFIX}-Pmw-[0-9]*:../../x11/py-Pmw WRKSRC= ${WRKDIR}/pymol -CONFLICTS= pymol-[0-9]* +CONFLICTS= pymol-[0-9]* +PYTHON_SELF_CONFLICT= yes USE_LANGUAGES= c c++ 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" diff --git a/filesystems/py-filesystem/Makefile b/filesystems/py-filesystem/Makefile index a8ab101e722..29874476acd 100644 --- a/filesystems/py-filesystem/Makefile +++ b/filesystems/py-filesystem/Makefile @@ -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 @@ LICENSE= modified-bsd USE_LANGUAGES= # none +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index 6f5e30ddec0..e0b7129d125 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -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 @@ COMMENT= Library for manipulating fonts 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 --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile index aa346672567..b08f6713aca 100644 --- a/graphics/py-aafigure/Makefile +++ b/graphics/py-aafigure/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # none +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 021c11f9c83..5afc9f15f91 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -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 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PKGCONFIG_OVERRIDE+= pycairo.pc.in PY_PATCHPLIST= yes +PYTHON_SELF_CONFLICT= yes + .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-2*) || \ diff --git a/graphics/py-uniconvertor/Makefile b/graphics/py-uniconvertor/Makefile index 451343fa251..e3543b4a58b 100644 --- a/graphics/py-uniconvertor/Makefile +++ b/graphics/py-uniconvertor/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c PYDISTUTILSPKG= yes +PYTHON_SELF_CONFLICT= yes DEPENDS+= ${PYPKGPREFIX}-sk1libs-[0-9]*:../../graphics/py-sk1libs diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile index f3aa5566df0..2bfd1c2c5fb 100644 --- a/lang/py-pyrex/Makefile +++ b/lang/py-pyrex/Makefile @@ -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 @@ LICENSE= apache-2.0 PYDISTUTILSPKG= yes USE_TOOLS+= pax +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/py-sendmail-admin/Makefile b/mail/py-sendmail-admin/Makefile index 937381a7955..ee27979d980 100644 --- a/mail/py-sendmail-admin/Makefile +++ b/mail/py-sendmail-admin/Makefile @@ -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 @@ COMMENT= Mailqs and rmmq, two scripts that ease Sendmail administration LICENSE= 2-clause-bsd PYTHON_VERSIONS_INCLUDE_3X= yes +PYTHON_SELF_CONFLICT= yes USE_LANGUAGES= # none diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index 338a5ab01a7..b71a845ce74 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -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 @@ HOMEPAGE= http://networkx.lanl.gov/ 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 --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index 04ca25163f6..bdbd587c196 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2012/09/15 10:06:06 obache Exp $ +# $NetBSD: Makefile,v 1.43 2012/10/03 23:40:35 cheusov Exp $ # DISTNAME= pyorbit-2.24.0 @@ -22,6 +22,8 @@ PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +PYTHON_SELF_CONFLICT= YES + BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 BUILDLINK_API_DEPENDS.python25+= python25>=2.5.4nb2 diff --git a/net/py-omniORBpy/Makefile b/net/py-omniORBpy/Makefile index fd5263182d8..885f9f09805 100644 --- a/net/py-omniORBpy/Makefile +++ b/net/py-omniORBpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/02/26 08:28:34 sbd Exp $ +# $NetBSD: Makefile,v 1.5 2012/10/03 23:40:36 cheusov Exp $ DISTNAME= omniORBpy-3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +18,8 @@ USE_TOOLS+= gmake USE_LANGUAGES+= c c++ MAKE_FILE= GNUmakefile +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/application.mk" .include "../../net/omniORB/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 8aa89a84700..6aeee20c276 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/04/15 22:01:03 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/10/03 23:40:37 cheusov Exp $ DISTNAME= s3cmd-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,6 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir PYDISTUTILSPKG= yes MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDIR} +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/pyversion.mk" DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat diff --git a/security/py-denyhosts/Makefile b/security/py-denyhosts/Makefile index e258896dcb1..6418c1358ec 100644 --- a/security/py-denyhosts/Makefile +++ b/security/py-denyhosts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/04/29 16:51:27 taca Exp $ +# $NetBSD: Makefile,v 1.6 2012/10/03 23:40:37 cheusov Exp $ # VER= 2.6 @@ -30,6 +30,8 @@ REPLACE_PYTHON= daemon-control-dist plugins/test_deny.py setup.py REPLACE_PYTHON+= scripts/restricted_from_invalid.py REPLACE_PYTHON+= scripts/restricted_from_passwd.py +PYTHON_SELF_CONFLICT= yes + RCD_SCRIPTS+= denyhosts post-configure: diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile index 1fe9fdb0684..623ba0e3356 100644 --- a/security/py-tlslite/Makefile +++ b/security/py-tlslite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/10/29 06:22:20 obache Exp $ +# $NetBSD: Makefile,v 1.5 2012/10/03 23:40:38 cheusov Exp $ # DISTNAME= tlslite-0.3.8 @@ -13,6 +13,7 @@ COMMENT= SSL 3.0, TLS 1.0, and TLS 1.1 in Python LICENSE= public-domain PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_SELF_CONFLICT= yes USE_LANGUAGES= # none 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" diff --git a/wm/py-tyle/Makefile b/wm/py-tyle/Makefile index 4aab6e32e69..764dbf9faa8 100644 --- a/wm/py-tyle/Makefile +++ b/wm/py-tyle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:03 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/10/03 23:40:39 cheusov Exp $ # DISTNAME= pytyle-0.7.5 @@ -16,6 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-Xlib-[0-9]*:../../x11/py-Xlib PKG_DESTDIR_SUPPORT= user-destdir +PYTHON_SELF_CONFLICT= yes + USE_LANGUAGES= #none .include "../../lang/python/distutils.mk" diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile index 384772b38e5..9b95d1a5280 100644 --- a/www/py-moin/Makefile +++ b/www/py-moin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/06/03 22:49:25 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2012/10/03 23:40:35 cheusov Exp $ # VER= 1.9.4 @@ -24,6 +24,8 @@ REPLACE_PYTHON= MoinMoin/i18n/tools/markup15to16.py \ REPLACE_PERL= MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +PYTHON_SELF_CONFLICT= yes + .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index 2ad93c3bc80..df4fe13c81a 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2012/10/03 21:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2012/10/03 23:40:38 cheusov Exp $ # VERSION= 2.8.10.1 @@ -20,7 +20,8 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config # previous name of the package -CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]* +CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]* +PYTHON_SELF_CONFLICT= yes WXARG= WXPORT=gtk2 UNICODE=1 |