<!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>[126840] trunk/dports/lang</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/126840">126840</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-10-15 21:13:20 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>python{27,3*}: Ignore local site-packages (#34763)
Beginning with 2.7, framework builds of CPython automatically add the
local site-packages directory (e.g., /Library/Python/2.7) to sys.path
(http://bugs.python.org/issue4865). Python 3.1 also adds user-local
site-packages (~/Library/Python/3.1). These behaviors conflict with
MacPorts' general policy of isolationism towards the host system.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython27Portfile">trunk/dports/lang/python27/Portfile</a></li>
<li><a href="#trunkdportslangpython31Portfile">trunk/dports/lang/python31/Portfile</a></li>
<li><a href="#trunkdportslangpython32Portfile">trunk/dports/lang/python32/Portfile</a></li>
<li><a href="#trunkdportslangpython33Portfile">trunk/dports/lang/python33/Portfile</a></li>
<li><a href="#trunkdportslangpython34Portfile">trunk/dports/lang/python34/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpython27filesomitlocalsitepackagespatch">trunk/dports/lang/python27/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython31filesomitlocalsitepackagespatch">trunk/dports/lang/python31/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython32filesomitlocalsitepackagespatch">trunk/dports/lang/python32/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython33filesomitlocalsitepackagespatch">trunk/dports/lang/python33/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython34filesomitlocalsitepackagespatch">trunk/dports/lang/python34/files/omit-local-site-packages.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython27Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/Portfile (126839 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/Portfile 2014-10-16 03:08:24 UTC (rev 126839)
+++ trunk/dports/lang/python27/Portfile 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> epoch 2
</span><span class="cx"> # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
</span><span class="cx"> version 2.7.8
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx">
</span><span class="cx"> set major [lindex [split $version .] 0]
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> patch-Lib-ctypes-macholib-dyld.py.diff \
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-libedit.diff \
</span><del>- patch-Include-pyport.h.diff
</del><ins>+ patch-Include-pyport.h.diff \
+ omit-local-site-packages.patch
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gettext \
</span><span class="cx"> port:zlib \
</span></span></pre></div>
<a id="trunkdportslangpython27filesomitlocalsitepackagespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python27/files/omit-local-site-packages.patch (0 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/omit-local-site-packages.patch (rev 0)
+++ trunk/dports/lang/python27/files/omit-local-site-packages.patch 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -295,15 +295,6 @@ def getsitepackages():
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- from sysconfig import get_config_var
+- framework = get_config_var("PYTHONFRAMEWORK")
+- if framework:
+- sitepackages.append(
+- os.path.join("/Library", framework,
+- sys.version[:3], "site-packages"))
+ return sitepackages
+
+ def addsitepackages(known_paths):
</ins></span></pre></div>
<a id="trunkdportslangpython31Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python31/Portfile (126839 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/Portfile 2014-10-16 03:08:24 UTC (rev 126839)
+++ trunk/dports/lang/python31/Portfile 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> epoch 1
</span><span class="cx"> # Remember to keep py31-tkinter and py31-gdbm's versions sync'd with this
</span><span class="cx"> version 3.1.5
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set major [lindex [split $version .] 0]
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories lang
</span><span class="lines">@@ -34,7 +34,8 @@
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span><span class="cx"> patch-Lib-distutils-dist.py.diff \
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><del>- patch-libedit.diff
</del><ins>+ patch-libedit.diff \
+ omit-local-site-packages.patch
</ins><span class="cx">
</span><span class="cx"> # http://bugs.python.org/issue21811
</span><span class="cx"> patchfiles-append yosemite-configure-fixes.patch \
</span></span></pre></div>
<a id="trunkdportslangpython31filesomitlocalsitepackagespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python31/files/omit-local-site-packages.patch (0 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/omit-local-site-packages.patch (rev 0)
+++ trunk/dports/lang/python31/files/omit-local-site-packages.patch 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -280,18 +280,6 @@ def addsitepackages(known_paths):
+ sitedirs.append(prefix)
+ sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
+
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- if 'Python.framework' in prefix:
+- sitedirs.append(
+- os.path.expanduser(
+- os.path.join("~", "Library", "Python",
+- sys.version[:3], "site-packages")))
+- sitedirs.append(
+- os.path.join("/Library", "Python",
+- sys.version[:3], "site-packages"))
+-
+ for sitedir in sitedirs:
+ if os.path.isdir(sitedir):
+ addsitedir(sitedir, known_paths)
</ins></span></pre></div>
<a id="trunkdportslangpython32Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/Portfile (126839 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/Portfile 2014-10-16 03:08:24 UTC (rev 126839)
+++ trunk/dports/lang/python32/Portfile 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> epoch 20120412
</span><span class="cx"> # Remember to keep py32-tkinter and py32-gdbm's versions sync'd with this
</span><span class="cx"> version 3.2.6
</span><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> set major [lindex [split $version .] 0]
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -35,7 +36,8 @@
</span><span class="cx"> patch-Lib-distutils-dist.py.diff \
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><del>- patch-libedit.diff
</del><ins>+ patch-libedit.diff \
+ omit-local-site-packages.patch
</ins><span class="cx">
</span><span class="cx"> # http://bugs.python.org/issue21811
</span><span class="cx"> patchfiles-append yosemite-configure-fixes.patch \
</span></span></pre></div>
<a id="trunkdportslangpython32filesomitlocalsitepackagespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python32/files/omit-local-site-packages.patch (0 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/omit-local-site-packages.patch (rev 0)
+++ trunk/dports/lang/python32/files/omit-local-site-packages.patch 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -292,15 +292,6 @@ def getsitepackages():
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- from sysconfig import get_config_var
+- framework = get_config_var("PYTHONFRAMEWORK")
+- if framework:
+- sitepackages.append(
+- os.path.join("/Library", framework,
+- sys.version[:3], "site-packages"))
+ return sitepackages
+
+ def addsitepackages(known_paths):
</ins></span></pre></div>
<a id="trunkdportslangpython33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python33/Portfile (126839 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python33/Portfile 2014-10-16 03:08:24 UTC (rev 126839)
+++ trunk/dports/lang/python33/Portfile 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> # Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
</span><span class="cx"> version 3.3.6
</span><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> epoch 20141012
</span><span class="cx">
</span><span class="lines">@@ -38,7 +39,8 @@
</span><span class="cx"> patch-Lib-distutils-dist.py.diff \
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><del>- patch-libedit.diff
</del><ins>+ patch-libedit.diff \
+ omit-local-site-packages.patch
</ins><span class="cx">
</span><span class="cx"> # http://bugs.python.org/issue21811
</span><span class="cx"> patchfiles-append yosemite-configure-fixes.patch \
</span></span></pre></div>
<a id="trunkdportslangpython33filesomitlocalsitepackagespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python33/files/omit-local-site-packages.patch (0 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python33/files/omit-local-site-packages.patch (rev 0)
+++ trunk/dports/lang/python33/files/omit-local-site-packages.patch 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -310,15 +310,6 @@ def getsitepackages(prefixes=None):
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- from sysconfig import get_config_var
+- framework = get_config_var("PYTHONFRAMEWORK")
+- if framework:
+- sitepackages.append(
+- os.path.join("/Library", framework,
+- sys.version[:3], "site-packages"))
+ return sitepackages
+
+ def addsitepackages(known_paths, prefixes=None):
</ins></span></pre></div>
<a id="trunkdportslangpython34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python34/Portfile (126839 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python34/Portfile 2014-10-16 03:08:24 UTC (rev 126839)
+++ trunk/dports/lang/python34/Portfile 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> # Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
</span><span class="cx"> version 3.4.2
</span><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> epoch 20141008
</span><span class="cx">
</span><span class="lines">@@ -36,7 +37,8 @@
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><del>- patch-libedit.diff
</del><ins>+ patch-libedit.diff \
+ omit-local-site-packages.patch
</ins><span class="cx">
</span><span class="cx"> depends_lib port:zlib port:openssl \
</span><span class="cx"> port:sqlite3 port:ncurses \
</span></span></pre></div>
<a id="trunkdportslangpython34filesomitlocalsitepackagespatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python34/files/omit-local-site-packages.patch (0 => 126840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python34/files/omit-local-site-packages.patch (rev 0)
+++ trunk/dports/lang/python34/files/omit-local-site-packages.patch 2014-10-16 04:13:20 UTC (rev 126840)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -311,15 +311,6 @@ def getsitepackages(prefixes=None):
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- from sysconfig import get_config_var
+- framework = get_config_var("PYTHONFRAMEWORK")
+- if framework:
+- sitepackages.append(
+- os.path.join("/Library", framework,
+- sys.version[:3], "site-packages"))
+ return sitepackages
+
+ def addsitepackages(known_paths, prefixes=None):
</ins></span></pre>
</div>
</div>
</body>
</html>