CVS commit: pkgsrc/devel/scons

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jul 20 13:16:15 UTC 2023

Modified Files:
        pkgsrc/devel/scons: Makefile

Log Message:
scons: Add precise CONFLICTS with pyNN-scons-3*

I had deleted PYTHON_SELF_CONFLICTS because it was overbroad,
resulting in py27-scons-3 incorrectly conflicting with py310-scons-4;
this incorrect conflicts caused incorrect failures during
pkg_rolling-replace and manual building.  However, there is still some
python 3 usage of scons-3, and various scons-3 does conflict.  This
commit adds a manual CONFLICTS line covering all python versions of
scons 3, and excluding other scons major versions.  I believe that now
the declared CONFLICTS are exactly correct, gaining the desired
efficiency while not breaking valid usage.

Thanks to wiz@ for off-list discussion about the subtleties.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/scons/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/scons/Makefile
diff -u pkgsrc/devel/scons/Makefile:1.56 pkgsrc/devel/scons/Makefile:1.57
--- pkgsrc/devel/scons/Makefile:1.56    Thu Jul 20 00:11:02 2023
+++ pkgsrc/devel/scons/Makefile Thu Jul 20 13:16:14 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2023/07/20 00:11:02 gdt Exp $
+# $NetBSD: Makefile,v 1.57 2023/07/20 13:16:14 gdt Exp $
 
 DISTNAME=      scons-3.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scons/}
 
@@ -13,6 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
+CONFLICTS=     py[0-9]*-scons-3[0-9\.]*
+
 USE_PKG_RESOURCES=     yes
 
 REPLACE_PYTHON+=       script/scons