[Midnightbsd-cvs] mports [22259] trunk/Mk/bsd.mport.mk: fixup the path if the new syntax is used for installing LIB depends that are missing.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 18 09:54:35 EST 2017
Revision: 22259
http://svnweb.midnightbsd.org/mports/?rev=22259
Author: laffer1
Date: 2017-02-18 09:54:35 -0500 (Sat, 18 Feb 2017)
Log Message:
-----------
fixup the path if the new syntax is used for installing LIB depends that are missing.
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2017-02-18 14:35:15 UTC (rev 22258)
+++ trunk/Mk/bsd.mport.mk 2017-02-18 14:54:35 UTC (rev 22259)
@@ -3297,6 +3297,10 @@
target="${DEPENDS_TARGET}"; \
depends_args="${DEPENDS_ARGS}"; \
fi; \
+ case $$dir in \
+ /*) dir=$$dir ;; \
+ *) dir=${PORTSDIR}/$$dir ;; \
+ esac ; \
if ${EXPR} "$$prog" : \\/ >/dev/null; then \
if [ -e "$$prog" ]; then \
if [ "$$prog" = "${NONEXISTENT}" ]; then \
@@ -3383,7 +3387,7 @@
fi; \
fi; \
if [ $$notfound != 0 ]; then \
- ${ECHO_MSG} "===> Verifying $$target for $$prog in $$dir"; \
+ ${ECHO_MSG} "===> Verifying $$target for $$prog in $$dir"; \
if [ ! -d "$$dir" ]; then \
${ECHO_MSG} " => No directory for $$prog. Skipping.."; \
else \
@@ -3409,6 +3413,10 @@
${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $${lib}" ; \
found=0 ; \
dirs="${LIB_DIRS} `${CAT} ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || : `" ; \
+ case $$dir in \
+ /*) dir=$$dir ;; \
+ *) dir=${PORTSDIR}/$$dir ;; \
+ esac ; \
for libdir in $$dirs; do \
test -f $${libdir}/$${lib} || continue; \
if [ -x /usr/bin/file ]; then \
@@ -3433,6 +3441,10 @@
pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
dir=$${i#*:}; \
target=$${i##*:}; \
+ case $$dir in \
+ /*) pdir=$$dir ;; \
+ *) pdir=${PORTSDIR}/$$dir ;; \
+ esac ; \
if ${TEST} $$dir = $$target; then \
target="${DEPENDS_TARGET}"; \
depends_args="${DEPENDS_ARGS}"; \
More information about the Midnightbsd-cvs
mailing list