221 files changed, 26 insertions, 18 deletions

diff --git a/Master/bin/universal-darwin/T1Wrap b/Master/bin/universal-darwin/T1Wrap
index a501b6d065e..7f619e383a1 100755
--- a/Master/bin/universal-darwin/T1Wrap
+++ b/Master/bin/universal-darwin/T1Wrap
diff --git a/Master/bin/universal-darwin/afm2pl b/Master/bin/universal-darwin/afm2pl
index c78c7c5c52c..7bdf8ec6004 100755
--- a/Master/bin/universal-darwin/afm2pl
+++ b/Master/bin/universal-darwin/afm2pl
diff --git a/Master/bin/universal-darwin/afm2tfm b/Master/bin/universal-darwin/afm2tfm
index a629d46d936..cd64fd0340f 100755
--- a/Master/bin/universal-darwin/afm2tfm
+++ b/Master/bin/universal-darwin/afm2tfm
diff --git a/Master/bin/universal-darwin/aleph b/Master/bin/universal-darwin/aleph
index ceb32bfbd61..2d244934c37 100755
--- a/Master/bin/universal-darwin/aleph
+++ b/Master/bin/universal-darwin/aleph
diff --git a/Master/bin/universal-darwin/bbox b/Master/bin/universal-darwin/bbox
index 2da25beaae5..22b848118aa 100755
--- a/Master/bin/universal-darwin/bbox
+++ b/Master/bin/universal-darwin/bbox
diff --git a/Master/bin/universal-darwin/bg5conv b/Master/bin/universal-darwin/bg5conv
index 0b70c903faa..d00da9ab652 100755
--- a/Master/bin/universal-darwin/bg5conv
+++ b/Master/bin/universal-darwin/bg5conv
diff --git a/Master/bin/universal-darwin/bibtex b/Master/bin/universal-darwin/bibtex
index 1e7519815ab..7beea621654 100755
--- a/Master/bin/universal-darwin/bibtex
+++ b/Master/bin/universal-darwin/bibtex
diff --git a/Master/bin/universal-darwin/bibtex8 b/Master/bin/universal-darwin/bibtex8
index a897632267c..261f4bb5e26 100755
--- a/Master/bin/universal-darwin/bibtex8
+++ b/Master/bin/universal-darwin/bibtex8
diff --git a/Master/bin/universal-darwin/bibtexu b/Master/bin/universal-darwin/bibtexu
index 7998b3444db..16a74c4af9f 100755
--- a/Master/bin/universal-darwin/bibtexu
+++ b/Master/bin/universal-darwin/bibtexu
diff --git a/Master/bin/universal-darwin/cef5conv b/Master/bin/universal-darwin/cef5conv
index ac2a261e43f..80507866eee 100755
--- a/Master/bin/universal-darwin/cef5conv
+++ b/Master/bin/universal-darwin/cef5conv
diff --git a/Master/bin/universal-darwin/cefconv b/Master/bin/universal-darwin/cefconv
index 6fb9f7a532f..00df3752f1b 100755
--- a/Master/bin/universal-darwin/cefconv
+++ b/Master/bin/universal-darwin/cefconv
diff --git a/Master/bin/universal-darwin/cefsconv b/Master/bin/universal-darwin/cefsconv
index e643b736fc1..fff5baf6632 100755
--- a/Master/bin/universal-darwin/cefsconv
+++ b/Master/bin/universal-darwin/cefsconv
diff --git a/Master/bin/universal-darwin/cfftot1 b/Master/bin/universal-darwin/cfftot1
index 52e48cd869c..25664dca0c9 100755
--- a/Master/bin/universal-darwin/cfftot1
+++ b/Master/bin/universal-darwin/cfftot1
diff --git a/Master/bin/universal-darwin/chktex b/Master/bin/universal-darwin/chktex
index 1303fa40dc3..abeb433380b 100755
--- a/Master/bin/universal-darwin/chktex
+++ b/Master/bin/universal-darwin/chktex
diff --git a/Master/bin/universal-darwin/convbkmk b/Master/bin/universal-darwin/convbkmk
new file mode 120000
index 00000000000..1dba94392d3
--- /dev/null
+++ b/Master/bin/universal-darwin/convbkmk
@@ -0,0 +1 @@
+../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/ctangle b/Master/bin/universal-darwin/ctangle
index 7868a2b6373..4ca736c4613 100755
--- a/Master/bin/universal-darwin/ctangle
+++ b/Master/bin/universal-darwin/ctangle
diff --git a/Master/bin/universal-darwin/ctie b/Master/bin/universal-darwin/ctie
index d0fdbfa781b..6adc48b224b 100755
--- a/Master/bin/universal-darwin/ctie
+++ b/Master/bin/universal-darwin/ctie
diff --git a/Master/bin/universal-darwin/cweave b/Master/bin/universal-darwin/cweave
index cc086f67db0..8c71a3c4e09 100755
--- a/Master/bin/universal-darwin/cweave
+++ b/Master/bin/universal-darwin/cweave
diff --git a/Master/bin/universal-darwin/detex b/Master/bin/universal-darwin/detex
index 600bea41fc2..3a77fca553a 100755
--- a/Master/bin/universal-darwin/detex
+++ b/Master/bin/universal-darwin/detex
diff --git a/Master/bin/universal-darwin/devnag b/Master/bin/universal-darwin/devnag
index 5cb291b5135..d03fe3e8c23 100755
--- a/Master/bin/universal-darwin/devnag
+++ b/Master/bin/universal-darwin/devnag
diff --git a/Master/bin/universal-darwin/disdvi b/Master/bin/universal-darwin/disdvi
index 9ac5e5775e9..63d3f63a57f 100755
--- a/Master/bin/universal-darwin/disdvi
+++ b/Master/bin/universal-darwin/disdvi
diff --git a/Master/bin/universal-darwin/dt2dv b/Master/bin/universal-darwin/dt2dv
index 79b55d3188c..43d1076494f 100755
--- a/Master/bin/universal-darwin/dt2dv
+++ b/Master/bin/universal-darwin/dt2dv
diff --git a/Master/bin/universal-darwin/dv2dt b/Master/bin/universal-darwin/dv2dt
index cb188edcde5..6fc97f0a5c1 100755
--- a/Master/bin/universal-darwin/dv2dt
+++ b/Master/bin/universal-darwin/dv2dt
diff --git a/Master/bin/universal-darwin/dvi2tty b/Master/bin/universal-darwin/dvi2tty
index ffa986fc3fd..5d51781e847 100755
--- a/Master/bin/universal-darwin/dvi2tty
+++ b/Master/bin/universal-darwin/dvi2tty
diff --git a/Master/bin/universal-darwin/dvibook b/Master/bin/universal-darwin/dvibook
index c25e4ce051e..972f2ebf153 100755
--- a/Master/bin/universal-darwin/dvibook
+++ b/Master/bin/universal-darwin/dvibook
diff --git a/Master/bin/universal-darwin/dviconcat b/Master/bin/universal-darwin/dviconcat
index 037598e4dad..3d3365facf1 100755
--- a/Master/bin/universal-darwin/dviconcat
+++ b/Master/bin/universal-darwin/dviconcat
diff --git a/Master/bin/universal-darwin/dvicopy b/Master/bin/universal-darwin/dvicopy
index 58d8968cdbb..9270c237e27 100755
--- a/Master/bin/universal-darwin/dvicopy
+++ b/Master/bin/universal-darwin/dvicopy
diff --git a/Master/bin/universal-darwin/dvidvi b/Master/bin/universal-darwin/dvidvi
index 922831d111e..bd93df84eb5 100755
--- a/Master/bin/universal-darwin/dvidvi
+++ b/Master/bin/universal-darwin/dvidvi
diff --git a/Master/bin/universal-darwin/dvilj b/Master/bin/universal-darwin/dvilj
index 46901954761..5b5f7780c22 100755
--- a/Master/bin/universal-darwin/dvilj
+++ b/Master/bin/universal-darwin/dvilj
diff --git a/Master/bin/universal-darwin/dvilj2p b/Master/bin/universal-darwin/dvilj2p
index 9480ac313f8..d98eaedbae8 100755
--- a/Master/bin/universal-darwin/dvilj2p
+++ b/Master/bin/universal-darwin/dvilj2p
diff --git a/Master/bin/universal-darwin/dvilj4 b/Master/bin/universal-darwin/dvilj4
index 219ae4ba24b..dde6ff716cf 100755
--- a/Master/bin/universal-darwin/dvilj4
+++ b/Master/bin/universal-darwin/dvilj4
diff --git a/Master/bin/universal-darwin/dvilj4l b/Master/bin/universal-darwin/dvilj4l
index dbdeb102b98..25accf34e16 100755
--- a/Master/bin/universal-darwin/dvilj4l
+++ b/Master/bin/universal-darwin/dvilj4l
diff --git a/Master/bin/universal-darwin/dvipdfmx b/Master/bin/universal-darwin/dvipdfmx
index c51824c2942..bcbc392344c 100755
--- a/Master/bin/universal-darwin/dvipdfmx
+++ b/Master/bin/universal-darwin/dvipdfmx
diff --git a/Master/bin/universal-darwin/dvipng b/Master/bin/universal-darwin/dvipng
index f33ec61d12f..146fd730962 100755
--- a/Master/bin/universal-darwin/dvipng
+++ b/Master/bin/universal-darwin/dvipng
diff --git a/Master/bin/universal-darwin/dvipos b/Master/bin/universal-darwin/dvipos
index ff02abd1c1c..eb617746891 100755
--- a/Master/bin/universal-darwin/dvipos
+++ b/Master/bin/universal-darwin/dvipos
diff --git a/Master/bin/universal-darwin/dvips b/Master/bin/universal-darwin/dvips
index e85901a3f95..d78f39d8eb5 100755
--- a/Master/bin/universal-darwin/dvips
+++ b/Master/bin/universal-darwin/dvips
diff --git a/Master/bin/universal-darwin/dviselect b/Master/bin/universal-darwin/dviselect
index 37ecfb1e0f9..648d3f0c274 100755
--- a/Master/bin/universal-darwin/dviselect
+++ b/Master/bin/universal-darwin/dviselect
diff --git a/Master/bin/universal-darwin/dvisvgm b/Master/bin/universal-darwin/dvisvgm
index b1402751156..a8889192b95 100755
--- a/Master/bin/universal-darwin/dvisvgm
+++ b/Master/bin/universal-darwin/dvisvgm
diff --git a/Master/bin/universal-darwin/dvitodvi b/Master/bin/universal-darwin/dvitodvi
index 6e859fa5393..07bb69e5dbb 100755
--- a/Master/bin/universal-darwin/dvitodvi
+++ b/Master/bin/universal-darwin/dvitodvi
diff --git a/Master/bin/universal-darwin/dvitype b/Master/bin/universal-darwin/dvitype
index ef35e479b73..3d00c3f0ff8 100755
--- a/Master/bin/universal-darwin/dvitype
+++ b/Master/bin/universal-darwin/dvitype
diff --git a/Master/bin/universal-darwin/epsffit b/Master/bin/universal-darwin/epsffit
index 4d41bcda91d..fa274c68f17 100755
--- a/Master/bin/universal-darwin/epsffit
+++ b/Master/bin/universal-darwin/epsffit
diff --git a/Master/bin/universal-darwin/eptex b/Master/bin/universal-darwin/eptex
index 7e7a9e70708..c03f7c04297 100755
--- a/Master/bin/universal-darwin/eptex
+++ b/Master/bin/universal-darwin/eptex
diff --git a/Master/bin/universal-darwin/euptex b/Master/bin/universal-darwin/euptex
index b598a830551..0412d72269c 100755
--- a/Master/bin/universal-darwin/euptex
+++ b/Master/bin/universal-darwin/euptex
diff --git a/Master/bin/universal-darwin/extconv b/Master/bin/universal-darwin/extconv
index e23f76e47a3..ae875fedf89 100755
--- a/Master/bin/universal-darwin/extconv
+++ b/Master/bin/universal-darwin/extconv
diff --git a/Master/bin/universal-darwin/gftodvi b/Master/bin/universal-darwin/gftodvi
index 5ad71cf0083..d2b92e8c778 100755
--- a/Master/bin/universal-darwin/gftodvi
+++ b/Master/bin/universal-darwin/gftodvi
diff --git a/Master/bin/universal-darwin/gftopk b/Master/bin/universal-darwin/gftopk
index ec5c42aa528..6026a5390d1 100755
--- a/Master/bin/universal-darwin/gftopk
+++ b/Master/bin/universal-darwin/gftopk
diff --git a/Master/bin/universal-darwin/gftype b/Master/bin/universal-darwin/gftype
index d0737fb2f17..8bbf18e5cc6 100755
--- a/Master/bin/universal-darwin/gftype
+++ b/Master/bin/universal-darwin/gftype
diff --git a/Master/bin/universal-darwin/gsftopk b/Master/bin/universal-darwin/gsftopk
index 4a8fa95bcfd..c0adfa15ed1 100755
--- a/Master/bin/universal-darwin/gsftopk
+++ b/Master/bin/universal-darwin/gsftopk
diff --git a/Master/bin/universal-darwin/hbf2gf b/Master/bin/universal-darwin/hbf2gf
index 974e235560d..c7bdc66b068 100755
--- a/Master/bin/universal-darwin/hbf2gf
+++ b/Master/bin/universal-darwin/hbf2gf
diff --git a/Master/bin/universal-darwin/kpseaccess b/Master/bin/universal-darwin/kpseaccess
index 2b1fcb528c0..f819b8d69d3 100755
--- a/Master/bin/universal-darwin/kpseaccess
+++ b/Master/bin/universal-darwin/kpseaccess
diff --git a/Master/bin/universal-darwin/kpsereadlink b/Master/bin/universal-darwin/kpsereadlink
index 3a3042138e3..c1f6d1d5176 100755
--- a/Master/bin/universal-darwin/kpsereadlink
+++ b/Master/bin/universal-darwin/kpsereadlink
diff --git a/Master/bin/universal-darwin/kpsestat b/Master/bin/universal-darwin/kpsestat
index cb986dba985..b02cec2cb0f 100755
--- a/Master/bin/universal-darwin/kpsestat
+++ b/Master/bin/universal-darwin/kpsestat
diff --git a/Master/bin/universal-darwin/kpsewhich b/Master/bin/universal-darwin/kpsewhich
index a93910c8f0a..76393dcde11 100755
--- a/Master/bin/universal-darwin/kpsewhich
+++ b/Master/bin/universal-darwin/kpsewhich
diff --git a/Master/bin/universal-darwin/lacheck b/Master/bin/universal-darwin/lacheck
index ed4fa629f77..5828966a55e 100755
--- a/Master/bin/universal-darwin/lacheck
+++ b/Master/bin/universal-darwin/lacheck
diff --git a/Master/bin/universal-darwin/luatex b/Master/bin/universal-darwin/luatex
index a7b63480d88..67476c60274 100755
--- a/Master/bin/universal-darwin/luatex
+++ b/Master/bin/universal-darwin/luatex
diff --git a/Master/bin/universal-darwin/mag b/Master/bin/universal-darwin/mag
index 9cc1673af3c..0fd8c7cc23a 100755
--- a/Master/bin/universal-darwin/mag
+++ b/Master/bin/universal-darwin/mag
diff --git a/Master/bin/universal-darwin/makeindex b/Master/bin/universal-darwin/makeindex
index f44d444d937..2a80aca8561 100755
--- a/Master/bin/universal-darwin/makeindex
+++ b/Master/bin/universal-darwin/makeindex
diff --git a/Master/bin/universal-darwin/makejvf b/Master/bin/universal-darwin/makejvf
index 36f937dc52e..2b9d1cf990c 100755
--- a/Master/bin/universal-darwin/makejvf
+++ b/Master/bin/universal-darwin/makejvf
diff --git a/Master/bin/universal-darwin/mendex b/Master/bin/universal-darwin/mendex
index fa5d360de51..aec95a0b18a 100755
--- a/Master/bin/universal-darwin/mendex
+++ b/Master/bin/universal-darwin/mendex
diff --git a/Master/bin/universal-darwin/mf b/Master/bin/universal-darwin/mf
index 012309bcf70..36536bff46f 100755
--- a/Master/bin/universal-darwin/mf
+++ b/Master/bin/universal-darwin/mf
diff --git a/Master/bin/universal-darwin/mf-nowin b/Master/bin/universal-darwin/mf-nowin
index 12e50f07ee8..cc7ef57655c 100755
--- a/Master/bin/universal-darwin/mf-nowin
+++ b/Master/bin/universal-darwin/mf-nowin
diff --git a/Master/bin/universal-darwin/mft b/Master/bin/universal-darwin/mft
index 8b8c1042bfa..74677b36d66 100755
--- a/Master/bin/universal-darwin/mft
+++ b/Master/bin/universal-darwin/mft
diff --git a/Master/bin/universal-darwin/mktexmf b/Master/bin/universal-darwin/mktexmf
index 2bd683c7f0a..d5c77a8856d 100755
--- a/Master/bin/universal-darwin/mktexmf
+++ b/Master/bin/universal-darwin/mktexmf
@@ -7,7 +7,7 @@
 # Originally written by Thomas Esser.
 # Public domain.
 
