Date: Thu, 12 Jun 2014 18:31:32 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267423 - in head: . share/vt/fonts Message-ID: <201406121831.s5CIVWZd087511@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Jun 12 18:31:32 2014 New Revision: 267423 URL: http://svnweb.freebsd.org/changeset/base/267423 Log: Build vt(4) fonts during buildworld vtfontcvt(8) is now built during buildworld, so can be used as a bootstrap tool to create vt(4) fonts from source .hex or .bdf font files, rather than having uuencoded binary fonts in the tree. Sponsored by: The FreeBSD Foundation Deleted: head/share/vt/fonts/vgarom-8x14.fnt.uu head/share/vt/fonts/vgarom-8x16.fnt.uu head/share/vt/fonts/vgarom-8x8.fnt.uu Modified: head/Makefile.inc1 head/share/vt/fonts/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Jun 12 17:22:04 2014 (r267422) +++ head/Makefile.inc1 Thu Jun 12 18:31:32 2014 (r267423) @@ -1196,6 +1196,10 @@ _gperf= gnu/usr.bin/gperf _groff= gnu/usr.bin/groff .endif +.if ${MK_VT_SUPPORT} != "no" +_vtfontcvt= usr.bin/vtfontcvt +.endif + .if ${BOOTSTRAPPING} < 900002 _sed= usr.bin/sed .endif @@ -1295,7 +1299,8 @@ bootstrap-tools: .MAKE ${_gensnmptree} \ usr.sbin/config \ ${_crunch} \ - ${_nmtree} + ${_nmtree} \ + ${_vtfontcvt} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ Modified: head/share/vt/fonts/Makefile ============================================================================== --- head/share/vt/fonts/Makefile Thu Jun 12 17:22:04 2014 (r267422) +++ head/share/vt/fonts/Makefile Thu Jun 12 18:31:32 2014 (r267423) @@ -3,13 +3,18 @@ FILES= gallant.fnt \ vgarom-8x8.fnt \ vgarom-8x14.fnt \ - vgarom-8x16.fnt + vgarom-8x16.fnt \ + vgarom-thin-8x8.fnt \ + vgarom-thin-8x16.fnt CLEANFILES+= ${FILES} -.SUFFIXES: .uu -.uu: - uudecode < ${.IMPSRC} +.SUFFIXES: .fnt .fnt.uu .hex +.hex.fnt: + vtfontcvt ${.IMPSRC} ${.TARGET} + +.fnt.uu.fnt: + uudecode -p < ${.IMPSRC} > ${.TARGET} FILESDIR= ${SHAREDIR}/vt/fonts
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406121831.s5CIVWZd087511>