135 files changed, 6 insertions, 1467 deletions

diff --git a/Master/bin/i386-netbsd/afm2pl b/Master/bin/i386-netbsd/afm2pl
index 0f19130a069..3ab8dfbd68e 100755
--- a/Master/bin/i386-netbsd/afm2pl
+++ b/Master/bin/i386-netbsd/afm2pl
diff --git a/Master/bin/i386-netbsd/afm2tfm b/Master/bin/i386-netbsd/afm2tfm
index 34ce1c91368..48b33cc9006 100755
--- a/Master/bin/i386-netbsd/afm2tfm
+++ b/Master/bin/i386-netbsd/afm2tfm
diff --git a/Master/bin/i386-netbsd/aleph b/Master/bin/i386-netbsd/aleph
index e0673005b11..ade24fa1263 100755
--- a/Master/bin/i386-netbsd/aleph
+++ b/Master/bin/i386-netbsd/aleph
diff --git a/Master/bin/i386-netbsd/asy b/Master/bin/i386-netbsd/asy
index 4b6b571ea82..8c1d86f2e27 100755
--- a/Master/bin/i386-netbsd/asy
+++ b/Master/bin/i386-netbsd/asy
diff --git a/Master/bin/i386-netbsd/bbox b/Master/bin/i386-netbsd/bbox
index 09669e7ddd7..c3ff3ec06bb 100755
--- a/Master/bin/i386-netbsd/bbox
+++ b/Master/bin/i386-netbsd/bbox
diff --git a/Master/bin/i386-netbsd/bg5conv b/Master/bin/i386-netbsd/bg5conv
index e185c4fa5d3..8cc332c2db4 100755
--- a/Master/bin/i386-netbsd/bg5conv
+++ b/Master/bin/i386-netbsd/bg5conv
diff --git a/Master/bin/i386-netbsd/bibtex b/Master/bin/i386-netbsd/bibtex
index 5264db62271..cc7630a2b82 100755
--- a/Master/bin/i386-netbsd/bibtex
+++ b/Master/bin/i386-netbsd/bibtex
diff --git a/Master/bin/i386-netbsd/bibtex8 b/Master/bin/i386-netbsd/bibtex8
index 02b93e54f8c..c7be84ce1b4 100755
--- a/Master/bin/i386-netbsd/bibtex8
+++ b/Master/bin/i386-netbsd/bibtex8
diff --git a/Master/bin/i386-netbsd/bibtexu b/Master/bin/i386-netbsd/bibtexu
index c9b2ef28aab..9ac662f4ab1 100755
--- a/Master/bin/i386-netbsd/bibtexu
+++ b/Master/bin/i386-netbsd/bibtexu
diff --git a/Master/bin/i386-netbsd/cef5conv b/Master/bin/i386-netbsd/cef5conv
index 5f0bfeb126b..ced8a0bb187 100755
--- a/Master/bin/i386-netbsd/cef5conv
+++ b/Master/bin/i386-netbsd/cef5conv
diff --git a/Master/bin/i386-netbsd/cefconv b/Master/bin/i386-netbsd/cefconv
index 9b5544aa4a7..a99b1b4c9c9 100755
--- a/Master/bin/i386-netbsd/cefconv
+++ b/Master/bin/i386-netbsd/cefconv
diff --git a/Master/bin/i386-netbsd/cefsconv b/Master/bin/i386-netbsd/cefsconv
index f9bfa694a27..91ed0579dbf 100755
--- a/Master/bin/i386-netbsd/cefsconv
+++ b/Master/bin/i386-netbsd/cefsconv
diff --git a/Master/bin/i386-netbsd/cfftot1 b/Master/bin/i386-netbsd/cfftot1
index 529bbb462f8..5adec141ef2 100755
--- a/Master/bin/i386-netbsd/cfftot1
+++ b/Master/bin/i386-netbsd/cfftot1
diff --git a/Master/bin/i386-netbsd/chktex b/Master/bin/i386-netbsd/chktex
index 3654136ab2c..28c20595ad0 100755
--- a/Master/bin/i386-netbsd/chktex
+++ b/Master/bin/i386-netbsd/chktex
diff --git a/Master/bin/i386-netbsd/ctangle b/Master/bin/i386-netbsd/ctangle
index 2fe8af16186..7544cab1740 100755
--- a/Master/bin/i386-netbsd/ctangle
+++ b/Master/bin/i386-netbsd/ctangle
diff --git a/Master/bin/i386-netbsd/ctie b/Master/bin/i386-netbsd/ctie
index 7ee845d55d6..a798b867742 100755
--- a/Master/bin/i386-netbsd/ctie
+++ b/Master/bin/i386-netbsd/ctie
diff --git a/Master/bin/i386-netbsd/cweave b/Master/bin/i386-netbsd/cweave
index 21d03c75dad..0f2ff8c606c 100755
--- a/Master/bin/i386-netbsd/cweave
+++ b/Master/bin/i386-netbsd/cweave
diff --git a/Master/bin/i386-netbsd/detex b/Master/bin/i386-netbsd/detex
index 6e70a4838d1..9395fccf98a 100755
--- a/Master/bin/i386-netbsd/detex
+++ b/Master/bin/i386-netbsd/detex
diff --git a/Master/bin/i386-netbsd/devnag b/Master/bin/i386-netbsd/devnag
index ef56d60faaa..ec5394f8d2c 100755
--- a/Master/bin/i386-netbsd/devnag
+++ b/Master/bin/i386-netbsd/devnag
diff --git a/Master/bin/i386-netbsd/disdvi b/Master/bin/i386-netbsd/disdvi
index 86a367164c2..c4da32e8447 100755
--- a/Master/bin/i386-netbsd/disdvi
+++ b/Master/bin/i386-netbsd/disdvi
diff --git a/Master/bin/i386-netbsd/dt2dv b/Master/bin/i386-netbsd/dt2dv
index 478070ee1eb..20194f9e4a2 100755
--- a/Master/bin/i386-netbsd/dt2dv
+++ b/Master/bin/i386-netbsd/dt2dv
diff --git a/Master/bin/i386-netbsd/dv2dt b/Master/bin/i386-netbsd/dv2dt
index 0f09721e858..45dafa7bc85 100755
--- a/Master/bin/i386-netbsd/dv2dt
+++ b/Master/bin/i386-netbsd/dv2dt
diff --git a/Master/bin/i386-netbsd/dvi2tty b/Master/bin/i386-netbsd/dvi2tty
index 16df6f00751..d681ee3fd4a 100755
--- a/Master/bin/i386-netbsd/dvi2tty
+++ b/Master/bin/i386-netbsd/dvi2tty
diff --git a/Master/bin/i386-netbsd/dvibook b/Master/bin/i386-netbsd/dvibook
index 998c626c26b..fdaabca933f 100755
--- a/Master/bin/i386-netbsd/dvibook
+++ b/Master/bin/i386-netbsd/dvibook
diff --git a/Master/bin/i386-netbsd/dviconcat b/Master/bin/i386-netbsd/dviconcat
index 59dafb42f42..7bf1b601248 100755
--- a/Master/bin/i386-netbsd/dviconcat
+++ b/Master/bin/i386-netbsd/dviconcat
diff --git a/Master/bin/i386-netbsd/dvicopy b/Master/bin/i386-netbsd/dvicopy
index c8dc9a62655..18d7f280e1c 100755
--- a/Master/bin/i386-netbsd/dvicopy
+++ b/Master/bin/i386-netbsd/dvicopy
diff --git a/Master/bin/i386-netbsd/dvidvi b/Master/bin/i386-netbsd/dvidvi
index 8da3bdbd881..1fea92abd88 100755
--- a/Master/bin/i386-netbsd/dvidvi
+++ b/Master/bin/i386-netbsd/dvidvi
diff --git a/Master/bin/i386-netbsd/dvilj b/Master/bin/i386-netbsd/dvilj
index 7e240ff642c..506246e9d6d 100755
--- a/Master/bin/i386-netbsd/dvilj
+++ b/Master/bin/i386-netbsd/dvilj
diff --git a/Master/bin/i386-netbsd/dvilj2p b/Master/bin/i386-netbsd/dvilj2p
index dee9f1873b0..26bf1aff1fa 100755
--- a/Master/bin/i386-netbsd/dvilj2p
+++ b/Master/bin/i386-netbsd/dvilj2p
diff --git a/Master/bin/i386-netbsd/dvilj4 b/Master/bin/i386-netbsd/dvilj4
index 511f1517a3a..661c53d4bcd 100755
--- a/Master/bin/i386-netbsd/dvilj4
+++ b/Master/bin/i386-netbsd/dvilj4
diff --git a/Master/bin/i386-netbsd/dvilj4l b/Master/bin/i386-netbsd/dvilj4l
index a973a036804..2966596fc1a 100755
--- a/Master/bin/i386-netbsd/dvilj4l
+++ b/Master/bin/i386-netbsd/dvilj4l
diff --git a/Master/bin/i386-netbsd/dvipdfmx b/Master/bin/i386-netbsd/dvipdfmx
index d9e80e8ec95..6228b6ed7d3 100755
--- a/Master/bin/i386-netbsd/dvipdfmx
+++ b/Master/bin/i386-netbsd/dvipdfmx
diff --git a/Master/bin/i386-netbsd/dvipng b/Master/bin/i386-netbsd/dvipng
index f18667ca1e5..3e547099d79 100755
--- a/Master/bin/i386-netbsd/dvipng
+++ b/Master/bin/i386-netbsd/dvipng
diff --git a/Master/bin/i386-netbsd/dvipos b/Master/bin/i386-netbsd/dvipos
index 16d7c4b16fa..311e972aa43 100755
--- a/Master/bin/i386-netbsd/dvipos
+++ b/Master/bin/i386-netbsd/dvipos
diff --git a/Master/bin/i386-netbsd/dvips b/Master/bin/i386-netbsd/dvips
index 63f3b89af1a..6a0bd7c8c07 100755
--- a/Master/bin/i386-netbsd/dvips
+++ b/Master/bin/i386-netbsd/dvips
diff --git a/Master/bin/i386-netbsd/dviselect b/Master/bin/i386-netbsd/dviselect
index ecff060ec0f..e8f17c4d2e3 100755
--- a/Master/bin/i386-netbsd/dviselect
+++ b/Master/bin/i386-netbsd/dviselect
diff --git a/Master/bin/i386-netbsd/dvisvgm b/Master/bin/i386-netbsd/dvisvgm
index 1a4272a5121..464a662ee25 100755
--- a/Master/bin/i386-netbsd/dvisvgm
+++ b/Master/bin/i386-netbsd/dvisvgm
diff --git a/Master/bin/i386-netbsd/dvitodvi b/Master/bin/i386-netbsd/dvitodvi
index 471a27e05f3..a33c1ffb9be 100755
--- a/Master/bin/i386-netbsd/dvitodvi
+++ b/Master/bin/i386-netbsd/dvitodvi
diff --git a/Master/bin/i386-netbsd/dvitype b/Master/bin/i386-netbsd/dvitype
index e1b32dbdc1e..771edf348ec 100755
--- a/Master/bin/i386-netbsd/dvitype
+++ b/Master/bin/i386-netbsd/dvitype
diff --git a/Master/bin/i386-netbsd/epsffit b/Master/bin/i386-netbsd/epsffit
index 360f9c748c0..f25f21cbb3f 100755
--- a/Master/bin/i386-netbsd/epsffit
+++ b/Master/bin/i386-netbsd/epsffit
diff --git a/Master/bin/i386-netbsd/eptex b/Master/bin/i386-netbsd/eptex
new file mode 100755
index 00000000000..27761ba2f12
--- /dev/null
+++ b/Master/bin/i386-netbsd/eptex
diff --git a/Master/bin/i386-netbsd/extconv b/Master/bin/i386-netbsd/extconv
index 64af637c241..a9121869186 100755
--- a/Master/bin/i386-netbsd/extconv
+++ b/Master/bin/i386-netbsd/extconv
diff --git a/Master/bin/i386-netbsd/gftodvi b/Master/bin/i386-netbsd/gftodvi
index 895e52189ad..7770b34d8eb 100755
--- a/Master/bin/i386-netbsd/gftodvi
+++ b/Master/bin/i386-netbsd/gftodvi
diff --git a/Master/bin/i386-netbsd/gftopk b/Master/bin/i386-netbsd/gftopk
index df6ae55f3d0..0e6526a17bf 100755
--- a/Master/bin/i386-netbsd/gftopk
+++ b/Master/bin/i386-netbsd/gftopk
diff --git a/Master/bin/i386-netbsd/gftype b/Master/bin/i386-netbsd/gftype
index 0455ee5379e..c402ddad567 100755
--- a/Master/bin/i386-netbsd/gftype
+++ b/Master/bin/i386-netbsd/gftype
diff --git a/Master/bin/i386-netbsd/gsftopk b/Master/bin/i386-netbsd/gsftopk
index ad2248830f2..54f85245db7 100755
--- a/Master/bin/i386-netbsd/gsftopk
+++ b/Master/bin/i386-netbsd/gsftopk
diff --git a/Master/bin/i386-netbsd/hbf2gf b/Master/bin/i386-netbsd/hbf2gf
index a96deb57598..3340a952b86 100755
--- a/Master/bin/i386-netbsd/hbf2gf
+++ b/Master/bin/i386-netbsd/hbf2gf
diff --git a/Master/bin/i386-netbsd/inimf b/Master/bin/i386-netbsd/inimf
new file mode 120000
index 00000000000..64dafc4ff66
--- /dev/null
+++ b/Master/bin/i386-netbsd/inimf
@@ -0,0 +1 @@
+mf
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/initex b/Master/bin/i386-netbsd/initex
new file mode 120000
index 00000000000..5c8f2b2cc00
--- /dev/null
+++ b/Master/bin/i386-netbsd/initex
@@ -0,0 +1 @@
+tex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/kpseaccess b/Master/bin/i386-netbsd/kpseaccess
index bff9b0543a8..34da18de1b8 100755
--- a/Master/bin/i386-netbsd/kpseaccess
+++ b/Master/bin/i386-netbsd/kpseaccess
diff --git a/Master/bin/i386-netbsd/kpsereadlink b/Master/bin/i386-netbsd/kpsereadlink
index 22f923abfbc..0445e5d283d 100755
--- a/Master/bin/i386-netbsd/kpsereadlink
+++ b/Master/bin/i386-netbsd/kpsereadlink
diff --git a/Master/bin/i386-netbsd/kpsestat b/Master/bin/i386-netbsd/kpsestat
index 07762f62158..0b7e9e146f5 100755
--- a/Master/bin/i386-netbsd/kpsestat
+++ b/Master/bin/i386-netbsd/kpsestat
diff --git a/Master/bin/i386-netbsd/kpsewhich b/Master/bin/i386-netbsd/kpsewhich
index 4c950d35925..1c79e265cac 100755
--- a/Master/bin/i386-netbsd/kpsewhich
+++ b/Master/bin/i386-netbsd/kpsewhich
diff --git a/Master/bin/i386-netbsd/lacheck b/Master/bin/i386-netbsd/lacheck
index 136ff7ff591..db97c23dbd4 100755
--- a/Master/bin/i386-netbsd/lacheck
+++ b/Master/bin/i386-netbsd/lacheck
diff --git a/Master/bin/i386-netbsd/luatex b/Master/bin/i386-netbsd/luatex
index 4b287349b93..5f3db46c9ee 100755
--- a/Master/bin/i386-netbsd/luatex
+++ b/Master/bin/i386-netbsd/luatex
diff --git a/Master/bin/i386-netbsd/mag b/Master/bin/i386-netbsd/mag
index e133b36293d..6cc00a7a2a0 100755
--- a/Master/bin/i386-netbsd/mag
+++ b/Master/bin/i386-netbsd/mag
diff --git a/Master/bin/i386-netbsd/makeindex b/Master/bin/i386-netbsd/makeindex
index cdf44249b5e..facdd0dcf69 100755
--- a/Master/bin/i386-netbsd/makeindex
+++ b/Master/bin/i386-netbsd/makeindex
diff --git a/Master/bin/i386-netbsd/makejvf b/Master/bin/i386-netbsd/makejvf
index fb537dafdd4..5c916d2f6ad 100755
--- a/Master/bin/i386-netbsd/makejvf
+++ b/Master/bin/i386-netbsd/makejvf
diff --git a/Master/bin/i386-netbsd/mendex b/Master/bin/i386-netbsd/mendex
index de403d72144..e017792ffab 100755
--- a/Master/bin/i386-netbsd/mendex
+++ b/Master/bin/i386-netbsd/mendex
diff --git a/Master/bin/i386-netbsd/mf b/Master/bin/i386-netbsd/mf
index f8fcc17c4c4..4d3f3183389 100755
--- a/Master/bin/i386-netbsd/mf
+++ b/Master/bin/i386-netbsd/mf
diff --git a/Master/bin/i386-netbsd/mf-nowin b/Master/bin/i386-netbsd/mf-nowin
index 9891da1ee66..22bccde20b2 100755
--- a/Master/bin/i386-netbsd/mf-nowin
+++ b/Master/bin/i386-netbsd/mf-nowin
diff --git a/Master/bin/i386-netbsd/mft b/Master/bin/i386-netbsd/mft
index c30b4c3c095..debdd942a0a 100755
--- a/Master/bin/i386-netbsd/mft
+++ b/Master/bin/i386-netbsd/mft
diff --git a/Master/bin/i386-netbsd/mkofm b/Master/bin/i386-netbsd/mkofm
index ef820171f08..306575cfbe7 100755
--- a/Master/bin/i386-netbsd/mkofm
+++ b/Master/bin/i386-netbsd/mkofm
@@ -1,3 +1,3 @@
 #!/bin/sh
 # Initial definition.  For the moment only makes .tfm files.
