[pkgsrc/trunk]: pkgsrc/mk/check Fix problem with saving variables whose value...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d60295650e16
branches:  trunk
changeset: 513990:d60295650e16
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 06 18:07:50 2006 +0000

description:
Fix problem with saving variables whose value contains "$$" by avoiding
it altogether.  In this case, saving _CHECK_WRKREF_SKIP_FILTER was
problematic because the value was cached and in the process, one $
was stripped.  This makes the check-wrkref target work again after
the big refactoring commit from a couple of days ago.

diffstat:

 mk/check/check-wrkref.mk |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (41 lines):

diff -r 65b63a33c00d -r d60295650e16 mk/check/check-wrkref.mk
--- a/mk/check/check-wrkref.mk  Tue Jun 06 18:02:48 2006 +0000
+++ b/mk/check/check-wrkref.mk  Tue Jun 06 18:07:50 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: check-wrkref.mk,v 1.2 2006/06/06 18:07:50 jlam Exp $
 
 .if defined(PKG_DEVELOPER)
 CHECK_WRKREF?=         tools
@@ -9,22 +9,21 @@
 # CHECK_WRKREF_SKIP is a list of shell globs.  Installed files that
 # match these globs are skipped when running the check-wrkref target.
 #
-.if make(check-wrkref)
-.  if !defined(_CHECK_WRKREF_SKIP_FILTER)
+.if !defined(_CHECK_WRKREF_SKIP_FILTER)
 _CHECK_WRKREF_SKIP_FILTER=     ${TRUE}
-.    if defined(CHECK_WRKREF_SKIP) && !empty(CHECK_WRKREF_SKIP)
+.  if defined(CHECK_WRKREF_SKIP) && !empty(CHECK_WRKREF_SKIP)
 _CHECK_WRKREF_SKIP_FILTER=     case "$$file" in
-.      for _pattern_ in ${CHECK_WRKREF_SKIP}
-_CHECK_WRKREF_SKIP_FILTER+=    ${_pattern_}) continue ;;
-.      endfor
+_CHECK_WRKREF_SKIP_FILTER+=    ${_CHECK_WRKREF_SKIP_FILTER_BODY}
 _CHECK_WRKREF_SKIP_FILTER+=    *) ;;
 _CHECK_WRKREF_SKIP_FILTER+=    esac
-.    endif
 .  endif
-MAKEVARS+=     _CHECK_WRKREF_SKIP_FILTER
-.else
-_CHECK_WRKREF_SKIP_FILTER=     ${TRUE}
 .endif
+.if !defined(_CHECK_WRKREF_SKIP_FILTER_BODY)
+.  for _pattern_ in ${CHECK_WRKREF_SKIP}
+_CHECK_WRKREF_SKIP_FILTER_BODY+=       ${_pattern_}) continue ;;
+.  endfor
+.endif
+MAKEVARS+=     _CHECK_WRKREF_SKIP_FILTER_BODY
 
 _CHECK_WRKREF:=                ${CHECK_WRKREF}
 .if !empty(_CHECK_WRKREF:Mwork)