diff options
| author | wiz <wiz> | 2004-12-28 14:38:03 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-12-28 14:38:03 +0000 |
| commit | a2de47d97128ef3ea5225981f245216bcdd4e6b1 (patch) | |
| tree | 3c57a9e442dc4d6c96263158fc72d70a96e3df2b /mk/fonts.mk | |
| parent | c8c3c66b78f7b0de036deecf86133c4cfde8df61 (diff) | |
| download | pkgsrc-a2de47d97128ef3ea5225981f245216bcdd4e6b1.tar.gz | |
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.
Diffstat (limited to 'mk/fonts.mk')
| -rw-r--r-- | mk/fonts.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/fonts.mk b/mk/fonts.mk index ac8f90bb068..94fd177e943 100644 --- a/mk/fonts.mk +++ b/mk/fonts.mk @@ -1,4 +1,4 @@ -# $NetBSD: fonts.mk,v 1.5 2004/03/29 22:13:47 recht Exp $ +# $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 @@ -34,6 +34,8 @@ 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) @@ -43,6 +45,8 @@ 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) |