here's a diff to update scons to the latest release. I've tested with
godot 3.4.5 (committed yesterday) and godot 3.5 (released today).
I've also build-tested net/serf, games/pingus (that has a very, very
old SConstruct file) and gpsd: everything seems to work fine.
The changelog mentions mostly MSVC and ninja integration stuff which
we don't use. (at the moment at least, building with ninja might be
interesting.)
https://github.com/SCons/scons/releases/tag/4.4.0
There's a note for packaging that says: "Updated setup.cfg to remove
Python 3.5 and add Python 3.10" which I don't think it's an issue but
mentioned anyway.
ok?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 7 Jun 2022 11:38:09 -0000 1.38
+++ Makefile 31 Jul 2022 10:12:23 -0000
@@ -1,9 +1,8 @@
COMMENT= Python-based build system
-MODPY_EGG_VERSION= 4.3.0
+MODPY_EGG_VERSION= 4.4.0
DISTNAME= SCons-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
-REVISION= 2
CATEGORIES= devel
HOMEPAGE= https://www.scons.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 2 Mar 2022 17:03:28 -0000 1.20
+++ distinfo 31 Jul 2022 10:12:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.3.0.tar.gz) = 1HCBWH42dcwWjx9U8NdKabMoovyQ7E/rhfcoZ3QZuHk=
-SIZE (SCons-4.3.0.tar.gz) = 3065950
+SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
+SIZE (SCons-4.4.0.tar.gz) = 3096859
Index: patches/patch-SCons_Tool___init___py
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool___init___py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-SCons_Tool___init___py
--- patches/patch-SCons_Tool___init___py 11 Mar 2022 18:53:22 -0000
1.2
+++ patches/patch-SCons_Tool___init___py 31 Jul 2022 10:15:01 -0000
@@ -1,7 +1,7 @@
Index: SCons/Tool/__init__.py
--- SCons/Tool/__init__.py.orig
+++ SCons/Tool/__init__.py
-@@ -763,9 +763,9 @@ def tool_list(platform, env):
+@@ -757,9 +757,9 @@ def tool_list(platform, env):
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'ilink']
Index: patches/patch-SCons_Tool_gxx_py
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gxx_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-SCons_Tool_gxx_py
--- patches/patch-SCons_Tool_gxx_py 11 Mar 2022 18:53:22 -0000 1.4
+++ patches/patch-SCons_Tool_gxx_py 31 Jul 2022 10:15:01 -0000
@@ -1,7 +1,7 @@
Index: SCons/Tool/gxx.py
--- SCons/Tool/gxx.py.orig
+++ SCons/Tool/gxx.py
-@@ -40,7 +40,7 @@ import SCons.Util
+@@ -38,7 +38,7 @@ import SCons.Util
from . import gcc
from . import cxx
Index: patches/patch-setup_cfg
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_cfg
--- patches/patch-setup_cfg 11 Mar 2022 18:53:22 -0000 1.2
+++ patches/patch-setup_cfg 31 Jul 2022 10:15:01 -0000
@@ -1,8 +1,8 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -56,7 +56,7 @@ console_scripts =
- scons.tool.docbook = *.*
+@@ -58,7 +58,7 @@ console_scripts =
+ SCons.Tool.docbook = *.*
[options.data_files]
-. = scons.1
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 7 Jun 2022 11:38:09 -0000 1.17
+++ pkg/PLIST 31 Jul 2022 10:26:46 -0000
@@ -68,6 +68,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Dir.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Fortran.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/IDL.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Java.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/LaTeX.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Prog.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Python.py
@@ -80,6 +81,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Dir.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Fortran.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}IDL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Java.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}LaTeX.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Prog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Python.${MODPY_PYC_MAGIC_TAG}pyc
@@ -107,6 +109,30 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/GettextCommon.py
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/JavaCommon.py
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Config.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Dispatcher.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Exceptions.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Policy.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Registry.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Util.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Warnings.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/WinSDK.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}ScriptArguments.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}SetupEnvDefault.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@@ -266,10 +292,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-35.pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-36.pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-37.pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-38.pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/.CatalogManager.properties.example
@@ -1712,6 +1734,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_daemon_build.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_run_daemon.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_scons_daemon.py
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}/
