pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Only add "fonts.(alias|dir|scale)" to "CHECK_FILES_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e74d70eeb13e
branches:  trunk
changeset: 508663:e74d70eeb13e
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Feb 23 14:38:07 2006 +0000

description:
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:

 mk/bsd.pkg.check.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 483b2efe4ce6 -r e74d70eeb13e mk/bsd.pkg.check.mk
--- a/mk/bsd.pkg.check.mk       Thu Feb 23 13:05:16 2006 +0000
+++ b/mk/bsd.pkg.check.mk       Thu Feb 23 14:38:07 2006 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index