<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/7c78e351d6ba6010a127c046ffa0736b8b4e125a">https://github.com/macports/macports-ports/commit/7c78e351d6ba6010a127c046ffa0736b8b4e125a</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 7c78e351d6b portgroups: respect subport name, when it matches project name
</span>7c78e351d6b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c78e351d6ba6010a127c046ffa0736b8b4e125a
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Nov 20 23:49:41 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> portgroups: respect subport name, when it matches project name
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Sometime subport name is matched project name on bitbucket, github,
</span><span style='display:block; white-space:pre;color:#404040;'> gitlab, etc. Let stop to overwrite `name` for this case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/40831
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55467
</span>---
_resources/port1.0/group/bitbucket-1.0.tcl | 2 +-
_resources/port1.0/group/gitea-1.0.tcl | 4 ++--
_resources/port1.0/group/github-1.0.tcl | 2 +-
_resources/port1.0/group/gitlab-1.0.tcl | 2 +-
_resources/port1.0/group/golang-1.0.tcl | 2 +-
_resources/port1.0/group/sourcehut-1.0.tcl | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bitbucket-1.0.tcl b/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f92618db32..ddcfbe201d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bitbucket-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ proc bitbucket.setup {bb_author bb_project bb_version {bb_tag_prefix ""}} {
</span> bitbucket.version ${bb_version}
bitbucket.tag_prefix ${bb_tag_prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${bitbucket.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${bitbucket.project}
}
version ${bitbucket.version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gitea-1.0.tcl b/_resources/port1.0/group/gitea-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ad9b43c2f65..5088664fd35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gitea-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gitea-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +50,10 @@ proc gitea.setup {gitea_author gitea_project gitea_version {gitea_tag_prefix ""}
</span> gitea.tag_prefix ${gitea_tag_prefix}
gitea.tag_suffix ${gitea_tag_suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${gitea.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${gitea.project}
dist_subdir ${gitea.project}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[info exists PortInfo(name)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {
</span> dist_subdir ${PortInfo(name)}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/github-1.0.tcl b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b5099e5d347..cfd4e6fa474 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/github-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""} {gh_tag_su
</span> github.tag_prefix ${gh_tag_prefix}
github.tag_suffix ${gh_tag_suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${github.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${github.project}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gitlab-1.0.tcl b/_resources/port1.0/group/gitlab-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 255db4d5469..f06b5210514 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gitlab-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gitlab-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ proc gitlab.setup {gl_author gl_project gl_version {gl_tag_prefix ""} {gl_tag_su
</span> gitlab.tag_prefix ${gl_tag_prefix}
gitlab.tag_suffix ${gl_tag_suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${gitlab.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${gitlab.project}
}
<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 c68f7e780d2..2617ce29465 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;'>@@ -94,7 +94,7 @@ proc go.setup {go_package go_version {go_tag_prefix ""} {go_tag_suffix ""}} {
</span> gitea.setup ${go.author} ${go.project} ${go_version} ${go_tag_prefix} ${go_tag_suffix}
}
default {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${go.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${go.project}
}
version ${go.version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/sourcehut-1.0.tcl b/_resources/port1.0/group/sourcehut-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ffb53b9f403..eed1572d1b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/sourcehut-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/sourcehut-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ proc sourcehut.setup {srht_author srht_project srht_version {srht_tag_prefix ""}
</span> sourcehut.tag_prefix ${srht_tag_prefix}
sourcehut.tag_suffix ${srht_tag_suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${sourcehut.project}))} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists PortInfo(name)]} {
</span> name ${sourcehut.project}
}
</pre><pre style='margin:0'>
</pre>