67 files changed, 22 insertions, 13 deletions

diff --git a/Master/bin/universal-darwin/afm2pl b/Master/bin/universal-darwin/afm2pl
index 80134528417..4a86f7085bc 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 03482449366..06072332e38 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 b92d9fad3ea..0221a6b03d3 100755
--- a/Master/bin/universal-darwin/aleph
+++ b/Master/bin/universal-darwin/aleph
diff --git a/Master/bin/universal-darwin/asy b/Master/bin/universal-darwin/asy
index 24cc417e63a..8a05e7dcda1 100755
--- a/Master/bin/universal-darwin/asy
+++ b/Master/bin/universal-darwin/asy
diff --git a/Master/bin/universal-darwin/bbox b/Master/bin/universal-darwin/bbox
index e1551b503dd..d662d5dfeb6 100755
--- a/Master/bin/universal-darwin/bbox
+++ b/Master/bin/universal-darwin/bbox
diff --git a/Master/bin/universal-darwin/bibtex b/Master/bin/universal-darwin/bibtex
index e62801d2399..bd74ec6e904 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 ce1db365abb..41152fbe551 100755
--- a/Master/bin/universal-darwin/bibtex8
+++ b/Master/bin/universal-darwin/bibtex8
diff --git a/Master/bin/universal-darwin/ctangle b/Master/bin/universal-darwin/ctangle
index da5d581218e..bcf0fa12b02 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 fe89d1f4c40..71b31a6e157 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 0de870a1dae..23388baeaed 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 3e75c41063a..c8526246f64 100755
--- a/Master/bin/universal-darwin/detex
+++ b/Master/bin/universal-darwin/detex
diff --git a/Master/bin/universal-darwin/dvicopy b/Master/bin/universal-darwin/dvicopy
index 225bd50bc50..f5f2f2f182b 100755
--- a/Master/bin/universal-darwin/dvicopy
+++ b/Master/bin/universal-darwin/dvicopy
diff --git a/Master/bin/universal-darwin/dvilj b/Master/bin/universal-darwin/dvilj
index 04470307257..40669adcda0 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 fe1489a8787..9a445485aa6 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 3762ca34a4f..ef1961ac342 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 2e2f230de10..90a8e6d9dbd 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 de0cfa83176..83280be5314 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 a96d38419e7..4c9c480d21e 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 831e63f246a..bf6c528a85c 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 4cf38b652e3..f5e1f0ea596 100755
--- a/Master/bin/universal-darwin/dvips
+++ b/Master/bin/universal-darwin/dvips
diff --git a/Master/bin/universal-darwin/dvitype b/Master/bin/universal-darwin/dvitype
index 408a4f4abdc..f756efb833e 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 bd8cdfa873e..e822870f977 100755
--- a/Master/bin/universal-darwin/epsffit
+++ b/Master/bin/universal-darwin/epsffit
diff --git a/Master/bin/universal-darwin/gftodvi b/Master/bin/universal-darwin/gftodvi
index 82681353af9..0ca555c9693 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 d95a2b23d91..1e858f1cb1c 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 df4cbc402f8..88a546d20f1 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 0fcd04f1e28..43c801b6d88 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 97b78451fea..a251f8bd675 100755
--- a/Master/bin/universal-darwin/hbf2gf
+++ b/Master/bin/universal-darwin/hbf2gf
diff --git a/Master/bin/universal-darwin/kpsewhich b/Master/bin/universal-darwin/kpsewhich
index 0c3c17a49e8..dfa3034bc29 100755
--- a/Master/bin/universal-darwin/kpsewhich
+++ b/Master/bin/universal-darwin/kpsewhich
diff --git a/Master/bin/universal-darwin/luatangle b/Master/bin/universal-darwin/luatangle
index 7e37b64756d..b28fc15d2d3 100755
--- a/Master/bin/universal-darwin/luatangle
+++ b/Master/bin/universal-darwin/luatangle
diff --git a/Master/bin/universal-darwin/luatex b/Master/bin/universal-darwin/luatex
index 384cd1c7a87..5c8d6d0cec0 100755
--- a/Master/bin/universal-darwin/luatex
+++ b/Master/bin/universal-darwin/luatex
diff --git a/Master/bin/universal-darwin/makeindex b/Master/bin/universal-darwin/makeindex
index 0acd5889cfa..dfd8a2344a1 100755
--- a/Master/bin/universal-darwin/makeindex
+++ b/Master/bin/universal-darwin/makeindex
diff --git a/Master/bin/universal-darwin/mf b/Master/bin/universal-darwin/mf
index 5ec37b2bb07..a39c451145f 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 e969973abc7..672107b446b 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 9bb0918788d..85bd8a53488 100755
--- a/Master/bin/universal-darwin/mft
+++ b/Master/bin/universal-darwin/mft
diff --git a/Master/bin/universal-darwin/mpost b/Master/bin/universal-darwin/mpost
index 2b679ccd4f9..6ae03427c5c 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 2f8f1b24f26..b66bed6b706 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 6d40830c09d..cdef44e3144 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 ef9ccdaca4c..0ff9264c483 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 1ff9902aa2c..2206d2554a9 100755
--- a/Master/bin/universal-darwin/otangle
+++ b/Master/bin/universal-darwin/otangle
diff --git a/Master/bin/universal-darwin/otftotfm b/Master/bin/universal-darwin/otftotfm
index b7e91954e5d..ac8317b8895 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 8026ece6ffb..e16c442377a 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 186a42d3e75..30bbf975832 100755
--- a/Master/bin/universal-darwin/outocp
+++ b/Master/bin/universal-darwin/outocp
diff --git a/Master/bin/universal-darwin/pdftex b/Master/bin/universal-darwin/pdftex
index e6586c4f145..90721ae2ba9 100755
--- a/Master/bin/universal-darwin/pdftex
+++ b/Master/bin/universal-darwin/pdftex
diff --git a/Master/bin/universal-darwin/pktogf b/Master/bin/universal-darwin/pktogf
index fd90fb6d481..0eb3013559b 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 7ddf3779119..3f0e1ce39d9 100755
--- a/Master/bin/universal-darwin/pktype
+++ b/Master/bin/universal-darwin/pktype
diff --git a/Master/bin/universal-darwin/ps2pk b/Master/bin/universal-darwin/ps2pk
index 285bbd11cd2..afa905ec9d0 100755
--- a/Master/bin/universal-darwin/ps2pk
+++ b/Master/bin/universal-darwin/ps2pk
diff --git a/Master/bin/universal-darwin/psnup b/Master/bin/universal-darwin/psnup
index 71b8e1795d5..8d17be012af 100755
--- a/Master/bin/universal-darwin/psnup
+++ b/Master/bin/universal-darwin/psnup
diff --git a/Master/bin/universal-darwin/t4ht b/Master/bin/universal-darwin/t4ht
index f24ee5e4bcf..6de702f22cd 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 140c1910830..5869cbcc543 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
new file mode 100755
index 00000000000..069b38dbdf4
--- /dev/null
+++ b/Master/bin/universal-darwin/teckit_compile
diff --git a/Master/bin/universal-darwin/tex b/Master/bin/universal-darwin/tex
index 05c3031ab91..405394d3698 100755
--- a/Master/bin/universal-darwin/tex
+++ b/Master/bin/universal-darwin/tex
diff --git a/Master/bin/universal-darwin/tex4ht b/Master/bin/universal-darwin/tex4ht
index 0dd83e280f9..55f6aebdf6c 100755
--- a/Master/bin/universal-darwin/tex4ht
+++ b/Master/bin/universal-darwin/tex4ht
diff --git a/Master/bin/universal-darwin/texlinks b/Master/bin/universal-darwin/texlinks
index d8e51550924..c77ceea60c0 100755
--- a/Master/bin/universal-darwin/texlinks
+++ b/Master/bin/universal-darwin/texlinks
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id: texlinks 13904 2009-06-23 00:47:00Z karl $
 
 # Thomas Esser, 1999, 2002, 2003. public domain.
 
