132 files changed, 31 insertions, 14 deletions

diff --git a/Master/bin/x86_64-darwin/T1Wrap b/Master/bin/x86_64-darwin/T1Wrap
index 5fff753398a..5dd61af762a 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 e7c69cd294d..d4c4509e921 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 19c7ed5e61a..d10fae645d7 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 78b29f51f16..6cf84c9d8c0 100755
--- a/Master/bin/x86_64-darwin/aleph
+++ b/Master/bin/x86_64-darwin/aleph
diff --git a/Master/bin/x86_64-darwin/asy b/Master/bin/x86_64-darwin/asy
index c9437b52d70..84cadde6604 100755
--- a/Master/bin/x86_64-darwin/asy
+++ b/Master/bin/x86_64-darwin/asy
diff --git a/Master/bin/x86_64-darwin/bbox b/Master/bin/x86_64-darwin/bbox
index 44c64322c88..b150c01c751 100755
--- a/Master/bin/x86_64-darwin/bbox
+++ b/Master/bin/x86_64-darwin/bbox
diff --git a/Master/bin/x86_64-darwin/bg5conv b/Master/bin/x86_64-darwin/bg5conv
index e4bb7748a2d..3e9b220625f 100755
--- a/Master/bin/x86_64-darwin/bg5conv
+++ b/Master/bin/x86_64-darwin/bg5conv
diff --git a/Master/bin/x86_64-darwin/bibtex b/Master/bin/x86_64-darwin/bibtex
index 0f6e181378e..66138c7819d 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 3750e5304f7..24524cbc6b3 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 f6d9eb1d499..2ccd37671a2 100755
--- a/Master/bin/x86_64-darwin/bibtexu
+++ b/Master/bin/x86_64-darwin/bibtexu
diff --git a/Master/bin/x86_64-darwin/cef5conv b/Master/bin/x86_64-darwin/cef5conv
index 1716e7f9be3..274fc8bcb1a 100755
--- a/Master/bin/x86_64-darwin/cef5conv
+++ b/Master/bin/x86_64-darwin/cef5conv
diff --git a/Master/bin/x86_64-darwin/cefconv b/Master/bin/x86_64-darwin/cefconv
index a8e14481d03..791724034b3 100755
--- a/Master/bin/x86_64-darwin/cefconv
+++ b/Master/bin/x86_64-darwin/cefconv
diff --git a/Master/bin/x86_64-darwin/cefsconv b/Master/bin/x86_64-darwin/cefsconv
index 5551bb900f7..c52f4371882 100755
--- a/Master/bin/x86_64-darwin/cefsconv
+++ b/Master/bin/x86_64-darwin/cefsconv
diff --git a/Master/bin/x86_64-darwin/cfftot1 b/Master/bin/x86_64-darwin/cfftot1
index 0a441915c13..33b33802c52 100755
--- a/Master/bin/x86_64-darwin/cfftot1
+++ b/Master/bin/x86_64-darwin/cfftot1
diff --git a/Master/bin/x86_64-darwin/chktex b/Master/bin/x86_64-darwin/chktex
index 98dc74e7254..3b58e080cc7 100755
--- a/Master/bin/x86_64-darwin/chktex
+++ b/Master/bin/x86_64-darwin/chktex
diff --git a/Master/bin/x86_64-darwin/ctangle b/Master/bin/x86_64-darwin/ctangle
index ec394df0109..1d035474d31 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 52a713ba58b..bd059866631 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 26342db39b0..d57eebdd719 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 d79a0c2a1f2..b4247467eeb 100755
--- a/Master/bin/x86_64-darwin/detex
+++ b/Master/bin/x86_64-darwin/detex
diff --git a/Master/bin/x86_64-darwin/devnag b/Master/bin/x86_64-darwin/devnag
index 526fec5d7d7..a01a349b4d3 100755
--- a/Master/bin/x86_64-darwin/devnag
+++ b/Master/bin/x86_64-darwin/devnag
diff --git a/Master/bin/x86_64-darwin/disdvi b/Master/bin/x86_64-darwin/disdvi
index c7957128ab6..0c8b7daa76b 100755
--- a/Master/bin/x86_64-darwin/disdvi
+++ b/Master/bin/x86_64-darwin/disdvi
diff --git a/Master/bin/x86_64-darwin/dt2dv b/Master/bin/x86_64-darwin/dt2dv
index b2c9b94b2a3..5a4abf9b7b3 100755
--- a/Master/bin/x86_64-darwin/dt2dv
+++ b/Master/bin/x86_64-darwin/dt2dv
diff --git a/Master/bin/x86_64-darwin/dv2dt b/Master/bin/x86_64-darwin/dv2dt
index f9bc552f173..a5109783c46 100755
--- a/Master/bin/x86_64-darwin/dv2dt
+++ b/Master/bin/x86_64-darwin/dv2dt
diff --git a/Master/bin/x86_64-darwin/dvi2tty b/Master/bin/x86_64-darwin/dvi2tty
index 13e62458c21..4052874fec4 100755
--- a/Master/bin/x86_64-darwin/dvi2tty
+++ b/Master/bin/x86_64-darwin/dvi2tty
diff --git a/Master/bin/x86_64-darwin/dvibook b/Master/bin/x86_64-darwin/dvibook
index f2ed10f13da..41ad2ed5b0e 100755
--- a/Master/bin/x86_64-darwin/dvibook
+++ b/Master/bin/x86_64-darwin/dvibook
diff --git a/Master/bin/x86_64-darwin/dviconcat b/Master/bin/x86_64-darwin/dviconcat
index a0ebb78896f..09715128a05 100755
--- a/Master/bin/x86_64-darwin/dviconcat
+++ b/Master/bin/x86_64-darwin/dviconcat
diff --git a/Master/bin/x86_64-darwin/dvicopy b/Master/bin/x86_64-darwin/dvicopy
index bc99a728792..2f089fe2265 100755
--- a/Master/bin/x86_64-darwin/dvicopy
+++ b/Master/bin/x86_64-darwin/dvicopy
diff --git a/Master/bin/x86_64-darwin/dvidvi b/Master/bin/x86_64-darwin/dvidvi
index 2a5edfe46ec..e56c3d6a3da 100755
--- a/Master/bin/x86_64-darwin/dvidvi
+++ b/Master/bin/x86_64-darwin/dvidvi
diff --git a/Master/bin/x86_64-darwin/dvilj b/Master/bin/x86_64-darwin/dvilj
index c27f0399d65..42002289282 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 21b809ef4aa..1a073f498e4 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 468e30a3d5f..ff0c1f2af23 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 89692920a6d..b2753ab7ea3 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 e3019239d24..2cb60c26879 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 cd23fc4fbce..7d316d39740 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 50254b015c1..9373fc6412c 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 75caf620e65..cc5f9ae69f7 100755
--- a/Master/bin/x86_64-darwin/dvips
+++ b/Master/bin/x86_64-darwin/dvips
diff --git a/Master/bin/x86_64-darwin/dviselect b/Master/bin/x86_64-darwin/dviselect
index f0aafb4ef19..585f87e7895 100755
--- a/Master/bin/x86_64-darwin/dviselect
+++ b/Master/bin/x86_64-darwin/dviselect
diff --git a/Master/bin/x86_64-darwin/dvisvgm b/Master/bin/x86_64-darwin/dvisvgm
index 9b4dd4c1b15..14bdd411f13 100755
--- a/Master/bin/x86_64-darwin/dvisvgm
+++ b/Master/bin/x86_64-darwin/dvisvgm
diff --git a/Master/bin/x86_64-darwin/dvitodvi b/Master/bin/x86_64-darwin/dvitodvi
index 997066f8ea2..53726dd633a 100755
--- a/Master/bin/x86_64-darwin/dvitodvi
+++ b/Master/bin/x86_64-darwin/dvitodvi
diff --git a/Master/bin/x86_64-darwin/dvitype b/Master/bin/x86_64-darwin/dvitype
index 9092913b335..3e39897b448 100755
--- a/Master/bin/x86_64-darwin/dvitype
+++ b/Master/bin/x86_64-darwin/dvitype
diff --git a/Master/bin/x86_64-darwin/epsffit b/Master/bin/x86_64-darwin/epsffit
index 742c446902f..1cab7ca1bec 100755
--- a/Master/bin/x86_64-darwin/epsffit
+++ b/Master/bin/x86_64-darwin/epsffit
diff --git a/Master/bin/x86_64-darwin/extconv b/Master/bin/x86_64-darwin/extconv
index 332b9f65955..d98b61e19bc 100755
--- a/Master/bin/x86_64-darwin/extconv
+++ b/Master/bin/x86_64-darwin/extconv
diff --git a/Master/bin/x86_64-darwin/fmtutil b/Master/bin/x86_64-darwin/fmtutil
index 2aa8c3a0643..7465b9680a2 100755
--- a/Master/bin/x86_64-darwin/fmtutil
+++ b/Master/bin/x86_64-darwin/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 18913 2010-06-12 16:17:53Z karl $'
+version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -126,8 +126,10 @@ Valid commands for fmtutil:
   --version                  show version info
   --help                     show this message
 
