<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4ba9dc948277cc7703f42e0e4d3b948b5da63bb3">https://github.com/macports/macports-ports/commit/4ba9dc948277cc7703f42e0e4d3b948b5da63bb3</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 4ba9dc9 python35: update to 3.5.9
</span>4ba9dc9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4ba9dc948277cc7703f42e0e4d3b948b5da63bb3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Nov 2 14:00:55 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python35: update to 3.5.9
</span>---
lang/python35/Portfile | 12 ++--
lang/python35/files/patch-_osx_support.py.diff | 94 ++++++++++++++++++++++++++
python/py-gdbm/Portfile | 8 +--
python/py-tkinter/Portfile | 8 +--
4 files changed, 108 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/Portfile b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24d28ab..b5f9266 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,7 @@ name python35
</span>
epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.9
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +25,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 ef7f82485e83c7f8f8bcb920a9c2457b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7ca1bacda445d33c6533c6fce7eb625757a3f8ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +37,8 @@ patchfiles patch-setup.py.diff \
</span> omit-local-site-packages.patch \
patch-xcode4bug.diff \
Modules_posixmodule.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-_osx_support.py.diff
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/files/patch-_osx_support.py.diff b/lang/python35/files/patch-_osx_support.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c247bb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,94 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-11-02 10:02:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-11-02 13:33:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = re.sub(r'-arch\s+\w+\s', ' ', flags, flags=re.ASCII)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-isysroot\s*\S+', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,7 +287,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to /usr and /System/Library by either a standalone CLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # package or the CLT component within Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = _config_vars.get('CFLAGS', '')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if m is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sdk = m.group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not os.path.exists(sdk):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not alter a config var explicitly overridden by env var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-isysroot\s*\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripArch = stripSysroot = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripArch = '-arch' in cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stripSysroot = '-isysroot' in cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stripSysroot = any(arg for arg in cc_args if arg.find('-isysroot') == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if stripArch or 'ARCHFLAGS' in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,23 +338,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if stripSysroot:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- index = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = indices[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if compiler_so[index] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ del compiler_so[index:index+2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except ValueError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # It's '-isysroot/some/path' in one arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ del compiler_so[index:index+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if the SDK that is used during compilation actually exists,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the universal build requires the usage of a universal SDK and not all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # users have that installed by default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysroot = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if '-isysroot' in cc_args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- idx = cc_args.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysroot = cc_args[idx+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif '-isysroot' in compiler_so:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- idx = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysroot = compiler_so[idx+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argvar = cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(cc_args) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argvar = compiler_so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for idx in indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if argvar[idx] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysroot = argvar[idx+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysroot = argvar[idx][len('-isysroot'):]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sysroot and not os.path.isdir(sysroot):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils import log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/distutils/unixccompiler.py.orig 2019-11-02 10:02:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/distutils/unixccompiler.py 2019-11-02 13:33:32.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,7 +282,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # vs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /usr/lib/libedit.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if m is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysroot = '/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fd072d..3e9e2da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,13 +84,13 @@ subport py34-gdbm {
</span> subport py35-gdbm {
maintainers {jmr @jmroot} openmaintainer
epoch 20170810
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.5.9
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 ef7f82485e83c7f8f8bcb920a9c2457b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7ca1bacda445d33c6533c6fce7eb625757a3f8ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex Python (3.5.\[0-9\]+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 790310b..f179dc1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,13 +80,13 @@ subport py34-tkinter {
</span> subport py35-tkinter {
maintainers {jmr @jmroot} openmaintainer
epoch 20170810
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.5.9
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 b1b4949786732494f4d6675c184aa765 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 782c63473dc5a4fb181409dcc2af9595d1aab92c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 ef7f82485e83c7f8f8bcb920a9c2457b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7ca1bacda445d33c6533c6fce7eb625757a3f8ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>