From 7f5f7018b92cc6fa09745c793261f399804e3fe0 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 25 Aug 2015 12:08:43 +0000
Subject: Make build-depends-list and run-depends-list accept dependency lines
without ${PORTSDIR}
Sponsored by: Gandi.net
---
Mk/bsd.port.mk | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 3a1047578d00..2f29c21b87f2 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4421,10 +4421,14 @@ build-depends-list:
BUILD-DEPENDS-LIST= \
for dir in $$(${ECHO_CMD} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
- if [ -d $$dir ]; then \
- ${ECHO_CMD} $$dir; \
+ case $$dir in \
+ /*) pdir=$$dir ;; \
+ *) pdir=${PORTSDIR}/$$dir ;; \
+ esac ; \
+ if [ -d $$pdir ]; then \
+ ${ECHO_CMD} $$pdir; \
else \
- ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
+ ${ECHO_MSG} "${PKGNAME}: \"$$pdir\" non-existent -- dependency list incomplete" >&2; \
fi; \
done | ${SORT} -u
@@ -4435,10 +4439,14 @@ run-depends-list:
RUN-DEPENDS-LIST= \
for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \
- if [ -d $$dir ]; then \
- ${ECHO_CMD} $$dir; \
+ case $$dir in \
+ /*) pdir=$$dir ;; \
+ *) pdir=${PORTSDIR}/$$dir ;; \
+ esac ; \
+ if [ -d $$pdir ]; then \
+ ${ECHO_CMD} $$pdir; \
else \
- ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
+ ${ECHO_MSG} "${PKGNAME}: \"$$pdir\" non-existent -- dependency list incomplete" >&2; \
fi; \
done | ${SORT} -u
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0