<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/cbad01743334c2f541da8c1faeaf417ba7f9ddcc">https://github.com/macports/macports-ports/commit/cbad01743334c2f541da8c1faeaf417ba7f9ddcc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cbad01743334c2f541da8c1faeaf417ba7f9ddcc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 3 16:27:27 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python39: update to 3.9.6
</span>---
lang/python39/Portfile | 28 ++++++++++++++-------------
lang/python39/files/distutils_spawn.py.patch | 29 ----------------------------
lang/python39/files/patch-configure.diff | 3 ++-
python/py-gdbm/Portfile | 8 ++++----
python/py-tkinter/Portfile | 8 ++++----
5 files changed, 25 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/Portfile b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ceab61ff85..e117142ca2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python39
# Remember to keep py39-tkinter and py39-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.9.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.9.6
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,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 71f7ada6bec9cdbf4538adc326120cfd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3c7bf2d7bcea98a8a749ef19ce7da429a7ca2c08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 ecc29a7688f86e550d29dba2ee66cf80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 350b335913bfcb42ff0ebf5ed9ebc2a56fec55f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,7 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
patch-configure-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,8 +175,9 @@ variant universal {
</span> set universal_arch_flags {}
set arch_run_32bit {}
set lipo_32bit_flags {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_intel64_flags {}
</span> set any64 no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span> lappend universal_arch_flags -arch ${arch}
if {${arch} in {i386 ppc}} {
lappend arch_run_32bit -${arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +194,9 @@ variant universal {
</span> set arch_run_32bit "/usr/bin/arch $arch_run_32bit"
#lipo_32bit_flags already correct
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"arm64" in $universal_archs && "x86_64" in $universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_intel64_flags "-extract x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
set arch_run_32bit ""
set lipo_32bit_flags ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,21 +207,20 @@ variant universal {
</span> reinplace \
"s|@@LIPO_32BIT_FLAGS@@|${lipo_32bit_flags}|" \
${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@LIPO_INTEL64_FLAGS@@|${lipo_intel64_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> reinplace \
"s|@@ARCH_RUN_32BIT@@|${arch_run_32bit}|" \
${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-universalsdk=${configure.sysroot}
</span> post-configure {
system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach unversioned {python3-32} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach unversioned {python3-32 python3-intel64} {
</span> delete ${destroot}${prefix}/bin/${unversioned}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/distutils_spawn.py.patch b/lang/python39/files/distutils_spawn.py.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8403b095101..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/files/distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/pypa/distutils/pull/36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/distutils/spawn.py b/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a73b8b9..b012d00 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,13 +60,17 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if _cfg_target:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if _cfg_target:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # ensure that the deployment target of build process is not less
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # than that used when the interpreter was built. This ensures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # extension modules are built with correct compatibility values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Ensure that the deployment target of the build process is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # less than 10.3 if the interpreter was built for 10.3 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This ensures extension modules are built with correct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # compatibility values, specifically LDSHARED which can use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # '-undefined dynamic_lookup' which only works on >= 10.3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_split = [int(x) for x in cur_target.split('.')]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if _cfg_target_split[:2] >= [10, 3] and cur_target_split[:2] < [10, 3]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'now "%s" but "%s" during configure;'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'must use 10.3 or later'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise DistutilsPlatformError(my_msg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env = dict(os.environ,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/patch-configure.diff b/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d285a93a641..36ce9b6fd8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,13 @@
</span> prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
# Add files for Mac specific code to the list of output
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7511,6 +7513,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7511,6 +7513,11 @@
</span> ;;
esac
+ UNIVERSAL_ARCH_FLAGS="@@UNIVERSAL_ARCH_FLAGS@@"
+ LIPO_32BIT_FLAGS="@@LIPO_32BIT_FLAGS@@"
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_INTEL64_FLAGS="@@LIPO_INTEL64_FLAGS@@"
</span> + ARCH_RUN_32BIT="@@ARCH_RUN_32BIT@@"
+
if test "${UNIVERSALSDK}" != "/"
<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 5473ab9eb19..2ba72c710d8 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;'>@@ -138,13 +138,13 @@ subport py38-gdbm {
</span> }
subport py39-gdbm {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.9.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.9.6
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 71f7ada6bec9cdbf4538adc326120cfd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3c7bf2d7bcea98a8a749ef19ce7da429a7ca2c08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 ecc29a7688f86e550d29dba2ee66cf80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 350b335913bfcb42ff0ebf5ed9ebc2a56fec55f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.9\.[0-9]+)}
<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 f037582e752..0323ea06bcd 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;'>@@ -130,13 +130,13 @@ subport py38-tkinter {
</span> }
subport py39-tkinter {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.9.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.9.6
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 71f7ada6bec9cdbf4538adc326120cfd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3c7bf2d7bcea98a8a749ef19ce7da429a7ca2c08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 ecc29a7688f86e550d29dba2ee66cf80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 350b335913bfcb42ff0ebf5ed9ebc2a56fec55f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>