<!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>[115844] trunk/dports/python/py-pip</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/115844">115844</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2014-01-12 14:28:25 -0800 (Sun, 12 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>py-pip: compatibility with pip_select (#38016)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypipPortfile">trunk/dports/python/py-pip/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-pip/files/</li>
<li><a href="#trunkdportspythonpypipfilespip25">trunk/dports/python/py-pip/files/pip25</a></li>
<li><a href="#trunkdportspythonpypipfilespip26">trunk/dports/python/py-pip/files/pip26</a></li>
<li><a href="#trunkdportspythonpypipfilespip27">trunk/dports/python/py-pip/files/pip27</a></li>
<li><a href="#trunkdportspythonpypipfilespip31">trunk/dports/python/py-pip/files/pip31</a></li>
<li><a href="#trunkdportspythonpypipfilespip32">trunk/dports/python/py-pip/files/pip32</a></li>
<li><a href="#trunkdportspythonpypipfilespip33">trunk/dports/python/py-pip/files/pip33</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypipPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pip/Portfile (115843 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/Portfile        2014-01-12 22:21:58 UTC (rev 115843)
+++ trunk/dports/python/py-pip/Portfile        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -3,10 +3,13 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> PortGroup           python 1.0
</span><ins>+PortGroup           select 1.0
</ins><span class="cx"> 
</span><del>-name                py-pip
</del><ins>+set realname        pip
+
+name                py-${realname}
</ins><span class="cx"> version             1.5
</span><del>-revision            1
</del><ins>+revision            2
</ins><span class="cx"> categories-append   www
</span><span class="cx"> license             MIT
</span><span class="cx"> platforms           darwin
</span><span class="lines">@@ -17,6 +20,7 @@
</span><span class="cx"> maintainers         stromnov openmaintainer
</span><span class="cx"> 
</span><span class="cx"> description         A tool for installing and managing Python packages.
</span><ins>+
</ins><span class="cx"> long_description    pip is a replacement for easy_install. It uses mostly the \
</span><span class="cx">                     same techniques for finding packages, so packages that \
</span><span class="cx">                     were made easy_installable should be pip-installable as \
</span><span class="lines">@@ -25,7 +29,7 @@
</span><span class="cx"> homepage            http://www.pip-installer.org/
</span><span class="cx"> master_sites        http://pypi.python.org/packages/source/p/pip/
</span><span class="cx"> 
</span><del>-distname            pip-${version}
</del><ins>+distname            ${realname}-${version}
</ins><span class="cx"> 
</span><span class="cx"> checksums           rmd160  86601d0f22920108f7077422ad23bfc062727510 \
</span><span class="cx">                     sha256  25f81d1a0e55d3b1709818dd57fdfb954b028f229f09bd69cb0bc80a8e03e048
</span><span class="lines">@@ -33,8 +37,8 @@
</span><span class="cx"> # Last version (1.3.1) with py25 support
</span><span class="cx"> subport py25-pip {
</span><span class="cx">     version             1.3.1
</span><del>-    revision            0
-    distname            pip-${version}
</del><ins>+    revision            1
+    distname            ${realname}-${version}
</ins><span class="cx">     checksums           rmd160  0bfbfbc536abcf20f952b444ee872128406e098e \
</span><span class="cx">                         sha256  145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957
</span><span class="cx">     livecheck.type      none
</span><span class="lines">@@ -42,8 +46,9 @@
</span><span class="cx"> 
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx">     depends_lib-append  port:py${python.version}-setuptools
</span><ins>+    depends_run         port:pip_select
</ins><span class="cx"> 
</span><del>-    if {${subport} eq &quot;py25-pip&quot;} {
</del><ins>+    if {${subport} eq &quot;py25-${realname}&quot;} {
</ins><span class="cx">         python.link_binaries_suffix
</span><span class="cx">         python.move_binaries no
</span><span class="cx">         post-destroot {
</span><span class="lines">@@ -58,6 +63,16 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    select.group            ${realname}
+    select.file             ${filespath}/${realname}${python.version}
+
+    notes &quot;
+    To make the Python ${python.branch} version of pip the one that is run\
+    when you execute the commands without a version suffix, e.g. 'pip', run:
+
+    port select --set ${select.group} [file tail ${select.file}]
+    &quot;
+
</ins><span class="cx">     livecheck.type      none
</span><span class="cx"> } else {
</span><span class="cx">     livecheck.type      regex
</span></span></pre></div>
<a id="trunkdportspythonpypipfilespip25"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip25 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip25                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip25        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+bin/pip-2.5
</ins></span></pre></div>
<a id="trunkdportspythonpypipfilespip26"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip26 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip26                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip26        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+${frameworks_dir}/Python.framework/Versions/2.6/bin/pip
</ins></span></pre></div>
<a id="trunkdportspythonpypipfilespip27"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip27 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip27                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip27        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+${frameworks_dir}/Python.framework/Versions/2.7/bin/pip
</ins></span></pre></div>
<a id="trunkdportspythonpypipfilespip31"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip31 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip31                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip31        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+${frameworks_dir}/Python.framework/Versions/3.1/bin/pip
</ins></span></pre></div>
<a id="trunkdportspythonpypipfilespip32"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip32 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip32                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip32        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+${frameworks_dir}/Python.framework/Versions/3.2/bin/pip
</ins></span></pre></div>
<a id="trunkdportspythonpypipfilespip33"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pip/files/pip33 (0 => 115844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pip/files/pip33                                (rev 0)
+++ trunk/dports/python/py-pip/files/pip33        2014-01-12 22:28:25 UTC (rev 115844)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+${frameworks_dir}/Python.framework/Versions/3.3/bin/pip
</ins></span></pre>
</div>
</div>

</body>
</html>