@@ -38,24 +39,26 @@ export PATH
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
-cnf=fmtutil.cnf   # name of the config file
-version=20080528.1847 # utc timestamp 
+version=20090623.0228
 progname=texlinks
+cnf=fmtutil.cnf   # name of the config file
 
 usage='Usage: texlinks [OPTION]... [DIRECTORY]...
 
 Create symbolic links format -> engine according to fmtutil setup.
 
 Mandatory arguments to long options are mandatory for short options too.
-  -h, --help           show this help text
-  --version            show version string
+  -e, --exeext EXT     append EXT to symlink targets (default: none)
   -f, --cnffile FILE   use FILE as config file (default: fmtutil.cnf)
-  -v, --verbose        enable verbose messages (default: off)
   -m, --multiplatform  operate in all platform specific directories
                         (default: operate only in directory for this platform)
-  -s, --silent         silently skip existing scripts / binaries
+  -q, --quiet          silently skip existing scripts / binaries
                         (default: issue warning)
+  -s, --silent         same as -q
   -u, --unlink	       remove symlinks created by texlinks
+  -v, --verbose        enable verbose messages (default: off)
+  -h, --help           show this help text
+  --version            show version string
 
 The DIRECTORY arguments are an optional list of directories in which to
 operate.  If no directories are specified and --multiplatform is
