<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/0e70890ea90d14e0cb9274f7acf00bee05b3a82a">https://github.com/macports/macports-ports/commit/0e70890ea90d14e0cb9274f7acf00bee05b3a82a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0e70890ea90d14e0cb9274f7acf00bee05b3a82a
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Jul 29 10:55:03 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    pypy: bump to 6.0.0, fix issues
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Bump to latest version, as mentioned.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Address issues identified by Ryan Schmidt in the PR referenced
</span><span style='display:block; white-space:pre;color:#404040;'>      below, such as too much cleverness with replacements.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Properly suppress dependency embedding -- use ours instead.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Reorganise the port to avoid duplication wherever possible.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Add manual page.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Add some comments.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Use pypy2 for building pypy3.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Prevent tkinter from using the system-provided Tk.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/55679
</span><span style='display:block; white-space:pre;color:#404040;'>    Refs: https://github.com/macports/macports-ports/pull/1475
</span>---
 lang/pypy/Portfile         | 145 +++++++++++++++++++++++++++------------------
 lang/pypy/files/paths.diff |  36 +++++++++++
 2 files changed, 122 insertions(+), 59 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 cb7eb6e..ad29314 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;'>@@ -1,12 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
 PortGroup           bitbucket 1.0
 
 name                pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup     pypy pypy 5.10.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 6.0.0 {release-pypy${python.branch}-v}
