<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/7227399f77ab3eef11f8fbdd0643cb061f49b7a4">https://github.com/macports/macports-ports/commit/7227399f77ab3eef11f8fbdd0643cb061f49b7a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7227399f77ab3eef11f8fbdd0643cb061f49b7a4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 28 15:35:07 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> python36: update to 3.6.6
</span>---
lang/python36/Portfile | 56 ++++++++++++++++++++++++++++++----------------
python/py-gdbm/Portfile | 10 ++++-----
python/py-tkinter/Portfile | 10 ++++-----
3 files changed, 47 insertions(+), 29 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 190c864..346d021 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.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.6
</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 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 c3f30a0aff425dda77d19e02f420d6ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d80cb4a653baf42a21faa1c973e8e52ddafba1e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,36 +90,54 @@ select.entries [list python python-$pythonNoDot $pythonNoDot] \
</span> [list python3 python3-$pythonNoDot $pythonNoDot]
platform darwin {
<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}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:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
</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;'>+ # work for dependents that incorrectly use this variable to find out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # how to link against python (see ticket #15099); instead we mirror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the behavior of `python-config --ldflags` here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${buildlibdir} "awk -F : \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"/'LINKFORSHARED'/ {printf \\\"%s: '-L${framewdir}/lib/python${branch}/${confdir}\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lpython${branch}m -ldl -framework CoreFoundation',\\n\\\", \\\$1; getline; next} {print}\"\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _sysconfigdata_m_darwin_darwin.py > _sysconfigdata_m_darwin_darwin.py.new"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename -force ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py.new \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${buildlibdir}/_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;'>+ # 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;'>+ ${buildlibdir}/_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;'>+ # 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;'>+ ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> post-destroot {
<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> foreach dir { Headers Resources Python Versions/Current } {
file delete ${destroot}${framewpath}/${dir}
}
ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</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:#e0ffe0;'>+ # Also make the sysconfig changes in the Makefile
</span> reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<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:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir config-${branch}m-darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove -arch flags from the config
</span> reinplace -E {s|-arch [a-z0-9_]+||g} \
<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;'>- ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # also remove gettext overlinking
</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;'>+
</span> reinplace "s|-lintl||" \
<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;'>- ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata_m_darwin_darwin.py
</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;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 7199b8a..6b4e153 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;'>@@ -111,13 +111,13 @@ subport py35-gdbm {
</span> subport py36-gdbm {
maintainers {jmr @jmroot} openmaintainer
epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.5
</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.6
</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 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 c3f30a0aff425dda77d19e02f420d6ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d80cb4a653baf42a21faa1c973e8e52ddafba1e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f
</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 b13dc10..d2c5bcf 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.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span> epoch 20170717
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 9f49654a4d6f733ff3284ab9d227e9fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 213ced5e09552468b1efc855727b743a3ab30e8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 c3f30a0aff425dda77d19e02f420d6ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d80cb4a653baf42a21faa1c973e8e52ddafba1e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>