<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/35b40b19c624275c987491a11370902fab29db13">https://github.com/macports/macports-ports/commit/35b40b19c624275c987491a11370902fab29db13</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 35b40b19c62 crossbinutils-1.0.tcl: bugfix 65348
</span>35b40b19c62 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 35b40b19c624275c987491a11370902fab29db13
</span>Author: Dean M Greer <gcenx83@gmail.com>
AuthorDate: Wed Jun 15 21:05:27 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    crossbinutils-1.0.tcl: bugfix 65348
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes https://trac.macports.org/ticket/65348
</span>---
 _resources/port1.0/group/crossbinutils-1.0.tcl | 60 +++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/crossbinutils-1.0.tcl b/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 13c28fdadfa..a26d34e05f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,11 +123,10 @@ proc crossbinutils.setup {target version} {
</span>             binutils/doc    binutils
             gprof           gprof
             ld              ld
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            libctf/doc      ctf-spec
</span>         }
 
         foreach {dir page} ${infopages} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Fix texinfo source file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Fix texi|info source file(s)
</span>             set tex [glob -directory ${worksrcpath}/${dir} ${page}.texi*]
             reinplace -q \
                 /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${tex}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,17 +143,17 @@ proc crossbinutils.setup {target version} {
</span>                     s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
                     ${worksrcpath}/${dir}/Makefile.in
             }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach dir2 {binutils gas libctf} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if { [ file exists "${worksrcpath}/${dir2}/configure" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach dir {binutils gas} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</span>                         reinplace -q -E \
                         s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/${dir2}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${worksrcpath}/${dir}/Makefile.in
</span>                 }
             }
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Fix packages' names.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach dir {bfd binutils gas gold gprof ld opcodes libctf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Fix packages names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach dir {bfd binutils gas gold gprof ld opcodes} {
</span>             if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
                 reinplace -q "/^ PACKAGE=/s/=.*/=${crossbinutils.target}-${dir}/" \
                     ${worksrcpath}/${dir}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,6 +175,53 @@ proc crossbinutils.setup {target version} {
</span>             ${worksrcpath}/libiberty/Makefile.in
         reinplace -q "s|/\$(MULTIOSDIR)||g" \
             ${worksrcpath}/libiberty/Makefile.in
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp ${version} "2.38"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set infopages {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                libctf/doc      ctf-spec
</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;'>+            foreach {dir page} ${infopages} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # Fix texi|info source file(s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { [ file exists "${worksrcpath}/${dir}" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set info [glob -directory ${worksrcpath}/${dir} ${page}.info*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${info}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q s/(${page})/(${crossbinutils.target}-${page})/g ${info}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        "s/@file{${page}}/@file{${crossbinutils.target}-${page}}/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${info}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    move ${info} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${info}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { [ file exists "${worksrcpath}/${dir}" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set tex [glob -directory ${worksrcpath}/${dir} ${page}.texi*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${tex}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q s/(${page})/(${crossbinutils.target}-${page})/g ${tex}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -q \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        "s/@file{${page}}/@file{${crossbinutils.target}-${page}}/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${tex}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    move ${tex} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${tex}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach dir {libctf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        reinplace -q -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${worksrcpath}/${dir}/Makefile.in
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Fix packages names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach dir {libctf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        reinplace -q "/^ PACKAGE=/s/=.*/=${crossbinutils.target}-${dir}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${worksrcpath}/${dir}/configure
</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>     }
 
     depends_lib \
</pre><pre style='margin:0'>

</pre>