<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/064d721f49ddd6c7546a45579f20e79a17baddcc">https://github.com/macports/macports-ports/commit/064d721f49ddd6c7546a45579f20e79a17baddcc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 064d721f49ddd6c7546a45579f20e79a17baddcc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 3 17:10:15 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python38: update to 3.8.11
</span>---
lang/python38/Portfile | 61 +++++++++++++++++++++-----------
lang/python38/files/patch-configure.diff | 18 ++++++++--
python/py-gdbm/Portfile | 10 +++---
python/py-tkinter/Portfile | 10 +++---
4 files changed, 66 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 951d7cc8146..2e1620f137c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name python38
</span>
epoch 1
# Remember to keep py38-tkinter, py38-htmldocs, and py38-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.11
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 d9eee4b20155553830a2025e4dcaa7b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 eaffc74bd79021ef7a6309f494ca387860e8af9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18433456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 5840ba601128f48fee4e7c98fbdac65d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3356291c0ebf28357d59e45ad5a730e0c26580d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb1a1114ebfe9e97199603c6083e20b236a0e007a2c51f29283ffb50c1420fb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18437648
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,32 +178,53 @@ variant universal {
</span> post-patch {
set universal_arch_flags {}
set arch_run_32bit {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_intel64_flags {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any64 no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span> lappend universal_arch_flags -arch ${arch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} eq "i386" || ${arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} in {i386 ppc}} {
</span> lappend arch_run_32bit -${arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend lipo_32bit_flags -extract ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any64 yes
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch_run_32bit} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$any64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$arch_run_32bit eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit "/usr/bin/arch $arch_run_32bit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #lipo_32bit_flags already correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags ""
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@UNIVERSAL_ARCH_FLAGS@@|${universal_arch_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@LIPO_32BIT_FLAGS@@|${lipo_32bit_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@ARCH_RUN_32BIT@@|${arch_run_32bit}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> }
<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/python38/files/patch-configure.diff b/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index abff0c6d986..81f6957c7fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-12-18 11:21:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-01-05 15:21:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3196,6 +3196,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-06-28 20:08:34.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-07-03 17:01:37.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3189,6 +3189,8 @@
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,15 @@
</span> prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
# Add files for Mac specific code to the list of output
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7428,6 +7430,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNIVERSAL_ARCH_FLAGS="@@UNIVERSAL_ARCH_FLAGS@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_32BIT_FLAGS="@@LIPO_32BIT_FLAGS@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_INTEL64_FLAGS="@@LIPO_INTEL64_FLAGS@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCH_RUN_32BIT="@@ARCH_RUN_32BIT@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${UNIVERSALSDK}" != "/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
</span><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 2ba72c710d8..dc4dc65c4ce 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,14 +124,14 @@ subport py37-gdbm {
</span> }
subport py38-gdbm {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.11
</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 d9eee4b20155553830a2025e4dcaa7b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 eaffc74bd79021ef7a6309f494ca387860e8af9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18433456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 5840ba601128f48fee4e7c98fbdac65d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3356291c0ebf28357d59e45ad5a730e0c26580d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb1a1114ebfe9e97199603c6083e20b236a0e007a2c51f29283ffb50c1420fb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18437648
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.8\.[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 0323ea06bcd..0daa1e3da86 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;'>@@ -117,14 +117,14 @@ subport py37-tkinter {
</span> }
subport py38-tkinter {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.11
</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 d9eee4b20155553830a2025e4dcaa7b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 eaffc74bd79021ef7a6309f494ca387860e8af9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18433456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 5840ba601128f48fee4e7c98fbdac65d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3356291c0ebf28357d59e45ad5a730e0c26580d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb1a1114ebfe9e97199603c6083e20b236a0e007a2c51f29283ffb50c1420fb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18437648
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>