diff options
| author | wiz <wiz@pkgsrc.org> | 2004-12-28 14:38:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-12-28 14:38:03 +0000 |
| commit | bc871f8be391f5d281cfb343e076093ad6e94954 (patch) | |
| tree | 3c57a9e442dc4d6c96263158fc72d70a96e3df2b /mk/install | |
| parent | 7c43830d8bda77dd0b656a6c280d4855067894d2 (diff) | |
| download | pkgsrc-bc871f8be391f5d281cfb343e076093ad6e94954.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/install')
| -rw-r--r-- | mk/install/fonts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/install/fonts b/mk/install/fonts index 649cc0ae0fe..1ec70710f90 100644 --- a/mk/install/fonts +++ b/mk/install/fonts @@ -1,4 +1,4 @@ -# $NetBSD: fonts,v 1.5 2004/03/30 11:55:02 recht Exp $ +# $NetBSD: fonts,v 1.6 2004/12/28 14:38:03 wiz Exp $ # # Handle font databases; used by fonts.mk. # @@ -21,7 +21,7 @@ POST-INSTALL|POST-DEINSTALL) if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* else - ( cd $d && ${TTMKFDIR} -o fonts.dir >/dev/null 2>&1 ) + ( cd $d && ${TTMKFDIR} >/dev/null 2>&1 ) fi done fi @@ -39,7 +39,7 @@ POST-INSTALL|POST-DEINSTALL) if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* else - ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 ) + ${MKFONTDIR} $d >/dev/null 2>&1 fi done fi |