diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh
--- a/Mk/Scripts/depends-list.sh
+++ b/Mk/Scripts/depends-list.sh
@@ -76,7 +76,7 @@
 				;;
 			esac
 			if [ -f ${d}/Makefile ]; then
-				if [ -n $f ]; then
+				if [ -n "$f" ]; then
 					export FLAVOR=$f
 				fi
 				break
@@ -91,9 +91,9 @@
 		fi
 
 		case " ${checked} " in
-			*\ ${d}\ *) continue ;; # Already checked
+			*\ ${port_display}\ *) continue ;; # Already checked
 		esac
-		checked="${checked} ${d}"
+		checked="${checked} ${port_display}"
 		# Check if the dependency actually exists or skip otherwise.
 		if [ ! -d "${d}" ]; then
 			echo "${dp_PKGNAME}: \"${port_display}\" non-existent -- dependency list incomplete" >&2