diff options
| author | joerg <joerg> | 2006-09-22 21:53:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-09-22 21:53:56 +0000 |
| commit | bcaa74d78c4bb00b45e3ba6f025114edd61b83a2 (patch) | |
| tree | db83b25b7768e178196b801eef79294cee44fa06 /mk/check | |
| parent | 2a25027705e71b83c42ccbdae2739d56d535f049 (diff) | |
| download | pkgsrc-bcaa74d78c4bb00b45e3ba6f025114edd61b83a2.tar.gz | |
- Compute CHEKCK_FILES filter on the entries requested and keep it
as tight as possible. Files we don't handle shouldn't be skipped.
- fonts.alias is not created automatically, so don't remove it.
- create fonts.encoding with mkfontdir using -e X11_ENCODINGSDIR.
On platforms not following the X11R6 loayout this might need to
be overriden.
- Fix type1inst calls.
- Modify packages which installed fonts.alias before to actually
include it in the PLIST and bump the revisions accordingly.
- Modify xorg-fonts* packages to use FONTS_DIRS.* to build indices
at run time.
Discussed with wiz and jlam.
Diffstat (limited to 'mk/check')
| -rw-r--r-- | mk/check/check-files.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk index fc95f459fbd..9bf97b02382 100644 --- a/mk/check/check-files.mk +++ b/mk/check/check-files.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-files.mk,v 1.7 2006/09/17 17:02:38 joerg Exp $ +# $NetBSD: check-files.mk,v 1.8 2006/09/22 21:53:58 joerg Exp $ .if defined(PKG_DEVELOPER) CHECK_FILES?= yes @@ -48,12 +48,17 @@ CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.* .endfor # Mutable X11 font database files +.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*)) +CHECK_FILES_SKIP+= ${PREFIX}/.*/encodings.dir +CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir +.endif +.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \ + (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) +CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale +.endif .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 CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.cache-1 .endif |