[pkgsrc/trunk]: pkgsrc/mk Change a few more uses of PKG_INFO into PKG_BEST_EX...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/82bebe2bb481
branches:  trunk
changeset: 461267:82bebe2bb481
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 11:23:35 2003 +0000

description:
Change a few more uses of PKG_INFO into PKG_BEST_EXISTS.  This corrects
the package size calculation and finding out for which packages we need
to add to +REQUIRED_BY.

diffstat:

 mk/bsd.pkg.mk |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 7907adb0b41e -r 82bebe2bb481 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Sep 13 10:18:06 2003 +0000
+++ b/mk/bsd.pkg.mk     Sat Sep 13 11:23:35 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1277 2003/09/13 08:20:08 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1278 2003/09/13 11:23:35 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -3886,7 +3886,8 @@
                fi;                                                     \
        fi;                                                             \
        if ${PACKAGE_DEPENDS_QUICK}; then                               \
-               ${PKG_INFO} -qf "$$pkg" | ${AWK} '/^@pkgdep/ {print $$2}'; \
+               found=`${PKG_BEST_EXISTS} "$$pkg"`;                     \
+               ${PKG_INFO} -qf "$$found" | ${AWK} '/^@pkgdep/ {print $$2}'; \
        else                                                            \
                if cd $$dir 2>/dev/null; then                           \
                        ${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE} PACKAGE_DEPENDS_WITH_PATTERNS=${PACKAGE_DEPENDS_WITH_PATTERNS}; \
@@ -4301,7 +4302,7 @@
 .PHONY: print-pkg-size-depends
 print-pkg-size-depends:
        @${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true \
-       | ${XARGS} -n 1 ${SETENV} ${PKG_INFO} -e                        \
+       | ${XARGS} -n 1 ${SETENV} ${PKG_BEST_EXISTS}                    \
        | ${SORT} -u                                                    \
        | ${XARGS} -n 256 ${SETENV} ${PKG_INFO} -qs                     \
        | ${AWK} -- 'BEGIN { print("0 "); }                             \
@@ -4601,7 +4602,7 @@
                fi;                                                     \
                list="`${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true ECHO_MSG=${TRUE} | ${SORT} -u`" ; \
                for dep in $$list; do \
-                       realdep="`${PKG_INFO} -e \"$$dep\" || ${TRUE}`" ; \
+                       realdep="`${PKG_BEST_EXISTS} \"$$dep\" || ${TRUE}`" ; \
                        if [ `${ECHO} $$realdep | ${WC} -w` -gt 1 ]; then \
                                ${ECHO} '***' "WARNING: '$$dep' expands to several installed packages " ; \
                                ${ECHO} "    (" `${ECHO} $$realdep` ")." ; \
@@ -4609,7 +4610,7 @@
                                continue ;                              \
                        fi ;                                            \
                done ;                                                  \
-               for realdep in `${ECHO} $$list | ${XARGS} -n 1 ${SETENV} ${PKG_INFO} -e | ${SORT} -u`; do \
+               for realdep in `${ECHO} $$list | ${XARGS} -n 1 ${SETENV} ${PKG_BEST_EXISTS} | ${SORT} -u`; do \
                        if ${TEST} -z "$$realdep"; then                 \
                                ${ECHO} "$$dep not installed - dependency NOT registered" ; \
                        elif [ -d ${_PKG_DBDIR}/$$realdep ]; then       \