-mktextfm $*
+mktextfm "$@"
diff --git a/Master/bin/i386-netbsd/mmafm b/Master/bin/i386-netbsd/mmafm
index 95c5bf2e5d8..b150782a3e9 100755
--- a/Master/bin/i386-netbsd/mmafm
+++ b/Master/bin/i386-netbsd/mmafm
diff --git a/Master/bin/i386-netbsd/mmpfb b/Master/bin/i386-netbsd/mmpfb
index 8c473dbefa5..468dacad257 100755
--- a/Master/bin/i386-netbsd/mmpfb
+++ b/Master/bin/i386-netbsd/mmpfb
diff --git a/Master/bin/i386-netbsd/mpost b/Master/bin/i386-netbsd/mpost
index bb7d933d8b2..a8c255c8269 100755
--- a/Master/bin/i386-netbsd/mpost
+++ b/Master/bin/i386-netbsd/mpost
diff --git a/Master/bin/i386-netbsd/odvicopy b/Master/bin/i386-netbsd/odvicopy
index 5ca1edca147..9342e407d7f 100755
--- a/Master/bin/i386-netbsd/odvicopy
+++ b/Master/bin/i386-netbsd/odvicopy
diff --git a/Master/bin/i386-netbsd/odvitype b/Master/bin/i386-netbsd/odvitype
index a491df5245f..810ba6ecd59 100755
--- a/Master/bin/i386-netbsd/odvitype
+++ b/Master/bin/i386-netbsd/odvitype
diff --git a/Master/bin/i386-netbsd/omfonts b/Master/bin/i386-netbsd/omfonts
index 45051d5dc64..3b90e3615c2 100755
--- a/Master/bin/i386-netbsd/omfonts
+++ b/Master/bin/i386-netbsd/omfonts
diff --git a/Master/bin/i386-netbsd/otangle b/Master/bin/i386-netbsd/otangle
index 10d81548dcc..d9ad41eae4f 100755
--- a/Master/bin/i386-netbsd/otangle
+++ b/Master/bin/i386-netbsd/otangle
diff --git a/Master/bin/i386-netbsd/otfinfo b/Master/bin/i386-netbsd/otfinfo
index 52171f3f1cb..4c67dfcc3a2 100755
--- a/Master/bin/i386-netbsd/otfinfo
+++ b/Master/bin/i386-netbsd/otfinfo
diff --git a/Master/bin/i386-netbsd/otftotfm b/Master/bin/i386-netbsd/otftotfm
index 4fa76b356ca..b062f3ed84f 100755
--- a/Master/bin/i386-netbsd/otftotfm
+++ b/Master/bin/i386-netbsd/otftotfm
diff --git a/Master/bin/i386-netbsd/otp2ocp b/Master/bin/i386-netbsd/otp2ocp
index 877a859ce16..9f8c54d3f86 100755
--- a/Master/bin/i386-netbsd/otp2ocp
+++ b/Master/bin/i386-netbsd/otp2ocp
diff --git a/Master/bin/i386-netbsd/outocp b/Master/bin/i386-netbsd/outocp
index b217b9340ff..c4c1c71f26e 100755
--- a/Master/bin/i386-netbsd/outocp
+++ b/Master/bin/i386-netbsd/outocp
diff --git a/Master/bin/i386-netbsd/patgen b/Master/bin/i386-netbsd/patgen
index 0791f1e4916..a25108b1da1 100755
--- a/Master/bin/i386-netbsd/patgen
+++ b/Master/bin/i386-netbsd/patgen
diff --git a/Master/bin/i386-netbsd/pbibtex b/Master/bin/i386-netbsd/pbibtex
index e773206c1be..7f8bd7f2760 100755
--- a/Master/bin/i386-netbsd/pbibtex
+++ b/Master/bin/i386-netbsd/pbibtex
diff --git a/Master/bin/i386-netbsd/pdfclose b/Master/bin/i386-netbsd/pdfclose
index d52802adcdd..aa46d1b7630 100755
--- a/Master/bin/i386-netbsd/pdfclose
+++ b/Master/bin/i386-netbsd/pdfclose
diff --git a/Master/bin/i386-netbsd/pdfopen b/Master/bin/i386-netbsd/pdfopen
index 85c6565acfd..d207a0f8df6 100755
--- a/Master/bin/i386-netbsd/pdfopen
+++ b/Master/bin/i386-netbsd/pdfopen
diff --git a/Master/bin/i386-netbsd/pdftex b/Master/bin/i386-netbsd/pdftex
index 1d67ff4cab3..c29a9b131c4 100755
--- a/Master/bin/i386-netbsd/pdftex
+++ b/Master/bin/i386-netbsd/pdftex
diff --git a/Master/bin/i386-netbsd/pdftosrc b/Master/bin/i386-netbsd/pdftosrc
index 0f565520879..7256ff5eb44 100755
--- a/Master/bin/i386-netbsd/pdftosrc
+++ b/Master/bin/i386-netbsd/pdftosrc
diff --git a/Master/bin/i386-netbsd/pdvitype b/Master/bin/i386-netbsd/pdvitype
index cfb7f7aed3a..da62f7b1fe0 100755
--- a/Master/bin/i386-netbsd/pdvitype
+++ b/Master/bin/i386-netbsd/pdvitype
diff --git a/Master/bin/i386-netbsd/pfb2pfa b/Master/bin/i386-netbsd/pfb2pfa
index 788c48346fb..27bf5ad1bae 100755
--- a/Master/bin/i386-netbsd/pfb2pfa
+++ b/Master/bin/i386-netbsd/pfb2pfa
diff --git a/Master/bin/i386-netbsd/pk2bm b/Master/bin/i386-netbsd/pk2bm
index f1503676bce..d34598e70c6 100755
--- a/Master/bin/i386-netbsd/pk2bm
+++ b/Master/bin/i386-netbsd/pk2bm
diff --git a/Master/bin/i386-netbsd/pktogf b/Master/bin/i386-netbsd/pktogf
index 7bbeae7e17a..dcc49ca1669 100755
--- a/Master/bin/i386-netbsd/pktogf
+++ b/Master/bin/i386-netbsd/pktogf
diff --git a/Master/bin/i386-netbsd/pktype b/Master/bin/i386-netbsd/pktype
index 5eb2df3ebf9..e3b9a389d20 100755
--- a/Master/bin/i386-netbsd/pktype
+++ b/Master/bin/i386-netbsd/pktype
diff --git a/Master/bin/i386-netbsd/platex b/Master/bin/i386-netbsd/platex
index 43a4f13c2a2..da5a0e6822f 120000
--- a/Master/bin/i386-netbsd/platex
+++ b/Master/bin/i386-netbsd/platex
@@ -1 +1 @@
-ptex
\ No newline at end of file
+eptex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/pltotf b/Master/bin/i386-netbsd/pltotf
index 062c7e45e0d..75dc87b405b 100755
--- a/Master/bin/i386-netbsd/pltotf
+++ b/Master/bin/i386-netbsd/pltotf
diff --git a/Master/bin/i386-netbsd/pooltype b/Master/bin/i386-netbsd/pooltype
index 52d951207c0..fb96eccbd37 100755
--- a/Master/bin/i386-netbsd/pooltype
+++ b/Master/bin/i386-netbsd/pooltype
diff --git a/Master/bin/i386-netbsd/ppltotf b/Master/bin/i386-netbsd/ppltotf
index fcf4c4c4712..4f5a6bc35dd 100755
--- a/Master/bin/i386-netbsd/ppltotf
+++ b/Master/bin/i386-netbsd/ppltotf
diff --git a/Master/bin/i386-netbsd/ps2pk b/Master/bin/i386-netbsd/ps2pk
index 13f6fff85c0..44045f23670 100755
--- a/Master/bin/i386-netbsd/ps2pk
+++ b/Master/bin/i386-netbsd/ps2pk
diff --git a/Master/bin/i386-netbsd/psbook b/Master/bin/i386-netbsd/psbook
index c2105bab94a..d50e43358b5 100755
--- a/Master/bin/i386-netbsd/psbook
+++ b/Master/bin/i386-netbsd/psbook
diff --git a/Master/bin/i386-netbsd/psnup b/Master/bin/i386-netbsd/psnup
index 5255fb4b4eb..ec53a0845ce 100755
--- a/Master/bin/i386-netbsd/psnup
+++ b/Master/bin/i386-netbsd/psnup
diff --git a/Master/bin/i386-netbsd/psresize b/Master/bin/i386-netbsd/psresize
index 4f92e16de28..badfebe0f26 100755
--- a/Master/bin/i386-netbsd/psresize
+++ b/Master/bin/i386-netbsd/psresize
diff --git a/Master/bin/i386-netbsd/psselect b/Master/bin/i386-netbsd/psselect
index 402aa84a01a..84d5fa55999 100755
--- a/Master/bin/i386-netbsd/psselect
+++ b/Master/bin/i386-netbsd/psselect
diff --git a/Master/bin/i386-netbsd/pstops b/Master/bin/i386-netbsd/pstops
index 21869ffc857..d90d9fd28b6 100755
--- a/Master/bin/i386-netbsd/pstops
+++ b/Master/bin/i386-netbsd/pstops
diff --git a/Master/bin/i386-netbsd/ptex b/Master/bin/i386-netbsd/ptex
index acc7ef2fbd5..b3c03d44e41 100755
--- a/Master/bin/i386-netbsd/ptex
+++ b/Master/bin/i386-netbsd/ptex
diff --git a/Master/bin/i386-netbsd/ptftopl b/Master/bin/i386-netbsd/ptftopl
index c26e04ccf82..3a1f0ac6785 100755
--- a/Master/bin/i386-netbsd/ptftopl
+++ b/Master/bin/i386-netbsd/ptftopl
diff --git a/Master/bin/i386-netbsd/sjisconv b/Master/bin/i386-netbsd/sjisconv
index 240fb15ec8d..dae95677b15 100755
--- a/Master/bin/i386-netbsd/sjisconv
+++ b/Master/bin/i386-netbsd/sjisconv
diff --git a/Master/bin/i386-netbsd/synctex b/Master/bin/i386-netbsd/synctex
index 6d3e03b286f..6c28e104b43 100755
--- a/Master/bin/i386-netbsd/synctex
+++ b/Master/bin/i386-netbsd/synctex
diff --git a/Master/bin/i386-netbsd/t1ascii b/Master/bin/i386-netbsd/t1ascii
index 300bb68b0ae..6dbb3af1652 100755
--- a/Master/bin/i386-netbsd/t1ascii
+++ b/Master/bin/i386-netbsd/t1ascii
diff --git a/Master/bin/i386-netbsd/t1asm b/Master/bin/i386-netbsd/t1asm
index ece26237633..9bd2cefe081 100755
--- a/Master/bin/i386-netbsd/t1asm
+++ b/Master/bin/i386-netbsd/t1asm
diff --git a/Master/bin/i386-netbsd/t1binary b/Master/bin/i386-netbsd/t1binary
index 1392c68f9e3..be7b0aa9713 100755
--- a/Master/bin/i386-netbsd/t1binary
+++ b/Master/bin/i386-netbsd/t1binary
diff --git a/Master/bin/i386-netbsd/t1disasm b/Master/bin/i386-netbsd/t1disasm
index 18e98da242f..3a316c0a170 100755
--- a/Master/bin/i386-netbsd/t1disasm
+++ b/Master/bin/i386-netbsd/t1disasm
diff --git a/Master/bin/i386-netbsd/t1dotlessj b/Master/bin/i386-netbsd/t1dotlessj
index c42a0345f35..c63be03abae 100755
--- a/Master/bin/i386-netbsd/t1dotlessj
+++ b/Master/bin/i386-netbsd/t1dotlessj
diff --git a/Master/bin/i386-netbsd/t1lint b/Master/bin/i386-netbsd/t1lint
index 4b732f94db3..1e4fb6f66af 100755
--- a/Master/bin/i386-netbsd/t1lint
+++ b/Master/bin/i386-netbsd/t1lint
diff --git a/Master/bin/i386-netbsd/t1mac b/Master/bin/i386-netbsd/t1mac
index b0cda254c05..f25a34f3554 100755
--- a/Master/bin/i386-netbsd/t1mac
+++ b/Master/bin/i386-netbsd/t1mac
diff --git a/Master/bin/i386-netbsd/t1rawafm b/Master/bin/i386-netbsd/t1rawafm
index a63a57184b8..b3bd0875f3b 100755
--- a/Master/bin/i386-netbsd/t1rawafm
+++ b/Master/bin/i386-netbsd/t1rawafm
diff --git a/Master/bin/i386-netbsd/t1reencode b/Master/bin/i386-netbsd/t1reencode
index 9cdbd283902..620908d1ef2 100755
--- a/Master/bin/i386-netbsd/t1reencode
+++ b/Master/bin/i386-netbsd/t1reencode
diff --git a/Master/bin/i386-netbsd/t1testpage b/Master/bin/i386-netbsd/t1testpage
index 46bd6af6504..38226d2dfc0 100755
--- a/Master/bin/i386-netbsd/t1testpage
+++ b/Master/bin/i386-netbsd/t1testpage
diff --git a/Master/bin/i386-netbsd/t1unmac b/Master/bin/i386-netbsd/t1unmac
index d24e7e63be5..c890596658b 100755
--- a/Master/bin/i386-netbsd/t1unmac
+++ b/Master/bin/i386-netbsd/t1unmac
diff --git a/Master/bin/i386-netbsd/t4ht b/Master/bin/i386-netbsd/t4ht
index 4cfea76f468..d209fdd66ac 100755
--- a/Master/bin/i386-netbsd/t4ht
+++ b/Master/bin/i386-netbsd/t4ht
diff --git a/Master/bin/i386-netbsd/tangle b/Master/bin/i386-netbsd/tangle
index c11bb277587..f2e32fa9278 100755
--- a/Master/bin/i386-netbsd/tangle
+++ b/Master/bin/i386-netbsd/tangle
diff --git a/Master/bin/i386-netbsd/tcdialog b/Master/bin/i386-netbsd/tcdialog
index ffcb2953afc..d3beac61171 100755
--- a/Master/bin/i386-netbsd/tcdialog
+++ b/Master/bin/i386-netbsd/tcdialog
diff --git a/Master/bin/i386-netbsd/teckit_compile b/Master/bin/i386-netbsd/teckit_compile
index 1abc46c4953..f08326f9473 100755
--- a/Master/bin/i386-netbsd/teckit_compile
+++ b/Master/bin/i386-netbsd/teckit_compile
diff --git a/Master/bin/i386-netbsd/tex b/Master/bin/i386-netbsd/tex
index f2e241e53d2..c0a9cabd159 100755
--- a/Master/bin/i386-netbsd/tex
+++ b/Master/bin/i386-netbsd/tex
diff --git a/Master/bin/i386-netbsd/tex2xindy b/Master/bin/i386-netbsd/tex2xindy
index 9d149871031..cf7247a53e6 100755
--- a/Master/bin/i386-netbsd/tex2xindy
+++ b/Master/bin/i386-netbsd/tex2xindy
diff --git a/Master/bin/i386-netbsd/tex4ht b/Master/bin/i386-netbsd/tex4ht
index 1aef03cc7ea..bb3c0304c34 100755
--- a/Master/bin/i386-netbsd/tex4ht
+++ b/Master/bin/i386-netbsd/tex4ht
diff --git a/Master/bin/i386-netbsd/tftopl b/Master/bin/i386-netbsd/tftopl
index d161f9938a5..41b65b448c5 100755
--- a/Master/bin/i386-netbsd/tftopl
+++ b/Master/bin/i386-netbsd/tftopl
diff --git a/Master/bin/i386-netbsd/tie b/Master/bin/i386-netbsd/tie
index d2c412da872..61ec58fab43 100755
--- a/Master/bin/i386-netbsd/tie
+++ b/Master/bin/i386-netbsd/tie
diff --git a/Master/bin/i386-netbsd/ttf2afm b/Master/bin/i386-netbsd/ttf2afm
index 5245bf66577..9f83ee09daa 100755
--- a/Master/bin/i386-netbsd/ttf2afm
+++ b/Master/bin/i386-netbsd/ttf2afm
diff --git a/Master/bin/i386-netbsd/ttf2pk b/Master/bin/i386-netbsd/ttf2pk
index 3967640c2b2..5aa5fe92132 100755
--- a/Master/bin/i386-netbsd/ttf2pk
+++ b/Master/bin/i386-netbsd/ttf2pk
diff --git a/Master/bin/i386-netbsd/ttf2tfm b/Master/bin/i386-netbsd/ttf2tfm
index 15aeb418260..3eb17d63a49 100755
--- a/Master/bin/i386-netbsd/ttf2tfm
+++ b/Master/bin/i386-netbsd/ttf2tfm
diff --git a/Master/bin/i386-netbsd/ttfdump b/Master/bin/i386-netbsd/ttfdump
index 004157e60d8..6fb497f70de 100755
--- a/Master/bin/i386-netbsd/ttfdump
+++ b/Master/bin/i386-netbsd/ttfdump
diff --git a/Master/bin/i386-netbsd/ttftotype42 b/Master/bin/i386-netbsd/ttftotype42
index 58cb3f82637..6c5fc99c288 100755
--- a/Master/bin/i386-netbsd/ttftotype42
+++ b/Master/bin/i386-netbsd/ttftotype42
diff --git a/Master/bin/i386-netbsd/updmap b/Master/bin/i386-netbsd/updmap
index 2483052a7de..5eceaae6d41 100755..120000
--- a/Master/bin/i386-netbsd/updmap
+++ b/Master/bin/i386-netbsd/updmap
@@ -1,1435 +1 @@
-#!/bin/sh
-# updmap - utility to maintain map files for outline fonts.
-# Public domain.  Originally written by Thomas Esser. 
-# Run with --help for usage.
-
-###############################################################################
-# program history:
-#   further changes in texk/tetex/ChangeLog.
-#   Sun May 25 21:05:32 CEST 2008 (Reinhard Kotucha)
-#      add function symlink_or_copy needed by tl-portable.
-#   Post-te retirement, now maintained in TeX Live; see
-#     Build/texk/tetex/ChangeLog for further changes.
-#   Fr Jul 22 07:22:38 CEST 2005
-#      write hint about log file into output files
-#   Fr Apr  8 19:15:05 CEST 2005
-#      cleanup now has an argument for the return code
-#   So Mär 27 18:52:06 CEST 2005
-#      honor $TMPDIR, $TEMP and $TMP, not just $TMP
-#   Do Mär 10 19:31:39 CET 2005
-#      add a few quotes for $cnfFile with whitespace
-#   Sa Jan 15 18:13:46 CET 2005
-#      avoid multiple variable assignments in one statement
-#   Sa Dez 25 12:44:23 CET 2004
-#      implementaion adopted for teTeX-3.0 (tcfmgr)
-#   Mi Nov  3 16:33:22 CET 2004
-#      add "--setoption option=value" syntax
-#   Fr Okt 29 21:05:53 CEST 2004
-#      add --enable Map=... / --enable MixedMap=...
-#   Mi Okt 20 19:17:19 CEST 2004
-#      transcript added; even better warnings / error messages
-#   So Okt 17 19:07:17 CEST 2004
-#      improved warnings / error messages
-#      added --syncwithtrees
-#      added --listavailablemaps
-#   Mi Okt  6 16:37:49 CEST 2004
-#      commenty may start with any of *#;%
-#   Sun Aug  1 11:42:14 CEST 2004, te
-#      remove pdftex related hacks; pdftex no longer needs them!
-#   Thu May 13 22:04:23 CEST 2004, te
-#      support user with new map file locations
-#   Fri Mar 19 15:22:55 CET 2004, te
-#      output "xxx yyy" instead of " xxx yyy " (less blanks)
-#   Fri Jan  2 22:41:11 CET 2004, te:
-#      add version string
-#   Wed Aug 20 18:51:47 CEST 2003
-#      store map files to fonts/map, add options for dvipsoutputdir,
-#      pdftexoutputdir, dvipdfmoutputdir
-#   Mon Mar 24 13:40:55 CET 2003
-#      fix fmex[789] for dvipdfm (no -r option)
-#   Sun Mar 23 18:58:00 CET 2003
-#      make the script robust against whitespace in filenames
-#   Mon Jan 27 22:38:44 CET 2003
-#      don't call a function before processOptions; we may loose our
-#      argument list with some broken shells
-#   Mon Jan 27 06:55:28 CET 2003
-#      fix unportable egrep / sed
-#   Sat Jan 18 10:10:26 CET 2003
-#      use $tmp8 in dvips2dvipdfm()
-#   Thu Jan  2 23:14:34 CET 2003
-#      add umask 022, so generated files are always world-readable
-#   Sun Oct 27 11:33:04 CET 2002
-#      write output in normalized format
-#      add support for dvipdfm
-#   Mon Sep 22 19:18:57 CEST 2002
-#      fix typo: buildin -> builtin
-#   Mon Sep  2 19:18:57 CEST 2002
-#      fix condensed <-> narrow mapping
-#   Sun Sep  1 15:02:28 CEST 2002
-#      add dvipsDownloadBase35 / pdftexDownloadBase14 options
-#   Wed May 22 20:00:13 CEST 2002
-#      listmaps option added by Gerben Wierda
-#   Tue May 21 05:27:37 CEST 2002
-#      now removing map files before rewriting them; fixes permission problems
-#   Tue May 21 05:05:34 CEST 2002:
-#      cli options added: showoptions, setoption, enable, disable, nomkmap
-#      now even more verbose; now reporting non-existing map files
-#      fixing trap for MAC OS/X compatibility
-#   Fri May 17 22:38:37 CEST 2002:
-#      rewritten from teTeX-1.0 version; Completely new designed.
-###############################################################################
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-# the version string
-version='$Id: updmap 17423 2010-03-11 17:53:34Z karl $'
-
-# 
-###############################################################################
-# help()
-#   display help message and exit
-###############################################################################
-help()
-{
-  cat <<eof
-$version
-Usage: updmap [OPTION]... [COMMAND]...
-
-Update the default font map files used by pdftex, dvips, and dvipdfm, as
-determined by updmap.cfg (the one returned by running "kpsewhich
-updmap.cfg").
-
-Among other things, these font map files are used to determine which
-fonts should be used as bitmaps and which as outlines, and to determine
-which fonts are included in the output.
-
-By default, the TeX filename database is also rebuilt (with mktexlsr).
-
-Valid options:
-  --cnffile FILE            read FILE for the updmap configuration
-  --pdftexoutputdir DIR     specify output directory (pdftex syntax)
-  --dvipsoutputdir DIR      specify output directory (dvips syntax)
-  --dvipdfmoutputdir DIR    specify output directory (dvipdfm syntax)
-  --outputdir DIR           specify output directory (for all files)
-  --copy                    cp generic files rather than using symlinks
-  --nomkmap                 do not recreate map files
-  --nohash                  do not run texhash
-  -n, --dry-run             only show the configuration, no output
-  --quiet                   reduce verbosity
-
-Valid commands:
-  --help                    show this message
-  --edit                    edit $cnfFileShort file
-  --showoptions ITEM        show alternatives for options
-  --setoption OPTION VALUE  set option, where OPTION is one of:
-                             dvipsPreferOutline LW35 dvipsDownloadBase35
-                             pdftexDownloadBase14 dvipdfmDownloadBase14
-  --setoption OPTION=VALUE  see above, just different syntax
-  --enable MAPTYPE MAPFILE  add "MAPTYPE MAPFILE" to updmap.cfg,
-                              where MAPTYPE is either Map or MixedMap
-  --enable Map=MAPFILE      add "Map MAPFILE" to updmap.cfg
-  --enable MixedMap=MAPFILE add "MixedMap MAPFILE" to updmap.cfg
-  --disable MAPFILE         disable MAPFILE, whether Map or MixedMap
-  --syncwithtrees           entries with unavailable map files will be
-                             disabled in the config file
-  --listmaps                list all active and inactive maps
-  --listavailablemaps       same as --listmaps, but without
-                             unavailable map files
-
-Explanation of the map types: the (only) difference between Map and
-MixedMap is that MixedMap entries are not added to psfonts_pk.map.  The
-purpose is to help users with printers that render Type 1 outline fonts
-worse than mode-tuned Type 1 bitmap fonts.  So MixedMap is used for
-fonts that are available as both Type 1 and Metafont.
-
-To see the precise locations of the various files that will be read and
-written, run updmap -n.
-
-For step-by-step instructions on making new fonts known to TeX, see
-http://tug.org/fonts/fontinstall.html.
-
-Report bugs to: tex-k@tug.org
-TeX Live home page: <http://tug.org/texlive/>
-eof
-  (exit 0); exit
-}
-
-# 
-###############################################################################
-# verboseMsg(msg)
-#   print `msg' to stderr is $verbose is true
-###############################################################################
-verboseMsg() {
-  test -n "$log" && echo ${1+"$@"} >> "$log"
-  $verbose && echo ${1+"$@"} >&2
-}
-
-###############################################################################
-# verboseCat()
-#   cat to stderr is $verbose is true
-###############################################################################
-verboseCat() {
-  if $verbose; then
-    if test -n "$log"; then
-      cat ${1+"$@"} | tee -a "$log" >&2
-    else
-      cat ${1+"$@"} >&2
-    fi
-  else
-    test -n "$log" && cat ${1+"$@"} >> "$log"
-  fi
-}
-
-###############################################################################
-# warn(msg)
-#   print `msg' to stderr
-###############################################################################
-warn()
-{
-  test -n "$log" && echo ${1+"$@"} >> "$log"
-  echo ${1+"$@"} >&2
-}
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{
-  warn "$progname: $1."
-  cleanup 1
-}
-
-###############################################################################
-# cfgval(variable)
-#   read variable ($1) from config file, first match wins
-###############################################################################
-cfgval()
-{
-  cat "$cnfFile" | sed -n 's/^'"$1"'[	 =][	 =]*//p' | sed q
-}
-
-###############################################################################
-# symlink_or_copy()
-#   if --copy is not set, try to create a symlink.  If this fails, write 
-#   a message to stderr and copy the file instead.
-###############################################################################
-symlink_or_copy()
-{
-  if $copy; then
-    $copy_cmd "$1" "$2"
-  else
-    $link_cmd "$1" "$2" ||
-    {
-    echo "Creating symbolic link failed, the file is copied instead." 1>&2 &&
-    $copy_cmd "$1" "$2"
-    }
-  fi
-}
-
-###############################################################################
-# setupSymlinks()
-#   set symlink (or copy)
-#    for psfonts.map according to dvipsPreferOutline variable,
-#    and for pdftex.map and dvipdfm.map according to pdftexDownloadBase14.
-###############################################################################
-setupSymlinks()
-{
-  (
-  cd "$dvipsoutputdir" || exit 1
-  rm -f psfonts.map
-  if test "x$dvipsPreferOutline" = xtrue; then
-    symlink_or_copy psfonts_t1.map psfonts.map
-  else
-    symlink_or_copy psfonts_pk.map psfonts.map
-  fi
-
-  cd "$pdftexoutputdir" || exit 1
-  rm -f pdftex.map
-  if test "x$pdftexDownloadBase14" = xtrue; then
-    symlink_or_copy pdftex_dl14.map pdftex.map
-  else
-    symlink_or_copy pdftex_ndl14.map pdftex.map
-  fi
-
-  cd "$dvipdfmoutputdir" || exit 1
-  rm -f dvipdfm.map
-  if test "x$dvipdfmDownloadBase14" = xtrue; then
-    symlink_or_copy dvipdfm_dl14.map dvipdfm.map
-  else
-    symlink_or_copy dvipdfm_ndl14.map dvipdfm.map
-  fi
-  )
-}
-
-###############################################################################
-# transLW35(args ...)
-#   transform fontname and filenames according to transformation specified
-#   by mode
-###############################################################################
-transLW35()
-{
-  case $mode in
-    ""|URWkb)
-      cat ${1+"$@"}
-      ;;
-    URW)
-      fileURW ${1+"$@"}
-      ;;
-    ADOBE|ADOBEkb)
-      psADOBE ${1+"$@"} | file$mode
-      ;;
-  esac
-}
-
-###############################################################################
-# catMaps(regex)
-#   filter config file by regex for map lines and extract the map filenames.
-#   These are then looked up (by kpsewhich in locateMap) and the content of
-#   all map files is send to stdout.
-###############################################################################
-catMaps()
-{
-  rm -f $catMapsFailed
-  egrep "$1" "$cnfFile" \
-    | sed 's@#.*@@' \
-       | awk '{print $2}' \
-       | sort \
-       | uniq \
-       | grep . > $tmp4
-
-  while read map; do
-    file=`locateMap "$map"` || { touch $catMapsFailed; break; }
-
-    # output the file; also output a newline, because the final newline
-    # might be missing in the map file; Empty lines are filtered out later,
-    # so it does not really hurt do do this here.
-    test -n "$file" && { cat "$file"; echo; }
-  done < $tmp4
-  if test -f $catMapsFailed; then
-    false; return 1
-  else
-    true; return 0
-  fi
-}
-
-###############################################################################
-# configReplace(file, pattern, line)
-#   The first line in file that matches pattern gets replaced by line.
-#   line will be added at the end of the file if pattern does not match.
-###############################################################################
-configReplace()
-{
-  file=$1; pat=$2; line=$3
-
-  if grep "$pat" "$file" >/dev/null; then
-    ed "$file" >/dev/null 2>&1 <<-eof
-	/$pat/
-	c
-	$line
-	.
-	w
-	q
-eof
-  else
-    echo "$line" >> "$file"
-  fi
-}
-
-###############################################################################
-# setOption (option, value)
-#   sets option to value in the config file (replacing the existing setting
-#   or by adding a new line to the config file).
-###############################################################################
-setOption()
-{
-  opt=$1
-  val=$2
-  case "$opt" in
-    LW35)
-      case "$val" in
-        URWkb|URW|ADOBE|ADOBEkb)
-          ;;
-        *)
-          abort "invalid value $val for option $opt"
-          ;;
-      esac
-      ;;
-    dvipsPreferOutline|dvipsDownloadBase35|pdftexDownloadBase14|dvipdfmDownloadBase14)
-      case "$val" in
-        true|false)
-          ;;
-        *)
-          abort "invalid value $val for option $opt"
-      esac
-      ;;
-    *)
-      abort "unsupported option $opt"
-      ;;
-  esac
-
-  configReplace "$cnfFile" "^$opt[ 	]" "$opt $val"
-}
-
-###############################################################################
-# enableMap (type, map)
-#   enables an entry in the config file for map with a given type.
-###############################################################################
-enableMap()
-{
-  case $1 in
-    Map|MixedMap)
-      ;;
-    *)
-      abort "invalid mapType $1"
-      ;;
-  esac
-
-  # a map can only have one type, so we carefully disable everything
-  # about map here:
-  disableMap "$2"
-
-  # now enable with the right type:
-  configReplace "$cnfFile" "^#![ 	]*$1[ 	]*$2" "$1 $2"
-}
-
-###############################################################################
-# disableMap (map)
-#   disables map in config file (any type)
-###############################################################################
-disableMap()
-{
-  #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-  #           map=$1 <"$cnfFile" | sort | uniq`
-  map=$1
-  mapType=`egrep "^(MixedMap|Map)[ 	]*$map( |	|$)" "$cnfFile" | awk '{print $1}' | sort | uniq`
-  for type in $mapType; do
-    configReplace "$cnfFile" "^$type[ 	]*$1" "#! $type $1"
-  done
-}
-
-###############################################################################
-# psADOBE()
-#   transform fontnames from URW to Adobe
-###############################################################################
-psADOBE()
-{
-  sed \
-    -e 's/ URWGothicL-Demi / AvantGarde-Demi /' \
-    -e 's/ URWGothicL-DemiObli / AvantGarde-DemiOblique /' \
-    -e 's/ URWGothicL-Book / AvantGarde-Book /' \
-    -e 's/ URWGothicL-BookObli / AvantGarde-BookOblique /' \
-    -e 's/ URWBookmanL-DemiBold / Bookman-Demi /' \
-    -e 's/ URWBookmanL-DemiBoldItal / Bookman-DemiItalic /' \
-    -e 's/ URWBookmanL-Ligh / Bookman-Light /' \
-    -e 's/ URWBookmanL-LighItal / Bookman-LightItalic /' \
-    -e 's/ NimbusMonL-Bold / Courier-Bold /' \
-    -e 's/ NimbusMonL-BoldObli / Courier-BoldOblique /' \
-    -e 's/ NimbusMonL-Regu / Courier /' \
-    -e 's/ NimbusMonL-ReguObli / Courier-Oblique /' \
-    -e 's/ NimbusSanL-Bold / Helvetica-Bold /' \
-    -e 's/ NimbusSanL-BoldCond / Helvetica-Narrow-Bold /' \
-    -e 's/ NimbusSanL-BoldItal / Helvetica-BoldOblique /' \
-    -e 's/ NimbusSanL-BoldCondItal / Helvetica-Narrow-BoldOblique /' \
-    -e 's/ NimbusSanL-Regu / Helvetica /' \
-    -e 's/ NimbusSanL-ReguCond / Helvetica-Narrow /' \
-    -e 's/ NimbusSanL-ReguItal / Helvetica-Oblique /' \
-    -e 's/ NimbusSanL-ReguCondItal / Helvetica-Narrow-Oblique /' \
-    -e 's/ CenturySchL-Bold / NewCenturySchlbk-Bold /' \
-    -e 's/ CenturySchL-BoldItal / NewCenturySchlbk-BoldItalic /' \
-    -e 's/ CenturySchL-Roma / NewCenturySchlbk-Roman /' \
-    -e 's/ CenturySchL-Ital / NewCenturySchlbk-Italic /' \
-    -e 's/ URWPalladioL-Bold / Palatino-Bold /' \
-    -e 's/ URWPalladioL-BoldItal / Palatino-BoldItalic /' \
-    -e 's/ URWPalladioL-Roma / Palatino-Roman /' \
-    -e 's/ URWPalladioL-Ital / Palatino-Italic /' \
-    -e 's/ StandardSymL / Symbol /' \
-    -e 's/ NimbusRomNo9L-Medi / Times-Bold /' \
-    -e 's/ NimbusRomNo9L-MediItal / Times-BoldItalic /' \
-    -e 's/ NimbusRomNo9L-Regu / Times-Roman /' \
-    -e 's/ NimbusRomNo9L-ReguItal / Times-Italic /' \
-    -e 's/ URWChanceryL-MediItal / ZapfChancery-MediumItalic /' \
-    -e 's/ Dingbats / ZapfDingbats /' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileADOBEkb()
-#   transform filenames from URW to ADOBE (both berry names)
-###############################################################################
-fileADOBEkb()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1pagd8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1pagdo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1pagk8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1pagko8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1pbkd8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1pbkdi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1pbkl8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1pbkli8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1pcrb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1pcrbo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1pcrr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1pcrro8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1phvb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1phvb8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1phvbo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1phvbo8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1phvr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1phvr8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1phvro8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1phvro8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1pncb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1pncbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1pncr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1pncri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pplb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pplbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1pplr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1pplri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1psyr.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1ptmb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1ptmbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1ptmr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1ptmri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1pzcmi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1pzdr.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileURW()
-#   transform filenames from URWkb (berry names) to URW (vendor names)
-###############################################################################
-fileURW()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1a010015l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1a010035l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1a010013l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1a010033l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1b018015l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1b018035l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1b018012l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1b018032l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1n022004l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1n022024l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1n022003l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1n022023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1n019004l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1n019044l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1n019024l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1n019064l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1n019003l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1n019043l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1n019023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1n019063l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1c059016l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1c059036l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1c059013l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1c059033l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1p052004l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1p052024l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1p052003l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1p052023l.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1s050000l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1n021004l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1n021024l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1n021003l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1n021023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1z003034l.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1d050000l.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileADOBE()
-#   transform filenames from URWkb (berry names) to ADOBE (vendor names)
-###############################################################################
-fileADOBE()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1agd_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1agdo____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1agw_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1agwo____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1bkd_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1bkdi____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1bkl_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1bkli____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1cob_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1cobo____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1com_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1coo_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1hvb_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1hvnb____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1hvbo____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1hvnbo___.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1hv______.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1hvn_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1hvo_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1hvno____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1ncb_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1ncbi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1ncr_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1nci_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pob_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pobi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1por_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1poi_____.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1sy______.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1tib_____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1tibi____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1tir_____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1tii_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1zcmi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1zd______.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# locateWeb2c (file ...)
-#   apply kpsewhich with format 'web2c files'
-###############################################################################
-locateWeb2c()
-{
-  kpsewhich --format='web2c files' ${1+"$@"}
-}
-
-###############################################################################
-# locateMap (file ...)
-#   apply kpsewhich with format 'map'
-###############################################################################
-locateMap()
-{
-
-  # Always use the "migration checking version". This might become
-  # consigurable, but for now, we always want to check.
-  if :; then
-    locateMapMigrate "$@"
-    return $?
-  fi
-
-  # The old version of the code; not used at the moment.
-  for map
-  do
-    file=`kpsewhich --format=map "$map"`
-    if test -f "$file"; then
-      verboseMsg "$progname: using map file \`$file'"
-      echo "$file"
-    else
-      warn "map file \`$map' not found."
-    fi
-  done
-}
-
-###############################################################################
-# locateMapMigrate (file ...)
-#   look for map file; assist user with possibly files in wrong locations;
-#   also watch out for possibly hidden conflicts
-###############################################################################
-locateMapMigrate()
-{
-  for map
-  do
-    # look up using the new search path
-    file=`kpsewhich --format=map "$map"`
-
-    # look up using the old search path
-    file2=`kpsewhich --format='dvips config' "$map"`
-
-    # Well, the search paths should not overlap. If they do, and if
-    # file1 = file2, we don't want to complain about file2, so:
-    test "x$file" = "x$file2" && file2=
-
-    if test -f "$file"; then
-
-      verboseMsg "$progname: using map file \`$file'"
-      echo "$file"
-
-      # we have found the file where we should. If we have additional
-      # ones: complain!
-      if test -f "$file2"; then
-        mapCmp "$file" "$file2" \
-          && mapWarn obsoleteCopy "$map" "$file2" \
-          || mapWarn manualResolve "$map" "$file" "$file2"
-      fi
-
-    else
-      if test -f "$file2"; then
-        # bad: map file exists in the wrong location only
-        mapWarn badLocation "$map" "$file2"
-      else
-        # bad: map file does not exist at all
-        mapWarn notFound "$map"
-      fi
-      false; return 1
-    fi
-  done
-  true; return 0
-}
-
-###############################################################################
-# mapCmp(file, file2)
-#   compare two map files like cmp; but less strict, so changes regarding
-#   whitespaces, comments etc. are tolerated. Important is only the
-#   return value here.
-###############################################################################
-mapCmp()
-{
-  file=$1; file2=$2
-
-  # For reasons of speed only. Avoid normalizeLines if files are 100%
-  # the same.
-  cmp "$file" "$file2" >/dev/null 2>&1 && return 0
-
-  normalizeLines <"$file" >"$tmpdir/mapCmp-1"
-  normalizeLines <"$file2" >"$tmpdir/mapCmp-2"
-  cmp "$tmpdir/mapCmp-1" "$tmpdir/mapCmp-2" >/dev/null 2>&1
-}
-
-###############################################################################
-# mapWarn()
-###############################################################################
-mapWarn()
-{
-
-  case $1 in
-  obsoleteCopy)
-    warn "
-!!! WARNING: Identical copy of used file for \`$2'
-    exists in obsolete location
-      $3
-    Please, consider removing this file.
-"
-    touch $mapWarnCalled
-    ;;
-  manualResolve)
-    warn "
-!!! WARNING: While searching for the right map file for \`$2', we have
-    found the file
-      $3
-    in the right location and we are using this
-    file. However, a map file with different content has been found in
-    the obsolete location
-      $4
-    Please, see which version you want to use and eventually update the
-    content of the used map file. Additionally, consider removing the
-    obsolete file.
-"
-    touch $mapWarnCalled
-    ;;
-  badLocation)
-    map=$2
-    location=$3
-
-    m="
-!!! ERROR: The right location for map files has been
-    changed for this release and the map file \`$map' has
-    not been found in the right location, but in the obsolete
-    location
-      $location
-    instead.
-
-    To fix this, please move this file into an appropriate
-    subdirectory of fonts/map in one of your texmf trees.
-
-    For more information about the changed search paths, see
-    the release notes section in the teTeX manual. You probably
-    can read this document by executing the command
-      texdoc TETEXDOC
-    else visit the web page
-      http://tug.org/texlive/mapenc.html
-"
-    warn "$m"
-    false; return 1
-    ;;
-  notFound)
-    warn "
-!!! ERROR! The map file \`$2' has not been found at all.
-
-    Either put this file into the right place or remove the
-    reference from the configuration file. An automatic way
-    to disable unavailable map files is to call
-      $progname --syncwithtrees
-
-    For manual editing, call
-      $progname --edit
-"
-
-    false; return 1
-    ;;
-  esac
-}
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$1
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd $orig_pwd && rm -rf "$tmpdir"; }
-  (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# showOptions(item)
-#   show Options for an item
-###############################################################################
-showOptions()
-{
-  item=$1
-
-  case "$item" in
-    LW35)
-      echo "URWkb URW ADOBE ADOBEkb"
-      ;;
-    dvipsPreferOutline|pdftexDownloadBase14|dvipdfmDownloadBase14|dvipsDownloadBase35)
-      echo "true false"
-      ;;
-    *)
-      abort "Unknown item \"$item\". Choose one of LW35, dvipsPreferOutline, dvipsDownloadBase35, pdftexDownloadBase14 or dvipdfmDownloadBase14"
-      ;;
-  esac
-
-  (exit 0); exit 0
-}
-
-###############################################################################
-# mktexdir(args)
-#   call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
-mktexdir()
-{
-  MT_FEATURES=none "$TEXMFMAIN/web2c/mktexdir" "$@" >&2
-}
-
-###############################################################################
-# setupDestDir()
-#   Assign output directories which are not yet assigned. Always use
-#   the TEXMFVAR for this.
-###############################################################################
-setupDestDir()
-{
-  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-
-  # dvips
-  if test -z "$dvipsoutputdir"; then
-    dvipsoutputdir=$vartexmf/fonts/map/dvips/updmap
-  fi
-
-  # pdftex
-  if test -z "$pdftexoutputdir"; then
-    pdftexoutputdir=$vartexmf/fonts/map/pdftex/updmap
-  fi
-
-  # dvipdfm
-  if test -z "$dvipdfmoutputdir"; then
-    dvipdfmoutputdir=$vartexmf/fonts/map/dvipdfm/updmap
-  fi
-
-  mktexdir "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir" >/dev/null 2>&1
-  for d in "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir"; do
-    test -d "$d" || abort "output directory \`$d' does not exist"
-    test -w "$d" || abort "output directory \`$d' is not writable"
-  done
-
-}
-
-###############################################################################
-# setupLog(cfgFile)
-#   try to set up a log file in $TEXMFVAR/web2c
-###############################################################################
-setupLog()
-{
-  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-  dir=$vartexmf/web2c
-  mktexdir "$dir" >/dev/null 2>&1
-  log="$dir/$progname.log"
-  if test -d "$dir" && test -w "$dir"; then
-    rm -f "$log"
-    > "$log"
-  fi
-  if test -w "$log"; then
-    if $chicken_mode; then
-      log=
-    else
-      date > "$log"
-      verboseMsg "$progname: This is $progname, version $version"
-      verboseMsg "$progname: using transcript file \`$log'"
-    fi
-  else
-    log=
-    verboseMsg "$progname: This is $progname, version $version"
-    verboseMsg "$progname: no permissions for writing $dir/$progname.log', so no transcript"
-  fi
-}
-
-###############################################################################
-# setupCfgFile()
-#   find config file if none specified on cmd line.
-###############################################################################
-setupCfgFile()
-{
-  case "$cnfFile" in
-    "") cnfFile=`locateWeb2c $cnfFileShort`
-        case "$cnfFile" in
-          "") abort "config file $cnfFileShort not found (ls-R missing?)"
-        esac;;
-  esac
-  setupLog
-}
-
-###############################################################################
-# processOptions()
-#   process cmd line options
-###############################################################################
-processOptions()
-{
-  while
-    case $1 in
-      --quiet|-q)
-          verbose=false;;
-      --cnffile)
-          cfgparam=1; cnfFile=$2; shift;;
-      --cnffile=*)
-          cfgparam=1; cnfFile=`echo "$1" | sed 's/--cnffile=//'`;;
-      --copy)
-          copy=true;;
-      --dry-run|-n)
-          chicken_mode=true;;
-      --dvipsoutputdir)
-          dvipsoutputdirparam=1; dvipsoutputdir=$2; shift;;
-      --dvipsoutputdir=*)
-          dvipsoutputdirparam=1; dvipsoutputdir=`echo "$1" | sed 's/--dvipsoutputdir=//'`;;
-      --pdftexoutputdir)
-          pdftexoutputdirparam=1; pdftexoutputdir=$2; shift;;
-      --pdftexoutputdir=*)
-          pdftexoutputdirparam=1; pdftexoutputdir=`echo "$1" | sed 's/--pdftexoutputdir=//'`;;
-      --dvipdfmoutputdir)
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2; shift;;
-      --dvipdfmoutputdir=*)
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=`echo "$1" | sed 's/--dvipdfmoutputdir=//'`;;
-      --outputdir)
-          dvipsoutputdirparam=1; dvipsoutputdir=$2
-          pdftexoutputdirparam=1; pdftexoutputdir=$2
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2
-          shift
-          ;;
-      --outputdir=*)
-          outputdir=`echo "$1" | sed 's/--outputdir=//'`
-          dvipsoutputdirparam=1; dvipsoutputdir=$outputdir
-          pdftexoutputdirparam=1; pdftexoutputdir=$outputdir
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$outputdir
-          ;;
-      --setoption)
-          cfgmaint=1
-          cmd=setoption
-          case $2 in
-            *=*)
-              setoptionOpt=`echo $2 | sed 's@=.*@@'`
-              setoptionVal=`echo $2 | sed 's@[^=]*=@@'`
-              shift
-            ;;
-            *)
-              test $# -ge 3 || { abort "--setoption needs two parameters: option value"; }
-              setoptionOpt=$2; setoptionVal=$3; shift; shift
-            ;;
-          esac
-          ;;
-      --enable)
-          cfgmaint=1
-          cmd=enable
-          case $2 in 
-            Map=*)
-              enableMapType=Map; enableMapFile=`echo "$2" | sed 's/Map=//'`; shift;;
-            MixedMap=*)
-              enableMapType=MixedMap; enableMapFile=`echo "$2" | sed 's/MixedMap=//'`; shift;;
-            Map|MixedMap)
-              test $# -ge 3 || { abort "--enable needs two parameters: mapType mapFile"; }
-              enableMapType=$2; enableMapFile=$3; shift; shift;;
-            *)
-              abort "--enable needs two parameters mapType mapFile";;
-          esac
-          ;;
-      --syncwithtrees)
-          cfgmaint=1
-          cmd=syncwithtrees;;
-      --disable)
-          cfgmaint=1
-          cmd=disable; disableMapFile=$2; shift
-          ;;
-      --disable=*)
-          cfgmaint=1
-          disableMapFile=`echo "$1" | sed 's/--disable=//'`
-          cmd=disable
-          ;;
-      --edit|-e)
-          cfgmaint=1
-          cmd=edit;;
-      --listmaps|-l)
-          cmd=listmaps;;
-      --listavailablemaps)
-          cmd=listavailablemaps;;
-      --showoptions)
-          cmd=showoptions; showoptionsItem=$2; shift;;
-      --showoptions=*)
-          cmd=showoptions; showoptionsItem=`echo "$1" | sed 's/--showoptions=//'`;;
-     
-      --nohash)
-          texhashEnabled=false;;
-      --nomkmap)
-          mkmapEnabled=false;;
-      --help|-help|-h)
-          help;;
-      --version)
-          echo "$progname version $version"; (exit 0); exit 0;;
-      "") break;;
-      *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
-    esac
-  do test $# -gt 0 && shift; done
-
-  if test -n "$cfgparam"; then
-    if test -z "$cnfFile" || test ! -f "$cnfFile"; then
-      abort "config file \`$cnfFileShort' not found"
-    fi
-  fi
-
-  if test -n "$dvipdoutputdirparam"; then
-    if test -z "$dvipdoutputdir" || test ! -d "$dvipdoutputdir"; then
-      abort "dvips output directory \`$1' not found"
-    fi
-  fi
-  if test -n "$pdftexoutputdirparam"; then
-    if test -z "$pdftexoutputdir" || test ! -d "$pdftexoutputdir"; then
-      abort "pdftex output directory \`$1' not found"
-    fi
-  fi
-  if test -n "$dvipdfmoutputdirparam"; then
-    if test -z "$dvipdfmoutputdir" || test ! -d "$dvipdfmoutputdir"; then
-      abort "dvipdfm output directory \`$1' not found"
-    fi
-  fi
-
-}
-
-###############################################################################
-# listMaps()
-#   list all maps mentioned in the config file
-###############################################################################
-listMaps()
-{
-  egrep '^(#! *)?(Mixed)?Map' "$cnfFile"
-}
-
-###############################################################################
-# listAvailableMaps()
-#   list maps mentioned in the config file if they are available
-###############################################################################
-listAvailableMaps()
-{
-  # loop over each possible line in the config file (-> $line)
-  # extract the name of the map file (-> $m)
-  # check if the map file exists and in that case echo the line
-  OLDIFS=$IFS
-  IFS='
-'
-  for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do
-    m=`echo "$line" | sed 's@[ 	]*$@@; s@.*[ 	]@@'`
-    kpsewhich --format=map "$m" >/dev/null && echo "$line"
-  done
-  IFS=$OLDIFS
-}
-
-###############################################################################
-# syncWithTrees()
-#   update the config file: uncomment all lines which refer to map files that
-#   are unavailabe in the texmf trees
-###############################################################################
-syncWithTrees()
-{
-  for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do
-    kpsewhich --format=map "$i" >/dev/null || echo "$i"
-  done > $tmp1
-  {
-    sed 's@/@\\/@g; s@^@/^MixedMap[ 	]*@; s@$@$/s/^/#! /@' <$tmp1
-    sed 's@/@\\/@g; s@^@/^Map[ 	]*@; s@$@$/s/^/#! /@' <$tmp1
-  } > $tmp2
-  sed -f $tmp2 "$cnfFile" > $tmp3 && cat $tmp3 > "$cnfFile"
-}
-
-###############################################################################
-# normalizeLines()
-#   remove comments, whitespace is exactly one space, no empty lines,
-#   no whitespace at end of line, one space before and after ",
-#   no CR's (as in skaknew).
-###############################################################################
-normalizeLines()
-{
-  sed \
-      -e '/^[*#;%]/d' \
-      -e 's@[ 	][ 	]*@ @g' \
-      -e '/^ *$/d' \
-      -e 's@ $@@' \
-      -e 's@ *" *@ " @g' \
-      -e 's@" \([^"]*\) "@"\1"@g' \
-   | tr -d '\r' \
-   | sort | uniq
-}
-
-###############################################################################
-# dvips2dvipdfm()
-#   reads from stdin, writes to stdout. It transforms "dvips"-like syntax into
-#   "dvipdfm"-like syntax. It is a very ugly hack.
-###############################################################################
-dvips2dvipdfm()
-{
-  sed -e 's@$@ %@' \
-      -e 's@^\(\([^ ]*\).*\)@\1\2@' \
-      -e 's@\(.*<\[* *\([^ ]*\)\.enc\(.*\)\)@\1 \2@' \
-      -e '/%[^ ]*$/s@$@ default@' \
-      -e 's@\(.*<<* *\([^ ]*\)\.pf[ab].*\)@\1 \2@' \
-      -e '/%[^ ]* [^ ]*$/s@\( \([^ ]*\).*\)$@\1 \2@' \
-      -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *ExtendFont.*\)@\1 -e \2@' \
-      -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *SlantFont.*\)@\1 -s \2@' \
-      -e 's@.*%@@' |
-  awk '$1 == $3 && $2 == "default" {$2=""; $3=""} {print}' > $tmp8
-
-  egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 \
-    | sed 's@$@ -r@; s@\(fmex[789]\) -r$@\1@'
-  egrep -v '^(cm|eu|la|lc|line|msam|xy)' $tmp8
-}
-
-
-###############################################################################
-# mkMaps()
-#   the main task of this script: create the output files
-###############################################################################
-mkMaps()
-{
-  newline='
-'
-  mode=`cfgval LW35`
-  dvipsPreferOutline=`cfgval dvipsPreferOutline`
-  dvipsDownloadBase35=`cfgval dvipsDownloadBase35`
-  pdftexDownloadBase14=`cfgval pdftexDownloadBase14`
-  dvipdfmDownloadBase14=`cfgval dvipdfmDownloadBase14`
-
-  # defaults
-  test -z "$mode" && mode=URWkb
-  test -z "$dvipsPreferOutline" && dvipsPreferOutline=true
-  test -z "$dvipsDownloadBase35" && dvipsDownloadBase35=false
-  test -z "$pdftexDownloadBase14" && pdftexDownloadBase14=false
-  test -z "$dvipdfmDownloadBase14" && dvipdfmDownloadBase14=false
-
-  outputFiles="$dvipsoutputdir/download35.map
-$dvipsoutputdir/builtin35.map
-$dvipsoutputdir/psfonts_t1.map
-$dvipsoutputdir/psfonts_pk.map
-$pdftexoutputdir/pdftex_dl14.map
-$pdftexoutputdir/pdftex_ndl14.map
-$dvipdfmoutputdir/dvipdfm_dl14.map
-$dvipdfmoutputdir/dvipdfm_ndl14.map
-$dvipsoutputdir/ps2pk.map"
-
-  outputLinks="$dvipsoutputdir/psfonts.map
-$pdftexoutputdir/pdftex.map
-$dvipdfmoutputdir/dvipdfm.map"
-
-  allOutput="$outputFiles
-$outputLinks"
-
-  notfound=false
-  OLDIFS=$IFS; IFS=$newline
-  for o in $allOutput; do
-    test -f "$o" || notfound=true
-  done
-  IFS=$OLDIFS
-  $notfound || texhashEnabled=false
-
-  verboseCat <<-eof
-	updmap is creating new map files using the following configuration:
-
-	  config file: \`$cnfFile'
-	  dvips output directory: \`$dvipsoutputdir'
-	  pdftex output directory: \`$pdftexoutputdir'
-	  dvipdfm output directory: \`$dvipdfmoutputdir'
-
-	  prefer outlines: \`$dvipsPreferOutline'
-	  texhash enabled: \`$texhashEnabled'
-	  download standard fonts (dvips): \`$dvipsDownloadBase35'
-	  download standard fonts (pdftex): \`$pdftexDownloadBase14'
-	  download standard fonts (dvipdfm): \`$dvipdfmDownloadBase14'
-eof
-
-  verboseMsg
-  verboseMsg "$progname: scanning for LW35 support files"
-  dvips35=`locateMap dvips35.map` || cleanup 1
-  pdftex35=`locateMap pdftex35.map` || cleanup 1
-  dvipdfm35=`locateMap dvipdfm35.map` || cleanup 1
-  ps2pk35=`locateMap ps2pk35.map` || cleanup 1
-
-  if $chicken_mode; then
-    echo
-    echo "$progname: chicken mode, skipping all output generation, goodbye."
-    exit 0
-  fi
-  
-  verboseMsg
-  verboseMsg "$progname: Scanning for MixedMap entries:"
-  catMaps '^MixedMap' > $tmp1 || cleanup 1
-
-  verboseMsg
-  verboseMsg "$progname: Scanning for Map entries:"
-  catMaps '^Map' > $tmp2 || cleanup 1
-  verboseMsg
-
-  # files should be world-readable
-  umask 022
-
-  OLDIFS=$IFS; IFS=$newline
-  for file in $allOutput; do
-    rm -f "$file"
-    cat > "$file" <<-eof
-	% $file: maintained by the script updmap.
-	%   Don't change this file directly. Edit texmf/web2c/$cnfFileShort
-	%   and run updmap to recreate this file.
-eof
-    if test -n "$log"; then
-    cat >> "$file" <<-eof
-	% A log of the updmap run that has created this file is available here:
-	%   $log
-eof
-    fi
-  done
-  IFS=$OLDIFS
-
-  verboseMsg "$progname: Generating output for ps2pk..."
-  { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/ps2pk.map"
-
-  verboseMsg "$progname: Generating output for dvips..."
-  { transLW35 "$ps2pk35"; } \
-    | normalizeLines >> "$dvipsoutputdir/download35.map"
-  { transLW35 "$dvips35"; } \
-    | normalizeLines >> "$dvipsoutputdir/builtin35.map"
-
-  if test "x$dvipsDownloadBase35" = xtrue; then
-    dftdvips=$ps2pk35
-  else
-    dftdvips=$dvips35
-  fi
-  { transLW35 "$dftdvips"; cat $tmp1 $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/psfonts_t1.map"
-  { transLW35 "$dftdvips"; cat $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/psfonts_pk.map"
-
-  verboseMsg "$progname: Generating output for pdftex..."
-  # remove PaintType due to Sebastian's request
-  { transLW35 "$pdftex35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp3
-  { transLW35 "$dvipdfm35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp6
-  { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp7
-
-  <$tmp3 normalizeLines >> "$pdftexoutputdir/pdftex_ndl14.map"
-  <$tmp7 normalizeLines >> "$pdftexoutputdir/pdftex_dl14.map"
-
-  verboseMsg "$progname: Generating output for dvipdfm..."
-  <$tmp7 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_dl14.map"
-  <$tmp6 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_ndl14.map"
-  verboseMsg "$progname: All output generated."
-  verboseMsg
-
-  setupSymlinks
-  $texhashEnabled && { $verbose && texhash || texhash >/dev/null 2>&1; }
-
-  verboseMsg
-  verboseMsg "$progname: Files generated:"
-  OLDIFS=$IFS; IFS=$newline
-  ls -l $outputFiles | verboseCat
-  IFS=$OLDIFS
-  verboseMsg
-
-  verboseMsg "$progname: Map file links or copies:"
-  ls -l "$dvipsoutputdir"/psfonts.map \
-         "$pdftexoutputdir"/pdftex.map \
-         "$dvipdfmoutputdir"/dvipdfm.map | verboseCat
-
-  if test -f $mapWarnCalled; then
-    m="
-
-!!! NOTICE:
-
-    With this release, the search paths for map files have been changed
-    and we have found that some files exist in the new path as well as
-    in the obsolete path.
-
-    This is not an error per se, but please consider removing duplicates
-    from the old location and search the above output"
-
-    test -n "$log" && m="$m or the transcript file
-      $log
-   "
-
-    m="$m for warnings.
-
-    For more information about the changed search paths, see
-    the release notes section in the teTeX manual. You probably
-    can read this document by executing the command
-      texdoc TETEXDOC
-    else visit the web page
-      http://tug.org/texlive/mapenc.html
-"
-    warn "$m"
-  fi
-
-  verboseMsg
-  verboseMsg "$progname: Done."
-  return 0
-}
-
-###############################################################################
-# main()
-#   execution starts here
-###############################################################################
-main()
-{
-  # initialize global variables
-  progname=updmap
-  cmd=
-  log=
-  chicken_mode=false
-  link_cmd="ln -s"
-  copy_cmd="cp"
-  copy=false
-  orig_pwd=`pwd`
-
-  cfgparam=
-  outputdirparam=
-  cfgmaint=
-  texhashEnabled=true
-  mkmapEnabled=true
-  verbose=true
-  needsCleanup=false
-
-  cnfFileShort=updmap.cfg
-  cnfFile=
-  dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir=
-  : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
-
-  tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-  tmp1=$tmpdir/a
-  tmp2=$tmpdir/b
-  tmp3=$tmpdir/c
-  tmp4=$tmpdir/d
-  tmp5=$tmpdir/e
-  tmp6=$tmpdir/f
-  tmp7=$tmpdir/g
-  tmp8=$tmpdir/h
-  mapWarnCalled=$tmpdir/mapWarnCalled
-  catMapsFailed=$tmpdir/catMapsFailed
-
-  processOptions ${1+"$@"}
-
-  case "$cmd" in
-    showoptions) showOptions "$showoptionsItem"; (exit 0); exit;;
-    help)        help; (exit 0); exit;;
-  esac
-
-  setupCfgFile
-  case "$cmd" in
-    listmaps) listMaps; (exit 0); exit;;
-    listavailablemaps) listAvailableMaps; (exit 0); exit;;
-  esac
-
-  # keep a copy of config file, so that we can see if the file was modified
-  setupTmpDir
-
-  if test -n "$cfgmaint"; then
-    if test -z "$cfgparam"; then
-      co=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd co --file $cnfFileShort`
-      test $? = 0 || cleanup 1
-      set x $co; shift
-      id=$1; cnfFile=$3; orig=$4
-      verboseMsg "$progname: initial config file is \`$orig'"
-    else
-      verboseMsg "$progname: config file is \`$cnfFile'"
-      cp "$cnfFile" $tmp5
-    fi
-
-    case "$cmd" in
-      edit)
-        ${VISUAL-${EDITOR-vi}} "$cnfFile";;
-      setoption)
-        setOption "$setoptionOpt" "$setoptionVal";;
-      enable)
-        enableMap "$enableMapType" "$enableMapFile";;
-      disable)
-        disableMap "$disableMapFile";;
-      syncwithtrees)
-        syncWithTrees;;
-    esac
-
-    unchanged=true
-    if test -z "$cfgparam"; then
-      ci=`"$TEXMFMAIN/texconfig/tcfmgr" --tmp $tmpdir --cmd ci --id $id`
-      test $? = 0 || cleanup 1
-      case "$ci" in
-        "") : ;;
-        *) unchanged=false
-           cnfFile=$ci
-           ;;
-      esac
-    else
-      cmp "$cnfFile" $tmp5 >/dev/null 2>&1 || unchanged=false
-    fi
-    case $unchanged in
-      true) if $mkmapEnabled; then
-              verboseMsg "$progname: configuration (updmap.cfg) unchanged. Map files will not be recreated."
-              mkmapEnabled=false
-            else
-              verboseMsg "$progname: configuration (updmap.cfg) unchanged."
-            fi;;
-      *)
-           verboseMsg "$progname: configuration file updated: \`$cnfFile'";;
-    esac
-  fi
-
-  $mkmapEnabled || return
-  setupDestDir
-  mkMaps
-}
-
-main ${1+"$@"}
-cleanup 0
+../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/updmap-sys b/Master/bin/i386-netbsd/updmap-sys
index 6f3c8365658..87523fb08ed 100755..120000
--- a/Master/bin/i386-netbsd/updmap-sys
+++ b/Master/bin/i386-netbsd/updmap-sys
@@ -1,30 +1 @@
-#!/bin/sh
-
-# updmap-sys: Thomas Esser, public domain.
-
-# wrapper script for updmap with TEXMFVAR and TEXMFCONFIG set to
-#   TEXMFSYSVAR / TEXMFSYSCONFIG
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-
-exec updmap ${1+"$@"}
+../../texmf/scripts/tetex/updmap-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/vftovp b/Master/bin/i386-netbsd/vftovp
index eb40adba058..7f84c8d53aa 100755
--- a/Master/bin/i386-netbsd/vftovp
+++ b/Master/bin/i386-netbsd/vftovp
diff --git a/Master/bin/i386-netbsd/vlna b/Master/bin/i386-netbsd/vlna
index cd2f662ce6a..4f7eeb194a5 100755
--- a/Master/bin/i386-netbsd/vlna
+++ b/Master/bin/i386-netbsd/vlna
diff --git a/Master/bin/i386-netbsd/vptovf b/Master/bin/i386-netbsd/vptovf
index a754451528b..0f81c9befe8 100755
--- a/Master/bin/i386-netbsd/vptovf
+++ b/Master/bin/i386-netbsd/vptovf
diff --git a/Master/bin/i386-netbsd/weave b/Master/bin/i386-netbsd/weave
index f9216439a96..ef9e09cf16f 100755
--- a/Master/bin/i386-netbsd/weave
+++ b/Master/bin/i386-netbsd/weave
diff --git a/Master/bin/i386-netbsd/xdvi-xaw b/Master/bin/i386-netbsd/xdvi-xaw
index fd6b3379ef0..820f0c34f2a 100755
--- a/Master/bin/i386-netbsd/xdvi-xaw
+++ b/Master/bin/i386-netbsd/xdvi-xaw
diff --git a/Master/bin/i386-netbsd/xdvipdfmx b/Master/bin/i386-netbsd/xdvipdfmx
index 723a5ea7599..eda156aff47 100755
--- a/Master/bin/i386-netbsd/xdvipdfmx
+++ b/Master/bin/i386-netbsd/xdvipdfmx
diff --git a/Master/bin/i386-netbsd/xetex b/Master/bin/i386-netbsd/xetex
index be0696267e0..2faa8930511 100755
--- a/Master/bin/i386-netbsd/xetex
+++ b/Master/bin/i386-netbsd/xetex
diff --git a/Master/bin/i386-netbsd/xindy.mem b/Master/bin/i386-netbsd/xindy.mem
index 807b40b657c..e13c8891e1d 100755
--- a/Master/bin/i386-netbsd/xindy.mem
+++ b/Master/bin/i386-netbsd/xindy.mem
diff --git a/Master/bin/i386-netbsd/xindy.run b/Master/bin/i386-netbsd/xindy.run
index ae207ea8ab6..8c12ed2df82 100755
--- a/Master/bin/i386-netbsd/xindy.run
+++ b/Master/bin/i386-netbsd/xindy.run