<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/238d27bf6c83557be3b67d6f2523c1cf8c8c87e7">https://github.com/macports/macports-ports/commit/238d27bf6c83557be3b67d6f2523c1cf8c8c87e7</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 238d27b pypy: bump to 5.10
</span>238d27b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 238d27bf6c83557be3b67d6f2523c1cf8c8c87e7
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Mon Jan 8 14:40:37 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> pypy: bump to 5.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - drop beta label from pypy3
</span><span style='display:block; white-space:pre;color:#404040;'> - suppress embedded dependencies in pypy3
</span><span style='display:block; white-space:pre;color:#404040;'> - check that we patch all references to /sw and /opt/local
</span><span style='display:block; white-space:pre;color:#404040;'> - remove some cruft
</span>---
lang/pypy/Portfile | 40 +++++++++++++++++++++++-----------------
lang/pypy/files/paths.diff | 22 ----------------------
2 files changed, 23 insertions(+), 39 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 0a22d3a..0e690f3 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;'>@@ -5,8 +5,8 @@ PortSystem 1.0
</span> PortGroup bitbucket 1.0
name pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup pypy pypy 5.9.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 5.10.0 {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 {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +18,8 @@ use_bzip2 yes
</span> distname pypy2-v${version}-src
bitbucket.tarball_from \
downloads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7033ad4d20a163d0ad3dc8db54dba7c08f16dae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1672fec524ccc3037069119498ef9027ebc9382a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1209f2db718e6afda17528baa5138177a14a0938588a7d3e1b7c722c483079a8
</span>
depends_build port:pkgconfig
depends_lib port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +32,9 @@ depends_lib port:libffi \
</span>
patchfiles darwin.py.diff \
make_output.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ffiplatform.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- paths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffiplatform.py.diff
</span>
subport pypy3 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_version ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version "${version}-beta"
</span> revision 1
set python.branch 3.5
set python.libdir 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,19 +43,20 @@ subport pypy3 {
</span> depends_lib-append port:xz
depends_build-replace port:pypy-bootstrap port:pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname pypy3-v${port_version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname pypy3-v${version}-src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b424e787905810439666f0d25014b2e74e3d8b34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f8a8c5d290d33fb087924fcc2ed752dfafd5659f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6e4cffde71e3f08b6e1befa5c0352a9bcc5f4e9f5cbf395001e0763a1a0d9e3
</span>
set pypy_c_name pypy3-c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append --no-embed-dependencies
</span> }
if {$subport == ${name}} {
set python.branch 2.7
set python.libdir 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set pypy_c_name pypy-c
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,13 +66,21 @@ long_description \
</span> instead of CPython is speed, as it runs generally faster.
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s+('/sw/', '/opt/local/')+('__PREFIX__',)+g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sanity check, useful when upgrading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {exec grep -lwre "/sw" -e "/opt/local" ${worksrcpath}}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "didn't catch all references to /sw or /opt/local!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/pypy/tool/cpyext/extbuild.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/rpython/translator/platform/distutils_platform.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pypy/tool/cpyext/extbuild.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete VIM swap files accidentally included with pypy3 up to and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # including 5.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec find ${worksrcpath} -name "*.swn" -delete
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sanity check, likewise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {exec grep -lwre "__PREFIX__" ${worksrcpath}}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "didn't catch all references to __PREFIX__!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/paths.diff b/lang/pypy/files/paths.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70c4906..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pypy/tool/cpyext/extbuild.py.orig 2017-03-20 06:55:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pypy/tool/cpyext/extbuild.py 2017-03-27 23:35:49.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_extra = link_extra + ['/DEBUG'] # generate .pdb file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (s + 'include' not in include_dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and os.path.exists(s + 'include')):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs.append(s + 'include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rpython/translator/platform/distutils_platform.py.orig 2017-03-20 06:55:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rpython/translator/platform/distutils_platform.py 2017-03-27 23:41:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.link_extra += ['/DEBUG'] # generate .pdb file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.name == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if s + 'include' not in self.include_dirs and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.exists(s + 'include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.include_dirs.append(s + 'include')
</span></pre><pre style='margin:0'>
</pre>