[87361] trunk/dports/python

[jmr at macports.org]

Revision: 87361
          http://trac.macports.org/changeset/87361
Author:   jmr at macports.org
Date:     2011-11-18 00:19:37 -0800 (Fri, 18 Nov 2011)
Log Message:
-----------
py-gsl: unify, adding py26 and py27 flavours in the process (fixes #28057)

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

Removed Paths:
-------------
    trunk/dports/python/py25-gsl/

Modified: trunk/dports/python/py-gsl/Portfile
===================================================================
--- trunk/dports/python/py-gsl/Portfile	2011-11-18 06:52:33 UTC (rev 87360)
+++ trunk/dports/python/py-gsl/Portfile	2011-11-18 08:19:37 UTC (rev 87361)
@@ -2,7 +2,7 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               python24 1.0
+PortGroup               python 1.0
 
 name                    py-gsl
 version                 0.9.5
@@ -21,29 +21,37 @@
                         sha1 718064cd6c9d50cae5048c920ab7ab2324d27c88 \
                         rmd160 0b9d2654bc1cfb84649603b2680932c4ce47a849
 
-build.env               CFLAGS="-I${prefix}/include/gsl -I${prefix}/include/python2.4 -I${prefix}/include" \
-                        LDFLAGS=-L${prefix}/lib
+python.versions         24 25 26 27
 
-depends_build           port:swig-python
-depends_lib             port:gsl
+if {$subport != $name} {
+    build.env-append        CPPFLAGS="-I${prefix}/include/gsl -I${python.include} ${configure.cppflags}"
 
-variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
-    depends_lib-append      port:py-numarray
-    build.args              --array-object=numarray
-}
-variant Numeric conflicts numarray numpy description "Use Numeric as array-object" {
-    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:py24-numpy
-    build.args              --array-object=numpy
-}
-if { ![variant_isset numarray] && ![variant_isset Numeric] } {
-    default_variants        +numpy
-}
+    depends_build           port:swig-python
+    depends_lib-append      port:gsl
 
+    if {${python.version} < 27} {
+        variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
+            if {${python.version} == 24} {
+                depends_lib-append  port:py-numarray
+            } else {
+                depends_lib-append  port:py${python.version}-numarray
+            }
+            build.args              --array-object=numarray
+        }
+    }
+    variant Numeric conflicts numpy description "Use Numeric as array-object" {
+        depends_lib-append      port:py${python.version}-numeric
+        build.args              --array-object=Numeric
+    }
+    variant numpy conflicts Numeric description "Use numpy as array-object" {
+        depends_lib-append      port:py${python.version}-numpy
+        build.args              --array-object=numpy
+    }
+    if {(![variant_isset numarray] || ![variant_exists numarray]) && ![variant_isset Numeric] } {
+        default_variants        +numpy
+    }
 
-post-destroot {
-    xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
+    post-destroot {
+        xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${subport}
+    }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111118/d721e4ea/attachment.html>