Ticket #52742: variants-mpbb-fully-outdated.diff

mpbb

@@ -8 +8 @@
 option_default_archive_site=https://packages.macports.org
 option_default_help=0
 option_default_port=
+option_default_variants=
 option_default_prefix=/opt/local
 option_default_staging_dir=${PWD:-/tmp/mp-buildbot}/archive-staging
 option_default_svn=$(which svn)
@@ -18 +19 @@
 option_archive_site=$option_default_archive_site
 option_help=$option_default_help
 option_port=$option_default_port
+option_variants=$option_default_variants
 option_prefix=$option_default_prefix
 option_staging_dir=$option_default_staging_dir
 option_svn=$option_default_svn
@@ -135 +137 @@
                     option_port=$2
                     shift
                     ;;
+                --variants)
+                    option_variants=$2
+                    shift
+                    ;;
                 --prefix)
                     option_prefix=$2
                     shift

mpbb-install-dependencies

@@ -26 +26 @@
     > "$log_status_dependencies"
 
     # calculate list of dependencies in-order
-    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
+    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}" ${option_variants})
     if [ $? -ne 0 ]; then
         echo "Calculating dependencies for '${option_port}' failed, aborting." >&2
         echo "[FAIL dependencies]" >> "$log_subports_progress"
@@ -60 +60 @@
         text="Installing dependency ($dependencies_counter of $dependencies_count) '${depname}' with variants '${depvariants}'"
         echo "----> ${text}"
         echo -n "${text} ... " >> "$log_status_dependencies"
-        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
+        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants ${option_variants}; then
             echo "Build of dependency '${depname}' failed, aborting." >&2
             echo "[FAIL]" >> "$log_status_dependencies"
             echo "[FAIL dependency '${depname}']" >> "$log_subports_progress"

mpbb-install-port

@@ -29 +29 @@
     echo -n "- Installing ${option_port} ... " >> "$log_subports_progress"
 
     local time_start=$(date +%s)
-    if ! "${option_prefix}/bin/port" -dk install "${option_port}"; then
+    if ! "${option_prefix}/bin/port" -dk install "${option_port}" ${option_variants}; then
         echo "Build of '${option_port}' failed."
         echo "[FAIL]" >> "$log_subports_progress"
         return 1