Ticket #51550: Portfile-openmpi.diff

Portfile

@@ -209 +209 @@
     } else {
         append long_description " (AND THE FORTRAN COMPILER SELECTED BY THE VARIANT, IF ANY)"
 
-        set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 6 7}
-        set default_fortran_variant +${compilers.gcc_default}
-        set g95_conflicts {}
+        compilers.choose   fc
+        compilers.setup    -dragonegg default_fortran
 
-        foreach ver ${gcc_versions} {
-            set ver_no_dot [join [split ${ver} "."] ""]
-
-            set variant_line {variant gcc${ver_no_dot} description \
-              "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
-            foreach over ${gcc_versions} {
-                if {${ver} == ${over}} {
-                    continue
-                }
-
-                set over_no_dot [join [split ${over} "."] ""]
-                append variant_line " conflicts gcc${over_no_dot}"
-            }
-            append variant_line { {}}
-
-            eval $variant_line
-
-            append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-            if {[variant_isset gcc${ver_no_dot}]} {
-                if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-                    set default_fortran_variant ""
-                }
-            }
-        }
-
-        eval [concat {variant g95 description {build with g95}} \
-              $g95_conflicts {{}}]
-
-        if {[variant_isset g95]} {
-            if {${default_fortran_variant} != "+g95"} {
-                set default_fortran_variant ""
-            }
-        }
-
-        if {${default_fortran_variant} != ""} {
-            default_variants "${default_fortran_variant}"
-        }
-
-        foreach ver ${gcc_versions} {
-            set ver_no_dot [join [split ${ver} "."] ""]
-
-            if {[variant_isset gcc${ver_no_dot}]} {
-                depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc \
-                                   port:gcc${ver_no_dot}
-
-                configure.args-delete   --disable-mpi-fortran
-                configure.args-append   --enable-mpi-fortran
-                select.file             ${filespath}/${name}-${cname}-fortran
-
-                configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-            }
-        }
-
-        if {[variant_isset g95]} {
-            depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc \
-                               port:g95
-
+        if {[fortran_variant_isset]} {
             configure.args-delete   --disable-mpi-fortran
             configure.args-append   --enable-mpi-fortran
             select.file             ${filespath}/${name}-${cname}-fortran
 
-            configure.fc ${prefix}/bin/g95
+            # at least currently, the Fortran variants gccX and g95 match the name of the ports
+            depends_lib-append      port:[fortran_variant_name]
         }
     }
     set devnotes ""