[87328] trunk/dports/python

17 Nov 2011

Revision: 87328
          http://trac.macports.org/changeset/87328
Author:   jmr@macports.org
Date:     2011-11-17 00:09:03 -0800 (Thu, 17 Nov 2011)
Log Message:
-----------
change py-numpy deps to py24-numpy

Modified Paths:
--------------
    trunk/dports/python/py-biopython/Portfile
    trunk/dports/python/py-cairo/Portfile
    trunk/dports/python/py-gnuplot/Portfile
    trunk/dports/python/py-gsl/Portfile
    trunk/dports/python/py-matplotlib/Portfile
    trunk/dports/python/py-nltk/Portfile
    trunk/dports/python/py-pycluster/Portfile
    trunk/dports/python/py-pydicom/Portfile
    trunk/dports/python/py-traits/Portfile

Modified: trunk/dports/python/py-biopython/Portfile
===================================================================

--- trunk/dports/python/py-biopython/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-biopython/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -22,7 +22,7 @@
                 sha1    3db0819d0046cfcd1c9aaf39aa7db40b9aa2645e \
                 rmd160  3e05426017e98cdc45cacfb08b1b5d7c3d4b10ff
 patchfiles		patch-setup.diff
-depends_lib-append	port:py-numpy \
+depends_lib-append	port:py24-numpy \
 				port:py-reportlab \
 				port:flex
 

Modified: trunk/dports/python/py-cairo/Portfile
===================================================================
--- trunk/dports/python/py-cairo/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-cairo/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -28,7 +28,7 @@
 depends_lib     port:python24 \
                 path:lib/pkgconfig/cairo.pc:cairo
 # depends_test
-depends_build-append port:py-numpy
+depends_build-append port:py24-numpy
 
 configure.python    ${prefix}/bin/python2.4
 

Modified: trunk/dports/python/py-gnuplot/Portfile
===================================================================
--- trunk/dports/python/py-gnuplot/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-gnuplot/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -21,7 +21,7 @@
                         sha1    1fab2850cd1881f4ede1f7978a8746af2aff9bb2 \
                         rmd160  0a06385a38e8b34d60d95e37b5d0a13dc682d520
 
-depends_lib-append      port:py-numpy
+depends_lib-append      port:py24-numpy
 depends_run             port:gnuplot
 
 post-destroot {

Modified: trunk/dports/python/py-gsl/Portfile
===================================================================
--- trunk/dports/python/py-gsl/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-gsl/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -32,11 +32,11 @@
     build.args              --array-object=numarray
 }
 variant Numeric conflicts numarray numpy description "Use Numeric as array-object" {
-    depends_lib-append      port:py-numeric
+    depends_lib-append      port:py24-numeric
     build.args              --array-object=Numeric
 }
 variant numpy conflicts numarray Numeric description "Use numpy as array-object" {
-    depends_lib-append      port:py-numpy
+    depends_lib-append      port:py24-numpy
     build.args              --array-object=numpy
 }
 if { ![variant_isset numarray] && ![variant_isset Numeric] } {

Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-matplotlib/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -30,7 +30,7 @@
 if {${subport} == "py24-matplotlib"} {
   depends_lib-append port:py-dateutil \
                      port:py-tz \
-                     port:py-numpy \
+                     port:py24-numpy \
                      port:py-configobj \
                      port:py-pyobjc2 \
                      port:py-pyobjc2-cocoa

Modified: trunk/dports/python/py-nltk/Portfile
===================================================================
--- trunk/dports/python/py-nltk/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-nltk/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -21,7 +21,7 @@
 checksums           sha1    4cd2b834875db6df2662a86a35f90d1e9bb8c1ce \
                     rmd160  2ae4a490b73a7d0dc49412a621ed8223761619ec
 
-depends_lib         port:py-numpy \
+depends_lib         port:py24-numpy \
                     port:py-matplotlib \
                     port:py-yaml
 

Modified: trunk/dports/python/py-pycluster/Portfile
===================================================================
--- trunk/dports/python/py-pycluster/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-pycluster/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -16,7 +16,7 @@
 
 homepage           http://bonsai.ims.u-tokyo.ac.jp/~mdehoon/software/cluster
 
-depends_lib-append  port:py-numpy
+depends_lib-append  port:py24-numpy
 
 master_sites       ${homepage}
 

Modified: trunk/dports/python/py-pydicom/Portfile
===================================================================
--- trunk/dports/python/py-pydicom/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-pydicom/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -33,14 +33,7 @@
                     rmd160  7e63d63f89b0bff900538d3dda72036b6a7397a3
 
 if {${subport} != ${name}} {
-    if {${python.version} != 24} {
-        set depversion      py${python.version}
-    } else {
-        set depversion      py 
-    }
-
-    depends_lib-append  port:${depversion}-numpy
+    depends_lib-append  port:py${python.version}-numpy
 }
 
 livecheck.regex       {pydicom-(\d+(?:\.\d+)*).tar.gz}
-

Modified: trunk/dports/python/py-traits/Portfile
===================================================================
--- trunk/dports/python/py-traits/Portfile	2011-11-17 07:51:19 UTC (rev 87327)
+++ trunk/dports/python/py-traits/Portfile	2011-11-17 08:09:03 UTC (rev 87328)
@@ -20,4 +20,4 @@
 patchfiles          enthought.diff color_traits.py.diff
 patch.pre_args      -p1
 
-depends_lib-append  port:py-scipy port:py-numpy
+depends_lib-append  port:py-scipy port:py24-numpy

    

jmr＠macports.org

tags

participants (1)