<!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>[151001] trunk/dports/lang/python35/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/151001">151001</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-05 06:59:53 -0700 (Fri, 05 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>python35: fix line numbers and fuzz in patchfiles</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython35filesomitlocalsitepackagespatch">trunk/dports/lang/python35/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython35filespatchLibcgipydiff">trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchLibctypesmacholibdyldpydiff">trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchconfigurediff">trunk/dports/lang/python35/files/patch-configure.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchlibeditdiff">trunk/dports/lang/python35/files/patch-libedit.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchsetuppydisabled_modulesdiff">trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchsetuppydiff">trunk/dports/lang/python35/files/patch-setup.py.diff</a></li>
<li><a href="#trunkdportslangpython35filespatchxcode4bugdiff">trunk/dports/lang/python35/files/patch-xcode4bug.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython35filesomitlocalsitepackagespatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/omit-local-site-packages.patch (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/omit-local-site-packages.patch 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/omit-local-site-packages.patch 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,8 +1,6 @@
</span><del>-Index: Lib/site.py
-===================================================================
</del><span class="cx"> --- Lib/site.py.orig
</span><span class="cx"> +++ Lib/site.py
</span><del>-@@ -311,15 +311,6 @@ def getsitepackages(prefixes=None):
</del><ins>+@@ -309,15 +309,6 @@ def getsitepackages(prefixes=None):
</ins><span class="cx"> else:
</span><span class="cx"> sitepackages.append(prefix)
</span><span class="cx"> sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchLibcgipydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-Lib-cgi.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,5 +1,5 @@
</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>+--- 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/python3.2
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchLibctypesmacholibdyldpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-Lib-ctypes-macholib-dyld.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,11 +1,11 @@
</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>+--- 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 class="cx"> - "/usr/local/lib",
</span><del>-+ "@@PREFIX@@/lib",
</del><ins>++ "/opt/local/lib",
</ins><span class="cx"> "/lib",
</span><span class="cx"> "/usr/lib",
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-configure.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-configure.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-configure.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2012-08-13 17:08:58.000000000 +0300
-+++ configure 2012-08-13 17:11:07.000000000 +0300
-@@ -3145,6 +3145,8 @@
</del><ins>+--- configure.orig
++++ configure
+@@ -3250,6 +3250,8 @@
</ins><span class="cx"> ;
</span><span class="cx"> esac
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchlibeditdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-libedit.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-libedit.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-libedit.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2013-10-23 21:50:49.000000000 +0300
-+++ configure 2013-10-23 22:03:14.000000000 +0300
-@@ -13882,9 +13882,9 @@
</del><ins>+--- configure.orig
++++ configure
+@@ -14760,9 +14762,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 "" tinfo ncursesw ncurses curses termcap; do
</span><span class="cx"> if test -z "$py_libtermcap"; then
</span><span class="lines">@@ -12,7 +12,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>-@@ -13928,13 +13928,13 @@
</del><ins>+@@ -14806,13 +14808,13 @@ $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 2.1
</span><span class="lines">@@ -29,7 +29,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>-@@ -13974,7 +13974,7 @@
</del><ins>+@@ -14852,7 +14854,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 +38,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>-@@ -13987,7 +13987,7 @@
</del><ins>+@@ -14865,7 +14867,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 +47,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>-@@ -14000,7 +14000,7 @@
</del><ins>+@@ -14878,7 +14880,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 +56,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>-@@ -14014,13 +14014,13 @@
</del><ins>+@@ -14892,13 +14894,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 +73,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>-@@ -14058,13 +14058,13 @@
</del><ins>+@@ -14936,13 +14938,13 @@ fi
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # also in 4.0
</span><span class="lines">@@ -90,7 +90,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>-@@ -14102,13 +14102,13 @@
</del><ins>+@@ -15024,13 +15026,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 +107,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>-@@ -14148,7 +14148,7 @@
</del><ins>+@@ -15070,7 +15072,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 +116,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>-@@ -14161,7 +14161,7 @@
</del><ins>+@@ -15083,7 +15085,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,10 +125,10 @@
</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-10-23 21:50:56.000000000 +0300
-+++ setup.py 2013-10-23 22:06:11.000000000 +0300
-@@ -646,7 +646,7 @@
- exts.append( Extension('audioop', ['audioop.c']) )
</del><ins>+--- setup.py.orig
++++ setup.py
+@@ -708,7 +708,7 @@ class PyBuildExt(build_ext):
+ libraries=math_libs) )
</ins><span class="cx">
</span><span class="cx"> # readline
</span><span class="cx"> - do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> readline_termcap_library = ""
</span><span class="cx"> curses_library = ""
</span><span class="cx"> # Cannot use os.popen here in py3k.
</span><del>-@@ -710,7 +710,7 @@
</del><ins>+@@ -774,7 +774,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 +145,8 @@
</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-10-23 21:51:09.000000000 +0300
-+++ Modules/readline.c 2013-10-23 22:10:09.000000000 +0300
</del><ins>+--- Modules/readline.c.orig
++++ Modules/readline.c
</ins><span class="cx"> @@ -29,8 +29,7 @@
</span><span class="cx">
</span><span class="cx"> /* GNU readline definitions */
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchsetuppydisabled_modulesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-setup.py-disabled_modules.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- setup.py.orig 2011-07-09 16:58:56.000000000 +1000
-+++ setup.py 2011-07-13 20:50:12.000000000 +1000
-@@ -21,7 +21,7 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
</del><ins>+--- setup.py.orig
++++ setup.py
+@@ -44,7 +44,7 @@ host_platform = get_platform()
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
</ins><span class="cx">
</span><span class="cx"> # This global variable is used to hold the list of modules to be disabled.
</span><span class="cx"> -disabled_module_list = []
</span><span class="cx"> +disabled_module_list = ["_tkinter", "_gdbm"]
</span><span class="cx">
</span><del>- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
</del><ins>+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (after any relative
</ins></span></pre></div>
<a id="trunkdportslangpython35filespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-setup.py.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-setup.py.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-setup.py.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- setup.py.orig 2012-08-13 17:01:43.000000000 +0300
-+++ setup.py 2012-08-13 17:06:17.000000000 +0300
-@@ -1576,7 +1576,7 @@
</del><ins>+--- setup.py.orig
++++ setup.py
+@@ -1695,7 +1695,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> # For 8.4a2, the X11 headers are not included. Rather than include a
</span><span class="cx"> # complicated search, this is a hard-coded path. It could bail out
</span><span class="cx"> # if X11 libs are not found...
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx"> frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
</span><span class="cx">
</span><span class="cx"> # All existing framework builds of Tcl/Tk don't support 64-bit
</span><del>-@@ -1621,13 +1621,6 @@
- def detect_tkinter(self, inc_dirs, lib_dirs):
- # The _tkinter module.
</del><ins>+@@ -1746,13 +1746,6 @@ class PyBuildExt(build_ext):
+ if self.detect_tkinter_explicitly():
+ return
</ins><span class="cx">
</span><span class="cx"> - # Rather than complicate the code below, detecting and building
</span><span class="cx"> - # AquaTk is a separate method. Only one Tkinter will be built on
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> # Assume we haven't found any of the libraries or include files
</span><span class="cx"> # The versions with dots are used on Unix, and the versions without
</span><span class="cx"> # dots on Windows, for detection by cygwin.
</span><del>-@@ -1676,17 +1669,17 @@
</del><ins>+@@ -1801,17 +1794,17 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> if host_platform == 'sunos5':
</span><span class="cx"> include_dirs.append('/usr/openwin/include')
</span><span class="cx"> added_lib_dirs.append('/usr/openwin/lib')
</span></span></pre></div>
<a id="trunkdportslangpython35filespatchxcode4bugdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/files/patch-xcode4bug.diff (151000 => 151001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/files/patch-xcode4bug.diff 2016-08-05 13:48:26 UTC (rev 151000)
+++ trunk/dports/lang/python35/files/patch-xcode4bug.diff 2016-08-05 13:59:53 UTC (rev 151001)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><del>-@@ -16238,6 +16240,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</del><ins>+@@ -16240,6 +16242,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</ins><span class="cx"> volatile int val = 1;
</span><span class="cx"> int main() {
</span><span class="cx"> __atomic_load_n(&val, __ATOMIC_SEQ_CST);
</span></span></pre>
</div>
</div>
</body>
</html>