<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch fix-pypy3
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c49d9b64625bf1e7cdbbdfd9b822aa0501280972">https://github.com/macports/macports-ports/commit/c49d9b64625bf1e7cdbbdfd9b822aa0501280972</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c49d9b64625bf1e7cdbbdfd9b822aa0501280972
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Jul 29 11:22:15 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    pypy-tkinter: new port
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Equivalent to 'py-tkinter', but for PyPy; uses the MacPorts-provided
</span><span style='display:block; white-space:pre;color:#404040;'>    Tcl & Tk frameworks.
</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/42512
</span>---
 lang/pypy/Portfile                            |  2 +
 python/pypy-tkinter/Portfile                  | 71 +++++++++++++++++++++++++++
 python/pypy-tkinter/files/ffiplatform.py.diff | 11 +++++
 python/pypy-tkinter/files/paths.diff          | 36 ++++++++++++++
 4 files changed, 120 insertions(+)

<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 ad29314..86ef62b 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,5 +1,7 @@
</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
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please remember to keep this file in sync with the pypy-tkinter port!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem          1.0
 PortGroup           bitbucket 1.0
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/pypy-tkinter/Portfile b/python/pypy-tkinter/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4700a59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please remember to keep this file in sync with the pypy port!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem          1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           bitbucket 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                pypy-tkinter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup     pypy pypy 6.0.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories          python graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license             MIT PSF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {danchr @danchr} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description         PyPy bindings to the Tk widget set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description    ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms           darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            http://pypy.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2           yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.tarball_from \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    downloads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pypy_version    [string range ${subport} 0 [string first "-" ${subport}]-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pypy_root       ${prefix}/lib/${pypy_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         port:${pypy_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# copied from the pypy port, as trace mode prevents us from sharing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# them between ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          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;'>+build.cmd           ${pypy_root}/bin/${pypy_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args          lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args
</span><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;'>+
</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;'>+subport pypy3-tkinter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.cmd           ${prefix}/bin/${pypy_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distname            ${pypy_version}-v${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><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-patch {
</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><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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 -d ${destroot}${pypy_root}/lib_pypy/_tkinter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        [glob -directory ${worksrcpath}/lib_pypy/_tkinter tklib_cffi.*.so] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${destroot}${pypy_root}/lib_pypy/_tkinter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/pypy-tkinter/files/ffiplatform.py.diff b/python/pypy-tkinter/files/ffiplatform.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a383186
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/pypy-tkinter/files/ffiplatform.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib_pypy/cffi/ffiplatform.py.orig      2016-03-19 04:52:25.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib_pypy/cffi/ffiplatform.py   2016-03-22 14:49:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     options['force'] = ('ffiplatform', True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     options['build_lib'] = ('ffiplatform', tmpdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     options['build_temp'] = ('ffiplatform', tmpdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    options['include_dirs'] = ('ffiplatform', '__PREFIX__/include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    options['library_dirs'] = ('ffiplatform', '__PREFIX__/lib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         old_level = distutils.log.set_threshold(0) or 0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/pypy-tkinter/files/paths.diff b/python/pypy-tkinter/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/python/pypy-tkinter/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>