<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/0d4b18fbffaf6907796e78809f694c59e527902f">https://github.com/macports/macports-ports/commit/0d4b18fbffaf6907796e78809f694c59e527902f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d4b18fbffaf6907796e78809f694c59e527902f
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Wed May 2 14:42:56 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    split cargo PG into cargo and cargo_fetch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/56377
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/56195
</span>---
 _resources/port1.0/group/cargo-1.0.tcl             | 174 +----------
 .../group/{cargo-1.0.tcl => cargo_fetch-1.0.tcl}   | 169 +++++++----
 devel/cargo/Portfile                               | 320 +++++++++++++++++----
 devel/mesalink/Portfile                            |  19 +-
 devel/mesalink/files/patch-configure.diff          |  13 +
 devel/racer/Portfile                               |  64 ++++-
 graphics/librsvg/Portfile                          |  28 +-
 sysutils/fd/Portfile                               |   4 +-
 textproc/ripgrep/Portfile                          |   4 +-
 9 files changed, 460 insertions(+), 335 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 17cc1ea..5ba2a61 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;'>@@ -62,183 +62,15 @@
</span> #    baz    author/baz  branch  abcdef12345678...commit...abcdef12345678  fedcba654321...
 #
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cargo.home cargo.crates cargo.crates_github
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.home      {${workpath}/.home/.cargo}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.crates    {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.crates_github {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc cargo.crates handle_cargo_crates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc handle_cargo_crates {option action {value ""}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${action} eq "set"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach {cname cversion chksum} ${value} {
</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;'>-            # The same crate name can appear with multiple versions. Use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # a combination of crate name and checksum as unique identifier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # As the :disttag cannot contain dots, the version number cannot be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # To download the crate file curl-0.4.11.crate, the URL is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            #    https://crates.io/api/v1/crates/curl/0.4.11/download.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Use ?dummy= to ignore ${distfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # see https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set cratetag        crate-${cname}-${chksum}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distfiles-append    ${cratefile}:${cratetag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites-append https://crates.io/api/v1/crates/${cname}/${cversion}/download?dummy=:${cratetag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums-append    ${cratefile} sha256 ${chksum}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc cargo.crates_github handle_cargo_crates_github
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc handle_cargo_crates_github {option action {value ""}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${action} eq "set"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach {cname cgithub cbranch crevision chksum} ${value} {
</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;'>-            # The same crate name can appear with multiple versions. Use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # a combination of crate name and checksum as unique identifier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # As the :disttag cannot contain dots, the version number cannot be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set cratetag        crate-${cname}-${chksum}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distfiles-append    ${cratefile}:${cratetag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites-append https://github.com/${cgithub}/archive/${crevision}.tar.gz?dummy=:${cratetag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums-append    ${cratefile} sha256 ${chksum}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo._extract_crate {cratefile} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cargo.home distpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set tar [findBinary tar ${portutil::autoconf::tar_path}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W "${cargo.home}/macports" "$tar -xf ${distpath}/${cratefile}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo._write_cargo_checksum {cdirname chksum} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cargo.home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # although cargo will never see the .crate, it expects to find the sha256 checksum here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set chkfile [open "${cargo.home}/macports/${cdirname}/.cargo-checksum.json" "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts $chkfile "{"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts $chkfile "    \"package\": ${chksum},"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts $chkfile "    \"files\": {}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts $chkfile "}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    close $chkfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo._import_crate {cname cversion chksum cratefile} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cargo.home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_info "Adding ${cratefile} to cargo home"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    cargo._extract_crate ${cratefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    cargo._write_cargo_checksum "${cname}-${cversion}" "\"${chksum}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo._import_crate_github {cname cgithub crevision chksum cratefile} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cargo.home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set crepo [lindex [split ${cgithub} "/"] 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set cdirname "${crepo}-${crevision}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_info "Adding ${cratefile} from github to cargo home"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    cargo._extract_crate ${cratefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    cargo._write_cargo_checksum ${cdirname} "null"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The distfiles of the main port will also be stored in this directory,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# but this is the only way to allow reusing the same crates across multiple ports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir             cargo-crates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default extract.only    {[cargo._disttagclean $distfiles]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# based on portextract::disttagclean from portextract.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo._disttagclean {list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cargo.crates cargo.crates_github
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {$list eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        return $list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach fname $list {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set name [getdistname ${fname}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set is_crate no
</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;'>-            if {${name} eq ${cratefile}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set is_crate yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</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;'>-            if {${name} eq ${cratefile}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set is_crate yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {!${is_crate}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend val ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return $val
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build           port:cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><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:#ffe0e0;'>-        puts $conf "replace-with = \"macports\""
</span><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:#ffe0e0;'>-
</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:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach stage {build destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ${stage}.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not force all Portfiles to switch from ${stage}.env to ${stage}.env-append
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo.environments {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global configure.cc configure.cxx subport build_arch universal_archs merger_configure_env merger_build_env merger_destroot_env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach stage {build destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${stage}.env-delete CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${stage}.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-port::register_callback cargo.environments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cargo_fetch 1.0
</span> 
 use_configure       no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default universal_variant yes
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           cargo build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.cmd   {"${cargo.bin} build"}
</span> build.target
 build.pre_args      --release --frozen -v -j${build.jobs}
 build.args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append    RUSTFLAGS="-C linker=${configure.cc}"
</span> 
 destroot {
     ui_error "No destroot phase in the Portfile!"
<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_fetch-1.0.tcl
</span>similarity index 60%
copy from _resources/port1.0/group/cargo-1.0.tcl
copy to _resources/port1.0/group/cargo_fetch-1.0.tcl
<span style='display:block; white-space:pre;color:#808080;'>index 17cc1ea..e028873 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_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span> #
 # Usage:
 #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup     cargo 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroup     cargo_fetch 1.0
</span> #
 # cargo.crates \
 #     foo  1.0.1  abcdef123456... \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,10 +62,11 @@
</span> #    baz    author/baz  branch  abcdef12345678...commit...abcdef12345678  fedcba654321...
 #
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cargo.home cargo.crates cargo.crates_github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cargo.bin cargo.home cargo.crates cargo.crates_github
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.home      {${workpath}/.home/.cargo}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.crates    {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cargo.bin           {${prefix}/bin/cargo}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cargo.home          {${workpath}/.home/.cargo}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cargo.crates        {}
</span> default cargo.crates_github {}
 
 option_proc cargo.crates handle_cargo_crates
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +148,16 @@ proc cargo._import_crate_github {cname cgithub crevision chksum cratefile} {
</span> 
 # The distfiles of the main port will also be stored in this directory,
 # but this is the only way to allow reusing the same crates across multiple ports.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir             cargo-crates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default dist_subdir     {[cargo._dist_subdir]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc cargo._dist_subdir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global name cargo.crates cargo.crates_github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[llength ${cargo.crates}] > 0 || [llength ${cargo.crates_github}]>0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return cargo-crates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 default extract.only    {[cargo._disttagclean $distfiles]}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,38 +190,70 @@ proc cargo._disttagclean {list} {
</span>     return $val
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build           port:cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "cargo-bootstrap" && ${subport} ne "cargo-stage1" && ${subport} ne "cargo"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append port:cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # do not force all Portfiles to switch from depends_build to depends_build-append
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    proc cargo.add_dependencies {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-delete port:cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append port:cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    port::register_callback cargo.add_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 post-extract {
<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;'>+    if {[llength ${cargo.crates}] > 0 || [llength ${cargo.crates_github}]>0} {
</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:#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:#e0ffe0;'>+
</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;'>-    close $conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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:#e0ffe0;'>+# MacPorts use the name i386 for 32-bit Intel architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Cargo and Rust use the name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc cargo.translate_arch_name {arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return "i686"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return ${arch}
</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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc cargo.rust_platform {{arch ""}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global os.platform build_arch muniversal.current_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${arch} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[info exists muniversal.current_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set arch ${muniversal.current_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set arch ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    return [cargo.translate_arch_name ${arch}]-apple-${os.platform}
</span> }
 
 foreach stage {build destroot} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,35 +262,62 @@ foreach stage {build destroot} {
</span>                         CXX=${configure.cxx}
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # do not force all Portfiles to switch from ${stage}.env to ${stage}.env-append
 proc cargo.environments {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global configure.cc configure.cxx subport build_arch universal_archs merger_configure_env merger_build_env merger_destroot_env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global configure.cc configure.cxx subport build_arch universal_archs merger_configure_env merger_build_env merger_destroot_env worksrcpath
</span>     foreach stage {build destroot} {
         ${stage}.env-delete CC=${configure.cc} \
                             CXX=${configure.cxx}
         ${stage}.env-append CC=${configure.cc} \
                             CXX=${configure.cxx}
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${stage}.env-delete RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
</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;'>+    # CARGO_BUILD_TARGET does not work correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see the patchfile path-dyld.diff in cargo Portfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${subport} ne "cargo-stage1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${stage}.env-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${stage}.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    lappend merger_${stage}_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        CARGO_BUILD_TARGET=[cargo.rust_platform ${arch}]
</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;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 port::register_callback cargo.environments
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           cargo build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args      --release --frozen -v -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append    RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_error "No destroot phase in the Portfile!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg "Here is an example destroot phase:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg "destroot {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg {    xinstall -m 755 ${worksrcpath}/target/release/${name} ${destroot}${prefix}/bin/}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg {    xinstall -m 444 ${worksrcpath}/doc/${name}.1 ${destroot}${prefix}/share/man/man1/}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg "}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg "Please check if there are additional files (configuration, documentation, etc.) that need to be installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    error "destroot phase not implemented"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# override universal_setup found in portutil.tcl so it uses muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/51643 for a similar case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc universal_setup {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_exists universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "universal variant already exists, so not adding the default one"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[exists universal_variant] && ![option universal_variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "universal_variant is false, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[exists use_xmkmf] && [option use_xmkmf]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "using xmkmf, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "OS doesn't support universal builds, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[llength [option supported_archs]] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "only one arch supported, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_debug "adding universal variant via PortGroup muniversal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        uplevel "PortGroup muniversal 1.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
<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 9c84a1e..c272c38 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;'>@@ -1,9 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=portfile:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    rust-lang ${name} 0.25.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         0.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cargo 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        rust-lang cargo 0.25.0
</span> #revision            0
 categories          devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,87 +24,285 @@ long_description    Cargo downloads your Rust project’s dependencies and \
</span> 
 homepage            https://crates.io
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# can use cmake or cmake-devel; default to cmake.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       path:bin/cmake:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # can use cmake or cmake-devel; default to cmake.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build   path:bin/cmake:cmake \
</span>                     bin:python:python27
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib     path:lib/libssl.dylib:openssl \
</span>                     port:curl \
                     port:rust
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-installs_libs       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  269eba2a358c3f690cbe5ca88776608cce26f54b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  00241ec54c1c48e0ae93963174f6240f26fddbdec0b0b51478c2ee500551f3aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    973758
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant   no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # use DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # without this change, --target and CARGO_BUILD_TARGET fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://users.rust-lang.org/t/subprocess-and-dynamic-library-linking-problem-interaction/7873
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://github.com/rust-lang/cargo/issues/2888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   path-dyld.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use an older version of cargo to build itself
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(version)  0.24.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(platform) ${build_arch}-apple-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # create Cargo.lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "${cargo.bin} update"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set stage0(platform) i686-apple-darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-extract {
</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:#e0ffe0;'>+            }
</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:#ffe0e0;'>-set stage0(distname) ${name}-${stage0(version)}-${stage0(platform)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set stage0(distfile) ${stage0(distname)}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.env-append OPENSSL_DIR=${prefix}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites-append https://static.rust-lang.org/dist/:stage0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append    ${stage0(distfile)}:stage0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:${name}-stage1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  269eba2a358c3f690cbe5ca88776608cce26f54b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  00241ec54c1c48e0ae93963174f6240f26fddbdec0b0b51478c2ee500551f3aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    973758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cargo.bin ${prefix}/libexec/${name}-stage1/bin/cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall ${worksrcpath}/target/[cargo.rust_platform]/release/cargo ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                {*}[glob ${worksrcpath}/src/etc/man/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d ${destroot}${prefix}/etc/bash_completion.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/src/etc/cargo.bashcomp.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/etc/bash_completion.d/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d ${destroot}${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/src/etc/_cargo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # --target and CARGO_BUILD_TARGET do not work correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # see the patchfile path-dyld.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        universal_variant   no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:${name}-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cargo.bin ${prefix}/libexec/${name}-bootstrap/bin/cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall ${worksrcpath}/target/release/cargo ${destroot}${prefix}/libexec/${subport}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/doc/${subport}
</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;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    master_sites-append https://static.rust-lang.org/dist/:stage0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "i386"} {
</span>     checksums-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${stage0(distfile)} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${name}-${version}-i686-apple-darwin${extract.suffix} \
</span>                     rmd160  17458dce93eb7e644385bd82ecb511311765e5e6 \
                     sha256  6b7a0a97e0d87cca7b7a5e090d168be6cdbb03298381bece33df493447e17e76 \
                     size    3909191
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     checksums-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${stage0(distfile)} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${name}-${version}-x86_64-apple-darwin${extract.suffix} \
</span>                     rmd160  ac5eff8ae2489845f9761c275b03677a50309c1a \
                     sha256  b6f7c662ea75a94f5a5e41c2fee95f09a5ba168429ac8cdd41f6ba2c78d1b07f \
                     size    4215369
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# github.setup sets this to yes, breaking the stage0 fetch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.ignore_sslcert no
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# set DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# without this change, --target fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://users.rust-lang.org/t/subprocess-and-dynamic-library-linking-problem-interaction/7873
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/rust-lang/cargo/issues/2888
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   path-dyld.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_platform [cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distfiles  ${name}-${version}-${rust_platform}${extract.suffix}:stage0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        worksrcdir ${name}-${version}-${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distfiles ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set rust_platform [cargo.rust_platform ${arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distfiles-append  ${name}-${version}-${rust_platform}${extract.suffix}:stage0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d -m 0755 ${workpath}/${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set rust_platform [cargo.rust_platform ${arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                move ${workpath}/${name}-${version}-${rust_platform} ${workpath}/${name}-${version}-${arch}
</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;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           ${workpath}/${stage0(distname)}/${name}/bin/cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          --release -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env           OPENSSL_DIR=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0755 ${worksrcpath}/cargo/bin/cargo ${destroot}${prefix}/libexec/${subport}/bin
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append    CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall ${worksrcpath}/target/release/cargo ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall {*}[glob ${worksrcpath}/src/etc/man/*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${prefix}/share/doc/${subport}
</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:#ffe0e0;'>-    xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY README.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-bootstrap {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${prefix}/etc/bash_completion.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall ${worksrcpath}/src/etc/cargo.bashcomp.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/etc/bash_completion.d/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-stage1 {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall ${worksrcpath}/src/etc/_cargo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cargo.crates \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        aho-corasick 0.5.3 ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        aho-corasick 0.6.4 d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        atty 0.2.8 af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        backtrace 0.3.5 ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        backtrace-sys 0.1.16 44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        bitflags 0.9.1 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        bitflags 1.0.1 b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        bufstream 0.1.3 f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cc 1.0.9 2b4911e4bdcb4100c7680e7e854ff38e23f1b34d4d9e079efae3da2801341ffc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cfg-if 0.1.2 d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cmake 0.1.29 56d741ea7a69e577f6d06b36b7dff4738f680593dc27a701ffa8506b73ce28bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        commoncrypto 0.2.0 d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        commoncrypto-sys 0.2.0 1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        core-foundation 0.4.6 8047f547cd6856d45b1cdd75ef8d2f21f3d0e4bf1dab0a0041b0ae9a5dda9c0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        core-foundation-sys 0.4.6 152195421a2e6497a8179195672e9d4ee8e45ed8c465b626f1606d27a08ebcd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        crossbeam 0.2.12 bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        crossbeam 0.3.2 24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        crypto-hash 0.3.1 09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        curl 0.4.11 b70fd6394677d3c0e239ff4be6f2b3176e171ffd1c23ffdc541e78dea2b8bb5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        curl-sys 0.4.1 f46e49c7125131f5afaded06944d6888b55cbdf8eba05dae73c954019b907961 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        docopt 0.8.3 d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        dtoa 0.4.2 09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        env_logger 0.4.3 3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        failure 0.1.1 934799b6c1de475a012a02dab0ace1ace43789ee4b99bcfbf1a2e3e8ced5de82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        failure_derive 0.1.1 c7cdda555bb90c9bb67a3b670a0f42de8e73f5981524123ad8578aafec8ddb8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        filetime 0.1.15 714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        flate2 1.0.1 9fac2277e84e5e858483756647a9d0aa8d9a2b7cba517fd84325a0aaa69a0909 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fnv 1.0.6 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreign-types 0.3.2 f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreign-types-shared 0.1.1 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fs2 0.4.3 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fuchsia-zircon 0.3.3 2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fuchsia-zircon-sys 0.3.3 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        git2 0.6.11 ee5b4bb7cd2a44e6e5ee3a26ba6a9ca10d4ce2771cdc3839bbc54b47b7d1be84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        git2-curl 0.7.0 68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        glob 0.2.11 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        globset 0.2.1 464627f948c3190ae3d04b1bc6d7dca2f785bda0ac01278e6db129ad383dbeb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        hamcrest 0.1.1 bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        hex 0.2.0 d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        hex 0.3.1 459d3cf58137bb02ad4adeef5036377ff59f066dbb82517b7192e3a5462a2abc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        home 0.3.2 8f94f6fbdc000a6eba0c8cf08632b2091bb59141d36ac321a2a96d6365e5e4dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        idna 0.1.4 014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ignore 0.2.2 b3fcaf2365eb14b28ec7603c98c06cc531f19de9eb283d89a3dff8417c8c99f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        itoa 0.4.1 c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        jobserver 0.1.11 60af5f849e1981434e4a31d3d782c4774ae9b434ce55b101a96ecfd09147e8be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        kernel32-sys 0.2.2 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lazy_static 0.2.11 76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lazy_static 1.0.0 c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        libc 0.2.40 6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        libgit2-sys 0.6.19 6eeae66e7b1c995de45cb4e65c5ab438a96a7b4077e448645d4048dc753ad357 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        libssh2-sys 0.2.6 0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        libz-sys 1.0.18 87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        log 0.3.9 e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        log 0.4.1 89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        matches 0.1.6 100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        memchr 0.1.11 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        memchr 1.0.2 148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        memchr 2.0.1 796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        miniz-sys 0.1.10 609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        miow 0.2.1 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        net2 0.2.32 9044faf1413a1057267be51b5afba8eb1090bd2231c693664aa1db716fe1eae0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num 0.1.42 4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-bigint 0.1.43 81b483ea42927c463e191802e7334556b48e7875297564c0e9951bd3a0ae53e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-complex 0.1.43 b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-integer 0.1.36 f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-iter 0.1.35 4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-rational 0.1.42 ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num-traits 0.2.2 dee092fcdf725aee04dd7da1d21debff559237d49ef1cb3e69bcb8ece44c7364 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        num_cpus 1.8.0 c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        openssl 0.10.5 1636c9f1d78af9cbcc50e523bfff4a30274108aad5e86761afd4d31e4e184fa7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        openssl-probe 0.1.2 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        openssl-sys 0.9.27 d6fdc5c4a02e69ce65046f1763a0181107038e02176233acb0b3351d7cc588f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        percent-encoding 1.0.1 31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pkg-config 0.3.9 3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        proc-macro2 0.2.3 cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        psapi-sys 0.1.1 1f71c7e142c25f297077a8ebc21f10847096b5d21ad7619d7bf0c1fcecb40bb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        quote 0.3.15 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        quote 0.4.2 1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rand 0.4.2 eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        redox_syscall 0.1.37 0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        redox_termios 0.1.1 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        regex 0.1.80 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        regex 0.2.10 aec3f58d903a7d2a9dc2bf0e41a746f4530e0cab6b615494e058f67a3ef947fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        regex-syntax 0.3.9 f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        regex-syntax 0.5.3 b2550876c31dc914696a6c2e01cbce8afba79a93c8ae979d2fe051c0230b3756 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        remove_dir_all 0.5.0 dfc5b3ce5d5ea144bb04ebd093a9e14e9765bcfec866aecda9b6dec43b3d1e24 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rustc-demangle 0.1.7 11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rustc-serialize 0.3.24 dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        same-file 0.1.3 d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        schannel 0.1.11 fbaffce35eb61c5b00846e73128b0cd62717e7c0ec46abbec132370d013975b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        scoped-tls 0.1.1 8674d439c964889e2476f474a3bf198cc9e199e77499960893bac5de7e9218a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        scopeguard 0.3.3 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        semver 0.8.0 bee2bc909ab2d8d60dab26e8cad85b25d795b14603a0dcb627b78b9d30b6454b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        semver-parser 0.7.0 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        serde 1.0.36 c70142ae874a42c70e03c63c6a49abe2ea0079b090bf6e136e99252fc1974bd6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        serde_derive 1.0.36 6fffe22d41dbddcead5b2c380c4714d44f2eb39292f7e7a0d966d2d45bf56408 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        serde_derive_internals 0.22.2 d2f04ed291686ce195a5c8f554aaf36e50a721fbf829ee3b6151e6f85eccf945 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        serde_ignored 0.0.4 190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        serde_json 1.0.13 5c508584d9913df116b91505eec55610a2f5b16e9ed793c46e4d0152872b3e74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        shell-escape 0.1.4 170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        socket2 0.3.4 71ebbe82fcdd697244ba7fe6e05e63b5c45910c3927e28469a04947494ff48d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        strsim 0.6.0 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        syn 0.11.11 d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        syn 0.12.15 c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        synom 0.11.3 a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        synstructure 0.6.1 3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        tar 0.4.14 1605d3388ceb50252952ffebab4b5dc43017ead7e4481b175961c283bb951195 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        tempdir 0.3.7 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        termcolor 0.3.6 adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        termion 1.5.1 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        thread-id 2.0.0 a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        thread_local 0.2.7 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        thread_local 0.3.5 279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        toml 0.4.5 a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ucd-util 0.1.1 fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        unicode-bidi 0.3.4 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        unicode-normalization 0.1.5 51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        unicode-xid 0.0.4 8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        unicode-xid 0.1.0 fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        unreachable 1.0.0 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        url 1.7.0 f808aadd8cfec6ef90e4a14eb46f24511824d1ac596b9682703c87056c8678b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        userenv-sys 0.2.0 71d28ea36bbd9192d75bd9fa9b39f96ddb986eaee824adae5d53b6e51919b2f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        utf8-ranges 0.1.3 a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        utf8-ranges 1.0.0 662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        vcpkg 0.2.2 9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        void 1.0.2 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        walkdir 1.0.7 bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        winapi 0.2.8 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        winapi 0.3.4 04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        winapi-build 0.1.1 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        winapi-i686-pc-windows-gnu 0.4.0 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        winapi-x86_64-pc-windows-gnu 0.4.0 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        wincolor 0.1.6 eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ws2_32-sys 0.2.1 d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mesalink/Portfile b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd02987..8954977 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> 
 PortSystem          1.0
 PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           cargo 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cargo_fetch 1.0
</span> 
 github.setup        mesalock-linux mesalink 0.6.0 v
 categories          devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,11 @@ checksums           mesalink-${version}.tar.gz \
</span>                     sha256  9d9c3cbafbeaab3355f8aa11fc302116f54a875976e43f3c94b7345136259881 \
                     size    132238
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs     x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# find files in the correct location when CARGO_BUILD_TARGET is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cargo.crates \
     aho-corasick             0.6.4  d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4 \
     arrayvec                 0.4.7  a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,18 +79,6 @@ cargo.crates_github \
</span>     enum_to_str_derive  kevinis/enum_to_str_derive   master    35a1c87b4746525dbadda438d1f37f59d414e450  f63ab650488f2b3b6f08357d9739f8fb8822b270723d40d4be7cecee58695ac1
 
 use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# cargo port group overrides the destroot phase,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# restore the default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    do-destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 # Release 0.6.1 is broken as it does not contain Cargo.lock
 # https://github.com/mesalock-linux/mesalink/issues/10
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mesalink/files/patch-configure.diff b/devel/mesalink/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7d305c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mesalink/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig      2018-04-02 20:38:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac   2018-05-02 05:48:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CARGO_TARGET_ARGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CARGO_RUSTC_ARGS="$CARGO_RUSTC_ARGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    CARGO_TARGET_SUBDIR="$CARGO_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    CARGO_TARGET_SUBDIR_ENV_VAR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    CARGO_TARGET_SUBDIR="$CARGO_BUILD_TARGET/$CARGO_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    CARGO_TARGET_SUBDIR_ENV_VAR="CARGO_TARGET_SUBDIR=$CARGO_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CARGO_TARGET_ARGS="--target $RUST_HOST"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CARGO_RUSTC_ARGS="$CARGO_RUSTC_ARGS -C linker=$CC"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/racer/Portfile b/devel/racer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2eaff7e..d5ebd72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/racer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/racer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,12 @@
</span> 
 PortSystem          1.0
 PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cargo 1.0
</span> 
 github.setup        racer-rust racer 2.0.12
 categories          devel
 platforms           darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant   no
</span> license             MIT
 maintainers         sean openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,18 +16,58 @@ long_description    RACER = Rust Auto-Complete-er. A utility intended to \
</span>                     provide rust code completion for editors and IDEs.
 
 depends_lib         port:rust
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:cargo
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  7072507edf67ba93ce554792574270a8853c1a53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  b6ee99363dc5c30d9f87bf6802d37b43d3e9be3b5b328540c812df29aee14204
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd           cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          --release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env           RUSTFLAGS="-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           racer-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  7072507edf67ba93ce554792574270a8853c1a53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b6ee99363dc5c30d9f87bf6802d37b43d3e9be3b5b328540c812df29aee14204 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    151442
</span> 
 destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    copy ${worksrcpath}/target/release/racer ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    copy ${worksrcpath}/target/[cargo.rust_platform]/release/racer ${destroot}${prefix}/bin/
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cargo.crates \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    aho-corasick 0.5.3 ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ansi_term 0.9.0 23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    atty 0.2.2 d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    bitflags 0.7.0 aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    bitflags 0.9.1 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    clap 2.26.2 3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    clippy 0.0.103 5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    clippy_lints 0.0.103 ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conv 0.3.3 78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    custom_derive 0.1.7 ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    env_logger 0.3.5 15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    kernel32-sys 0.2.2 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    lazy_static 0.2.8 3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    libc 0.2.31 d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    log 0.3.8 880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    magenta 0.1.1 4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    magenta-sys 0.1.1 40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    matches 0.1.6 100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    memchr 0.1.11 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    nom 1.2.4 a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    quine-mc_cluskey 0.2.4 07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    rand 0.3.16 eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    regex 0.1.80 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    regex-syntax 0.3.9 f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    rustc-serialize 0.3.24 dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    semver 0.2.3 2d5b7638a1f03815d94e88cb3b3c08e87f0db4d683ef499d1836aaf70a45623f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    strsim 0.6.0 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    syntex_errors 0.52.0 9e52bffe6202cfb67587784cf23e0ec5bf26d331eef4922a16d5c42e12aa1e9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    syntex_pos 0.52.0 955ef4b16af4c468e4680d1497f873ff288f557d338180649e18f915af5e15ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    syntex_syntax 0.52.0 76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    term 0.4.6 fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    term_size 0.3.0 e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    textwrap 0.8.0 df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    thread-id 2.0.0 a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    thread_local 0.2.7 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    toml 0.1.30 0590d72182e50e879c4da3b11c6488dae18fccb1ae0c7a3eda18e16795844796 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    toml 0.2.1 736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    unicode-normalization 0.1.5 51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    unicode-width 0.1.4 bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    unicode-xid 0.0.3 36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    utf8-ranges 0.1.3 a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    vec_map 0.8.0 887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    winapi 0.2.8 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    winapi-build 0.1.1 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65cff2b..ff44faa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,36 +64,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span>                     port:cargo \
                     port:rust
 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup   cargo_fetch 1.0
</span> 
     # when CARGO_BUILD_TARGET is set, directory structure changes
     patchfiles-append   patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set arch_name i686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set arch_name i686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> }
 
 gobject_introspection yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fd/Portfile b/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5100103..cd32a02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,10 +77,10 @@ pre-build {
</span>     file mkdir ${worksrcpath}/shell_completions
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append    SHELL_COMPLETIONS_DIR="${worksrcpath}/shell_completions"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append    SHELL_COMPLETIONS_DIR="shell_completions"
</span> 
 destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/target/release/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 ${worksrcpath}/target/[cargo.rust_platform]/release/${name} ${destroot}${prefix}/bin/
</span>     xinstall -m 444 ${worksrcpath}/doc/${name}.1 ${destroot}${prefix}/share/man/man1/
 
     xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/ripgrep/Portfile b/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1ae1f1..850ae0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,10 +68,10 @@ depends_build-append \
</span>                     port:docbook-xsl-nons
 
 destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/target/release/rg ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 ${worksrcpath}/target/[cargo.rust_platform]/release/rg ${destroot}${prefix}/bin/
</span>     ln -s rg ${destroot}${prefix}/bin/ripgrep
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set outpath ${worksrcpath}/target/release/build/ripgrep-65e5a64db1247a47/out/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set outpath ${worksrcpath}/target/[cargo.rust_platform]/release/build/ripgrep-c06d1a60bbe49ad3/out/
</span>     xinstall -m 644 ${outpath}/rg.1 ${destroot}${prefix}/share/man/man1/
     xinstall -d -m 755 ${destroot}${prefix}/share/bash-completion/completions
     xinstall -m 644 ${outpath}/rg.bash ${destroot}${prefix}/share/bash-completion/completions/rg
</pre><pre style='margin:0'>

</pre>