<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/778ed67bb536b99e58ed5c9f084995f287149092">https://github.com/macports/macports-ports/commit/778ed67bb536b99e58ed5c9f084995f287149092</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 778ed67bb536b99e58ed5c9f084995f287149092
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 3 18:08:32 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python36: update to 3.6.14
</span>---
lang/python36/Portfile | 51 ++++++++++++++++++++------------
lang/python36/files/patch-configure.diff | 17 +++++++++--
python/py-gdbm/Portfile | 8 ++---
python/py-tkinter/Portfile | 8 ++---
4 files changed, 54 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94c6f9d2a4e..631f25b406b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,7 @@ name python36
</span>
epoch 20170717
# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.14
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +25,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 1c04330ffff21cd777dc38e2310fc452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 129f0f49c2db86c17f768f320484f116bd61cf2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a47a43a53abb42286a2c11965343ff56711b9e64e8d11bf2c6701a4fb8ce1a0f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 3224d64986a9f10b9a52f4fd6f0a0412 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6c6dedfe1781604cabaab1ca7c16e1c59e537648 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2663a7a0cfbd00fc76269dce4317db0b54be53c0f4d705aabb32b87efa02d5ae
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,26 +181,40 @@ 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 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;'>+ } 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|@@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"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/files/patch-configure.diff b/lang/python36/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b6f8bb82e32..4da9689ed84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/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 2012-08-13 17:08:58.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2012-08-13 17:11:07.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3145,6 +3145,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-06-29 02:52:10.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-07-03 17:56:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3183,6 +3183,8 @@
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,14 @@
</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;'>+@@ -7482,6 +7484,10 @@
</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;'>++ 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 abd30bf1f6f..c58792daefa 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;'>@@ -98,13 +98,13 @@ subport py35-gdbm {
</span> subport py36-gdbm {
maintainers {jmr @jmroot}
epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.14
</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 1c04330ffff21cd777dc38e2310fc452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 129f0f49c2db86c17f768f320484f116bd61cf2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a47a43a53abb42286a2c11965343ff56711b9e64e8d11bf2c6701a4fb8ce1a0f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 3224d64986a9f10b9a52f4fd6f0a0412 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6c6dedfe1781604cabaab1ca7c16e1c59e537648 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2663a7a0cfbd00fc76269dce4317db0b54be53c0f4d705aabb32b87efa02d5ae
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.6\.[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 72df5b03359..3539505d65b 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;'>@@ -93,13 +93,13 @@ subport py35-tkinter {
</span> subport py36-tkinter {
maintainers {jmr @jmroot}
epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.14
</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 1c04330ffff21cd777dc38e2310fc452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 129f0f49c2db86c17f768f320484f116bd61cf2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a47a43a53abb42286a2c11965343ff56711b9e64e8d11bf2c6701a4fb8ce1a0f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 3224d64986a9f10b9a52f4fd6f0a0412 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6c6dedfe1781604cabaab1ca7c16e1c59e537648 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2663a7a0cfbd00fc76269dce4317db0b54be53c0f4d705aabb32b87efa02d5ae
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>