[Midnightbsd-cvs] mports [22268] trunk/Mk/bsd.mport.mk: revert back to versioning.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 18 15:24:17 EST 2017
Revision: 22268
http://svnweb.midnightbsd.org/mports/?rev=22268
Author: laffer1
Date: 2017-02-18 15:24:17 -0500 (Sat, 18 Feb 2017)
Log Message:
-----------
revert back to versioning.
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2017-02-18 20:13:41 UTC (rev 22267)
+++ trunk/Mk/bsd.mport.mk 2017-02-18 20:24:17 UTC (rev 22268)
@@ -3713,21 +3713,9 @@
# the mport binary tools only store the the first tier of the depenancy
# tree in a mports archive.
PACKAGE-DEPENDS-LIST?= \
- if [ "${CHILD_DEPENDS}" ]; then \
- installed=$$(${MPORT_QUERY} -q origin=$${PKGORIGIN} || \
- ${TRUE}); \
- if [ "$$installed" ]; then \
- break; \
- fi; \
- if [ -z "$$installed" ]; then \
- installed="${PKGBASE}"; \
- fi; \
- for pkgname in $$installed; do \
- ${ECHO_CMD} "$$pkgname ${.CURDIR} ${PKGORIGIN}"; \
- done; \
- fi; \
- checked="${PARENT_CHECKED}"; \
- for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
+ for depend in `${ECHO_CMD} "${_LIB_RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${SORT} -u`; do \
+ version=`(${ECHO_CMD} $$depend | ${CUT} -f 1 -d ':' | ${GREP} -se '[<>]') || ${TRUE}`; \
+ dir=`${ECHO_CMD} $$depend | ${CUT} -f 2 -d ':'`; \
case "$$dir" in \
/*) ;; \
*) dir=${PORTSDIR}/$$dir ;; \
@@ -3734,20 +3722,15 @@
esac ; \
dir=$$(${REALPATH} $$dir); \
if [ -d $$dir ]; then \
- case $$checked in \
- $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \
- esac; \
- childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
- set -- $$childout; \
- childdir=""; \
- while [ $$\# != 0 ]; do \
- childdir="$$childdir $$2"; \
- ${ECHO_CMD} "$$1 $$2 $$3"; \
- shift 3; \
- done; \
- checked="$$dir $$childdir $$checked"; \
+ meta=`cd $$dir && ${MAKE} -V PKGBASE -V PKGORIGIN | ${PASTE} - -`; \
+ if [ -z "$$version" ]; then \
+ ${ECHO_CMD} "$$dir $$meta" | ${AWK} '{print $$2 " " $$1 " " $$3}'; \
+ else \
+ version=`${ECHO_CMD} $$version | ${SED} -E 's/^.*([<>])/\1/'`; \
+ ${ECHO_CMD} "$$dir $$meta $$version" | ${AWK} '{print $$2 " " $$1 " " $$3 " " $$4}'; \
+ fi; \
else \
- ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
+ ${ECHO_MSG} "\"$$dir\" non-existent -- dependency list incomplete" >&2; \
fi; \
done
More information about the Midnightbsd-cvs
mailing list