<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3f9369e876e15b47c13469cf63fdab176d45ec19">https://github.com/macports/macports-ports/commit/3f9369e876e15b47c13469cf63fdab176d45ec19</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 3f9369e876e tailscale: properly embed version info during build
</span>3f9369e876e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f9369e876e15b47c13469cf63fdab176d45ec19
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed Jun 9 00:42:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> tailscale: properly embed version info during build
</span>---
net/tailscale/Portfile | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tailscale/Portfile b/net/tailscale/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39e3de62870..53057af9c8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tailscale/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tailscale/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup golang 1.0
</span>
go.setup github.com/tailscale/tailscale 1.8.7 v
go.package tailscale.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
homepage https://tailscale.com
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,6 @@ checksums rmd160 e5c962b49da5fc733e8608444bce894edd13d157 \
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ts_build_dir ${worksrcpath}/_build
</span> set ts_log_dir ${prefix}/var/log/tailscale
startupitem.create yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,16 +37,18 @@ startupitem.executable \
</span> # Allow Go to fetch deps at build time
build.env-delete GO111MODULE=off GOPROXY=off
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args -ldflags \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -X tailscale.com/version.Long=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -X tailscale.com/version.Short=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -o ${ts_build_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ./cmd/tailscale{,d}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append VERSION_LONG=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION_SHORT=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION_GIT_HASH=non-git
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${ts_build_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable running the version detection script, which tries to use git.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s/^eval/# eval/g" ${worksrcpath}/build_dist.sh
</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;'>+build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${build.env} ./build_dist.sh ./cmd/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${build.env} ./build_dist.sh ./cmd/${name}d"
</span> }
destroot.keepdirs-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +56,6 @@ destroot.keepdirs-append \
</span>
destroot {
xinstall -d ${destroot}${ts_log_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${ts_build_dir}/tailscale ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${ts_build_dir}/tailscaled ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/tailscale ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/tailscaled ${destroot}${prefix}/bin/
</span> }
</pre><pre style='margin:0'>
</pre>