[pkgsrc/trunk]: pkgsrc/mk To support variants of make that run the shell so '...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cec4483db5a
branches:  trunk
changeset: 503287:6cec4483db5a
user:      erh <erh%pkgsrc.org@localhost>
date:      Thu Nov 17 19:30:22 2005 +0000

description:
To support variants of make that run the shell so 'set -e' is true (shell
exits on any command failing), add a '|| ${TRUE}' when running the
check-vulnerable target in do-fetch.

diffstat:

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

diffs (22 lines):

diff -r 7da5c5851c01 -r 6cec4483db5a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Nov 17 18:54:15 2005 +0000
+++ b/mk/bsd.pkg.mk     Thu Nov 17 19:30:22 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1757 2005/11/17 17:18:01 erh Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1758 2005/11/17 19:30:22 erh Exp $
 #
 # This file is in the public domain.
 #
@@ -1393,10 +1393,10 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then               \
                ${ECHO_MSG} "${_PKGSRC_IN}> Checking for vulnerabilities in ${PKGNAME}"; \
-               vul=`${MAKE} ${MAKEFLAGS} check-vulnerable`;            \
+               vul=`${MAKE} ${MAKEFLAGS} check-vulnerable || ${TRUE}`;         \
                case "$$vul" in                                         \
                "")     ;;                                              \
-               *vulnid:*)      vulnids=`echo "$$vul" | grep vulnid: | sed -e's/.*vulnid:\\([[:digit:]]*\\).*/\\1/'`; \
+               *vulnid:*)      vulnids=`echo "$$vul" | ${GREP} vulnid: | ${SED} -e's/.*vulnid:\\([[:digit:]]*\\).*/\\1/'`; \
                        ${ECHO} "$$vul";                                \
                        ${ECHO} "or if this package is absolutely essential, add this to mk.conf:"; \
                        for vulnid in $$vulnids ; do \