Subject: CVS commit: pkgsrc
To: None <>
From: Thomas Klausner <>
List: pkgsrc-changes
Date: 12/28/2004 14:38:03
Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Dec 28 14:38:03 UTC 2004

Modified Files:
	pkgsrc/fonts/alee-ttf: Makefile
	pkgsrc/fonts/arphic-ttf: Makefile
	pkgsrc/fonts/baekmuk-ttf: Makefile
	pkgsrc/fonts/cyberbase-ttf: Makefile
	pkgsrc/fonts/cyberbit-ttf: Makefile
	pkgsrc/fonts/dbz-ttf: Makefile
	pkgsrc/fonts/geoslab703-ttf: Makefile
	pkgsrc/fonts/kochi-ttf: Makefile
	pkgsrc/fonts/ms-ttf: Makefile
	pkgsrc/fonts/un-core-ttf: Makefile
	pkgsrc/fonts/un-extra-ttf: Makefile
	pkgsrc/fonts/vera-ttf: Makefile
	pkgsrc/mk/install: fonts

Log Message:
Fix ttf/type1 handling in
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
Also, save a subshell in install/fonts while there.

Bump PKGREVISION for all affected packages.

jmmv@ says ok.

To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/fonts/alee-ttf/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/fonts/arphic-ttf/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/fonts/baekmuk-ttf/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/fonts/cyberbase-ttf/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/fonts/cyberbit-ttf/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/fonts/dbz-ttf/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/fonts/geoslab703-ttf/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/fonts/kochi-ttf/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/fonts/ms-ttf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/fonts/un-core-ttf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/fonts/un-extra-ttf/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/fonts/vera-ttf/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/install/fonts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.