<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/7dbe7c1242d114b2f223f533dd876ccb68a1ca39">https://github.com/macports/macports-ports/commit/7dbe7c1242d114b2f223f533dd876ccb68a1ca39</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7dbe7c1242d114b2f223f533dd876ccb68a1ca39
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 12 22:09:53 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> python34: refresh patches, remove unneeded reinplace
</span>---
lang/python34/Portfile | 5 --
lang/python34/files/patch-libedit.diff | 24 ++++----
.../files/patch-setup.py-disabled_modules.diff | 11 ----
lang/python34/files/patch-setup.py.diff | 66 ++++++----------------
4 files changed, 29 insertions(+), 77 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 b23a4bd..c2abf31 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;'>@@ -34,7 +34,6 @@ checksums rmd160 8c4cde8603a15cd55b59b665a84efd0e8f9d7553 \
</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 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +71,6 @@ post-patch {
</span> # replace /Applications with ${applications_dir}
reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See http://trac.macports.org/changeset/37861
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/PythonLauncher/Makefile.in
</span> }
build.target all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/patch-libedit.diff b/lang/python34/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ed70f0..330b044 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-10-23 21:50:49.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-10-23 22:03:14.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13882,9 +13882,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-08-09 17:08:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-09-12 22:05:21.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14126,9 +14126,9 @@
</span> $as_echo_n "checking how to link readline libs... " >&6; }
for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13928,13 +13928,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14172,13 +14172,13 @@
</span> fi
# check for readline 2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13974,7 +13974,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14218,7 +14218,7 @@
</span> # check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@
</span> _ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13987,7 +13987,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14231,7 +14231,7 @@
</span> then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@
</span>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14000,7 +14000,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14244,7 +14244,7 @@
</span>
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@
</span>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14014,13 +14014,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14258,13 +14258,13 @@
</span> fi
# check for readline 4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14058,13 +14058,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14302,13 +14302,13 @@
</span>
# also in 4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14102,13 +14102,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14346,13 +14346,13 @@
</span>
# check for readline 4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14148,7 +14148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14392,7 +14392,7 @@
</span> # also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@
</span> _ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14161,7 +14161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14405,7 +14405,7 @@
</span> then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/patch-setup.py-disabled_modules.diff b/lang/python34/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/python34/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/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 16b544e..f031611 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,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-08-09 17:08:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-09-12 21:20:26.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,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' (after any relative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1688,7 +1688,8 @@
</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> def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>- # 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;'>+ # 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>