[BACK]Return to fonts.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mk

File: [cvs.NetBSD.org] / pkgsrc / mk / fonts.mk (download)

Revision 1.6, Tue Dec 28 14:38:03 2004 UTC (15 years, 9 months ago) by wiz
Branch: MAIN
CVS Tags: tv-derecurse-merge, tv-derecurse-base, pkgsrc-2005Q3-base, pkgsrc-2005Q3, pkgsrc-2005Q2-base, pkgsrc-2005Q2, pkgsrc-2005Q1-base, pkgsrc-2005Q1
Changes since 1.5: +5 -1 lines

Fix ttf/type1 handling in fonts.mk:
Previously, ttmkfdir's output was redirected to fonts.dir,
while the correct behaviour is to let it create fonts.scale
and then let mkfontdir merge fonts.scale into fonts.dir.
type1 handling had a similar problem.
Get the wanted behaviour by automatically appending the contents of
FONTS_TTF_DIRS and FONTS_TYPE1_DIRS to FONTS_X11_DIRS.
Also, save a subshell in install/fonts while there.

Bump PKGREVISION for all affected packages.

jmmv@ says ok.

# $NetBSD: fonts.mk,v 1.6 2004/12/28 14:38:03 wiz Exp $
#
# This Makefile fragment is intended to be included by packages that install
# fonts (most of them in the fonts category).  It takes care of updating the
# fonts.dir files at install/deinstall time.
#
# The following variables need to be defined by packages using fonts.mk:
#
# FONTS_<TYPE>_DIRS - Whitespaced list of directories where the font database
#                     is updated. If empty, nothing is done for this TYPE.
#
# Supported TYPEs: TTF, TYPE1, X11.
#

.if !defined(FONTS_MK)
FONTS_MK=		# defined

# TrueType fonts
FONTS_TTF_DIRS?=
# Type1 fonts
FONTS_TYPE1_DIRS?=
# Generic X fonts (PCF, SNF, BDF)
FONTS_X11_DIRS?=

.if !empty(FONTS_TTF_DIRS) || !empty(FONTS_TYPE1_DIRS) || !empty(FONTS_X11_DIRS)

USE_PKGINSTALL=		YES
HEADER_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/fonts

.if !empty(FONTS_TTF_DIRS)
EVAL_PREFIX+=			TTMKFDIR_PREFIX=ttmkfdir
TTMKFDIR_PREFIX_DEFAULT=	${LOCALBASE}
FILES_SUBST+=		FONTS_TTF="YES"
FILES_SUBST+=		FONTS_TTF_DIRS="${FONTS_TTF_DIRS}"
FILES_SUBST+=		TTMKFDIR="${TTMKFDIR_PREFIX}/bin/ttmkfdir"
DEPENDS+=		ttmkfdir2>=20021109:../../fonts/ttmkfdir2
# also need to run mkfontdir there
FONTS_X11_DIRS+=	${FONTS_TTF_DIRS}
.endif

.if !empty(FONTS_TYPE1_DIRS)
EVAL_PREFIX+=			TYPE1INST_PREFIX=type1inst
TYPE1INST_PREFIX_DEFAULT=	${LOCALBASE}
FILES_SUBST+=		FONTS_TYPE1="YES"
FILES_SUBST+=		FONTS_TYPE1_DIRS="${FONTS_TYPE1_DIRS}"
FILES_SUBST+=		TYPE1INST="${TYPE1INST_PREFIX}/bin/type1inst"
DEPENDS+=		type1inst>=0.6.1:../../fonts/type1inst
# also need to run mkfontdir there
FONTS_X11_DIRS+=	${FONTS_TYPE1_DIRS}
.endif

.if !empty(FONTS_X11_DIRS)
FILES_SUBST+=		FONTS_X11="YES"
FILES_SUBST+=		FONTS_X11_DIRS="${FONTS_X11_DIRS}"
FILES_SUBST+=		MKFONTDIR="${X11BASE}/bin/mkfontdir"
.endif

.endif

.endif	# FONTS_MK