Wed Oct 21 18:00:00 2009 UTC ()
revert previous - better do a bulk build with this change first to see
if/how much stuff is dependent on it.


(tnn)
diff -r1.25 -r1.26 pkgsrc/mk/check/check-files.mk
cvs diff -r1.25 -r1.26 pkgsrc/mk/check/check-files.mk (expand / switch to unified diff)

--- pkgsrc/mk/check/check-files.mk 2009/10/21 17:00:33 1.25
+++ pkgsrc/mk/check/check-files.mk 2009/10/21 18:00:00 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: check-files.mk,v 1.25 2009/10/21 17:00:33 tnn Exp $ 1# $NetBSD: check-files.mk,v 1.26 2009/10/21 18:00:00 tnn 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" for PKG_DEVELOPERs, "no" otherwise. 13# Default value: "yes" for PKG_DEVELOPERs, "no" otherwise.
14# 14#
@@ -86,26 +86,29 @@ CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREF @@ -86,26 +86,29 @@ CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREF
86CHECK_FILES_SKIP+= ${PREFIX}/.*/encodings.dir 86CHECK_FILES_SKIP+= ${PREFIX}/.*/encodings.dir
87CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir 87CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir
88.endif 88.endif
89.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \ 89.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
90 (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) 90 (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*))
91CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale 91CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale
92.endif 92.endif
93.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \ 93.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
94 (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \ 94 (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \
95 (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*)) 95 (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
96CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.cache-1 96CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.cache-1
97.endif 97.endif
98 98
 99# Mutable charset.alias file
 100CHECK_FILES_SKIP+= ${PREFIX}/lib/charset.alias
 101
99_CHECK_FILES_SKIP_FILTER= ${GREP} -vx ${CHECK_FILES_SKIP:@f@-e ${DESTDIR:Q}${f:Q}@} 102_CHECK_FILES_SKIP_FILTER= ${GREP} -vx ${CHECK_FILES_SKIP:@f@-e ${DESTDIR:Q}${f:Q}@}
100 103
101########################################################################### 104###########################################################################
102# These are the files generated and used by the check-files implementation 105# These are the files generated and used by the check-files implementation
103# used across several check-files targets. 106# used across several check-files targets.
104# 107#
105# _CHECK_FILES_ERRMSG.* are the files that contain the error 108# _CHECK_FILES_ERRMSG.* are the files that contain the error
106# messages discovered during each stage of file-checking. 109# messages discovered during each stage of file-checking.
107# 110#
108# _CHECK_FILES_PRE.* are the file lists generated before any files 111# _CHECK_FILES_PRE.* are the file lists generated before any files
109# from the package are installed. 112# from the package are installed.
110# 113#
111# _CHECK_FILES_POST.* are the file lists generated after all files 114# _CHECK_FILES_POST.* are the file lists generated after all files