diff options
| author | cheusov <cheusov> | 2012-10-03 23:40:35 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2012-10-03 23:40:35 +0000 |
| commit | 6640f4e0315610e86268d98a24f213403027cee0 (patch) | |
| tree | 0671ee272f4e4f2a67b3b474811ea8104a1b37f4 /net | |
| parent | dc40a26024d85d07535fe4b732e30978908b9b14 (diff) | |
| download | pkgsrc-6640f4e0315610e86268d98a24f213403027cee0.tar.gz | |
CONFLICTS between python modules
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-ORBit/Makefile | 4 | ||||
| -rw-r--r-- | net/py-omniORBpy/Makefile | 4 | ||||
| -rw-r--r-- | net/py-s3cmd/Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
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 |