<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch variant-support
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/50fad119c13a9165c1102d1b436712fb6a6b55a4">https://github.com/macports/mpbb/commit/50fad119c13a9165c1102d1b436712fb6a6b55a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 50fad119c13a9165c1102d1b436712fb6a6b55a4
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Mar 11 16:38:36 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Support specifying variants in install-dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/52742
</span>---
mpbb-install-dependencies | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ce2309..da76f46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ install-dependencies-usage() {
</span> # "prog" is defined in mpbb-help.
# shellcheck disable=SC2154
cat <<EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-usage: $prog [<global opts>] install-dependencies <port>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+usage: $prog [<global opts>] install-dependencies <port>[@(+|-)variant [...]]
</span>
Build and install the dependencies of the given port.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,12 @@ EOF
</span> }
install-dependencies() {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- local port=${1-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -z $port ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ -z $1 ]]; then
</span> err "Must specify a port"
return 1
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ local port=${1%%@*}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local portvariants=${1:${#port}+1}
</span> local dependencies
local dependencies_count
local dependencies_counter
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +42,7 @@ install-dependencies() {
</span> # calculate list of dependencies in-order
# $option_prefix and $thisdir are set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "$@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "$port" "$portvariants")
</span> if [ $? -ne 0 ]; then
echo "Calculating dependencies for '$port' failed, aborting." >&2
echo "Building '$port' ... [ERROR] (failed to calculate dependencies) maintainers: $(get-maintainers "$port")." >> "$log_subports_progress"
</pre><pre style='margin:0'>
</pre>