-The config file is named fmtutil.cnf, and
+The default config file is named fmtutil.cnf, and
 running  kpsewhich fmtutil.cnf  should show the active file.
+The command  kpsewhich --engine=/ --all foo.fmt  should show the
+locations of any and all foo.fmt files.
 
 For more information about fmt generation in TeX Live, try
 tlmgr --help or see http://tug.org/texlive/doc/tlmgr.html.
@@ -488,12 +490,13 @@ main()
       --test|--dolinks|--force)
           ;;
       "") break;;
-      *) abort "unknown option \`$1'. Try $progname --help for help";;
+      *) abort "unknown option \`$1'; try $progname --help if you need it";;
     esac
   do test $# -gt 0 && shift; done
 
   case "$cmd" in
-    help|"") help;;
+         "") abort "missing command; try $progname --help if you need it";;
+       help) help;;
     version) version;;
   esac
 
diff --git a/Master/bin/x86_64-darwin/gftodvi b/Master/bin/x86_64-darwin/gftodvi
index a37aeff53f3..1a17778cfe1 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 320bc3c3977..20a3e0d717c 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 3ebfe245759..9cec3bc6f5c 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 2f3c864118f..a23f24498c4 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 d762077b94b..2a53098cbb5 100755
--- a/Master/bin/x86_64-darwin/hbf2gf
+++ b/Master/bin/x86_64-darwin/hbf2gf
diff --git a/Master/bin/x86_64-darwin/kpseaccess b/Master/bin/x86_64-darwin/kpseaccess
index 1e5aea59c04..38f0aa08adf 100755
--- a/Master/bin/x86_64-darwin/kpseaccess
+++ b/Master/bin/x86_64-darwin/kpseaccess
diff --git a/Master/bin/x86_64-darwin/kpsereadlink b/Master/bin/x86_64-darwin/kpsereadlink
index 3d95e745a27..88cb99e1dba 100755
--- a/Master/bin/x86_64-darwin/kpsereadlink
+++ b/Master/bin/x86_64-darwin/kpsereadlink
diff --git a/Master/bin/x86_64-darwin/kpsestat b/Master/bin/x86_64-darwin/kpsestat
index 245cf01d1a4..6118de0c485 100755
--- a/Master/bin/x86_64-darwin/kpsestat
+++ b/Master/bin/x86_64-darwin/kpsestat
diff --git a/Master/bin/x86_64-darwin/kpsewhich b/Master/bin/x86_64-darwin/kpsewhich
index 03b57422168..c6fc8b73c51 100755
--- a/Master/bin/x86_64-darwin/kpsewhich
+++ b/Master/bin/x86_64-darwin/kpsewhich
diff --git a/Master/bin/x86_64-darwin/lacheck b/Master/bin/x86_64-darwin/lacheck
index 2a918d9ac88..53b09f2d4cd 100755
--- a/Master/bin/x86_64-darwin/lacheck
+++ b/Master/bin/x86_64-darwin/lacheck
diff --git a/Master/bin/x86_64-darwin/luatex b/Master/bin/x86_64-darwin/luatex
index f87d414afa5..7e90d8f55db 100755
--- a/Master/bin/x86_64-darwin/luatex
+++ b/Master/bin/x86_64-darwin/luatex
diff --git a/Master/bin/x86_64-darwin/mag b/Master/bin/x86_64-darwin/mag
index a5049f2e2aa..4c5f1de18d9 100755
--- a/Master/bin/x86_64-darwin/mag
+++ b/Master/bin/x86_64-darwin/mag
diff --git a/Master/bin/x86_64-darwin/makeindex b/Master/bin/x86_64-darwin/makeindex
index 8de85ab1e09..afbc64e1a73 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 a8fa5914c37..0bc8fed5f67 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 b2e0dea91a7..6cec00134f1 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 386aaf9d3bd..b3844cce2ed 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 ac2707a1a53..160692c4cc5 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 31bbdaa19e8..2b7632875ea 100755
--- a/Master/bin/x86_64-darwin/mft
+++ b/Master/bin/x86_64-darwin/mft
diff --git a/Master/bin/x86_64-darwin/mktexpk b/Master/bin/x86_64-darwin/mktexpk
index 1d0a4b4e2be..48a57bd25c2 100755
--- a/Master/bin/x86_64-darwin/mktexpk
+++ b/Master/bin/x86_64-darwin/mktexpk
@@ -8,7 +8,7 @@
 # Report bugs to tex-k@tug.org.
 # Public domain.
 
