pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python Introduce variable PYTHON_SELF_CONFLICT



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1f1d771299c
branches:  trunk
changeset: 609487:d1f1d771299c
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Wed Oct 03 23:39:21 2012 +0000

description:
Introduce variable PYTHON_SELF_CONFLICT
for registering conflicts between python modules.

diffstat:

 lang/python/pyversion.mk |  17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r feeddde55307 -r d1f1d771299c lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Wed Oct 03 23:22:21 2012 +0000
+++ b/lang/python/pyversion.mk  Wed Oct 03 23:39:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.102 2012/10/03 22:03:41 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.103 2012/10/03 23:39:21 cheusov Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -49,6 +49,13 @@
 #      Possible values: (defined) (undefined)
 #      Default: (undefined)
 #
+# PYTHON_SELF_CONFLICT
+#      If set to "yes", additional CONFLICTS entries are added for
+#      registering a conflict between pyNN-<modulename> packages.
+#
+#      Possible values: yes no
+#      Default: no
+#
 # === Defined variables ===
 #
 # PYPKGPREFIX
@@ -141,6 +148,14 @@
 _PYTHON_VERSION=       none
 .endif
 
+# Additional CONFLICTS
+.if ${PYTHON_SELF_CONFLICT:U:tl} == "yes"
+.for i in ${PYTHON_VERSIONS_ACCEPTED:N${_PYTHON_VERSION}}
+CONFLICTS +=   ${PKGNAME:S/py${_PYTHON_VERSION}/py${i}/:C/-[0-9].*$/-[0-9]*/}
+.endfor
+.endif # PYCONFLICTS
+
+#
 PLIST_VARS+=   py2x py3x
 
 .if ${_PYTHON_VERSION} == "32"



Home | Main Index | Thread Index | Old Index