Sun Jan 21 00:34:26 2024 UTC (127d)
mk/check-file: use common filename prefix in WRKDIR


(rillig)
diff -r1.44 -r1.45 pkgsrc/mk/check/check-files.mk
cvs diff -r1.44 -r1.45 pkgsrc/mk/check/check-files.mk (expand / switch to unified diff)

--- pkgsrc/mk/check/check-files.mk 2024/01/21 00:21:42 1.44
+++ pkgsrc/mk/check/check-files.mk 2024/01/21 00:34:26 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: check-files.mk,v 1.44 2024/01/21 00:21:42 rillig Exp $ 1# $NetBSD: check-files.mk,v 1.45 2024/01/21 00:34:26 rillig Exp $
2# 2#
3# This file checks that the list of installed files matches the PLIST. 3# This file checks that the list of installed files matches the PLIST.
4# For that purpose it records the file list of LOCALBASE before and 4# For that purpose it records the file list of LOCALBASE before and
5# after the installation of the package and compares these lists with 5# after the installation of the package and compares these lists with
6# the PLIST. 6# the PLIST.
7# 7#
8# User-settable variables: 8# User-settable variables:
9# 9#
10# CHECK_FILES 10# CHECK_FILES
11# "yes" to enable the check, "no" to disable it. 11# "yes" to enable the check, "no" to disable it.
12# 12#
13# Default value: "yes" 13# Default value: "yes"
14# 14#
@@ -124,36 +124,36 @@ _CHECK_FILES_SKIP_FILTER= ${GREP} -vx ${ @@ -124,36 +124,36 @@ _CHECK_FILES_SKIP_FILTER= ${GREP} -vx ${
124# _CHECK_FILES_ERRMSG.* are the files that contain the error 124# _CHECK_FILES_ERRMSG.* are the files that contain the error
125# messages discovered during each stage of file-checking. 125# messages discovered during each stage of file-checking.
126# 126#
127# _CHECK_FILES_PRE.* are the file lists generated before any files 127# _CHECK_FILES_PRE.* are the file lists generated before any files
128# from the package are installed. 128# from the package are installed.
129# 129#
130# _CHECK_FILES_POST.* are the file lists generated after all files 130# _CHECK_FILES_POST.* are the file lists generated after all files
131# from the package are installed. 131# from the package are installed.
132# 132#
133# The "pre" and "post" file lists are compared against each other to 133# The "pre" and "post" file lists are compared against each other to
134# determine if the package is installing files where it shouldn't be. 134# determine if the package is installing files where it shouldn't be.
135# 135#
136_CHECK_FILES_ERRMSG.prefix= ${ERROR_DIR}/check-files-prefix 136_CHECK_FILES_ERRMSG.prefix= ${ERROR_DIR}/check-files-prefix
137_CHECK_FILES_PRE.prefix= ${WRKDIR}/.prefix.pre 137_CHECK_FILES_PRE.prefix= ${WRKDIR}/.check-files.prefix.pre
138_CHECK_FILES_POST.prefix= ${WRKDIR}/.prefix.post 138_CHECK_FILES_POST.prefix= ${WRKDIR}/.check-files.prefix.post
139 139
140_CHECK_FILES_ERRMSG.sysconfdir= ${ERROR_DIR}/.check-files-sysconfdir 140_CHECK_FILES_ERRMSG.sysconfdir= ${ERROR_DIR}/.check-files-sysconfdir
141_CHECK_FILES_PRE.sysconfdir= ${WRKDIR}/.sysconfdir.pre 141_CHECK_FILES_PRE.sysconfdir= ${WRKDIR}/.check-files.sysconfdir.pre
142_CHECK_FILES_POST.sysconfdir= ${WRKDIR}/.sysconfdir.post 142_CHECK_FILES_POST.sysconfdir= ${WRKDIR}/.check-files.sysconfdir.post
143 143
144_CHECK_FILES_ERRMSG.varbase= ${ERROR_DIR}/.check-files-varbase 144_CHECK_FILES_ERRMSG.varbase= ${ERROR_DIR}/.check-files-varbase
145_CHECK_FILES_PRE.varbase= ${WRKDIR}/.varbase.pre 145_CHECK_FILES_PRE.varbase= ${WRKDIR}/.check-files.varbase.pre
146_CHECK_FILES_POST.varbase= ${WRKDIR}/.varbase.post 146_CHECK_FILES_POST.varbase= ${WRKDIR}/.check-files.varbase.post
147 147
148_CHECK_FILES_ERRMSGS= # empty 148_CHECK_FILES_ERRMSGS= # empty
149_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.prefix} 149_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.prefix}
150.if ${CHECK_FILES_STRICT:tl} != no 150.if ${CHECK_FILES_STRICT:tl} != no
151_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.sysconfdir} 151_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.sysconfdir}
152_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.varbase} 152_CHECK_FILES_ERRMSGS+= ${_CHECK_FILES_ERRMSG.varbase}
153.endif 153.endif
154 154
155########################################################################### 155###########################################################################
156# _CHECK_FILES_PRE holds the list of targets that are built as part of 156# _CHECK_FILES_PRE holds the list of targets that are built as part of
157# building the check-files-pre target. These targets should cause the 157# building the check-files-pre target. These targets should cause the
158# "pre" file lists to be generated. 158# "pre" file lists to be generated.
159# 159#