1 files changed, 7 insertions, 10 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 01afde5afad9..a82378ac592a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -5380,23 +5380,20 @@ PACKAGE-DEPENDS-LIST?= \
 
 ACTUAL-PACKAGE-DEPENDS?= \
 	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
-		for pkgname in ${PKG_DBDIR}/*; do \
+		origins=$$(for pkgname in ${PKG_DBDIR}/*; do \
 			if [ -e $$pkgname/+CONTENTS ]; then \
-				a=$${pkgname\#\#*/}; \
-				b=`${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS`; \
-				if [ ! -z $$b ]; then \
-					origins="$$origins $$a $$b"; \
-				fi; \
+				${ECHO_CMD} $${pkgname\#\#*/}; \
+				${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS; \
 			fi; \
-		done; \
+		done); \
 		for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
 			tmp=$${dir%/*}; \
 			dir=$${tmp\#\#*/}/$${dir\#\#*/}; \
 			set -- $$origins; \
-			while [ $$\# != 0 ]; do \
-				if [ $$dir = $$2 ]; then \
+			while [ $$\# -gt 1 ]; do \
+				if [ "$$dir" = "$$2" ]; then \
 					${ECHO_CMD} $$1:$$dir; \
-					if [ -e ${PKG_DBDIR}/$$1/+CONTENTS ]; then \
+					if [ -e ${PKG_DBDIR}/$$1/+CONTENTS -a -z "${EXPLICIT_PACKAGE_DEPENDS}" ]; then \
 						packagelist="$$packagelist ${PKG_DBDIR}/$$1/+CONTENTS"; \
 					fi; \
 					break; \