<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/229ec9a78c622e98a6d4669fa3cb389fc8c0d458">https://github.com/macports/macports-ports/commit/229ec9a78c622e98a6d4669fa3cb389fc8c0d458</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 229ec9a78c622e98a6d4669fa3cb389fc8c0d458
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Oct 6 08:56:47 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> python36: update to 3.6.3
</span>---
lang/python36/Portfile | 54 +++++++++-------------
.../files/patch-setup.py-disabled_modules.diff | 11 -----
lang/python36/files/patch-setup.py.diff | 42 +++++++++++++----
3 files changed, 55 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef55ca2..6df03d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,9 @@ PortGroup select 1.0
</span>
name python36
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> epoch 20170717
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.3
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,30 +20,34 @@ description An interpreted, object-oriented programming language
</span> long_description Python is an interpreted, interactive, object-oriented \
programming language.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.python.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.python.org/
</span> master_sites ${homepage}ftp/python/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites ${homepage}ftp/python/3.6.0/
</span>
distname Python-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 243d052f3e54426d77d41b33d01adba598dc4d65 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 b9c2c36c33fb89bda1fefd37ad5af9be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b29962b7233c74149670d8b83284d4265de5e769 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py-disabled_modules.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
omit-local-site-packages.patch \
patch-configure-xcode4bug.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 port:libedit port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span> depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,12 +60,12 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --enable-ipv6 \
--enable-loadable-sqlite-extensions \
--with-computed-gotos \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ensurepip=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ensurepip=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-system-expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-system-ffi
</span>
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
${worksrcpath}/Lib/cgi.py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,18 +80,11 @@ post-patch {
</span>
build.target all
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# test_cmd_line fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://bugs.python.org/issue4388 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://bugs.python.org/issue4474
</span> test.run yes
test.target test
destroot.target frameworkinstall maninstall
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure that correct compiler is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append MAKE="${build.cmd} CC=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set pythonNoDot python[string map {. {}} $branch]
select.entries [list python python-$pythonNoDot $pythonNoDot] \
[list python3 python3-$pythonNoDot $pythonNoDot]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +94,7 @@ set confdir config-${branch}m
</span> platform darwin {
set confdir config-${branch}m-darwin
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # See http://trac.macports.org/ticket/18376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/18376
</span> system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,13 +146,13 @@ variant universal {
</span> reinplace \
"s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch_run_32bit} != "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch_run_32bit} ne ""} {
</span> reinplace \
"s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
${worksrcpath}/configure
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span> configure.args-append --enable-universalsdk=${configure.sdkroot}
} else {
configure.args-append --enable-universalsdk=/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,8 +169,5 @@ variant universal {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.url ${homepage}downloads/
</span> livecheck.url ${homepage}downloads/source/
livecheck.regex Python (${branch}(?:\\.\\d+)*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#regex below just for test releases, proper above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.regex Python\[ \]+(3.6.0\[abrc\]+\[0-9\])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/files/patch-setup.py-disabled_modules.diff b/lang/python36/files/patch-setup.py-disabled_modules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4f95fc0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/files/patch-setup.py-disabled_modules.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;'>---- setup.py.orig 2017-07-08 13:33:27.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2017-09-10 11:37:43.000000000 +1000
</span><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:#ffe0e0;'>- # This global variable is used to hold the list of modules to be disabled.
</span><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;color:#808080;'>diff --git a/lang/python36/files/patch-setup.py.diff b/lang/python36/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ce71d31..488de5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2017-07-08 13:33:27.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2017-09-10 11:34:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1725,7 +1725,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For 8.4a2, the X11 headers are not included. Rather than include a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # complicated search, this is a hard-coded path. It could bail out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if X11 libs are not found...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2017-10-03 16:52:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-10-06 08:29:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # All existing framework builds of Tcl/Tk don't support 64-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1779,9 +1778,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This global variable is used to hold the list of modules to be disabled.
</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;'>+ def add_dir_to_list(dirlist, dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Add the directory 'dir' to the list 'dirlist' (after any relative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,12 +487,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ['m']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def detect_modules(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Ensure that /usr/local is always used, but the local build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # directories (i.e. '.' and 'Include') must be first. See issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 10520.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not cross_compiling:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only change this for cross builds for 3.3, issues on Mageia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cross_compiling:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.add_gcc_paths()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1782,9 +1776,8 @@
</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:#e0e0e0;'>@@ -20,3 +34,11 @@
</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:#e0ffe0;'>+@@ -2025,7 +2018,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OS X 10.5 comes with libffi.dylib; the include files are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in /usr/include/ffi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inc_dirs.append('/usr/include/ffi')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif '--without-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>