diff options
| author | tron <tron@pkgsrc.org> | 2006-02-23 14:38:07 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2006-02-23 14:38:07 +0000 |
| commit | 7aab4e005f437554c873d6f49e7f684d6f24be32 (patch) | |
| tree | b1b50d122fe42da2c3d593c56f5a7da01fb52d2d /mk/bsd.pkg.check.mk | |
| parent | 2f4d316517a4358c613d0e036fe53e57103f0231 (diff) | |
| download | pkgsrc-7aab4e005f437554c873d6f49e7f684d6f24be32.tar.gz | |
Only add "fonts.(alias|dir|scale)" to "CHECK_FILES_SKIP" if a package
is using "pkginstall.mk" to handle font installation.
This fixes one of the many false positives created by "CHECK_FILES",
in this case affecting the "xservers" package.
Diffstat (limited to 'mk/bsd.pkg.check.mk')
| -rw-r--r-- | mk/bsd.pkg.check.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index 395c16ce8f2..1fd29282ca2 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.28 2006/01/24 22:17:12 rillig Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.29 2006/02/23 14:38:07 tron Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the various install-time "check" @@ -95,9 +95,13 @@ CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* .endfor # Mutable X11 font database files +.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \ + (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \ + (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*)) CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.alias CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale +.endif # Mutable charset.alias file CHECK_FILES_SKIP+= ${PREFIX}/lib/charset.alias |