<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/bffdd87166d0d2ac6126f45c1b0028244425e963">https://github.com/macports/macports-ports/commit/bffdd87166d0d2ac6126f45c1b0028244425e963</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 bffdd87166d go-tools: eliminate conflict with Ruby - Delete internal binary 'bundle'
</span>bffdd87166d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bffdd87166d0d2ac6126f45c1b0028244425e963
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Oct 6 15:13:36 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> go-tools: eliminate conflict with Ruby
</span><span style='display:block; white-space:pre;color:#404040;'> - Delete internal binary 'bundle'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57787
</span>---
devel/go-tools/Portfile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/go-tools/Portfile b/devel/go-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13b4058679d..53f81af2724 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/go-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/go-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup golang 1.0
</span>
go.setup github.com/golang/tools 0.1.7 v
epoch 7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
name go-tools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,5 +30,10 @@ build.env-delete GOPROXY=off GO111MODULE=off
</span> build.args -o bin/ ./cmd/... ./cmd/auth/...
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 {*}[glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dp_bin ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 {*}[glob ${worksrcpath}/bin/*] ${dp_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove internal Go utility 'bundle', to avoid conflict with Ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/57787
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${dp_bin}/bundle
</span> }
</pre><pre style='margin:0'>
</pre>