<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1444149f3489dcac7659bcaca661d5a159c68157">https://github.com/macports/macports-ports/commit/1444149f3489dcac7659bcaca661d5a159c68157</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 1444149f348 octave: Fix gcc-devel conflict, don't assume gcc port and variant names are always the same Closes: https://trac.macports.org/ticket/61760
</span>1444149f348 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1444149f3489dcac7659bcaca661d5a159c68157
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Dec 7 09:18:55 2020 +0000

<span style='display:block; white-space:pre;color:#404040;'>    octave: Fix gcc-devel conflict, don't assume gcc port and variant names are always the same
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/61760
</span>---
 _resources/port1.0/group/compilers-1.0.tcl | 12 +++++++++++-
 math/octave/Portfile                       |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index de28c4a3ba7..8e0249c6a27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +104,7 @@ foreach ver ${gcc_versions} {
</span>     if { $ver eq "devel" } {
         set cdb(gcc$ver_nodot,depends)  port:gcc-devel
         set cdb(gcc$ver_nodot,dependsl) "port:libgcc-devel"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set cdb(gcc$ver_nodot,dependsa) gcc-devel
</span>     } else {
         set cdb(gcc$ver_nodot,depends)  port:gcc$ver_nodot
         if {[vercmp ${ver} 4.6] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,11 +114,11 @@ foreach ver ${gcc_versions} {
</span>         } else {
             set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set cdb(gcc$ver_nodot,dependsa) gcc$ver_nodot
</span>     }
     set cdb(gcc$ver_nodot,libfortran) ${prefix}/lib/gcc$ver_nodot/libgfortran.dylib
     # note: above is ultimately a symlink to ${prefix}/lib/libgcc/libgfortran.3.dylib
     set cdb(gcc$ver_nodot,dependsd) port:g95
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set cdb(gcc$ver_nodot,dependsa) gcc$ver_nodot
</span>     set cdb(gcc$ver_nodot,conflict) "gfortran g95"
     set cdb(gcc$ver_nodot,cc)       ${prefix}/bin/gcc-mp-$ver
     set cdb(gcc$ver_nodot,cxx)      ${prefix}/bin/g++-mp-$ver
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,6 +375,15 @@ proc fortran_variant_name {} {
</span>     return ""
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc fortran_depends_port_name {var} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global cdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ${var} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return $cdb(${var},dependsa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return ""
</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;'>+
</span> proc fortran_variant_depends_port_name {} {
     global cdb
     set var_name [fortran_variant_name]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78d4f747fe1..d04878fc234 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -588,7 +588,8 @@ set magickDefault yes
</span> if {${configure.cxx_stdlib} eq "libc++"} {
     foreach gccVar ${compilers.gcc_variants} {
         if {[variant_exists ${gccVar}] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend magickConflict ${gccVar}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set varPort [fortran_depends_port_name ${gccVar}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend magickConflict ${varPort}
</span>             if {[variant_isset ${gccVar}] } {
                 set magickDefault no
             }
</pre><pre style='margin:0'>

</pre>