139 files changed, 24 insertions, 18 deletions

diff --git a/Master/bin/amd64-kfreebsd/afm2pl b/Master/bin/amd64-kfreebsd/afm2pl
index c260938ff1b..bf82ce518c2 100755
--- a/Master/bin/amd64-kfreebsd/afm2pl
+++ b/Master/bin/amd64-kfreebsd/afm2pl
diff --git a/Master/bin/amd64-kfreebsd/afm2tfm b/Master/bin/amd64-kfreebsd/afm2tfm
index a8f7384aea9..29ec281c6e4 100755
--- a/Master/bin/amd64-kfreebsd/afm2tfm
+++ b/Master/bin/amd64-kfreebsd/afm2tfm
diff --git a/Master/bin/amd64-kfreebsd/aleph b/Master/bin/amd64-kfreebsd/aleph
index 7bbe50aa16b..7757edcb868 100755
--- a/Master/bin/amd64-kfreebsd/aleph
+++ b/Master/bin/amd64-kfreebsd/aleph
diff --git a/Master/bin/amd64-kfreebsd/asy b/Master/bin/amd64-kfreebsd/asy
index dcb141e6656..d77725e0847 100755
--- a/Master/bin/amd64-kfreebsd/asy
+++ b/Master/bin/amd64-kfreebsd/asy
diff --git a/Master/bin/amd64-kfreebsd/bbox b/Master/bin/amd64-kfreebsd/bbox
index 481f91dbda4..57ba5cf9d0c 100755
--- a/Master/bin/amd64-kfreebsd/bbox
+++ b/Master/bin/amd64-kfreebsd/bbox
diff --git a/Master/bin/amd64-kfreebsd/bg5conv b/Master/bin/amd64-kfreebsd/bg5conv
index ae50d4ef206..66d5f3d4a53 100755
--- a/Master/bin/amd64-kfreebsd/bg5conv
+++ b/Master/bin/amd64-kfreebsd/bg5conv
diff --git a/Master/bin/amd64-kfreebsd/bibtex b/Master/bin/amd64-kfreebsd/bibtex
index 8c86a3b5446..d2d6c8acc39 100755
--- a/Master/bin/amd64-kfreebsd/bibtex
+++ b/Master/bin/amd64-kfreebsd/bibtex
diff --git a/Master/bin/amd64-kfreebsd/bibtex8 b/Master/bin/amd64-kfreebsd/bibtex8
index 08bebd07458..23148abea4c 100755
--- a/Master/bin/amd64-kfreebsd/bibtex8
+++ b/Master/bin/amd64-kfreebsd/bibtex8
diff --git a/Master/bin/amd64-kfreebsd/bibtexu b/Master/bin/amd64-kfreebsd/bibtexu
index c748dc5ceb0..d4887a62c8b 100755
--- a/Master/bin/amd64-kfreebsd/bibtexu
+++ b/Master/bin/amd64-kfreebsd/bibtexu
diff --git a/Master/bin/amd64-kfreebsd/cef5conv b/Master/bin/amd64-kfreebsd/cef5conv
index c31d58d3ca9..dfbcd3531f4 100755
--- a/Master/bin/amd64-kfreebsd/cef5conv
+++ b/Master/bin/amd64-kfreebsd/cef5conv
diff --git a/Master/bin/amd64-kfreebsd/cefconv b/Master/bin/amd64-kfreebsd/cefconv
index ec746c5e348..8675f59f386 100755
--- a/Master/bin/amd64-kfreebsd/cefconv
+++ b/Master/bin/amd64-kfreebsd/cefconv
diff --git a/Master/bin/amd64-kfreebsd/cefsconv b/Master/bin/amd64-kfreebsd/cefsconv
index 3d2254e57a2..a28ede27811 100755
--- a/Master/bin/amd64-kfreebsd/cefsconv
+++ b/Master/bin/amd64-kfreebsd/cefsconv
diff --git a/Master/bin/amd64-kfreebsd/cfftot1 b/Master/bin/amd64-kfreebsd/cfftot1
index ed328ebc7c5..a4142fb5ccf 100755
--- a/Master/bin/amd64-kfreebsd/cfftot1
+++ b/Master/bin/amd64-kfreebsd/cfftot1
diff --git a/Master/bin/amd64-kfreebsd/chktex b/Master/bin/amd64-kfreebsd/chktex
index 497e6ca60aa..747d18b565e 100755
--- a/Master/bin/amd64-kfreebsd/chktex
+++ b/Master/bin/amd64-kfreebsd/chktex
diff --git a/Master/bin/amd64-kfreebsd/ctangle b/Master/bin/amd64-kfreebsd/ctangle
index 7fbd01eebb7..47fe6773cb8 100755
--- a/Master/bin/amd64-kfreebsd/ctangle
+++ b/Master/bin/amd64-kfreebsd/ctangle
diff --git a/Master/bin/amd64-kfreebsd/ctie b/Master/bin/amd64-kfreebsd/ctie
index 17b43a4e206..877c3038114 100755
--- a/Master/bin/amd64-kfreebsd/ctie
+++ b/Master/bin/amd64-kfreebsd/ctie
diff --git a/Master/bin/amd64-kfreebsd/cweave b/Master/bin/amd64-kfreebsd/cweave
index a835fdd78fa..9769cc9cd12 100755
--- a/Master/bin/amd64-kfreebsd/cweave
+++ b/Master/bin/amd64-kfreebsd/cweave
diff --git a/Master/bin/amd64-kfreebsd/detex b/Master/bin/amd64-kfreebsd/detex
index 2505cd39fbf..37aed59b59f 100755
--- a/Master/bin/amd64-kfreebsd/detex
+++ b/Master/bin/amd64-kfreebsd/detex
diff --git a/Master/bin/amd64-kfreebsd/devnag b/Master/bin/amd64-kfreebsd/devnag
index 6a1e62c5107..57fa9d8bef9 100755
--- a/Master/bin/amd64-kfreebsd/devnag
+++ b/Master/bin/amd64-kfreebsd/devnag
diff --git a/Master/bin/amd64-kfreebsd/disdvi b/Master/bin/amd64-kfreebsd/disdvi
index 247ff39f296..4cf09579583 100755
--- a/Master/bin/amd64-kfreebsd/disdvi
+++ b/Master/bin/amd64-kfreebsd/disdvi
diff --git a/Master/bin/amd64-kfreebsd/dt2dv b/Master/bin/amd64-kfreebsd/dt2dv
index 866bee899de..0d1c904984f 100755
--- a/Master/bin/amd64-kfreebsd/dt2dv
+++ b/Master/bin/amd64-kfreebsd/dt2dv
diff --git a/Master/bin/amd64-kfreebsd/dv2dt b/Master/bin/amd64-kfreebsd/dv2dt
index 126b3e5cebe..792b057366c 100755
--- a/Master/bin/amd64-kfreebsd/dv2dt
+++ b/Master/bin/amd64-kfreebsd/dv2dt
diff --git a/Master/bin/amd64-kfreebsd/dvi2tty b/Master/bin/amd64-kfreebsd/dvi2tty
index 08156fc6652..a0571334d00 100755
--- a/Master/bin/amd64-kfreebsd/dvi2tty
+++ b/Master/bin/amd64-kfreebsd/dvi2tty
diff --git a/Master/bin/amd64-kfreebsd/dvibook b/Master/bin/amd64-kfreebsd/dvibook
index 25265d20683..4ce8fc87d1e 100755
--- a/Master/bin/amd64-kfreebsd/dvibook
+++ b/Master/bin/amd64-kfreebsd/dvibook
diff --git a/Master/bin/amd64-kfreebsd/dviconcat b/Master/bin/amd64-kfreebsd/dviconcat
index 18fdff3f2d9..15636817a57 100755
--- a/Master/bin/amd64-kfreebsd/dviconcat
+++ b/Master/bin/amd64-kfreebsd/dviconcat
diff --git a/Master/bin/amd64-kfreebsd/dvicopy b/Master/bin/amd64-kfreebsd/dvicopy
index d47441b01ef..e557d3468f4 100755
--- a/Master/bin/amd64-kfreebsd/dvicopy
+++ b/Master/bin/amd64-kfreebsd/dvicopy
diff --git a/Master/bin/amd64-kfreebsd/dvidvi b/Master/bin/amd64-kfreebsd/dvidvi
index e43e01b4dde..2c8fb6d832a 100755
--- a/Master/bin/amd64-kfreebsd/dvidvi
+++ b/Master/bin/amd64-kfreebsd/dvidvi
diff --git a/Master/bin/amd64-kfreebsd/dvilj b/Master/bin/amd64-kfreebsd/dvilj
index 0ac5833daba..9798ab4fd39 100755
--- a/Master/bin/amd64-kfreebsd/dvilj
+++ b/Master/bin/amd64-kfreebsd/dvilj
diff --git a/Master/bin/amd64-kfreebsd/dvilj2p b/Master/bin/amd64-kfreebsd/dvilj2p
index 35f8ac55dbb..63985d15f03 100755
--- a/Master/bin/amd64-kfreebsd/dvilj2p
+++ b/Master/bin/amd64-kfreebsd/dvilj2p
diff --git a/Master/bin/amd64-kfreebsd/dvilj4 b/Master/bin/amd64-kfreebsd/dvilj4
index 9e4195b1196..3c871a80412 100755
--- a/Master/bin/amd64-kfreebsd/dvilj4
+++ b/Master/bin/amd64-kfreebsd/dvilj4
diff --git a/Master/bin/amd64-kfreebsd/dvilj4l b/Master/bin/amd64-kfreebsd/dvilj4l
index 27367c0208b..5d4a7680f0b 100755
--- a/Master/bin/amd64-kfreebsd/dvilj4l
+++ b/Master/bin/amd64-kfreebsd/dvilj4l
diff --git a/Master/bin/amd64-kfreebsd/dvipdfmx b/Master/bin/amd64-kfreebsd/dvipdfmx
index 2e9481aabf4..b21d06e976f 100755
--- a/Master/bin/amd64-kfreebsd/dvipdfmx
+++ b/Master/bin/amd64-kfreebsd/dvipdfmx
diff --git a/Master/bin/amd64-kfreebsd/dvipng b/Master/bin/amd64-kfreebsd/dvipng
index 7294267bfab..3136269be4d 100755
--- a/Master/bin/amd64-kfreebsd/dvipng
+++ b/Master/bin/amd64-kfreebsd/dvipng
diff --git a/Master/bin/amd64-kfreebsd/dvipos b/Master/bin/amd64-kfreebsd/dvipos
index 48cfae1d2bd..34cd8c6c727 100755
--- a/Master/bin/amd64-kfreebsd/dvipos
+++ b/Master/bin/amd64-kfreebsd/dvipos
diff --git a/Master/bin/amd64-kfreebsd/dvips b/Master/bin/amd64-kfreebsd/dvips
index 300d2252ac6..40595ca077b 100755
--- a/Master/bin/amd64-kfreebsd/dvips
+++ b/Master/bin/amd64-kfreebsd/dvips
diff --git a/Master/bin/amd64-kfreebsd/dviselect b/Master/bin/amd64-kfreebsd/dviselect
index f2b39041418..5a61a230550 100755
--- a/Master/bin/amd64-kfreebsd/dviselect
+++ b/Master/bin/amd64-kfreebsd/dviselect
diff --git a/Master/bin/amd64-kfreebsd/dvisvgm b/Master/bin/amd64-kfreebsd/dvisvgm
index 91aaecfe200..d1e5a4e8af1 100755
--- a/Master/bin/amd64-kfreebsd/dvisvgm
+++ b/Master/bin/amd64-kfreebsd/dvisvgm
diff --git a/Master/bin/amd64-kfreebsd/dvitodvi b/Master/bin/amd64-kfreebsd/dvitodvi
index 030826705ef..718c96adf27 100755
--- a/Master/bin/amd64-kfreebsd/dvitodvi
+++ b/Master/bin/amd64-kfreebsd/dvitodvi
diff --git a/Master/bin/amd64-kfreebsd/dvitype b/Master/bin/amd64-kfreebsd/dvitype
index 89f32e5b66b..fecd35d5180 100755
--- a/Master/bin/amd64-kfreebsd/dvitype
+++ b/Master/bin/amd64-kfreebsd/dvitype
diff --git a/Master/bin/amd64-kfreebsd/epsffit b/Master/bin/amd64-kfreebsd/epsffit
index 7bf13ab1d7e..8e7660ea47c 100755
--- a/Master/bin/amd64-kfreebsd/epsffit
+++ b/Master/bin/amd64-kfreebsd/epsffit
diff --git a/Master/bin/amd64-kfreebsd/eptex b/Master/bin/amd64-kfreebsd/eptex
index 97988729490..bd3e3690589 100755
--- a/Master/bin/amd64-kfreebsd/eptex
+++ b/Master/bin/amd64-kfreebsd/eptex
diff --git a/Master/bin/amd64-kfreebsd/euptex b/Master/bin/amd64-kfreebsd/euptex
index 71db4b15631..7f26b3627af 100755
--- a/Master/bin/amd64-kfreebsd/euptex
+++ b/Master/bin/amd64-kfreebsd/euptex
diff --git a/Master/bin/amd64-kfreebsd/extconv b/Master/bin/amd64-kfreebsd/extconv
index 00d5fd6d8af..bab7bdbc100 100755
--- a/Master/bin/amd64-kfreebsd/extconv
+++ b/Master/bin/amd64-kfreebsd/extconv
diff --git a/Master/bin/amd64-kfreebsd/gftodvi b/Master/bin/amd64-kfreebsd/gftodvi
index 1ef2351aedb..bebd4e7116e 100755
--- a/Master/bin/amd64-kfreebsd/gftodvi
+++ b/Master/bin/amd64-kfreebsd/gftodvi
diff --git a/Master/bin/amd64-kfreebsd/gftopk b/Master/bin/amd64-kfreebsd/gftopk
index d14df968b9a..ad60568006d 100755
--- a/Master/bin/amd64-kfreebsd/gftopk
+++ b/Master/bin/amd64-kfreebsd/gftopk
diff --git a/Master/bin/amd64-kfreebsd/gftype b/Master/bin/amd64-kfreebsd/gftype
index 314b5b2dea9..99ca4827448 100755
--- a/Master/bin/amd64-kfreebsd/gftype
+++ b/Master/bin/amd64-kfreebsd/gftype
diff --git a/Master/bin/amd64-kfreebsd/gsftopk b/Master/bin/amd64-kfreebsd/gsftopk
index d249c1e2dbe..20847805b4f 100755
--- a/Master/bin/amd64-kfreebsd/gsftopk
+++ b/Master/bin/amd64-kfreebsd/gsftopk
diff --git a/Master/bin/amd64-kfreebsd/hbf2gf b/Master/bin/amd64-kfreebsd/hbf2gf
index d22022af7b8..404529ca239 100755
--- a/Master/bin/amd64-kfreebsd/hbf2gf
+++ b/Master/bin/amd64-kfreebsd/hbf2gf
diff --git a/Master/bin/amd64-kfreebsd/kpseaccess b/Master/bin/amd64-kfreebsd/kpseaccess
index 72ae1e4e47b..46381ecec01 100755
--- a/Master/bin/amd64-kfreebsd/kpseaccess
+++ b/Master/bin/amd64-kfreebsd/kpseaccess
diff --git a/Master/bin/amd64-kfreebsd/kpsereadlink b/Master/bin/amd64-kfreebsd/kpsereadlink
index 0e38242aca3..c0d95889166 100755
--- a/Master/bin/amd64-kfreebsd/kpsereadlink
+++ b/Master/bin/amd64-kfreebsd/kpsereadlink
diff --git a/Master/bin/amd64-kfreebsd/kpsestat b/Master/bin/amd64-kfreebsd/kpsestat
index fc8a9e35698..44c2ed33a0d 100755
--- a/Master/bin/amd64-kfreebsd/kpsestat
+++ b/Master/bin/amd64-kfreebsd/kpsestat
diff --git a/Master/bin/amd64-kfreebsd/kpsewhich b/Master/bin/amd64-kfreebsd/kpsewhich
index 985d2bedf48..58c1da3b7a8 100755
--- a/Master/bin/amd64-kfreebsd/kpsewhich
+++ b/Master/bin/amd64-kfreebsd/kpsewhich
diff --git a/Master/bin/amd64-kfreebsd/lacheck b/Master/bin/amd64-kfreebsd/lacheck
index 2ee45fa0c32..8131b43cca6 100755
--- a/Master/bin/amd64-kfreebsd/lacheck
+++ b/Master/bin/amd64-kfreebsd/lacheck
diff --git a/Master/bin/amd64-kfreebsd/luatex b/Master/bin/amd64-kfreebsd/luatex
index 8042d902ccf..3cd40288b13 100755
--- a/Master/bin/amd64-kfreebsd/luatex
+++ b/Master/bin/amd64-kfreebsd/luatex
diff --git a/Master/bin/amd64-kfreebsd/mag b/Master/bin/amd64-kfreebsd/mag
index c36995279eb..ee025a49103 100755
--- a/Master/bin/amd64-kfreebsd/mag
+++ b/Master/bin/amd64-kfreebsd/mag
diff --git a/Master/bin/amd64-kfreebsd/makeindex b/Master/bin/amd64-kfreebsd/makeindex
index 67a026c0bff..50d26b85473 100755
--- a/Master/bin/amd64-kfreebsd/makeindex
+++ b/Master/bin/amd64-kfreebsd/makeindex
diff --git a/Master/bin/amd64-kfreebsd/makejvf b/Master/bin/amd64-kfreebsd/makejvf
index 3409ed91c24..c2bd484a264 100755
--- a/Master/bin/amd64-kfreebsd/makejvf
+++ b/Master/bin/amd64-kfreebsd/makejvf
diff --git a/Master/bin/amd64-kfreebsd/mendex b/Master/bin/amd64-kfreebsd/mendex
index 5ce546a7255..f14889839f5 100755
--- a/Master/bin/amd64-kfreebsd/mendex
+++ b/Master/bin/amd64-kfreebsd/mendex
diff --git a/Master/bin/amd64-kfreebsd/mf b/Master/bin/amd64-kfreebsd/mf
index 421d8a617dd..d926ea3694d 100755
--- a/Master/bin/amd64-kfreebsd/mf
+++ b/Master/bin/amd64-kfreebsd/mf
diff --git a/Master/bin/amd64-kfreebsd/mf-nowin b/Master/bin/amd64-kfreebsd/mf-nowin
index e9b885a8879..169bdda3370 100755
--- a/Master/bin/amd64-kfreebsd/mf-nowin
+++ b/Master/bin/amd64-kfreebsd/mf-nowin
diff --git a/Master/bin/amd64-kfreebsd/mft b/Master/bin/amd64-kfreebsd/mft
index cecb34987b9..a205fc4b7ab 100755
--- a/Master/bin/amd64-kfreebsd/mft
+++ b/Master/bin/amd64-kfreebsd/mft
diff --git a/Master/bin/amd64-kfreebsd/mktexmf b/Master/bin/amd64-kfreebsd/mktexmf
index 2bd683c7f0a..d5c77a8856d 100755
--- a/Master/bin/amd64-kfreebsd/mktexmf
+++ b/Master/bin/amd64-kfreebsd/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/amd64-kfreebsd/mmafm b/Master/bin/amd64-kfreebsd/mmafm
index 972761f904d..f4e5db054e5 100755
--- a/Master/bin/amd64-kfreebsd/mmafm
+++ b/Master/bin/amd64-kfreebsd/mmafm
diff --git a/Master/bin/amd64-kfreebsd/mmpfb b/Master/bin/amd64-kfreebsd/mmpfb
index 9fe1feac8d0..6539c09cf83 100755
--- a/Master/bin/amd64-kfreebsd/mmpfb
+++ b/Master/bin/amd64-kfreebsd/mmpfb
diff --git a/Master/bin/amd64-kfreebsd/mpost b/Master/bin/amd64-kfreebsd/mpost
index 2f13faaec56..d7342d97c49 100755
--- a/Master/bin/amd64-kfreebsd/mpost
+++ b/Master/bin/amd64-kfreebsd/mpost
diff --git a/Master/bin/amd64-kfreebsd/odvicopy b/Master/bin/amd64-kfreebsd/odvicopy
index 7548f63258a..986aee0dff0 100755
--- a/Master/bin/amd64-kfreebsd/odvicopy
+++ b/Master/bin/amd64-kfreebsd/odvicopy
diff --git a/Master/bin/amd64-kfreebsd/odvitype b/Master/bin/amd64-kfreebsd/odvitype
index 134abc20e03..a27a65bc778 100755
--- a/Master/bin/amd64-kfreebsd/odvitype
+++ b/Master/bin/amd64-kfreebsd/odvitype
diff --git a/Master/bin/amd64-kfreebsd/omfonts b/Master/bin/amd64-kfreebsd/omfonts
index d74eb68adcc..2428d5f8ddc 100755
--- a/Master/bin/amd64-kfreebsd/omfonts
+++ b/Master/bin/amd64-kfreebsd/omfonts
diff --git a/Master/bin/amd64-kfreebsd/otangle b/Master/bin/amd64-kfreebsd/otangle
index bff7e0a6d1d..1ebaa4f85ff 100755
--- a/Master/bin/amd64-kfreebsd/otangle
+++ b/Master/bin/amd64-kfreebsd/otangle
diff --git a/Master/bin/amd64-kfreebsd/otfinfo b/Master/bin/amd64-kfreebsd/otfinfo
index 76dda65f65a..35585591a36 100755
--- a/Master/bin/amd64-kfreebsd/otfinfo
+++ b/Master/bin/amd64-kfreebsd/otfinfo
diff --git a/Master/bin/amd64-kfreebsd/otftotfm b/Master/bin/amd64-kfreebsd/otftotfm
index b1b9352eb38..0189afa6e68 100755
--- a/Master/bin/amd64-kfreebsd/otftotfm
+++ b/Master/bin/amd64-kfreebsd/otftotfm
diff --git a/Master/bin/amd64-kfreebsd/otp2ocp b/Master/bin/amd64-kfreebsd/otp2ocp
index 6f9ae5564ef..639e7a422dd 100755
--- a/Master/bin/amd64-kfreebsd/otp2ocp
+++ b/Master/bin/amd64-kfreebsd/otp2ocp
diff --git a/Master/bin/amd64-kfreebsd/outocp b/Master/bin/amd64-kfreebsd/outocp
index 8ce4576c4d8..432ef45d3c9 100755
--- a/Master/bin/amd64-kfreebsd/outocp
+++ b/Master/bin/amd64-kfreebsd/outocp
diff --git a/Master/bin/amd64-kfreebsd/patgen b/Master/bin/amd64-kfreebsd/patgen
index 461ebb3b08b..e713a11beb5 100755
--- a/Master/bin/amd64-kfreebsd/patgen
+++ b/Master/bin/amd64-kfreebsd/patgen
diff --git a/Master/bin/amd64-kfreebsd/pbibtex b/Master/bin/amd64-kfreebsd/pbibtex
index 5f9807d95b1..fdf893a1e50 100755
--- a/Master/bin/amd64-kfreebsd/pbibtex
+++ b/Master/bin/amd64-kfreebsd/pbibtex
diff --git a/Master/bin/amd64-kfreebsd/pdfclose b/Master/bin/amd64-kfreebsd/pdfclose
index b1001037f2a..17d23643cae 100755
--- a/Master/bin/amd64-kfreebsd/pdfclose
+++ b/Master/bin/amd64-kfreebsd/pdfclose
diff --git a/Master/bin/amd64-kfreebsd/pdfopen b/Master/bin/amd64-kfreebsd/pdfopen
index 7bb9c1b99bf..61447b4932a 100755
--- a/Master/bin/amd64-kfreebsd/pdfopen
+++ b/Master/bin/amd64-kfreebsd/pdfopen
diff --git a/Master/bin/amd64-kfreebsd/pdftex b/Master/bin/amd64-kfreebsd/pdftex
index a9cd7778deb..ae186430525 100755
--- a/Master/bin/amd64-kfreebsd/pdftex
+++ b/Master/bin/amd64-kfreebsd/pdftex
diff --git a/Master/bin/amd64-kfreebsd/pdftosrc b/Master/bin/amd64-kfreebsd/pdftosrc
index 721266da263..cb49925d308 100755
--- a/Master/bin/amd64-kfreebsd/pdftosrc
+++ b/Master/bin/amd64-kfreebsd/pdftosrc
diff --git a/Master/bin/amd64-kfreebsd/pdvitype b/Master/bin/amd64-kfreebsd/pdvitype
index 2577640a0ac..0ac0604278f 100755
--- a/Master/bin/amd64-kfreebsd/pdvitype
+++ b/Master/bin/amd64-kfreebsd/pdvitype
diff --git a/Master/bin/amd64-kfreebsd/pfb2pfa b/Master/bin/amd64-kfreebsd/pfb2pfa
index 51b17c9316e..56568f4acc0 100755
--- a/Master/bin/amd64-kfreebsd/pfb2pfa
+++ b/Master/bin/amd64-kfreebsd/pfb2pfa
diff --git a/Master/bin/amd64-kfreebsd/pk2bm b/Master/bin/amd64-kfreebsd/pk2bm
index ce83f061f08..ed95da7ecb2 100755
--- a/Master/bin/amd64-kfreebsd/pk2bm
+++ b/Master/bin/amd64-kfreebsd/pk2bm
diff --git a/Master/bin/amd64-kfreebsd/pktogf b/Master/bin/amd64-kfreebsd/pktogf
index a3cd9d74024..99c1c541a15 100755
--- a/Master/bin/amd64-kfreebsd/pktogf
+++ b/Master/bin/amd64-kfreebsd/pktogf
diff --git a/Master/bin/amd64-kfreebsd/pktype b/Master/bin/amd64-kfreebsd/pktype
index fcaf737a40a..c11e59b3aa2 100755
--- a/Master/bin/amd64-kfreebsd/pktype
+++ b/Master/bin/amd64-kfreebsd/pktype
diff --git a/Master/bin/amd64-kfreebsd/pltotf b/Master/bin/amd64-kfreebsd/pltotf
index 3c419abd0c0..f31c7ca1c5d 100755
--- a/Master/bin/amd64-kfreebsd/pltotf
+++ b/Master/bin/amd64-kfreebsd/pltotf
diff --git a/Master/bin/amd64-kfreebsd/pmxab b/Master/bin/amd64-kfreebsd/pmxab
index f9b337ce40d..04fe21ed2f7 100755
--- a/Master/bin/amd64-kfreebsd/pmxab
+++ b/Master/bin/amd64-kfreebsd/pmxab
diff --git a/Master/bin/amd64-kfreebsd/pooltype b/Master/bin/amd64-kfreebsd/pooltype
index 5642677605e..241908cd492 100755
--- a/Master/bin/amd64-kfreebsd/pooltype
+++ b/Master/bin/amd64-kfreebsd/pooltype
diff --git a/Master/bin/amd64-kfreebsd/ppltotf b/Master/bin/amd64-kfreebsd/ppltotf
index 4cc0d934981..1a552944e9d 100755
--- a/Master/bin/amd64-kfreebsd/ppltotf
+++ b/Master/bin/amd64-kfreebsd/ppltotf
diff --git a/Master/bin/amd64-kfreebsd/prepmx b/Master/bin/amd64-kfreebsd/prepmx
index 4c554cca694..c57bde5f4da 100755
--- a/Master/bin/amd64-kfreebsd/prepmx
+++ b/Master/bin/amd64-kfreebsd/prepmx
diff --git a/Master/bin/amd64-kfreebsd/ps2pk b/Master/bin/amd64-kfreebsd/ps2pk
index 09787385225..d9151fff025 100755
--- a/Master/bin/amd64-kfreebsd/ps2pk
+++ b/Master/bin/amd64-kfreebsd/ps2pk
diff --git a/Master/bin/amd64-kfreebsd/psbook b/Master/bin/amd64-kfreebsd/psbook
index fdfd3d4a9e6..e25da2e8940 100755
--- a/Master/bin/amd64-kfreebsd/psbook
+++ b/Master/bin/amd64-kfreebsd/psbook
diff --git a/Master/bin/amd64-kfreebsd/psnup b/Master/bin/amd64-kfreebsd/psnup
index 703441975a3..9e850ef3c43 100755
--- a/Master/bin/amd64-kfreebsd/psnup
+++ b/Master/bin/amd64-kfreebsd/psnup
diff --git a/Master/bin/amd64-kfreebsd/psresize b/Master/bin/amd64-kfreebsd/psresize
index 7d118b4b870..7ab5e45758e 100755
--- a/Master/bin/amd64-kfreebsd/psresize
+++ b/Master/bin/amd64-kfreebsd/psresize
diff --git a/Master/bin/amd64-kfreebsd/psselect b/Master/bin/amd64-kfreebsd/psselect
index 1f3d0826c97..fce7ba678aa 100755
--- a/Master/bin/amd64-kfreebsd/psselect
+++ b/Master/bin/amd64-kfreebsd/psselect
diff --git a/Master/bin/amd64-kfreebsd/pstops b/Master/bin/amd64-kfreebsd/pstops
index d9146895b20..133ed8a681c 100755
--- a/Master/bin/amd64-kfreebsd/pstops
+++ b/Master/bin/amd64-kfreebsd/pstops
diff --git a/Master/bin/amd64-kfreebsd/ptex b/Master/bin/amd64-kfreebsd/ptex
index 1bf3bb26965..d433c97c564 100755
--- a/Master/bin/amd64-kfreebsd/ptex
+++ b/Master/bin/amd64-kfreebsd/ptex
diff --git a/Master/bin/amd64-kfreebsd/ptftopl b/Master/bin/amd64-kfreebsd/ptftopl
index 01bc0d30f09..285816f6e9f 100755
--- a/Master/bin/amd64-kfreebsd/ptftopl
+++ b/Master/bin/amd64-kfreebsd/ptftopl
diff --git a/Master/bin/amd64-kfreebsd/scor2prt b/Master/bin/amd64-kfreebsd/scor2prt
index 3170dbf5612..4455aa76b8c 100755
--- a/Master/bin/amd64-kfreebsd/scor2prt
+++ b/Master/bin/amd64-kfreebsd/scor2prt
diff --git a/Master/bin/amd64-kfreebsd/sjisconv b/Master/bin/amd64-kfreebsd/sjisconv
index ce1a88114ad..adf82041c7e 100755
--- a/Master/bin/amd64-kfreebsd/sjisconv
+++ b/Master/bin/amd64-kfreebsd/sjisconv
diff --git a/Master/bin/amd64-kfreebsd/synctex b/Master/bin/amd64-kfreebsd/synctex
index f82dadb23ae..9d79871bb4b 100755
--- a/Master/bin/amd64-kfreebsd/synctex
+++ b/Master/bin/amd64-kfreebsd/synctex
diff --git a/Master/bin/amd64-kfreebsd/t1ascii b/Master/bin/amd64-kfreebsd/t1ascii
index 6c9b1161e53..185cbbd639c 100755
--- a/Master/bin/amd64-kfreebsd/t1ascii
+++ b/Master/bin/amd64-kfreebsd/t1ascii
diff --git a/Master/bin/amd64-kfreebsd/t1asm b/Master/bin/amd64-kfreebsd/t1asm
index e93ba232a34..a1513aafb03 100755
--- a/Master/bin/amd64-kfreebsd/t1asm
+++ b/Master/bin/amd64-kfreebsd/t1asm
diff --git a/Master/bin/amd64-kfreebsd/t1binary b/Master/bin/amd64-kfreebsd/t1binary
index 41e1af930b9..519f6f82f12 100755
--- a/Master/bin/amd64-kfreebsd/t1binary
+++ b/Master/bin/amd64-kfreebsd/t1binary
diff --git a/Master/bin/amd64-kfreebsd/t1disasm b/Master/bin/amd64-kfreebsd/t1disasm
index 50d9ffaab0f..d9468180b84 100755
--- a/Master/bin/amd64-kfreebsd/t1disasm
+++ b/Master/bin/amd64-kfreebsd/t1disasm
diff --git a/Master/bin/amd64-kfreebsd/t1dotlessj b/Master/bin/amd64-kfreebsd/t1dotlessj
index 30c681ee978..ef46bcbbab8 100755
--- a/Master/bin/amd64-kfreebsd/t1dotlessj
+++ b/Master/bin/amd64-kfreebsd/t1dotlessj
diff --git a/Master/bin/amd64-kfreebsd/t1lint b/Master/bin/amd64-kfreebsd/t1lint
index 43cd8a30699..def6601463e 100755
--- a/Master/bin/amd64-kfreebsd/t1lint
+++ b/Master/bin/amd64-kfreebsd/t1lint
diff --git a/Master/bin/amd64-kfreebsd/t1mac b/Master/bin/amd64-kfreebsd/t1mac
index 6dd23f46d76..89f08e915da 100755
--- a/Master/bin/amd64-kfreebsd/t1mac
+++ b/Master/bin/amd64-kfreebsd/t1mac
diff --git a/Master/bin/amd64-kfreebsd/t1rawafm b/Master/bin/amd64-kfreebsd/t1rawafm
index 23b7b2f4228..0a8eb197793 100755
--- a/Master/bin/amd64-kfreebsd/t1rawafm
+++ b/Master/bin/amd64-kfreebsd/t1rawafm
diff --git a/Master/bin/amd64-kfreebsd/t1reencode b/Master/bin/amd64-kfreebsd/t1reencode
index 0832a605787..e6cdd9f1bc7 100755
--- a/Master/bin/amd64-kfreebsd/t1reencode
+++ b/Master/bin/amd64-kfreebsd/t1reencode
diff --git a/Master/bin/amd64-kfreebsd/t1testpage b/Master/bin/amd64-kfreebsd/t1testpage
index ad22d5d07c9..66624490af2 100755
--- a/Master/bin/amd64-kfreebsd/t1testpage
+++ b/Master/bin/amd64-kfreebsd/t1testpage
diff --git a/Master/bin/amd64-kfreebsd/t1unmac b/Master/bin/amd64-kfreebsd/t1unmac
index 311c5be99d7..42ed6bd6c0c 100755
--- a/Master/bin/amd64-kfreebsd/t1unmac
+++ b/Master/bin/amd64-kfreebsd/t1unmac
diff --git a/Master/bin/amd64-kfreebsd/t4ht b/Master/bin/amd64-kfreebsd/t4ht
index 7c58c28a27d..4fc6a3b8a7a 100755
--- a/Master/bin/amd64-kfreebsd/t4ht
+++ b/Master/bin/amd64-kfreebsd/t4ht
diff --git a/Master/bin/amd64-kfreebsd/tangle b/Master/bin/amd64-kfreebsd/tangle
index b973fc97f27..17ecf9a6ae6 100755
--- a/Master/bin/amd64-kfreebsd/tangle
+++ b/Master/bin/amd64-kfreebsd/tangle
diff --git a/Master/bin/amd64-kfreebsd/teckit_compile b/Master/bin/amd64-kfreebsd/teckit_compile
index c4cbe82d037..0fbf2b171c6 100755
--- a/Master/bin/amd64-kfreebsd/teckit_compile
+++ b/Master/bin/amd64-kfreebsd/teckit_compile
diff --git a/Master/bin/amd64-kfreebsd/tex b/Master/bin/amd64-kfreebsd/tex
index 949ba3dfcf5..32cc7fe465b 100755
--- a/Master/bin/amd64-kfreebsd/tex
+++ b/Master/bin/amd64-kfreebsd/tex
diff --git a/Master/bin/amd64-kfreebsd/tex2xindy b/Master/bin/amd64-kfreebsd/tex2xindy
index ad582314299..70bf71a18c9 100755
--- a/Master/bin/amd64-kfreebsd/tex2xindy
+++ b/Master/bin/amd64-kfreebsd/tex2xindy
diff --git a/Master/bin/amd64-kfreebsd/tex4ht b/Master/bin/amd64-kfreebsd/tex4ht
index 2cbc30e10aa..235c28248b5 100755
--- a/Master/bin/amd64-kfreebsd/tex4ht
+++ b/Master/bin/amd64-kfreebsd/tex4ht
diff --git a/Master/bin/amd64-kfreebsd/tftopl b/Master/bin/amd64-kfreebsd/tftopl
index 9586a6c73a1..88710811f4a 100755
--- a/Master/bin/amd64-kfreebsd/tftopl
+++ b/Master/bin/amd64-kfreebsd/tftopl
diff --git a/Master/bin/amd64-kfreebsd/tie b/Master/bin/amd64-kfreebsd/tie
index f4e334d523f..ac1fd440310 100755
--- a/Master/bin/amd64-kfreebsd/tie
+++ b/Master/bin/amd64-kfreebsd/tie
diff --git a/Master/bin/amd64-kfreebsd/ttf2afm b/Master/bin/amd64-kfreebsd/ttf2afm
index 79e143096fb..ccc61e92eff 100755
--- a/Master/bin/amd64-kfreebsd/ttf2afm
+++ b/Master/bin/amd64-kfreebsd/ttf2afm
diff --git a/Master/bin/amd64-kfreebsd/ttf2pk b/Master/bin/amd64-kfreebsd/ttf2pk
index 3ae9aa67ace..103f13c2a41 100755
--- a/Master/bin/amd64-kfreebsd/ttf2pk
+++ b/Master/bin/amd64-kfreebsd/ttf2pk
diff --git a/Master/bin/amd64-kfreebsd/ttf2tfm b/Master/bin/amd64-kfreebsd/ttf2tfm
index dd276d68d17..e3476cdf6e9 100755
--- a/Master/bin/amd64-kfreebsd/ttf2tfm
+++ b/Master/bin/amd64-kfreebsd/ttf2tfm
diff --git a/Master/bin/amd64-kfreebsd/ttfdump b/Master/bin/amd64-kfreebsd/ttfdump
index ec6c4118180..1e23d39187e 100755
--- a/Master/bin/amd64-kfreebsd/ttfdump
+++ b/Master/bin/amd64-kfreebsd/ttfdump
diff --git a/Master/bin/amd64-kfreebsd/ttftotype42 b/Master/bin/amd64-kfreebsd/ttftotype42
index 7a56f581541..c1fdbe123b6 100755
--- a/Master/bin/amd64-kfreebsd/ttftotype42
+++ b/Master/bin/amd64-kfreebsd/ttftotype42
diff --git a/Master/bin/amd64-kfreebsd/upbibtex b/Master/bin/amd64-kfreebsd/upbibtex
index 6eb538eebc3..64f9709311c 100755
--- a/Master/bin/amd64-kfreebsd/upbibtex
+++ b/Master/bin/amd64-kfreebsd/upbibtex
diff --git a/Master/bin/amd64-kfreebsd/updvitype b/Master/bin/amd64-kfreebsd/updvitype
index 457cfeb922e..b643cd19b33 100755
--- a/Master/bin/amd64-kfreebsd/updvitype
+++ b/Master/bin/amd64-kfreebsd/updvitype
diff --git a/Master/bin/amd64-kfreebsd/uppltotf b/Master/bin/amd64-kfreebsd/uppltotf
index 5d94762a880..6fa9796edae 100755
--- a/Master/bin/amd64-kfreebsd/uppltotf
+++ b/Master/bin/amd64-kfreebsd/uppltotf
diff --git a/Master/bin/amd64-kfreebsd/uptex b/Master/bin/amd64-kfreebsd/uptex
index bd90a1e5d10..b2e392f9563 100755
--- a/Master/bin/amd64-kfreebsd/uptex
+++ b/Master/bin/amd64-kfreebsd/uptex
diff --git a/Master/bin/amd64-kfreebsd/uptftopl b/Master/bin/amd64-kfreebsd/uptftopl
index 84fa49e21fb..5a9968ec48b 100755
--- a/Master/bin/amd64-kfreebsd/uptftopl
+++ b/Master/bin/amd64-kfreebsd/uptftopl
diff --git a/Master/bin/amd64-kfreebsd/vftovp b/Master/bin/amd64-kfreebsd/vftovp
index a388e6f5710..75d9e24d9cd 100755
--- a/Master/bin/amd64-kfreebsd/vftovp
+++ b/Master/bin/amd64-kfreebsd/vftovp
diff --git a/Master/bin/amd64-kfreebsd/vlna b/Master/bin/amd64-kfreebsd/vlna
index 0784deab01d..73c59693946 100755
--- a/Master/bin/amd64-kfreebsd/vlna
+++ b/Master/bin/amd64-kfreebsd/vlna
diff --git a/Master/bin/amd64-kfreebsd/vptovf b/Master/bin/amd64-kfreebsd/vptovf
index 1ec1dcd6832..a7d8e361e07 100755
--- a/Master/bin/amd64-kfreebsd/vptovf
+++ b/Master/bin/amd64-kfreebsd/vptovf
diff --git a/Master/bin/amd64-kfreebsd/weave b/Master/bin/amd64-kfreebsd/weave
index 75c9ebd1998..658589c2798 100755
--- a/Master/bin/amd64-kfreebsd/weave
+++ b/Master/bin/amd64-kfreebsd/weave
diff --git a/Master/bin/amd64-kfreebsd/wovp2ovf b/Master/bin/amd64-kfreebsd/wovp2ovf
index 9c4b14e0712..39b7a22603c 100755
--- a/Master/bin/amd64-kfreebsd/wovp2ovf
+++ b/Master/bin/amd64-kfreebsd/wovp2ovf
diff --git a/Master/bin/amd64-kfreebsd/xdvi-xaw b/Master/bin/amd64-kfreebsd/xdvi-xaw
index 82b083ee83a..e329bc7e005 100755
--- a/Master/bin/amd64-kfreebsd/xdvi-xaw
+++ b/Master/bin/amd64-kfreebsd/xdvi-xaw
diff --git a/Master/bin/amd64-kfreebsd/xdvipdfmx b/Master/bin/amd64-kfreebsd/xdvipdfmx
index c63ad3d0b6e..4750c68cb6b 100755
--- a/Master/bin/amd64-kfreebsd/xdvipdfmx
+++ b/Master/bin/amd64-kfreebsd/xdvipdfmx
diff --git a/Master/bin/amd64-kfreebsd/xetex b/Master/bin/amd64-kfreebsd/xetex
index 6df59b006c3..670dcf499b1 100755
--- a/Master/bin/amd64-kfreebsd/xetex
+++ b/Master/bin/amd64-kfreebsd/xetex
diff --git a/Master/bin/i386-kfreebsd/luatex b/Master/bin/i386-kfreebsd/luatex
index 6992ca15530..e1e9c18ec7d 100755
--- a/Master/bin/i386-kfreebsd/luatex
+++ b/Master/bin/i386-kfreebsd/luatex
diff --git a/Master/bin/i386-kfreebsd/mktexmf b/Master/bin/i386-kfreebsd/mktexmf
index 2bd683c7f0a..d5c77a8856d 100755
--- a/Master/bin/i386-kfreebsd/mktexmf
+++ b/Master/bin/i386-kfreebsd/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