Date: Tue, 25 Aug 2015 12:08:43 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395245 - head/Mk Message-ID: <201508251208.t7PC8hrF009099@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Aug 25 12:08:43 2015 New Revision: 395245 URL: https://svnweb.freebsd.org/changeset/ports/395245 Log: Make build-depends-list and run-depends-list accept dependency lines without ${PORTSDIR} Sponsored by: Gandi.net Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Aug 25 11:34:47 2015 (r395244) +++ head/Mk/bsd.port.mk Tue Aug 25 12:08:43 2015 (r395245) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508251208.t7PC8hrF009099>