<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf02bf6957ccd3d26343e3628e0473037b1fac62">https://github.com/macports/macports-ports/commit/bf02bf6957ccd3d26343e3628e0473037b1fac62</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 bf02bf6 pypy: upgrade to 7.1.1
</span>bf02bf6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf02bf6957ccd3d26343e3628e0473037b1fac62
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue Apr 30 16:50:27 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> pypy: upgrade to 7.1.1
</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/58213
</span>---
lang/pypy/Portfile | 38 +++++++++++++++++---------------------
lang/pypy/files/paths.diff | 16 ++++++++--------
python/pypy-tkinter/Portfile | 27 +++++++++++++++------------
3 files changed, 40 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/Portfile b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e958927..348dbcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup bitbucket 1.0
</span> PortGroup select 1.0
name pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup pypy pypy 6.0.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup pypy pypy 7.1.1 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang python devel
license MIT PSF
maintainers {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +49,7 @@ array set module_scripts {
</span> }
subport pypy3 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pypy_c_name pypy3-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch 3.6
</span>
set module_scripts(venv) venv
set module_scripts(idle) idlelib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,26 +59,28 @@ subport pypy3 {
</span> depends_run-append port:python3_select
select.entries-append [list python3 python3-$subport $subport]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname pypy3-v${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 18f1511e9bcbcd6911e44aefa73e874cda09d4e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed8005202b46d6fc6831df1d13a4613bc40084bfa42f275068edadf8954034a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22648140
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9c4936f66407c58d7253ebb3ba1a9148809cb386 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a3ef876e3691a54f4cff045028ec3be94ab9beb2e99f051b83175302c1899a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23171982
</span> }
if {$subport == ${name}} {
set python.branch 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pypy_c_name pypy-c
</span>
depends_run-append port:python2_select
select.entries-append [list python2 python2-$subport $subport]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname pypy2-v${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4a9568322ac0b8e1c53be81861c7474c1d1926e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6097ec5ee23d0d34d8cd27a1072bed041c8a080ad48731190a03a2223029212d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19741694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fdaf733dfcd7df39579f551aba49632e366701be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5f06bede6d71dce8dfbfe797aab26c8e35cb990e16b826914652dc093ad74451 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20027876
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname pypy${python.branch}-v${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A fast interpreter for Python ${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyPy is a replacement for CPython ${python.branch}. The main reason to use it \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instead of CPython is speed, as it runs generally faster.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
"CFLAGS=${configure.cc_archflags} ${configure.cppflags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,11 +112,6 @@ if {$subport == "pypy3"} {
</span> destroot.args-append --no-embedded-dependencies
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description A fast interpreter for Python ${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyPy is a replacement for CPython ${python.branch}. The main reason to use it \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instead of CPython is speed, as it runs generally faster.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
# sanity check, useful when upgrading, as upstream tends to move these around
if { ![catch {exec grep --exclude "*.orig" -lwre /sw -e ${prefix} ${worksrcpath}} result] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +119,7 @@ post-patch {
</span> }
reinplace "s|__PREFIX__|${prefix}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/pypy/module/test_lib_pypy/ctypes_tests/conftest.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extra_tests/ctypes_tests/conftest.py \
</span> ${worksrcpath}/pypy/tool/cpyext/extbuild.py \
${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +187,7 @@ if {${os.arch} ne "i386"} {
</span>
post-destroot {
file delete ${destroot}${prefix}/lib/${subport}.tar.bz2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../lib/${subport}/bin/${subport} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../lib/${subport}/bin/${subport} ${destroot}${prefix}/bin/${subport}
</span>
xinstall -d ${destroot}${prefix}/share/man/man1
system -W ${worksrcpath}/pypy/doc/man \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/paths.diff b/lang/pypy/files/paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0aafb16..0d9bfd3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/files/paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,10 @@ diff --git lib_pypy/_tkinter/tklib_build.py lib_pypy/_tkinter/tklib_build.py
</span> linklibs = ['tcl', 'tk']
libdirs = []
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pypy/module/test_lib_pypy/ctypes_tests/conftest.py pypy/module/test_lib_pypy/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pypy/module/test_lib_pypy/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pypy/module/test_lib_pypy/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ def c_compile(cfilenames, outputfilename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ./extra_tests/ctypes_tests/conftest.py ../pypy2.7-v7.0.0-src.new/extra_tests/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./extra_tests/ctypes_tests/conftest.py 2019-02-05 14:42:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ../pypy2.7-v7.0.0-src.new/extra_tests/ctypes_tests/conftest.py 2019-02-12 14:57:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span> link_extra = link_extra + ['/DEBUG'] # generate .pdb file
if sys.platform == 'darwin':
# support Fink & Darwinports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +22,10 @@ diff --git pypy/module/test_lib_pypy/ctypes_tests/conftest.py pypy/module/test_l
</span> if (s + 'include' not in include_dirs
and os.path.exists(s + 'include')):
include_dirs.append(s + 'include')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pypy/tool/cpyext/extbuild.py pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +175,7 @@ def c_compile(cfilenames, outputfilename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ./pypy/tool/cpyext/extbuild.py ../pypy2.7-v7.0.0-src.new/pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./pypy/tool/cpyext/extbuild.py 2019-02-05 14:42:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ../pypy2.7-v7.0.0-src.new/pypy/tool/cpyext/extbuild.py 2019-02-12 14:57:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@
</span> link_extra = link_extra + ['/DEBUG'] # generate .pdb file
if sys.platform == 'darwin':
# support Fink & Darwinports
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/pypy-tkinter/Portfile b/python/pypy-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4700a59..d943a90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/pypy-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/pypy-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortSystem 1.0
</span> PortGroup bitbucket 1.0
name pypy-tkinter
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup pypy pypy 6.0.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup pypy pypy 7.1.1 {release-pypy${python.branch}-v}
</span> categories python graphics
license MIT PSF
maintainers {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,29 +40,32 @@ build.args lib_pypy/_tkinter/tklib_build.py
</span> build.target
build.post_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pypy2-v${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a9568322ac0b8e1c53be81861c7474c1d1926e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6097ec5ee23d0d34d8cd27a1072bed041c8a080ad48731190a03a2223029212d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19741694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fdaf733dfcd7df39579f551aba49632e366701be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5f06bede6d71dce8dfbfe797aab26c8e35cb990e16b826914652dc093ad74451 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20027876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport pypy3-tkinter {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch 3.6
</span> build.cmd ${prefix}/bin/${pypy_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${pypy_version}-v${version}-src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 18f1511e9bcbcd6911e44aefa73e874cda09d4e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed8005202b46d6fc6831df1d13a4613bc40084bfa42f275068edadf8954034a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22648140
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9c4936f66407c58d7253ebb3ba1a9148809cb386 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a3ef876e3691a54f4cff045028ec3be94ab9beb2e99f051b83175302c1899a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23171982
</span> }
post-patch {
reinplace "s|__PREFIX__|${prefix}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/pypy/module/test_lib_pypy/ctypes_tests/conftest.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extra_tests/ctypes_tests/conftest.py \
</span> ${worksrcpath}/pypy/tool/cpyext/extbuild.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
</span> ${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname pypy${python.branch}-v${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir pypy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -m 755 -d ${destroot}${pypy_root}/lib_pypy/_tkinter
xinstall -m 755 \
</pre><pre style='margin:0'>
</pre>