<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/d63e2a88eff17c8fcd2ff6cd0d3eb7ab93f4f637">https://github.com/macports/macports-ports/commit/d63e2a88eff17c8fcd2ff6cd0d3eb7ab93f4f637</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 d63e2a8 python37-devel: update to 3.7.0b4
</span>d63e2a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d63e2a88eff17c8fcd2ff6cd0d3eb7ab93f4f637
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat May 5 07:53:56 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> python37-devel: update to 3.7.0b4
</span>---
lang/python37-devel/Portfile | 64 +++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37-devel/Portfile b/lang/python37-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae32a02..e5cbc5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python37-devel
# Remember to keep py37-tkinter and py37-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.7.0b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.0b4
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ master_sites ${homepage}ftp/python/3.7.0/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1a9dca37ccfddea7b9f9ee65789e7036 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b6822aa8ddfc725fef63565328f2be5ee51e09db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b152788486c61ee6c3e9feaeb4c3fe9679f0a76a19a4c82eb4c665989c340fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 a9860cd8eeafcf7e36c789fe70857df5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4e06250edde7392fb246b6325ea0c48e48e65018 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0be714eab2bb5515e0c4f372781a042d37e6c20a9fa908f3302eac04d53e9ae
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,43 +88,57 @@ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>- 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;'>- 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;'>- set confdir config-${branch}m-darwin
</span>
<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> # Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/3.7/Python) which doesn't
<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-${branch}m-darwin/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${framewdir}/lib/python${branch} "awk -F : \
</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> \"/'LINKFORSHARED'/ {printf \\\"%s: '-L${framewdir}/lib/python${branch}/${confdir}\
-lpython${branch}m -ldl -framework CoreFoundation',\\n\\\", \\\$1; getline; next} {print}\"\
_sysconfigdata_m_darwin_darwin.py > _sysconfigdata_m_darwin_darwin.py.new"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata_m_darwin_darwin.py.new \
</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;'>+ 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>
# remove -arch flags from the config
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:#e0ffe0;'>+ ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # also remove gettext overlinking
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;'>+ ${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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</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;'>+ 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also make the sysconfig changes in the Makefile
</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-${branch}m-darwin/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+
</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> }
}
</pre><pre style='margin:0'>
</pre>