<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2efa178989eddba0841a5f3b2382eff10f349726">https://github.com/macports/macports-ports/commit/2efa178989eddba0841a5f3b2382eff10f349726</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 2efa178 Update to lang/python38-devel (#4607)
</span>2efa178 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2efa178989eddba0841a5f3b2382eff10f349726
</span>Author: Themanwithoutaplan <charlie.clark@clark-consulting.eu>
AuthorDate: Tue Jun 18 13:34:03 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> Update to lang/python38-devel (#4607)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Updated version and hashes
</span><span style='display:block; white-space:pre;color:#404040;'> Renamed one of the post-build configuration files to match distfiles
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Adjust patches to setup.py to reflect changes in distfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Adjust confdir
</span>---
lang/python38-devel/Portfile | 20 +++++-----
lang/python38-devel/files/patch-libedit.diff | 54 +++++++++++++--------------
lang/python38-devel/files/patch-setup.py.diff | 43 ++++++---------------
3 files changed, 49 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38-devel/Portfile b/lang/python38-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d3c3ca..55c9569 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name python38-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.0a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.0b1
</span> epoch 1
revision 0
set major [lindex [split $version .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ master_sites ${homepage}ftp/python/3.8.0/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c8d69aaf673167a30f409a9bbce34b152d644d10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 64f08ef60c86474d1390917841c1b618391e6ba01a42cf33977414bd602e8b5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17201560
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b39fac594a845b31214409b3dc504124567107b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd9f113242c95463fd95a5b2e9e48a00edcb9c2eb7f9a56cee864e4c5be37f10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17601532
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@ select.entries [list python python-$pythonNoDot $pythonNoDot] \
</span> platform darwin {
set framewpath ${frameworks_dir}/Python.framework
set framewdir ${framewpath}/Versions/${branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir config-${branch}m-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confdir config-${branch}-darwin
</span>
post-configure {
# See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,17 +109,17 @@ platform darwin {
</span> system -W ${buildlibdir} "awk -F : \
\"/'LINKFORSHARED'/ {printf \\\"%s: '-L${framewdir}/lib/python${branch}/${confdir}\
-lpython${branch}m -ldl -framework CoreFoundation',\\n\\\", \\\$1; getline; next} {print}\"\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _sysconfigdata_m_darwin_darwin.py > _sysconfigdata_m_darwin_darwin.py.new"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py.new \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _sysconfigdata__darwin_darwin.py > _sysconfigdata__darwin_darwin.py.new"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename -force ${buildlibdir}/_sysconfigdata__darwin_darwin.py.new \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${buildlibdir}/_sysconfigdata__darwin_darwin.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${buildlibdir}/_sysconfigdata__darwin_darwin.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${buildlibdir}/_sysconfigdata__darwin_darwin.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38-devel/files/patch-libedit.diff b/lang/python38-devel/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 865ccc7..01fc48a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38-devel/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38-devel/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,21 +27,21 @@
</span> /* end confdefs.h. */
-#include <readline/readline.h>
+#include <editline/readline.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -15018,7 +15018,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <readline/readline.h>
+#include <editline/readline.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -15032,13 +15032,13 @@
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # check for readline 4.0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5
-$as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +55,10 @@
</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> @@ -15076,13 +15076,13 @@
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # also in 4.0
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5
-$as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +72,10 @@
</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> @@ -15120,13 +15120,13 @@
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # also in 4.0, but not in editline
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -lreadline" >&5
-$as_echo_n "checking for rl_resize_terminal in -lreadline... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,10 +89,10 @@
</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> @@ -15164,13 +15164,13 @@
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # check for readline 4.2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,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> @@ -15210,7 +15210,7 @@
# also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,13 +122,13 @@
</span> /* end confdefs.h. */
-#include <readline/readline.h>
+#include <editline/readline.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -15236,13 +15236,13 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -lreadline" >&5
-$as_echo_n "checking for append_history in -lreadline... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -ledit" >&5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,22 +141,22 @@
</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 2018-03-29 22:57:55.000000000 +1100
+++ setup.py 2018-04-27 06:10:46.000000000 +1000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -779,7 +779,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libraries=['m']) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -872,7 +872,7 @@ class PyBuildExt(build_ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def detect_readline_curses(self):
</span> # readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ do_readline = self.compiler.find_library_file(lib_dirs, 'edit')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do_readline = self.compiler.find_library_file(self.lib_dirs, 'edit')
</span> readline_termcap_library = ""
curses_library = ""
# Cannot use os.popen here in py3k.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -845,7 +845,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -938,7 +938,7 @@ class PyBuildExt(build_ext):
</span> else:
readline_extra_link_args = ()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - readline_libs = ['readline']
+ readline_libs = ['edit']
if readline_termcap_library:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,12 +165,12 @@
</span> --- Modules/readline.c.orig 2013-10-23 21:51:09.000000000 +0300
+++ Modules/readline.c 2013-10-23 22:10:09.000000000 +0300
@@ -29,8 +29,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* GNU readline definitions */
#undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
-#include <readline/readline.h>
-#include <readline/history.h>
+#include <editline/readline.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38-devel/files/patch-setup.py.diff b/lang/python38-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index de50929..ca4e45c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +1,22 @@
</span> --- setup.py.orig 2018-03-29 22:57:55.000000000 +1100
+++ setup.py 2018-04-27 05:55:22.000000000 +1000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@@ -24,7 +24,7 @@ from distutils.spawn import find_executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_EXTENSIONS = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This global variable is used to hold the list of modules to be disabled.
<span style='display:block; white-space:pre;background:#ffe0e0;'>--disabled_module_list = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+disabled_module_list = ["_tkinter", "_gdbm"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def add_dir_to_list(dirlist, dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Add the directory 'dir' to the list 'dirlist' (after any relative
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -540,9 +540,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure that /usr/local is always used, but the local build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directories (i.e. '.' and 'Include') must be first. See issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 10520.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not cross_compiling:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only change this for cross builds for 3.3, issues on Mageia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cross_compiling:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.add_gcc_paths()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1789,9 +1786,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DISABLED_MODULE_LIST = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DISABLED_MODULE_LIST = ["_tkinter", "_gdbm"]
</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;'>+ def get_platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1840,8 +1840,8 @@ class PyBuildExt(build_ext):
</span> # Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (host_platform == 'darwin' and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (MACOS and self.detect_tkinter_darwin()):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return True
</span> + self.announce("INFO: Not using Tcl/Tk", 2)
+ return
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1983,7 +1979,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OS X 10.5 comes with libffi.dylib; the include files are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in /usr/include/ffi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- inc_dirs.append('/usr/include/ffi')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not ffi_inc or ffi_inc[0] == '':
</span></pre><pre style='margin:0'>
</pre>