<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/0d5845a1c8a4270913b005433bbb84d779e613c5">https://github.com/macports/macports-ports/commit/0d5845a1c8a4270913b005433bbb84d779e613c5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d5845a1c8a4270913b005433bbb84d779e613c5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Sep 22 09:18:04 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> python27: update to 2.7.14
</span>---
lang/python27/Portfile | 42 +++++++++-------------
.../files/patch-setup.py-disabled_modules.diff | 11 ------
lang/python27/files/patch-setup.py.diff | 35 +++++++++++++-----
3 files changed, 44 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16d4b15..2e6c59f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup select 1.0
</span> name python27
epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.7.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.14
</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,42 +26,42 @@ master_sites ${homepage}ftp/python/${version}/
</span> distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 be09518cdc335314de1c5ebe181690082ce780d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 1f6db41ad91d9eb0a6f0c769b8613c5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 816553f988c661cfe31b6e89a513fdfbf87963d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66
</span>
patchfiles patch-Makefile.pre.in.diff \
patch-setup.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py-disabled_modules.diff \
</span> patch-Lib-cgi.py.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-configure.diff \
patch-libedit.diff \
enable-loadable-sqlite-extensions.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 \
</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> port:db48 \
<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> port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libedit
</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:zlib
</span> depends_run port:python_select \
port:python2_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable-ipv6 for now, getaddrinfo-function missing
</span> configure.args --enable-framework=${frameworks_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ipv6 \
</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.cppflags-append -I${prefix}/include/db48
configure.ldflags-append -L${prefix}/lib/db48
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# signed integer overflow is normally undefined as per the C spec, but python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# needs it to be defined as twos-complement
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fwrapv
</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;'>@@ -82,10 +81,6 @@ test.target test
</span>
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 python2 python2-$pythonNoDot $pythonNoDot]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,15 +131,13 @@ platform darwin {
</span> }
variant universal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This patch will need updating when 2.7.6 is released, as ARCH_RUN_32BIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # will once again be used for something. See ticket #39270.
</span> patchfiles-append patch-configure-universal.diff
post-patch {
reinplace \
"s|__UNIVERSAL_ARCHFLAGS__|${configure.universal_cflags}|" \
${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;'>@@ -156,6 +149,5 @@ variant ucs4 description {Enable support for UCS4} {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.url ${homepage}downloads/
</span> livecheck.url ${homepage}downloads/
livecheck.regex Python (${branch}(?:\\.\\d+)*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/patch-setup.py-disabled_modules.diff b/lang/python27/files/patch-setup.py-disabled_modules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a16644f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/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 2013-05-20 03:35:48.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2013-05-20 03:37:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,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' (at the front) if
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/patch-setup.py.diff b/lang/python27/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c3b135d..170b883 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -454,10 +454,6 @@ class PyBuildExt(build_ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2017-09-17 03:38:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-09-22 08:06:01.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,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:#e0ffe0;'>+
</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' (at the front) if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -454,10 +454,6 @@
</span> os.unlink(tmpfile)
def detect_modules(self):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +20,7 @@ Index: setup.py
</span> if cross_compiling:
self.add_gcc_paths()
self.add_multiarch_paths()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -808,10 +804,7 @@ class PyBuildExt(build_ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,10 +804,7 @@
</span> depends=['socketmodule.h'],
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +32,7 @@ Index: setup.py
</span> ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -821,9 +814,7 @@ class PyBuildExt(build_ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -821,9 +814,7 @@
</span> if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +43,7 @@ Index: setup.py
</span>
if (ssl_incs is not None and
ssl_libs is not None):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -944,34 +935,7 @@ class PyBuildExt(build_ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -944,34 +935,7 @@
</span>
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,3 +79,15 @@ Index: setup.py
</span>
if cross_compiling:
db_inc_paths = []
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2125,11 +2089,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not '--with-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><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if host_platform == 'darwin':
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not ffi_inc or ffi_inc[0] == '':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffi_inc = find_file('ffi.h', [], inc_dirs)
</span></pre><pre style='margin:0'>
</pre>