<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/460f1b130da2390b624240a135f572aca13de9e0">https://github.com/macports/macports-ports/commit/460f1b130da2390b624240a135f572aca13de9e0</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 460f1b1 pypy: update to 7.3.0
</span>460f1b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 460f1b130da2390b624240a135f572aca13de9e0
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Mon Jan 6 19:20:50 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> pypy: update to 7.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * move tkinter support to subport to simplify upgrades
</span><span style='display:block; white-space:pre;color:#404040;'> * don't try to use preinstalled binary depending on trace mode
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Re: https://trac.macports.org/ticket/59410
</span>---
lang/pypy/Portfile | 102 ++++++++++++++-------
lang/pypy/files/no-embed.diff | 45 ++++++---
.../files/{darwin.py.diff => pypy2-darwin.py.diff} | 0
lang/pypy/files/pypy3-darwin.py.diff | 12 +++
python/pypy-tkinter/Portfile | 76 ---------------
python/pypy-tkinter/files/ffiplatform.py.diff | 11 ---
python/pypy-tkinter/files/paths.diff | 36 --------
7 files changed, 116 insertions(+), 166 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 b890517..55721b7 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 7.2.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.3.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 {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,7 @@ depends_lib port:libffi \
</span> depends_run port:python_select
select.entries [list python python-$subport $subport]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles darwin.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no-embed.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-embed.diff \
</span> make_output.diff \
ffiplatform.py.diff \
paths.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +58,14 @@ 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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport pypy-tkinter {
</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;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 cdcc01b6235ea2598d978c84c974977d60f1be05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d7c707df5041f1593fe82f29c40056c21e4d6cb66554bbd66769bd80bcbfafc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21850076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport pypy3-tkinter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch 3.6
</span> }
if {$subport == ${name}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,10 +73,21 @@ if {$subport == ${name}} {
</span>
depends_run-append port:python2_select
select.entries-append [list python2 python2-$subport $subport]
<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;'>+if {${python.branch} == 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append pypy2-darwin.py.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e2cd6ff78845f1b674997e99adbdcc8bd8780e7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 55cb7757784fbe3952102447f65b27d80e6c885a464a7af1a9ce264492439dcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20219532
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 acb601481958888d11c7007e8d749c9035ff7d22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0b25c7f8938ab0fedd8dedf26b9e73c490913b002b484c1b2f19d5844a518de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20328540
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append pypy3-darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3032a53eb9fb8d226a1a0075472407ce3e6c7734 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48d12c15fbcbcf4a32882a883195e1f922997cde78e7a16d4342b9b521eefcfa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21937786
</span> }
distname pypy${python.branch}-v${version}-src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +131,8 @@ post-patch {
</span> ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.branch} == "2.7" && ${macosx_deployment_target} != "10.14"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/MACOSX_DEPLOYMENT_TARGET/s/10\\.14/${macosx_deployment_target}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.branch} == "2.7"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/MACOSX_DEPLOYMENT_TARGET/s/10\\.\\(\[0-9\]*\\)/${macosx_deployment_target}/" \
</span> lib-python/2.7/distutils/sysconfig_pypy.py
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,9 +149,6 @@ if {$subport ne $name} {
</span> # just use our own pypy2 for building pypy3
depends_build-append port:pypy
build.cmd ${prefix}/lib/pypy/bin/pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {![tbool ports_trace] && [file executable ${prefix}/lib/pypy/pypy]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if we're not in trace mode, use pypy from this port if it's available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${prefix}/lib/pypy/pypy
</span> } else {
if {${os.platform} eq "darwin" && ${os.arch} eq "i386" && ![catch {sysctl hw.cpu64bit_capable} is64bit] && $is64bit == 1} {
# use a binary distribution of pypy itself
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,26 +194,55 @@ if {${os.arch} ne "i386"} {
</span> build.args-append --opt=3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/lib/${subport}.tar.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../lib/${subport}/bin/${subport} ${destroot}${prefix}/bin/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Install support files, but only if not in a proper subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![string match "pypy*-*" ${subport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${prefix}/lib/${subport}.tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../lib/${subport}/bin/${subport} ${destroot}${prefix}/bin/${subport}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/pypy/doc/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "rst2man-2.7.py pypy.1.rst ${destroot}${prefix}/share/man/man1/${subport}.1"
</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:#ffe0e0;'>- foreach script [array names module_scripts] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set module $module_scripts($script)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set scriptpath "${destroot}${prefix}/lib/${subport}/bin/${script}"
</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:#ffe0e0;'>- xinstall -m 755 ${filespath}/module-script.sh $scriptpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s+__PYPY__+${prefix}/bin/${subport}+" $scriptpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s+__MODULE__+${module}+" $scriptpath
</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> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opt1 description {use optimization level 1 for faster build (but slower execution)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:boehmgc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete --opt=3 --opt=jit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --opt=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Factor Tk into a separate subport, like CPython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match "pypy*-tkinter" ${subport}]} {
</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;'>+ 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;'>+ categories python graphics
</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;'>+ build.dir ${worksrcpath}
</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;'>+ 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;'>+ select.entries
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot { }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/no-embed.diff b/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e54d7b3..226d6f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,33 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r 4a68d8d3d2fc pypy/tool/release/package.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pypy/tool/release/package.py Fri Oct 04 18:02:31 2019 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pypy/tool/release/package.py Mon Oct 28 09:41:10 2019 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,6 +321,8 @@ def package(*args, **kwds):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options.no_tk = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.environ.has_key("PYPY_EMBED_DEPENDENCIES"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options.embed_dependencies = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif os.environ.has_key("PYPY_NO_EMBED_DEPENDENCIES"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options.embed_dependencies = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not options.builddir:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The import actually creates the udir directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from rpython.tool.udir import udir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pypy/tool/build_cffi_imports.py pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,7 +165,7 @@ def create_cffi_import_libraries(pypy_c,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = os.environ.copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print('*', ' '.join(args), file=sys.stderr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if embed_dependencies:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if False:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status, stdout, stderr = _build_dependency(key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if status != 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ failures.append((key, module))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,7 +238,7 @@ if __name__ == '__main__':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ only = set(args.only.split(','))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ failures = create_cffi_import_libraries(exename, options, basedir, only=only,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- embed_dependencies=args.embed_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ embed_dependencies=False,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rebuild=args.rebuild)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if len(failures) > 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print('*** failed to build the CFFI modules %r' % (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pypy/tool/release/package.py pypy/tool/release/package.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pypy/tool/release/package.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/tool/release/package.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@ def create_package(basedir, options, _fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not options.no_cffi:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ failures = create_cffi_import_libraries(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str(pypy_c), options, str(basedir),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- embed_dependencies=options.embed_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ embed_dependencies=False,
</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;'>+ for key, module in failures:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/darwin.py.diff b/lang/pypy/files/pypy2-darwin.py.diff
</span>similarity index 100%
rename from lang/pypy/files/darwin.py.diff
rename to lang/pypy/files/pypy2-darwin.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/pypy3-darwin.py.diff b/lang/pypy/files/pypy3-darwin.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5c45c67
</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/pypy3-darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git rpython/translator/platform/darwin.py rpython/translator/platform/darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rpython/translator/platform/darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rpython/translator/platform/darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since 10.5, so we use that as minimum requirement. Bumped to 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to allow the use of thread-local in __thread in C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DARWIN_VERSION_MIN = '-mmacosx-version-min=10.7'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DARWIN_VERSION_MIN = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Darwin(posix.BasePosix):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = "darwin"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/pypy-tkinter/Portfile b/python/pypy-tkinter/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69f7246..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please remember to keep this file in sync with the pypy port!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup bitbucket 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name pypy-tkinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup pypy pypy 7.2.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories python graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT PSF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {danchr @danchr} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description PyPy bindings to the Tk widget set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://pypy.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.tarball_from \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pypy_version [string range ${subport} 0 [string first "-" ${subport}]-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pypy_root ${prefix}/lib/${pypy_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:${pypy_version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# copied from the pypy port, as trace mode prevents us from sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# them between ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles ffiplatform.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- paths.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${pypy_root}/bin/${pypy_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e2cd6ff78845f1b674997e99adbdcc8bd8780e7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 55cb7757784fbe3952102447f65b27d80e6c885a464a7af1a9ce264492439dcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20219532
</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;'>-subport pypy3-tkinter {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${prefix}/bin/${pypy_version}
</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;'>- checksums rmd160 cdcc01b6235ea2598d978c84c974977d60f1be05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d7c707df5041f1593fe82f29c40056c21e4d6cb66554bbd66769bd80bcbfafc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21850076
</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;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extra_tests/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:#ffe0e0;'>- ${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
</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;'>-distname pypy${python.branch}-v${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir pypy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${pypy_root}/lib_pypy/_tkinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [glob -directory ${worksrcpath}/lib_pypy/_tkinter tklib_cffi.*.so] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${pypy_root}/lib_pypy/_tkinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a383186..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/pypy-tkinter/files/ffiplatform.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib_pypy/cffi/ffiplatform.py.orig 2016-03-19 04:52:25.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib_pypy/cffi/ffiplatform.py 2016-03-22 14:49:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +47,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options['force'] = ('ffiplatform', True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options['build_lib'] = ('ffiplatform', tmpdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options['build_temp'] = ('ffiplatform', tmpdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options['include_dirs'] = ('ffiplatform', '__PREFIX__/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options['library_dirs'] = ('ffiplatform', '__PREFIX__/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d9bfd3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/pypy-tkinter/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,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib_pypy/_tkinter/tklib_build.py lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib_pypy/_tkinter/tklib_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@ elif sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linklibs = ['tcl85', 'tk85']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdirs = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ incdirs = ['__PREFIX__/include']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linklibs = ['tcl', 'tk']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdirs = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- ./extra_tests/ctypes_tests/conftest.py 2019-02-05 14:42:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ../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:#ffe0e0;'>-@@ -58,7 +58,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;'>-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:#ffe0e0;'>---- ./pypy/tool/cpyext/extbuild.py 2019-02-05 14:42:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ../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:#ffe0e0;'>-@@ -175,7 +175,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></pre><pre style='margin:0'>
</pre>