<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/40f10c73c5dbe5aa8e0372f12d6e547232baa476">https://github.com/macports/macports-ports/commit/40f10c73c5dbe5aa8e0372f12d6e547232baa476</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 40f10c7 python36: update to 3.6.5
</span>40f10c7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40f10c73c5dbe5aa8e0372f12d6e547232baa476
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 30 02:26:57 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> python36: update to 3.6.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Likewise py36-gdbm and py36-tkinter. Also fix removal of -arch flags
</span><span style='display:block; white-space:pre;color:#404040;'> from sysconfig, and remove -lintl as well to prevent overlinking.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53508
</span>---
lang/python36/Portfile | 72 ++++++++++++++++++++++++----------------------
python/py-gdbm/Portfile | 10 +++----
python/py-tkinter/Portfile | 8 +++---
3 files changed, 47 insertions(+), 43 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 7e9577e..190c864 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,7 +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.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.5
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,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 1325134dd525b4a2c3272a1a0214dd54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0fd34bf6748133728106b0d12c354e8b45d62d79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,14 +89,44 @@ set pythonNoDot python[string map {. {}} $branch]
</span> select.entries [list python python-$pythonNoDot $pythonNoDot] \
[list python3 python3-$pythonNoDot $pythonNoDot]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set confdir config-${branch}m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir config-${branch}m-darwin
</span> post-configure {
# See https://trac.macports.org/ticket/18376
system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><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;'>+ foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${framewpath}/${dir}
</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;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Without this, LINKFORSHARED is set to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (this becomes Python.framework/Versions/3.6/Python) which doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # quite work (see ticket #15099); instead we mirror the behavior of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # `python-config --ldflags` here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/config-3.6m-darwin/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confdir config-${branch}m-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove -arch flags from the config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also remove gettext overlinking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lintl||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata_m_darwin_darwin.py
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach unversioned {2to3 idle3 pydoc3 python3 python3-config pyvenv} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/${unversioned}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
notes "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,32 +137,6 @@ the 'python' or 'python3' commands), run one or both of:
</span> sudo port select --set python3 $pythonNoDot
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Without this, LINKFORSHARED is set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (this becomes Python.framework/Versions/3.6/Python) which doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # quite work (see ticket #15099); instead we mirror the behavior of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # `python-config --ldflags` here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config-3.6m-darwin/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove -arch flags from the config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach unversioned {2to3 idle3 pydoc3 python3 python3-config pyvenv} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin/${unversioned}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant universal {
post-patch {
set universal_arch_flags {}
<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 46ecd42..f2291ec 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;'>@@ -110,14 +110,14 @@ subport py35-gdbm {
</span> }
subport py36-gdbm {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.4
</span> epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 1325134dd525b4a2c3272a1a0214dd54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0fd34bf6748133728106b0d12c354e8b45d62d79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</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 88794b1..60e5461 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;'>@@ -103,14 +103,14 @@ subport py35-tkinter {
</span> }
subport py36-tkinter {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.5
</span> revision 0
epoch 20170717
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 1325134dd525b4a2c3272a1a0214dd54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0fd34bf6748133728106b0d12c354e8b45d62d79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>