<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e3974095a551238eb928c1705ab448edb6e30b00">https://github.com/macports/macports-ports/commit/e3974095a551238eb928c1705ab448edb6e30b00</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 e397409 github-1.0.tcl: Add github.tag_suffix
</span>e397409 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e3974095a551238eb928c1705ab448edb6e30b00
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 22 18:26:06 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> github-1.0.tcl: Add github.tag_suffix
</span>---
_resources/port1.0/group/github-1.0.tcl | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
<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 4043ea0..99ccd25 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;'>@@ -37,7 +37,7 @@
</span> # Documentation (sources):
# https://github.com/macports/macports-guide/blob/master/guide/xml/portgroup-github.xml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options github.author github.project github.version github.tag_prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options github.author github.project github.version github.tag_prefix github.tag_suffix
</span> options github.homepage github.raw github.master_sites github.tarball_from
default github.homepage {https://github.com/${github.author}/${github.project}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,13 +72,14 @@ proc handle_tarball_from {option action args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global extract.suffix github.author github.project github.version github.tag_prefix github.homepage github.master_sites PortInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""} {gh_tag_suffix ""}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global extract.suffix github.author github.project github.version github.tag_prefix github.tag_suffix github.homepage github.master_sites PortInfo
</span>
github.author ${gh_author}
github.project ${gh_project}
github.version ${gh_version}
github.tag_prefix ${gh_tag_prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tag_suffix ${gh_tag_suffix}
</span>
if {!([info exists PortInfo(name)] && (${PortInfo(name)} ne ${github.project}))} {
name ${github.project}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +88,7 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
</span> version ${github.version}
homepage ${github.homepage}
git.url ${github.homepage}.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch [join ${github.tag_prefix}]${github.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch [join ${github.tag_prefix}]${github.version}[join ${github.tag_suffix}]
</span> distname ${github.project}-${github.version}
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,9 +117,11 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
</span>
# If the version is composed entirely of hex characters, and is at least 7
# characters long, and is not exactly 8 decimal digits (which might be a
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # version in YYYYMMDD format), and no tag_prefix is provided, then assume we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # are using a commit hash and livecheck commits; otherwise livecheck tags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # version in YYYYMMDD format), and no tag prefix or suffix is provided, then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # assume we are using a commit hash and livecheck commits; otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # livecheck tags.
</span> if {[join ${github.tag_prefix}] eq "" && \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ [join ${github.tag_suffix}] eq "" && \
</span> [regexp "^\[0-9a-f\]{7,}\$" ${github.version}] && \
![regexp "^\[0-9\]{8}\$" ${github.version}]} {
livecheck.type regexm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +130,7 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
</span> } else {
livecheck.type regex
livecheck.url ${github.homepage}/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex archive/[join ${github.tag_prefix} ""](\[^"\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex archive/[join ${github.tag_prefix}](\[^"\]+)[join ${github.tag_suffix}]${extract.suffix}
</span> }
livecheck.version ${github.version}
}
</pre><pre style='margin:0'>
</pre>