@@ -125,7 +128,8 @@ check_for_binary()
 ###############################################################################
 # install_link(dest src)
 #   create a symlink like ln -s dest src, but make sure that src is not
-#   an existing binary
+#   an existing binary, possibly adding the executable extension if
+#   passed on the command.
 ###############################################################################
 install_link()
 {
@@ -148,6 +152,9 @@ install_link()
       ;;
   esac
 
+  # append .exe if supplied (for cygwin).
+  test -n "$exeext" && dest="$dest$exeext"
+  
   case $src in
     */cont-??|*/mptopdf)
       # context includes wrapper scripts that create/run these.
@@ -155,7 +162,7 @@ install_link()
       ;;
     *)
       test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-        verbose_do rm -f "$src"
+        rm -f "$src"
   
       if test -f "$src"; then
         case $silent in
@@ -235,6 +242,7 @@ main()
   dirs=
   needsCleanup=false
 
+  exeext=
   multiplatform=false
   verbose=false
   unlink=false
@@ -247,13 +255,14 @@ main()
       --h*|-h)
           echo "$usage"; exit 0;;
       --version)
-          echo "$progname version $version."; exit 0;;
+          echo "$progname version $version"; exit 0;;
       --cnffile|-f)
           shift; cnf_file=$1;;
-      --v*|-v) verbose=true;;
-      --s*|-s) silent=true;;
+      --e*|-e) shift; exeext=$1;;
       --m*|-m) multiplatform=true;;
+      --s*|-s|--q*|-q) silent=true;;
       --u*|-u) unlink=true;;
+      --v*|-v) verbose=true;;
       -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
       *)  break;;
     esac
diff --git a/Master/bin/universal-darwin/tftopl b/Master/bin/universal-darwin/tftopl
index d3a2804c23f..cfce8f827fa 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 67eb8d61043..492ee14f27a 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 b72b37c6f16..d57167efb77 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 6c8d4121044..639e9ef4f09 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 dd35299b6d1..4ec7726c536 100755
--- a/Master/bin/universal-darwin/ttf2tfm
+++ b/Master/bin/universal-darwin/ttf2tfm
diff --git a/Master/bin/universal-darwin/vftovp b/Master/bin/universal-darwin/vftovp
index 9c086401200..bf6d7c47e12 100755
--- a/Master/bin/universal-darwin/vftovp
+++ b/Master/bin/universal-darwin/vftovp
diff --git a/Master/bin/universal-darwin/weave b/Master/bin/universal-darwin/weave
index e9859dcb1ed..bb1c279f5d2 100755
--- a/Master/bin/universal-darwin/weave
+++ b/Master/bin/universal-darwin/weave
diff --git a/Master/bin/universal-darwin/xdv2pdf b/Master/bin/universal-darwin/xdv2pdf
index 974e2d25634..750b608d193 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 c795cf5d3c9..b98d4386708 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 46f2e73927e..cd2be92323c 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 e229ec2b0fb..4acd3656f3d 100755
--- a/Master/bin/universal-darwin/xetex
+++ b/Master/bin/universal-darwin/xetex
diff --git a/Master/bin/universal-darwin/xindy-i386.mem b/Master/bin/universal-darwin/xindy-i386.mem
index 85bcfea16db..2133433ec06 100644
--- a/Master/bin/universal-darwin/xindy-i386.mem
+++ b/Master/bin/universal-darwin/xindy-i386.mem
diff --git a/Master/bin/universal-darwin/xindy-ppc.mem b/Master/bin/universal-darwin/xindy-ppc.mem
index f3bd54bf2ee..39b9045f5c9 100644
--- a/Master/bin/universal-darwin/xindy-ppc.mem
+++ b/Master/bin/universal-darwin/xindy-ppc.mem
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 85b9d1b7770..720c1df7dbe 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 # Public domain.  Originally written 2008, Karl Berry.
 # Update a TeX Live Master/bin/PLATFORM directory.
 
@@ -139,7 +139,7 @@ for tlname in $tlnames; do
     exit 1
   fi
 
-  $msg "installing from $bin_loc to $destdir"
+  $msg "installing from $bin_loc to $destdir via $tmpdir"
   rm -rf $tmpdir
   mkdir $tmpdir