-version='$Id: mktexmf 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexmf 26569 2012-05-22 16:05:18Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname FONT.
 
@@ -36,17 +36,20 @@ if test -n "$sauterroot"; then
   rootfile=$sauterroot
   rootname=b-$rootname
 else
-  case $rootname in
+  case $name in
     # csso12[0-5][0-9] from CJK package; unsupported by mktexmf
     csso12[0-5][0-9])
-       rootfile=;;
-    cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-       rootfile=`kpsewhich cscode.mf`;;
-    wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-       lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
-       rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+      rootfile=;;
     *)
-       rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+      case $rootname in
+        cs*|lcsss*|icscsc*|icstt*|ilcsss*)
+          rootfile=`kpsewhich cscode.mf`;;
+        wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
+          lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
+          rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+        *)
+          rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+      esac;;
   esac
 fi
 { test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1
diff --git a/Master/bin/universal-darwin/mmafm b/Master/bin/universal-darwin/mmafm
index e99108ce2b4..b9f17417045 100755
--- a/Master/bin/universal-darwin/mmafm
+++ b/Master/bin/universal-darwin/mmafm
diff --git a/Master/bin/universal-darwin/mmpfb b/Master/bin/universal-darwin/mmpfb
index 8764631b762..a4e58625271 100755
--- a/Master/bin/universal-darwin/mmpfb
+++ b/Master/bin/universal-darwin/mmpfb
diff --git a/Master/bin/universal-darwin/mpost b/Master/bin/universal-darwin/mpost
index 7ae20b5e9a6..62c16be0c62 100755
--- a/Master/bin/universal-darwin/mpost
+++ b/Master/bin/universal-darwin/mpost
diff --git a/Master/bin/universal-darwin/odvicopy b/Master/bin/universal-darwin/odvicopy
index 20fc477a0df..00fb20fe3d7 100755
--- a/Master/bin/universal-darwin/odvicopy
+++ b/Master/bin/universal-darwin/odvicopy
diff --git a/Master/bin/universal-darwin/odvitype b/Master/bin/universal-darwin/odvitype
index 597705cd79f..ad90c3e7c2c 100755
--- a/Master/bin/universal-darwin/odvitype
+++ b/Master/bin/universal-darwin/odvitype
diff --git a/Master/bin/universal-darwin/omfonts b/Master/bin/universal-darwin/omfonts
index 81eec1914bc..d993f81964c 100755
--- a/Master/bin/universal-darwin/omfonts
+++ b/Master/bin/universal-darwin/omfonts
diff --git a/Master/bin/universal-darwin/otangle b/Master/bin/universal-darwin/otangle
index 2ffe5d6bcb6..d87bbce9c8d 100755
--- a/Master/bin/universal-darwin/otangle
+++ b/Master/bin/universal-darwin/otangle
diff --git a/Master/bin/universal-darwin/otfinfo b/Master/bin/universal-darwin/otfinfo
index a643e8be839..ee44cb26e4e 100755
--- a/Master/bin/universal-darwin/otfinfo
+++ b/Master/bin/universal-darwin/otfinfo
diff --git a/Master/bin/universal-darwin/otftotfm b/Master/bin/universal-darwin/otftotfm
index 4867d6f93a9..47c7fd821a6 100755
--- a/Master/bin/universal-darwin/otftotfm
+++ b/Master/bin/universal-darwin/otftotfm
diff --git a/Master/bin/universal-darwin/otp2ocp b/Master/bin/universal-darwin/otp2ocp
index cd64ca9d26f..cd689b6ab33 100755
--- a/Master/bin/universal-darwin/otp2ocp
+++ b/Master/bin/universal-darwin/otp2ocp
diff --git a/Master/bin/universal-darwin/outocp b/Master/bin/universal-darwin/outocp
index 12f9187ed5d..adc0dc2a8d2 100755
--- a/Master/bin/universal-darwin/outocp
+++ b/Master/bin/universal-darwin/outocp
diff --git a/Master/bin/universal-darwin/patgen b/Master/bin/universal-darwin/patgen
index c9ae8954ecd..adac1dd8a69 100755
--- a/Master/bin/universal-darwin/patgen
+++ b/Master/bin/universal-darwin/patgen
diff --git a/Master/bin/universal-darwin/pbibtex b/Master/bin/universal-darwin/pbibtex
index 38a6fb6e271..6379c7bf35b 100755
--- a/Master/bin/universal-darwin/pbibtex
+++ b/Master/bin/universal-darwin/pbibtex
diff --git a/Master/bin/universal-darwin/pdfclose b/Master/bin/universal-darwin/pdfclose
index 7ea628bf0c0..a64910652ea 100755
--- a/Master/bin/universal-darwin/pdfclose
+++ b/Master/bin/universal-darwin/pdfclose
diff --git a/Master/bin/universal-darwin/pdfopen b/Master/bin/universal-darwin/pdfopen
index b8314f5bdfa..60d705058f2 100755
--- a/Master/bin/universal-darwin/pdfopen
+++ b/Master/bin/universal-darwin/pdfopen
diff --git a/Master/bin/universal-darwin/pdftex b/Master/bin/universal-darwin/pdftex
index 3d6e3add2b7..df57f7a94e8 100755
--- a/Master/bin/universal-darwin/pdftex
+++ b/Master/bin/universal-darwin/pdftex
diff --git a/Master/bin/universal-darwin/pdftosrc b/Master/bin/universal-darwin/pdftosrc
index dca829aec1f..8cc77445a2d 100755
--- a/Master/bin/universal-darwin/pdftosrc
+++ b/Master/bin/universal-darwin/pdftosrc
diff --git a/Master/bin/universal-darwin/pdvitype b/Master/bin/universal-darwin/pdvitype
index 27938005984..e266fbf3fa5 100755
--- a/Master/bin/universal-darwin/pdvitype
+++ b/Master/bin/universal-darwin/pdvitype
diff --git a/Master/bin/universal-darwin/pfb2pfa b/Master/bin/universal-darwin/pfb2pfa
index 50eeea7f7fc..d6d0c57fec3 100755
--- a/Master/bin/universal-darwin/pfb2pfa
+++ b/Master/bin/universal-darwin/pfb2pfa
diff --git a/Master/bin/universal-darwin/pk2bm b/Master/bin/universal-darwin/pk2bm
index b19ac488a19..7912e9b3df7 100755
--- a/Master/bin/universal-darwin/pk2bm
+++ b/Master/bin/universal-darwin/pk2bm
diff --git a/Master/bin/universal-darwin/pktogf b/Master/bin/universal-darwin/pktogf
index fc47b6cf138..3595a73966b 100755
--- a/Master/bin/universal-darwin/pktogf
+++ b/Master/bin/universal-darwin/pktogf
diff --git a/Master/bin/universal-darwin/pktype b/Master/bin/universal-darwin/pktype
index 76a1ac4c108..3eb20f57164 100755
--- a/Master/bin/universal-darwin/pktype
+++ b/Master/bin/universal-darwin/pktype
diff --git a/Master/bin/universal-darwin/pltotf b/Master/bin/universal-darwin/pltotf
index f237126d26f..5430c70a2ad 100755
--- a/Master/bin/universal-darwin/pltotf
+++ b/Master/bin/universal-darwin/pltotf
diff --git a/Master/bin/universal-darwin/pmxab b/Master/bin/universal-darwin/pmxab
index 72c2af7d83d..9119f1da247 100755
--- a/Master/bin/universal-darwin/pmxab
+++ b/Master/bin/universal-darwin/pmxab
diff --git a/Master/bin/universal-darwin/pooltype b/Master/bin/universal-darwin/pooltype
index d3ae67dcd33..ac8c80b6a11 100755
--- a/Master/bin/universal-darwin/pooltype
+++ b/Master/bin/universal-darwin/pooltype
diff --git a/Master/bin/universal-darwin/ppltotf b/Master/bin/universal-darwin/ppltotf
index 05a190bb63b..15104776d4f 100755
--- a/Master/bin/universal-darwin/ppltotf
+++ b/Master/bin/universal-darwin/ppltotf
diff --git a/Master/bin/universal-darwin/prepmx b/Master/bin/universal-darwin/prepmx
new file mode 100755
index 00000000000..cfae9fd26dc
--- /dev/null
+++ b/Master/bin/universal-darwin/prepmx
diff --git a/Master/bin/universal-darwin/ps2pk b/Master/bin/universal-darwin/ps2pk
index e3e6377cdb3..8462cce4ec4 100755
--- a/Master/bin/universal-darwin/ps2pk
+++ b/Master/bin/universal-darwin/ps2pk
diff --git a/Master/bin/universal-darwin/psbook b/Master/bin/universal-darwin/psbook
index 0e75728a445..a0b3592d63b 100755
--- a/Master/bin/universal-darwin/psbook
+++ b/Master/bin/universal-darwin/psbook
diff --git a/Master/bin/universal-darwin/psnup b/Master/bin/universal-darwin/psnup
index 4d8accfce75..894df49a4ae 100755
--- a/Master/bin/universal-darwin/psnup
+++ b/Master/bin/universal-darwin/psnup
diff --git a/Master/bin/universal-darwin/psresize b/Master/bin/universal-darwin/psresize
index c7124d10183..03fcffc0c93 100755
--- a/Master/bin/universal-darwin/psresize
+++ b/Master/bin/universal-darwin/psresize
diff --git a/Master/bin/universal-darwin/psselect b/Master/bin/universal-darwin/psselect
index 13478792db9..adcb3f88576 100755
--- a/Master/bin/universal-darwin/psselect
+++ b/Master/bin/universal-darwin/psselect
diff --git a/Master/bin/universal-darwin/pstops b/Master/bin/universal-darwin/pstops
index eecea5d70ff..ec75abed936 100755
--- a/Master/bin/universal-darwin/pstops
+++ b/Master/bin/universal-darwin/pstops
diff --git a/Master/bin/universal-darwin/ptex b/Master/bin/universal-darwin/ptex
index e4e2fd5f2ba..6982edecb9f 100755
--- a/Master/bin/universal-darwin/ptex
+++ b/Master/bin/universal-darwin/ptex
diff --git a/Master/bin/universal-darwin/ptftopl b/Master/bin/universal-darwin/ptftopl
index 85368560970..12f7638a0a0 100755
--- a/Master/bin/universal-darwin/ptftopl
+++ b/Master/bin/universal-darwin/ptftopl
diff --git a/Master/bin/universal-darwin/scor2prt b/Master/bin/universal-darwin/scor2prt
index 7b60d44806f..297235de398 100755
--- a/Master/bin/universal-darwin/scor2prt
+++ b/Master/bin/universal-darwin/scor2prt
diff --git a/Master/bin/universal-darwin/sjisconv b/Master/bin/universal-darwin/sjisconv
index 6e129fedac4..df87f1daf99 100755
--- a/Master/bin/universal-darwin/sjisconv
+++ b/Master/bin/universal-darwin/sjisconv
diff --git a/Master/bin/universal-darwin/synctex b/Master/bin/universal-darwin/synctex
index ef794e89b39..4d0c5323b58 100755
--- a/Master/bin/universal-darwin/synctex
+++ b/Master/bin/universal-darwin/synctex
diff --git a/Master/bin/universal-darwin/t1ascii b/Master/bin/universal-darwin/t1ascii
index 57853edcfcb..9d30dfc268a 100755
--- a/Master/bin/universal-darwin/t1ascii
+++ b/Master/bin/universal-darwin/t1ascii
diff --git a/Master/bin/universal-darwin/t1asm b/Master/bin/universal-darwin/t1asm
index 6946e4487d9..b940cc5d559 100755
--- a/Master/bin/universal-darwin/t1asm
+++ b/Master/bin/universal-darwin/t1asm
diff --git a/Master/bin/universal-darwin/t1binary b/Master/bin/universal-darwin/t1binary
index 068839ca6b0..ddff8a340fc 100755
--- a/Master/bin/universal-darwin/t1binary
+++ b/Master/bin/universal-darwin/t1binary
diff --git a/Master/bin/universal-darwin/t1disasm b/Master/bin/universal-darwin/t1disasm
index bac79b5b9d4..075a974bac3 100755
--- a/Master/bin/universal-darwin/t1disasm
+++ b/Master/bin/universal-darwin/t1disasm
diff --git a/Master/bin/universal-darwin/t1dotlessj b/Master/bin/universal-darwin/t1dotlessj
index 9f9c9aa1372..bfef48d4f50 100755
--- a/Master/bin/universal-darwin/t1dotlessj
+++ b/Master/bin/universal-darwin/t1dotlessj
diff --git a/Master/bin/universal-darwin/t1lint b/Master/bin/universal-darwin/t1lint
index 395d664c521..a8d6cbcabd0 100755
--- a/Master/bin/universal-darwin/t1lint
+++ b/Master/bin/universal-darwin/t1lint
diff --git a/Master/bin/universal-darwin/t1mac b/Master/bin/universal-darwin/t1mac
index 0d7e899f0c2..30a100c41c6 100755
--- a/Master/bin/universal-darwin/t1mac
+++ b/Master/bin/universal-darwin/t1mac
diff --git a/Master/bin/universal-darwin/t1rawafm b/Master/bin/universal-darwin/t1rawafm
index ffe572ac0c8..abeb6273e09 100755
--- a/Master/bin/universal-darwin/t1rawafm
+++ b/Master/bin/universal-darwin/t1rawafm
diff --git a/Master/bin/universal-darwin/t1reencode b/Master/bin/universal-darwin/t1reencode
index b414173a424..fb3112f6493 100755
--- a/Master/bin/universal-darwin/t1reencode
+++ b/Master/bin/universal-darwin/t1reencode
diff --git a/Master/bin/universal-darwin/t1testpage b/Master/bin/universal-darwin/t1testpage
index 45ec1eb0c92..4845b11b3cd 100755
--- a/Master/bin/universal-darwin/t1testpage
+++ b/Master/bin/universal-darwin/t1testpage
diff --git a/Master/bin/universal-darwin/t1unmac b/Master/bin/universal-darwin/t1unmac
index aae68217d2a..728e76a116c 100755
--- a/Master/bin/universal-darwin/t1unmac
+++ b/Master/bin/universal-darwin/t1unmac
diff --git a/Master/bin/universal-darwin/t4ht b/Master/bin/universal-darwin/t4ht
index dcbbe3d9a08..4e36dda350b 100755
--- a/Master/bin/universal-darwin/t4ht
+++ b/Master/bin/universal-darwin/t4ht
diff --git a/Master/bin/universal-darwin/tangle b/Master/bin/universal-darwin/tangle
index 8d0978c12b5..b8bea2632cd 100755
--- a/Master/bin/universal-darwin/tangle
+++ b/Master/bin/universal-darwin/tangle
diff --git a/Master/bin/universal-darwin/teckit_compile b/Master/bin/universal-darwin/teckit_compile
index 1a309ee2c08..7983622e4bb 100755
--- a/Master/bin/universal-darwin/teckit_compile
+++ b/Master/bin/universal-darwin/teckit_compile
diff --git a/Master/bin/universal-darwin/tex b/Master/bin/universal-darwin/tex
index c95a592ac39..7e870835f4d 100755
--- a/Master/bin/universal-darwin/tex
+++ b/Master/bin/universal-darwin/tex
diff --git a/Master/bin/universal-darwin/tex2xindy b/Master/bin/universal-darwin/tex2xindy
index 6e1d728d151..e68b48cf2ed 100755
--- a/Master/bin/universal-darwin/tex2xindy
+++ b/Master/bin/universal-darwin/tex2xindy
diff --git a/Master/bin/universal-darwin/tex4ht b/Master/bin/universal-darwin/tex4ht
index 012cb4f1f89..1f23cafed5d 100755
--- a/Master/bin/universal-darwin/tex4ht
+++ b/Master/bin/universal-darwin/tex4ht
diff --git a/Master/bin/universal-darwin/tftopl b/Master/bin/universal-darwin/tftopl
index 34e67cc45b9..11ba8f983cb 100755
--- a/Master/bin/universal-darwin/tftopl
+++ b/Master/bin/universal-darwin/tftopl
diff --git a/Master/bin/universal-darwin/tie b/Master/bin/universal-darwin/tie
index d8ca52028e4..160c4f782e9 100755
--- a/Master/bin/universal-darwin/tie
+++ b/Master/bin/universal-darwin/tie
diff --git a/Master/bin/universal-darwin/ttf2afm b/Master/bin/universal-darwin/ttf2afm
index 4ac26ace627..160c93393d5 100755
--- a/Master/bin/universal-darwin/ttf2afm
+++ b/Master/bin/universal-darwin/ttf2afm
diff --git a/Master/bin/universal-darwin/ttf2pk b/Master/bin/universal-darwin/ttf2pk
index da03b78f59e..4c17de5e73c 100755
--- a/Master/bin/universal-darwin/ttf2pk
+++ b/Master/bin/universal-darwin/ttf2pk
diff --git a/Master/bin/universal-darwin/ttf2tfm b/Master/bin/universal-darwin/ttf2tfm
index e5f9ddff1c1..7db5f4b93c8 100755
--- a/Master/bin/universal-darwin/ttf2tfm
+++ b/Master/bin/universal-darwin/ttf2tfm
diff --git a/Master/bin/universal-darwin/ttfdump b/Master/bin/universal-darwin/ttfdump
index f54dcdbfe0f..ba05c8888d3 100755
--- a/Master/bin/universal-darwin/ttfdump
+++ b/Master/bin/universal-darwin/ttfdump
diff --git a/Master/bin/universal-darwin/ttftotype42 b/Master/bin/universal-darwin/ttftotype42
index a5aff16cc4b..747c608bcd5 100755
--- a/Master/bin/universal-darwin/ttftotype42
+++ b/Master/bin/universal-darwin/ttftotype42
diff --git a/Master/bin/universal-darwin/upbibtex b/Master/bin/universal-darwin/upbibtex
index c520cb3210a..fea7b78c129 100755
--- a/Master/bin/universal-darwin/upbibtex
+++ b/Master/bin/universal-darwin/upbibtex
diff --git a/Master/bin/universal-darwin/updvitype b/Master/bin/universal-darwin/updvitype
index b790c4852ec..b76c7c11359 100755
--- a/Master/bin/universal-darwin/updvitype
+++ b/Master/bin/universal-darwin/updvitype
diff --git a/Master/bin/universal-darwin/uppltotf b/Master/bin/universal-darwin/uppltotf
index a96cac05b6c..2add4012d3f 100755
--- a/Master/bin/universal-darwin/uppltotf
+++ b/Master/bin/universal-darwin/uppltotf
diff --git a/Master/bin/universal-darwin/uptex b/Master/bin/universal-darwin/uptex
index d417a349b9e..d46a821a71a 100755
--- a/Master/bin/universal-darwin/uptex
+++ b/Master/bin/universal-darwin/uptex
diff --git a/Master/bin/universal-darwin/uptftopl b/Master/bin/universal-darwin/uptftopl
index 4408f15b07d..ac98d5a9bd0 100755
--- a/Master/bin/universal-darwin/uptftopl
+++ b/Master/bin/universal-darwin/uptftopl
diff --git a/Master/bin/universal-darwin/vftovp b/Master/bin/universal-darwin/vftovp
index 3dbd989eb67..1b3555a4a75 100755
--- a/Master/bin/universal-darwin/vftovp
+++ b/Master/bin/universal-darwin/vftovp
diff --git a/Master/bin/universal-darwin/vlna b/Master/bin/universal-darwin/vlna
index 8397f5e69c9..2805410869b 100755
--- a/Master/bin/universal-darwin/vlna
+++ b/Master/bin/universal-darwin/vlna
diff --git a/Master/bin/universal-darwin/vptovf b/Master/bin/universal-darwin/vptovf
index d948caa337a..9e7f58a162d 100755
--- a/Master/bin/universal-darwin/vptovf
+++ b/Master/bin/universal-darwin/vptovf
diff --git a/Master/bin/universal-darwin/weave b/Master/bin/universal-darwin/weave
index 5971c4b2930..2e5cb305446 100755
--- a/Master/bin/universal-darwin/weave
+++ b/Master/bin/universal-darwin/weave
diff --git a/Master/bin/universal-darwin/wovp2ovf b/Master/bin/universal-darwin/wovp2ovf
new file mode 100755
index 00000000000..3de24c5e884
--- /dev/null
+++ b/Master/bin/universal-darwin/wovp2ovf
diff --git a/Master/bin/universal-darwin/xdv2pdf b/Master/bin/universal-darwin/xdv2pdf
index 7e32233e1f7..f7f358baf5f 100755
--- a/Master/bin/universal-darwin/xdv2pdf
+++ b/Master/bin/universal-darwin/xdv2pdf
diff --git a/Master/bin/universal-darwin/xdvi-xaw b/Master/bin/universal-darwin/xdvi-xaw
index 6bff30d92b9..9dae7758fb3 100755
--- a/Master/bin/universal-darwin/xdvi-xaw
+++ b/Master/bin/universal-darwin/xdvi-xaw
diff --git a/Master/bin/universal-darwin/xdvipdfmx b/Master/bin/universal-darwin/xdvipdfmx
index cda0a15a0fb..196bab113e0 100755
--- a/Master/bin/universal-darwin/xdvipdfmx
+++ b/Master/bin/universal-darwin/xdvipdfmx
diff --git a/Master/bin/universal-darwin/xetex b/Master/bin/universal-darwin/xetex
index 73aa7adcad6..00e012c91e0 100755
--- a/Master/bin/universal-darwin/xetex
+++ b/Master/bin/universal-darwin/xetex
diff --git a/Master/bin/x86_64-darwin/T1Wrap b/Master/bin/x86_64-darwin/T1Wrap
index 0db53c102e9..fcac79769da 100755
--- a/Master/bin/x86_64-darwin/T1Wrap
+++ b/Master/bin/x86_64-darwin/T1Wrap
diff --git a/Master/bin/x86_64-darwin/afm2pl b/Master/bin/x86_64-darwin/afm2pl
index 05dbeaae9b6..5d9b94b72f5 100755
--- a/Master/bin/x86_64-darwin/afm2pl
+++ b/Master/bin/x86_64-darwin/afm2pl
diff --git a/Master/bin/x86_64-darwin/afm2tfm b/Master/bin/x86_64-darwin/afm2tfm
index 9138a912546..46e044e3d0e 100755
--- a/Master/bin/x86_64-darwin/afm2tfm
+++ b/Master/bin/x86_64-darwin/afm2tfm
diff --git a/Master/bin/x86_64-darwin/aleph b/Master/bin/x86_64-darwin/aleph
index 7919dfca90a..b8f1468bdc1 100755
--- a/Master/bin/x86_64-darwin/aleph
+++ b/Master/bin/x86_64-darwin/aleph
diff --git a/Master/bin/x86_64-darwin/bibtex b/Master/bin/x86_64-darwin/bibtex
index 1b9546797d3..ffa54e8f421 100755
--- a/Master/bin/x86_64-darwin/bibtex
+++ b/Master/bin/x86_64-darwin/bibtex
diff --git a/Master/bin/x86_64-darwin/bibtex8 b/Master/bin/x86_64-darwin/bibtex8
index e5f32302736..16d7583b577 100755
--- a/Master/bin/x86_64-darwin/bibtex8
+++ b/Master/bin/x86_64-darwin/bibtex8
diff --git a/Master/bin/x86_64-darwin/bibtexu b/Master/bin/x86_64-darwin/bibtexu
index 418d787a888..502b4759498 100755
--- a/Master/bin/x86_64-darwin/bibtexu
+++ b/Master/bin/x86_64-darwin/bibtexu
diff --git a/Master/bin/x86_64-darwin/convbkmk b/Master/bin/x86_64-darwin/convbkmk
new file mode 120000
index 00000000000..1dba94392d3
--- /dev/null
+++ b/Master/bin/x86_64-darwin/convbkmk
@@ -0,0 +1 @@
+../../texmf-dist/scripts/uptex/convbkmk.rb
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/ctangle b/Master/bin/x86_64-darwin/ctangle
index 4375748b592..51851293d18 100755
--- a/Master/bin/x86_64-darwin/ctangle
+++ b/Master/bin/x86_64-darwin/ctangle
diff --git a/Master/bin/x86_64-darwin/ctie b/Master/bin/x86_64-darwin/ctie
index f7a8fc08aa9..dc6ab6543ec 100755
--- a/Master/bin/x86_64-darwin/ctie
+++ b/Master/bin/x86_64-darwin/ctie
diff --git a/Master/bin/x86_64-darwin/cweave b/Master/bin/x86_64-darwin/cweave
index 268655abe6d..4e0e3d34958 100755
--- a/Master/bin/x86_64-darwin/cweave
+++ b/Master/bin/x86_64-darwin/cweave
diff --git a/Master/bin/x86_64-darwin/detex b/Master/bin/x86_64-darwin/detex
index ab36fb91e68..ed12c0c6256 100755
--- a/Master/bin/x86_64-darwin/detex
+++ b/Master/bin/x86_64-darwin/detex
diff --git a/Master/bin/x86_64-darwin/dvi2tty b/Master/bin/x86_64-darwin/dvi2tty
index f1268adcfc3..ca2ca16001c 100755
--- a/Master/bin/x86_64-darwin/dvi2tty
+++ b/Master/bin/x86_64-darwin/dvi2tty
diff --git a/Master/bin/x86_64-darwin/dvicopy b/Master/bin/x86_64-darwin/dvicopy
index 4ac7c032d33..efd76766967 100755
--- a/Master/bin/x86_64-darwin/dvicopy
+++ b/Master/bin/x86_64-darwin/dvicopy
diff --git a/Master/bin/x86_64-darwin/dvilj b/Master/bin/x86_64-darwin/dvilj
index 4fc93be00c6..cb7508974f4 100755
--- a/Master/bin/x86_64-darwin/dvilj
+++ b/Master/bin/x86_64-darwin/dvilj
diff --git a/Master/bin/x86_64-darwin/dvilj2p b/Master/bin/x86_64-darwin/dvilj2p
index ed9eb730fa7..120f870d85c 100755
--- a/Master/bin/x86_64-darwin/dvilj2p
+++ b/Master/bin/x86_64-darwin/dvilj2p
diff --git a/Master/bin/x86_64-darwin/dvilj4 b/Master/bin/x86_64-darwin/dvilj4
index 4e4484b6173..ce0e48bbcc6 100755
--- a/Master/bin/x86_64-darwin/dvilj4
+++ b/Master/bin/x86_64-darwin/dvilj4
diff --git a/Master/bin/x86_64-darwin/dvilj4l b/Master/bin/x86_64-darwin/dvilj4l
index 7bb2887202b..37b74bb6c1c 100755
--- a/Master/bin/x86_64-darwin/dvilj4l
+++ b/Master/bin/x86_64-darwin/dvilj4l
diff --git a/Master/bin/x86_64-darwin/dvipdfmx b/Master/bin/x86_64-darwin/dvipdfmx
index 9fbbf626a76..eff5bb0f3d2 100755
--- a/Master/bin/x86_64-darwin/dvipdfmx
+++ b/Master/bin/x86_64-darwin/dvipdfmx
diff --git a/Master/bin/x86_64-darwin/dvipng b/Master/bin/x86_64-darwin/dvipng
index 00825e63528..1437f3558ad 100755
--- a/Master/bin/x86_64-darwin/dvipng
+++ b/Master/bin/x86_64-darwin/dvipng
diff --git a/Master/bin/x86_64-darwin/dvipos b/Master/bin/x86_64-darwin/dvipos
index 986f99cb5e7..ed42e293951 100755
--- a/Master/bin/x86_64-darwin/dvipos
+++ b/Master/bin/x86_64-darwin/dvipos
diff --git a/Master/bin/x86_64-darwin/dvips b/Master/bin/x86_64-darwin/dvips
index 458bf04ae53..fa637482243 100755
--- a/Master/bin/x86_64-darwin/dvips
+++ b/Master/bin/x86_64-darwin/dvips
diff --git a/Master/bin/x86_64-darwin/dvisvgm b/Master/bin/x86_64-darwin/dvisvgm
index 460cd720a44..0ab9fa69970 100755
--- a/Master/bin/x86_64-darwin/dvisvgm
+++ b/Master/bin/x86_64-darwin/dvisvgm
diff --git a/Master/bin/x86_64-darwin/dvitype b/Master/bin/x86_64-darwin/dvitype
index 82e289ffa76..3903550d5a2 100755
--- a/Master/bin/x86_64-darwin/dvitype
+++ b/Master/bin/x86_64-darwin/dvitype
diff --git a/Master/bin/x86_64-darwin/eptex b/Master/bin/x86_64-darwin/eptex
index 471f60c0d42..1b016b68f52 100755
--- a/Master/bin/x86_64-darwin/eptex
+++ b/Master/bin/x86_64-darwin/eptex
diff --git a/Master/bin/x86_64-darwin/euptex b/Master/bin/x86_64-darwin/euptex
index 1ac4ae333c6..3a7c3e891ec 100755
--- a/Master/bin/x86_64-darwin/euptex
+++ b/Master/bin/x86_64-darwin/euptex
diff --git a/Master/bin/x86_64-darwin/gftodvi b/Master/bin/x86_64-darwin/gftodvi
index f29f5292c62..19d64c14ce0 100755
--- a/Master/bin/x86_64-darwin/gftodvi
+++ b/Master/bin/x86_64-darwin/gftodvi
diff --git a/Master/bin/x86_64-darwin/gftopk b/Master/bin/x86_64-darwin/gftopk
index a0bbbe35968..86764c3bfd1 100755
--- a/Master/bin/x86_64-darwin/gftopk
+++ b/Master/bin/x86_64-darwin/gftopk
diff --git a/Master/bin/x86_64-darwin/gftype b/Master/bin/x86_64-darwin/gftype
index c4c2598726d..5a1df55eb52 100755
--- a/Master/bin/x86_64-darwin/gftype
+++ b/Master/bin/x86_64-darwin/gftype
diff --git a/Master/bin/x86_64-darwin/gsftopk b/Master/bin/x86_64-darwin/gsftopk
index 1d33b90b4d4..baea2482f36 100755
--- a/Master/bin/x86_64-darwin/gsftopk
+++ b/Master/bin/x86_64-darwin/gsftopk
diff --git a/Master/bin/x86_64-darwin/hbf2gf b/Master/bin/x86_64-darwin/hbf2gf
index fe4bd691c80..ca398bc5563 100755
--- a/Master/bin/x86_64-darwin/hbf2gf
+++ b/Master/bin/x86_64-darwin/hbf2gf
diff --git a/Master/bin/x86_64-darwin/kpsewhich b/Master/bin/x86_64-darwin/kpsewhich
index 3baa3cdc528..6657947ecb9 100755
--- a/Master/bin/x86_64-darwin/kpsewhich
+++ b/Master/bin/x86_64-darwin/kpsewhich
diff --git a/Master/bin/x86_64-darwin/luatex b/Master/bin/x86_64-darwin/luatex
index e270fec7452..7754d21ab0a 100755
--- a/Master/bin/x86_64-darwin/luatex
+++ b/Master/bin/x86_64-darwin/luatex
diff --git a/Master/bin/x86_64-darwin/makeindex b/Master/bin/x86_64-darwin/makeindex
index b275f5a77fa..d3d50c3922c 100755
--- a/Master/bin/x86_64-darwin/makeindex
+++ b/Master/bin/x86_64-darwin/makeindex
diff --git a/Master/bin/x86_64-darwin/makejvf b/Master/bin/x86_64-darwin/makejvf
index e7018543129..74fcd40cc39 100755
--- a/Master/bin/x86_64-darwin/makejvf
+++ b/Master/bin/x86_64-darwin/makejvf
diff --git a/Master/bin/x86_64-darwin/mendex b/Master/bin/x86_64-darwin/mendex
index 5ca9a163c6a..b629c7a801c 100755
--- a/Master/bin/x86_64-darwin/mendex
+++ b/Master/bin/x86_64-darwin/mendex
diff --git a/Master/bin/x86_64-darwin/mf b/Master/bin/x86_64-darwin/mf
index b5fad9e0983..c155214b036 100755
--- a/Master/bin/x86_64-darwin/mf
+++ b/Master/bin/x86_64-darwin/mf
diff --git a/Master/bin/x86_64-darwin/mf-nowin b/Master/bin/x86_64-darwin/mf-nowin
index c9cb6737232..c4abad0ef03 100755
--- a/Master/bin/x86_64-darwin/mf-nowin
+++ b/Master/bin/x86_64-darwin/mf-nowin
diff --git a/Master/bin/x86_64-darwin/mft b/Master/bin/x86_64-darwin/mft
index 1fe4edad096..9accbdf9918 100755
--- a/Master/bin/x86_64-darwin/mft
+++ b/Master/bin/x86_64-darwin/mft
diff --git a/Master/bin/x86_64-darwin/mktexmf b/Master/bin/x86_64-darwin/mktexmf
index 2bd683c7f0a..d5c77a8856d 100755
--- a/Master/bin/x86_64-darwin/mktexmf
+++ b/Master/bin/x86_64-darwin/mktexmf
@@ -7,7 +7,7 @@
 # Originally written by Thomas Esser.
 # Public domain.
 
-version='$Id: mktexmf 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexmf 26569 2012-05-22 16:05:18Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname FONT.
 
@@ -36,17 +36,20 @@ if test -n "$sauterroot"; then
   rootfile=$sauterroot
   rootname=b-$rootname
 else
-  case $rootname in
+  case $name in
     # csso12[0-5][0-9] from CJK package; unsupported by mktexmf
     csso12[0-5][0-9])
