63 files changed, 14 insertions, 7 deletions

diff --git a/Master/bin/i386-darwin/afm2pl b/Master/bin/i386-darwin/afm2pl
index 4e56a9d5535..b4aebb00a37 100755
--- a/Master/bin/i386-darwin/afm2pl
+++ b/Master/bin/i386-darwin/afm2pl
diff --git a/Master/bin/i386-darwin/afm2tfm b/Master/bin/i386-darwin/afm2tfm
index 6a09ba80b91..edb7bf034b4 100755
--- a/Master/bin/i386-darwin/afm2tfm
+++ b/Master/bin/i386-darwin/afm2tfm
diff --git a/Master/bin/i386-darwin/aleph b/Master/bin/i386-darwin/aleph
index b746561db94..1f04f960b1f 100755
--- a/Master/bin/i386-darwin/aleph
+++ b/Master/bin/i386-darwin/aleph
diff --git a/Master/bin/i386-darwin/bibtex b/Master/bin/i386-darwin/bibtex
index 3ab9ea41b1d..8bc34360807 100755
--- a/Master/bin/i386-darwin/bibtex
+++ b/Master/bin/i386-darwin/bibtex
diff --git a/Master/bin/i386-darwin/bibtex8 b/Master/bin/i386-darwin/bibtex8
index e4059b18012..a6490d2e874 100755
--- a/Master/bin/i386-darwin/bibtex8
+++ b/Master/bin/i386-darwin/bibtex8
diff --git a/Master/bin/i386-darwin/ctangle b/Master/bin/i386-darwin/ctangle
index 16943fcc63b..115561d1bd0 100755
--- a/Master/bin/i386-darwin/ctangle
+++ b/Master/bin/i386-darwin/ctangle
diff --git a/Master/bin/i386-darwin/ctie b/Master/bin/i386-darwin/ctie
index a9e4019c550..07222a281a1 100755
--- a/Master/bin/i386-darwin/ctie
+++ b/Master/bin/i386-darwin/ctie
diff --git a/Master/bin/i386-darwin/cweave b/Master/bin/i386-darwin/cweave
index a2e7a8c2c5c..4d564c0c0ea 100755
--- a/Master/bin/i386-darwin/cweave
+++ b/Master/bin/i386-darwin/cweave
diff --git a/Master/bin/i386-darwin/detex b/Master/bin/i386-darwin/detex
index 843f09cef38..f8228836db6 100755
--- a/Master/bin/i386-darwin/detex
+++ b/Master/bin/i386-darwin/detex
diff --git a/Master/bin/i386-darwin/dmp b/Master/bin/i386-darwin/dmp
index 764e68654d2..f7a40e19a6b 100755
--- a/Master/bin/i386-darwin/dmp
+++ b/Master/bin/i386-darwin/dmp
diff --git a/Master/bin/i386-darwin/dt2dv b/Master/bin/i386-darwin/dt2dv
index fe231792788..0fb4738819f 100755
--- a/Master/bin/i386-darwin/dt2dv
+++ b/Master/bin/i386-darwin/dt2dv
diff --git a/Master/bin/i386-darwin/dvi2tty b/Master/bin/i386-darwin/dvi2tty
index 28b3c2fc5d7..6e716ffb386 100755
--- a/Master/bin/i386-darwin/dvi2tty
+++ b/Master/bin/i386-darwin/dvi2tty
diff --git a/Master/bin/i386-darwin/dvicopy b/Master/bin/i386-darwin/dvicopy
index d6d50f581c4..52d1946b80a 100755
--- a/Master/bin/i386-darwin/dvicopy
+++ b/Master/bin/i386-darwin/dvicopy
diff --git a/Master/bin/i386-darwin/dvilj b/Master/bin/i386-darwin/dvilj
index 79fda56b220..ad833ccc3ef 100755
--- a/Master/bin/i386-darwin/dvilj
+++ b/Master/bin/i386-darwin/dvilj
diff --git a/Master/bin/i386-darwin/dvilj2p b/Master/bin/i386-darwin/dvilj2p
index ac3a03ede12..12267a96043 100755
--- a/Master/bin/i386-darwin/dvilj2p
+++ b/Master/bin/i386-darwin/dvilj2p
diff --git a/Master/bin/i386-darwin/dvilj4 b/Master/bin/i386-darwin/dvilj4
index e51e2a28442..c44dd80a165 100755
--- a/Master/bin/i386-darwin/dvilj4
+++ b/Master/bin/i386-darwin/dvilj4
diff --git a/Master/bin/i386-darwin/dvilj4l b/Master/bin/i386-darwin/dvilj4l
index 342d6f77347..880f4875596 100755
--- a/Master/bin/i386-darwin/dvilj4l
+++ b/Master/bin/i386-darwin/dvilj4l
diff --git a/Master/bin/i386-darwin/dvipdfm b/Master/bin/i386-darwin/dvipdfm
index d3cb8ad3e61..050f4d3cc56 100755
--- a/Master/bin/i386-darwin/dvipdfm
+++ b/Master/bin/i386-darwin/dvipdfm
diff --git a/Master/bin/i386-darwin/dvipdfmx b/Master/bin/i386-darwin/dvipdfmx
index 9b57a3fa4fd..4ad548ca247 100755
--- a/Master/bin/i386-darwin/dvipdfmx
+++ b/Master/bin/i386-darwin/dvipdfmx
diff --git a/Master/bin/i386-darwin/dvipng b/Master/bin/i386-darwin/dvipng
index 750244344e8..ec9a07bfd68 100755
--- a/Master/bin/i386-darwin/dvipng
+++ b/Master/bin/i386-darwin/dvipng
diff --git a/Master/bin/i386-darwin/dvipos b/Master/bin/i386-darwin/dvipos
index bceaee2ea6a..c69cf643f65 100755
--- a/Master/bin/i386-darwin/dvipos
+++ b/Master/bin/i386-darwin/dvipos
diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips
index f3dd4dd1e07..a32d7a7968e 100755
--- a/Master/bin/i386-darwin/dvips
+++ b/Master/bin/i386-darwin/dvips
diff --git a/Master/bin/i386-darwin/dvitomp b/Master/bin/i386-darwin/dvitomp
index 6b851c25257..0ba160a4fb9 100755
--- a/Master/bin/i386-darwin/dvitomp
+++ b/Master/bin/i386-darwin/dvitomp
diff --git a/Master/bin/i386-darwin/dvitype b/Master/bin/i386-darwin/dvitype
index 95c12cf3a74..0b939447afa 100755
--- a/Master/bin/i386-darwin/dvitype
+++ b/Master/bin/i386-darwin/dvitype
diff --git a/Master/bin/i386-darwin/ebb b/Master/bin/i386-darwin/ebb
index fa6338b40f6..c5e8c2653aa 100755
--- a/Master/bin/i386-darwin/ebb
+++ b/Master/bin/i386-darwin/ebb
diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi
index f116ea4bb56..1bc815a5d0d 100755
--- a/Master/bin/i386-darwin/gftodvi
+++ b/Master/bin/i386-darwin/gftodvi
diff --git a/Master/bin/i386-darwin/gftopk b/Master/bin/i386-darwin/gftopk
index abac512ad2c..fd7efb59c4b 100755
--- a/Master/bin/i386-darwin/gftopk
+++ b/Master/bin/i386-darwin/gftopk
diff --git a/Master/bin/i386-darwin/gftype b/Master/bin/i386-darwin/gftype
index 4b8ccbb4be5..70b8304edf6 100755
--- a/Master/bin/i386-darwin/gftype
+++ b/Master/bin/i386-darwin/gftype
diff --git a/Master/bin/i386-darwin/gsftopk b/Master/bin/i386-darwin/gsftopk
index 3918892c3db..7f83ca8b615 100755
--- a/Master/bin/i386-darwin/gsftopk
+++ b/Master/bin/i386-darwin/gsftopk
diff --git a/Master/bin/i386-darwin/hbf2gf b/Master/bin/i386-darwin/hbf2gf
index 54a624f543a..2c3300269ed 100755
--- a/Master/bin/i386-darwin/hbf2gf
+++ b/Master/bin/i386-darwin/hbf2gf
diff --git a/Master/bin/i386-darwin/kpsewhich b/Master/bin/i386-darwin/kpsewhich
index 31abed10889..bdc0885a943 100755
--- a/Master/bin/i386-darwin/kpsewhich
+++ b/Master/bin/i386-darwin/kpsewhich
diff --git a/Master/bin/i386-darwin/makeindex b/Master/bin/i386-darwin/makeindex
index e7776e5a71b..b8c07f18609 100755
--- a/Master/bin/i386-darwin/makeindex
+++ b/Master/bin/i386-darwin/makeindex
diff --git a/Master/bin/i386-darwin/makempx b/Master/bin/i386-darwin/makempx
index c5bdbd7738f..8481a71a491 100755
--- a/Master/bin/i386-darwin/makempx
+++ b/Master/bin/i386-darwin/makempx
diff --git a/Master/bin/i386-darwin/mf b/Master/bin/i386-darwin/mf
index 402037a2c3e..940fbff2b0e 100755
--- a/Master/bin/i386-darwin/mf
+++ b/Master/bin/i386-darwin/mf
diff --git a/Master/bin/i386-darwin/mf-nowin b/Master/bin/i386-darwin/mf-nowin
index babbdbf3e82..6572671e1d3 100755
--- a/Master/bin/i386-darwin/mf-nowin
+++ b/Master/bin/i386-darwin/mf-nowin
diff --git a/Master/bin/i386-darwin/mft b/Master/bin/i386-darwin/mft
index f9282219fe8..978cddfecb0 100755
--- a/Master/bin/i386-darwin/mft
+++ b/Master/bin/i386-darwin/mft
diff --git a/Master/bin/i386-darwin/mpost b/Master/bin/i386-darwin/mpost
index f47a51609d1..8913b94c9f2 100755
--- a/Master/bin/i386-darwin/mpost
+++ b/Master/bin/i386-darwin/mpost
diff --git a/Master/bin/i386-darwin/odvicopy b/Master/bin/i386-darwin/odvicopy
index ca539a24208..6fd12e69292 100755
--- a/Master/bin/i386-darwin/odvicopy
+++ b/Master/bin/i386-darwin/odvicopy
diff --git a/Master/bin/i386-darwin/odvitype b/Master/bin/i386-darwin/odvitype
index 26ab6e712c0..1b784f07eaf 100755
--- a/Master/bin/i386-darwin/odvitype
+++ b/Master/bin/i386-darwin/odvitype
diff --git a/Master/bin/i386-darwin/omega b/Master/bin/i386-darwin/omega
index 37e21613765..ba967438d3b 100755
--- a/Master/bin/i386-darwin/omega
+++ b/Master/bin/i386-darwin/omega
diff --git a/Master/bin/i386-darwin/omfonts b/Master/bin/i386-darwin/omfonts
index 5340d594ee1..2be5eff3c08 100755
--- a/Master/bin/i386-darwin/omfonts
+++ b/Master/bin/i386-darwin/omfonts
diff --git a/Master/bin/i386-darwin/otftotfm b/Master/bin/i386-darwin/otftotfm
index 46c6c813900..c08bf417e77 100755
--- a/Master/bin/i386-darwin/otftotfm
+++ b/Master/bin/i386-darwin/otftotfm
diff --git a/Master/bin/i386-darwin/otp2ocp b/Master/bin/i386-darwin/otp2ocp
index 9aad462402d..0bfb47bb15f 100755
--- a/Master/bin/i386-darwin/otp2ocp
+++ b/Master/bin/i386-darwin/otp2ocp
diff --git a/Master/bin/i386-darwin/outocp b/Master/bin/i386-darwin/outocp
index 204fc86450f..3b912101618 100755
--- a/Master/bin/i386-darwin/outocp
+++ b/Master/bin/i386-darwin/outocp
diff --git a/Master/bin/i386-darwin/pdftex b/Master/bin/i386-darwin/pdftex
index 2645c36c41f..143136467c6 100755
--- a/Master/bin/i386-darwin/pdftex
+++ b/Master/bin/i386-darwin/pdftex
diff --git a/Master/bin/i386-darwin/pktogf b/Master/bin/i386-darwin/pktogf
index 1b508b2ca9e..a24b6aa5e62 100755
--- a/Master/bin/i386-darwin/pktogf
+++ b/Master/bin/i386-darwin/pktogf
diff --git a/Master/bin/i386-darwin/pktype b/Master/bin/i386-darwin/pktype
index e0b61346ec0..d635f073e5a 100755
--- a/Master/bin/i386-darwin/pktype
+++ b/Master/bin/i386-darwin/pktype
diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk
index a6d2567fd1a..089d31bea45 100755
--- a/Master/bin/i386-darwin/ps2pk
+++ b/Master/bin/i386-darwin/ps2pk
diff --git a/Master/bin/i386-darwin/t4ht b/Master/bin/i386-darwin/t4ht
index d84dbe389e8..0ec41f9dde1 100755
--- a/Master/bin/i386-darwin/t4ht
+++ b/Master/bin/i386-darwin/t4ht
diff --git a/Master/bin/i386-darwin/tangle b/Master/bin/i386-darwin/tangle
index 1a2cb11b84d..88620a5ed7e 100755
--- a/Master/bin/i386-darwin/tangle
+++ b/Master/bin/i386-darwin/tangle
diff --git a/Master/bin/i386-darwin/tex b/Master/bin/i386-darwin/tex
index 7be3557fa68..976f1f46587 100755
--- a/Master/bin/i386-darwin/tex
+++ b/Master/bin/i386-darwin/tex
diff --git a/Master/bin/i386-darwin/tex4ht b/Master/bin/i386-darwin/tex4ht
index 794da76dec1..8fda2a45e11 100755
--- a/Master/bin/i386-darwin/tex4ht
+++ b/Master/bin/i386-darwin/tex4ht
diff --git a/Master/bin/i386-darwin/texlinks b/Master/bin/i386-darwin/texlinks
index 148d457aa84..f84f55a95bd 100755
--- a/Master/bin/i386-darwin/texlinks
+++ b/Master/bin/i386-darwin/texlinks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright Thomas Esser, 1999, 2002, 2003. public domain.
+# Thomas Esser, 1999, 2002, 2003. public domain.
 
 # texlinks: script to maintain symlinks from format to engine. Interprets
 # the lines given in fmtutil.cnf.
