<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f44d44387d86d296b4e0d235737d44bebfaf48c">https://github.com/macports/macports-ports/commit/6f44d44387d86d296b4e0d235737d44bebfaf48c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6f44d44 Revert a set of mistaken commits by MarcusCalhoun-Lopez
</span>6f44d44 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f44d44387d86d296b4e0d235737d44bebfaf48c
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Fri Apr 27 22:25:22 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> Revert a set of mistaken commits by MarcusCalhoun-Lopez
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commits:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ad74231453310610fd7432adb93fb5110ad4157d
</span><span style='display:block; white-space:pre;color:#404040;'> 8129b740cee3af8924b19df302ca1ab5cc2c5be1
</span><span style='display:block; white-space:pre;color:#404040;'> ef8a319b93196a8c24bc0ea786ceccdc72e2932a
</span><span style='display:block; white-space:pre;color:#404040;'> 2018e17bae76928704d88088e220dc036222a0f4
</span><span style='display:block; white-space:pre;color:#404040;'> 43fa62e3cd97c26170da5f061717b18ed41f8d7e
</span><span style='display:block; white-space:pre;color:#404040;'> 903a0f42ee73a1794f1bdb454d295bf27f16237e
</span><span style='display:block; white-space:pre;color:#404040;'> ca60330d222f981707c1277b023b044176f0d47f
</span><span style='display:block; white-space:pre;color:#404040;'> effc2886cf0bee00532024aa043b3fd3415d74cc
</span><span style='display:block; white-space:pre;color:#404040;'> 68a34f577814e3e5b3f444530262b109093da515
</span><span style='display:block; white-space:pre;color:#404040;'> e3bd4e336adc623e396a0b9495b578a1a3cf2452
</span><span style='display:block; white-space:pre;color:#404040;'> ab5c006fb4dc9bdf81be0516bf43bf6254f92f0b
</span><span style='display:block; white-space:pre;color:#404040;'> ecb4c4162ecd507cf6edcb85d39958912304a78c
</span><span style='display:block; white-space:pre;color:#404040;'> 00388e9305f5189b9bfc3b5442e92c1b8766b883
</span><span style='display:block; white-space:pre;color:#404040;'> d911e14f64df12efbcbdffa461da0337dbca1226
</span><span style='display:block; white-space:pre;color:#404040;'> 20e585feb55340dfe2a45d236f90fd2edecdb3e4
</span><span style='display:block; white-space:pre;color:#404040;'> 968ddf5b34bbba587c5c1335c24d79bb8e4ea481
</span><span style='display:block; white-space:pre;color:#404040;'> 24864aeda99bedbc183f882878df70e8b555aa0b
</span>---
_resources/port1.0/group/cargo-1.0.tcl | 231 +++++++--------------------------
devel/mesalink/Portfile | 13 +-
devel/racer/Portfile | 71 ++--------
graphics/librsvg/Portfile | 30 ++++-
sysutils/fd/Portfile | 35 +++--
textproc/ripgrep/Portfile | 31 ++---
6 files changed, 121 insertions(+), 290 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 96b605c..7e2fb52 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;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
#
# Copyright (c) 2018 The MacPorts Project
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# All rights reserved.
</span> #
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +11,7 @@
</span> # 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3. Neither the name of The MacPorts Project nor the names of its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3. Neither the name of Apple Computer, Inc. nor the names of its
</span> # contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +27,7 @@
</span> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This PortGroup supports the cargo build system
#
# Usage:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +38,7 @@
</span> # foo 1.0.1 abcdef123456... \
# bar 2.5.0 fedcba654321...
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The cargo.crates option expects a list with 3-tuples consisting of name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The cargo.crates option expects a list with 4-tuples consisting of name,
</span> # version, and sha256 checksum. Only sha256 is supported at this time as
# the checksum will be reused by cargo internally.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +46,6 @@
</span> # the upstream source code. The cargo2port generator can be used to automate
# updates of this list for new releases.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# To get a list of these, run in worksrcdir:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# cargo update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# grep \"checksum Cargo.lock | perl -pe 's/"checksum (\S*) (\S*) \S* = "(\S*)"/cargo.crates $1 $2 $3/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> # https://github.com/macports/macports-contrib/tree/master/cargo2port/cargo2port.tcl
#
# If Cargo.lock references pre-release versions, or in general references
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,17 +56,12 @@
</span> # cargo.crates_github \
# baz author/baz branch abcdef12345678...commit...abcdef12345678 fedcba654321...
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cargo.direct_call no (default) means that cargo is called from another program (e.g. make)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# cargo.cargo.worksrcdir_crates no (default) means that port does NOT provide crate files
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cargo.home cargo.crates cargo.crates_github cargo.direct_call cargo.worksrcdir_crates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cargo.home cargo.crates cargo.crates_github
</span>
default cargo.home {${workpath}/.home/.cargo}
default cargo.crates {}
default cargo.crates_github {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default universal_variant yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.direct_call no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cargo.worksrcdir_crates no
</span>
option_proc cargo.crates handle_cargo_crates
proc handle_cargo_crates {option action {value ""}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,11 +72,6 @@ proc handle_cargo_crates {option action {value ""}} {
</span> # a combination of crate name and checksum as unique identifier.
# As the :disttag cannot contain dots, the version number cannot be
# used.
<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> set cratetag crate-${cname}-${chksum}
distfiles-append ${cratefile}:${cratetag}
master_sites-append https://crates.io/api/v1/crates/${cname}/${cversion}/download?dummy=:${cratetag}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,38 +97,6 @@ proc handle_cargo_crates_github {option action {value ""}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc cargo.direct_call handle_cargo_direct_call
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc handle_cargo_direct_call {option action {value ""}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${action} eq "set" && ${value}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global build.jobs
</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 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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # restore destroot.cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default destroot.cmd {[portbuild::build_getmaketype]}
</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;'>-# MacPorts use the name i386 for 32-bit Intel architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Cargo and Rust use the name i686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cargo.translate_arch_name {arch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "i686"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${arch}
</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.rust_platform {arch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [cargo.translate_arch_name ${arch}]-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc cargo._extract_crate {cratefile} {
global cargo.home distpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,154 +139,60 @@ proc cargo._import_crate_github {cname cgithub crevision chksum cratefile} {
</span> # but this is the only way to allow reusing the same crates across multiple ports.
dist_subdir cargo-crates
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default extract.only {[cargo._disttagclean $distfiles]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default extract.only {${distname}${extract.suffix}}
</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;'>-if {${subport} ne "cargo-bootstrap" && ${subport} ne "cargo-stage1" && ${subport} ne "cargo"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not force all Portfiles to switch from depends_build to depends_build-append
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc cargo.add_dependencies {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:cargo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port::register_callback cargo.add_dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:cargo
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!${cargo.worksrcdir_crates}} {
</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:#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;'>+ # 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "replace-with = \"macports\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $conf "local-registry = \"/var/empty\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength ${cargo.crates_github}] > 0} {
</span> foreach {cname cgithub cbranch crevision chksum} ${cargo.crates_github} {
puts $conf "\[source.\"https://github.com/${cgithub}\"\]"
puts $conf "git = \"https://github.com/${cgithub}\""
puts $conf "branch = \"${cbranch}\""
puts $conf "replace-with = \"macports\""
}
<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;'>- foreach {cname cversion chksum} ${cargo.crates} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the libssh2-sys crate requires the header files from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a version of libssh2 that has not been released
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (e.g. channel.c uses the error code LIBSSH2_ERROR_CHANNEL_WINDOW_FULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure these header files are found properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cname} eq "libssh2-sys"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -tail -directory ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/include/ *.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../include/${f} ${cargo.home}/macports/libssh2-sys-${cversion}/libssh2/src/
</span><span style='display:block; white-space:pre;background:#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;'>-
</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;'>- #${stage}.env-append RUST_BACKTRACE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $conf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the existence of universal variant is not known until later in the install process
</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;'>- #${stage}.env-delete RUST_BACKTRACE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #${stage}.env-append RUST_BACKTRACE=1
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CARGO_BUILD_TARGET does not work correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see the patchfile path-dyld.diff in cargo Portfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "cargo-stage1"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage}.env-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${stage}.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=[cargo.rust_platform ${build_arch}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach stage {configure build destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_${stage}_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=[cargo.rust_platform ${arch}]
</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:#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:#ffe0e0;'>-port::register_callback cargo.environments
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# override universal_setup found in portutil.tcl so it uses muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/51643 for a similar case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc universal_setup {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "universal variant already exists, so not adding the default one"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[exists universal_variant] && ![option universal_variant]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "universal_variant is false, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[exists use_xmkmf] && [option use_xmkmf]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "using xmkmf, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "OS doesn't support universal builds, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[llength [option supported_archs]] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "only one arch supported, so not adding the default universal variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "adding universal variant via PortGroup muniversal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uplevel "PortGroup muniversal 1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd cargo build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args --release --frozen -v -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env 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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "No destroot phase in the Portfile!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Here is an example destroot phase:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "destroot {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg { xinstall -m 755 ${worksrcpath}/target/release/${name} ${destroot}${prefix}/bin/}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg { xinstall -m 444 ${worksrcpath}/doc/${name}.1 ${destroot}${prefix}/share/man/man1/}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ error "destroot phase not implemented"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;color:#808080;'>diff --git a/devel/mesalink/Portfile b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d59505..dd02987 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;'>@@ -21,8 +21,6 @@ checksums mesalink-${version}.tar.gz \
</span> sha256 9d9c3cbafbeaab3355f8aa11fc302116f54a875976e43f3c94b7345136259881 \
size 132238
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> cargo.crates \
aho-corasick 0.6.4 d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4 \
arrayvec 0.4.7 a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +76,16 @@ cargo.crates_github \
</span> use_autoreconf yes
use_configure yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --enable-rusthost=\$CARGO_BUILD_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cargo port group overrides the destroot phase,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# restore the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do-destroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/racer/Portfile b/devel/racer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07cd9ef..2eaff7e 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:#ffe0e0;'>-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:#e0ffe0;'>+universal_variant no
</span> license MIT
maintainers sean openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,65 +16,18 @@ 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:#e0ffe0;'>+depends_build port:cargo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums racer-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7072507edf67ba93ce554792574270a8853c1a53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6ee99363dc5c30d9f87bf6802d37b43d3e9be3b5b328540c812df29aee14204 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 151442
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7072507edf67ba93ce554792574270a8853c1a53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6ee99363dc5c30d9f87bf6802d37b43d3e9be3b5b328540c812df29aee14204
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cargo.direct_call yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# muniversal build requires Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append -f Makefile-Install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makefile [open ${worksrcpath}/Makefile-Install "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "install:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0755 target/\$(CARGO_BUILD_TARGET)/release/racer \$(DESTDIR)${prefix}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${makefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd cargo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args --release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env RUSTFLAGS="-C linker=${configure.cc}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cargo.crates \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aho-corasick 0.5.3 ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ansi_term 0.9.0 23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atty 0.2.2 d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bitflags 0.7.0 aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bitflags 0.9.1 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clap 2.26.2 3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clippy 0.0.103 5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clippy_lints 0.0.103 ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conv 0.3.3 78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- custom_derive 0.1.7 ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env_logger 0.3.5 15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kernel32-sys 0.2.2 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lazy_static 0.2.8 3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libc 0.2.31 d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log 0.3.8 880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- magenta 0.1.1 4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- magenta-sys 0.1.1 40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- matches 0.1.6 100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memchr 0.1.11 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nom 1.2.4 a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- quine-mc_cluskey 0.2.4 07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rand 0.3.16 eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regex 0.1.80 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regex-syntax 0.3.9 f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rustc-serialize 0.3.24 dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- semver 0.2.3 2d5b7638a1f03815d94e88cb3b3c08e87f0db4d683ef499d1836aaf70a45623f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strsim 0.6.0 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- syntex_errors 0.52.0 9e52bffe6202cfb67587784cf23e0ec5bf26d331eef4922a16d5c42e12aa1e9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- syntex_pos 0.52.0 955ef4b16af4c468e4680d1497f873ff288f557d338180649e18f915af5e15ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- syntex_syntax 0.52.0 76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- term 0.4.6 fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- term_size 0.3.0 e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- textwrap 0.8.0 df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thread-id 2.0.0 a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thread_local 0.2.7 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- toml 0.1.30 0590d72182e50e879c4da3b11c6488dae18fccb1ae0c7a3eda18e16795844796 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- toml 0.2.1 736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unicode-normalization 0.1.5 51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unicode-width 0.1.4 bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unicode-xid 0.0.3 36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utf8-ranges 0.1.3 a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_map 0.8.0 887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- winapi 0.2.8 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- winapi-build 0.1.1 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/target/release/racer ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 6516953..65cff2b 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,12 +64,36 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> port:cargo \
port:rust
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo.worksrcdir_crates yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 c5ca61c..5100103 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;'>@@ -22,8 +22,6 @@ checksums fd-${version}.tar.gz \
</span> sha256 e6ba21e66a295b9fb69bfc9a361813b3c7d73b8d29dc819d37d21af750814ee9 \
size 49655
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cargo.direct_call yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> cargo.crates \
aho-corasick 0.6.4 d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4 \
ansi_term 0.11.0 ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,23 +79,22 @@ pre-build {
</span>
build.env-append SHELL_COMPLETIONS_DIR="${worksrcpath}/shell_completions"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# muniversal build requires Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append -f Makefile-Install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makefile [open ${worksrcpath}/Makefile-Install "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "install:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0755 target/\$(CARGO_BUILD_TARGET)/release/${name} \$(DESTDIR)${prefix}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0444 doc/${name}.1 \$(DESTDIR)${prefix}/share/man/man1/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/doc/${name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0644 README.md LICENSE-MIT LICENSE-APACHE \$(DESTDIR)${prefix}/share/doc/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/target/release/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 444 ${worksrcpath}/doc/${name}.1 ${destroot}${prefix}/share/man/man1/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/bash-completion/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 644 ${worksrcpath}/shell_completions/fd.bash \$(DESTDIR)${prefix}/share/bash-completion/completions/fd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/zsh/site-functions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 644 ${worksrcpath}/shell_completions/_fd \$(DESTDIR)${prefix}/share/zsh/site-functions/_fd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/fish/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 644 ${worksrcpath}/shell_completions/fd.fish \$(DESTDIR)${prefix}/share/fish/completions/fd.fish"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README.md LICENSE-MIT LICENSE-APACHE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${makefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/shell_completions/fd.bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/bash-completion/completions/fd
</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 644 ${worksrcpath}/shell_completions/_fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/zsh/site-functions/_fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/fish/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/shell_completions/fd.fish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/fish/completions/fd.fish
</span> }
<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 95a9b9e..c62e042 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;'>@@ -67,25 +67,16 @@ depends_build-append \
</span> port:asciidoc \
port:docbook-xsl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cargo.direct_call yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/target/release/rg ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s rg ${destroot}${prefix}/bin/ripgrep
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# muniversal build requires Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OUTDIR contains a checksum, so it is not know until late in the build process and may
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# change with a change in the cargo PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append -f Makefile-Install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makefile [open ${worksrcpath}/Makefile-Install "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from ci/utils.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "OUTDIR=\$(shell find . -name ripgrep-stamp -print0 | xargs -0 ls -t | head -n1 | xargs dirname)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "install:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0755 target/\$(CARGO_BUILD_TARGET)/release/rg \$(DESTDIR)${prefix}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tln -s rg \$(DESTDIR)${prefix}/bin/ripgrep"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0644 \$(OUTDIR)/rg.1 \$(DESTDIR)${prefix}/share/man/man1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/bash-completion/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0644 \$(OUTDIR)/rg.bash \$(DESTDIR)${prefix}/share/bash-completion/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/fish/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0644 \$(OUTDIR)/rg.fish \$(DESTDIR)${prefix}/share/fish/completions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -d -m 0755 \$(DESTDIR)${prefix}/share/zsh/site-functions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${makefile} "\tinstall -m 0644 complete/_rg \$(DESTDIR)${prefix}/share/zsh/site-functions/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${makefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set outpath ${worksrcpath}/target/release/build/ripgrep-65e5a64db1247a47/out/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${outpath}/rg.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${outpath}/rg.bash ${destroot}${prefix}/share/bash-completion/completions/rg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/fish/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${outpath}/rg.fish ${destroot}${prefix}/share/fish/completions/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/complete/_rg ${destroot}${prefix}/share/zsh/site-functions/
</span> }
</pre><pre style='margin:0'>
</pre>