diff --git a/Makefile.inc1 b/Makefile.inc1 index 344da994ef32..ac5692da7c86 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 && \ diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile index f8a27001c8a6..05e99a5fe6bf 100644 --- a/share/vt/fonts/Makefile +++ b/share/vt/fonts/Makefile @@ -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 diff --git a/share/vt/fonts/vgarom-8x14.fnt.uu b/share/vt/fonts/vgarom-8x14.fnt.uu deleted file mode 100644 index d0b9e3e4b2b6..000000000000 --- a/share/vt/fonts/vgarom-8x14.fnt.uu +++ /dev/null @@ -1,98 +0,0 @@ -# $FreeBSD$ -begin 644 vgarom-8x14.fnt -M5D9.5#`P,#((#@``````_@```%`````````````````````````````````` -M````P\/!@8`!@8`````&9F9B0``````````````&QL_FQL;/YL;````!@8 -M?,;"P'P&AL9\&!@``````,+!@P9L8``````#AL;#AVW,S,=@`````P,#!@ -M```````````````,`P,#`P&`P``````#`8#`P,#`P8,`````````!F//\\ -M9@```````````!@8?A@8`````````````````!@8```````````/X````` -M````````````````&!@```````(!@P8,"`````````?,;.WO;FQL9\```` -M```8.'@8&!@8&'X``````'S&!@P8,&_@``````?,8&!CP&!L9\```````, -M'#QLS/X,#!X``````/[`P,#\!@;&?```````.`P/S&QL9\``````#^Q@8, -M`P,#```````'S&QL9\QL;&?```````?,;&QGX&!@QX````````&!@````8 -M&``````````8&````!@8,```````!@P8,&`P&`P&``````````!^``!^```` -M`````&`P&`P!@P8```````?,;!@8`!@8``````!\QL;>WM[
&A@8/```````#QFPL#`
-MWL9F.@``````QL;&QO[&QL;&```````\&!@8&!@8P``````!X,#`P,#,S,
-M>```````YF9L;'AL;&;F``````#P8&!@8&!B9OX``````,;N_O[6QL;&Q@``
-M````QN;V_M[.QL;&```````X;,;&QL;&;#@``````/QF9F9\8&!@\```````
-M?,;&QL;6WGP,#@````#\9F9F?&QF9N8``````'S&QF`X#,;&?```````?GY:
-M&!@8&!@\``````#&QL;&QL;&QGP``````,;&QL;&QFPX$```````QL;&QM;6
-M_GQL``````#&QFPX.#ALQL8``````&9F9F8\&!@8/```````_L:,!@PL;^
-M```````\,#`P,#`P,#P``````(#`X'`X'`X&`@``````/`P,#`P,#`P\````
-M$#ALQ@````````````````````````````#_`#`P&```````````````````
-M``!X#'S,S'8``````.!@8'AL9F9F?```````````?,;`P,9\```````<#`P\
-M;,S,S'8``````````'S&_L#&?```````.&QD8/!@8P``````````!VS,S,
-M?`S,>````.!@8&QV9F9FY@``````&!@`.!@8&!@\```````&!@`.!@8&!F9F
-M/````.!@8&9L>&QFY@``````.!@8&!@8&!@\``````````#L_M;6UL8`````
-M`````-QF9F9F9@``````````?,;&QL9\``````````#<9F9F?&!@\```````
-M`';,S,Q\#`P>````````W'9F8P``````````!\QG` 0``````WP!Z``,```#D`'X`"P```/$`B@`#````
-M]@".``$```#Y`)```P```/\`E``````!D@"5``````.3`)8``````Y@`EP``
-M```#HP"8``````.F`)D``````ZD`F@`````#L0";``````.T`)P``0```\``
-MG@`````#PP"?``$```/&`*$`````("(`H@`````@/`"C`````"!_`*0`````
-M(*<`I0`````AD`"F``4``"&H`*P`````(AD`K0`!```B'@"O``$``"(I`+$`
-M````(D@`L@`````B80"S`````")D`+0``0``(P(`M@`````C$`"W`````",@
-M`+@``0``)0``N@`````E`@"[`````"4,`+P`````)1``O0`````E%`"^````
-M`"48`+\`````)1P`P``````E)`#!`````"4L`,(`````)30`PP`````E/`#$
-M`````"50`,4`'```)8``X@`````EA`#C`````"6(`.0`````)8P`Y0`````E
-MD`#F``,``"6@`.H`````):P`ZP`````EL@#L`````"6Z`.T`````);P`[@``
-M```EQ`#O`````"7+`/``````)=@`\0`!```F.@#S``(``"9``/8`````)D(`
-K]P`````F8`#X`````"9C`/D`````)F4`^@`!```F:@#\`````"9L`/T`````
-`
-end
diff --git a/share/vt/fonts/vgarom-8x16.fnt.uu b/share/vt/fonts/vgarom-8x16.fnt.uu
deleted file mode 100644
index 91a8258065ce..000000000000
--- a/share/vt/fonts/vgarom-8x16.fnt.uu
+++ /dev/null
@@ -1,110 +0,0 @@
-# $FreeBSD$
-begin 644 vgarom-8x16.fnt
-M5D9.5#`P,#(($```````_@```%``````````````````````````````````
-M```````8/#P\&!@8`!@8``````!F9F8D``````````````````!L;/YL;&S^
-M;&P`````&!A\QL+`?`8&AL9\&!@```````#"Q@P8,&A@```````#AL;#AV
-MW,S,S'8``````#`P,&``````````````````#!@P,#`P,#`8#````````#`8
-M#`P,#`P,````````````!F//\\9@``````````````&!A^&!@`````````
-M```````````8&!@P`````````````/X````````````````````````8&```
-M`````````@8,!@P(`````````X;,;&UM;&QFPX````````AX&!@8&!@8
-M?@```````'S&!@P8,`QOX```````!\Q@8&/`8&!L9\````````#!P\;,S^
-M#`P,'@```````/[`P,#\!@8&QGP````````X8,#`_,;&QL9\````````_L8&
-M!@P8,#`P,````````'S&QL9\QL;&QGP```````!\QL;&?@8&!@QX````````
-M```8&````!@8````````````&!@````8``````````!@P8,&`P&`P&````
-M````````?@``?@````````````!@,!@,!@P8,&````````!\QL8,&!@8`!@8
-M`````````'S&QM[>WMS`?````````!`X;,;&_L;&QL8```````#\9F9F?&9F
-M9F;\````````/&;"P,#`P,)F/````````/AL9F9F9F9F;/@```````#^9F)H
-M>&A@8F;^````````_F9B:'AH8&!@\````````#QFPL#`WL;&9CH```````#&
-MQL;&_L;&QL;&````````/!@8&!@8&!@8/````````!X,#`P,#,S,S'@`````
-M``#F9F9L>'AL9F;F````````\&!@8&!@8&)F_@```````,;N_O[6QL;&QL8`
-M``````#&YO;^WL[&QL;&````````?,;&QL;&QL;&?````````/QF9F9\8&!@
-M8/````````!\QL;&QL;&UMY\#`X`````_&9F9GQL9F9FY@```````'S&QF`X
-M#`;&QGP```````!^?EH8&!@8&!@\````````QL;&QL;&QL;&?````````,;&
-MQL;&QL9L.!````````#&QL;&UM;6_NYL````````QL9L?#@X?&S&Q@``````
-M`&9F9F8\&!@8P```````#^QH8,!@PL;^````````/#`P,#`P,#`P/```
-M``````"`P.!P.!P.!@(````````\#`P,#`P,#`P\`````!`X;,8`````````
-M````````````````````````_P``,#`8````````````````````````>`Q\
-MS,S,=@```````.!@8'AL9F9F9GP```````````!\QL#`P,9\````````'`P,
-M/&S,S,S,=@```````````'S&_L#`QGP````````X;&1@\&!@8P````````
-M````=LS,S,S,?`S,>````.!@8&QV9F9F9N8````````8&``X&!@8&!@\````
-M````!@8`#@8&!@8&!F9F/````.!@8&9L>'AL9N8````````X&!@8&!@8&!@\
-M````````````[/[6UM;6Q@```````````-QF9F9F9F8```````````!\QL;&
-MQL9\````````````W&9F9F9F?&!@\````````';,S,S,S'P,#!X```````#<
-M=F9@8P````````````?,9@.`S&?````````!`P,/PP,#`P-AP`````````
-M``#,S,S,S,QV````````````9F9F9F8\&````````````,;&UM;6_FP`````
-M``````#&;#@X.&S&````````````QL;&QL;&?@8,^````````/[,!@QOX`
-M```````.&!@8SL;&Q@``````Q@!\QL;&QL;&QGP``````,8`QL;&QL;&QL9\
-M````````>,S,S-C,QL;&S```````8#`8`'@,?,S,S'8``````!@P8`!X#'S,
-MS,QV```````0.&P`>`Q\S,S,=@```````,P``'@,?,S,S'8``````#AL.`!X
-M#'S,S,QV````````````S'8V?MC8;@``````````/&9@8&8\#`8\`````&`P
-M&`!\QO[`P,9\```````,``?,;^P,#&?```````$#AL`'S&_L#`QGP`````
-M``#&``!\QO[`P,9\``````!@,!@`.!@8&!@8/```````#!@P`#@8&!@8P`
-M`````!@\9@`X&!@8&!@\````````9@``.!@8&!@8/````````';<`-QF9F9F
-M9F8``````&`P&`!\QL;&QL9\```````8,&``?,;&QL;&?```````$#AL`'S&
-MQL;&QGP```````#&``!\QL;&QL9\```````````8&`!^`!@8````````8#`8
-M`,S,S,S,S'8``````!@P8`#,S,S,S,QV```````P>,P`S,S,S,S,=@``````
-M`,P``,S,S,S,S'8```````#&``#&QL;&QL9^!@QX```.&Q@8&'X8&!@8&-AP
-M`````/[&QL#`P,#`P,``````````.&S&QO[&QFPX`````````/[&8#`8,&
-M_@````````!^QF9F8\&'X````````X;,;&QFQL;&SN````````````=MS8
-MV-C<=@```````!XP&`P^9F9F9CP````````<,&!@?&!@8#`<``````````#^
-M;&QL;&QL;````````````'[8V-C8V'```````````';<&!@8&!@8````````
-M``,&?MO;\WY@P``````````````8/#P8``````````!F9F9F9F9F`&9F````
-M``#8;&QL;&P`````````````^,S,^,3,WLS,S,8````````````P8/Y@,```
-M````````Q^&!@8&!@8&````````````!@,_@P8```````````8&!@8&!@8
-M?CP8````````````*&S^;"@``````````!@\?A@8&'X\&``````````8/'X8
-M&!A^/!A^```````````````8&```````````#PP,#`P,[&QL/!P`````````
-M``!^V]O;?@```````````````,#`P/X```````````!\QL;&QL;&QL8`````
-M``````!VW`!VW`````````````#^``#^``#^```````````,!@,!@,`'X`
-M````````,!@,!@P8,`!^```````````0.&S&QL;^``````````````#^P,#`
-MP``````````.&QL8&!@8&!@8&!@8&!@8&!@8&!@8V-C8<```````````````
-M_P``````````&!@8&!@8&!@8&!@8&!@8&``````````?&!@8&!@8&!@`````
-M````^!@8&!@8&!@8&!@8&!@8&!\``````````!@8&!@8&!CX```````````8
-M&!@8&!@8'Q@8&!@8&!@8&!@8&!@8&/@8&!@8&!@8&`````````#_&!@8&!@8
-M&!@8&!@8&!@8_P``````````&!@8&!@8&/\8&!@8&!@8&```````_P#_````
-M```````V-C8V-C8V-C8V-C8V-C8V```````?&!\8&!@8&!@8&``````````_
-M-C8V-C8V-C8``````#\P-S8V-C8V-C8V``````#X&/@8&!@8&!@8&```````
-M``#^-C8V-C8V-C8``````/X&]C8V-C8V-C8V&!@8&!@?&!\``````````#8V
-M-C8V-C8_```````````V-C8V-C /OX^'@X&`@``
-M`````````#QF0D)F/```````________Y\/#Y_______________PYF]O9G#
-M______\``'Z!I8&!O9F!@7X```````!^_]O__\/G__]^`````````!@8VSSG
-M/-L8&````````#QF9F9F/!A^&!@````````>#AHR>,S,S,QX`````````!@\
-M?O__?A@8/``````````8/#SGY^<8P``````````&S^_O[^?#@0````````
-M```0.'S^?#@0`````````#\S/S`P,#!P\.````````!_8W]C8V-C9^?FP```
-M`````"````!>````H`````````"A`%\``@```*4`8@``````IP!C``````"J
-M`&0``@```+``9P`"````M0!J``(```"Z`&T``P```+\`<0``````Q`!R``,`
-M``#)`'8``````-$`=P``````U@!X``````#<`'D``````-\`>@`#````Y`!^
-M``L```#Q`(H``P```/8`C@`!````^0"0``,```#_`)0``````9(`E0`````#
-MDP"6``````.8`)<``````Z,`F``````#I@"9``````.I`)H``````[$`FP``
-M```#M`"<``$```/``)X``````\,`GP`!```#Q@"A`````"`B`*(`````(#P`
-MHP`````@?P"D`````""G`*4`````(9``I@`%```AJ`"L`````"(9`*T``0``
-M(AX`KP`!```B*0"Q`````")(`+(`````(F$`LP`````B9`"T``$``","`+8`
-M````(Q``MP`````C(`"X``$``"4``+H`````)0(`NP`````E#`"\`````"40
-M`+T`````)10`O@`````E&`"_`````"4<`,``````)20`P0`````E+`#"````
-M`"4T`,,`````)3P`Q``````E4`#%`!P``"6``.(`````)80`XP`````EB`#D
-M`````"6,`.4`````)9``Y@`#```EH`#J`````"6L`.L`````);(`[``````E
-MN@#M`````"6\`.X`````)<0`[P`````ERP#P`````"78`/$``0``)CH`\P`"
-M```F0`#V`````"9"`/<`````)F``^``````F8P#Y`````"9E`/H``0``)FH`
-+_``````F;`#]````
-`
-end
diff --git a/share/vt/fonts/vgarom-8x8.fnt.uu b/share/vt/fonts/vgarom-8x8.fnt.uu
deleted file mode 100644
index 7d40314a719a..000000000000
--- a/share/vt/fonts/vgarom-8x8.fnt.uu
+++ /dev/null
@@ -1,65 +0,0 @@
-# $FreeBSD$
-begin 644 vgarom-8x8.fnt
-M5D9.5#`P,#(("```````_@```%```````````````````````````#!X>#`P
-M`#``;&QL``````!L;/YL_FQL`#!\P'@,^#```,;,!FQ@`X;#AVW,QV`&!@
-MP```````!@8&`P&`!@,!@8!@``!F//\\9@```#`P_#`P`````````#`P
-M8````/P````````````P,``!@P8,"``'S&SM[VYGP`,'`P,#`P_`!XS`PX
-M8,S\`'C,##@,S'@`'#QLS/X,'@#\P/@,#,QX`#A@P/C,S'@`_,P,`P,`!X
-MS,QXS,QX`'C,S'P,&'```#`P```P,```,#```#`P8!@P8,!@,!@```#\``#\
-M``!@,!@,!@`'C,#!@P`#``?,;>WM[`>``P>,S,_,S,`/QF9GQF9OP`/&;`
-MP,!F/`#X;&9F9FSX`/YB:'AH8OX`_F)H>&A@\``\9L#`SF8^`,S,S/S,S,P`
-M>#`P,#`P>``>#`P,S,QX`.9F;'AL9N8`\&!@8&)F_@#&[O[^UL;&`,;F]M[.
-MQL8`.&S&QL9L.`#\9F9\8P`'C,S,S<>!P`_&9F?&QFY@!XS.!P',QX`/RT
-M,#`P,'@`S,S,S,S,_`#,S,S,S'@P`,;&QM;^[L8`QL9L.#ALQ@#,S,QX,#!X
-M`/[&C!@R9OX`>&!@8&!@>`#`8#`8#`8"`'@8&!@8&'@`$#ALQ@``````````
-M````_S`P&`````````!X#'S,=@#@8&!\9F;<````>,S`S'@`'`P,?,S,=@``
-M`'C,_,!X`#AL8/!@8/````!VS,Q\#/C@8&QV9F;F`#``<#`P,'@`#``,#`S,
-MS'C@8&9L>&SF`'`P,#`P,'@```#,_O[6Q@```/C,S,S,````>,S,S'@```#<
-M9F9\8/```';,S'P,'@``W'9F8/````!\P'@,^``0,'PP,#08````S,S,S'8`
-M``#,S,QX,````,;6_OYL````QFPX;,8```#,S,Q\#/@``/R8,&3\`!PP,.`P
-M,!P`&!@8`!@8&`#@,#`<,##@`';<````````&!@`&!@8&``8&'[`P'X8AL
-M9/!@YOP`S,QX_##\,#`^8SAL;#C,>#QL;#X`?@```#-FS&8S``````#\#`P`
-M`#AL;#@`````,##\,#``_`!P!@>`````!F9F9F?`?]O;>QL;&P``````
-M&````#AL;#@`?````,QF,V;,``##QLS;-V_/`\/&S-XS9LP/,``P8,#,>`#&
-M.&S&_L;&`#`P`'C,_,P`/FS,_LS,S@!XS,#,>!@,>!P`_&!X8/P`_`#,[/S<
-MS`##QF9CP8`,P`S,S,S'@``'C,^,SXP,#@`'@,?,Q^`!P`>`Q\S'X`?L,\
-M!CYF/P#,`'@,?,Q^`#`P>`Q\S'X```!_#'_,?P```'C`P'@,..``>,S\P'@`
-M'`!XS/S`>`!^PSQF?F`\`,P`>,S\P'@`X`!P,#`P>``X`'`P,#!X`'S&.!@8
-MP`S`!P,#`P>```^`#XS,S,``#@`'C,S'@``!P`>,S,>`!XS`!XS,QX``#,
-M`'C,S'@`,#``_``P,```X`#,S,Q^```<`,S,S'X`>,P`S,S,?@``S`#,S,Q^
-M``#,`,S,?`SX#AL8/!@8V'``_,S`P,#``#ALQO[&;#@`_,Q@,,_`#\,'C,
-MS'@P_#ALQL9L;.X```!VW,C<=@`<,!A\S,QX`#A@P/C`8#@``/YL;&QL;```
-M`'[8V-AP``!VW!@8&!@`!@Q^V]M^8,```!@\/!@``&9F9F9F`&8`>&QL;&P`
-M``#XS,SZQL_&QP`P8/Y@,```Q^&!@8&```&`S^#!@``!@8&!A^/!@``"1F
-M_V8D```8/'X8&'X\&!@\?AA^/!C_````&!@````/#`P,[&P\'```?MO;?@``
-M``#`P,#^``!XS,S,S,S,``!VW`!VW````/P`_`#\```8,&`P&`#\`&`P!@
-M`/P``!`X;,;&_@````#\P,````X;&Q@8&!@8&!@8&!C8V'``````_P```!@8
-M&!@8&!@8`````!\8&!@`````^!@8&!@8&!@?````&!@8&/@````8&!@8'Q@8
-M&!@8&!CX&!@8`````/\8&!@8&!@8_P```!@8&!C_&!@8``#_`/\````V-C8V
-M-C8V-@``'Q@?&!@8`````#\V-C8``#\P-S8V-@``^!CX&!@8`````/XV-C8`
-M`/X&]C8V-A@8'Q@?````-C8V-C\````V-C 0``````WP!Z``,```#D`'X`"P```/$`
-MB@`#````]@".``$```#Y`)```P```/\`E``````!D@"5``````.3`)8`````
-M`Y@`EP`````#HP"8``````.F`)D``````ZD`F@`````#L0";``````.T`)P`
-M`0```\``G@`````#PP"?``$```/&`*$`````("(`H@`````@/`"C`````"!_
-M`*0`````(*<`I0`````AD`"F``4``"&H`*P`````(AD`K0`!```B'@"O``$`
-M`"(I`+$`````(D@`L@`````B80"S`````")D`+0``0``(P(`M@`````C$`"W
-M`````",@`+@``0``)0``N@`````E`@"[`````"4,`+P`````)1``O0`````E
-M%`"^`````"48`+\`````)1P`P``````E)`#!`````"4L`,(`````)30`PP``
-M```E/`#$`````"50`,4`'```)8``X@`````EA`#C`````"6(`.0`````)8P`
-MY0`````ED`#F``,``"6@`.H`````):P`ZP`````EL@#L`````"6Z`.T`````
-M);P`[@`````EQ`#O`````"7+`/``````)=@`\0`!```F.@#S``(``"9``/8`
-M````)D(`]P`````F8`#X`````"9C`/D`````)F4`^@`!```F:@#\`````"9L
-$`/T`````
-`
-end