<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/83d0fd6b7025dd83b77a3b36a95884415807e13e">https://github.com/macports/macports-ports/commit/83d0fd6b7025dd83b77a3b36a95884415807e13e</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 83d0fd6 python37: update to 3.7.5
</span>83d0fd6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 83d0fd6b7025dd83b77a3b36a95884415807e13e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Oct 16 23:16:48 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python37: update to 3.7.5
</span>---
lang/python37/Portfile | 12 ++--
lang/python37/files/patch-_osx_support.py.diff | 95 ++++++++++++++++++++++++++
python/py-gdbm/Portfile | 12 ++--
python/py-tkinter/Portfile | 12 ++--
4 files changed, 113 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c10793a..5f10d9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,7 @@ PortGroup clang_dependency 1.0
</span> name python37
# Remember to keep py37-tkinter and py37-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.7.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.5
</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,16 +25,17 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 d33e4aae66097051c2eca45ee3604803 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b9ddfd1ad22b75920f37104ed2fbc0ab39c683f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 08ed8030b1183107c48f2092e79a87e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 19043c229ecf75b732ff63e11c766a2d60fb5b4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-xcode4bug.diff \
</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/python37/files/patch-_osx_support.py.diff b/lang/python37/files/patch-_osx_support.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a1d8ed5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/distutils/unixccompiler.py.orig 2019-07-09 04:03:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/distutils/unixccompiler.py 2019-09-30 08:06:47.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,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;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-07-09 04:03:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-09-30 09:39:16.000000000 +1000
</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('-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;'>+@@ -337,11 +337,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
</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;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for index in indices:
</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;'>+- # 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;'>++ 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;'>++ 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;'>+ except ValueError:
</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;'>+@@ -349,12 +353,19 @@
</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;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 b3a630a..bb923b9 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;'>@@ -41,7 +41,7 @@ subport py27-gdbm {
</span> livecheck.regex Python (2.7.\[0-9\]+)
}
subport py32-gdbm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span> version 3.2.6
revision 2
homepage https://docs.python.org/release/${version}/library/dbm.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ subport py32-gdbm {
</span> livecheck.regex Python (3.2.\[0-9\]+)
}
subport py33-gdbm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span> version 3.3.7
epoch 20141012
revision 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,13 +111,13 @@ subport py36-gdbm {
</span> }
subport py37-gdbm {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.7.5
</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 d33e4aae66097051c2eca45ee3604803 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b9ddfd1ad22b75920f37104ed2fbc0ab39c683f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 08ed8030b1183107c48f2092e79a87e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 19043c229ecf75b732ff63e11c766a2d60fb5b4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex Python (3.7.\[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 42f0d70..3743c5a 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;'>@@ -42,7 +42,7 @@ subport py27-tkinter {
</span> append extract_files " Modules/tkinter.h"
}
subport py32-tkinter {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span> version 3.2.6
homepage https://docs.python.org/release/${version}/library/tkinter.html
checksums md5 e0ba4360dfcb4aec735e666cc0ae7b0e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ subport py32-tkinter {
</span> set module_name tkinter
}
subport py33-tkinter {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span> version 3.3.7
epoch 20141012
homepage https://docs.python.org/release/${version}/library/tkinter.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,13 +105,13 @@ subport py36-tkinter {
</span> }
subport py37-tkinter {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.7.5
</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 d33e4aae66097051c2eca45ee3604803 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b9ddfd1ad22b75920f37104ed2fbc0ab39c683f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 08ed8030b1183107c48f2092e79a87e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 19043c229ecf75b732ff63e11c766a2d60fb5b4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>