<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/42f30581fa112678029260a79a13c08076ed609b">https://github.com/macports/macports-ports/commit/42f30581fa112678029260a79a13c08076ed609b</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 42f3058 cargo: update dependencies, rebuild
</span>42f3058 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 42f30581fa112678029260a79a13c08076ed609b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Oct 3 16:12:33 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> cargo: update dependencies, rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Both cargo and cargo-stage1 link with libssh2. Previously
</span><span style='display:block; white-space:pre;color:#404040;'> a dependency on libssh2 was only declared for cargo-stage1.
</span><span style='display:block; white-space:pre;color:#404040;'> This allowed cargo to build properly (because of the build
</span><span style='display:block; white-space:pre;color:#404040;'> dependency on cargo-stage1) but in situations where the
</span><span style='display:block; white-space:pre;color:#404040;'> pre-built cargo archive was being activated by another
</span><span style='display:block; white-space:pre;color:#404040;'> port (e.g. librsvg) a build error might occur if the cargo
</span><span style='display:block; white-space:pre;color:#404040;'> binary was executed and libssh2 was not otherwise installed and active.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> cargo build --verbose --release
</span><span style='display:block; white-space:pre;color:#404040;'> dyld: Library not loaded: /opt/local/lib/libssh2.1.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> Referenced from: /opt/local/bin/cargo
</span><span style='display:block; white-space:pre;color:#404040;'> Reason: image not found
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/57214
</span>---
devel/cargo/Portfile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cargo/Portfile b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a6283b..08b3a58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ if {${subport} ne "${name}-bootstrap"} {
</span> }
PortGroup cargo 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
supported_archs i386 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,7 @@ if {${subport} ne "${name}-bootstrap"} {
</span>
depends_lib path:lib/libssl.dylib:openssl \
port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libssh2 \
</span> port:rust
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,9 +169,7 @@ if {${subport} ne "${name}-bootstrap"} {
</span>
subport ${name}-bootstrap {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-stage1 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libssh2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-stage1 {}
</span>
if {${subport} ne "${name}-bootstrap"} {
cargo.crates \
</pre><pre style='margin:0'>
</pre>