Hello,

I just realized I still have this on my tree.  I built a bunch of ports
that use scons, and looking at the changelog I don't expect breakages
from the update.

Yet, maybe a trip to a bulk build could be useful.


Thanks,

Omar Polo


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/scons/Makefile,v
diff -u -p -r1.43 Makefile
--- Makefile	13 May 2023 19:06:09 -0000	1.43
+++ Makefile	11 Dec 2023 12:43:40 -0000
@@ -1,9 +1,8 @@
 COMMENT=	Python-based build system
 
-MODPY_EGG_VERSION= 4.5.2
+MODPY_EGG_VERSION= 4.6.0
 DISTNAME=	SCons-${MODPY_EGG_VERSION}
 PKGNAME=	${DISTNAME:L}
-REVISION=	0
 CATEGORIES=	devel
 
 HOMEPAGE=	https://www.scons.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/scons/distinfo,v
diff -u -p -r1.22 distinfo
--- distinfo	12 Apr 2023 16:37:06 -0000	1.22
+++ distinfo	11 Dec 2023 12:43:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.5.2.tar.gz) = gTNgsrzkdrycwSoPOiLUbOUgeWs1JVcgLLB9PkAvVFg=
-SIZE (SCons-4.5.2.tar.gz) = 3194717
+SHA256 (SCons-4.6.0.tar.gz) = fbKJWLGIuAD4A8KH0GgMw6x8Qi7Qsc+YlQQsUlZ4A+w=
+SIZE (SCons-4.6.0.tar.gz) = 3230138
Index: patches/patch-SCons_Tool_gcc_py
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gcc_py,v
diff -u -p -r1.4 patch-SCons_Tool_gcc_py
--- patches/patch-SCons_Tool_gcc_py	11 Mar 2022 18:53:22 -0000	1.4
+++ patches/patch-SCons_Tool_gcc_py	11 Dec 2023 12:59:04 -0000
@@ -1,7 +1,7 @@
 Index: SCons/Tool/gcc.py
 --- SCons/Tool/gcc.py.orig
 +++ SCons/Tool/gcc.py
-@@ -37,7 +37,7 @@ import subprocess
+@@ -37,7 +37,7 @@ from subprocess import PIPE
  
  import SCons.Util
  
@@ -9,4 +9,4 @@ Index: SCons/Tool/gcc.py
 +compilers = ['cc']
  
  
- def generate(env):
+ def generate(env) -> None:
Index: patches/patch-SCons_Tool_gnulink_py
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gnulink_py,v
diff -u -p -r1.2 patch-SCons_Tool_gnulink_py
--- patches/patch-SCons_Tool_gnulink_py	11 Mar 2022 18:53:22 -0000	1.2
+++ patches/patch-SCons_Tool_gnulink_py	11 Dec 2023 12:59:04 -0000
@@ -1,7 +1,7 @@
 Index: SCons/Tool/gnulink.py
 --- SCons/Tool/gnulink.py.orig
 +++ SCons/Tool/gnulink.py
-@@ -55,7 +55,7 @@ def generate(env):
+@@ -58,7 +58,7 @@ def generate(env) -> None:
  
  def exists(env):
      # TODO: sync with link.smart_link() to choose a linker
Index: patches/patch-SCons_Tool_gxx_py
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gxx_py,v
diff -u -p -r1.5 patch-SCons_Tool_gxx_py
--- patches/patch-SCons_Tool_gxx_py	21 Aug 2022 08:59:46 -0000	1.5
+++ patches/patch-SCons_Tool_gxx_py	11 Dec 2023 12:59:04 -0000
@@ -9,4 +9,4 @@ Index: SCons/Tool/gxx.py
 +compilers = ['c++']
  
  
- def generate(env):
+ def generate(env) -> None:
Index: patches/patch-setup_cfg
===================================================================
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
diff -u -p -r1.4 patch-setup_cfg
--- patches/patch-setup_cfg	12 Apr 2023 16:37:06 -0000	1.4
+++ patches/patch-setup_cfg	11 Dec 2023 12:59:04 -0000
@@ -1,7 +1,7 @@
 Index: setup.cfg
 --- setup.cfg.orig
 +++ setup.cfg
-@@ -60,7 +60,7 @@ console_scripts = 
+@@ -61,7 +61,7 @@ console_scripts = 
  SCons.Tool.docbook = *.*
  
  [options.data_files]
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
diff -u -p -r1.21 PLIST
--- pkg/PLIST	13 May 2023 19:06:09 -0000	1.21
+++ pkg/PLIST	11 Dec 2023 13:08:35 -0000
@@ -469,6 +469,7 @@ lib/python${MODPY_VERSION}/site-packages
 ${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__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 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/${MODPY_PYCACHE}__init__.cpython-311.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
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/.urilist
@@ -2008,13 +2009,19 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}envs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}envs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}filelock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}filelock.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}sctypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}sctypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/envs.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/filelock.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Util/hashes.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Util/types.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/sctypes.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Util/stats.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/ConfigureCache.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/__init__.py