[pkgsrc/trunk]: pkgsrc/mk We just depend on the package that best matches the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8db5eaa09040
branches:  trunk
changeset: 461268:8db5eaa09040
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 11:32:04 2003 +0000

description:
We just depend on the package that best matches the pkgpattern, so remove
the unreachable code surrounded by checks for matching multiple packages.

diffstat:

 mk/bsd.pkg.mk |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (40 lines):

diff -r 82bebe2bb481 -r 8db5eaa09040 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Sep 13 11:23:35 2003 +0000
+++ b/mk/bsd.pkg.mk     Sat Sep 13 11:32:04 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1278 2003/09/13 11:23:35 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1279 2003/09/13 11:32:04 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -3959,13 +3959,7 @@
                                exit 1;                                 \
                        fi;                                             \
                fi;                                                     \
-               if [ `${ECHO} $$found | ${WC} -w` -gt 1 ]; then         \
-                       ${ECHO} '***' "WARNING: Dependency on '$$found' expands to several installed packages " ; \
-                       ${ECHO} "    (" `${ECHO} $$found` ")." ;        \
-                       ${ECHO} "    Please check if this is really intended!" ; \
-               else                                                    \
-                       ${ECHO_MSG} "${_PKGSRC_IN}> Required installed package $$pkg: $${found} found"; \
-               fi ;                                                    \
+               ${ECHO_MSG} "${_PKGSRC_IN}> Required installed package $$pkg: $${found} found"; \
        else                                                            \
                ${ECHO_MSG} "${_PKGSRC_IN}> Required package $$pkg: NOT found"; \
                target=${DEPENDS_TARGET};                               \
@@ -4601,15 +4595,6 @@
                        fi;                                             \
                fi;                                                     \
                list="`${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true ECHO_MSG=${TRUE} | ${SORT} -u`" ; \
-               for dep in $$list; do \
-                       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` ")." ; \
-                               ${ECHO} "    Please check if this is really intended!" ; \
-                               continue ;                              \
-                       fi ;                                            \
-               done ;                                                  \
                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" ; \