-version='$Id: mktexpk 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexpk 18407 2010-05-21 18:16:31Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
   Create a PK font.
@@ -19,14 +19,27 @@ usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
 --mfmode MODE       use MODE as the METAFONT mode.
 --destdir DESTDIR   write fonts in DESTDIR.
 
-Try to create a PK file for NAME at resolution DPI, with an assumed
-device base resolution of BDPI, and a Metafont \`mag' of MAG. Use MODE
-for the METAFONT mode.  Use DESTDIR for the root of where to install
-into, either the absolute directory name to use (if it starts with a
-/) or relative to the default DESTDIR (if not). REDIRECT, if supplied,
-is a string of the form '>&n', where n is the number of the file
-descriptor which is to receive, instead of stdout, the name of the
-newly created pk file."
+Try to create a bitmap PK file for NAME at resolution DPI, with an
+assumed device base resolution of BDPI, and a Metafont \`mag' of
+MAG. Use MODE for the METAFONT mode.  Use DESTDIR for the root of where
+to install into, either the absolute directory name to use (if it starts
+with a /) or relative to the default DESTDIR (if not). REDIRECT, if
+supplied, is a string of the form '>&n', where n is the number of the
+file descriptor which is to receive, instead of stdout, the name of the
+newly created pk file.
+
+If you expected the font to be available as an outline, and thus this
+script does not work and should not have been called, most likely the
+font's .tfm name is missing from the relevant map file (e.g.,
+psfonts.map for dvips, pdftex.map for pdftex).  These map files are
+typically maintained using updmap; q.v.
+
+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/>
+"
 
 # Handle non-positional options, except for --version/--help
 while test $# -gt 0; do
@@ -190,6 +203,7 @@ else
       cmd="hbf2gf -q -p $NAME $DPI"
     else
       echo "$progname: don't know how to create bitmap font for $NAME." >&2
+      echo "$progname: perhaps $NAME is missing from the map file." >&2
       exit 1
     fi
   fi
diff --git a/Master/bin/x86_64-darwin/mmafm b/Master/bin/x86_64-darwin/mmafm
index ab5c8248ddb..a9bd5808a58 100755
--- a/Master/bin/x86_64-darwin/mmafm
+++ b/Master/bin/x86_64-darwin/mmafm
diff --git a/Master/bin/x86_64-darwin/mmpfb b/Master/bin/x86_64-darwin/mmpfb
index f07a6f29b4c..f2a00bb1f36 100755
--- a/Master/bin/x86_64-darwin/mmpfb
+++ b/Master/bin/x86_64-darwin/mmpfb
diff --git a/Master/bin/x86_64-darwin/mpost b/Master/bin/x86_64-darwin/mpost
index ab5dff67cd1..dfd5ea90f37 100755
--- a/Master/bin/x86_64-darwin/mpost
+++ b/Master/bin/x86_64-darwin/mpost
diff --git a/Master/bin/x86_64-darwin/musixflx b/Master/bin/x86_64-darwin/musixflx
index 2d5388f46ea..ddbbeaf8da5 100755
--- a/Master/bin/x86_64-darwin/musixflx
+++ b/Master/bin/x86_64-darwin/musixflx
diff --git a/Master/bin/x86_64-darwin/odvicopy b/Master/bin/x86_64-darwin/odvicopy
index a582a3854d6..da86d44302b 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 f9edadd0ef4..d09c82c3a73 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 7353f9f9450..1474310900f 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 588e0e7b159..67ddc34d4ac 100755
--- a/Master/bin/x86_64-darwin/otangle
+++ b/Master/bin/x86_64-darwin/otangle
diff --git a/Master/bin/x86_64-darwin/otfinfo b/Master/bin/x86_64-darwin/otfinfo
index 2d14949793f..47e7400d279 100755
--- a/Master/bin/x86_64-darwin/otfinfo
+++ b/Master/bin/x86_64-darwin/otfinfo
diff --git a/Master/bin/x86_64-darwin/otftotfm b/Master/bin/x86_64-darwin/otftotfm
index 573a604f8a2..b150d64110f 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 fb1471ee085..ebb7bf2bd57 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 8f5bf7d4564..2c372d8a05f 100755
--- a/Master/bin/x86_64-darwin/outocp
+++ b/Master/bin/x86_64-darwin/outocp
diff --git a/Master/bin/x86_64-darwin/patgen b/Master/bin/x86_64-darwin/patgen
index f54068efdde..378d31ecdfc 100755
--- a/Master/bin/x86_64-darwin/patgen
+++ b/Master/bin/x86_64-darwin/patgen
diff --git a/Master/bin/x86_64-darwin/pbibtex b/Master/bin/x86_64-darwin/pbibtex
index 14889049206..a064129ec7d 100755
--- a/Master/bin/x86_64-darwin/pbibtex
+++ b/Master/bin/x86_64-darwin/pbibtex
diff --git a/Master/bin/x86_64-darwin/pdfclose b/Master/bin/x86_64-darwin/pdfclose
index 7f2c2162850..0143a1a0d01 100755
--- a/Master/bin/x86_64-darwin/pdfclose
+++ b/Master/bin/x86_64-darwin/pdfclose
diff --git a/Master/bin/x86_64-darwin/pdfopen b/Master/bin/x86_64-darwin/pdfopen
index 86cf9a0104c..a7bacc848d2 100755
--- a/Master/bin/x86_64-darwin/pdfopen
+++ b/Master/bin/x86_64-darwin/pdfopen
diff --git a/Master/bin/x86_64-darwin/pdftex b/Master/bin/x86_64-darwin/pdftex
index bc7175218dc..4eeed941f48 100755
--- a/Master/bin/x86_64-darwin/pdftex
+++ b/Master/bin/x86_64-darwin/pdftex
diff --git a/Master/bin/x86_64-darwin/pdftosrc b/Master/bin/x86_64-darwin/pdftosrc
index eae8304c38b..761ef45516b 100755
--- a/Master/bin/x86_64-darwin/pdftosrc
+++ b/Master/bin/x86_64-darwin/pdftosrc
diff --git a/Master/bin/x86_64-darwin/pdvitype b/Master/bin/x86_64-darwin/pdvitype
index 45314fdc8ca..05fba7fe232 100755
--- a/Master/bin/x86_64-darwin/pdvitype
+++ b/Master/bin/x86_64-darwin/pdvitype
diff --git a/Master/bin/x86_64-darwin/pfb2pfa b/Master/bin/x86_64-darwin/pfb2pfa
index 37fdbce5cdc..df58ee7f2d9 100755
--- a/Master/bin/x86_64-darwin/pfb2pfa
+++ b/Master/bin/x86_64-darwin/pfb2pfa
diff --git a/Master/bin/x86_64-darwin/pk2bm b/Master/bin/x86_64-darwin/pk2bm
index 486e6df808b..6437a477e7e 100755
--- a/Master/bin/x86_64-darwin/pk2bm
+++ b/Master/bin/x86_64-darwin/pk2bm
diff --git a/Master/bin/x86_64-darwin/pktogf b/Master/bin/x86_64-darwin/pktogf
index 3360f8046ce..0c8325e3821 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 07250e47b0e..050e2821cef 100755
--- a/Master/bin/x86_64-darwin/pktype
+++ b/Master/bin/x86_64-darwin/pktype
diff --git a/Master/bin/x86_64-darwin/pltotf b/Master/bin/x86_64-darwin/pltotf
index add99569a36..96cfa95777e 100755
--- a/Master/bin/x86_64-darwin/pltotf
+++ b/Master/bin/x86_64-darwin/pltotf
diff --git a/Master/bin/x86_64-darwin/pooltype b/Master/bin/x86_64-darwin/pooltype
index 0530242da95..b6a89ecd369 100755
--- a/Master/bin/x86_64-darwin/pooltype
+++ b/Master/bin/x86_64-darwin/pooltype
diff --git a/Master/bin/x86_64-darwin/ppltotf b/Master/bin/x86_64-darwin/ppltotf
index 9f0dfe4effd..005c6e5a3f8 100755
--- a/Master/bin/x86_64-darwin/ppltotf
+++ b/Master/bin/x86_64-darwin/ppltotf
diff --git a/Master/bin/x86_64-darwin/ps2pk b/Master/bin/x86_64-darwin/ps2pk
index a202535d794..9f1a9ec24d4 100755
--- a/Master/bin/x86_64-darwin/ps2pk
+++ b/Master/bin/x86_64-darwin/ps2pk
diff --git a/Master/bin/x86_64-darwin/psbook b/Master/bin/x86_64-darwin/psbook
index ced72b5ce34..fd748d8b497 100755
--- a/Master/bin/x86_64-darwin/psbook
+++ b/Master/bin/x86_64-darwin/psbook
diff --git a/Master/bin/x86_64-darwin/psnup b/Master/bin/x86_64-darwin/psnup
index 8fcf0ed1aa5..54a1751cee3 100755
--- a/Master/bin/x86_64-darwin/psnup
+++ b/Master/bin/x86_64-darwin/psnup
diff --git a/Master/bin/x86_64-darwin/psresize b/Master/bin/x86_64-darwin/psresize
index c5fc8210f77..702f5019f8a 100755
--- a/Master/bin/x86_64-darwin/psresize
+++ b/Master/bin/x86_64-darwin/psresize
diff --git a/Master/bin/x86_64-darwin/psselect b/Master/bin/x86_64-darwin/psselect
index 5296675d8aa..7f4d1ee1c87 100755
--- a/Master/bin/x86_64-darwin/psselect
+++ b/Master/bin/x86_64-darwin/psselect
diff --git a/Master/bin/x86_64-darwin/pstops b/Master/bin/x86_64-darwin/pstops
index b7788735f5b..e7d5dbe9d97 100755
--- a/Master/bin/x86_64-darwin/pstops
+++ b/Master/bin/x86_64-darwin/pstops
diff --git a/Master/bin/x86_64-darwin/ptex b/Master/bin/x86_64-darwin/ptex
index 58644f884a4..1cbed593baf 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 5725744f8a1..2269f481469 100755
--- a/Master/bin/x86_64-darwin/ptftopl
+++ b/Master/bin/x86_64-darwin/ptftopl
diff --git a/Master/bin/x86_64-darwin/sjisconv b/Master/bin/x86_64-darwin/sjisconv
index 4da2c7e926e..4680010462b 100755
--- a/Master/bin/x86_64-darwin/sjisconv
+++ b/Master/bin/x86_64-darwin/sjisconv
diff --git a/Master/bin/x86_64-darwin/synctex b/Master/bin/x86_64-darwin/synctex
index eca86f0fbbf..66c3e749ca3 100755
--- a/Master/bin/x86_64-darwin/synctex
+++ b/Master/bin/x86_64-darwin/synctex
diff --git a/Master/bin/x86_64-darwin/t1ascii b/Master/bin/x86_64-darwin/t1ascii
index 7423eece16e..40b5d2a7d46 100755
--- a/Master/bin/x86_64-darwin/t1ascii
+++ b/Master/bin/x86_64-darwin/t1ascii
diff --git a/Master/bin/x86_64-darwin/t1asm b/Master/bin/x86_64-darwin/t1asm
index 90fc878e1d6..d6d5dfea680 100755
--- a/Master/bin/x86_64-darwin/t1asm
+++ b/Master/bin/x86_64-darwin/t1asm
diff --git a/Master/bin/x86_64-darwin/t1binary b/Master/bin/x86_64-darwin/t1binary
index 1232f1effad..55be786bb06 100755
--- a/Master/bin/x86_64-darwin/t1binary
+++ b/Master/bin/x86_64-darwin/t1binary
diff --git a/Master/bin/x86_64-darwin/t1disasm b/Master/bin/x86_64-darwin/t1disasm
index 1b315b61c74..96b797d88db 100755
--- a/Master/bin/x86_64-darwin/t1disasm
+++ b/Master/bin/x86_64-darwin/t1disasm
diff --git a/Master/bin/x86_64-darwin/t1dotlessj b/Master/bin/x86_64-darwin/t1dotlessj
index 75e67ff1f2e..cb9ebb1fa52 100755
--- a/Master/bin/x86_64-darwin/t1dotlessj
+++ b/Master/bin/x86_64-darwin/t1dotlessj
diff --git a/Master/bin/x86_64-darwin/t1lint b/Master/bin/x86_64-darwin/t1lint
index 9cde988caa7..67f8b0f71bf 100755
--- a/Master/bin/x86_64-darwin/t1lint
+++ b/Master/bin/x86_64-darwin/t1lint
diff --git a/Master/bin/x86_64-darwin/t1mac b/Master/bin/x86_64-darwin/t1mac
index 8518d8889b4..ae784e8ab46 100755
--- a/Master/bin/x86_64-darwin/t1mac
+++ b/Master/bin/x86_64-darwin/t1mac
diff --git a/Master/bin/x86_64-darwin/t1rawafm b/Master/bin/x86_64-darwin/t1rawafm
index fe5f7a74f46..bfbf14c1022 100755
--- a/Master/bin/x86_64-darwin/t1rawafm
+++ b/Master/bin/x86_64-darwin/t1rawafm
diff --git a/Master/bin/x86_64-darwin/t1reencode b/Master/bin/x86_64-darwin/t1reencode
index ea78dd778ca..7e0aeadf6ba 100755
--- a/Master/bin/x86_64-darwin/t1reencode
+++ b/Master/bin/x86_64-darwin/t1reencode
diff --git a/Master/bin/x86_64-darwin/t1testpage b/Master/bin/x86_64-darwin/t1testpage
index 341355e4766..ac11798f368 100755
--- a/Master/bin/x86_64-darwin/t1testpage
+++ b/Master/bin/x86_64-darwin/t1testpage
diff --git a/Master/bin/x86_64-darwin/t1unmac b/Master/bin/x86_64-darwin/t1unmac
index 0c95b41769a..c68263cff7b 100755
--- a/Master/bin/x86_64-darwin/t1unmac
+++ b/Master/bin/x86_64-darwin/t1unmac
diff --git a/Master/bin/x86_64-darwin/t4ht b/Master/bin/x86_64-darwin/t4ht
index f6992b73137..3aeb7c6b2a3 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 12a4a19f39a..afde287ce5e 100755
--- a/Master/bin/x86_64-darwin/tangle
+++ b/Master/bin/x86_64-darwin/tangle
diff --git a/Master/bin/x86_64-darwin/tcdialog b/Master/bin/x86_64-darwin/tcdialog
index 0a0de995150..c534adf2c75 100755
--- a/Master/bin/x86_64-darwin/tcdialog
+++ b/Master/bin/x86_64-darwin/tcdialog
diff --git a/Master/bin/x86_64-darwin/tex b/Master/bin/x86_64-darwin/tex
index d070fbe4a4f..c7290a85a96 100755
--- a/Master/bin/x86_64-darwin/tex
+++ b/Master/bin/x86_64-darwin/tex
diff --git a/Master/bin/x86_64-darwin/tex2xindy b/Master/bin/x86_64-darwin/tex2xindy
index 9978f3789dc..ca32684ea9d 100755
--- a/Master/bin/x86_64-darwin/tex2xindy
+++ b/Master/bin/x86_64-darwin/tex2xindy
diff --git a/Master/bin/x86_64-darwin/tex4ht b/Master/bin/x86_64-darwin/tex4ht
index ee1578fe222..15a5d0b16da 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 a5b76d3cc19..9f8d3e9fc6c 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 03e9a8e630a..18e6359961d 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 9ffa8fd5594..166b787f929 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 779941f76ff..d38e6aa37ce 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 6a0b878ef5a..0ea6121166c 100755
--- a/Master/bin/x86_64-darwin/ttf2tfm
+++ b/Master/bin/x86_64-darwin/ttf2tfm
diff --git a/Master/bin/x86_64-darwin/ttfdump b/Master/bin/x86_64-darwin/ttfdump
index f2bd61f9397..cdad29b051e 100755
--- a/Master/bin/x86_64-darwin/ttfdump
+++ b/Master/bin/x86_64-darwin/ttfdump
diff --git a/Master/bin/x86_64-darwin/ttftotype42 b/Master/bin/x86_64-darwin/ttftotype42
index 5d881e8ccf4..ec227b37b4f 100755
--- a/Master/bin/x86_64-darwin/ttftotype42
+++ b/Master/bin/x86_64-darwin/ttftotype42
diff --git a/Master/bin/x86_64-darwin/vftovp b/Master/bin/x86_64-darwin/vftovp
index 5aff014c758..509950f91ad 100755
--- a/Master/bin/x86_64-darwin/vftovp
+++ b/Master/bin/x86_64-darwin/vftovp
diff --git a/Master/bin/x86_64-darwin/vlna b/Master/bin/x86_64-darwin/vlna
index e5c2c353ff6..209e62c8180 100755
--- a/Master/bin/x86_64-darwin/vlna
+++ b/Master/bin/x86_64-darwin/vlna
diff --git a/Master/bin/x86_64-darwin/vptovf b/Master/bin/x86_64-darwin/vptovf
index b5f2965a906..db8927c5b45 100755
--- a/Master/bin/x86_64-darwin/vptovf
+++ b/Master/bin/x86_64-darwin/vptovf
diff --git a/Master/bin/x86_64-darwin/weave b/Master/bin/x86_64-darwin/weave
index 1e55829ff2f..c872a6ea71b 100755
--- a/Master/bin/x86_64-darwin/weave
+++ b/Master/bin/x86_64-darwin/weave
diff --git a/Master/bin/x86_64-darwin/xasy b/Master/bin/x86_64-darwin/xasy
index 2f876fa5f56..06b216f0df2 120000
--- a/Master/bin/x86_64-darwin/xasy
+++ b/Master/bin/x86_64-darwin/xasy
@@ -1 +1 @@
-asy
\ No newline at end of file
+../../texmf/asymptote/GUI/xasy.py
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/xdv2pdf b/Master/bin/x86_64-darwin/xdv2pdf
index 5dbbced2c1a..24e64cafdd7 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 54475802d3f..7db616597a1 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 f7679f4b78a..983c2aa6ab3 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 7897935d6f4..9fc35bf9c67 100755
--- a/Master/bin/x86_64-darwin/xetex
+++ b/Master/bin/x86_64-darwin/xetex
diff --git a/Master/bin/x86_64-darwin/xindy.mem b/Master/bin/x86_64-darwin/xindy.mem
index fb3c21647aa..270378b1c84 100644
--- a/Master/bin/x86_64-darwin/xindy.mem
+++ b/Master/bin/x86_64-darwin/xindy.mem