<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/c6234d57bcb5f66e56a36896a7ebe9d8fdf465a1">https://github.com/macports/macports-ports/commit/c6234d57bcb5f66e56a36896a7ebe9d8fdf465a1</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 c6234d5  pypy: oops, revert previous commit
</span>c6234d5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c6234d57bcb5f66e56a36896a7ebe9d8fdf465a1
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Wed Jul 25 13:32:18 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    pypy: oops, revert previous commit
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    I didn't intend to commit this.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    https://trac.macports.org/ticket/55679
</span>---
 lang/pypy/Portfile | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 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 1c157c1..cb7eb6e 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 6.0.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</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            1
</span> categories          lang python devel
 license             MIT PSF
 maintainers         {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +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  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  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;'>@@ -36,6 +35,7 @@ patchfiles          darwin.py.diff \
</span>                     ffiplatform.py.diff
 
 subport pypy3 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision       1
</span>     set python.branch 3.5
     set python.libdir 3
     livecheck.regex downloads/pypy3-v(\[0-9.\]+)-src\\.tar\\.bz2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +45,12 @@ subport pypy3 {
</span> 
     distname            pypy3-v${version}-src
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  6013d3109f2e7d078b960c8743f8885ebdf50bd3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  f5548e06e2fc0c24ec8b6e3c5b09f90081818f7caa3e436dc312592611724713 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    29071765
</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}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +66,7 @@ long_description \
</span>     instead of CPython is speed, as it runs generally faster.
 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s+(\\\\('/sw/', \\\\)?'/opt/local/')+('__PREFIX__',)+g" \
</span><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;'>+    reinplace "s+('/sw/', '/opt/local/')+('__PREFIX__',)+g" \
</span>         ${worksrcpath}/pypy/tool/cpyext/extbuild.py
 
     # sanity check, useful when upgrading
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,9 +74,8 @@ post-patch {
</span>         return -code error "didn't catch all references to /sw or /opt/local!"
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|__PREFIX__|${prefix}|" \
</span><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:#ffe0e0;'>-        ${worksrcpath}/pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                        ${worksrcpath}/pypy/tool/cpyext/extbuild.py
</span> 
     # sanity check, likewise
     if { ![catch {exec grep -lwre "__PREFIX__" ${worksrcpath}}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,11 +143,6 @@ destroot.args       --builddir ${destroot}${prefix}/lib \
</span> destroot.target     package.py
 destroot.post_args
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport pypy3 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # we set destroot.args just above, so we cannot do this earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.args-append --no-embedded-dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # JIT is not available on powerpc at present
 if {${os.arch} ne "i386"} {
     build.args-delete --opt=jit
</pre><pre style='margin:0'>

</pre>