CVS commit: pkgsrc/mk/check

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Wed May 31 22:56:22 UTC 2017

Modified Files:
        pkgsrc/mk/check: check-files.mk

Log Message:
Check that some variables have the correct number of words.

Assert MAKE_DIRS_PERMS and OWN_DIRS_PERMS have the right number of
words before using a multivariable .for loop over those variables.
This prevents errors in parsing the makefiles.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/check/check-files.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/check/check-files.mk
diff -u pkgsrc/mk/check/check-files.mk:1.32 pkgsrc/mk/check/check-files.mk:1.33
--- pkgsrc/mk/check/check-files.mk:1.32 Sat Apr  1 20:55:39 2017
+++ pkgsrc/mk/check/check-files.mk      Wed May 31 22:56:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.32 2017/04/01 20:55:39 rillig Exp $
+# $NetBSD: check-files.mk,v 1.33 2017/05/31 22:56:22 jlam Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -78,8 +78,12 @@ CHECK_FILES_SKIP+=   ${VARBASE}/.*
 .for d in ${MAKE_DIRS} ${OWN_DIRS}
 CHECK_FILES_SKIP+=     ${d:C/^([^\/])/${PREFIX}\/\1/}.*
 .endfor
-.for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS}
+.for _var_ in MAKE_DIRS_PERMS OWN_DIRS_PERMS
+.  if empty(${_var_}) || empty(${_var_}:C/.*/4/:M*:S/4 4 4 4//gW)
+.    for d o g m in ${${_var_}}
 CHECK_FILES_SKIP+=     ${d:C/^([^\/])/${PREFIX}\/\1/}.*
+.    endfor
+.  endif
 .endfor
 
 # Mutable X11 font database files