pkg/create: use separate steps for mk install and mk clean, to avoid mkfile problems

30 files changed, 792 insertions, 199 deletions

diff --git a/adm/timezone/local b/adm/timezone/local
new file mode 100644
index 000000000..bf8ae4c11
--- /dev/null
+++ b/adm/timezone/local
@@ -0,0 +1,24 @@
+CST -21600 CDT -18000
+   9943200   25664400   41392800   57718800   73447200   89168400
+ 104896800  120618000  126669600  152067600  162352800  183517200
+ 199245600  215571600  230695200  247021200  262749600  278470800
+ 294199200  309920400  325648800  341370000  357098400  372819600
+ 388548000  404874000  419997600  436323600  452052000  467773200
+ 483501600  499222800  514951200  530672400  544586400  562122000
+ 576036000  594176400  607485600  625626000  638935200  657075600
+ 670989600  688525200  702439200  719974800  733888800  752029200
+ 765338400  783478800  796788000  814928400  828842400  846378000
+ 860292000  877827600  891741600  909277200  923191200  941331600
+ 954640800  972781200  986090400 1004230800 1018144800 1035680400
+1049594400 1067130000 1081044000 1099184400 1112493600 1130634000
+1143943200 1162083600 1173578400 1194141600 1205028000 1225591200
+1236477600 1257040800 1268532000 1289095200 1299981600 1320544800
+1331431200 1351994400 1362880800 1383444000 1394330400 1414893600
+1425780000 1446343200 1457834400 1478397600 1489284000 1509847200
+1520733600 1541296800 1552183200 1572746400 1583632800 1604196000
+1615687200 1636250400 1647136800 1667700000 1678586400 1699149600
+1710036000 1730599200 1741485600 1762048800 1772935200 1793498400
+1804989600 1825552800 1836439200 1857002400 1867888800 1888452000
+1899338400 1919901600 1930788000 1951351200 1962842400 1983405600
+1994292000 2014855200 2025741600 2046304800 2057191200 2077754400
+2088640800 2109204000 2120090400 2140653600
diff --git a/lib/font/bit/helvetica/helvetica.14.0000 b/lib/font/bit/helvetica/helvetica.14.0000
new file mode 100644
index 000000000..9098034cc
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.14.0000
diff --git a/lib/font/bit/helvetica/helvetica.14.0178 b/lib/font/bit/helvetica/helvetica.14.0178
new file mode 100644
index 000000000..a02ff463e
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.14.0178
diff --git a/lib/font/bit/helvetica/helvetica.14.2018 b/lib/font/bit/helvetica/helvetica.14.2018
new file mode 100644
index 000000000..072ce9e61
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.14.2018
diff --git a/lib/font/bit/helvetica/helvetica.14.font b/lib/font/bit/helvetica/helvetica.14.font
new file mode 100644
index 000000000..44c9de446
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.14.font
@@ -0,0 +1,4 @@
+17	13
+0x2018	0x2118	helvetica.14.2018
+0x0178	0x0278	helvetica.14.0178
+0x0000	0x0100	helvetica.14.0000
diff --git a/lib/font/bit/helvetica/helvetica.16.0000 b/lib/font/bit/helvetica/helvetica.16.0000
new file mode 100644
index 000000000..8b2ab9c69
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.16.0000
diff --git a/lib/font/bit/helvetica/helvetica.16.0178 b/lib/font/bit/helvetica/helvetica.16.0178
new file mode 100644
index 000000000..c4dd7e40a
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.16.0178
diff --git a/lib/font/bit/helvetica/helvetica.16.2018 b/lib/font/bit/helvetica/helvetica.16.2018
new file mode 100644
index 000000000..f26a489d4
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.16.2018
diff --git a/lib/font/bit/helvetica/helvetica.16.font b/lib/font/bit/helvetica/helvetica.16.font
new file mode 100644
index 000000000..0e2bf6668
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.16.font
@@ -0,0 +1,4 @@
+20	15
+0x2018	0x2118	helvetica.16.2018
+0x0178	0x0278	helvetica.16.0178
+0x0000	0x0100	helvetica.16.0000
diff --git a/lib/font/bit/helvetica/helvetica.18.0000 b/lib/font/bit/helvetica/helvetica.18.0000
new file mode 100644
index 000000000..08a7a3ad5
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.18.0000
diff --git a/lib/font/bit/helvetica/helvetica.18.0178 b/lib/font/bit/helvetica/helvetica.18.0178
new file mode 100644
index 000000000..1f039669b
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.18.0178
diff --git a/lib/font/bit/helvetica/helvetica.18.2018 b/lib/font/bit/helvetica/helvetica.18.2018
new file mode 100644
index 000000000..99389b253
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.18.2018
diff --git a/lib/font/bit/helvetica/helvetica.18.font b/lib/font/bit/helvetica/helvetica.18.font
new file mode 100644
index 000000000..8f2da7e29
--- /dev/null
+++ b/lib/font/bit/helvetica/helvetica.18.font
@@ -0,0 +1,4 @@
+22	17
+0x2018	0x2118	helvetica.18.2018
+0x0178	0x0278	helvetica.18.0178
+0x0000	0x0100	helvetica.18.0000
diff --git a/lib/font/bit/helvetica/unicode.14.font b/lib/font/bit/helvetica/unicode.14.font
new file mode 100644
index 000000000..2fe19ecfc
--- /dev/null
+++ b/lib/font/bit/helvetica/unicode.14.font
@@ -0,0 +1,101 @@
+17	13
+0xfff9	0xffff	../dejavusans/dejavusans.12.fff9
+0xff00	0xfff8	../fixed/10x20.FF00
+0xfe00	0xfeff	../dejavusans/dejavusans.12.fe00
+0xfb00	0xfc00	../dejavusans/dejavusans.12.fb00
+0xf6c5	0xf7c5	../dejavusans/dejavusans.12.f6c5
+0xf001	0xf101	../dejavusans/dejavusans.12.f001
+0xef00	0xf000	../dejavusans/dejavusans.12.ef00
+0xa746	0xa846	../dejavusans/dejavusans.12.a746
+0xa644	0xa744	../dejavusans/dejavusans.12.a644
+0x9e00	0x9fff	../jis/jis9e00.24
+0x9c00	0x9dff	../jis/jis9c00.24
+0x9a00	0x9bff	../jis/jis9a00.24
+0x9800	0x99ff	../jis/jis9800.24
+0x9600	0x97ff	../jis/jis9600.24
+0x9400	0x95ff	../jis/jis9400.24
+0x9200	0x93ff	../jis/jis9200.24
+0x9000	0x91ff	../jis/jis9000.24
+0x8e00	0x8fff	../jis/jis8e00.24
+0x8c00	0x8dff	../jis/jis8c00.24
+0x8a00	0x8bff	../jis/jis8a00.24
+0x8800	0x89ff	../jis/jis8800.24
+0x8600	0x87ff	../jis/jis8600.24
+0x8400	0x85ff	../jis/jis8400.24
+0x8200	0x83ff	../jis/jis8200.24
+0x8000	0x81ff	../jis/jis8000.24
+0x7e00	0x7fff	../jis/jis7e00.24
+0x7c00	0x7dff	../jis/jis7c00.24
+0x7a00	0x7bff	../jis/jis7a00.24
+0x7800	0x79ff	../jis/jis7800.24
+0x7600	0x77ff	../jis/jis7600.24
+0x7400	0x75ff	../jis/jis7400.24
+0x7200	0x73ff	../jis/jis7200.24
+0x7000	0x71ff	../jis/jis7000.24
+0x6e00	0x6fff	../jis/jis6e00.24
+0x6c00	0x6dff	../jis/jis6c00.24
+0x6a00	0x6bff	../jis/jis6a00.24
+0x6800	0x69ff	../jis/jis6800.24
+0x6600	0x67ff	../jis/jis6600.24
+0x6400	0x65ff	../jis/jis6400.24
+0x6200	0x63ff	../jis/jis6200.24
+0x6000	0x61ff	../jis/jis6000.24
+0x5e00	0x5fff	../jis/jis5e00.24
+0x5c00	0x5dff	../jis/jis5c00.24
+0x5a00	0x5bff	../jis/jis5a00.24
+0x5800	0x59ff	../jis/jis5800.24
+0x5600	0x57ff	../jis/jis5600.24
+0x5400	0x55ff	../jis/jis5400.24
+0x5200	0x53ff	../jis/jis5200.24
+0x5000	0x51ff	../jis/jis5000.24
+0x4ec1	0x4fff	../jis/jis4e00.24
+0x4dc0	0x4ec0	../dejavusans/dejavusans.12.4dc0
+0x3041	0x309e	../jis/hiragana.24
+0x30a1	0x30fe	../jis/katakana.24
+0x3000	0x303f	../jis/jis3000.24
+0x2d61	0x2e61	../dejavusans/dejavusans.12.2d61
+0x2c60	0x2d60	../dejavusans/dejavusans.12.2c60
+0x2a7d	0x2b7d	../dejavusans/dejavusans.12.2a7d
+0x2940	0x2a40	../dejavusans/dejavusans.12.2940
+0x2814	0x2914	../dejavusans/dejavusans.12.2814
+0x2713	0x2813	../dejavusans/dejavusans.12.2713
+0x2612	0x2712	../dejavusans/dejavusans.12.2612
+0x2523	0x2611	../dejavusans/dejavusans.12.2523
+0x2422	0x2522	../dejavusans/dejavusans.12.2422
+0x2300	0x23ff	../fixed/10x20.2300
+0x2200	0x22ff	../fixed/10x20.2200
+0x22f8	0x23f8	../dejavusans/dejavusans.12.22f8
+0x21fc	0x22f7	../dejavusans/dejavusans.12.21fc
+0x21eb	0x21fb	../dejavusans/dejavusans.12.2104
+0x2190	0x21ea	../misc/arrows
+0x2018	0x2118	helvetica.14.2018
+0x2104	0x2189	../dejavusans/dejavusans.12.2104
+0x2000	0x20ff	../fixed/6x12.2000
+0x2100	0x2103	../dejavusans/dejavusans.12.2003
+0x1f02	0x2002	../dejavusans/dejavusans.12.1f02
+0x1e01	0x1f01	../dejavusans/dejavusans.12.1e01
+0x1d00	0x1e00	../dejavusans/dejavusans.12.1d00
+0x1600	0x16ff	../fixed/10x20.1600
+0x1502	0x15ff	../dejavusans/dejavusans.12.1502
+0x1401	0x1501	../dejavusans/dejavusans.12.1401
+0x1300	0x13ff	../fixed/10x20.1300
+0x1200	0x12ff	../fixed/10x20.1200
+0x10a0	0x11a0	../dejavusans/dejavusans.12.10a0
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x0f00	0x0f3f	../dejavusans/dejavusans.12.0e3f
+0x07c0	0x08c0	../dejavusans/dejavusans.12.07c0
+0x0606	0x0706	../dejavusans/dejavusans.12.0606
+0x0505	0x0605	../dejavusans/dejavusans.12.0505
+0x0404	0x0504	../dejavusans/dejavusans.12.0404
+0x03c0	0x03c0	../dejavusans/dejavusans.12.03c0
+0x03a9	0x03a9	../dejavusans/dejavusans.12.03a9
+0x0300	0x0302	../fixed/10x20.0300
+0x0303	0x0403	../dejavusans/dejavusans.12.0303
+0x0178	0x0278	helvetica.14.0178
+0x0202	0x0302	../dejavusans/dejavusans.12.0202
+0x0101	0x0201	../dejavusans/dejavusans.12.0101
+0x00a0	0x0100	../dejavusans/dejavusans.12.00a0
+0x007f	0x007f	../palatino/R.6.1
+0x0080	0x009f	../dejavusans/dejavusans.12.0020
+0x0000	0x001f	../palatino/R.6.1
+0x0000	0x0100	helvetica.14.0000
diff --git a/lib/font/bit/helvetica/unicode.16.font b/lib/font/bit/helvetica/unicode.16.font
new file mode 100644
index 000000000..0452083b4
--- /dev/null
+++ b/lib/font/bit/helvetica/unicode.16.font
@@ -0,0 +1,101 @@
+20	15
+0xfff9	0xffff	../dejavusans/dejavusans.14.fff9
+0xff00	0xfff8	../fixed/10x20.FF00
+0xfe00	0xfeff	../dejavusans/dejavusans.14.fe00
+0xfb00	0xfc00	../dejavusans/dejavusans.14.fb00
+0xf6c5	0xf7c5	../dejavusans/dejavusans.14.f6c5
+0xf001	0xf101	../dejavusans/dejavusans.14.f001
+0xef00	0xf000	../dejavusans/dejavusans.14.ef00
+0xa746	0xa846	../dejavusans/dejavusans.14.a746
+0xa644	0xa744	../dejavusans/dejavusans.14.a644
+0x9e00	0x9fff	../jis/jis9e00.24
+0x9c00	0x9dff	../jis/jis9c00.24
+0x9a00	0x9bff	../jis/jis9a00.24
+0x9800	0x99ff	../jis/jis9800.24
+0x9600	0x97ff	../jis/jis9600.24
+0x9400	0x95ff	../jis/jis9400.24
+0x9200	0x93ff	../jis/jis9200.24
+0x9000	0x91ff	../jis/jis9000.24
+0x8e00	0x8fff	../jis/jis8e00.24
+0x8c00	0x8dff	../jis/jis8c00.24
+0x8a00	0x8bff	../jis/jis8a00.24
+0x8800	0x89ff	../jis/jis8800.24
+0x8600	0x87ff	../jis/jis8600.24
+0x8400	0x85ff	../jis/jis8400.24
+0x8200	0x83ff	../jis/jis8200.24
+0x8000	0x81ff	../jis/jis8000.24
+0x7e00	0x7fff	../jis/jis7e00.24
+0x7c00	0x7dff	../jis/jis7c00.24
+0x7a00	0x7bff	../jis/jis7a00.24
+0x7800	0x79ff	../jis/jis7800.24
+0x7600	0x77ff	../jis/jis7600.24
+0x7400	0x75ff	../jis/jis7400.24
+0x7200	0x73ff	../jis/jis7200.24
+0x7000	0x71ff	../jis/jis7000.24
+0x6e00	0x6fff	../jis/jis6e00.24
+0x6c00	0x6dff	../jis/jis6c00.24
+0x6a00	0x6bff	../jis/jis6a00.24
+0x6800	0x69ff	../jis/jis6800.24
+0x6600	0x67ff	../jis/jis6600.24
+0x6400	0x65ff	../jis/jis6400.24
+0x6200	0x63ff	../jis/jis6200.24
+0x6000	0x61ff	../jis/jis6000.24
+0x5e00	0x5fff	../jis/jis5e00.24
+0x5c00	0x5dff	../jis/jis5c00.24
+0x5a00	0x5bff	../jis/jis5a00.24
+0x5800	0x59ff	../jis/jis5800.24
+0x5600	0x57ff	../jis/jis5600.24
+0x5400	0x55ff	../jis/jis5400.24
+0x5200	0x53ff	../jis/jis5200.24
+0x5000	0x51ff	../jis/jis5000.24
+0x4ec1	0x4fff	../jis/jis4e00.24
+0x4dc0	0x4ec0	../dejavusans/dejavusans.14.4dc0
+0x3041	0x309e	../jis/hiragana.24
+0x30a1	0x30fe	../jis/katakana.24
+0x3000	0x303f	../jis/jis3000.24
+0x2d61	0x2e61	../dejavusans/dejavusans.14.2d61
+0x2c60	0x2d60	../dejavusans/dejavusans.14.2c60
+0x2a7d	0x2b7d	../dejavusans/dejavusans.14.2a7d
+0x2940	0x2a40	../dejavusans/dejavusans.14.2940
+0x2814	0x2914	../dejavusans/dejavusans.14.2814
+0x2713	0x2813	../dejavusans/dejavusans.14.2713
+0x2612	0x2712	../dejavusans/dejavusans.14.2612
+0x2523	0x2611	../dejavusans/dejavusans.14.2523
+0x2422	0x2522	../dejavusans/dejavusans.14.2422
+0x2300	0x23ff	../fixed/10x20.2300
+0x2200	0x22ff	../fixed/10x20.2200
+0x22f8	0x23f8	../dejavusans/dejavusans.14.22f8
+0x21fc	0x22f7	../dejavusans/dejavusans.14.21fc
+0x21eb	0x21fb	../dejavusans/dejavusans.14.2104
+0x2190	0x21ea	../misc/arrows
+0x2018	0x2118	helvetica.16.2018
+0x2104	0x2189	../dejavusans/dejavusans.14.2104
+0x2000	0x20ff	../fixed/10x20.2000
+0x2100	0x2103	../dejavusans/dejavusans.14.2003
+0x1f02	0x2002	../dejavusans/dejavusans.14.1f02
+0x1e01	0x1f01	../dejavusans/dejavusans.14.1e01
+0x1d00	0x1e00	../dejavusans/dejavusans.14.1d00
+0x1600	0x16ff	../fixed/10x20.1600
+0x1502	0x15ff	../dejavusans/dejavusans.14.1502
+0x1401	0x1501	../dejavusans/dejavusans.14.1401
+0x1300	0x13ff	../fixed/10x20.1300
+0x1200	0x12ff	../fixed/10x20.1200
+0x10a0	0x11a0	../dejavusans/dejavusans.14.10a0
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x0f00	0x0f3f	../dejavusans/dejavusans.14.0e3f
+0x07c0	0x08c0	../dejavusans/dejavusans.14.07c0
+0x0606	0x0706	../dejavusans/dejavusans.14.0606
+0x0505	0x0605	../dejavusans/dejavusans.14.0505
+0x0404	0x0504	../dejavusans/dejavusans.14.0404
+0x03c0	0x03c0	../dejavusans/dejavusans.14.03c0
+0x03a9	0x03a9	../dejavusans/dejavusans.14.03a9
+0x0300	0x0302	../fixed/10x20.0300
+0x0303	0x0403	../dejavusans/dejavusans.14.0303
+0x0178	0x0278	helvetica.16.0178
+0x0202	0x0302	../dejavusans/dejavusans.14.0202
+0x0101	0x0201	../dejavusans/dejavusans.14.0101
+0x00a0	0x0100	../dejavusans/dejavusans.14.00a0
+0x007f	0x007f	../palatino/R.6.1
+0x0080	0x009f	../dejavusans/dejavusans.14.0020
+0x0000	0x001f	../palatino/R.6.1
+0x0000	0x0100	helvetica.16.0000
diff --git a/lib/font/bit/helvetica/unicode.18.font b/lib/font/bit/helvetica/unicode.18.font
new file mode 100644
index 000000000..95f3b0031
--- /dev/null
+++ b/lib/font/bit/helvetica/unicode.18.font
@@ -0,0 +1,101 @@
+22	17
+0xfff9	0xffff	../dejavusans/dejavusans.16.fff9
+0xff00	0xfff8	../fixed/10x20.FF00
+0xfe00	0xfeff	../dejavusans/dejavusans.16.fe00
+0xfb00	0xfc00	../dejavusans/dejavusans.16.fb00
+0xf6c5	0xf7c5	../dejavusans/dejavusans.16.f6c5
+0xf001	0xf101	../dejavusans/dejavusans.16.f001
+0xef00	0xf000	../dejavusans/dejavusans.16.ef00
+0xa746	0xa846	../dejavusans/dejavusans.16.a746
+0xa644	0xa744	../dejavusans/dejavusans.16.a644
+0x9e00	0x9fff	../jis/jis9e00.24
+0x9c00	0x9dff	../jis/jis9c00.24
+0x9a00	0x9bff	../jis/jis9a00.24
+0x9800	0x99ff	../jis/jis9800.24
+0x9600	0x97ff	../jis/jis9600.24
+0x9400	0x95ff	../jis/jis9400.24
+0x9200	0x93ff	../jis/jis9200.24
+0x9000	0x91ff	../jis/jis9000.24
+0x8e00	0x8fff	../jis/jis8e00.24
+0x8c00	0x8dff	../jis/jis8c00.24
+0x8a00	0x8bff	../jis/jis8a00.24
+0x8800	0x89ff	../jis/jis8800.24
+0x8600	0x87ff	../jis/jis8600.24
+0x8400	0x85ff	../jis/jis8400.24
+0x8200	0x83ff	../jis/jis8200.24
+0x8000	0x81ff	../jis/jis8000.24
+0x7e00	0x7fff	../jis/jis7e00.24
+0x7c00	0x7dff	../jis/jis7c00.24
+0x7a00	0x7bff	../jis/jis7a00.24
+0x7800	0x79ff	../jis/jis7800.24
+0x7600	0x77ff	../jis/jis7600.24
+0x7400	0x75ff	../jis/jis7400.24
+0x7200	0x73ff	../jis/jis7200.24
+0x7000	0x71ff	../jis/jis7000.24
+0x6e00	0x6fff	../jis/jis6e00.24
+0x6c00	0x6dff	../jis/jis6c00.24
+0x6a00	0x6bff	../jis/jis6a00.24
+0x6800	0x69ff	../jis/jis6800.24
+0x6600	0x67ff	../jis/jis6600.24
+0x6400	0x65ff	../jis/jis6400.24
+0x6200	0x63ff	../jis/jis6200.24
+0x6000	0x61ff	../jis/jis6000.24
+0x5e00	0x5fff	../jis/jis5e00.24
+0x5c00	0x5dff	../jis/jis5c00.24
+0x5a00	0x5bff	../jis/jis5a00.24
+0x5800	0x59ff	../jis/jis5800.24
+0x5600	0x57ff	../jis/jis5600.24
+0x5400	0x55ff	../jis/jis5400.24
+0x5200	0x53ff	../jis/jis5200.24
+0x5000	0x51ff	../jis/jis5000.24
+0x4ec1	0x4fff	../jis/jis4e00.24
+0x4dc0	0x4ec0	../dejavusans/dejavusans.16.4dc0
+0x3041	0x309e	../jis/hiragana.24
+0x30a1	0x30fe	../jis/katakana.24
+0x3000	0x303f	../jis/jis3000.24
+0x2d61	0x2e61	../dejavusans/dejavusans.16.2d61
+0x2c60	0x2d60	../dejavusans/dejavusans.16.2c60
+0x2a7d	0x2b7d	../dejavusans/dejavusans.16.2a7d
+0x2940	0x2a40	../dejavusans/dejavusans.16.2940
+0x2814	0x2914	../dejavusans/dejavusans.16.2814
+0x2713	0x2813	../dejavusans/dejavusans.16.2713
+0x2612	0x2712	../dejavusans/dejavusans.16.2612
+0x2523	0x2611	../dejavusans/dejavusans.16.2523
+0x2422	0x2522	../dejavusans/dejavusans.16.2422
+0x2300	0x23ff	../fixed/10x20.2300
+0x2200	0x22ff	../fixed/10x20.2200
+0x22f8	0x23f8	../dejavusans/dejavusans.16.22f8
+0x21fc	0x22f7	../dejavusans/dejavusans.16.21fc
+0x21eb	0x21fb	../dejavusans/dejavusans.16.2104
+0x2190	0x21ea	../misc/arrows
+0x2018	0x2118	helvetica.18.2018
+0x2104	0x2189	../dejavusans/dejavusans.16.2104
+0x2000	0x20ff	../fixed/10x20.2000
+0x2100	0x2103	../dejavusans/dejavusans.16.2003
+0x1f02	0x2002	../dejavusans/dejavusans.16.1f02
+0x1e01	0x1f01	../dejavusans/dejavusans.16.1e01
+0x1d00	0x1e00	../dejavusans/dejavusans.16.1d00
+0x1600	0x16ff	../fixed/10x20.1600
+0x1502	0x15ff	../dejavusans/dejavusans.16.1502
+0x1401	0x1501	../dejavusans/dejavusans.16.1401
+0x1300	0x13ff	../fixed/10x20.1300
+0x1200	0x12ff	../fixed/10x20.1200
+0x10a0	0x11a0	../dejavusans/dejavusans.16.10a0
+0x0e00	0x0eff	../fixed/10x20.0E00
+0x0f00	0x0f3f	../dejavusans/dejavusans.16.0e3f
+0x07c0	0x08c0	../dejavusans/dejavusans.16.07c0
+0x0606	0x0706	../dejavusans/dejavusans.16.0606
+0x0505	0x0605	../dejavusans/dejavusans.16.0505
+0x0404	0x0504	../dejavusans/dejavusans.16.0404
+0x03c0	0x03c0	../dejavusans/dejavusans.16.03c0
+0x03a9	0x03a9	../dejavusans/dejavusans.16.03a9
+0x0300	0x0302	../fixed/10x20.0300
+0x0303	0x0403	../dejavusans/dejavusans.16.0303
+0x0178	0x0278	helvetica.18.0178
+0x0202	0x0302	../dejavusans/dejavusans.16.0202
+0x0101	0x0201	../dejavusans/dejavusans.16.0101
+0x00a0	0x0100	../dejavusans/dejavusans.16.00a0
+0x007f	0x007f	../palatino/R.6.1
+0x0080	0x009f	../dejavusans/dejavusans.16.0020
+0x0000	0x001f	../palatino/R.6.1
+0x0000	0x0100	helvetica.18.0000
diff --git a/lib/namespace.httpd b/lib/namespace.httpd
index 74d4faaeb..b6daf3e19 100644
--- a/lib/namespace.httpd
+++ b/lib/namespace.httpd
@@ -1,39 +1,39 @@
-# we start with the namespace of the console...
-
-# man2html expects man pages under /sys/man
-mount #s/boot /n/emelieother other
-bind /n/emelieother/plan9/sys/man /usr/web/sys/man
-#bind /n/emelieother/plan9/sys/doc /usr/web/sys/doc
-#bind /sys/man /usr/web/sys/man
-bind /sys/doc /usr/web/sys/doc
-
-# just so people will find something under plan9
-bind /usr/web/plan9dist /usr/web/plan9
-
-# users
-bind /usr/mike/www /usr/web/incoming/mike
-
-# netlib
-bind /netlib/pub /usr/web/netlib
-mount -b #s/netlib.depend.pub /usr/web/netlib.depend
-# don't need to bind to /usr/web/math etc. because of /sys/lib/http-rewrite
-
-# who what why when where
-mount /srv/alice /n/alice
-bind -b /n/alice/cm /usr/web/cm
-bind /usr/web/cm/who /usr/web/who
-bind -b /usr/web/cm/physics/who /usr/web/who
-bind -b /usr/web/cm/blrsv/who /usr/web/who
-bind -b /usr/web/cm/ss/who /usr/web/who
-bind -b /usr/web/cm/ms/who /usr/web/who
-bind -b /usr/web/cm/china/who /usr/web/who
-bind -b /usr/web/cm/cs/who /usr/web/who
-bind /usr/web/cm/ms/what/wavelet /usr/web/wavelet
-
-# formerly ftp.research.bell-labs.com
-bind -b /n/alice/usr/ftp /usr/web/dist
-
-# wiki (questions to rsc)
-mount -b #s/wiki.plan9 /usr/web/wiki/plan9
-
-# httpd will bind /usr/web onto /
+# 	At this stage, namespace is alredy configured using /lib/namespace
+# 	We can add something to it.
+
+#
+#	Here /usr/web is our webbase
+#	and `alice' stands for any user
+#
+
+# 	In case that `/~alice' is requested,
+#		bind /usr/alice/web /usr/web/mnt
+# 	is internally executed at the beginning.
+
+#
+#	configure our basic namespace
+#
+
+bind -a /usr/web/bin/$cputype /bin
+bind -a /usr/web/bin/rc /bin
+
+bind /sys/lib /usr/web/sys/lib
+bind /lib /usr/web/lib
+bind /bin /usr/web/bin
+bind /rc/lib /usr/web/rc/lib
+bind -c #e /usr/web/env
+bind #c /usr/web/dev
+
+bind /proc /usr/web/proc
+bind -a #d  /usr/web/fd
+
+#	In case of  `~' , 
+#		bind /usr/web/mnt /usr/web/doc
+#	is internally executed
+
+#	Let /usr/web be our webroot then
+#	httpd internally execute the followings:
+#		bind /usr/web /
+#		cd /
+#	to cut off everything not mounted below /usr/web
+#
diff --git a/rc/bin/inst/tzsetup b/rc/bin/inst/tzsetup
index 92c06a45c..92c06a45c 100644..100755
--- a/rc/bin/inst/tzsetup
+++ b/rc/bin/inst/tzsetup
diff --git a/rc/bin/nietzsche b/rc/bin/nietzsche
index caced3c70..caced3c70 100644..100755
--- a/rc/bin/nietzsche
+++ b/rc/bin/nietzsche
diff --git a/rc/bin/nusbrc b/rc/bin/nusbrc
index 71fe5734e..71fe5734e 100644..100755
--- a/rc/bin/nusbrc
+++ b/rc/bin/nusbrc
diff --git a/rc/bin/tcpu b/rc/bin/tcpu
new file mode 100755
index 000000000..d87a5ae65
--- /dev/null
+++ b/rc/bin/tcpu
@@ -0,0 +1,6 @@
+#!/bin/rc
+rfork ne
+auth/keyfs -p
+aux/listen1 -t tcp!*!ticket /bin/auth/authsrv &
+service=cpu aux/listen1 tcp!*!cpu /bin/cpu -O &
+service=cpu aux/listen1 tcp!*!ncpu /bin/cpu -R &
diff --git a/sys/doc/cleanps b/sys/doc/cleanps
index 67f87b655..67f87b655 100644..100755
--- a/sys/doc/cleanps
+++ b/sys/doc/cleanps
diff --git a/sys/doc/mkdirlist b/sys/doc/mkdirlist
index dfd7a21c3..dfd7a21c3 100644..100755
--- a/sys/doc/mkdirlist
+++ b/sys/doc/mkdirlist
diff --git a/sys/doc/mkfilelist b/sys/doc/mkfilelist
index 3c8a11128..3c8a11128 100644..100755
--- a/sys/doc/mkfilelist
+++ b/sys/doc/mkfilelist
diff --git a/sys/doc/prfile b/sys/doc/prfile
index 04fd23b2a..04fd23b2a 100644..100755
--- a/sys/doc/prfile
+++ b/sys/doc/prfile
diff --git a/sys/games/lib/fortunes b/sys/games/lib/fortunes
index 64633b34e..354d6d81d 100644
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -4655,3 +4655,4 @@ please, grow up! -- Skip Travakkolian
 <aiju> we need objectivism oriented programming!
 <cinap_lenrek> ports are the economic engine for the elite <cinap_lenrek> occupy port 80!
 CTC is a Java application that is installed in two locations.
