--==========42F64574D0AF675DB227==========
Content-Type: multipart/mixed;
 boundary="==========6D7B0B337113152C781D=========="

--==========6D7B0B337113152C781D==========
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi!

If there're no objections then I'd like to commit the attached diff. Which=20
changes ttmkfdir to Yu Shao's (ttmkfdir2) version. This version is=20
compatible to freetype2 and would close PR 24934. (Or should I import it as =

ttmkfdir2 and change fonts.mk to use this version?)

--=20
Marc Recht
--==========6D7B0B337113152C781D==========
Content-Type: application/octet-stream; name="ttmkfdir.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="ttmkfdir.diff"; size=5501

SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L3BrZ3NyYy9mb250
cy90dG1rZmRpci9NYWtlZmlsZSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS43CmRpZmYgLXUgLXUg
LWIgLXIxLjcgTWFrZWZpbGUKLS0tIE1ha2VmaWxlCTIwIEphbiAyMDA0IDEyOjE1OjE3IC0wMDAw
CTEuNworKysgTWFrZWZpbGUJMjkgTWFyIDIwMDQgMTE6MTA6NDkgLTAwMDAKQEAgLTEsMjAgKzEs
MjQgQEAKICMgJE5ldEJTRDogTWFrZWZpbGUsdiAxLjcgMjAwNC8wMS8yMCAxMjoxNToxNyBhZ2Mg
RXhwICQKICMKIAotRElTVE5BTUU9CXR0bWtmZGlyCi1QS0dOQU1FPQl0dG1rZmRpci0wCitESVNU
TkFNRT0JdHRta2ZkaXIyLjIwMDIxMTA5CitQS0dOQU1FPQl0dG1rZmRpci0yMDAyMTEwOQogQ0FU
RUdPUklFUz0JZm9udHMgeDExCi1NQVNURVJfU0lURVM9CWh0dHA6Ly93d3cuam9lcmctcG9tbW5p
dHouZGUvVHJ1ZVR5cGUvCitNQVNURVJfU0lURVM9CWh0dHA6Ly9wZW9wbGUucmVkaGF0LmNvbS95
c2hhby8KK0VYVFJBQ1RfU1VGWD0JLnRhci5iejIKIAogTUFJTlRBSU5FUj0JdGVjaC1wa2dATmV0
QlNELm9yZwotSE9NRVBBR0U9CWh0dHA6Ly93d3cuam9lcmctcG9tbW5pdHouZGUvVHJ1ZVR5cGUv
eGZzZnQuaHRtbAorSE9NRVBBR0U9CWh0dHA6Ly9wZW9wbGUucmVkaGF0LmNvbS95c2hhby8KIENP
TU1FTlQ9CVRvb2wgdGhhdCBjcmVhdGVzIGEgZm9udHMuc2NhbGUgZmlsZQogCi1XUktTUkM9CQkk
e1dSS0RJUn0KLVVTRV9CVUlMRExJTksyPQl5ZXMKK1dSS1NSQz0JCSR7V1JLRElSfS90dG1rZmRp
cjIKK1VTRV9MSUJUT09MPQl5ZXMKK1VTRV9CVUlMRExJTkszPQl5ZXMKK1VTRV9HTlVfVE9PTFMr
PQltYWtlCitVU0VfTEFOR1VBR0VTPQljIGMrKwogCiBkby1pbnN0YWxsOgogCSR7SU5TVEFMTF9Q
Uk9HUkFNfSAke1dSS1NSQ30vdHRta2ZkaXIgJHtQUkVGSVh9L2JpbgogCi0uaW5jbHVkZSAiLi4v
Li4vZ3JhcGhpY3MvZnJlZXR5cGUtbGliL2J1aWxkbGluazIubWsiCisuaW5jbHVkZSAiLi4vLi4v
Z3JhcGhpY3MvZnJlZXR5cGUyL2J1aWxkbGluazMubWsiCiAuaW5jbHVkZSAiLi4vLi4vbWsvYnNk
LnBrZy5tayIKSW5kZXg6IGRpc3RpbmZvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L3Br
Z3NyYy9mb250cy90dG1rZmRpci9kaXN0aW5mbyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xLjEu
MQpkaWZmIC11IC11IC1iIC1yMS4xLjEuMSBkaXN0aW5mbwotLS0gZGlzdGluZm8JMiBKdWwgMjAw
MiAxMzowNjoyNyAtMDAwMAkxLjEuMS4xCisrKyBkaXN0aW5mbwkyOSBNYXIgMjAwNCAxMToxMDo0
OSAtMDAwMApAQCAtMSw2ICsxLDcgQEAKICROZXRCU0Q6IGRpc3RpbmZvLHYgMS4xLjEuMSAyMDAy
LzA3LzAyIDEzOjA2OjI3IHdpeiBFeHAgJAogCi1TSEExICh0dG1rZmRpci50YXIuZ3opID0gMWJh
MmI1MTAzZTE1OTc1OGUyZTg0ZTcwOWNiMzk2ZTVkNTMyZWQ5NQotU2l6ZSAodHRta2ZkaXIudGFy
Lmd6KSA9IDYxNDg3IGJ5dGVzCi1TSEExIChwYXRjaC1hYSkgPSA3N2E2NThjNjZlZDk3YzY2Mzg0
MDdhZTY0NmYwMDNkOWE1NGVkMzkxCi1TSEExIChwYXRjaC1hYikgPSAxOGM3OTI0NjQyYmEyYjdh
ODdhNjgyYTllMzM0M2RjN2E2NTllMDc4CitTSEExICh0dG1rZmRpcjIuMjAwMjExMDkudGFyLmJ6
MikgPSBiZWUxOTQ0Y2UzZTViNmM0NTAzYTE0ZTY0Mjk3MzdjYzU1OGEyNGMwCitTaXplICh0dG1r
ZmRpcjIuMjAwMjExMDkudGFyLmJ6MikgPSA3MDE5MDAgYnl0ZXMKK1NIQTEgKHBhdGNoLWFhKSA9
IDUxM2M2OTIyY2ZhNjBhNmMyZGJmMzMyYTVkNjVlMDI3N2JkODk5MjkKK1NIQTEgKHBhdGNoLWFi
KSA9IGQyMmIxZWI3ZGU5YzJiYTYyMjU4M2JiMmUyZmU2YzRjY2Q0YjI2ZDIKK1NIQTEgKHBhdGNo
LWFjKSA9IDIzZWI2ZTUwMDUyMmExY2U4MjZhOWIwODk5ZDdhZmZmNjAxN2QwOTYKSW5kZXg6IHBh
dGNoZXMvcGF0Y2gtYWEKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvcGtnc3JjL2ZvbnRz
L3R0bWtmZGlyL3BhdGNoZXMvcGF0Y2gtYWEsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMS4xLjEK
ZGlmZiAtdSAtdSAtYiAtcjEuMS4xLjEgcGF0Y2gtYWEKLS0tIHBhdGNoZXMvcGF0Y2gtYWEJMiBK
dWwgMjAwMiAxMzowNjoyNyAtMDAwMAkxLjEuMS4xCisrKyBwYXRjaGVzL3BhdGNoLWFhCTI5IE1h
ciAyMDA0IDExOjEwOjQ5IC0wMDAwCkBAIC0xLDMxICsxLDMxIEBACi0kTmV0QlNEOiBwYXRjaC1h
YSx2IDEuMS4xLjEgMjAwMi8wNy8wMiAxMzowNjoyNyB3aXogRXhwICQKKyROZXRCU0QkCiAKLS0t
LSBNYWtlZmlsZS5vcmlnCVNhdCBKdW4gIDggMjE6MzY6NDMgMjAwMgotKysrIE1ha2VmaWxlCVNh
dCBKdW4gIDggMjE6NDI6MDEgMjAwMgotQEAgLTEsMTAgKzEsMTAgQEAKLS1GUkVFVFlQRV9CQVNF
PS4uL2ZyZWV0eXBlLTEuMQotLUZSRUVUWVBFX0lOQ0w9JChGUkVFVFlQRV9CQVNFKS9saWIKLS1G
UkVFVFlQRV9MSUI9LUwkKEZSRUVUWVBFX0JBU0UpL2xpYi8ubGlicyAtbHR0ZgorLS0tIE1ha2Vm
aWxlLm9yaWcJMjAwMi0xMS0wNyAwNjoyODo0NC4wMDAwMDAwMDAgKzAxMDAKKysrKyBNYWtlZmls
ZQorQEAgLTEsMTIgKzEsOSBAQAorLUZSRUVUWVBFX0JBU0U9L3Vzci9pbmNsdWRlL2ZyZWV0eXBl
MgorLUZSRUVUWVBFX0lOQ0w9LUkkKEZSRUVUWVBFX0JBU0UpLy4KKy1GUkVFVFlQRV9MSUI9L3Vz
ci9saWIvbGliZnJlZXR5cGUuc28KIC0KLS1DQz1nY2MKLS1DRkxBR1M9LVdhbGwgLXBlZGFudGlj
IC1JJChGUkVFVFlQRV9JTkNMKQotLUxERkFMR1M9JChGUkVFVFlQRV9MSUIpIC1zCi0rI0ZSRUVU
WVBFX0JBU0U9Li4vZnJlZXR5cGUtMS4xCi0rI0ZSRUVUWVBFX0lOQ0w9JChGUkVFVFlQRV9CQVNF
KS9saWIKLSsjRlJFRVRZUEVfTElCPS1MJChGUkVFVFlQRV9CQVNFKS9saWIvLmxpYnMgLWx0dGYK
LSsKLSsjQ0M9Z2NjCi0rI0NGTEFHUz0tV2FsbCAtcGVkYW50aWMgLUkkKEZSRUVUWVBFX0lOQ0wp
Ci0rI0xERkFMR1M9JChGUkVFVFlQRV9MSUIpIC1zCistREVCVUc9LWdnZGIKKy1DWFg9ZysrCist
Q1hYRkxBR1M9LVdhbGwgLXBlZGFudGljICQoRlJFRVRZUEVfSU5DTCkgJChERUJVRykKKytGUkVF
VFlQRV9JTkNMPWBmcmVldHlwZS1jb25maWcgLS1jZmxhZ3NgCisrRlJFRVRZUEVfTElCPWBmcmVl
dHlwZS1jb25maWcgLS1saWJzYAogIAotIGFsbDogdHRta2ZkaXIKKy1MREZMQUdTPSQoRlJFRVRZ
UEVfTElCKSAkKERFQlVHKQorK0NYWEZMQUdTKz0kKEZSRUVUWVBFX0lOQ0wpCisrCisrTERGTEFH
Uys9JChGUkVFVFlQRV9MSUIpCiAgCi1AQCAtMTgsNyArMTgsNyBAQAotIAlsbiAkPCAkQAorIC5Q
SE9OWTogY2xlYW4KICAKLSB0dG1rZmRpcjogdHRta2ZkaXIubwotLQkkKENDKSAtbyAkQCAkPCAk
KExERkFMR1MpCi0rCSQoQ0MpIC1vICRAIHR0bWtmZGlyLm8gJChMREZMQUdTKSAtbHR0ZgorQEAg
LTE5LDcgKzE2LDcgQEAgdHRta2ZkaXI6IHR0bWtmZGlyLm8gZGlyZWN0b3J5Lm8gY29tbWFuZAor
IAlsaWJ0b29sIC0tbW9kZT1saW5rICQoQ1hYKSAtbyAkQCAkXiAkKExERkxBR1MpCiAgCi0gdHRt
a2ZkaXIubzogdHRta2ZkaXIuYyBwYW5vc2UuaCB0dG9zMnZhbC5oCisgcGFyc2VyLmNwcDogZW5j
b2RpbmcubAorLQkgICAgZmxleCAtaSAtOCAtbyRAICQ8CisrCSAgICBsZXggLWkgLTggLW8kQCAk
PAogIAorIGNsZWFuOgorIAktcm0gLWYgKi5vICp+IHR0bWtmZGlyIGNvcmUgcGFyc2VyLmNwcApJ
bmRleDogcGF0Y2hlcy9wYXRjaC1hYgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9wa2dz
cmMvZm9udHMvdHRta2ZkaXIvcGF0Y2hlcy9wYXRjaC1hYix2CnJldHJpZXZpbmcgcmV2aXNpb24g
MS4xLjEuMQpkaWZmIC11IC11IC1iIC1yMS4xLjEuMSBwYXRjaC1hYgotLS0gcGF0Y2hlcy9wYXRj
aC1hYgkyIEp1bCAyMDAyIDEzOjA2OjI3IC0wMDAwCTEuMS4xLjEKKysrIHBhdGNoZXMvcGF0Y2gt
YWIJMjkgTWFyIDIwMDQgMTE6MTA6NDkgLTAwMDAKQEAgLTEsMTMgKzEsMTMgQEAKLSROZXRCU0Q6
IHBhdGNoLWFiLHYgMS4xLjEuMSAyMDAyLzA3LzAyIDEzOjA2OjI3IHdpeiBFeHAgJAorJE5ldEJT
RCQKIAotLS0tIHR0bWtmZGlyLmMub3JpZwlTYXQgSnVuICA4IDIxOjM3OjU4IDIwMDIKLSsrKyB0
dG1rZmRpci5jCVNhdCBKdW4gIDggMjE6Mzg6MTggMjAwMgotQEAgLTYxLDcgKzYxLDcgQEAKLSAj
aW5jbHVkZSA8Y3R5cGUuaD4KLSAjaW5jbHVkZSA8ZXJybm8uaD4KLSAKLS0jaW5jbHVkZSA8ZnJl
ZXR5cGUuaD4KLSsjaW5jbHVkZSA8ZnJlZXR5cGUvZnJlZXR5cGUuaD4KLSAKLSAjaW5jbHVkZSAi
cGFub3NlLmgiCi0gI2luY2x1ZGUgInR0b3MydmFsLmgiCistLS0gdHRmLmNwcC5vcmlnCTIwMDQt
MDMtMjkgMTI6NDY6NDguMDAwMDAwMDAwICswMjAwCisrKysgdHRmLmNwcAorQEAgLTIyNiw3ICsy
MjYsNyBAQCBGYWNlOjpGb250RmFtaWx5TmFtZSAodm9pZCkgY29uc3QKKyAJZm9yIChpID0gMDsg
aSA8IG47IGkrKykgeworIAkgICAgaWYgKChmdGVycm9yID0gRlRfR2V0X1NmbnRfTmFtZSAoZmFj
ZSwgaSwgJk5hbWVQdHIpKSAhPSBGVF9FcnJfT2spIHsKKyAgICAgICAgICAgICAgICAgICAgIHN0
ZDo6Y291dCA8PCAiV2FybmluZzogQ2FuJ3QgU0ZOVCBuYW1lIDogIiA8PCBGaWxlTmFtZSA8PCAi
KCIgPDwgZnRlcnJvciA8PCAiKSIgPDwgc3RkOjplbmRsOworLQkgICAgICAgICAgICByZXR1cm47
CisrCSAgICAgICAgICAgIHJldHVybiAidW5rbm93biI7CisgICAgICAgICAgICAgfTsKKyAgICAg
ICAgICAgICBwbGF0Zm9ybSA9IE5hbWVQdHIucGxhdGZvcm1faWQ7CisgICAgICAgICAgICAgZW5j
b2RpbmcgPSBOYW1lUHRyLmVuY29kaW5nX2lkOwpJbmRleDogcGF0Y2hlcy9wYXRjaC1hYwo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09ClJDUyBmaWxlOiBwYXRjaGVzL3BhdGNoLWFjCmRpZmYgLU4gcGF0Y2hlcy9wYXRjaC1h
YwotLS0gL2Rldi9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIHBhdGNoZXMvcGF0
Y2gtYWMJMjkgTWFyIDIwMDQgMTE6MTA6NDkgLTAwMDAKQEAgLTAsMCArMSwxMyBAQAorJE5ldEJT
RCQKKworLS0tIHR0Zi5oLm9yaWcJMjAwMi0xMS0wNyAwNjoyODo0NC4wMDAwMDAwMDAgKzAxMDAK
KysrKyB0dGYuaAorQEAgLTEzLDYgKzEzLDggQEAKKyAjaW5jbHVkZSAidXRpbC5oIgorICNpbmNs
dWRlICJlbmNvZGluZy5oIgorIAorK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisrCisgbmFtZXNwYWNl
IHR0ZiB7CisgCisgICAgIGNsYXNzIEZhY2Ugewo=

--==========6D7B0B337113152C781D==========--

--==========42F64574D0AF675DB227==========
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; size=186

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (NetBSD)

iD8DBQFAaAZi7YQCetAaG3MRAn5dAJ4yiky1Sp5HxhGFhYgQTAyiKq1digCeKobF
wZPpV27cZa2V5nzy6zbPESI=
=Bmwq
-----END PGP SIGNATURE-----

--==========42F64574D0AF675DB227==========--