CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Jan 19 00:42:01 UTC 2024

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

Log Message:
mk/check: clean up check-fakehome and check-files


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/check/check-fakehome.mk
cvs rdiff -u -r1.39 -r1.40 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-fakehome.mk
diff -u pkgsrc/mk/check/check-fakehome.mk:1.4 pkgsrc/mk/check/check-fakehome.mk:1.5
--- pkgsrc/mk/check/check-fakehome.mk:1.4       Sun Oct 12 23:39:17 2014
+++ pkgsrc/mk/check/check-fakehome.mk   Fri Jan 19 00:42:01 2024
@@ -1,6 +1,6 @@
-# $NetBSD: check-fakehome.mk,v 1.4 2014/10/12 23:39:17 joerg Exp $
+# $NetBSD: check-fakehome.mk,v 1.5 2024/01/19 00:42:01 rillig Exp $
 #
-# This file checks that the package does not install files to $HOME.
+# This file warns when the package installs files to $HOME.
 #
 # User-settable variables:
 #
@@ -15,9 +15,8 @@
 #
 
 _VARGROUPS+=                   check-fakehome
-_USER_VARS.check-fakehome=     CHECK_FAKEHOME
-_PKG_VARS.check-fakehome=      # None for now. One might be added to override
-#                                the test if the fakehome test is made fatal.
+_USER_VARS.check-fakehome=     CHECK_FAKEHOME PKG_DEVELOPER
+_USE_VARS.check-fakehome=      FAKEHOMEDIR
 
 .if ${PKG_DEVELOPER:Uno} != "no"
 CHECK_FAKEHOME?=               yes
@@ -25,7 +24,7 @@ CHECK_FAKEHOME?=              yes
 CHECK_FAKEHOME?=               no
 .endif
 
-.if ${CHECK_FAKEHOME:M[Yy][Ee][Ss]}
+.if ${CHECK_FAKEHOME:tl} == yes
 privileged-install-hook: _check-fakehome
 .endif
 

Index: pkgsrc/mk/check/check-files.mk
diff -u pkgsrc/mk/check/check-files.mk:1.39 pkgsrc/mk/check/check-files.mk:1.40
--- pkgsrc/mk/check/check-files.mk:1.39 Mon Nov 28 23:15:34 2022
+++ pkgsrc/mk/check/check-files.mk      Fri Jan 19 00:42:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.39 2022/11/28 23:15:34 gutteridge Exp $
+# $NetBSD: check-files.mk,v 1.40 2024/01/19 00:42:01 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
@@ -27,7 +27,18 @@
 
 _VARGROUPS+=           check-files
 _USER_VARS.check-files=        CHECK_FILES CHECK_FILES_STRICT
-_PKG_VARS.check-files= CHECK_FILES_SKIP
+_PKG_VARS.check-files= CHECK_FILES_SUPPORTED CHECK_FILES_SKIP
+_USE_VARS.check-files= \
+       DESTDIR PREFIX PKG_SYSCONFDIR VARBASE PKG_DBDIR DISTDIR PACKAGES \
+       MAKE_DIRS OWN_DIRS \
+       FONTS_DIRS.x11 FONTS_DIRS.ttf FONTS_DIRS.type1 \
+       PERL5_INSTALLARCHLIB \
+       WRKDIR ERROR_DIR \
+       PLIST INFO_FILES ICON_THEMES
+_IGN_VARS.check-files= PKGNAME _CHECK_FILES_*
+_SORTED_VARS.check-files= \
+       CHECK_FILES_SKIP
+
 
 CHECK_FILES?=          yes
 CHECK_FILES_STRICT?=   no
@@ -50,7 +61,7 @@ CHECK_FILES_SKIP+=    ${PREFIX}/lib/R/doc/h
 
 CHECK_FILES_SKIP+=     ${PKG_DBDIR}/.*
 
-# We don't care about what's under linux/proc and linux32/proc in Linux 
+# We don't care about what's under linux/proc and linux32/proc in Linux
 # emulation, which just holds run-time generated data.
 #
 CHECK_FILES_SKIP+=     ${PREFIX}/emul/linux/proc.*
