Permalink
Browse files

CONFLICTS between python modules

  • Loading branch information...
1 parent d68bd4c commit 7670646b9e646faa4be9fead813238dd646f5e48 cheusov committed Oct 3, 2012
@@ -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:
@@ -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
View
@@ -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++
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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"
View
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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*) || \
@@ -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
View
@@ -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"
@@ -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
@@ -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"
View
@@ -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
@@ -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"
View
@@ -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
@@ -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:
@@ -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
@@ -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}
@@ -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/ ; \
View
@@ -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
@@ -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"
@@ -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
Oops, something went wrong.

0 comments on commit 7670646

Please sign in to comment.