<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2b56ded2aff678d43d7e2f9e8b0c891df3b6d3f2">https://github.com/macports/macports-ports/commit/2b56ded2aff678d43d7e2f9e8b0c891df3b6d3f2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2b56ded2aff678d43d7e2f9e8b0c891df3b6d3f2
</span>Author: Aaron Madlon-Kay <aaron@madlon-kay.com>
AuthorDate: Thu Apr 20 10:55:29 2023 +0900
<span style='display:block; white-space:pre;color:#404040;'> golang-1.0 PortGroup: handle Gitlab-hosted vendors
</span>---
_resources/port1.0/group/golang-1.0.tcl | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fbf20e286a4..21a87f3b22c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,14 +394,23 @@ post-extract {
</span> }
foreach vlist ${go.vendors_internal} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lassign ${vlist} sha1_short vpackage vresolved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Processing vendored dependency (sha1_short: ${sha1_short}, vpackage: ${vpackage}, vresolved: ${vresolved})"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign ${vlist} sha1_short vpackage vresolved vversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Processing vendored dependency (sha1_short: ${sha1_short}, vpackage: ${vpackage}, vresolved: ${vresolved}, vversion: ${vversion})"
</span>
file mkdir ${gopath}/src/[file dirname ${vpackage}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${sha1_short} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Next is a big bag of heuristics to try to move the extracted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependencies into the gopath. We have to try to accommodate all naming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # schemes used by the various "forges" (GitHub, Gitlab, etc.).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign [go._translate_package_id ${vresolved}] _ vauthor vproject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gitlab_workdir ${vproject}-${vversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${workpath}/${gitlab_workdir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${gitlab_workdir} ${gopath}/src/${vpackage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${sha1_short} ne ""} {
</span> move [glob ${workpath}/*-${sha1_short}*] ${gopath}/src/${vpackage}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lassign [go._translate_package_id ${vresolved}] _ vauthor vproject
</span> # In some cases, this can match multiple folders, e.g.,
# gopkg.in/src-d/go-git.v4 and gopkg.in/src-d/go-git-fixtures.v3.
# We want the one that does not have any dashes in the wildcard of
</pre><pre style='margin:0'>
</pre>