56 files changed, 14 insertions, 7 deletions

diff --git a/Master/bin/powerpc-darwin/afm2pl b/Master/bin/powerpc-darwin/afm2pl
index 31d8b82b844..9f7373fab54 100755
--- a/Master/bin/powerpc-darwin/afm2pl
+++ b/Master/bin/powerpc-darwin/afm2pl
diff --git a/Master/bin/powerpc-darwin/afm2tfm b/Master/bin/powerpc-darwin/afm2tfm
index 5ab3a851212..38d22ee5dc8 100755
--- a/Master/bin/powerpc-darwin/afm2tfm
+++ b/Master/bin/powerpc-darwin/afm2tfm
diff --git a/Master/bin/powerpc-darwin/aleph b/Master/bin/powerpc-darwin/aleph
index d35f6f3f697..9e7ed55619d 100755
--- a/Master/bin/powerpc-darwin/aleph
+++ b/Master/bin/powerpc-darwin/aleph
diff --git a/Master/bin/powerpc-darwin/bibtex b/Master/bin/powerpc-darwin/bibtex
index b6312ac3482..62800f347c4 100755
--- a/Master/bin/powerpc-darwin/bibtex
+++ b/Master/bin/powerpc-darwin/bibtex
diff --git a/Master/bin/powerpc-darwin/bibtex8 b/Master/bin/powerpc-darwin/bibtex8
index c12aa21105d..afe49029250 100755
--- a/Master/bin/powerpc-darwin/bibtex8
+++ b/Master/bin/powerpc-darwin/bibtex8
diff --git a/Master/bin/powerpc-darwin/ctangle b/Master/bin/powerpc-darwin/ctangle
index 4883a97be15..c551ffea14b 100755
--- a/Master/bin/powerpc-darwin/ctangle
+++ b/Master/bin/powerpc-darwin/ctangle
diff --git a/Master/bin/powerpc-darwin/ctie b/Master/bin/powerpc-darwin/ctie
index 7201197cbfa..3c348192c47 100755
--- a/Master/bin/powerpc-darwin/ctie
+++ b/Master/bin/powerpc-darwin/ctie
diff --git a/Master/bin/powerpc-darwin/cweave b/Master/bin/powerpc-darwin/cweave
index 16ea3c44b12..482c02a49a2 100755
--- a/Master/bin/powerpc-darwin/cweave
+++ b/Master/bin/powerpc-darwin/cweave
diff --git a/Master/bin/powerpc-darwin/detex b/Master/bin/powerpc-darwin/detex
index 1bffc5aa449..49b8f6e169a 100755
--- a/Master/bin/powerpc-darwin/detex
+++ b/Master/bin/powerpc-darwin/detex
diff --git a/Master/bin/powerpc-darwin/dvi2tty b/Master/bin/powerpc-darwin/dvi2tty
index 75067cce3b6..09109faf732 100755
--- a/Master/bin/powerpc-darwin/dvi2tty
+++ b/Master/bin/powerpc-darwin/dvi2tty
diff --git a/Master/bin/powerpc-darwin/dvicopy b/Master/bin/powerpc-darwin/dvicopy
index 93d93a44541..f3ba56d5bd2 100755
--- a/Master/bin/powerpc-darwin/dvicopy
+++ b/Master/bin/powerpc-darwin/dvicopy
diff --git a/Master/bin/powerpc-darwin/dvilj b/Master/bin/powerpc-darwin/dvilj
index 2f64c5f8899..0ec8e434d78 100755
--- a/Master/bin/powerpc-darwin/dvilj
+++ b/Master/bin/powerpc-darwin/dvilj
diff --git a/Master/bin/powerpc-darwin/dvilj2p b/Master/bin/powerpc-darwin/dvilj2p
index 588317e6ad5..f958d34a837 100755
--- a/Master/bin/powerpc-darwin/dvilj2p
+++ b/Master/bin/powerpc-darwin/dvilj2p
diff --git a/Master/bin/powerpc-darwin/dvilj4 b/Master/bin/powerpc-darwin/dvilj4
index a1c0a0ae0e7..084ef78b97f 100755
--- a/Master/bin/powerpc-darwin/dvilj4
+++ b/Master/bin/powerpc-darwin/dvilj4
diff --git a/Master/bin/powerpc-darwin/dvilj4l b/Master/bin/powerpc-darwin/dvilj4l
index 69abd312d54..e3ac62cffaa 100755
--- a/Master/bin/powerpc-darwin/dvilj4l
+++ b/Master/bin/powerpc-darwin/dvilj4l
diff --git a/Master/bin/powerpc-darwin/dvipdfm b/Master/bin/powerpc-darwin/dvipdfm
index dc61d461a70..8111a832c9b 100755
--- a/Master/bin/powerpc-darwin/dvipdfm
+++ b/Master/bin/powerpc-darwin/dvipdfm
diff --git a/Master/bin/powerpc-darwin/dvipdfmx b/Master/bin/powerpc-darwin/dvipdfmx
index 05c20e7b81c..626f0908cd7 100755
--- a/Master/bin/powerpc-darwin/dvipdfmx
+++ b/Master/bin/powerpc-darwin/dvipdfmx
diff --git a/Master/bin/powerpc-darwin/dvips b/Master/bin/powerpc-darwin/dvips
index 35b92dabb5c..22e66242f9e 100755
--- a/Master/bin/powerpc-darwin/dvips
+++ b/Master/bin/powerpc-darwin/dvips
diff --git a/Master/bin/powerpc-darwin/dvitomp b/Master/bin/powerpc-darwin/dvitomp
index 2896d7bb079..90868694877 100755
--- a/Master/bin/powerpc-darwin/dvitomp
+++ b/Master/bin/powerpc-darwin/dvitomp
diff --git a/Master/bin/powerpc-darwin/dvitype b/Master/bin/powerpc-darwin/dvitype
index 7f0a2b6b8d6..4bbe9a7f120 100755
--- a/Master/bin/powerpc-darwin/dvitype
+++ b/Master/bin/powerpc-darwin/dvitype
diff --git a/Master/bin/powerpc-darwin/ebb b/Master/bin/powerpc-darwin/ebb
index 8402098daba..efb9599e744 100755
--- a/Master/bin/powerpc-darwin/ebb
+++ b/Master/bin/powerpc-darwin/ebb
diff --git a/Master/bin/powerpc-darwin/gftodvi b/Master/bin/powerpc-darwin/gftodvi
index 8d92d49e6a0..532a2ae0471 100755
--- a/Master/bin/powerpc-darwin/gftodvi
+++ b/Master/bin/powerpc-darwin/gftodvi
diff --git a/Master/bin/powerpc-darwin/gftopk b/Master/bin/powerpc-darwin/gftopk
index 00698d14ced..6c48c4e3e88 100755
--- a/Master/bin/powerpc-darwin/gftopk
+++ b/Master/bin/powerpc-darwin/gftopk
diff --git a/Master/bin/powerpc-darwin/gftype b/Master/bin/powerpc-darwin/gftype
index 3cbe0517367..6abe4b54435 100755
--- a/Master/bin/powerpc-darwin/gftype
+++ b/Master/bin/powerpc-darwin/gftype
diff --git a/Master/bin/powerpc-darwin/gsftopk b/Master/bin/powerpc-darwin/gsftopk
index 305e6a62bd9..89db213e39a 100755
--- a/Master/bin/powerpc-darwin/gsftopk
+++ b/Master/bin/powerpc-darwin/gsftopk
diff --git a/Master/bin/powerpc-darwin/hbf2gf b/Master/bin/powerpc-darwin/hbf2gf
index 3c3ee110405..ad8990b0f23 100755
--- a/Master/bin/powerpc-darwin/hbf2gf
+++ b/Master/bin/powerpc-darwin/hbf2gf
diff --git a/Master/bin/powerpc-darwin/kpsewhich b/Master/bin/powerpc-darwin/kpsewhich
index 920d40fd104..2a072ea3e20 100755
--- a/Master/bin/powerpc-darwin/kpsewhich
+++ b/Master/bin/powerpc-darwin/kpsewhich
diff --git a/Master/bin/powerpc-darwin/makeindex b/Master/bin/powerpc-darwin/makeindex
index 439f1307dd4..a71dce0574b 100755
--- a/Master/bin/powerpc-darwin/makeindex
+++ b/Master/bin/powerpc-darwin/makeindex
diff --git a/Master/bin/powerpc-darwin/mf b/Master/bin/powerpc-darwin/mf
index 617d7974dbd..55a9906cead 100755
--- a/Master/bin/powerpc-darwin/mf
+++ b/Master/bin/powerpc-darwin/mf
diff --git a/Master/bin/powerpc-darwin/mf-nowin b/Master/bin/powerpc-darwin/mf-nowin
index acb83b0cefd..2dc63879557 100755
--- a/Master/bin/powerpc-darwin/mf-nowin
+++ b/Master/bin/powerpc-darwin/mf-nowin
diff --git a/Master/bin/powerpc-darwin/mft b/Master/bin/powerpc-darwin/mft
index 205d523f12b..38bbe4abda6 100755
--- a/Master/bin/powerpc-darwin/mft
+++ b/Master/bin/powerpc-darwin/mft
diff --git a/Master/bin/powerpc-darwin/mpost b/Master/bin/powerpc-darwin/mpost
index ddca8198fe9..c5fcde68e71 100755
--- a/Master/bin/powerpc-darwin/mpost
+++ b/Master/bin/powerpc-darwin/mpost
diff --git a/Master/bin/powerpc-darwin/odvicopy b/Master/bin/powerpc-darwin/odvicopy
index 0eb1c537982..8598494be4d 100755
--- a/Master/bin/powerpc-darwin/odvicopy
+++ b/Master/bin/powerpc-darwin/odvicopy
diff --git a/Master/bin/powerpc-darwin/odvitype b/Master/bin/powerpc-darwin/odvitype
index 156dec858a2..b46ae1d0d85 100755
--- a/Master/bin/powerpc-darwin/odvitype
+++ b/Master/bin/powerpc-darwin/odvitype
diff --git a/Master/bin/powerpc-darwin/omega b/Master/bin/powerpc-darwin/omega
index 7661abd1ed9..a0dd60f0ba1 100755
--- a/Master/bin/powerpc-darwin/omega
+++ b/Master/bin/powerpc-darwin/omega
diff --git a/Master/bin/powerpc-darwin/omfonts b/Master/bin/powerpc-darwin/omfonts
index cbd573d3397..71e30da4d85 100755
--- a/Master/bin/powerpc-darwin/omfonts
+++ b/Master/bin/powerpc-darwin/omfonts
diff --git a/Master/bin/powerpc-darwin/otftotfm b/Master/bin/powerpc-darwin/otftotfm
index 11ded531740..b65e0d4b962 100755
--- a/Master/bin/powerpc-darwin/otftotfm
+++ b/Master/bin/powerpc-darwin/otftotfm
diff --git a/Master/bin/powerpc-darwin/otp2ocp b/Master/bin/powerpc-darwin/otp2ocp
index 4eba59697b8..28f17bcf4db 100755
--- a/Master/bin/powerpc-darwin/otp2ocp
+++ b/Master/bin/powerpc-darwin/otp2ocp
diff --git a/Master/bin/powerpc-darwin/outocp b/Master/bin/powerpc-darwin/outocp
index 7be071a01df..5db1c76afad 100755
--- a/Master/bin/powerpc-darwin/outocp
+++ b/Master/bin/powerpc-darwin/outocp
diff --git a/Master/bin/powerpc-darwin/pdftex b/Master/bin/powerpc-darwin/pdftex
index 557f97b8966..222b6379d4f 100755
--- a/Master/bin/powerpc-darwin/pdftex
+++ b/Master/bin/powerpc-darwin/pdftex
diff --git a/Master/bin/powerpc-darwin/pktogf b/Master/bin/powerpc-darwin/pktogf
index fdfb365028a..6b66bc8f1f5 100755
--- a/Master/bin/powerpc-darwin/pktogf
+++ b/Master/bin/powerpc-darwin/pktogf
diff --git a/Master/bin/powerpc-darwin/pktype b/Master/bin/powerpc-darwin/pktype
index dc1b037d838..042fa6b48db 100755
--- a/Master/bin/powerpc-darwin/pktype
+++ b/Master/bin/powerpc-darwin/pktype
diff --git a/Master/bin/powerpc-darwin/ps2pk b/Master/bin/powerpc-darwin/ps2pk
index 7056540979a..90ccd10ba17 100755
--- a/Master/bin/powerpc-darwin/ps2pk
+++ b/Master/bin/powerpc-darwin/ps2pk
diff --git a/Master/bin/powerpc-darwin/t4ht b/Master/bin/powerpc-darwin/t4ht
index f98463281e9..316363f1847 100755
--- a/Master/bin/powerpc-darwin/t4ht
+++ b/Master/bin/powerpc-darwin/t4ht
diff --git a/Master/bin/powerpc-darwin/tangle b/Master/bin/powerpc-darwin/tangle
index 125dc628dd1..5ee0cb35f35 100755
--- a/Master/bin/powerpc-darwin/tangle
+++ b/Master/bin/powerpc-darwin/tangle
diff --git a/Master/bin/powerpc-darwin/tex b/Master/bin/powerpc-darwin/tex
index 1efd581ba3d..2044e40f5b1 100755
--- a/Master/bin/powerpc-darwin/tex
+++ b/Master/bin/powerpc-darwin/tex
diff --git a/Master/bin/powerpc-darwin/tex4ht b/Master/bin/powerpc-darwin/tex4ht
index 4cb076aafca..ca9fdf29eb2 100755
--- a/Master/bin/powerpc-darwin/tex4ht
+++ b/Master/bin/powerpc-darwin/tex4ht
diff --git a/Master/bin/powerpc-darwin/texlinks b/Master/bin/powerpc-darwin/texlinks
index 148d457aa84..f84f55a95bd 100755
--- a/Master/bin/powerpc-darwin/texlinks
+++ b/Master/bin/powerpc-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/powerpc-darwin/tftopl b/Master/bin/powerpc-darwin/tftopl
index 20930bf7bb6..a15070e2dad 100755
--- a/Master/bin/powerpc-darwin/tftopl
+++ b/Master/bin/powerpc-darwin/tftopl
diff --git a/Master/bin/powerpc-darwin/ttf2afm b/Master/bin/powerpc-darwin/ttf2afm
index a5d5fc5d4d5..9330d450b71 100755
--- a/Master/bin/powerpc-darwin/ttf2afm
+++ b/Master/bin/powerpc-darwin/ttf2afm
diff --git a/Master/bin/powerpc-darwin/ttf2pk b/Master/bin/powerpc-darwin/ttf2pk
index 1841f250711..3bc0156c36e 100755
--- a/Master/bin/powerpc-darwin/ttf2pk
+++ b/Master/bin/powerpc-darwin/ttf2pk
diff --git a/Master/bin/powerpc-darwin/ttf2tfm b/Master/bin/powerpc-darwin/ttf2tfm
index 0b47e76cd2d..f3e511d5f58 100755
--- a/Master/bin/powerpc-darwin/ttf2tfm
+++ b/Master/bin/powerpc-darwin/ttf2tfm
diff --git a/Master/bin/powerpc-darwin/vftovp b/Master/bin/powerpc-darwin/vftovp
index ac0eacfc65e..3455f832ba6 100755
--- a/Master/bin/powerpc-darwin/vftovp
+++ b/Master/bin/powerpc-darwin/vftovp
diff --git a/Master/bin/powerpc-darwin/weave b/Master/bin/powerpc-darwin/weave
index bb35eb4f976..6a87f269b53 100755
--- a/Master/bin/powerpc-darwin/weave
+++ b/Master/bin/powerpc-darwin/weave
diff --git a/Master/bin/powerpc-darwin/xdvi-xaw.bin b/Master/bin/powerpc-darwin/xdvi-xaw.bin
index c3d7946ad1b..2fe74b7b27b 100755
--- a/Master/bin/powerpc-darwin/xdvi-xaw.bin
+++ b/Master/bin/powerpc-darwin/xdvi-xaw.bin
diff --git a/Master/bin/powerpc-darwin/xdvipdfmx b/Master/bin/powerpc-darwin/xdvipdfmx
index 0e2d84451c2..5b7dab43436 100755
--- a/Master/bin/powerpc-darwin/xdvipdfmx
+++ b/Master/bin/powerpc-darwin/xdvipdfmx