[115840] trunk/dports/python/py-pip/Portfile

[stromnov at macports.org]

Revision: 115840
          https://trac.macports.org/changeset/115840
Author:   stromnov at macports.org
Date:     2014-01-12 13:00:42 -0800 (Sun, 12 Jan 2014)
Log Message:
-----------
py-pip: fix conflicts between subports

Modified Paths:
--------------
    trunk/dports/python/py-pip/Portfile

Modified: trunk/dports/python/py-pip/Portfile
===================================================================
--- trunk/dports/python/py-pip/Portfile	2014-01-12 20:12:19 UTC (rev 115839)
+++ trunk/dports/python/py-pip/Portfile	2014-01-12 21:00:42 UTC (rev 115840)
@@ -6,6 +6,7 @@
 
 name                py-pip
 version             1.5
+revision            1
 categories-append   www
 license             MIT
 platforms           darwin
@@ -42,16 +43,24 @@
 if {${name} ne ${subport}} {
     depends_lib-append  port:py${python.version}-setuptools
 
-    python.link_binaries_suffix
-    python.move_binaries no
-    post-destroot {
-        copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${subport}
-        delete ${destroot}${prefix}/bin/pip
+    if {${subport} eq "py25-pip"} {
+        python.link_binaries_suffix
+        python.move_binaries no
+        post-destroot {
+            copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${subport}
+            delete ${destroot}${prefix}/bin/pip
+        }
+    } else {
+        post-destroot {
+            eval xinstall -m 644 [glob ${worksrcpath}/docs/*] ${destroot}${prefix}/share/doc/${subport}
+            delete ${destroot}${prefix}/bin/pip[string range ${python.version} 0 end-1]-${python.branch}
+            delete ${destroot}${prefix}/bin/pip${python.branch}-${python.branch}
+        }
     }
 
     livecheck.type      none
 } else {
     livecheck.type      regex
     livecheck.url       ${master_sites}
-    livecheck.regex     "pip-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+    livecheck.regex     {pip-(\d+(?:\.\d+)*)\.[tz]}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140112/efd3ebf7/attachment.html>