@@ -35,7 +35,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 cnf=fmtutil.cnf   # name of the config file
-version=1125258113 # seconds since `00:00:00 1970-01-01 UTC'
+version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 progname=texlinks
 
@@ -133,16 +133,23 @@ install_link()
 
   case $src in
     */mf)
-      if test $dest = "mf-nowin" && test -f $selfautoloc/mfw; then
-        dest="mfw"
-        verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
+      if test "$dest" = mf-nowin; then
+        if test -f $selfautoloc/mfw; then
+          dest=mfw  # name for windows-enabled mf, once upon a time
+          verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
+        fi
+        if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
+          # have both mf and mf-nowin binaries.  no link.
+          verbose_echo "metafont symlink $src -> $dest skipped (special case)"
+          return
+        fi
       fi
       ;;
   esac
 
   case $src in
     */cont-??|*/metafun|*/mptopdf)
-      verbose_echo "symlink $2 -> $dest skipped (special case)"
+      verbose_echo "symlink $src -> $dest skipped (special case)"
       ;;
     *)
       test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
@@ -153,7 +160,7 @@ install_link()
           true)
             ;;
           *)
-            errmsg "install_link failed for $src. File already exists."
+            errmsg "install_link $src -> $dest failed: file already exists."
             ;;
         esac
       else
