summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerwin <erwin@FreeBSD.org>2011-02-16 10:43:53 +0000
committererwin <erwin@FreeBSD.org>2011-02-16 10:43:53 +0000
commit8048a8ee058b36ec8e5fb953828ba95e189b6ad5 (patch)
treec29559736caabfa9d854b1c62ec960fd7eb305ba
parentb65f5769b11a5cfd6cf1c49dbe7c62c548e6a1d3 (diff)
downloadFreeBSD-ports-8048a8ee058b36ec8e5fb953828ba95e189b6ad5.zip
FreeBSD-ports-8048a8ee058b36ec8e5fb953828ba95e189b6ad5.tar.gz
Make actual-package-depends work with (unsupported) non-standard
subtrees of ${PORTSDIR} with depths other than 2. PR: 144482 Submitted by: brooks
-rw-r--r--Mk/bsd.port.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index bc8ca26..a08a834 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -5561,8 +5561,13 @@ ACTUAL-PACKAGE-DEPENDS?= \
fi; \
done); \
for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
- tmp=$${dir%/*}; \
- dir=$${tmp\#\#*/}/$${dir\#\#*/}; \
+ tmp=$${dir\#${PORTSDIR}/}; \
+ if [ "$$tmp" = "$$dir" ]; then \
+ tmp=$${dir%/*}; \
+ dir=$${tmp\#\#*/}/$${dir\#\#*/}; \
+ else \
+ dir=$$tmp; \
+ fi; \
set -- $$origins; \
while [ $$\# -gt 1 ]; do \
if [ ! -d "${PORTSDIR}/$$2" ]; then \
OpenPOWER on IntegriCloud