-       rootfile=;;
-    cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-       rootfile=`kpsewhich cscode.mf`;;
-    wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-       lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
-       rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+      rootfile=;;
     *)
-       rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+      case $rootname in
+        cs*|lcsss*|icscsc*|icstt*|ilcsss*)
+          rootfile=`kpsewhich cscode.mf`;;
+        wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
+          lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
+          rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+        *)
+          rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+      esac;;
   esac
 fi
 { test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1
diff --git a/Master/bin/x86_64-darwin/mpost b/Master/bin/x86_64-darwin/mpost
index 094e2c993d6..6c979043b1a 100755
--- a/Master/bin/x86_64-darwin/mpost
+++ b/Master/bin/x86_64-darwin/mpost
diff --git a/Master/bin/x86_64-darwin/odvicopy b/Master/bin/x86_64-darwin/odvicopy
index 90422c535ab..c281ab5fbc4 100755
--- a/Master/bin/x86_64-darwin/odvicopy
+++ b/Master/bin/x86_64-darwin/odvicopy
diff --git a/Master/bin/x86_64-darwin/odvitype b/Master/bin/x86_64-darwin/odvitype
index a38d83dd88c..34780e4f241 100755
--- a/Master/bin/x86_64-darwin/odvitype
+++ b/Master/bin/x86_64-darwin/odvitype
diff --git a/Master/bin/x86_64-darwin/omfonts b/Master/bin/x86_64-darwin/omfonts
index f68dc2d6579..13524e01d6a 100755
--- a/Master/bin/x86_64-darwin/omfonts
+++ b/Master/bin/x86_64-darwin/omfonts
diff --git a/Master/bin/x86_64-darwin/otangle b/Master/bin/x86_64-darwin/otangle
index 23d53662e5e..7ff21d6a3dc 100755
--- a/Master/bin/x86_64-darwin/otangle
+++ b/Master/bin/x86_64-darwin/otangle
diff --git a/Master/bin/x86_64-darwin/otftotfm b/Master/bin/x86_64-darwin/otftotfm
index 2a664c22baf..7df39d02182 100755
--- a/Master/bin/x86_64-darwin/otftotfm
+++ b/Master/bin/x86_64-darwin/otftotfm
diff --git a/Master/bin/x86_64-darwin/otp2ocp b/Master/bin/x86_64-darwin/otp2ocp
index 43432ab4c04..e87783ab440 100755
--- a/Master/bin/x86_64-darwin/otp2ocp
+++ b/Master/bin/x86_64-darwin/otp2ocp
diff --git a/Master/bin/x86_64-darwin/outocp b/Master/bin/x86_64-darwin/outocp
index 9c1b109f531..f9cb6f81b42 100755
--- a/Master/bin/x86_64-darwin/outocp
+++ b/Master/bin/x86_64-darwin/outocp
diff --git a/Master/bin/x86_64-darwin/pbibtex b/Master/bin/x86_64-darwin/pbibtex
index 497873c4466..9feed5af711 100755
--- a/Master/bin/x86_64-darwin/pbibtex
+++ b/Master/bin/x86_64-darwin/pbibtex
diff --git a/Master/bin/x86_64-darwin/pdftex b/Master/bin/x86_64-darwin/pdftex
index 59c728cdf7a..f5827e6a760 100755
--- a/Master/bin/x86_64-darwin/pdftex
+++ b/Master/bin/x86_64-darwin/pdftex
diff --git a/Master/bin/x86_64-darwin/pdvitype b/Master/bin/x86_64-darwin/pdvitype
index bbd6920f1b6..10c3984b14d 100755
--- a/Master/bin/x86_64-darwin/pdvitype
+++ b/Master/bin/x86_64-darwin/pdvitype
diff --git a/Master/bin/x86_64-darwin/pktogf b/Master/bin/x86_64-darwin/pktogf
index 89149d0838e..c36a9e72cea 100755
--- a/Master/bin/x86_64-darwin/pktogf
+++ b/Master/bin/x86_64-darwin/pktogf
diff --git a/Master/bin/x86_64-darwin/pktype b/Master/bin/x86_64-darwin/pktype
index a9e6d77cc9f..cb840431e52 100755
--- a/Master/bin/x86_64-darwin/pktype
+++ b/Master/bin/x86_64-darwin/pktype
diff --git a/Master/bin/x86_64-darwin/pmxab b/Master/bin/x86_64-darwin/pmxab
index d7c4214eb73..8108785903b 100755
--- a/Master/bin/x86_64-darwin/pmxab
+++ b/Master/bin/x86_64-darwin/pmxab
diff --git a/Master/bin/x86_64-darwin/ppltotf b/Master/bin/x86_64-darwin/ppltotf
index d065c0aac5d..a3510dbc1b3 100755
--- a/Master/bin/x86_64-darwin/ppltotf
+++ b/Master/bin/x86_64-darwin/ppltotf
diff --git a/Master/bin/x86_64-darwin/prepmx b/Master/bin/x86_64-darwin/prepmx
new file mode 100755
index 00000000000..7b5e3d31e61
--- /dev/null
+++ b/Master/bin/x86_64-darwin/prepmx
diff --git a/Master/bin/x86_64-darwin/ps2pk b/Master/bin/x86_64-darwin/ps2pk
index 4f0d27c54c1..b34765ed086 100755
--- a/Master/bin/x86_64-darwin/ps2pk
+++ b/Master/bin/x86_64-darwin/ps2pk
diff --git a/Master/bin/x86_64-darwin/ptex b/Master/bin/x86_64-darwin/ptex
index 12b6b969ac4..9d6b8dbb332 100755
--- a/Master/bin/x86_64-darwin/ptex
+++ b/Master/bin/x86_64-darwin/ptex
diff --git a/Master/bin/x86_64-darwin/ptftopl b/Master/bin/x86_64-darwin/ptftopl
index e49dc8af089..38a46798a79 100755
--- a/Master/bin/x86_64-darwin/ptftopl
+++ b/Master/bin/x86_64-darwin/ptftopl
diff --git a/Master/bin/x86_64-darwin/scor2prt b/Master/bin/x86_64-darwin/scor2prt
index 7670501cddb..1fb482245d4 100755
--- a/Master/bin/x86_64-darwin/scor2prt
+++ b/Master/bin/x86_64-darwin/scor2prt
diff --git a/Master/bin/x86_64-darwin/t4ht b/Master/bin/x86_64-darwin/t4ht
index bc9c2f10c50..7f23d978a8b 100755
--- a/Master/bin/x86_64-darwin/t4ht
+++ b/Master/bin/x86_64-darwin/t4ht
diff --git a/Master/bin/x86_64-darwin/tangle b/Master/bin/x86_64-darwin/tangle
index fb7b4285f79..b2f6a427be9 100755
--- a/Master/bin/x86_64-darwin/tangle
+++ b/Master/bin/x86_64-darwin/tangle
diff --git a/Master/bin/x86_64-darwin/teckit_compile b/Master/bin/x86_64-darwin/teckit_compile
index 7ef3c84dd95..7fb544b1cef 100755
--- a/Master/bin/x86_64-darwin/teckit_compile
+++ b/Master/bin/x86_64-darwin/teckit_compile
diff --git a/Master/bin/x86_64-darwin/tex b/Master/bin/x86_64-darwin/tex
index 761df7187ca..f410c6978a3 100755
--- a/Master/bin/x86_64-darwin/tex
+++ b/Master/bin/x86_64-darwin/tex
diff --git a/Master/bin/x86_64-darwin/tex4ht b/Master/bin/x86_64-darwin/tex4ht
index 1d1a856afcf..e4ca6e631bb 100755
--- a/Master/bin/x86_64-darwin/tex4ht
+++ b/Master/bin/x86_64-darwin/tex4ht
diff --git a/Master/bin/x86_64-darwin/tftopl b/Master/bin/x86_64-darwin/tftopl
index 37a54321969..f865a944d38 100755
--- a/Master/bin/x86_64-darwin/tftopl
+++ b/Master/bin/x86_64-darwin/tftopl
diff --git a/Master/bin/x86_64-darwin/tie b/Master/bin/x86_64-darwin/tie
index 556245aa8be..8ebf0fc346d 100755
--- a/Master/bin/x86_64-darwin/tie
+++ b/Master/bin/x86_64-darwin/tie
diff --git a/Master/bin/x86_64-darwin/ttf2afm b/Master/bin/x86_64-darwin/ttf2afm
index 1acec1e227d..07d54c39cc1 100755
--- a/Master/bin/x86_64-darwin/ttf2afm
+++ b/Master/bin/x86_64-darwin/ttf2afm
diff --git a/Master/bin/x86_64-darwin/ttf2pk b/Master/bin/x86_64-darwin/ttf2pk
index 0acfd82a4d2..93bad666c48 100755
--- a/Master/bin/x86_64-darwin/ttf2pk
+++ b/Master/bin/x86_64-darwin/ttf2pk
diff --git a/Master/bin/x86_64-darwin/ttf2tfm b/Master/bin/x86_64-darwin/ttf2tfm
index 145dcd0a7fe..c2cb17c7272 100755
--- a/Master/bin/x86_64-darwin/ttf2tfm
+++ b/Master/bin/x86_64-darwin/ttf2tfm
diff --git a/Master/bin/x86_64-darwin/upbibtex b/Master/bin/x86_64-darwin/upbibtex
index 136b358ab6b..5717d67897a 100755
--- a/Master/bin/x86_64-darwin/upbibtex
+++ b/Master/bin/x86_64-darwin/upbibtex
diff --git a/Master/bin/x86_64-darwin/updvitype b/Master/bin/x86_64-darwin/updvitype
index 9175377cb28..6b7de9c258b 100755
--- a/Master/bin/x86_64-darwin/updvitype
+++ b/Master/bin/x86_64-darwin/updvitype
diff --git a/Master/bin/x86_64-darwin/uppltotf b/Master/bin/x86_64-darwin/uppltotf
index f9bd9935b51..9ba1a67c624 100755
--- a/Master/bin/x86_64-darwin/uppltotf
+++ b/Master/bin/x86_64-darwin/uppltotf
diff --git a/Master/bin/x86_64-darwin/uptex b/Master/bin/x86_64-darwin/uptex
index 9831f7339de..74b3b90ead0 100755
--- a/Master/bin/x86_64-darwin/uptex
+++ b/Master/bin/x86_64-darwin/uptex
diff --git a/Master/bin/x86_64-darwin/uptftopl b/Master/bin/x86_64-darwin/uptftopl
index 69263a6f585..78bd00d734c 100755
--- a/Master/bin/x86_64-darwin/uptftopl
+++ b/Master/bin/x86_64-darwin/uptftopl
diff --git a/Master/bin/x86_64-darwin/vftovp b/Master/bin/x86_64-darwin/vftovp
index 4bd92f956ac..6b9699d0f43 100755
--- a/Master/bin/x86_64-darwin/vftovp
+++ b/Master/bin/x86_64-darwin/vftovp
diff --git a/Master/bin/x86_64-darwin/weave b/Master/bin/x86_64-darwin/weave
index 1ba4da83316..3b274408fe5 100755
--- a/Master/bin/x86_64-darwin/weave
+++ b/Master/bin/x86_64-darwin/weave
diff --git a/Master/bin/x86_64-darwin/wovp2ovf b/Master/bin/x86_64-darwin/wovp2ovf
new file mode 100755
index 00000000000..a23c316bd5a
--- /dev/null
+++ b/Master/bin/x86_64-darwin/wovp2ovf
diff --git a/Master/bin/x86_64-darwin/xdv2pdf b/Master/bin/x86_64-darwin/xdv2pdf
index f292e2aa9a8..6bfd9ebeb75 100755
--- a/Master/bin/x86_64-darwin/xdv2pdf
+++ b/Master/bin/x86_64-darwin/xdv2pdf
diff --git a/Master/bin/x86_64-darwin/xdvi-xaw b/Master/bin/x86_64-darwin/xdvi-xaw
index a63ab915689..eea7ddf11f4 100755
--- a/Master/bin/x86_64-darwin/xdvi-xaw
+++ b/Master/bin/x86_64-darwin/xdvi-xaw
diff --git a/Master/bin/x86_64-darwin/xdvipdfmx b/Master/bin/x86_64-darwin/xdvipdfmx
index d659c56ef9e..95ac3665057 100755
--- a/Master/bin/x86_64-darwin/xdvipdfmx
+++ b/Master/bin/x86_64-darwin/xdvipdfmx
diff --git a/Master/bin/x86_64-darwin/xetex b/Master/bin/x86_64-darwin/xetex
index 5c3e893b6e8..a784f1bc7f3 100755
--- a/Master/bin/x86_64-darwin/xetex
+++ b/Master/bin/x86_64-darwin/xetex