<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00388e9305f5189b9bfc3b5442e92c1b8766b883">https://github.com/macports/macports-ports/commit/00388e9305f5189b9bfc3b5442e92c1b8766b883</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00388e9305f5189b9bfc3b5442e92c1b8766b883
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 27 15:00:54 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> cargo PG: whitespace changes
</span>---
_resources/port1.0/group/cargo-1.0.tcl | 72 +++++++++++++++++-----------------
1 file changed, 36 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo-1.0.tcl b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d6d10dc..c6a87aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,48 +227,48 @@ if {${subport} ne "cargo-bootstrap" && ${subport} ne "cargo-stage1" && ${subport
</span>
post-extract {
if {!${cargo.worksrcdir_crates}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir "${cargo.home}/macports"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid downloading files from online repository during build phase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use a replacement for crates.io
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://doc.rust-lang.org/cargo/reference/source-replacement.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set conf [open "${cargo.home}/config" "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "\[source\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "\[source.macports\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "directory = \"${cargo.home}/macports\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "\[source.crates-io\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "replace-with = \"macports\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "local-registry = \"/var/empty\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {cname cgithub cbranch crevision chksum} ${cargo.crates_github} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "\[source.\"https://github.com/${cgithub}\"\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "git = \"https://github.com/${cgithub}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $conf "branch = \"${cbranch}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir "${cargo.home}/macports"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid downloading files from online repository during build phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use a replacement for crates.io
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://doc.rust-lang.org/cargo/reference/source-replacement.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [open "${cargo.home}/config" "w"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "\[source\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "\[source.macports\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "directory = \"${cargo.home}/macports\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "\[source.crates-io\]"
</span> puts $conf "replace-with = \"macports\""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "local-registry = \"/var/empty\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {cname cgithub cbranch crevision chksum} ${cargo.crates_github} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "\[source.\"https://github.com/${cgithub}\"\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "git = \"https://github.com/${cgithub}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "branch = \"${cbranch}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "replace-with = \"macports\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $conf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # import all crates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {cname cversion chksum} ${cargo.crates} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cratefile ${cname}-${cversion}.crate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo._import_crate ${cname} ${cversion} ${chksum} ${cratefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {cname cgithub cbranch crevision chksum} ${cargo.crates_github} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cratefile ${cname}-${crevision}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo._import_crate_github ${cname} ${cgithub} ${crevision} ${chksum} ${cratefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # import all crates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {cname cversion chksum} ${cargo.crates} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cratefile ${cname}-${cversion}.crate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo._import_crate ${cname} ${cversion} ${chksum} ${cratefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {cname cgithub cbranch crevision chksum} ${cargo.crates_github} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cratefile ${cname}-${crevision}.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo._import_crate_github ${cname} ${cgithub} ${crevision} ${chksum} ${cratefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {cname cversion chksum} ${cargo.crates} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the libssh2-sys crate requires the header files from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a version of libssh2 that has not been released
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (e.g. channel.c uses the error code LIBSSH2_ERROR_CHANNEL_WINDOW_FULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure these header files are found properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cname} eq "libssh2-sys"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -tail -directory ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/include/ *.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../include/${f} ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/src/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {cname cversion chksum} ${cargo.crates} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the libssh2-sys crate requires the header files from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a version of libssh2 that has not been released
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (e.g. channel.c uses the error code LIBSSH2_ERROR_CHANNEL_WINDOW_FULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure these header files are found properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cname} eq "libssh2-sys"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tail -directory ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/include/ *.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../include/${f} ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/src/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
foreach stage {build destroot} {
</pre><pre style='margin:0'>
</pre>