<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/d86b2ba3a4863d1a601351ee8d5446d60a22f544">https://github.com/macports/macports-ports/commit/d86b2ba3a4863d1a601351ee8d5446d60a22f544</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 d86b2ba python34: update to 3.4.8
</span>d86b2ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d86b2ba3a4863d1a601351ee8d5446d60a22f544
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 5 16:43:10 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> python34: update to 3.4.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Likewise py34-gdbm and py34-tkinter.
</span>---
lang/python34/Portfile | 48 +++++++++++++++------------------
lang/python34/files/patch-setup.py.diff | 31 ++++++++++++++++++---
python/py-gdbm/Portfile | 9 ++++---
python/py-tkinter/Portfile | 8 +++---
4 files changed, 60 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/Portfile b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 992c858..d703909 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,9 @@ PortGroup select 1.0
</span>
name python34
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> epoch 20170810
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.8
</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,11 +24,10 @@ homepage https://www.python.org/
</span> master_sites ${homepage}ftp/python/${version}/
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 8c4cde8603a15cd55b59b665a84efd0e8f9d7553 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8714cf2b56dd36922dec8fa184d4936e1001c22fb439798cb73dda069e129d1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 15c44931f2274bfe928d53e0b675a4d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dcdde1eb1917e2fb9bc021288228432b3cb2def4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29a472fa902c7b2add152f5e1e82e0885a8d360645689c1db5d1949a7e8ac3ea
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +37,17 @@ patchfiles patch-setup.py.diff \
</span> omit-local-site-packages.patch \
patch-Include-pyport.h.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;'>@@ -56,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;'>@@ -76,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 https://bugs.python.org/issue4388 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://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;'>@@ -130,7 +127,7 @@ post-destroot {
</span>
platform 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;'>@@ -148,13 +145,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;'>@@ -171,6 +168,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/
livecheck.regex Python (${branch}(?:\\.\\d+)*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/patch-setup.py.diff b/lang/python34/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f031611..e11bae5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2017-08-09 17:08:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2017-09-12 21:20:26.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2018-02-05 10:40:38.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-02-05 16:07:04.000000000 +1100
</span> @@ -39,7 +39,7 @@
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,20 @@
</span>
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (after any relative
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1688,7 +1688,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -447,12 +447,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.unlink(tmpfile)
</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;'>+@@ -1691,7 +1685,8 @@
</span>
def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +32,15 @@
</span> # Check whether --with-tcltk-includes and --with-tcltk-libs were
# configured or passed into the make target. If so, use these values
# to build tkinter and bypass the searches for Tcl and TK in standard
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1937,11 +1932,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><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 eebe2d7..8ac8e71 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;'>@@ -82,13 +82,14 @@ subport py33-gdbm {
</span> }
subport py34-gdbm {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.4.7
</span> epoch 20170810
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8c4cde8603a15cd55b59b665a84efd0e8f9d7553 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8714cf2b56dd36922dec8fa184d4936e1001c22fb439798cb73dda069e129d1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 15c44931f2274bfe928d53e0b675a4d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dcdde1eb1917e2fb9bc021288228432b3cb2def4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29a472fa902c7b2add152f5e1e82e0885a8d360645689c1db5d1949a7e8ac3ea
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c"
livecheck.regex Python (3.4.\[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 8cc8885..f30d68e 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;'>@@ -77,12 +77,14 @@ subport py33-tkinter {
</span> }
subport py34-tkinter {
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.4.7
</span> epoch 20170810
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8c4cde8603a15cd55b59b665a84efd0e8f9d7553 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8714cf2b56dd36922dec8fa184d4936e1001c22fb439798cb73dda069e129d1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 15c44931f2274bfe928d53e0b675a4d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dcdde1eb1917e2fb9bc021288228432b3cb2def4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29a472fa902c7b2add152f5e1e82e0885a8d360645689c1db5d1949a7e8ac3ea
</span> append extract_files " Modules/tkinter.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>