 @@ -1,57 +1,63 @@
-# $NetBSD: check-files.mk,v 1.45 2024/01/21 00:34:26 rillig Exp $
+# $NetBSD: check-files.mk,v 1.46 2024/01/21 02:12:20 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
 # after the installation of the package and compares these lists with
 # the PLIST.
+#
 # User-settable variables:
+#
 # CHECK_FILES
 #	"yes" to enable the check, "no" to disable it.
+#
 #	Default value: "yes"
+#
 # CHECK_FILES_STRICT
 #	When set to "yes", VARBASE and PKG_SYSCONFDIR are checked in
 #	addition to LOCALBASE.
+#
 # CHECK_FILES_ONLY_PREFIX
 #	When set to "yes", the only directory below DESTDIR that may be
 #	modified during installation is PREFIX itself.
+#
 # Package-settable variables:
+#
 # CHECK_FILES_SKIP
 #	A list of regular expressions (FIXME: all other checks use shell
 #	patterns) that names files to be skipped. This is useful to
 #	avoid getting errors triggered by changes in directories not
 #	really handled by pkgsrc.
+#
 _VARGROUPS+=			check-files
-_USER_VARS.check-files=		CHECK_FILES CHECK_FILES_STRICT
+_USER_VARS.check-files=		\
 	CHECK_FILES CHECK_FILES_STRICT CHECK_FILES_ONLY_PREFIX
 _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 MAKE_DIRS_PERMS OWN_DIRS OWN_DIRS_PERMS \
 	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_*
 _LISTED_VARS.check-files=	MAKE_DIRS MAKE_DIRS_PERMS OWN_DIRS OWN_DIRS_PERMS
 _SORTED_VARS.check-files=	CHECK_FILES_SKIP
-CHECK_FILES?=		yes
+CHECK_FILES?=			yes
-CHECK_FILES_STRICT?=	no
+CHECK_FILES_STRICT?=		no
 CHECK_FILES_ONLY_PREFIX?=	no
 # Info index files updated when a new info file is added.
 .if defined(INFO_FILES)
 CHECK_FILES_SKIP+=	${PREFIX}/.*/dir
 .endif
 # Perl's perllocal.pod index that is regenerated when a local module
 # is added.
+#
 CHECK_FILES_SKIP+=	${PERL5_INSTALLARCHLIB}/perllocal.pod
 # R's index files that are regenerated when a local module
 # is added.
 @@ -135,32 +141,37 @@ _CHECK_FILES_SKIP_FILTER=	${GREP} -vx ${
+#
 _CHECK_FILES_ERRMSG.prefix=	${ERROR_DIR}/check-files-prefix
 _CHECK_FILES_PRE.prefix=	${WRKDIR}/.check-files.prefix.pre
 _CHECK_FILES_POST.prefix=	${WRKDIR}/.check-files.prefix.post
 _CHECK_FILES_ERRMSG.sysconfdir=	${ERROR_DIR}/.check-files-sysconfdir
 _CHECK_FILES_PRE.sysconfdir=	${WRKDIR}/.check-files.sysconfdir.pre
 _CHECK_FILES_POST.sysconfdir=	${WRKDIR}/.check-files.sysconfdir.post
 _CHECK_FILES_ERRMSG.varbase=	${ERROR_DIR}/.check-files-varbase
 _CHECK_FILES_PRE.varbase=	${WRKDIR}/.check-files.varbase.pre
 _CHECK_FILES_POST.varbase=	${WRKDIR}/.check-files.varbase.post
 _CHECK_FILES_ERRMSG.only-prefix=	${ERROR_DIR}/check-files-only-prefix
 _CHECK_FILES_ERRMSGS=		# empty
 _CHECK_FILES_ERRMSGS+=		${_CHECK_FILES_ERRMSG.prefix}
 .if ${CHECK_FILES_STRICT:tl} != no
 _CHECK_FILES_ERRMSGS+=		${_CHECK_FILES_ERRMSG.sysconfdir}
 _CHECK_FILES_ERRMSGS+=		${_CHECK_FILES_ERRMSG.varbase}
 .endif
 .if ${CHECK_FILES_ONLY_PREFIX:tl} == yes
 _CHECK_FILES_ERRMSGS+=		${_CHECK_FILES_ERRMSG.only-prefix}
 .endif
 ###########################################################################
 # _CHECK_FILES_PRE holds the list of targets that are built as part of
 # building the check-files-pre target.  These targets should cause the
 # "pre" file lists to be generated.
+#
 _CHECK_FILES_PRE=		#
 _CHECK_FILES_PRE+=		${_CHECK_FILES_PRE.prefix}
 .if ${CHECK_FILES_STRICT:tl} != no
 _CHECK_FILES_PRE+=		${_CHECK_FILES_PRE.sysconfdir}
 _CHECK_FILES_PRE+=		${_CHECK_FILES_PRE.varbase}
 .endif
 @@ -368,26 +379,37 @@ ${_CHECK_FILES_ERRMSG.varbase}:						\
 	if ${CMP} -s ${_CHECK_FILES_PRE.varbase}			\
 		       ${_CHECK_FILES_POST.varbase}; then		\
 		${TRUE};						\
 	else								\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The package has modified ${VARBASE}"		\
 			"contents directly!";				\
 		${ECHO} "    The offending files/directories are:";	\
 		${DIFF} -u ${_CHECK_FILES_PRE.varbase}			\
 			   ${_CHECK_FILES_POST.varbase}	|		\
 		${GREP} '^+[^+]' | ${SED} "s|^+|	|";		\
 	fi > ${.TARGET}
 ${_CHECK_FILES_ERRMSG.only-prefix}:
 	${RUN}								\
 	files=${WRKDIR}/.check-files-only-prefix;			\
 	${FIND} ${DESTDIR} \( -type f -o -type l \) -print		\
 	| ${GREP} -v '^${DESTDIR}${PREFIX}/' > "$$files" || :;		\
 	if [ -s "$$files" ]; then					\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The package has installed files outside ${PREFIX}:"; \
 		${SED} -e 's,^,        ,' "$$files";			\
 	fi > ${.TARGET}
 ###########################################################################
 # check-files-clean removes the state files related to the "check-files"
 # target so that the check-files-{pre,post} targets may be re-run.
+#
 .PHONY: check-files-clean
 check-clean: check-files-clean
 check-files-clean:
 	${RUN}								\
 	${RM} -f ${_CHECK_FILES_ERRMSGS}				\
 		${_CHECK_FILES_PRE} ${_CHECK_FILES_POST}		\
 		${_CHECK_FILES_DIFF} ${_CHECK_FILES_ADDED}		\
 		${_CHECK_FILES_DELETED} ${_CHECK_FILES_EXPECTED}	\
 		${_CHECK_FILES_MISSING} ${_CHECK_FILES_MISSING_SKIP}	\