From owner-svn-src-head@FreeBSD.ORG  Thu Jun 12 18:31:33 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6D502C00;
 Thu, 12 Jun 2014 18:31:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4068E2A3D;
 Thu, 12 Jun 2014 18:31:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CIVXlj087515;
 Thu, 12 Jun 2014 18:31:33 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CIVWZd087511;
 Thu, 12 Jun 2014 18:31:32 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201406121831.s5CIVWZd087511@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 12 Jun 2014 18:31:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267423 - in head: . share/vt/fonts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jun 2014 18:31:33 -0000

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