af422c7666
r267011: Make height and width optional arguments Now defaults to a 16x8 font size. The height and width can be specified using -h and -w respectively. r267012: Make the bold font optional r267035: Use a hash to speed up glyph deduplication Walking a linked list of all glyphs to look for a duplicate is very slow for large fonts (e.g., for CJK character sets). In my test the runtime for a sample 40000 character font went from just over 80 seconds on average to just over 2 seconds. r267119: -w sets the width, not height r267123: Support "GNU Unifont" format font data The GNU Unifont .hex format is a text file. Each line represents one glyph and consists of a four-digit hex code point, a colon, and pairs of hex digits representing the bitmap. By default an 8x16 font is assumed, with 16x16 double-width glyphs, resulting in either 32 or 64 hex digits for the bitmap. Our version of the file format supports comments at the top of the file to set the height and width: Each row of bitmap data is rounded up to byte width - for example, a 10-pixel wide font uses 4 characters per row. See http://czyborra.com/unifont/ for more background on the original format. r267126: Accept space after BITMAP in .bdf parser The Unifont BDF generator incorrectly adds a space after BITMAP, and and that error has been widely propagated. r267173: use -h height and -w width args r267298: Hide stats by default and improve error handling The font stats are interesting, but rather verbose. r267301: Speed up bold glyph map deduplication Perform an O(n) deduplication pass over the bold maps at the end, rather than walking the normal map list to look for a duplicate glyph each time a bold mapping entry is added. r267324: handle failure writing output font r267337: move to usr.bin/vtfontcvt vtfontcvt is useful for end users to convert arbitrary bitmap fonts for use by vt(4). It can also be used as a build tool, allowing us to keep the source font data in the src tree rather than uuencoded binaries. Reviewed by: ray, wblock (D183) r267366: Avoid leaking file pointer on error CID: 1222506, 1222505 r268022: Rename the WITHOUT_VT_SUPPORT knob to WITHOUT_VT The _SUPPORT knobs have a consistent meaning which differs from the behaviour controlled by this knob. As the knob is opt-out and has not appeared in a release the impact should be low. r268172: correct width calculation (.hex files and commandline) r268948: Use the standard way of printing the usage string r268949: Remove redundant return statement after errx Also update vtfontcvt(8), based on inclusion in FreeBSD 10.1 Sponsored by: The FreeBSD Foundation
391 lines
4.4 KiB
Makefile
391 lines
4.4 KiB
Makefile
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
|
|
# $FreeBSD$
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
# XXX MISSING: deroff diction graph learn plot
|
|
# spell spline struct xsend
|
|
# XXX Use GNU versions: diff ld patch
|
|
# Moved to secure: bdes
|
|
#
|
|
|
|
SUBDIR= alias \
|
|
apply \
|
|
asa \
|
|
${_atf} \
|
|
awk \
|
|
banner \
|
|
basename \
|
|
brandelf \
|
|
bsdiff \
|
|
bzip2 \
|
|
bzip2recover \
|
|
cap_mkdb \
|
|
chat \
|
|
chpass \
|
|
cksum \
|
|
${_clang} \
|
|
cmp \
|
|
col \
|
|
colldef \
|
|
colrm \
|
|
column \
|
|
comm \
|
|
compress \
|
|
cpuset \
|
|
csplit \
|
|
ctlstat \
|
|
cut \
|
|
dirname \
|
|
du \
|
|
ee \
|
|
elf2aout \
|
|
elfdump \
|
|
enigma \
|
|
env \
|
|
expand \
|
|
false \
|
|
fetch \
|
|
file \
|
|
find \
|
|
finger \
|
|
fmt \
|
|
fold \
|
|
fstat \
|
|
fsync \
|
|
ftp \
|
|
gcore \
|
|
gencat \
|
|
getconf \
|
|
getent \
|
|
getopt \
|
|
grep \
|
|
gzip \
|
|
head \
|
|
hexdump \
|
|
${_iconv} \
|
|
id \
|
|
ipcrm \
|
|
ipcs \
|
|
iscsictl \
|
|
join \
|
|
jot \
|
|
${_kdump} \
|
|
keylogin \
|
|
keylogout \
|
|
killall \
|
|
ktrace \
|
|
ktrdump \
|
|
lam \
|
|
lastcomm \
|
|
ldd \
|
|
leave \
|
|
less \
|
|
lessecho \
|
|
lesskey \
|
|
limits \
|
|
locale \
|
|
lock \
|
|
lockf \
|
|
logger \
|
|
login \
|
|
logins \
|
|
logname \
|
|
look \
|
|
lorder \
|
|
lsvfs \
|
|
lzmainfo \
|
|
m4 \
|
|
${_makewhatis} \
|
|
${_man} \
|
|
mandoc \
|
|
mesg \
|
|
minigzip \
|
|
ministat \
|
|
${_mkcsmapper} \
|
|
mkdep \
|
|
${_mkesdb} \
|
|
mkfifo \
|
|
mkimg \
|
|
mklocale \
|
|
mktemp \
|
|
mkulzma \
|
|
mkuzip \
|
|
mt \
|
|
ncal \
|
|
netstat \
|
|
newgrp \
|
|
nfsstat \
|
|
nice \
|
|
nl \
|
|
nohup \
|
|
opieinfo \
|
|
opiekey \
|
|
opiepasswd \
|
|
pagesize \
|
|
passwd \
|
|
paste \
|
|
patch \
|
|
pathchk \
|
|
perror \
|
|
pr \
|
|
printenv \
|
|
printf \
|
|
procstat \
|
|
protect \
|
|
rctl \
|
|
renice \
|
|
rev \
|
|
revoke \
|
|
rpcinfo \
|
|
rs \
|
|
rup \
|
|
rusers \
|
|
rwall \
|
|
script \
|
|
sed \
|
|
send-pr \
|
|
seq \
|
|
shar \
|
|
showmount \
|
|
sockstat \
|
|
sort \
|
|
split \
|
|
stat \
|
|
stdbuf \
|
|
su \
|
|
systat \
|
|
tabs \
|
|
tail \
|
|
talk \
|
|
tar \
|
|
tcopy \
|
|
tee \
|
|
${_tests} \
|
|
tftp \
|
|
time \
|
|
tip \
|
|
top \
|
|
touch \
|
|
tput \
|
|
tr \
|
|
true \
|
|
truncate \
|
|
${_truss} \
|
|
tset \
|
|
tsort \
|
|
tty \
|
|
uname \
|
|
unexpand \
|
|
uniq \
|
|
unzip \
|
|
units \
|
|
unvis \
|
|
uudecode \
|
|
uuencode \
|
|
vi \
|
|
vis \
|
|
vmstat \
|
|
w \
|
|
wall \
|
|
wc \
|
|
what \
|
|
whereis \
|
|
which \
|
|
whois \
|
|
write \
|
|
xargs \
|
|
xinstall \
|
|
${_xlint} \
|
|
${_xstr} \
|
|
xz \
|
|
xzdec \
|
|
${_yacc} \
|
|
yes \
|
|
${_ypcat} \
|
|
${_ypmatch} \
|
|
${_ypwhich}
|
|
|
|
# NB: keep these sorted by MK_* knobs
|
|
|
|
.if ${MK_AT} != "no"
|
|
SUBDIR+= at
|
|
.endif
|
|
|
|
.if ${MK_ATM} != "no"
|
|
SUBDIR+= atm
|
|
.endif
|
|
|
|
.if ${MK_BLUETOOTH} != "no"
|
|
SUBDIR+= bluetooth
|
|
.endif
|
|
|
|
.if ${MK_BSD_CPIO} != "no"
|
|
SUBDIR+= cpio
|
|
.endif
|
|
|
|
.if ${MK_CALENDAR} != "no"
|
|
SUBDIR+= calendar
|
|
.endif
|
|
|
|
.if ${MK_CLANG} != "no"
|
|
_clang= clang
|
|
.endif
|
|
|
|
.if ${MK_GPL_DTC} != "yes"
|
|
SUBDIR+= dtc
|
|
.endif
|
|
|
|
.if ${MK_GROFF} != "no"
|
|
SUBDIR+= vgrind
|
|
.endif
|
|
|
|
.if ${MK_HESIOD} != "no"
|
|
SUBDIR+= hesinfo
|
|
.endif
|
|
|
|
.if ${MK_ICONV} != "no"
|
|
_iconv= iconv
|
|
_mkcsmapper= mkcsmapper
|
|
_mkesdb= mkesdb
|
|
.endif
|
|
|
|
.if ${MK_KDUMP} != "no"
|
|
SUBDIR+= kdump
|
|
SUBDIR+= truss
|
|
.endif
|
|
|
|
.if ${MK_KERBEROS_SUPPORT} != "no"
|
|
SUBDIR+= compile_et
|
|
.endif
|
|
|
|
.if ${MK_LDNS_UTILS} != "no"
|
|
SUBDIR+= drill
|
|
SUBDIR+= host
|
|
.endif
|
|
|
|
.if ${MK_LIBTHR} != "no"
|
|
SUBDIR+= csup
|
|
.endif
|
|
|
|
.if ${MK_LOCATE} != "no"
|
|
SUBDIR+= locate
|
|
.endif
|
|
|
|
# XXX msgs?
|
|
.if ${MK_MAIL} != "no"
|
|
SUBDIR+= biff
|
|
SUBDIR+= from
|
|
SUBDIR+= mail
|
|
SUBDIR+= msgs
|
|
.endif
|
|
|
|
.if ${MK_MAKE} != "no"
|
|
.if ${MK_BMAKE} != "no"
|
|
SUBDIR+= bmake
|
|
.else
|
|
SUBDIR+= make
|
|
.endif
|
|
.endif
|
|
|
|
.if ${MK_MAN_UTILS} != "no"
|
|
SUBDIR+= catman
|
|
_makewhatis= makewhatis
|
|
_man= man
|
|
.endif
|
|
|
|
.if ${MK_NETCAT} != "no"
|
|
SUBDIR+= nc
|
|
.endif
|
|
|
|
.if ${MK_NIS} != "no"
|
|
SUBDIR+= ypcat
|
|
SUBDIR+= ypmatch
|
|
SUBDIR+= ypwhich
|
|
.endif
|
|
|
|
.if ${MK_OPENSSH} != "no"
|
|
SUBDIR+= ssh-copy-id
|
|
.endif
|
|
|
|
.if ${MK_OPENSSL} != "no"
|
|
SUBDIR+= bc
|
|
SUBDIR+= chkey
|
|
SUBDIR+= dc
|
|
SUBDIR+= newkey
|
|
.endif
|
|
|
|
.if ${MK_QUOTAS} != "no"
|
|
SUBDIR+= quota
|
|
.endif
|
|
|
|
.if ${MK_RCMDS} != "no"
|
|
SUBDIR+= rlogin
|
|
SUBDIR+= rsh
|
|
SUBDIR+= ruptime
|
|
SUBDIR+= rwho
|
|
.endif
|
|
|
|
.if ${MK_SENDMAIL} != "no"
|
|
SUBDIR+= vacation
|
|
.endif
|
|
|
|
.if ${MK_TELNET} != "no"
|
|
SUBDIR+= telnet
|
|
.endif
|
|
|
|
.if ${MK_TESTS} != "no"
|
|
_atf= atf
|
|
_tests= tests
|
|
.endif
|
|
|
|
.if ${MK_TEXTPROC} != "no"
|
|
SUBDIR+= checknr
|
|
SUBDIR+= colcrt
|
|
SUBDIR+= ul
|
|
.endif
|
|
|
|
.if ${MK_TOOLCHAIN} != "no"
|
|
SUBDIR+= ar
|
|
SUBDIR+= c89
|
|
SUBDIR+= c99
|
|
SUBDIR+= ctags
|
|
SUBDIR+= file2c
|
|
SUBDIR+= gprof
|
|
SUBDIR+= indent
|
|
SUBDIR+= lex
|
|
SUBDIR+= mkstr
|
|
SUBDIR+= rpcgen
|
|
SUBDIR+= unifdef
|
|
SUBDIR+= xlint
|
|
SUBDIR+= xstr
|
|
SUBDIR+= yacc
|
|
.endif
|
|
|
|
.if ${MK_VT} != "no"
|
|
SUBDIR+= vtfontcvt
|
|
.endif
|
|
|
|
.if ${MK_USB} != "no"
|
|
SUBDIR+= usbhidaction
|
|
SUBDIR+= usbhidctl
|
|
.endif
|
|
|
|
.if ${MK_UTMPX} != "no"
|
|
SUBDIR+= last
|
|
SUBDIR+= users
|
|
SUBDIR+= who
|
|
.endif
|
|
|
|
.if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes"
|
|
SUBDIR+= svn
|
|
.endif
|
|
|
|
.include <bsd.arch.inc.mk>
|
|
|
|
SUBDIR:= ${SUBDIR:O}
|
|
|
|
SUBDIR_PARALLEL=
|
|
|
|
.include <bsd.subdir.mk>
|