svn commit: r529956 - head/Mk

Mateusz Piotrowski 0mp at FreeBSD.org
Tue Mar 31 08:31:31 UTC 2020


Author: 0mp
Date: Tue Mar 31 08:31:14 2020
New Revision: 529956
URL: https://svnweb.freebsd.org/changeset/ports/529956

Log:
  Fix install-missing-packages when port is missing multiple dependencies
  
  The current implementation of install-missing-packages does not handle
  correctly the situation when a port is missing multiple dependencies. pkg(8)
  would only get the first missing origin as an argument. All the other origins
  would be listed on new lines and would not be passed to pkg(8).
  
  PR:		244215
  Discussed with:	mat, tobik
  Approved by:	portmgr (implicit, fix r525388)
  Differential Revision:	https://reviews.freebsd.org/D23795

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Mar 31 08:10:22 2020	(r529955)
+++ head/Mk/bsd.port.mk	Tue Mar 31 08:31:14 2020	(r529956)
@@ -4334,9 +4334,8 @@ missing-packages:
 # Install missing dependencies from package
 install-missing-packages:
 	@_dirs=$$(${MISSING-DEPENDS-LIST}); \
-	if [ -n "$${_dirs}" ]; then \
-		${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \
-	fi
+	${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | \
+		${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
 
 ################################################################
 # Everything after here are internal targets and really


More information about the svn-ports-head mailing list