CVS commit: pkgsrc/mk/check

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Jan 19 18:41:16 UTC 2024

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

Log Message:
mk/check-files: fail more gracefully on typos in MAKE_DIRS_PERMS

Previously, building a package that had the wrong number of words in
MAKE_DIRS_PERMS failed with "can't shift that many", which didn't give a
hint at the underlying problem.  Now it fails immediately, pointing to
the line in check-files.mk that loops over MAKE_DIRS_PERMS and
OWN_DIRS_PERMS.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 pkgsrc/mk/check/check-files.mk:1.41
--- pkgsrc/mk/check/check-files.mk:1.40 Fri Jan 19 00:42:01 2024
+++ pkgsrc/mk/check/check-files.mk      Fri Jan 19 18:41:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.40 2024/01/19 00:42:01 rillig Exp $
+# $NetBSD: check-files.mk,v 1.41 2024/01/19 18:41:16 rillig 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
@@ -85,12 +85,8 @@ CHECK_FILES_SKIP+=   ${VARBASE}/.*
 .for d in ${MAKE_DIRS} ${OWN_DIRS}
 CHECK_FILES_SKIP+=     ${d:C/^([^\/])/${PREFIX}\/\1/}.*
 .endfor
-.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
+.for dir owner group mode in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS}
+CHECK_FILES_SKIP+=     ${dir:C/^([^\/])/${PREFIX}\/\1/}.*
 .endfor
 
 # Mutable X11 font database files