<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[152946] trunk/dports/lang/python27/files</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/152946">152946</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-09-20 22:00:25 -0700 (Tue, 20 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>python27: Refresh patches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython27filespatchIncludepyporthdiff">trunk/dports/lang/python27/files/patch-Include-pyport.h.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchLibcgipydiff">trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchLibctypesmacholibdyldpydiff">trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchMakefilepreindiff">trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchconfigurediff">trunk/dports/lang/python27/files/patch-configure.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchlibeditdiff">trunk/dports/lang/python27/files/patch-libedit.diff</a></li>
<li><a href="#trunkdportslangpython27filespatchsetuppydiff">trunk/dports/lang/python27/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython27filespatchIncludepyporthdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-Include-pyport.h.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-Include-pyport.h.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Include-pyport.h.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- Include/pyport.h.orig 2014-06-29 21:05:24.000000000 -0500
-+++ Include/pyport.h 2014-07-11 13:36:52.000000000 -0500
-@@ -713,6 +713,12 @@
</del><ins>+Index: Include/pyport.h
+===================================================================
+--- Include/pyport.h.orig
++++ Include/pyport.h
+@@ -713,6 +713,12 @@ extern int fdatasync(int);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
</span><span class="lines">@@ -13,7 +15,7 @@
</span><span class="cx"> #include <ctype.h>
</span><span class="cx"> #include <wctype.h>
</span><span class="cx"> #undef isalnum
</span><del>-@@ -730,6 +736,7 @@
</del><ins>+@@ -730,6 +736,7 @@ extern int fdatasync(int);
</ins><span class="cx"> #undef toupper
</span><span class="cx"> #define toupper(c) towupper(btowc(c))
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchLibcgipydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Lib-cgi.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>---- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
-+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
</del><ins>+Index: Lib/cgi.py
+===================================================================
+--- Lib/cgi.py.orig
++++ Lib/cgi.py
</ins><span class="cx"> @@ -1,13 +1,6 @@
</span><span class="cx"> -#! /usr/local/bin/python
</span><span class="cx"> +#! @@PREFIX@@/bin/python2.7
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchLibctypesmacholibdyldpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- Lib/ctypes/macholib/dyld.py.orig 2008-02-21 11:52:20.000000000 -0700
-+++ Lib/ctypes/macholib/dyld.py 2009-10-11 02:42:21.000000000 -0600
-@@ -26,7 +26,7 @@
</del><ins>+Index: Lib/ctypes/macholib/dyld.py
+===================================================================
+--- Lib/ctypes/macholib/dyld.py.orig
++++ Lib/ctypes/macholib/dyld.py
+@@ -23,7 +23,7 @@ DEFAULT_FRAMEWORK_FALLBACK = [
</ins><span class="cx">
</span><span class="cx"> DEFAULT_LIBRARY_FALLBACK = [
</span><span class="cx"> os.path.expanduser("~/lib"),
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchMakefilepreindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- Makefile.pre.in.orig 2013-11-11 10:06:36.000000000 +0200
-+++ Makefile.pre.in 2013-11-11 10:08:02.000000000 +0200
-@@ -461,7 +461,7 @@
</del><ins>+Index: Makefile.pre.in
+===================================================================
+--- Makefile.pre.in.orig
++++ Makefile.pre.in
+@@ -546,7 +546,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
</ins><span class="cx"> esac; \
</span><span class="cx"> $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
</span><span class="cx"> _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
</span><span class="lines">@@ -9,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> # Build static library
</span><span class="cx"> # avoid long command lines, same as LIBRARY_OBJS
</span><del>-@@ -1138,7 +1138,7 @@
</del><ins>+@@ -1265,7 +1265,7 @@ libainstall: all python-config
</ins><span class="cx"> # Install the dynamically loadable modules
</span><span class="cx"> # This goes into $(exec_prefix)
</span><span class="cx"> sharedinstall: sharedmods
</span><span class="lines">@@ -18,7 +20,7 @@
</span><span class="cx"> --prefix=$(prefix) \
</span><span class="cx"> --install-scripts=$(BINDIR) \
</span><span class="cx"> --install-platlib=$(DESTSHARED) \
</span><del>-@@ -1212,7 +1212,7 @@
</del><ins>+@@ -1339,7 +1339,7 @@ frameworkinstallextras:
</ins><span class="cx"> # This installs a few of the useful scripts in Tools/scripts
</span><span class="cx"> scriptsinstall:
</span><span class="cx"> SRCDIR=$(srcdir) $(RUNSHARED) \
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-configure.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-configure.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-configure.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- configure.orig 2010-11-01 12:47:19.000000000 +1100
-+++ configure 2011-05-14 01:51:04.000000000 +1000
-@@ -2914,6 +2914,8 @@
</del><ins>+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -3149,6 +3149,8 @@ if test "${enable_framework+set}" = set;
</ins><span class="cx"> ;
</span><span class="cx"> esac
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchlibeditdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-libedit.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-libedit.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-libedit.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- configure.orig 2013-05-20 03:42:25.000000000 +1000
-+++ configure 2013-05-20 03:49:42.000000000 +1000
-@@ -13447,9 +13447,9 @@
</del><ins>+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -13756,9 +13756,9 @@ py_cv_lib_readline=no
</ins><span class="cx"> $as_echo_n "checking how to link readline libs... " >&6; }
</span><span class="cx"> for py_libtermcap in "" ncursesw ncurses curses termcap; do
</span><span class="cx"> if test -z "$py_libtermcap"; then
</span><span class="lines">@@ -12,7 +14,7 @@
</span><span class="cx"> fi
</span><span class="cx"> LIBS="$READLINE_LIBS $LIBS_no_readline"
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><del>-@@ -13493,13 +13493,13 @@
</del><ins>+@@ -13802,13 +13802,13 @@ $as_echo "#define HAVE_LIBREADLINE 1" >>
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 2.1
</span><span class="lines">@@ -29,7 +31,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13539,7 +13539,7 @@
</del><ins>+@@ -13848,7 +13848,7 @@ fi
</ins><span class="cx"> # check for readline 2.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -38,7 +40,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -13552,7 +13552,7 @@
</del><ins>+@@ -13861,7 +13861,7 @@ if test $have_readline = yes
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -47,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -13565,7 +13565,7 @@
</del><ins>+@@ -13874,7 +13874,7 @@ rm -f conftest*
</ins><span class="cx">
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -56,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -13579,13 +13579,13 @@
</del><ins>+@@ -13888,13 +13888,13 @@ rm -f conftest*
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 4.0
</span><span class="lines">@@ -73,7 +75,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13623,13 +13623,13 @@
</del><ins>+@@ -13932,13 +13932,13 @@ fi
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # also in 4.0
</span><span class="lines">@@ -90,7 +92,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13667,13 +13667,13 @@
</del><ins>+@@ -14020,13 +14020,13 @@ fi
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # check for readline 4.2
</span><span class="lines">@@ -107,7 +109,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13713,7 +13713,7 @@
</del><ins>+@@ -14066,7 +14066,7 @@ fi
</ins><span class="cx"> # also in readline 4.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -116,7 +118,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -13726,7 +13726,7 @@
</del><ins>+@@ -14079,7 +14079,7 @@ if test $have_readline = yes
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -125,9 +127,11 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>---- setup.py.orig 2013-05-20 03:42:24.000000000 +1000
-+++ setup.py 2013-05-20 03:52:00.000000000 +1000
-@@ -696,7 +696,7 @@
</del><ins>+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -719,7 +719,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> missing.extend(['imageop'])
</span><span class="cx">
</span><span class="cx"> # readline
</span><span class="lines">@@ -136,7 +140,7 @@
</span><span class="cx"> readline_termcap_library = ""
</span><span class="cx"> curses_library = ""
</span><span class="cx"> # Determine if readline is already linked against curses or tinfo.
</span><del>-@@ -747,7 +747,7 @@
</del><ins>+@@ -772,7 +772,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> else:
</span><span class="cx"> readline_extra_link_args = ()
</span><span class="cx">
</span><span class="lines">@@ -145,8 +149,10 @@
</span><span class="cx"> if readline_termcap_library:
</span><span class="cx"> pass # Issue 7384: Already linked against curses or tinfo.
</span><span class="cx"> elif curses_library:
</span><del>---- Modules/readline.c.orig 2013-05-12 13:32:51.000000000 +1000
-+++ Modules/readline.c 2013-05-20 03:59:17.000000000 +1000
</del><ins>+Index: Modules/readline.c
+===================================================================
+--- Modules/readline.c.orig
++++ Modules/readline.c
</ins><span class="cx"> @@ -28,8 +28,7 @@
</span><span class="cx">
</span><span class="cx"> /* GNU readline definitions */
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/files/patch-setup.py.diff (152945 => 152946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-setup.py.diff 2016-09-21 04:10:40 UTC (rev 152945)
+++ trunk/dports/lang/python27/files/patch-setup.py.diff 2016-09-21 05:00:25 UTC (rev 152946)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- setup.py.orig 2013-11-12 12:57:03.000000000 +0200
-+++ setup.py 2013-11-12 13:03:25.000000000 +0200
-@@ -436,10 +436,6 @@
</del><ins>+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -454,10 +454,6 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> os.unlink(tmpfile)
</span><span class="cx">
</span><span class="cx"> def detect_modules(self):
</span><span class="lines">@@ -11,7 +13,7 @@
</span><span class="cx"> if cross_compiling:
</span><span class="cx"> self.add_gcc_paths()
</span><span class="cx"> self.add_multiarch_paths()
</span><del>-@@ -784,10 +780,7 @@
</del><ins>+@@ -808,10 +804,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> depends=['socketmodule.h'],
</span><span class="cx"> libraries=math_libs) )
</span><span class="cx"> # Detect SSL support for the socket module (via _ssl)
</span><span class="lines">@@ -23,7 +25,7 @@
</span><span class="cx"> ssl_incs = find_file('openssl/ssl.h', inc_dirs,
</span><span class="cx"> search_for_ssl_incs_in
</span><span class="cx"> )
</span><del>-@@ -797,9 +790,7 @@
</del><ins>+@@ -821,9 +814,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> if krb5_h:
</span><span class="cx"> ssl_incs += krb5_h
</span><span class="cx"> ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
</span><span class="lines">@@ -34,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> if (ssl_incs is not None and
</span><span class="cx"> ssl_libs is not None):
</span><del>-@@ -920,34 +911,7 @@
</del><ins>+@@ -944,34 +935,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx">
</span><span class="cx"> # construct a list of paths to look for the header file in on
</span><span class="cx"> # top of the normal inc_dirs.
</span></span></pre>
</div>
</div>
</body>
</html>