[Midnightbsd-cvs] mports [22262] trunk/Mk/bsd.mport.mk: change dependencies again.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 18 14:52:50 EST 2017


Revision: 22262
          http://svnweb.midnightbsd.org/mports/?rev=22262
Author:   laffer1
Date:     2017-02-18 14:52:50 -0500 (Sat, 18 Feb 2017)
Log Message:
-----------
change dependencies again.

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2017-02-18 15:30:51 UTC (rev 22261)
+++ trunk/Mk/bsd.mport.mk	2017-02-18 19:52:50 UTC (rev 22262)
@@ -3713,6 +3713,28 @@
 # the mport binary tools only store the the first tier of the depenancy
 # tree in a mports archive.
 PACKAGE-DEPENDS-LIST?= \
+	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 ;; \
+		esac ; \
+		dir=$$(${REALPATH} $$dir); \
+		if [ -d $$dir ]; then \
+			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} "\"$$dir\" non-existent -- dependency list incomplete" >&2; \
+		fi; \
+	done
+	
+PACKAGE-DEPENDS-LIST?= \
 	if [ "${CHILD_DEPENDS}" ]; then \
 		installed=$$(${MPORT_QUERY} -q origin=$${PKGORIGIN} || \
 		${TRUE}); \
@@ -3990,6 +4012,7 @@
 	@${ECHO_CMD} "** ${_file} doesn't exist. Exiting."; exit 1
 .endif
 .endfor
+.endif
 	@${ECHO_MSG} "===> Creating users and/or groups."
 	@${ECHO_CMD} "@exec echo \"===> Creating users and/or groups.\"" >> ${TMPPLIST}
 .for _group in ${GROUPS}



More information about the Midnightbsd-cvs mailing list