From 52c1cf84b76a503431a3799caa610346dfbea5a7 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Mon, 9 Jul 2012 07:31:29 -0500
Subject: [PATCH] script/makepkg: exclude current port from
 port_available_deps; sort output too

---
 script/makepkg | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/script/makepkg b/script/makepkg
index 573c49f..a1f57e0 100755
--- a/script/makepkg
+++ b/script/makepkg
@@ -413,10 +413,7 @@ port_fetch_recursive() {
 
 # Recursively compute all dependencies to load; avoid loading packages whose
 # depgraph is incomplete, since that can cause strange behaviour at build time
-port_available_deps() {
-  # Clear cache if first value isn't '-r'
-  [ "${1}" = '-r' ] && shift || kvs_unset_all 'port_available_deps'
-
+port_available_deps_recursive() {
   local port="${1}"
   local dependency
   local good=good
@@ -431,7 +428,7 @@ port_available_deps() {
     do
       #echo "C==> Computing ${dependency}" >&2
       # Recurse into dependency
-      port_available_deps -r "${dependency}" || unset good
+      port_available_deps_recursive "${dependency}" || unset good
     done
     local pkgfile="${final_bdeps_dir}/$(port2pkg "${port}").tbz"
     [ "${good}" -a -f "${pkgfile}" ] && echo "${port}" || unset good
@@ -441,6 +438,12 @@ port_available_deps() {
   [ "${good}" ]
 }
 
+port_available_deps() {
+  local port="${1}"
+  kvs_unset_all 'port_available_deps'
+  port_available_deps_recursive "${port}" | grep -v "^${port}$" | sort
+}
+
 # Copy in and install dependency packages
 # Missing dependencies are not fatal, since a port build will rebuild them anyways
 port_load_deps() {
-- 
2.42.0