tech-pkg archive

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

Unregistered CONFLICTS



distbb I use for bulk builds automatically collects unregistered
CONFLICTS between packages. Example is below.

http://mova.org/~cheusov/pub/pkgsrc-distbb/NetBSD51/HEAD/logs/20120725.2158/META/check_unregistered_CONFLICTS.html

Not that CONFLICTS is a vital part of pkgsrc, but I'd like to explicitly
register most of them.

One of the main source of unregistered conflicts are python modules.
While different pythons can coexist on the system, some modules cannot,
for example py25-vobject-0.8.1cnb1 and py26-vobject-0.8.1cnb1, the share
bin/ics_diff.  The following patch introduces PYCONFLICTS variable. If
package sets it to "yes", additional conflicts are added. Unless anyone
has a better idea, I'd like to commit this patch and set PYCONFLICTS in
appropriate packages.

Index: lang/python/pyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v
retrieving revision 1.100
diff -u -r1.100 pyversion.mk
--- lang/python/pyversion.mk    1 Aug 2012 19:07:20 -0000       1.100
+++ lang/python/pyversion.mk    16 Sep 2012 18:54:12 -0000
@@ -134,6 +142,14 @@
 _PYTHON_VERSION=       none
 .endif
 
+# Additional CONFLICTS
+.if ${PYCONFLICTS: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"
Index: textproc/py-vobject/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-vobject/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- textproc/py-vobject/Makefile        1 Mar 2011 11:29:05 -0000       1.8
+++ textproc/py-vobject/Makefile        16 Sep 2012 18:54:12 -0000
@@ -3,7 +3,7 @@
 
 DISTNAME=      vobject-0.8.1c
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc python
 MASTER_SITES=  http://vobject.skyhouseconsulting.com/
 
@@ -15,7 +15,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 DEPENDS+=      ${PYPKGPREFIX}-dateutil>=1.1:../../time/py-dateutil
-
+PYCONFLICTS=   yes
 
 PYDISTUTILSPKG=        yes
 PY_PATCHPLIST= yes

-- 
Best regards, Aleksey Cheusov.


Home | Main Index | Thread Index | Old Index