Modified: trunk/dports/python/py-usadel1/Portfile (89601 => 89602)
--- trunk/dports/python/py26-usadel1/Portfile 2012-02-03 22:15:25 UTC (rev 89601)
+++ trunk/dports/python/py-usadel1/Portfile 2012-02-03 22:25:30 UTC (rev 89602)
@@ -2,9 +2,9 @@
# $Id$
PortSystem 1.0
-PortGroup python26 1.0
+PortGroup python 1.0
-name py26-usadel1
+name py-usadel1
version 0.2.3.2
categories-append science
platforms darwin
@@ -25,37 +25,43 @@
checksums sha1 ffde19a5dd8a5977d99b00d88ec40873f9a904d1 \
rmd160 bef6ce3a839866bab5f69b3cc986d92c32765828
-depends_lib-append port:py26-numpy \
- port:py26-scipy \
- port:py26-tables
+python.versions 25 26 27
+python.default_version 25
-python.add_archflags no
-
-depends_lib-append port:gcc44
-configure.compiler macports-gcc-4.4
-
-# Using variants causes fortran compiler failure.
-#variant gcc45 conflicts gcc44 description {Use the gcc45 compiler (enables fortran code)} {
-# depends_lib-append port:gcc45
-# configure.compiler macports-gcc-4.5
-#}
-
-#variant gcc44 conflicts gcc45 description {Use the gcc44 compiler (enables fortran code)} {
-# depends_lib-append port:gcc44
-# configure.compiler macports-gcc-4.4
-#}
-
-#if {![variant_isset gcc45]} {
-# default_variants +gcc44
-#}
-
-build.args config_fc \
- --fcompiler=gfortran \
- --noarch
-
-build.env-append CC=${configure.cc} \
- F90=${configure.fc}
-
-livecheck.type regex
-livecheck.url http://ltl.tkk.fi/~theory/usadel1/download.html
-livecheck.regex {usadel1-(\d+(?:\.\d+)*)}
+if {$subport != $name} {
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
+ port:py${python.version}-tables
+
+ python.add_archflags no
+
+ depends_lib-append port:gcc45
+ configure.compiler macports-gcc-4.5
+
+ # Using variants causes fortran compiler failure.
+ #variant gcc45 conflicts gcc44 description {Use the gcc45 compiler (enables fortran code)} {
+ # depends_lib-append port:gcc45
+ # configure.compiler macports-gcc-4.5
+ #}
+
+ #variant gcc44 conflicts gcc45 description {Use the gcc44 compiler (enables fortran code)} {
+ # depends_lib-append port:gcc44
+ # configure.compiler macports-gcc-4.4
+ #}
+
+ #if {![variant_isset gcc44]} {
+ # default_variants +gcc45
+ #}
+
+ build.args config_fc \
+ --fcompiler=gfortran \
+ --noarch
+
+ build.env-append CC=${configure.cc} \
+ F90=${configure.fc}
+ livecheck.type none
+} else {
+ livecheck.type regex
+ livecheck.url http://ltl.tkk.fi/~theory/usadel1/download.html
+ livecheck.regex {usadel1-(\d+(?:\.\d+)*)}
+}