+To this end, the standards bodies have ratified a new standard that establishes interoperability issues between frame relay and ATM networks.
diff --git a/sys/lib/httpd.rewrite b/sys/lib/httpd.rewrite
index e6aa6080b..dccf3eefb 100644
--- a/sys/lib/httpd.rewrite
+++ b/sys/lib/httpd.rewrite
@@ -1,11 +1,20 @@
-# httpd(8) describes the syntax.  to kick-start,
-# for(i in `{seq 50}) hget http://www.your-domain.com/ >/dev/null
+#
 
-# An example of a local redirect
-#/netlib/c++/idioms/index.html.Z /netlib/c++/idioms/index.html
+# 	syntax: prefix replacement
+# 	parsed by splitting into fields separated by spaces and tabs.
+# 	Anything following a # is ignored.
+#
+#	Pegasus extension for virtual host
+#	`*' prefixed items will be bound to web root
+#
+
+
+# Home page for IP based virtual host. Don't foreget the IP of plan9
+#http://car		*/usr/carol/www
+#http://202.250.160.122	*/usr/carol/www
 
 # Redirection to another site
-#/netlib/lapack/lawns http://netlib.org/lapack/lawns
+#/~emili	http://plan9.bell-labs.com
 
-# Home page for virtual host
-#http://www.ampl.com/		/cm/cs/what/ampl/index.html
+# Httpd root of real host is "/usr/bob/www"
+/	*/usr/re9714
diff --git a/sys/lib/postscript/font/fontmap b/sys/lib/postscript/font/fontmap
index 959450c7d..6efa5bed2 100644
--- a/sys/lib/postscript/font/fontmap
+++ b/sys/lib/postscript/font/fontmap
@@ -1,152 +1,389 @@
-LucidaSans			LucidaSans
-LucidaSans-Demi 		LucidaSans-Demi
-LucidaSans-DemiItalic 		LucidaSans-DemiItalic
-LucidaSans-Italic 		LucidaSans-Italic
-LucidaSans-Typewriter83	LucidaSans-Typewriter83
-LucidaSansUnicode00		lsunr00.pfa
-LucidaSansUnicode01		lsunr01.pfa
-LucidaSansUnicode02		lsunr02.pfa
-LucidaSansUnicode03		lsunr03.pfa
-LucidaSansUnicode04		lsunr04.pfa
-LucidaSansUnicode05		lsunr05.pfa
-LucidaSansUnicode20		lsunr20.pfa
-LucidaSansUnicode21		lsunr21.pfa
-LucidaSansUnicode22		lsunr22.pfa
-LucidaSansUnicode24		lsunr24.pfa
-LucidaSansUnicode25		lsunr25.pfa
-LucidaTypewriter 		LucidaTypewriter
+LuxiMono00 luxi/LuxiMono00
+LuxiMono01 luxi/LuxiMono01
+LuxiMono02 luxi/LuxiMono02
+LuxiMono03 luxi/LuxiMono03
+LuxiMono20 luxi/LuxiMono20
+LuxiMono21 luxi/LuxiMono21
+LuxiMono22 luxi/LuxiMono22
+LuxiMono-Bold00 luxi/LuxiMono-Bold00
+LuxiMono-Bold01 luxi/LuxiMono-Bold01
+LuxiMono-Bold02 luxi/LuxiMono-Bold02
+LuxiMono-Bold03 luxi/LuxiMono-Bold03
+LuxiMono-Bold20 luxi/LuxiMono-Bold20
+LuxiMono-Bold21 luxi/LuxiMono-Bold21
+LuxiMono-Bold22 luxi/LuxiMono-Bold22
+LuxiMono-BoldEA luxi/LuxiMono-BoldEA
+LuxiMono-BoldF0 luxi/LuxiMono-BoldF0
+LuxiMono-BoldF6 luxi/LuxiMono-BoldF6
+LuxiMono-BoldFB luxi/LuxiMono-BoldFB
+LuxiMono-BoldOblique00 luxi/LuxiMono-BoldOblique00
+LuxiMono-BoldOblique01 luxi/LuxiMono-BoldOblique01
+LuxiMono-BoldOblique02 luxi/LuxiMono-BoldOblique02
+LuxiMono-BoldOblique03 luxi/LuxiMono-BoldOblique03
+LuxiMono-BoldOblique20 luxi/LuxiMono-BoldOblique20
+LuxiMono-BoldOblique21 luxi/LuxiMono-BoldOblique21
+LuxiMono-BoldOblique22 luxi/LuxiMono-BoldOblique22
+LuxiMono-BoldObliqueEA luxi/LuxiMono-BoldObliqueEA
+LuxiMono-BoldObliqueF0 luxi/LuxiMono-BoldObliqueF0
+LuxiMono-BoldObliqueF6 luxi/LuxiMono-BoldObliqueF6
+LuxiMono-BoldObliqueFB luxi/LuxiMono-BoldObliqueFB
+LuxiMonoEA luxi/LuxiMonoEA
+LuxiMonoF0 luxi/LuxiMonoF0
+LuxiMonoF6 luxi/LuxiMonoF6
+LuxiMonoFB luxi/LuxiMonoFB
+LuxiMono-Oblique00 luxi/LuxiMono-Oblique00
+LuxiMono-Oblique01 luxi/LuxiMono-Oblique01
+LuxiMono-Oblique02 luxi/LuxiMono-Oblique02
+LuxiMono-Oblique03 luxi/LuxiMono-Oblique03
+LuxiMono-Oblique20 luxi/LuxiMono-Oblique20
+LuxiMono-Oblique21 luxi/LuxiMono-Oblique21
+LuxiMono-Oblique22 luxi/LuxiMono-Oblique22
+LuxiMono-ObliqueEA luxi/LuxiMono-ObliqueEA
+LuxiMono-ObliqueF0 luxi/LuxiMono-ObliqueF0
+LuxiMono-ObliqueF6 luxi/LuxiMono-ObliqueF6
+LuxiMono-ObliqueFB luxi/LuxiMono-ObliqueFB
+LuxiSans00 luxi/LuxiSans00
+LuxiSans01 luxi/LuxiSans01
+LuxiSans02 luxi/LuxiSans02
+LuxiSans03 luxi/LuxiSans03
+LuxiSans20 luxi/LuxiSans20
+LuxiSans21 luxi/LuxiSans21
+LuxiSans22 luxi/LuxiSans22
+LuxiSans-Bold00 luxi/LuxiSans-Bold00
+LuxiSans-Bold01 luxi/LuxiSans-Bold01
+LuxiSans-Bold02 luxi/LuxiSans-Bold02
+LuxiSans-Bold03 luxi/LuxiSans-Bold03
+LuxiSans-Bold20 luxi/LuxiSans-Bold20
+LuxiSans-Bold21 luxi/LuxiSans-Bold21
+LuxiSans-Bold22 luxi/LuxiSans-Bold22
+LuxiSans-BoldEA luxi/LuxiSans-BoldEA
+LuxiSans-BoldF0 luxi/LuxiSans-BoldF0
+LuxiSans-BoldF6 luxi/LuxiSans-BoldF6
+LuxiSans-BoldFB luxi/LuxiSans-BoldFB
+LuxiSans-BoldOblique00 luxi/LuxiSans-BoldOblique00
+LuxiSans-BoldOblique01 luxi/LuxiSans-BoldOblique01
+LuxiSans-BoldOblique02 luxi/LuxiSans-BoldOblique02
+LuxiSans-BoldOblique03 luxi/LuxiSans-BoldOblique03
+LuxiSans-BoldOblique20 luxi/LuxiSans-BoldOblique20
+LuxiSans-BoldOblique21 luxi/LuxiSans-BoldOblique21
+LuxiSans-BoldOblique22 luxi/LuxiSans-BoldOblique22
+LuxiSans-BoldObliqueEA luxi/LuxiSans-BoldObliqueEA
+LuxiSans-BoldObliqueF0 luxi/LuxiSans-BoldObliqueF0
+LuxiSans-BoldObliqueF6 luxi/LuxiSans-BoldObliqueF6
+LuxiSans-BoldObliqueFB luxi/LuxiSans-BoldObliqueFB
+LuxiSansEA luxi/LuxiSansEA
+LuxiSansF0 luxi/LuxiSansF0
+LuxiSansF6 luxi/LuxiSansF6
+LuxiSansFB luxi/LuxiSansFB
+LuxiSans-Oblique00 luxi/LuxiSans-Oblique00
+LuxiSans-Oblique01 luxi/LuxiSans-Oblique01
+LuxiSans-Oblique02 luxi/LuxiSans-Oblique02
+LuxiSans-Oblique03 luxi/LuxiSans-Oblique03
+LuxiSans-Oblique20 luxi/LuxiSans-Oblique20
+LuxiSans-Oblique21 luxi/LuxiSans-Oblique21
+LuxiSans-Oblique22 luxi/LuxiSans-Oblique22
+LuxiSans-ObliqueEA luxi/LuxiSans-ObliqueEA
+LuxiSans-ObliqueF0 luxi/LuxiSans-ObliqueF0
+LuxiSans-ObliqueF6 luxi/LuxiSans-ObliqueF6
+LuxiSans-ObliqueFB luxi/LuxiSans-ObliqueFB
+LuxiSerif00 luxi/LuxiSerif00
+LuxiSerif01 luxi/LuxiSerif01
+LuxiSerif02 luxi/LuxiSerif02
+LuxiSerif03 luxi/LuxiSerif03
+LuxiSerif20 luxi/LuxiSerif20
+LuxiSerif21 luxi/LuxiSerif21
+LuxiSerif22 luxi/LuxiSerif22
+LuxiSerif-Bold00 luxi/LuxiSerif-Bold00
+LuxiSerif-Bold01 luxi/LuxiSerif-Bold01
+LuxiSerif-Bold02 luxi/LuxiSerif-Bold02
+LuxiSerif-Bold03 luxi/LuxiSerif-Bold03
+LuxiSerif-Bold20 luxi/LuxiSerif-Bold20
+LuxiSerif-Bold21 luxi/LuxiSerif-Bold21
+LuxiSerif-Bold22 luxi/LuxiSerif-Bold22
+LuxiSerif-BoldEA luxi/LuxiSerif-BoldEA
+LuxiSerif-BoldF0 luxi/LuxiSerif-BoldF0
+LuxiSerif-BoldF6 luxi/LuxiSerif-BoldF6
+LuxiSerif-BoldFB luxi/LuxiSerif-BoldFB
+LuxiSerif-BoldOblique00 luxi/LuxiSerif-BoldOblique00
+LuxiSerif-BoldOblique01 luxi/LuxiSerif-BoldOblique01
+LuxiSerif-BoldOblique02 luxi/LuxiSerif-BoldOblique02
+LuxiSerif-BoldOblique03 luxi/LuxiSerif-BoldOblique03
+LuxiSerif-BoldOblique20 luxi/LuxiSerif-BoldOblique20
+LuxiSerif-BoldOblique21 luxi/LuxiSerif-BoldOblique21
+LuxiSerif-BoldOblique22 luxi/LuxiSerif-BoldOblique22
+LuxiSerif-BoldObliqueEA luxi/LuxiSerif-BoldObliqueEA
+LuxiSerif-BoldObliqueF0 luxi/LuxiSerif-BoldObliqueF0
+LuxiSerif-BoldObliqueF6 luxi/LuxiSerif-BoldObliqueF6
+LuxiSerif-BoldObliqueFB luxi/LuxiSerif-BoldObliqueFB
+LuxiSerifEA luxi/LuxiSerifEA
+LuxiSerifF0 luxi/LuxiSerifF0
+LuxiSerifF6 luxi/LuxiSerifF6
+LuxiSerifFB luxi/LuxiSerifFB
+LuxiSerif-Oblique00 luxi/LuxiSerif-Oblique00
+LuxiSerif-Oblique01 luxi/LuxiSerif-Oblique01
+LuxiSerif-Oblique02 luxi/LuxiSerif-Oblique02
+LuxiSerif-Oblique03 luxi/LuxiSerif-Oblique03
+LuxiSerif-Oblique20 luxi/LuxiSerif-Oblique20
+LuxiSerif-Oblique21 luxi/LuxiSerif-Oblique21
+LuxiSerif-Oblique22 luxi/LuxiSerif-Oblique22
+LuxiSerif-ObliqueEA luxi/LuxiSerif-ObliqueEA
+LuxiSerif-ObliqueF0 luxi/LuxiSerif-ObliqueF0
+LuxiSerif-ObliqueF6 luxi/LuxiSerif-ObliqueF6
+LuxiSerif-ObliqueFB luxi/LuxiSerif-ObliqueFB
 
