[110108] trunk/dports/science/ncarg/Portfile

[jeremyhu at macports.org]

Revision: 110108
          https://trac.macports.org/changeset/110108
Author:   jeremyhu at macports.org
Date:     2013-08-26 01:28:43 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
ncarg: Use fortran variant, and not universal.  Fixes build on Mavericks

Modified Paths:
--------------
    trunk/dports/science/ncarg/Portfile

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2013-08-26 08:27:50 UTC (rev 110107)
+++ trunk/dports/science/ncarg/Portfile	2013-08-26 08:28:43 UTC (rev 110108)
@@ -96,18 +96,8 @@
     }
     if {[variant_isset g95]} {
         set fortranlib -lf95
-    } elseif {[variant_isset gcc43]} {
-        set fortranlib  "-L${prefix}/lib/gcc43 -lgfortran"
-    } elseif {[variant_isset gcc44]} {
-        set fortranlib  "-L${prefix}/lib/gcc44 -lgfortran"
-    } elseif {[variant_isset gcc45]} {
-        set fortranlib  "-L${prefix}/lib/gcc45 -lgfortran"
-    } elseif {[variant_isset gcc46]} {
-        set fortranlib  "-L${prefix}/lib/gcc46 -lgfortran"
-    } elseif {[variant_isset gcc47]} {
-        set fortranlib  "-L${prefix}/lib/gcc47 -lgfortran"
-    } elseif {[variant_isset gcc48]} {
-        set fortranlib  "-L${prefix}/lib/gcc48 -lgfortran"
+    } else {
+        set fortranlib  "-L${prefix}/lib/libgcc -lgfortran"
     } 
     foreach f {Darwin Darwin_Intel} {
         reinplace "s|-lgfortran|${fortranlib}|" ${worksrcpath}/config/${f}
@@ -231,38 +221,67 @@
     }
 }
 
-variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 description {compile with g95} {
-    configure.fc            ${prefix}/bin/g95
-    depends_build-append    port:g95
-    configure.fflags-append -fno-second-underscore
-}
+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set default_fortran_variant +gcc48
 
-variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 description {compile with gcc 4.3} {
-    configure.compiler      macports-gcc-4.3
-}
+foreach ver ${gcc_versions} {
+    set ver_no_dot [join [split ${ver} "."] ""]
 
-variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 description {compile with gcc 4.4} {
-    configure.compiler      macports-gcc-4.4
-}
+    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
 
-variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 description {compile with gcc 4.5} {
-    configure.compiler      macports-gcc-4.5
+    variant gcc${ver_no_dot} conflicts g95 {}
+    variant g95 conflicts gcc${ver_no_dot} {}
+
+    foreach over ${gcc_versions} {
+        if {${ver} == ${over}} {
+            continue
+        }
+
+        set over_no_dot [join [split ${over} "."] ""]
+        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+    }
+
+    if {[variant_isset gcc${ver_no_dot}]} {
+        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+            set default_fortran_variant ""
+        }
+    }
 }
 
-variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 description {compile with gcc 4.6} {
-    configure.compiler      macports-gcc-4.6
+variant g95 description {build with g95} {}
+
+if {[variant_isset g95]} {
+    if {${default_fortran_variant} != "+g95"} {
+        set default_fortran_variant ""
+    }
 }
 
-variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 description {compile with gcc 4.7} {
-    configure.compiler      macports-gcc-4.7
+if {${default_fortran_variant} != ""} {
+    default_variants-append "${default_fortran_variant}"
 }
 
-variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 description {compile with gcc 4.8} {
-    configure.compiler      macports-gcc-4.8
+foreach ver ${gcc_versions} {
+    set ver_no_dot [join [split ${ver} "."] ""]
+
+    if {[variant_isset gcc${ver_no_dot}]} {
+        depends_lib-append port:libgcc
+        depends_build-append port:gcc${ver_no_dot}
+
+        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
+        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+    }
 }
 
-if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48] && ![variant_isset g95]} {
-    default_variants +gcc47
+if {[variant_isset g95]} {
+    depends_lib-append port:libgcc
+    depends_build-append port:g95
+
+    configure.fc ${prefix}/bin/g95
+    configure.f77 ${prefix}/bin/g95
+    configure.f90 ${prefix}/bin/g95
+
+    configure.fflags-append -fno-second-underscore
 }
 
 ## ncarg fails to build some binaries with xnu-headers installed 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/01c9ff6b/attachment.html>