<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dd471e2556997ef9feb6afc274bc968a31826058">https://github.com/macports/macports-ports/commit/dd471e2556997ef9feb6afc274bc968a31826058</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd471e2556997ef9feb6afc274bc968a31826058
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 7 15:46:40 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> python310: update to 3.10.15
</span>---
lang/python310/Portfile | 26 ++++++++++++++------------
python/py-gdbm/Portfile | 8 ++++----
python/py-tkinter/Portfile | 8 ++++----
3 files changed, 22 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310/Portfile b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4287c49aa3..3f3f4312d28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup clang_dependency 1.0
</span> name python310
# Remember to keep py310-tkinter and py310-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.10.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.15
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 05148354ce821ba7369e5b7958435400 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7c947aa2c06cb72b654dafc828cf93c5a8d02ce5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 8b1faa1b193e4e90c0f17eb2decd89b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5dd86df4aea59b9c1d596ced03d71b54e4695c72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> patch-threadid-older-systems.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span> depends_lib port:bzip2 \
port:expat \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +98,7 @@ test.target test
</span> destroot.target frameworkinstall maninstall
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir config-${branch}-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set abiflags {}
</span>
post-configure {
# poll() misbehaves on 10.8 and older
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,6 +109,10 @@ platform darwin {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confdir config-${branch}${abiflags}-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach dir { Headers Resources Python Versions/Current } {
file delete ${destroot}${framewpath}/${dir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,15 +131,15 @@ platform darwin {
</span> set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch} -ldl -framework CoreFoundation',"
reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl ||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# recompile the modified file
set python_for_build python.exe
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +147,7 @@ platform darwin {
</span> if {![file exists ${worksrcpath}/${python_for_build}]} {
set python_for_build python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] -o 0 -o 1 -o 2 [shellescape ${libdir}/_sysconfigdata__darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] -o 0 -o 1 -o 2 [shellescape ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py]"
</span>
# Also make the sysconfig changes in the Makefile
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c6bb14ae58..9efc337909f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,12 +124,12 @@ subport py39-gdbm {
</span> }
subport py310-gdbm {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.10.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.10.15
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 05148354ce821ba7369e5b7958435400 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7c947aa2c06cb72b654dafc828cf93c5a8d02ce5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 8b1faa1b193e4e90c0f17eb2decd89b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5dd86df4aea59b9c1d596ced03d71b54e4695c72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
</span> livecheck.regex {Python (3\.10\.[0-9]+)}
}
subport py311-gdbm {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0b84cff178..1c65b1098b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,12 +116,12 @@ subport py39-tkinter {
</span> }
subport py310-tkinter {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.10.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.10.15
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 05148354ce821ba7369e5b7958435400 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7c947aa2c06cb72b654dafc828cf93c5a8d02ce5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 8b1faa1b193e4e90c0f17eb2decd89b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5dd86df4aea59b9c1d596ced03d71b54e4695c72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
</span> }
subport py311-tkinter {
maintainers {jmr @jmroot}
</pre><pre style='margin:0'>
</pre>