<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62a982aead24fa8767b92f303de737a7ea09ed3c">https://github.com/macports/macports-ports/commit/62a982aead24fa8767b92f303de737a7ea09ed3c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 62a982aead24fa8767b92f303de737a7ea09ed3c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jun 26 15:50:41 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    scons: Update to 4.3.0; use python310
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59303
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/60957
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: #14998
</span>---
 devel/scons/Portfile                  | 35 +++++++++++++++++++----------------
 devel/scons/files/manpath.patch       | 15 ---------------
 devel/scons/files/python-interp.patch | 32 ++++----------------------------
 3 files changed, 23 insertions(+), 59 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/Portfile b/devel/scons/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d827dba8028..39b830ee492 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/scons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,13 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                scons
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.3.0
</span> revision            0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  6052ef4ebd702ce7dc9888d50c163664201c377f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    668298
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  b08156d60b1363584fa4a21e53201d9af89b324c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  d47081587e3675cc168f1f54f0d74a69b328a2fc90ec4feb85f728677419b879 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3065950
</span> 
 categories          devel python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> supported_archs     noarch
 license             MIT
 maintainers         {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,28 +22,32 @@ long_description    SCons is an Open Source software construction \
</span>                     for the classic Make utility with integrated \
                     functionality similar to autoconf/automake and \
                     compiler caches such as ccache.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://www.scons.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://www.scons.org
</span> master_sites        sourceforge:project/scons/scons/${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          manpath.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    python-interp.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          python-interp.patch
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -W ${worksrcpath}/script "s|__PYTHON__|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        scons scons-configure-cache scons-time sconsign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -W ${worksrcpath}/SCons/Utilities "s|__PYTHON__|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ConfigureCache.py sconsign.py
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args       --install-man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --no-version-script
</span> post-destroot {
     xinstall -m 0755 -d \
         ${destroot}${prefix}/share/doc/${name}
     xinstall -m 0644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        CHANGES.txt LICENSE.txt README.txt RELEASE.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        LICENSE README.rst \
</span>         ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach manfile [glob -tails -directory ${destroot}${python.prefix}/share/man/man1 *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    file mkdir ${destroot}${python.prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach manfile [glob -tails -directory ${destroot}${python.prefix} *.1] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${destroot}${python.prefix}/${manfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${python.prefix}/share/man/man1/${manfile}
</span>         ln -s ${python.prefix}/share/man/man1/${manfile} \
             ${destroot}${prefix}/share/man/man1/${manfile}
     }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/manpath.patch b/devel/scons/files/manpath.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2c2b18d1d8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/manpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-scons: Use MacPorts' location for man pages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Lawrence Velázquez <larryv@macports.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2019-01-07 21:00:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2019-01-08 08:21:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -380,7 +380,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if is_win32:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 dir = 'Doc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                dir = os.path.join('man', 'man1')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                dir = os.path.join('share', 'man', 'man1')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             self.data_files = [(dir, man_pages)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             man_dir = os.path.join(self.install_dir, dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             msg = "Installed SCons man pages into %s" % man_dir
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/python-interp.patch b/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b062cd71e05..2abda38fcd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,40 +3,16 @@ scons: Use MacPorts' Python interpreter
</span> Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Lawrence Velázquez <larryv@macports.org>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: script/scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/scons.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SCons/Utilities/ConfigureCache.py.orig 2020-12-20 23:00:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SCons/Utilities/ConfigureCache.py      2022-06-26 15:15:04.000000000 -0500
</span> @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!__PYTHON__
  #
  # SCons - a Software Constructor
  #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: script/scons-configure-cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/scons-configure-cache.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/scons-configure-cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#! /usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!__PYTHON__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SCons - a Software Constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: script/scons-time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/scons-time.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/scons-time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!__PYTHON__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # scons-time - run SCons timings and collect statistics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: script/sconsign
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/sconsign.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/sconsign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SCons/Utilities/sconsign.py.orig       2020-12-20 23:00:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SCons/Utilities/sconsign.py    2022-06-26 15:15:04.000000000 -0500
</span> @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!__PYTHON__
</pre><pre style='margin:0'>

</pre>