<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/ded2645de7cf9f40dddb0e7b1a98ce2c4224750e">https://github.com/macports/macports-ports/commit/ded2645de7cf9f40dddb0e7b1a98ce2c4224750e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ded2645de7cf9f40dddb0e7b1a98ce2c4224750e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Sep 22 10:35:13 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> python33: update to 3.3.7
</span>---
lang/python33/Portfile | 20 ++-----
.../files/patch-setup.py-disabled_modules.diff | 11 ----
lang/python33/files/patch-setup.py.diff | 66 ++++++----------------
3 files changed, 23 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/Portfile b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de20b19..bf6ab6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,9 @@ PortGroup select 1.0
</span>
name python33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> epoch 20141012
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.7
</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,22 +20,19 @@ 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:#ffe0e0;'>-#master_sites ${homepage}ftp/python/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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 e45909eedf3648408ef8b34775ab24654181d9bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5226e4bf7a530c3ff2bcde0c94e0e09e59a8bcde0114fe0268bc925bdabb5d3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 84e2f12f044ca53b577f6224c53f82ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3a915ea86ef3826fc0483eb94a2b4e2b9ad787b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 85f60c327501c36bc18c33370c14d472801e6af2f901dafbba056f61685429fe
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-Lib-distutils-dist.py.diff \
patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py-disabled_modules.diff \
</span> patch-libedit.diff \
omit-local-site-packages.patch \
patch-Include-pyport.h.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,8 +57,6 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --with-computed-gotos
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;'>@@ -172,6 +165,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/python33/files/patch-setup.py-disabled_modules.diff b/lang/python33/files/patch-setup.py-disabled_modules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1950398..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/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 2011-07-09 16:58:56.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2011-07-13 20:50:12.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
</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;'>- # File which contains the directory for shared mods (for sys.path fixup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # when running from the build dir, see Modules/getpath.c)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/files/patch-setup.py.diff b/lang/python33/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 16b544e..53da26e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2012-08-13 17:01:43.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2012-08-13 17:06:17.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1576,7 +1576,7 @@
</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;'>-+ #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-09-19 17:32:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-09-22 10:19:34.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,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;'>-@@ -1621,13 +1621,6 @@
</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;'>+@@ -1667,6 +1667,9 @@
</span> def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Rather than complicate the code below, detecting and building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # AquaTk is a separate method. Only one Tkinter will be built on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Darwin - either AquaTk, if it is found, or X11 based Tk.
</span><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:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume we haven't found any of the libraries or include files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The versions with dots are used on Unix, and the versions without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dots on Windows, for detection by cygwin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1676,17 +1669,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_platform == 'sunos5':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs.append('/usr/openwin/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- added_lib_dirs.append('/usr/openwin/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R6/include'):
</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;'>-- added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R6/include'):
</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;'>-+ # added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume default location for X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If Cygwin, then verify that X is installed before proceeding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_platform == 'cygwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Skip building; provided by a separate port in MacPorts.
</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;'>+ # Check whether --with-tcltk-includes and --with-tcltk-libs were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configured or passed into the make target. If so, use these values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to build tkinter and bypass the searches for Tcl and TK in standard
</span></pre><pre style='margin:0'>
</pre>