<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/89cda1ccada8fe53b02cbab51f5985945fb1fbc5">https://github.com/macports/macports-ports/commit/89cda1ccada8fe53b02cbab51f5985945fb1fbc5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 89cda1ccada openmpi/mpich: cleanup fortran logic
</span>89cda1ccada is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 89cda1ccada8fe53b02cbab51f5985945fb1fbc5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun May 23 12:24:02 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    openmpi/mpich: cleanup fortran logic
</span>---
 science/mpich/Portfile   | 33 +++++++++++++++++++++++++--------
 science/openmpi/Portfile | 33 +++++++++++++++++++++++++--------
 2 files changed, 50 insertions(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/mpich/Portfile b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c71e9b7e20..80c983dae69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,11 +260,17 @@ if {${subport_enabled}} {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Fortran Support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set fortran_enabled no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     if { [string first gcc $cname] == 0 } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set fortran_enabled yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         long_description-append "AND FORTRAN COMPILERS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  --disable-fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                --enable-fortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         variant fortran description {Stub : fortran always enabled for gcc-based version} {}
         default_variants-append     +fortran
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,9 +293,7 @@ if {${subport_enabled}} {
</span>         compilers.setup    default_fortran
 
         if {[fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.args-replace  --disable-fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    --enable-fortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set fortran_enabled yes
</span> 
             # Ask the portgroup for the correct dependency - the Fortran
             # variants gccX and g95 match the name of the ports but
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,8 +306,17 @@ if {${subport_enabled}} {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${fortran_enabled}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace  --disable-fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --enable-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    unset fortran_enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     #---------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Universal Build Support - START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Universal Build Support
</span>     #---------------------------------------------------------------------------
 
     if {![info exists universal_possible]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,7 +360,7 @@ if {${subport_enabled}} {
</span>     }
 
     #---------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Universal Build Support - END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Variants
</span>     #---------------------------------------------------------------------------
 
     variant threads description {Build with full thread support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,6 +383,10 @@ if {${subport_enabled}} {
</span>         configure.cxxflags-append   -march=native
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Notes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     mpiutil_add_notes \
         ${name} ${subport} ${cname} ${select.file}
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/Portfile b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 235fd424d99..a5eba601bee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,11 +236,17 @@ if {${subport_enabled}} {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Fortran Support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set fortran_enabled no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     if { [string first gcc $cname] == 0 } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set fortran_enabled yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         long_description-append "AND FORTRAN COMPILERS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-replace  --disable-mpi-fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                --enable-mpi-fortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         variant fortran description {Stub : fortran always enabled for gcc-based version} {}
         default_variants-append     +fortran
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,17 +260,24 @@ if {${subport_enabled}} {
</span>         compilers.setup    default_fortran
 
         if {[fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.args-replace  --disable-mpi-fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    --enable-mpi-fortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set fortran_enabled yes
</span> 
             # Get the dependent port for the active fortran variant
             depends_lib-append      [fortran_variant_depends]
         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${fortran_enabled}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace  --disable-mpi-fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --enable-mpi-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        select.file             ${filespath}/portselect/${name}-${cname}-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    unset fortran_enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     #---------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Universal Build Support - START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Universal Build Support
</span>     #---------------------------------------------------------------------------
 
     if {![info exists universal_possible]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,7 +359,7 @@ if {${subport_enabled}} {
</span>     }
 
     #---------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Universal Build Support - END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Variants
</span>     #---------------------------------------------------------------------------
 
     variant valgrind description {Enable valgrind support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,6 +375,10 @@ if {${subport_enabled}} {
</span>         configure.args-append --enable-mpi1-compatibility
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Notes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     mpiutil_add_notes \
         ${name} ${subport} ${cname} ${select.file}
 
</pre><pre style='margin:0'>

</pre>