-% alias for troff
-LucidaCW			LucidaTypewriter
-
-% Postscript versions of TeX fonts
-CMB10		cm/cmb10.pfa
-CMBSY10		cm/cmbsy10.pfa
-CMBX10		cm/cmbx10.pfa
-CMBX12		cm/cmbx12.pfa
-CMBX5		cm/cmbx5.pfa
-CMBX6		cm/cmbx6.pfa
-CMBX7		cm/cmbx7.pfa
-CMBX8		cm/cmbx8.pfa
-CMBX9		cm/cmbx9.pfa
-CMBXSL10		cm/cmbxsl10.pfa
-CMBXTI10		cm/cmbxti10.pfa
-CMCSC10		cm/cmcsc10.pfa
-CMDUNH10		cm/cmdunh10.pfa
-CMEX10		cm/cmex10.pfa
-CMFF10		cm/cmff10.pfa
-CMFI10		cm/cmfi10.pfa
-CMFIB8		cm/cmfib8.pfa
-CMINCH		cm/cminch.pfa
-CMITT10		cm/cmitt10.pfa
-CMMI10		cm/cmmi10.pfa
-CMMI12		cm/cmmi12.pfa
-CMMI5		cm/cmmi5.pfa
-CMMI6		cm/cmmi6.pfa
-CMMI7		cm/cmmi7.pfa
-CMMI8		cm/cmmi8.pfa
-CMMI9		cm/cmmi9.pfa
-CMMIB10		cm/cmmib10.pfa
-CMR10		cm/cmr10.pfa
-CMR12		cm/cmr12.pfa
-CMR17		cm/cmr17.pfa
-CMR5		cm/cmr5.pfa
-CMR6		cm/cmr6.pfa
-CMR7		cm/cmr7.pfa
-CMR8		cm/cmr8.pfa
-CMR9		cm/cmr9.pfa
-CMSL10		cm/cmsl10.pfa
-CMSL12		cm/cmsl12.pfa
-CMSL8		cm/cmsl8.pfa
-CMSL9		cm/cmsl9.pfa
-CMSLTT10		cm/cmsltt10.pfa
-CMSS10		cm/cmss10.pfa
-CMSS12		cm/cmss12.pfa
-CMSS17		cm/cmss17.pfa
-CMSS8		cm/cmss8.pfa
-CMSS9		cm/cmss9.pfa
-CMSSBX10		cm/cmssbx10.pfa
-CMSSDC10		cm/cmssdc10.pfa
-CMSSI10		cm/cmssi10.pfa
-CMSSI12		cm/cmssi12.pfa
-CMSSI17		cm/cmssi17.pfa
-CMSSI8		cm/cmssi8.pfa
-CMSSI9		cm/cmssi9.pfa
-CMSSQ8		cm/cmssq8.pfa
-CMSSQI8		cm/cmssqi8.pfa
-CMSY10		cm/cmsy10.pfa
-CMSY5		cm/cmsy5.pfa
-CMSY6		cm/cmsy6.pfa
-CMSY7		cm/cmsy7.pfa
-CMSY8		cm/cmsy8.pfa
-CMSY9		cm/cmsy9.pfa
-CMTCSC10		cm/cmtcsc10.pfa
-CMTEX10		cm/cmtex10.pfa
-CMTEX8		cm/cmtex8.pfa
-CMTEX9		cm/cmtex9.pfa
-CMTI10		cm/cmti10.pfa
-CMTI12		cm/cmti12.pfa
-CMTI7		cm/cmti7.pfa
-CMTI8		cm/cmti8.pfa
-CMTI9		cm/cmti9.pfa
-CMTT10		cm/cmtt10.pfa
-CMTT12		cm/cmtt12.pfa
-CMTT8		cm/cmtt8.pfa
-CMTT9		cm/cmtt9.pfa
-CMU10		cm/cmu10.pfa
-CMVTT10		cm/cmvtt10.pfa
-LASY10		cm/lasy10.pfa
-LASY5		cm/lasy5.pfa
-LASY6		cm/lasy6.pfa
-LASY7		cm/lasy7.pfa
-LASY8		cm/lasy8.pfa
-LASY9		cm/lasy9.pfa
-LASYB10		cm/lasyb10.pfa
-LCIRCLE1		cm/lcircle1.pfa
-LCIRCLEW		cm/lcirclew.pfa
-LCMSS8		cm/lcmss8.pfa
-LCMSSB8		cm/lcmssb8.pfa
-LCMSSI8		cm/lcmssi8.pfa
-LINE10		cm/line10.pfa
-LINEW10		cm/linew10.pfa
-LOGO10		cm/logo10.pfa
-LOGO8		cm/logo8.pfa
-LOGO9		cm/logo9.pfa
-LOGOBF10		cm/logobf10.pfa
-LOGOSL10		cm/logosl10.pfa
-
-% AMS fonts for TeX
-CMBSY5		ams/cmbsy5.pfa
-CMBSY7		ams/cmbsy7.pfa
-CMMIB5		ams/cmmib5.pfa
-CMMIB7		ams/cmmib7.pfa
-EUEX10		ams/euex10.pfa
-EUFB10		ams/eufb10.pfa
-EUFB5		ams/eufb5.pfa
-EUFB7		ams/eufb7.pfa
-EUFM10		ams/eufm10.pfa
-EUFM5		ams/eufm5.pfa
-EUFM7		ams/eufm7.pfa
-EURB10		ams/eurb10.pfa
-EURB5		ams/eurb5.pfa
-EURB7		ams/eurb7.pfa
-EURM10		ams/eurm10.pfa
-EURM5		ams/eurm5.pfa
-EURM7		ams/eurm7.pfa
-EUSB10		ams/eusb10.pfa
-EUSB5		ams/eusb5.pfa
-EUSB7		ams/eusb7.pfa
-EUSM10		ams/eusm10.pfa
-EUSM5		ams/eusm5.pfa
-EUSM7		ams/eusm7.pfa
-MSAM10		ams/msam10.pfa
-MSAM5		ams/msam5.pfa
-MSAM7		ams/msam7.pfa
-MSBM10		ams/msbm10.pfa
-MSBM5		ams/msbm5.pfa
-MSBM7		ams/msbm7.pfa
-WNCYB10		ams/wncyb10.pfa
-WNCYI10		ams/wncyi10.pfa
-WNCYR10		ams/wncyr10.pfa
-WNCYSC10		ams/wncysc10.pfa
-WNCYSS10		ams/wncyss10.pfa
+DejaVuMonoSans00 dejavu/DejaVuMonoSans00
+DejaVuMonoSans01 dejavu/DejaVuMonoSans01
+DejaVuMonoSans02 dejavu/DejaVuMonoSans02
+DejaVuMonoSans03 dejavu/DejaVuMonoSans03
+DejaVuMonoSans04 dejavu/DejaVuMonoSans04
+DejaVuMonoSans1D dejavu/DejaVuMonoSans1D
+DejaVuMonoSans1E dejavu/DejaVuMonoSans1E
+DejaVuMonoSans20 dejavu/DejaVuMonoSans20
+DejaVuMonoSans21 dejavu/DejaVuMonoSans21
+DejaVuMonoSans22 dejavu/DejaVuMonoSans22
+DejaVuMonoSans23 dejavu/DejaVuMonoSans23
+DejaVuMonoSans24 dejavu/DejaVuMonoSans24
+DejaVuMonoSans25 dejavu/DejaVuMonoSans25
+DejaVuMonoSans26 dejavu/DejaVuMonoSans26
+DejaVuMonoSans27 dejavu/DejaVuMonoSans27
+DejaVuMonoSans28 dejavu/DejaVuMonoSans28
+DejaVuMonoSans29 dejavu/DejaVuMonoSans29
+DejaVuMonoSans2B dejavu/DejaVuMonoSans2B
+DejaVuMonoSansBold00 dejavu/DejaVuMonoSansBold00
+DejaVuMonoSansBold01 dejavu/DejaVuMonoSansBold01
+DejaVuMonoSansBold02 dejavu/DejaVuMonoSansBold02
+DejaVuMonoSansBold03 dejavu/DejaVuMonoSansBold03
+DejaVuMonoSansBold04 dejavu/DejaVuMonoSansBold04
+DejaVuMonoSansBold1D dejavu/DejaVuMonoSansBold1D
+DejaVuMonoSansBold1E dejavu/DejaVuMonoSansBold1E
+DejaVuMonoSansBold20 dejavu/DejaVuMonoSansBold20
+DejaVuMonoSansBold21 dejavu/DejaVuMonoSansBold21
+DejaVuMonoSansBold22 dejavu/DejaVuMonoSansBold22
+DejaVuMonoSansBold23 dejavu/DejaVuMonoSansBold23
+DejaVuMonoSansBold24 dejavu/DejaVuMonoSansBold24
+DejaVuMonoSansBold25 dejavu/DejaVuMonoSansBold25
+DejaVuMonoSansBold26 dejavu/DejaVuMonoSansBold26
+DejaVuMonoSansBold27 dejavu/DejaVuMonoSansBold27
+DejaVuMonoSansBold28 dejavu/DejaVuMonoSansBold28
+DejaVuMonoSansBold29 dejavu/DejaVuMonoSansBold29
+DejaVuMonoSansBold2B dejavu/DejaVuMonoSansBold2B
+DejaVuMonoSansBoldFB dejavu/DejaVuMonoSansBoldFB
+DejaVuMonoSansBoldFF dejavu/DejaVuMonoSansBoldFF
+DejaVuMonoSansBoldOblique00 dejavu/DejaVuMonoSansBoldOblique00
+DejaVuMonoSansBoldOblique01 dejavu/DejaVuMonoSansBoldOblique01
+DejaVuMonoSansBoldOblique02 dejavu/DejaVuMonoSansBoldOblique02
+DejaVuMonoSansBoldOblique03 dejavu/DejaVuMonoSansBoldOblique03
+DejaVuMonoSansBoldOblique04 dejavu/DejaVuMonoSansBoldOblique04
+DejaVuMonoSansBoldOblique1D dejavu/DejaVuMonoSansBoldOblique1D
+DejaVuMonoSansBoldOblique1E dejavu/DejaVuMonoSansBoldOblique1E
+DejaVuMonoSansBoldOblique20 dejavu/DejaVuMonoSansBoldOblique20
+DejaVuMonoSansBoldOblique21 dejavu/DejaVuMonoSansBoldOblique21
+DejaVuMonoSansBoldOblique22 dejavu/DejaVuMonoSansBoldOblique22
+DejaVuMonoSansBoldOblique23 dejavu/DejaVuMonoSansBoldOblique23
+DejaVuMonoSansBoldOblique24 dejavu/DejaVuMonoSansBoldOblique24
+DejaVuMonoSansBoldOblique25 dejavu/DejaVuMonoSansBoldOblique25
+DejaVuMonoSansBoldOblique26 dejavu/DejaVuMonoSansBoldOblique26
+DejaVuMonoSansBoldOblique27 dejavu/DejaVuMonoSansBoldOblique27
+DejaVuMonoSansBoldOblique28 dejavu/DejaVuMonoSansBoldOblique28
+DejaVuMonoSansBoldOblique29 dejavu/DejaVuMonoSansBoldOblique29
+DejaVuMonoSansBoldOblique2B dejavu/DejaVuMonoSansBoldOblique2B
+DejaVuMonoSansBoldObliqueFB dejavu/DejaVuMonoSansBoldObliqueFB
+DejaVuMonoSansBoldObliqueFF dejavu/DejaVuMonoSansBoldObliqueFF
+DejaVuMonoSansFB dejavu/DejaVuMonoSansFB
+DejaVuMonoSansFF dejavu/DejaVuMonoSansFF
+DejaVuMonoSansOblique00 dejavu/DejaVuMonoSansOblique00
+DejaVuMonoSansOblique01 dejavu/DejaVuMonoSansOblique01
+DejaVuMonoSansOblique02 dejavu/DejaVuMonoSansOblique02
+DejaVuMonoSansOblique03 dejavu/DejaVuMonoSansOblique03
+DejaVuMonoSansOblique04 dejavu/DejaVuMonoSansOblique04
+DejaVuMonoSansOblique1D dejavu/DejaVuMonoSansOblique1D
+DejaVuMonoSansOblique1E dejavu/DejaVuMonoSansOblique1E
+DejaVuMonoSansOblique20 dejavu/DejaVuMonoSansOblique20
+DejaVuMonoSansOblique21 dejavu/DejaVuMonoSansOblique21
+DejaVuMonoSansOblique22 dejavu/DejaVuMonoSansOblique22
+DejaVuMonoSansOblique23 dejavu/DejaVuMonoSansOblique23
+DejaVuMonoSansOblique24 dejavu/DejaVuMonoSansOblique24
+DejaVuMonoSansOblique25 dejavu/DejaVuMonoSansOblique25
+DejaVuMonoSansOblique26 dejavu/DejaVuMonoSansOblique26
+DejaVuMonoSansOblique27 dejavu/DejaVuMonoSansOblique27
+DejaVuMonoSansOblique28 dejavu/DejaVuMonoSansOblique28
+DejaVuMonoSansOblique29 dejavu/DejaVuMonoSansOblique29
+DejaVuMonoSansOblique2B dejavu/DejaVuMonoSansOblique2B
+DejaVuMonoSansObliqueFB dejavu/DejaVuMonoSansObliqueFB
+DejaVuMonoSansObliqueFF dejavu/DejaVuMonoSansObliqueFF
+DejaVuSans00 dejavu/DejaVuSans00
+DejaVuSans01 dejavu/DejaVuSans01
+DejaVuSans02 dejavu/DejaVuSans02
+DejaVuSans03 dejavu/DejaVuSans03
+DejaVuSans04 dejavu/DejaVuSans04
+DejaVuSans05 dejavu/DejaVuSans05
+DejaVuSans1D dejavu/DejaVuSans1D
+DejaVuSans1E dejavu/DejaVuSans1E
+DejaVuSans1F dejavu/DejaVuSans1F
+DejaVuSans20 dejavu/DejaVuSans20
+DejaVuSans21 dejavu/DejaVuSans21
+DejaVuSans22 dejavu/DejaVuSans22
+DejaVuSans23 dejavu/DejaVuSans23
+DejaVuSans24 dejavu/DejaVuSans24
+DejaVuSans25 dejavu/DejaVuSans25
+DejaVuSans26 dejavu/DejaVuSans26
+DejaVuSans27 dejavu/DejaVuSans27
+DejaVuSans28 dejavu/DejaVuSans28
+DejaVuSans29 dejavu/DejaVuSans29
+DejaVuSans2A dejavu/DejaVuSans2A
+DejaVuSans2B dejavu/DejaVuSans2B
+DejaVuSansBold00 dejavu/DejaVuSansBold00
+DejaVuSansBold01 dejavu/DejaVuSansBold01
+DejaVuSansBold02 dejavu/DejaVuSansBold02
+DejaVuSansBold03 dejavu/DejaVuSansBold03
+DejaVuSansBold04 dejavu/DejaVuSansBold04
+DejaVuSansBold05 dejavu/DejaVuSansBold05
+DejaVuSansBold1D dejavu/DejaVuSansBold1D
+DejaVuSansBold1E dejavu/DejaVuSansBold1E
+DejaVuSansBold1F dejavu/DejaVuSansBold1F
+DejaVuSansBold20 dejavu/DejaVuSansBold20
+DejaVuSansBold21 dejavu/DejaVuSansBold21
+DejaVuSansBold22 dejavu/DejaVuSansBold22
+DejaVuSansBold23 dejavu/DejaVuSansBold23
+DejaVuSansBold24 dejavu/DejaVuSansBold24
+DejaVuSansBold25 dejavu/DejaVuSansBold25
+DejaVuSansBold26 dejavu/DejaVuSansBold26
+DejaVuSansBold27 dejavu/DejaVuSansBold27
+DejaVuSansBold28 dejavu/DejaVuSansBold28
+DejaVuSansBold29 dejavu/DejaVuSansBold29
+DejaVuSansBold2A dejavu/DejaVuSansBold2A
+DejaVuSansBold2B dejavu/DejaVuSansBold2B
+DejaVuSansBoldFB dejavu/DejaVuSansBoldFB
+DejaVuSansBoldFF dejavu/DejaVuSansBoldFF
+DejaVuSansBoldOblique00 dejavu/DejaVuSansBoldOblique00
+DejaVuSansBoldOblique01 dejavu/DejaVuSansBoldOblique01
+DejaVuSansBoldOblique02 dejavu/DejaVuSansBoldOblique02
+DejaVuSansBoldOblique03 dejavu/DejaVuSansBoldOblique03
+DejaVuSansBoldOblique04 dejavu/DejaVuSansBoldOblique04
+DejaVuSansBoldOblique05 dejavu/DejaVuSansBoldOblique05
+DejaVuSansBoldOblique1D dejavu/DejaVuSansBoldOblique1D
+DejaVuSansBoldOblique1E dejavu/DejaVuSansBoldOblique1E
+DejaVuSansBoldOblique1F dejavu/DejaVuSansBoldOblique1F
+DejaVuSansBoldOblique20 dejavu/DejaVuSansBoldOblique20
+DejaVuSansBoldOblique21 dejavu/DejaVuSansBoldOblique21
+DejaVuSansBoldOblique22 dejavu/DejaVuSansBoldOblique22
+DejaVuSansBoldOblique23 dejavu/DejaVuSansBoldOblique23
+DejaVuSansBoldOblique24 dejavu/DejaVuSansBoldOblique24
+DejaVuSansBoldOblique25 dejavu/DejaVuSansBoldOblique25
+DejaVuSansBoldOblique26 dejavu/DejaVuSansBoldOblique26
+DejaVuSansBoldOblique27 dejavu/DejaVuSansBoldOblique27
+DejaVuSansBoldOblique28 dejavu/DejaVuSansBoldOblique28
+DejaVuSansBoldOblique29 dejavu/DejaVuSansBoldOblique29
+DejaVuSansBoldOblique2A dejavu/DejaVuSansBoldOblique2A
+DejaVuSansBoldOblique2B dejavu/DejaVuSansBoldOblique2B
+DejaVuSansBoldObliqueFB dejavu/DejaVuSansBoldObliqueFB
+DejaVuSansBoldObliqueFF dejavu/DejaVuSansBoldObliqueFF
+DejaVuSansFB dejavu/DejaVuSansFB
+DejaVuSansFF dejavu/DejaVuSansFF
+DejaVuSansOblique00 dejavu/DejaVuSansOblique00
+DejaVuSansOblique01 dejavu/DejaVuSansOblique01
+DejaVuSansOblique02 dejavu/DejaVuSansOblique02
+DejaVuSansOblique03 dejavu/DejaVuSansOblique03
+DejaVuSansOblique04 dejavu/DejaVuSansOblique04
+DejaVuSansOblique05 dejavu/DejaVuSansOblique05
+DejaVuSansOblique1D dejavu/DejaVuSansOblique1D
+DejaVuSansOblique1E dejavu/DejaVuSansOblique1E
+DejaVuSansOblique1F dejavu/DejaVuSansOblique1F
+DejaVuSansOblique20 dejavu/DejaVuSansOblique20
+DejaVuSansOblique21 dejavu/DejaVuSansOblique21
+DejaVuSansOblique22 dejavu/DejaVuSansOblique22
+DejaVuSansOblique23 dejavu/DejaVuSansOblique23
+DejaVuSansOblique24 dejavu/DejaVuSansOblique24
+DejaVuSansOblique25 dejavu/DejaVuSansOblique25
+DejaVuSansOblique26 dejavu/DejaVuSansOblique26
+DejaVuSansOblique27 dejavu/DejaVuSansOblique27
+DejaVuSansOblique28 dejavu/DejaVuSansOblique28
+DejaVuSansOblique29 dejavu/DejaVuSansOblique29
+DejaVuSansOblique2A dejavu/DejaVuSansOblique2A
+DejaVuSansOblique2B dejavu/DejaVuSansOblique2B
+DejaVuSansObliqueFB dejavu/DejaVuSansObliqueFB
+DejaVuSansObliqueFF dejavu/DejaVuSansObliqueFF
+DejaVuSerif00 dejavu/DejaVuSerif00
+DejaVuSerif01 dejavu/DejaVuSerif01
+DejaVuSerif02 dejavu/DejaVuSerif02
+DejaVuSerif03 dejavu/DejaVuSerif03
+DejaVuSerif04 dejavu/DejaVuSerif04
+DejaVuSerif1D dejavu/DejaVuSerif1D
+DejaVuSerif1E dejavu/DejaVuSerif1E
+DejaVuSerif1F dejavu/DejaVuSerif1F
+DejaVuSerif20 dejavu/DejaVuSerif20
+DejaVuSerif21 dejavu/DejaVuSerif21
+DejaVuSerif22 dejavu/DejaVuSerif22
+DejaVuSerif23 dejavu/DejaVuSerif23
+DejaVuSerif24 dejavu/DejaVuSerif24
+DejaVuSerif25 dejavu/DejaVuSerif25
+DejaVuSerif26 dejavu/DejaVuSerif26
+DejaVuSerif27 dejavu/DejaVuSerif27
+DejaVuSerif28 dejavu/DejaVuSerif28
+DejaVuSerif29 dejavu/DejaVuSerif29
+DejaVuSerif2B dejavu/DejaVuSerif2B
+DejaVuSerifBold00 dejavu/DejaVuSerifBold00
+DejaVuSerifBold01 dejavu/DejaVuSerifBold01
+DejaVuSerifBold02 dejavu/DejaVuSerifBold02
+DejaVuSerifBold03 dejavu/DejaVuSerifBold03
+DejaVuSerifBold04 dejavu/DejaVuSerifBold04
+DejaVuSerifBold1D dejavu/DejaVuSerifBold1D
+DejaVuSerifBold1E dejavu/DejaVuSerifBold1E
+DejaVuSerifBold1F dejavu/DejaVuSerifBold1F
+DejaVuSerifBold20 dejavu/DejaVuSerifBold20
+DejaVuSerifBold21 dejavu/DejaVuSerifBold21
+DejaVuSerifBold22 dejavu/DejaVuSerifBold22
+DejaVuSerifBold23 dejavu/DejaVuSerifBold23
+DejaVuSerifBold24 dejavu/DejaVuSerifBold24
+DejaVuSerifBold25 dejavu/DejaVuSerifBold25
+DejaVuSerifBold26 dejavu/DejaVuSerifBold26
+DejaVuSerifBold27 dejavu/DejaVuSerifBold27
+DejaVuSerifBold28 dejavu/DejaVuSerifBold28
+DejaVuSerifBold29 dejavu/DejaVuSerifBold29
+DejaVuSerifBold2B dejavu/DejaVuSerifBold2B
+DejaVuSerifBoldFB dejavu/DejaVuSerifBoldFB
+DejaVuSerifBoldFF dejavu/DejaVuSerifBoldFF
+DejaVuSerifBoldOblique00 dejavu/DejaVuSerifBoldOblique00
+DejaVuSerifBoldOblique01 dejavu/DejaVuSerifBoldOblique01
+DejaVuSerifBoldOblique02 dejavu/DejaVuSerifBoldOblique02
+DejaVuSerifBoldOblique03 dejavu/DejaVuSerifBoldOblique03
+DejaVuSerifBoldOblique04 dejavu/DejaVuSerifBoldOblique04
+DejaVuSerifBoldOblique1D dejavu/DejaVuSerifBoldOblique1D
+DejaVuSerifBoldOblique1E dejavu/DejaVuSerifBoldOblique1E
+DejaVuSerifBoldOblique1F dejavu/DejaVuSerifBoldOblique1F
+DejaVuSerifBoldOblique20 dejavu/DejaVuSerifBoldOblique20
+DejaVuSerifBoldOblique21 dejavu/DejaVuSerifBoldOblique21
+DejaVuSerifBoldOblique22 dejavu/DejaVuSerifBoldOblique22
+DejaVuSerifBoldOblique23 dejavu/DejaVuSerifBoldOblique23
+DejaVuSerifBoldOblique24 dejavu/DejaVuSerifBoldOblique24
+DejaVuSerifBoldOblique25 dejavu/DejaVuSerifBoldOblique25
+DejaVuSerifBoldOblique26 dejavu/DejaVuSerifBoldOblique26
+DejaVuSerifBoldOblique27 dejavu/DejaVuSerifBoldOblique27
+DejaVuSerifBoldOblique28 dejavu/DejaVuSerifBoldOblique28
+DejaVuSerifBoldOblique29 dejavu/DejaVuSerifBoldOblique29
+DejaVuSerifBoldOblique2B dejavu/DejaVuSerifBoldOblique2B
+DejaVuSerifBoldObliqueFB dejavu/DejaVuSerifBoldObliqueFB
+DejaVuSerifBoldObliqueFF dejavu/DejaVuSerifBoldObliqueFF
+DejaVuSerifFB dejavu/DejaVuSerifFB
+DejaVuSerifFF dejavu/DejaVuSerifFF
+DejaVuSerifOblique00 dejavu/DejaVuSerifOblique00
+DejaVuSerifOblique01 dejavu/DejaVuSerifOblique01
+DejaVuSerifOblique02 dejavu/DejaVuSerifOblique02
+DejaVuSerifOblique03 dejavu/DejaVuSerifOblique03
+DejaVuSerifOblique04 dejavu/DejaVuSerifOblique04
+DejaVuSerifOblique1D dejavu/DejaVuSerifOblique1D
+DejaVuSerifOblique1E dejavu/DejaVuSerifOblique1E
+DejaVuSerifOblique1F dejavu/DejaVuSerifOblique1F
+DejaVuSerifOblique20 dejavu/DejaVuSerifOblique20
+DejaVuSerifOblique21 dejavu/DejaVuSerifOblique21
+DejaVuSerifOblique22 dejavu/DejaVuSerifOblique22
+DejaVuSerifOblique23 dejavu/DejaVuSerifOblique23
+DejaVuSerifOblique24 dejavu/DejaVuSerifOblique24
+DejaVuSerifOblique25 dejavu/DejaVuSerifOblique25
+DejaVuSerifOblique26 dejavu/DejaVuSerifOblique26
+DejaVuSerifOblique27 dejavu/DejaVuSerifOblique27
+DejaVuSerifOblique28 dejavu/DejaVuSerifOblique28
+DejaVuSerifOblique29 dejavu/DejaVuSerifOblique29
+DejaVuSerifOblique2B dejavu/DejaVuSerifOblique2B
+DejaVuSerifObliqueFB dejavu/DejaVuSerifObliqueFB
+DejaVuSerifObliqueFF dejavu/DejaVuSerifObliqueFF
diff --git a/sys/lib/tls/mail b/sys/lib/tls/mail
index bf646337e..b0ac52605 100644
--- a/sys/lib/tls/mail
+++ b/sys/lib/tls/mail
@@ -1 +1 @@
-x509 sha1=1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e (replace with your mail server fingerprint)
+x509 sha1=C969B712918818ED839D98B781411F9BE51C0571
diff --git a/sys/src/cmd/pkg/create b/sys/src/cmd/pkg/create
index 525d3b7fe..4cb3b7421 100755
--- a/sys/src/cmd/pkg/create
+++ b/sys/src/cmd/pkg/create
@@ -11,7 +11,8 @@ C=`{pwd}
 	cd $d
 	mk
 	divergefs -p /tmp/$i /
-	mk install clean
+	mk install
+	mk clean
 	unmount /
 }
 cd /tmp/$i/files