[pkgsrc/trunk]: pkgsrc/mk Fixed the test on PKG_{FAIL,SKIP}_REASON. Added a p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d22e2ff3bdf7
branches:  trunk
changeset: 515659:d22e2ff3bdf7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jul 05 23:27:34 2006 +0000

description:
Fixed the test on PKG_{FAIL,SKIP}_REASON. Added a prefix line to the
output of PKG_SKIP_REASON, since the plain message does not say where it
comes from.

diffstat:

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

diffs (31 lines):

diff -r c2d1b8f4db52 -r d22e2ff3bdf7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Jul 05 22:21:02 2006 +0000
+++ b/mk/bsd.pkg.mk     Wed Jul 05 23:27:34 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1859 2006/07/05 22:21:02 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1860 2006/07/05 23:27:34 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -602,14 +602,19 @@
 .    if defined(SKIP_SILENT)
        @${DO_NADA}
 .    else
+.      if defined(PKG_FAIL_REASON) && !empty(PKG_FAIL_REASON:M*)
        @for str in ${PKG_FAIL_REASON}; do                              \
                ${ERROR_MSG} "$$str";                                   \
        done
-       @for str in ${PKG_SKIP_REASON}; do                              \
+.      endif
+.      if defined(PKG_SKIP_REASON) && !empty(PKG_SKIP_REASON:M*)
+       @${WARNING_MSG} "Skipping ${PKGNAME}:";                         \
+       for str in ${PKG_SKIP_REASON}; do                               \
                ${WARNING_MSG} "$$str";                                 \
        done
+.      endif
 .    endif
-.    if defined(PKG_FAIL_REASON)
+.    if defined(PKG_FAIL_REASON) && !empty(PKG_FAIL_REASON:M*)
        @${FALSE}
 .    endif
 .  endif # SKIP