<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5003eeca90f5d8b6cf935c6342e247afcdd81c2d">https://github.com/macports/macports-ports/commit/5003eeca90f5d8b6cf935c6342e247afcdd81c2d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5003eeca90f5d8b6cf935c6342e247afcdd81c2d
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Fri Oct 20 12:55:21 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-numpy: update to 1.26.1, add py312 subport
</span>---
 python/py-numpy/Portfile                           | 29 +++++++++++++++-------
 python/py-numpy/files/patch-build_cython_path.diff | 26 +++++++++++++++++++
 2 files changed, 46 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c3b5a57ec16..d80a5f16928 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,12 +13,12 @@ maintainers             {michaelld @michaelld} openmaintainer
</span> description             The core utilities for the scientific library scipy for Python
 long_description        {*}${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            numpy numpy 1.25.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            numpy numpy 1.26.1 v
</span> revision                0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  1fbbbb4eb4c1e0f6f0c499d30b7809bdba866d95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    10805282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  78a71e4c218294e7daa73e61dec8c85849e16f41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  c8c6c72d4a9f831f328efb1312642a1cafafaa88981d9ab76368d50d07d93cbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    15651806
</span> 
 if {${name} ne ${subport}} {
     # the python PortGroup puts compiler names in build.env and destroot.env
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ if {${name} ne ${subport}} {
</span>     pre-destroot { set_compilers }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions         27 35 36 37 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions         27 35 36 37 38 39 310 311 312
</span> 
 # http://trac.macports.org/ticket/34562
 python.consistent_destroot yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +89,7 @@ if {${name} ne ${subport}} {
</span>         github.tarball_from releases
         set PATCH_PY_EXT    ".37"
         livecheck.regex     {(1\.21(?:\.\d+)+)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.pep517       no
</span>     } elseif {${python.version} == 38} {
         github.setup        numpy numpy 1.24.1 v
         checksums           rmd160  dd2df59cb48926eb460143f617a552b8009af11d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,11 +99,19 @@ if {${name} ne ${subport}} {
</span>         github.tarball_from releases
         set PATCH_PY_EXT    ".38"
         livecheck.regex     {(1\.24(?:\.\d+)+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        github.tarball_from releases
</span>         if {${python.pep517}} {
             build.args      --skip-dependency-check
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append    port:ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:py${python.version}-pyproject_metadata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-build_cython_path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append    CYTHON=${prefix}/bin/cython-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # https://github.com/numpy/numpy/pull/24970
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            system "chmod -x ${worksrcpath}/numpy/_build_utils/tempita.py"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     patchfiles-append       patch-numpy_core_setup.py${PATCH_PY_EXT}.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,8 +130,10 @@ if {${name} ne ${subport}} {
</span>     depends_lib-append      port:fftw-3 \
                             path:bin/cython-${python.branch}:py${python.version}-cython
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env-append        SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.env-append     SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} < 312} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append    SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.env-append SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     pre-build {
         build.env-append        ARCHFLAGS=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-build_cython_path.diff b/python/py-numpy/files/patch-build_cython_path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e60e6f78517
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-build_cython_path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b9364db1b1be024cc834240b59d9b065a67c66f1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 20 Oct 2023 12:05:52 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Allow the path to cython to be configured in the environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as CYTHON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesonbuild/envconfig.py | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git vendored-meson/meson/mesonbuild/envconfig.py vendored-meson/meson/mesonbuild/envconfig.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e0c56703121..3545ccb6fb31 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendored-meson/meson/mesonbuild/envconfig.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendored-meson/meson/mesonbuild/envconfig.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,6 +138,8 @@ ENV_VAR_TOOL_MAP: T.Mapping[str, str] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'make': 'MAKE',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'vapigen': 'VAPIGEN',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'llvm-config': 'LLVM_CONFIG',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    'cython': 'CYTHON',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENV_VAR_PROG_MAP = {**ENV_VAR_COMPILER_MAP, **ENV_VAR_TOOL_MAP}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>