@@ -64,7 +75,7 @@ CHECK_FILES_SKIP+=    ${PACKAGES}/.*
 CHECK_FILES_SKIP+=     ${DISTDIR}/.*
 
 # For unprivileged builds, VARBASE is below LOCALBASE.
-.if !empty(CHECK_FILES_STRICT:M[Nn][Oo])
+.if ${CHECK_FILES_STRICT:tl} == no
 CHECK_FILES_SKIP+=     ${VARBASE}/.*
 .endif
 
@@ -98,7 +109,7 @@ CHECK_FILES_SKIP+=   ${PREFIX}/.*/fonts.ca
 .endif
 
 # Mutable icon theme cache files
-.if !empty(ICON_THEMES:M[Yy][Ee][Ss])
+.if ${ICON_THEMES:tl} == yes
 CHECK_FILES_SKIP+=     ${PREFIX}/share/icons/.*/icon-theme.cache
 .endif
 
@@ -140,7 +151,7 @@ _CHECK_FILES_POST.varbase=  ${WRKDIR}/.va
 
 _CHECK_FILES_ERRMSGS=          # empty
 _CHECK_FILES_ERRMSGS+=         ${_CHECK_FILES_ERRMSG.prefix}
-.if empty(CHECK_FILES_STRICT:M[nN][oO])
+.if ${CHECK_FILES_STRICT:tl} != no
 _CHECK_FILES_ERRMSGS+=         ${_CHECK_FILES_ERRMSG.sysconfdir}
 _CHECK_FILES_ERRMSGS+=         ${_CHECK_FILES_ERRMSG.varbase}
 .endif
@@ -152,7 +163,7 @@ _CHECK_FILES_ERRMSGS+=              ${_CHECK_FILES_E
 #
 _CHECK_FILES_PRE=              #
 _CHECK_FILES_PRE+=             ${_CHECK_FILES_PRE.prefix}
-.if empty(CHECK_FILES_STRICT:M[nN][oO])
+.if ${CHECK_FILES_STRICT:tl} != no
 _CHECK_FILES_PRE+=             ${_CHECK_FILES_PRE.sysconfdir}
 _CHECK_FILES_PRE+=             ${_CHECK_FILES_PRE.varbase}
 .endif
@@ -164,12 +175,12 @@ _CHECK_FILES_PRE+=                ${_CHECK_FILES_PRE.v
 #
 _CHECK_FILES_POST=             #
 _CHECK_FILES_POST+=            ${_CHECK_FILES_POST.prefix}
-.if empty(CHECK_FILES_STRICT:M[nN][oO])
+.if ${CHECK_FILES_STRICT:tl} != no
 _CHECK_FILES_POST+=            ${_CHECK_FILES_POST.sysconfdir}
 _CHECK_FILES_POST+=            ${_CHECK_FILES_POST.varbase}
 .endif
 
-.if empty(CHECK_FILES:M[nN][oO])
+.if ${CHECK_FILES:tl} != no
 privileged-install-hook: check-files
 .endif
 
@@ -225,7 +236,7 @@ check-files-varbase: ${_CHECK_FILES_ERRM
 # subtarget.
 #
 .PHONY: check-files
-.if !empty(CHECK_FILES_SUPPORTED:M[nN][oO])
+.if ${CHECK_FILES_SUPPORTED:U:tl} == no
 check-files:
        @${DO_NADA}
 .else
@@ -332,7 +343,7 @@ ${_CHECK_FILES_ERRMSG.prefix}:                                              \
        fi >> ${.TARGET}
 
 # Check ${PKG_SYSCONFDIR} for files which are not in the PLIST and are
-# also not copied into place by the INSTALL scripts. 
+# also not copied into place by the INSTALL scripts.
 #
 ${_CHECK_FILES_ERRMSG.sysconfdir}:                                     \
                ${_CHECK_FILES_PRE.sysconfdir}                          \