diff --git a/Master/bin/i386-darwin/tftopl b/Master/bin/i386-darwin/tftopl
index e8c03562252..4507957bdea 100755
--- a/Master/bin/i386-darwin/tftopl
+++ b/Master/bin/i386-darwin/tftopl
diff --git a/Master/bin/i386-darwin/ttf2afm b/Master/bin/i386-darwin/ttf2afm
index ee6c026fce1..55fff22ece0 100755
--- a/Master/bin/i386-darwin/ttf2afm
+++ b/Master/bin/i386-darwin/ttf2afm
diff --git a/Master/bin/i386-darwin/ttf2pk b/Master/bin/i386-darwin/ttf2pk
index e0cb19d65de..54ffb1d166a 100755
--- a/Master/bin/i386-darwin/ttf2pk
+++ b/Master/bin/i386-darwin/ttf2pk
diff --git a/Master/bin/i386-darwin/ttf2tfm b/Master/bin/i386-darwin/ttf2tfm
index b55c3186a8f..b15d520e282 100755
--- a/Master/bin/i386-darwin/ttf2tfm
+++ b/Master/bin/i386-darwin/ttf2tfm
diff --git a/Master/bin/i386-darwin/vftovp b/Master/bin/i386-darwin/vftovp
index a3516499fee..dc6c8f5068e 100755
--- a/Master/bin/i386-darwin/vftovp
+++ b/Master/bin/i386-darwin/vftovp
diff --git a/Master/bin/i386-darwin/weave b/Master/bin/i386-darwin/weave
index 944b61999cf..4bb498789ab 100755
--- a/Master/bin/i386-darwin/weave
+++ b/Master/bin/i386-darwin/weave
diff --git a/Master/bin/i386-darwin/xdv2pdf b/Master/bin/i386-darwin/xdv2pdf
index 90e7889a04e..3741aa016c4 100755
--- a/Master/bin/i386-darwin/xdv2pdf
+++ b/Master/bin/i386-darwin/xdv2pdf
diff --git a/Master/bin/i386-darwin/xdvi-xaw.bin b/Master/bin/i386-darwin/xdvi-xaw.bin
index 521c190b21a..a5383c1d802 100755
--- a/Master/bin/i386-darwin/xdvi-xaw.bin
+++ b/Master/bin/i386-darwin/xdvi-xaw.bin
diff --git a/Master/bin/i386-darwin/xdvipdfmx b/Master/bin/i386-darwin/xdvipdfmx
index 11e1b36b4a3..73ae832719e 100755
--- a/Master/bin/i386-darwin/xdvipdfmx
+++ b/Master/bin/i386-darwin/xdvipdfmx
diff --git a/Master/bin/i386-darwin/xetex b/Master/bin/i386-darwin/xetex
index 5b6221b0230..a2a20f80851 100755
--- a/Master/bin/i386-darwin/xetex
+++ b/Master/bin/i386-darwin/xetex