From owner-svn-ports-all@freebsd.org Tue Mar 31 08:31:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7674527BEC8; Tue, 31 Mar 2020 08:31:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48s2c1059Qz4GRZ; Tue, 31 Mar 2020 08:31:29 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45BDF61A3; Tue, 31 Mar 2020 08:31:15 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02V8VFkO023196; Tue, 31 Mar 2020 08:31:15 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02V8VFJq023195; Tue, 31 Mar 2020 08:31:15 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003310831.02V8VFJq023195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Tue, 31 Mar 2020 08:31:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529956 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 529956 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2020 08:31:31 -0000 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