</span> categories          lang python devel
 license             MIT PSF
 maintainers         {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,13 +13,11 @@ platforms           darwin
</span> 
 homepage            http://pypy.org/
 use_bzip2           yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            pypy2-v${version}-src
</span> bitbucket.tarball_from \
                     downloads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  1672fec524ccc3037069119498ef9027ebc9382a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  1209f2db718e6afda17528baa5138177a14a0938588a7d3e1b7c722c483079a8
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build       port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py27-docutils
</span> depends_lib         port:libffi \
                     port:sqlite3 \
                     port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,32 +28,68 @@ 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:#e0ffe0;'>+                    ffiplatform.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    paths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# a simple mapping from scripts to modules -- ideally, upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# provided these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set module_scripts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pydoc pydoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    2to3 lib2to3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    smtpd.py smtpd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 subport pypy3 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision       1
</span>     set python.branch 3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python.libdir 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex downloads/pypy3-v(\[0-9.\]+)-src\\.tar\\.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set pypy_c_name pypy3-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set module_scripts(venv) venv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set module_scripts(idle) idlelib
</span> 
     depends_lib-append port:xz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-replace port:pypy-bootstrap port:pypy
</span> 
     distname            pypy3-v${version}-src
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  f8a8c5d290d33fb087924fcc2ed752dfafd5659f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  a6e4cffde71e3f08b6e1befa5c0352a9bcc5f4e9f5cbf395001e0763a1a0d9e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.args-append --no-embed-dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160  18f1511e9bcbcd6911e44aefa73e874cda09d4e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  ed8005202b46d6fc6831df1d13a4613bc40084bfa42f275068edadf8954034a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    22648140
</span> }
 
 if {$subport == ${name}} {
     set python.branch 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python.libdir 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     set pypy_c_name pypy-c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distname            pypy2-v${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160  4a9568322ac0b8e1c53be81861c7474c1d1926e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  6097ec5ee23d0d34d8cd27a1072bed041c8a080ad48731190a03a2223029212d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    19741694
</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;'>+build.env           PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir           ${worksrcpath}/pypy/goal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args          --batch --verbose \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --cc=${configure.cc} --opt=jit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --make-jobs=${build.jobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target        ../../rpython/bin/rpython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args     targetpypystandalone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env        ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir        ${worksrcpath}/pypy/tool/release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args       --builddir ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --archive-name ${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --without-tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target     package.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "pypy3"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # we need to do this after assigning to the variable above -- and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # since ${worksrcpath} depends on the subport, we can't do it earlier either
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.args-append --no-embedded-dependencies
</span> }
 
 description         A fast interpreter for Python ${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,33 +98,40 @@ 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/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # sanity check, useful when upgrading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ![catch {exec grep -lwre "/sw" -e "/opt/local" ${worksrcpath}}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return -code error "didn't catch all references to /sw or /opt/local!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # sanity check, useful when upgrading, as upstream tends to move these around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ![catch {exec grep --exclude "*.orig" -lwre /sw -e ${prefix} ${worksrcpath}} result] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return -code error "didn't catch all references to /sw and ${prefix}:\n$result"
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.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}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/pypy/module/test_lib_pypy/ctypes_tests/conftest.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:#e0ffe0;'>+        ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
</span> 
     # sanity check, likewise
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ![catch {exec grep -lwre "__PREFIX__" ${worksrcpath}}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return -code error "didn't catch all references to __PREFIX__!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ![catch {exec grep --exclude "*.orig" -lwre __PREFIX__ ${worksrcpath}} result] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return -code error "didn't catch all references to __PREFIX__:\n$result"
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use pypy to build if it's already installed, and we're not in trace mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![tbool ports_trace] && [file executable ${prefix}/lib/pypy/pypy]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Which Python binary should we use? Building PyPy is _very_ resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# intensive, and one of the best cases for using PyPy itself over
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CPython.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport ne $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # just use our own pypy2 for building pypy3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append port:pypy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.cmd       ${prefix}/lib/pypy/bin/pypy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {![tbool ports_trace] && [file executable ${prefix}/lib/pypy/pypy]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # if we're not in trace mode, use pypy from this port if it's available
</span>     build.cmd       ${prefix}/lib/pypy/pypy
 } else {
     if {${os.platform} eq "darwin" && ${os.arch} eq "i386" && ![catch {sysctl hw.cpu64bit_capable} is64bit] && $is64bit == 1} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # use a binary distribution of pypy itself
</span>         depends_build-append port:pypy-bootstrap
         build.cmd       ${prefix}/lib/pypy-bootstrap/bin/pypy
     } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # fall back to good old CPython...
</span>         depends_build-append port:python27
         build.cmd       ${prefix}/bin/python2.7
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,24 +163,6 @@ platform darwin {
</span>         build.cmd arch -${build_arch} ${build.cmd}
     }
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env           PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir           ${worksrcpath}/pypy/goal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          --batch --verbose \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --cc=${configure.cc} --opt=jit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --make-jobs=${build.jobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        ../../rpython/bin/rpython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args     targetpypystandalone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env        ${build.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.dir        ${worksrcpath}/pypy/tool/release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args       --builddir ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --archive-name ${subport} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --without-tk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target     package.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.post_args
</span> 
 # JIT is not available on powerpc at present
 if {${os.arch} ne "i386"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,16 +170,22 @@ if {${os.arch} ne "i386"} {
</span>     build.args-append --opt=3
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # some modules have to be compiled in an extra step
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach script {_audioop_build.py _curses_build.py _pwdgrp_build.py _sqlite3_build.py _syslog_build.py} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W ${worksrcpath}/lib_pypy "${build.dir}/${pypy_c_name} $script"
</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;'>-
</span> post-destroot {
     file delete ${destroot}${prefix}/lib/${subport}.tar.bz2
     ln -s ../lib/${subport}/bin/${subport} ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath}/pypy/doc/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "rst2man-2.7.py pypy.1.rst ${destroot}${prefix}/share/man/man1/${subport}.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach script [array names module_scripts] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set module $module_scripts($script)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set scriptpath "${destroot}/${prefix}/lib/${subport}/bin/${script}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 755 ${filespath}/module-script.sh $scriptpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s+__PYPY__+${prefix}/bin/${subport}+" $scriptpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s+__MODULE__+${module}+" $scriptpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 variant opt1 description {use optimization level 1 for faster build (but slower execution)} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/paths.diff b/lang/pypy/files/paths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0aafb16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib_pypy/_tkinter/tklib_build.py lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@ elif sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     linklibs = ['tcl85', 'tk85']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     libdirs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    incdirs = ['__PREFIX__/include']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     linklibs = ['tcl', 'tk']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     libdirs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+--- pypy/module/test_lib_pypy/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/module/test_lib_pypy/ctypes_tests/conftest.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@ def c_compile(cfilenames, outputfilename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         link_extra = link_extra + ['/DEBUG']  # generate .pdb file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (s + 'include' not in include_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     and os.path.exists(s + 'include')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 include_dirs.append(s + 'include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pypy/tool/cpyext/extbuild.py pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/tool/cpyext/extbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@ def c_compile(cfilenames, outputfilename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         link_extra = link_extra + ['/DEBUG']  # generate .pdb file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (s + 'include' not in include_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     and os.path.exists(s + 'include')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 include_dirs.append(s + 'include')
</span></pre><pre style='margin:0'>

</pre>