CVS commit: pkgsrc/devel/scons

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun  8 04:55:52 UTC 2023

Modified Files:
        pkgsrc/devel/scons: DESCR Makefile buildlink3.mk

Log Message:
scons: add upper bound to avoid pulling in scons4


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/scons/DESCR
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/scons/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/scons/buildlink3.mk

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/DESCR
diff -u pkgsrc/devel/scons/DESCR:1.2 pkgsrc/devel/scons/DESCR:1.3
--- pkgsrc/devel/scons/DESCR:1.2        Mon May 23 08:26:07 2005
+++ pkgsrc/devel/scons/DESCR    Thu Jun  8 04:55:52 2023
@@ -1,3 +1,6 @@
 SCons is an Open Source software construction tool--that is, a build tool;
 an improved substitute for the classic Make utility; a better way to build
 software.
+
+This is major version 3 of scons, which still supports Python 2.
+Use scons4 instead, if possible.

Index: pkgsrc/devel/scons/Makefile
diff -u pkgsrc/devel/scons/Makefile:1.54 pkgsrc/devel/scons/Makefile:1.55
--- pkgsrc/devel/scons/Makefile:1.54    Thu Jun 30 11:18:18 2022
+++ pkgsrc/devel/scons/Makefile Thu Jun  8 04:55:52 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.54 2022/06/30 11:18:18 nia Exp $
+# $NetBSD: Makefile,v 1.55 2023/06/08 04:55:52 wiz Exp $
 
-# 4.1.0 is broken, per reports on gpsd list.  Apparently 4.0.1 is ok.
 DISTNAME=      scons-3.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=   4
@@ -9,7 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_PYPI:=s/scon
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://www.scons.org/
-COMMENT=       Python-based, open-source build system
+COMMENT=       Python-based, open-source build system (old version 3)
 LICENSE=       mit
 
 USE_LANGUAGES= # none

Index: pkgsrc/devel/scons/buildlink3.mk
diff -u pkgsrc/devel/scons/buildlink3.mk:1.3 pkgsrc/devel/scons/buildlink3.mk:1.4
--- pkgsrc/devel/scons/buildlink3.mk:1.3        Tue Jun  6 12:41:16 2023
+++ pkgsrc/devel/scons/buildlink3.mk    Thu Jun  8 04:55:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2023/06/06 12:41:16 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/06/08 04:55:52 wiz Exp $
 
 # Note that while scons is a build tool, it requires running a python
 # program on the host that uses the scons library.  Currently, the
@@ -21,7 +21,7 @@ BUILDLINK_TREE+=      scons
 SCONS_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.scons?=    build
-BUILDLINK_API_DEPENDS.scons+=  ${PYPKGPREFIX}-scons>=3.0.2
+BUILDLINK_API_DEPENDS.scons+=  ${PYPKGPREFIX}-scons>=3.0.2<4
 BUILDLINK_PKGSRCDIR.scons?=    ../../devel/scons
 .endif # SCONS_BUILDLINK3_MK