Changeset 97929

Timestamp:

Sep 20, 2012, 9:59:08 AM (12 years ago)

Author:

ryandesign@…

Message:

py-virtualenv: fix installation of py25-virtualenv, and remove superfluous duplicate files in py26-virtualenv and up, by generalizing the fix that was confined to the py24-virtualenv subport; disable livecheck in subports

File:

• trunk/dports/python/py-virtualenv/Portfile (modified) (4 diffs)

trunk/dports/python/py-virtualenv/Portfile

@@ -9 +9 @@
 set real_name       virtualenv
 version             1.8.2
+revision            1
 maintainers         akitada openmaintainer
 
@@ -29 +30 @@
 subport py24-virtualenv {
     version             1.7.2
+    revision            0
     distname            ${real_name}-${version}
     checksums           rmd160  bdd0c3ef92ed2b954ee60a4d4df31dc1c17e4b1e \
                         sha256  8cbbe308ab0f446a4ceacf24b2656bedd33ea22825b0750fd079766cc6e91bf4
-    python.move_binaries    no
-    post-destroot {
-        delete ${destroot}${prefix}/bin/virtualenv
-    }
 }
 
@@ -44 +42 @@
     select.file         ${filespath}/virtualenv${python.version}
 
+    # The virtualenv build process creates both virtualenv and virtualenv-${python.branch}
+    # but we only want one. We cannot keep the unsuffixed one, because by the time the port's
+    # post-destroot block runs, the portgroup's post-destroot block (which creates suffixed
+    # versions by renaming or symlinking) has already run. Therefore we will keep the
+    # suffixed one and tell the portgroup not to create its own suffixed versions.
+    python.link_binaries_suffix
+    python.move_binaries no
+    
     post-destroot {
+        delete ${destroot}${prefix}/bin/virtualenv
+        if {${prefix} != ${python.prefix}} {
+            delete ${destroot}${python.prefix}/bin/virtualenv
+        }
+        
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
         foreach f [glob -directory ${worksrcpath}/docs *] {
@@ -50 +61 @@
         }
     }
+    
+    livecheck.type      none
 } else {
     livecheck.type      regex