<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c62a21838f933393b14963763d406ec9498df004">https://github.com/macports/macports-ports/commit/c62a21838f933393b14963763d406ec9498df004</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 c62a218 python38: update to 3.8.1
</span>c62a218 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c62a21838f933393b14963763d406ec9498df004
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Dec 21 14:17:09 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> python38: update to 3.8.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update py-gdbm and py-tkinter
</span><span style='display:block; white-space:pre;color:#404040;'> - only disable poll on 10.8 and older
</span><span style='display:block; white-space:pre;color:#404040;'> - refresh patches so that they apply cleanly
</span><span style='display:block; white-space:pre;color:#404040;'> - move sysroot patch from patch-setup.py-diff to patch-_osx_support.py.diff
</span>---
lang/python38/Portfile | 15 +++++++-----
lang/python38/files/patch-_osx_support.py.diff | 11 +++++++++
lang/python38/files/patch-configure-xcode4bug.diff | 6 ++---
lang/python38/files/patch-configure.diff | 6 ++---
lang/python38/files/patch-libedit.diff | 28 +++++++++++-----------
lang/python38/files/patch-setup.py.diff | 9 -------
python/py-gdbm/Portfile | 8 +++----
python/py-tkinter/Portfile | 8 +++----
8 files changed, 48 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d6c46b..cfff4e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@ PortGroup select 1.0
</span> name python38
# Remember to keep py38-tkinter and py38-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.1
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ada4ef83d6315ab854e1f1e430db142b40260e7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17829824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 057623eae4d7b82eb037176f8e80c87a30bd3586 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17828408
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,8 +97,11 @@ platform darwin {
</span> set confdir config-${branch}-darwin
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # poll() misbehaves on 10.8 and older
</span> # See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-_osx_support.py.diff b/lang/python38/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c305d4..ed57665 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,3 +92,14 @@
</span> if m is None:
sysroot = '/'
else:
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-12-21 16:03:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-12-21 16:04:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return MACOS_SDK_ROOT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOS_SDK_ROOT = m.group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-configure-xcode4bug.diff b/lang/python38/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d3a763b..0dd85f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ https://bugs.python.org/issue24844
</span> Compiling python fails in Xcode 4 (clang < 3.3) where existence of 'atomic'
is detected by configure, but it is not fully functional.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-10-14 09:34:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-12-10 09:38:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16800,6 +16800,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-12-21 15:43:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-12-21 15:45:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16791,6 +16791,24 @@
</span> volatile int val = 1;
int main() {
__atomic_load_n(&val, __ATOMIC_SEQ_CST);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-configure.diff b/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a8d538..1db008f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-12-10 08:33:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-12-10 08:33:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3188,7 +3188,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-12-18 12:21:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-12-21 15:41:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3176,7 +3176,7 @@
</span> ;;
*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-libedit.diff b/lang/python38/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ba7cbab..3dc54a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-12-10 09:25:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-12-10 09:30:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15281,9 +15281,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-12-21 15:41:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-12-21 15:43:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15269,9 +15269,9 @@
</span> $as_echo_n "checking how to link readline libs... " >&6; }
for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15329,7 +15329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15317,7 +15317,7 @@
</span> # check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@
</span> _ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15342,7 +15342,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15330,7 +15330,7 @@
</span> then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15355,7 +15355,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15343,7 +15343,7 @@
</span>
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@
</span>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15369,13 +15369,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15357,13 +15357,13 @@
</span> fi
# check for readline 4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15413,13 +15413,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15401,13 +15401,13 @@
</span>
# also in 4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15457,13 +15457,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15445,13 +15445,13 @@
</span>
# also in 4.0, but not in editline
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15501,13 +15501,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15489,13 +15489,13 @@
</span>
# check for readline 4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15547,7 +15547,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15535,7 +15535,7 @@
</span> # also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@
</span> _ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15560,7 +15560,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15548,7 +15548,7 @@
</span> then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@
</span>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15573,13 +15573,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15561,13 +15561,13 @@
</span>
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@
</span> +LIBS="-ledit $READLINE_LIBS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- setup.py.orig 2019-10-14 09:34:47.000000000 -0400
+++ setup.py 2019-12-10 09:30:07.000000000 -0500
@@ -874,7 +874,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-setup.py.diff b/lang/python38/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 54e24f2..37f3c53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,15 +9,6 @@
</span>
def get_platform():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return MACOS_SDK_ROOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOS_SDK_ROOT = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span> @@ -648,9 +648,6 @@
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
<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 07a4bf0..f9a329d 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;'>@@ -124,13 +124,13 @@ subport py37-gdbm {
</span> }
subport py38-gdbm {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.1
</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 rmd160 ada4ef83d6315ab854e1f1e430db142b40260e7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17829824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 057623eae4d7b82eb037176f8e80c87a30bd3586 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17828408
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.8\.[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 e5050bf..cd69c5e 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;'>@@ -117,13 +117,13 @@ subport py37-tkinter {
</span> }
subport py38-tkinter {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.1
</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 rmd160 ada4ef83d6315ab854e1f1e430db142b40260e7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17829824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 057623eae4d7b82eb037176f8e80c87a30bd3586 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17828408
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>