Index: bsd.port.mk =================================================================== diff --git a/head/Mk/bsd.port.mk b/head/Mk/bsd.port.mk --- a/head/Mk/bsd.port.mk (revision 320795) +++ b/head/Mk/bsd.port.mk (working copy) @@ -1134,6 +1134,7 @@ INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses +LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/lib # make sure bmake treats -V as expected .MAKE.EXPAND_VARIABLES= yes @@ -5092,9 +5093,39 @@ .endif .endfor -lib-depends: +get-lib-path: +_LDPATH!= ${CAT} ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || ${ECHO_CMD} +LIB_DIRS+= ${_LDPATH:O:u} + +lib-depends: get-lib-path .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS) - @set -e ; for i in ${LIB_DEPENDS}; do \ + @set -e ; \ + for i in ${LIB_DEPENDS:M*.so*\:*}; do \ + lib=$${i%%:*} ; \ + dir=$${i#*:} ; \ + target="${DEPENDS_TARGET}"; \ + depends_args="${DEPENDS_ARGS}"; \ + ${ECHO_MSG} -n "====> ${PKGNAME} depends on shared library: $${lib}:" ; \ + found=0 ; \ + for libdir in ${LIB_DIRS}; do \ + test -f $${libdir}/$${lib} || continue; \ + if [ -x /usr/bin/file ]; then \ + [ `file -b -L --mime-type $${libdir}/$${lib}` = "application/x-sharedlib" ] || continue ; \ + fi ; \ + found=1 ; \ + ${ECHO_MSG} " - found"; \ + done ; \ + if [ $${found} -eq 0 ]; then \ + ${ECHO_MSG} " - not found"; \ + ${ECHO_MSG} "===> Verifying for $$lib in $$dir"; \ + if [ ! -d "$$dir" ] ; then \ + ${ECHO_MSG} " => No directory for $$lib. Skipping.."; \ + else \ + ${_INSTALL_DEPENDS} \ + fi ; \ + fi ; \ + done + @set -e ; for i in ${LIB_DEPENDS:N*.so*\:*}; do \ lib=$${i%%:*}; \ pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\ dir=$${i#*:}; \