From 4162046ce0f29867d71cca6778d65dbb39b37d05 Mon Sep 17 00:00:00 2001
From: Joshua Root <jmr@macports.org>
Date: Sun, 12 Feb 2017 21:26:34 +1100
Subject: [PATCH] Fix gathering archives when ports are inactive

---
 mpbb-gather-archives      | 2 +-
 mpbb-install-dependencies | 4 ++++
 mpbb-install-port         | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mpbb-gather-archives b/mpbb-gather-archives
index e854265..9bbb727 100644
--- a/mpbb-gather-archives
+++ b/mpbb-gather-archives
@@ -51,7 +51,7 @@ gather-archives() {
     mkdir -p "${option_staging_dir}" || return
 
     status=0
-    for archive_path in $("${option_prefix}/bin/port" -q location active); do
+    for archive_path in $("${option_prefix}/bin/port" -q location $(cat "${option_work_dir}/all_ports"); do
         archive_port=$(basename "$(dirname "${archive_path}")")
         archive_basename=$(basename "${archive_path}")
 
diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
index a6d4f25..1402587 100644
--- a/mpbb-install-dependencies
+++ b/mpbb-install-dependencies
@@ -92,6 +92,8 @@ install-dependencies() {
         return 1
     fi
 
+    rm -f "${option_work_dir}/all_ports"
+
     while read -r dependency; do
         # Split portname +variant1+variant2 into portname and variants, where
         # the variants are optional.
@@ -142,6 +144,8 @@ install-dependencies() {
                 "${option_prefix}/bin/port" -fp deactivate active
             fi
         fi
+        # add to the list for gather_archives
+        echo "$dependency" >> "${option_work_dir}/all_ports"
     done <<<"$dependencies"
 
     # activate everything now that we know it's all built and installed
diff --git a/mpbb-install-port b/mpbb-install-port
index 6759108..c972781 100644
--- a/mpbb-install-port
+++ b/mpbb-install-port
@@ -49,6 +49,7 @@ install-port() {
         echo "$@ already installed, nothing to do"
         # log: summary for the portwatcher
         echo "Building '$port' ... [OK]" >> "$log_subports_progress"
+        echo "$@" >> "${option_work_dir}/all_ports"
         return 0
     fi
 
@@ -122,4 +123,6 @@ install-port() {
     if [ $? -eq 0 ] && [ -f "$port_mainlog" ]; then
         cp -f "$port_mainlog" "$log_port_main"
     fi
+
+    echo "$@" >> "${option_work_dir}/all_ports"
 }