svn commit: r417413 - head/Mk/Scripts

[Bryan Drewery]

Author: bdrewery
Date: Fri Jun 24 05:04:33 2016
New Revision: 417413
URL: https://svnweb.freebsd.org/changeset/ports/417413

Log:
  Fix package depends install not respecting DEPENDS_ARGS for the PKGFILE lookup.
  
  This also optimizes the PKGBASE/PKGFILE lookup with the new port_var_fetch(),
  which passes in the known DEPENDS_ARGS.

Modified:
  head/Mk/Scripts/do-depends.sh

Modified: head/Mk/Scripts/do-depends.sh
==============================================================================
--- head/Mk/Scripts/do-depends.sh	Fri Jun 24 05:03:34 2016	(r417412)
+++ head/Mk/Scripts/do-depends.sh	Fri Jun 24 05:04:33 2016	(r417413)
@@ -27,12 +27,10 @@ install_depends()
 		return 0
 	fi
 
-	read pkgfile <<- EOF
-	$(${dp_MAKE} -C ${origin} -VPKGFILE)
-	EOF
-	read pkgbase <<- EOF
-	$(${dp_MAKE} -C ${origin} -VPKGBASE)
-	EOF
+	port_var_fetch "${origin}" "${depends_args}" \
+	    PKGFILE pkgfile \
+	    PKGBASE pkgbase
+
 	if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
 		echo "===>   Installing existing package ${pkgfile}"
 		if [ "${pkgbase}" = "pkg" ]; then