From fe9c30f5da74aabd53b3f59f4ff3560ab9e6f983 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Mon, 9 Jul 2012 04:30:34 -0500
Subject: [PATCH] script/makepkg: complete all config and fetch steps first;
 then proceed with chport

---
 script/makepkg | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/script/makepkg b/script/makepkg
index 490e904..573c49f 100755
--- a/script/makepkg
+++ b/script/makepkg
@@ -566,13 +566,29 @@ pkg_fixdeps() {
 # Be sure to chsetup and populate your config before running!
 chport() {
   [ "${#}" -gt 0 ] || set -- $(cat ${conf_dir}/port.lst)
+
+  # Stash the current list of ports
+  kvs_unset_all 'chport'
+  kvs_set 'chport' 'port.lst' "${*}"
+
+  # Complete all config and fetch steps first
+  for step in port_config_recursive port_fetch_recursive
+  do
+    set -- $(kvs_get 'chport' 'port.lst')
+    while [ "${1}" ]
+    do
+      local port="${1}"
+      meh "=> Step ${step}"
+      ${step} ${port}
+      shift
+    done
+  done
+
+  # Now process the remaining steps
+  set -- $(kvs_get 'chport' 'port.lst')
   while [ "${1}" ]
   do
     local port="${1}"
-    meh "config-recursive"
-    port_config_recursive "${port}"
-    meh "fetch-recursive"
-    port_fetch_recursive "${port}"
     meh "load-deps"
     port_load_deps "${port}"
     meh "build"
-- 
2.42.0