<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/cd6f54b30dd6eda6b2d24413d7fd43d4c0beacc6">https://github.com/macports/macports-ports/commit/cd6f54b30dd6eda6b2d24413d7fd43d4c0beacc6</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 cd6f54b30dd mongo-tools: Update to 100.2.1
</span>cd6f54b30dd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd6f54b30dd6eda6b2d24413d7fd43d4c0beacc6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 28 09:20:11 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> mongo-tools: Update to 100.2.1
</span>---
devel/mongo-tools/Portfile | 38 +++++++++++++++++++++++------------
devel/mongo-tools/files/openssl.patch | 6 +++---
devel/mongo-tools/files/version.patch | 38 +++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-tools/Portfile b/devel/mongo-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cd2734f76b..b0b7f17147c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,19 +5,21 @@ PortSystem 1.0
</span> # This block must be declared before the one declared by the github portgroup
# (which is included by the golang portgroup).
post-extract {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global git_commit
</span> set dir [glob ${workpath}/*]
regexp "/${github.author}-${github.project}-(\[0-9a-f\]+)$" ${dir} -> git_commit
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^(\[\[:space:\]\]*VersionStr=)\"\\$\\(\[^\"\]*\"\$|\\1${git.branch}|" ${dir}/set_goenv.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^(\[\[:space:\]\]*GitCommit=)\"\\$\\(\[^\"\]*\"\$|\\1${git_commit}|" ${dir}/set_goenv.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${workpath}/git_commit w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts -nonewline ${fp} ${git_commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span> }
PortGroup golang 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/mongodb/mongo-tools 100.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/mongodb/mongo-tools 100.2.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6b133e72f44f65caf38610ca58757e004844513d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ded903fe5f3c40fe13e9c478e78279f83e7a3b6231a6c9cbead4061a6208924f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 27404378
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f657e9de3a72d8f2c39c19a7bfe86c248f8cec13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b97a8731c422d5cfbc3d50c41129416b1cfa96a267621b07c8f71d2a13f6600c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 27442485
</span>
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,15 +52,25 @@ depends_lib port:cyrus-sasl2 \
</span> port:libpcap \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles openssl.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env GOROOT=[exec ${go.bin} env GOROOT]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles openssl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global git_commit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![exists git_commit]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${workpath}/git_commit r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git_commit [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@GIT_COMMIT@|${git_commit}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildscript/build.go \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ release/version/version.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@VERSION@|${version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ release/version/version.go
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ./build.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ssl sasl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ./make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span>
destroot {
copy {*}[glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-tools/files/openssl.patch b/devel/mongo-tools/files/openssl.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index beca99b14a7..6920f352bbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mongo-tools/files/openssl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-tools/files/openssl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> MacPorts openssl is not pre-1.0.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- set_goenv.sh.orig 2019-10-31 09:17:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ set_goenv.sh 2019-10-31 09:17:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,9 +98,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/github.com/mongodb/mongo-tools-common/set_goenv.sh.orig 2020-11-11 14:35:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/github.com/mongodb/mongo-tools-common/set_goenv.sh 2020-11-15 17:05:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,9 +90,6 @@
</span> UNAME_S=$(PATH="/usr/bin:/bin" uname -s)
case $UNAME_S in
Darwin)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mongo-tools/files/version.patch b/devel/mongo-tools/files/version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e84241a5b56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mongo-tools/files/version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch the version and git commit into the scripts so that we don't need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to check out a git clone.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildscript/build.go.orig 2020-11-11 14:35:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildscript/build.go 2020-11-28 08:20:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "path/filepath"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "strings"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "github.com/craiggwilson/goke/pkg/git"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "github.com/craiggwilson/goke/pkg/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "github.com/craiggwilson/goke/task"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "github.com/mongodb/mongo-tools-common/testtype"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "", fmt.Errorf("failed to get current version: %w", err)
</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;'>+- gitCommit, err := git.SHA1(ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gitCommit, err := "@GIT_COMMIT@", error(nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err != nil {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "", fmt.Errorf("failed to get git commit hash: %w", err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- release/version/version.go.orig 2020-11-11 14:35:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ release/version/version.go 2020-11-28 08:23:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,12 +62,12 @@
</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;'>+ func GetCurrent() (Version, error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commit, err := git("rev-parse", "HEAD")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ commit, err := "@GIT_COMMIT@", error(nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err != nil {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Version{}, fmt.Errorf("git rev-parse HEAD failed: %w", err)
</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;'>+- desc, err := git("describe", "--dirty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ desc, err := "@VERSION@", error(nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err != nil {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Version{}, fmt.Errorf("git describe --dirty failed: %w", err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>