x86_64-linux pretest1 update (from peb)

git-svn-id: svn://tug.org/texlive/trunk@18365 c570f23f-e606-0410-a88d-b1316a301751

138 files changed, 293 insertions, 45 deletions

diff --git a/Master/bin/x86_64-linux/afm2pl b/Master/bin/x86_64-linux/afm2pl
index 19fddc8f43c..6353ca31147 100755
--- a/Master/bin/x86_64-linux/afm2pl
+++ b/Master/bin/x86_64-linux/afm2pl
diff --git a/Master/bin/x86_64-linux/afm2tfm b/Master/bin/x86_64-linux/afm2tfm
index f01feefad0f..9c8de9a995f 100755
--- a/Master/bin/x86_64-linux/afm2tfm
+++ b/Master/bin/x86_64-linux/afm2tfm
diff --git a/Master/bin/x86_64-linux/aleph b/Master/bin/x86_64-linux/aleph
index a280f4a483f..7d32a09734b 100755
--- a/Master/bin/x86_64-linux/aleph
+++ b/Master/bin/x86_64-linux/aleph
diff --git a/Master/bin/x86_64-linux/bbox b/Master/bin/x86_64-linux/bbox
index 3a839e3cb0a..9708926746a 100755
--- a/Master/bin/x86_64-linux/bbox
+++ b/Master/bin/x86_64-linux/bbox
diff --git a/Master/bin/x86_64-linux/bg5conv b/Master/bin/x86_64-linux/bg5conv
index 2744ebcfd20..687e8ee9a81 100755
--- a/Master/bin/x86_64-linux/bg5conv
+++ b/Master/bin/x86_64-linux/bg5conv
diff --git a/Master/bin/x86_64-linux/bibtex b/Master/bin/x86_64-linux/bibtex
index 4833b08e898..4e168c101fe 100755
--- a/Master/bin/x86_64-linux/bibtex
+++ b/Master/bin/x86_64-linux/bibtex
diff --git a/Master/bin/x86_64-linux/bibtex8 b/Master/bin/x86_64-linux/bibtex8
index ee0be7c4b78..4f79d3b7c53 100755
--- a/Master/bin/x86_64-linux/bibtex8
+++ b/Master/bin/x86_64-linux/bibtex8
diff --git a/Master/bin/x86_64-linux/bibtexu b/Master/bin/x86_64-linux/bibtexu
new file mode 100755
index 00000000000..a2a18421ca1
--- /dev/null
+++ b/Master/bin/x86_64-linux/bibtexu
diff --git a/Master/bin/x86_64-linux/cef5conv b/Master/bin/x86_64-linux/cef5conv
index bafa91a5c7a..5cac76b4e93 100755
--- a/Master/bin/x86_64-linux/cef5conv
+++ b/Master/bin/x86_64-linux/cef5conv
diff --git a/Master/bin/x86_64-linux/cefconv b/Master/bin/x86_64-linux/cefconv
index 5283d77304b..eaae44940d9 100755
--- a/Master/bin/x86_64-linux/cefconv
+++ b/Master/bin/x86_64-linux/cefconv
diff --git a/Master/bin/x86_64-linux/cefsconv b/Master/bin/x86_64-linux/cefsconv
index 3d85e91223b..7cface08b29 100755
--- a/Master/bin/x86_64-linux/cefsconv
+++ b/Master/bin/x86_64-linux/cefsconv
diff --git a/Master/bin/x86_64-linux/cfftot1 b/Master/bin/x86_64-linux/cfftot1
index 56539f9503b..d055badc1d9 100755
--- a/Master/bin/x86_64-linux/cfftot1
+++ b/Master/bin/x86_64-linux/cfftot1
diff --git a/Master/bin/x86_64-linux/chktex b/Master/bin/x86_64-linux/chktex
new file mode 100755
index 00000000000..c319409e3de
--- /dev/null
+++ b/Master/bin/x86_64-linux/chktex
diff --git a/Master/bin/x86_64-linux/chkweb b/Master/bin/x86_64-linux/chkweb
new file mode 100755
index 00000000000..cbc0caa780d
--- /dev/null
+++ b/Master/bin/x86_64-linux/chkweb
@@ -0,0 +1,56 @@
+#! /bin/sh
+
+#  ChkWEB v1.0, runs the LaTeX parts of a CWEB file through ChkTeX.
+#  Copyright (C) 1996 Jens T. Berger Thielemann
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#  Contact the author at:
+#		Jens Berger
+#		Spektrumvn. 4
+#		N-0666 Oslo
+#		Norway
+#		E-mail: <jensthi@ifi.uio.no>
+
+
+params=
+
+for p
+do
+    case $p in
+    --) break
+	;;
+    -*) params="$params $p"
+	shift
+	;;
+    *) break
+	;;
+    esac
+done
+
+
+if test "$1" = ""; then
+    deweb | chktex -v3 $params
+else
+    for file
+    do
+	if test -f $file; then
+	    deweb $file | chktex -p $file -v3 $params
+	else
+	    deweb $file.w | chktex -p $file.w -v3 $params
+	fi
+    done
+fi
+
diff --git a/Master/bin/x86_64-linux/ctangle b/Master/bin/x86_64-linux/ctangle
index b24d9035aef..63d893a7bd6 100755
--- a/Master/bin/x86_64-linux/ctangle
+++ b/Master/bin/x86_64-linux/ctangle
diff --git a/Master/bin/x86_64-linux/ctie b/Master/bin/x86_64-linux/ctie
index 562caed9256..2641adda480 100755
--- a/Master/bin/x86_64-linux/ctie
+++ b/Master/bin/x86_64-linux/ctie
diff --git a/Master/bin/x86_64-linux/cweave b/Master/bin/x86_64-linux/cweave
index 540620877c4..dae610ca7f3 100755
--- a/Master/bin/x86_64-linux/cweave
+++ b/Master/bin/x86_64-linux/cweave
diff --git a/Master/bin/x86_64-linux/detex b/Master/bin/x86_64-linux/detex
index c1fbde330c3..23364154921 100755
--- a/Master/bin/x86_64-linux/detex
+++ b/Master/bin/x86_64-linux/detex
diff --git a/Master/bin/x86_64-linux/devnag b/Master/bin/x86_64-linux/devnag
index bf12c3cc8c6..4863641126f 100755
--- a/Master/bin/x86_64-linux/devnag
+++ b/Master/bin/x86_64-linux/devnag
diff --git a/Master/bin/x86_64-linux/deweb b/Master/bin/x86_64-linux/deweb
new file mode 100755
index 00000000000..245119b134a
--- /dev/null
+++ b/Master/bin/x86_64-linux/deweb
@@ -0,0 +1,122 @@
+#! /usr/bin/env perl
+#  deweb v1.2, kills the C sections of a CWEB file, for passing to ChkTeX.
+#  Copyright (C) 1996 Jens T. Berger Thielemann
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#  Contact the author at:
+#		Jens Berger
+#		Spektrumvn. 4
+#		N-0666 Oslo
+#		Norway
+#		E-mail: <jensthi@ifi.uio.no>
+#
+#
+#
+
+print STDERR "DeWEB v1.2 - Copyright 1996 Jens T. Berger Thielemann\n";
+
+undef $/;
+$texmode = 1;
+$_ = <>;
+
+while(/\@/)
+{
+    &out($`);
+    $_ = $';
+
+    if(/^@/) {
+	$_ = $';
+	&out('@');
+       	next;
+    }
+
+    if(/^([\s\n])/) {
+	$_ = $';
+	print "\n" if $1 eq "\n";
+	$texmode = 1;
+	next;
+    }
+
+    if(/^[cpd]/i) {
+	$_ = $';
+	$texmode = 0;
+	next;
+    }
+
+    if(/^\,/i) {
+	$_ = $';
+        print '\,';
+	next;
+    }
+
+    if(m!^/!) {
+	$_ = $';
+        print '\\\\';
+	next;
+    }
+
+    if(/^[h\&\|\;\#\+]/i || /^i.*/i) {
+	$_ = $';
+	next;
+    }
+
+    if(/^\*[0-9\*]?((.|\n)*?\.)/) {
+	$_ = $';
+	print $1;
+	$texmode = 1;
+	next;
+    }
+
+    if(/^[<(^.t!]((.|\n)*?)\@\>/i) {
+	$_ = $';
+	print '{'.$1.'}';
+	$texmode = 0;
+	next;
+    }
+
+    if(/^[=]((.|\n)*?)\@\>/) {
+	$_ = $';
+	print &printnl($1);
+	next;
+    }
+
+    if(/^[fsl](\s+\S+\s+\S+)|^\'(.|\n)*?\'|^\[((.|\n)*?)\@\]/i) {
+	$_ = $';
+	print &printnl($+);
+	next;
+    }
+
+    @line = split(/\n/, $_, 2);
+    print STDERR "Unknown opcode, ignored. Buffer:\n$line[0]\n";
+
+}
+
+print $_;
+
+sub printnl {
+    my($foo);
+    if(defined $_[0]) {
+	$foo = $_[0];
+	$foo =~ s/.//g;
+    } else {
+	$foo = "";
+    }
+    $foo;
+}
+
+sub out {
+    print $texmode? $_[0] : &printnl($_[0]);
+}
diff --git a/Master/bin/x86_64-linux/disdvi b/Master/bin/x86_64-linux/disdvi
index 1b3f0eb1142..1ded143b6c1 100755
--- a/Master/bin/x86_64-linux/disdvi
+++ b/Master/bin/x86_64-linux/disdvi
diff --git a/Master/bin/x86_64-linux/dt2dv b/Master/bin/x86_64-linux/dt2dv
index 33e59cc40fe..94de583cc4d 100755
--- a/Master/bin/x86_64-linux/dt2dv
+++ b/Master/bin/x86_64-linux/dt2dv
diff --git a/Master/bin/x86_64-linux/dv2dt b/Master/bin/x86_64-linux/dv2dt
index 32193a0a7e5..b34c6286e53 100755
--- a/Master/bin/x86_64-linux/dv2dt
+++ b/Master/bin/x86_64-linux/dv2dt
diff --git a/Master/bin/x86_64-linux/dvi2tty b/Master/bin/x86_64-linux/dvi2tty
index 646e2271d2b..d9425262c96 100755
--- a/Master/bin/x86_64-linux/dvi2tty
+++ b/Master/bin/x86_64-linux/dvi2tty
diff --git a/Master/bin/x86_64-linux/dvibook b/Master/bin/x86_64-linux/dvibook
index c093bbf4c4e..297421dc848 100755
--- a/Master/bin/x86_64-linux/dvibook
+++ b/Master/bin/x86_64-linux/dvibook
diff --git a/Master/bin/x86_64-linux/dviconcat b/Master/bin/x86_64-linux/dviconcat
index d3c2a1565bb..085190470cc 100755
--- a/Master/bin/x86_64-linux/dviconcat
+++ b/Master/bin/x86_64-linux/dviconcat
diff --git a/Master/bin/x86_64-linux/dvicopy b/Master/bin/x86_64-linux/dvicopy
index e85b830ac26..d7595beb868 100755
--- a/Master/bin/x86_64-linux/dvicopy
+++ b/Master/bin/x86_64-linux/dvicopy
diff --git a/Master/bin/x86_64-linux/dvidvi b/Master/bin/x86_64-linux/dvidvi
index 316052a68e7..57ebf460061 100755
--- a/Master/bin/x86_64-linux/dvidvi
+++ b/Master/bin/x86_64-linux/dvidvi
diff --git a/Master/bin/x86_64-linux/dvihp b/Master/bin/x86_64-linux/dvihp
index 6b149517086..fdaf3fb87bf 100755
--- a/Master/bin/x86_64-linux/dvihp
+++ b/Master/bin/x86_64-linux/dvihp
@@ -1,6 +1,7 @@
 #!/bin/sh
 # $Id: dvihp,v 1.3 1996/12/03 19:53:56 karl Exp karl $
-# Run dvicopy, then dvilj[k].  kb@mail.tug.org, 1994.  Public domain.
+# Run dvicopy, then dvilj[k].  Originally written by Karl Berry.
+# Public domain.
 # Try to accept arguments a la dvips, from Thomas Esser.
 
 : ${DVILJ=dvilj4}       # the dvilj variant to run
@@ -43,7 +44,7 @@ usage="Usage: `basename $0` [OPTIONS] [DVIFILE[.dvi]].
 
 Other options are passed to the dvilj program.
 
-Email bug reports to tex-k@mail.tug.org."
+Email bug reports to tex-k@tug.org."
 
 
 if test $# -eq 0; then
diff --git a/Master/bin/x86_64-linux/dvilj b/Master/bin/x86_64-linux/dvilj
index 4af8e855b50..fd8607ac759 100755
--- a/Master/bin/x86_64-linux/dvilj
+++ b/Master/bin/x86_64-linux/dvilj
diff --git a/Master/bin/x86_64-linux/dvilj2p b/Master/bin/x86_64-linux/dvilj2p
index 9174afc8109..aa8810d896f 100755
--- a/Master/bin/x86_64-linux/dvilj2p
+++ b/Master/bin/x86_64-linux/dvilj2p
diff --git a/Master/bin/x86_64-linux/dvilj4 b/Master/bin/x86_64-linux/dvilj4
index 2e4feea9a87..675504ba3a8 100755
--- a/Master/bin/x86_64-linux/dvilj4
+++ b/Master/bin/x86_64-linux/dvilj4
diff --git a/Master/bin/x86_64-linux/dvilj4l b/Master/bin/x86_64-linux/dvilj4l
index 6baec04bda4..5b6e46e410b 100755
--- a/Master/bin/x86_64-linux/dvilj4l
+++ b/Master/bin/x86_64-linux/dvilj4l
diff --git a/Master/bin/x86_64-linux/dvipdfmx b/Master/bin/x86_64-linux/dvipdfmx
index e5ae562c792..a8e58bc81f7 100755
--- a/Master/bin/x86_64-linux/dvipdfmx
+++ b/Master/bin/x86_64-linux/dvipdfmx
diff --git a/Master/bin/x86_64-linux/dvipng b/Master/bin/x86_64-linux/dvipng
index c6035fb9372..4868c90eb72 100755
--- a/Master/bin/x86_64-linux/dvipng
+++ b/Master/bin/x86_64-linux/dvipng
diff --git a/Master/bin/x86_64-linux/dvipos b/Master/bin/x86_64-linux/dvipos
index a3cda5ba83f..5b5a562ec38 100755
--- a/Master/bin/x86_64-linux/dvipos
+++ b/Master/bin/x86_64-linux/dvipos
diff --git a/Master/bin/x86_64-linux/dvips b/Master/bin/x86_64-linux/dvips
index 08ac80b17ea..276f0824cc5 100755
--- a/Master/bin/x86_64-linux/dvips
+++ b/Master/bin/x86_64-linux/dvips
diff --git a/Master/bin/x86_64-linux/dviselect b/Master/bin/x86_64-linux/dviselect
index 2183a98bc16..5ea89317596 100755
--- a/Master/bin/x86_64-linux/dviselect
+++ b/Master/bin/x86_64-linux/dviselect
diff --git a/Master/bin/x86_64-linux/dvisvgm b/Master/bin/x86_64-linux/dvisvgm
new file mode 100755
index 00000000000..8e2a9c8a343
--- /dev/null
+++ b/Master/bin/x86_64-linux/dvisvgm
diff --git a/Master/bin/x86_64-linux/dvitodvi b/Master/bin/x86_64-linux/dvitodvi
index f2835d30108..60ab3a6cdb6 100755
--- a/Master/bin/x86_64-linux/dvitodvi
+++ b/Master/bin/x86_64-linux/dvitodvi
diff --git a/Master/bin/x86_64-linux/dvitype b/Master/bin/x86_64-linux/dvitype
index 8da50250671..cb7f61f7eed 100755
--- a/Master/bin/x86_64-linux/dvitype
+++ b/Master/bin/x86_64-linux/dvitype
diff --git a/Master/bin/x86_64-linux/epsffit b/Master/bin/x86_64-linux/epsffit
index fafbf095e91..ec9a583b5e9 100755
--- a/Master/bin/x86_64-linux/epsffit
+++ b/Master/bin/x86_64-linux/epsffit
diff --git a/Master/bin/x86_64-linux/extconv b/Master/bin/x86_64-linux/extconv
index bb344cab35e..a599dce5422 100755
--- a/Master/bin/x86_64-linux/extconv
+++ b/Master/bin/x86_64-linux/extconv
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index f12885629e2..6257aba50e7 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -1,6 +1,7 @@
 #!/bin/sh
 # fmtutil - utility to maintain format files.
 # Public domain.  Originally written by Thomas Esser.
+# Run with --help for usage.
 
 # program history:
 #   further changes in texk/tetex/ChangeLog.
@@ -58,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091223.1047
+version='$Id: fmtutil 17423 2010-03-11 17:53:34Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -82,13 +83,24 @@ cleanup()
 ###############################################################################
 help()
 {
-  cat <<'eof'
+  cat <<eof
+$version
 Usage: fmtutil [OPTION]... CMD [ARG]...
+Usage: mktexfmt FMT.fmt|BASE.base|MEM.mem|FMTNAME
+
+Rebuild and manage TeX formats (and Metafont bases and MetaPost mems).
+
+If the command name ends in mktexfmt, only one format can be created.
+The only options supported are --help and --version, and the command
+line must consist of either a format name, with its extension, or a
+plain name that is passed as the argument to --byfmt (see below).  The
+full name of the generated file (if any) is written to stdout, and
+nothing else.
 
-Rebuild, manage, and otherwise manipulate TeX formats (and Metafont
-bases and MetaPost mems).
+If not operating in mktexfmt mode, the command line can be more general,
+and multiple formats can be generated, as follows.
 
-Valid options:
+Valid options for fmtutil:
   --cnffile FILE
   --fmtdir DIRECTORY
   --no-engine-subdir         don't use engine-specific subdir of the fmtdir
@@ -97,7 +109,7 @@ Valid options:
   --dolinks                  (not implemented, just for compatibility)
   --force                    (not implemented, just for compatibility)
 
-Valid commands:
+Valid commands for fmtutil:
   --all                      recreate all format files
   --missing                  create all missing format files
   --refresh                  recreate only existing format files
@@ -116,6 +128,9 @@ Valid commands:
 
 The config file is named fmtutil.cnf, and
 running  kpsewhich fmtutil.cnf  should show the active file.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 eof
   cleanup 0
 }
@@ -398,18 +413,15 @@ main()
       mktexfmtMode=true
       fullfmt=$1; shift
       case $fullfmt in
+        ""|--help) help ;;
+        --version) version ;;
+              --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
-           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift
-           ;;
-        *.*)
-           abort "unknown format type: $fullfmt"
-           ;;
-        "")
-           help
-           ;;
-        *)
-           set x --byfmt $fullfmt; shift
-           ;;
+          set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
+          shift
+          ;;
+        *.*) abort "unknown format type: $fullfmt" ;;
+          *) set x --byfmt $fullfmt; shift ;;
       esac
       ;;
   esac
@@ -482,7 +494,7 @@ main()
   esac
 
   if test -n "$cfgparam"; then
-    test -f "$cnf_file" || abort "config file \`$cnf_file' not found"
+    test -f "$cnf_file" || abort "config file \`$cnf_file' not found (ls-R missing?)"
   fi
 
   if test -n "$cfgmaint"; then
diff --git a/Master/bin/x86_64-linux/gftodvi b/Master/bin/x86_64-linux/gftodvi
index 47d10d94001..49bf41eca93 100755
--- a/Master/bin/x86_64-linux/gftodvi
+++ b/Master/bin/x86_64-linux/gftodvi
diff --git a/Master/bin/x86_64-linux/gftopk b/Master/bin/x86_64-linux/gftopk
index 8b59cd78711..a8bef13114c 100755
--- a/Master/bin/x86_64-linux/gftopk
+++ b/Master/bin/x86_64-linux/gftopk
diff --git a/Master/bin/x86_64-linux/gftype b/Master/bin/x86_64-linux/gftype
index 8d463271025..5b24497d959 100755
--- a/Master/bin/x86_64-linux/gftype
+++ b/Master/bin/x86_64-linux/gftype
diff --git a/Master/bin/x86_64-linux/gsftopk b/Master/bin/x86_64-linux/gsftopk
index 2687fad2fb5..229a5e02e52 100755
--- a/Master/bin/x86_64-linux/gsftopk
+++ b/Master/bin/x86_64-linux/gsftopk
diff --git a/Master/bin/x86_64-linux/hbf2gf b/Master/bin/x86_64-linux/hbf2gf
index 50dd6cb3f49..74c66c194d3 100755
--- a/Master/bin/x86_64-linux/hbf2gf
+++ b/Master/bin/x86_64-linux/hbf2gf
diff --git a/Master/bin/x86_64-linux/kpseaccess b/Master/bin/x86_64-linux/kpseaccess
index 240e15f3f2c..81d6e1a7abb 100755
--- a/Master/bin/x86_64-linux/kpseaccess
+++ b/Master/bin/x86_64-linux/kpseaccess
diff --git a/Master/bin/x86_64-linux/kpsereadlink b/Master/bin/x86_64-linux/kpsereadlink
index 9b9301d1214..3759f313a8e 100755
--- a/Master/bin/x86_64-linux/kpsereadlink
+++ b/Master/bin/x86_64-linux/kpsereadlink
diff --git a/Master/bin/x86_64-linux/kpsestat b/Master/bin/x86_64-linux/kpsestat
index c53c3f09665..bb6160dddf4 100755
--- a/Master/bin/x86_64-linux/kpsestat
+++ b/Master/bin/x86_64-linux/kpsestat
diff --git a/Master/bin/x86_64-linux/kpsewhich b/Master/bin/x86_64-linux/kpsewhich
index db5bf41a57a..9a2f6d98801 100755
--- a/Master/bin/x86_64-linux/kpsewhich
+++ b/Master/bin/x86_64-linux/kpsewhich
diff --git a/Master/bin/x86_64-linux/lacheck b/Master/bin/x86_64-linux/lacheck
index 45255599903..d1b84fcb7d3 100755
--- a/Master/bin/x86_64-linux/lacheck
+++ b/Master/bin/x86_64-linux/lacheck
diff --git a/Master/bin/x86_64-linux/luatex b/Master/bin/x86_64-linux/luatex
index 9655a3e38f9..7b68f60efca 100755
--- a/Master/bin/x86_64-linux/luatex
+++ b/Master/bin/x86_64-linux/luatex
diff --git a/Master/bin/x86_64-linux/mag b/Master/bin/x86_64-linux/mag
index 198f8ca1f52..28a924c75a3 100755
--- a/Master/bin/x86_64-linux/mag
+++ b/Master/bin/x86_64-linux/mag
diff --git a/Master/bin/x86_64-linux/makeindex b/Master/bin/x86_64-linux/makeindex
index 42af2488a19..a0e920801bf 100755
--- a/Master/bin/x86_64-linux/makeindex
+++ b/Master/bin/x86_64-linux/makeindex
diff --git a/Master/bin/x86_64-linux/makejvf b/Master/bin/x86_64-linux/makejvf
new file mode 100755
index 00000000000..34a9588f668
--- /dev/null
+++ b/Master/bin/x86_64-linux/makejvf
diff --git a/Master/bin/x86_64-linux/mendex b/Master/bin/x86_64-linux/mendex
new file mode 100755
index 00000000000..b443cf837e0
--- /dev/null
+++ b/Master/bin/x86_64-linux/mendex
diff --git a/Master/bin/x86_64-linux/mf b/Master/bin/x86_64-linux/mf
index 18b16bbf0d1..28eba8b8579 100755
--- a/Master/bin/x86_64-linux/mf
+++ b/Master/bin/x86_64-linux/mf
diff --git a/Master/bin/x86_64-linux/mf-nowin b/Master/bin/x86_64-linux/mf-nowin
index c89980aea59..866a612c87d 100755
--- a/Master/bin/x86_64-linux/mf-nowin
+++ b/Master/bin/x86_64-linux/mf-nowin
diff --git a/Master/bin/x86_64-linux/mft b/Master/bin/x86_64-linux/mft
index 0c226f34a51..aa9e02efae5 100755
--- a/Master/bin/x86_64-linux/mft
+++ b/Master/bin/x86_64-linux/mft
diff --git a/Master/bin/x86_64-linux/mktexmf b/Master/bin/x86_64-linux/mktexmf
index 32bb85ec3d8..2bd683c7f0a 100755
--- a/Master/bin/x86_64-linux/mktexmf
+++ b/Master/bin/x86_64-linux/mktexmf
@@ -4,10 +4,10 @@
 # (If you change or delete the word `original' on the previous line,
 # installation won't write this script over yours.)
 # 
-# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl.
+# Originally written by Thomas Esser.
 # Public domain.
 
-version='$Id: mktexmf,v 1.27 2005/01/25 17:39:21 olaf Exp $'
+version='$Id: mktexmf 16497 2009-12-24 18:38:47Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname FONT.
 
diff --git a/Master/bin/x86_64-linux/mktexpk b/Master/bin/x86_64-linux/mktexpk
index baed82a83fa..1d0a4b4e2be 100755
--- a/Master/bin/x86_64-linux/mktexpk
+++ b/Master/bin/x86_64-linux/mktexpk
@@ -8,7 +8,7 @@
 # Report bugs to tex-k@tug.org.
 # Public domain.
 
-version='$Id: mktexpk,v 1.34 2005/06/21 10:49:10 olaf Exp $'
+version='$Id: mktexpk 16497 2009-12-24 18:38:47Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
   Create a PK font.
diff --git a/Master/bin/x86_64-linux/mktextfm b/Master/bin/x86_64-linux/mktextfm
index e695f8ffbf4..bc65668e92e 100755
--- a/Master/bin/x86_64-linux/mktextfm
+++ b/Master/bin/x86_64-linux/mktextfm
@@ -4,10 +4,10 @@
 # (If you change or delete the word `original' on the previous line,
 # installation won't write this script over yours.)
 # 
-# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl.
+# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
 # Public domain.
 
-version='$Id: mktextfm,v 1.27 2004/07/03 19:25:15 olaf Exp $'
+version='$Id: mktextfm 16497 2009-12-24 18:38:47Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [--destdir DESTDIR] FONT.
 
diff --git a/Master/bin/x86_64-linux/mmafm b/Master/bin/x86_64-linux/mmafm
index d52e8c17128..d592848ff56 100755
--- a/Master/bin/x86_64-linux/mmafm
+++ b/Master/bin/x86_64-linux/mmafm
diff --git a/Master/bin/x86_64-linux/mmpfb b/Master/bin/x86_64-linux/mmpfb
index 6e67ae9a5b1..2239f0585a6 100755
--- a/Master/bin/x86_64-linux/mmpfb
+++ b/Master/bin/x86_64-linux/mmpfb
diff --git a/Master/bin/x86_64-linux/mpost b/Master/bin/x86_64-linux/mpost
index a28f4a70e4f..d257ebab006 100755
--- a/Master/bin/x86_64-linux/mpost
+++ b/Master/bin/x86_64-linux/mpost
diff --git a/Master/bin/x86_64-linux/musixflx b/Master/bin/x86_64-linux/musixflx
index 092dd48e520..a1efa98889d 100755
--- a/Master/bin/x86_64-linux/musixflx
+++ b/Master/bin/x86_64-linux/musixflx
diff --git a/Master/bin/x86_64-linux/odvicopy b/Master/bin/x86_64-linux/odvicopy
index 27d2d368cd1..330eb5b646e 100755
--- a/Master/bin/x86_64-linux/odvicopy
+++ b/Master/bin/x86_64-linux/odvicopy
diff --git a/Master/bin/x86_64-linux/odvitype b/Master/bin/x86_64-linux/odvitype
index af09307e1c3..187ca802c0e 100755
--- a/Master/bin/x86_64-linux/odvitype
+++ b/Master/bin/x86_64-linux/odvitype
diff --git a/Master/bin/x86_64-linux/omfonts b/Master/bin/x86_64-linux/omfonts
index 41cff31e53d..2ae1c319448 100755
--- a/Master/bin/x86_64-linux/omfonts
+++ b/Master/bin/x86_64-linux/omfonts
diff --git a/Master/bin/x86_64-linux/otangle b/Master/bin/x86_64-linux/otangle
index 748dfe19aca..d23d63b7258 100755
--- a/Master/bin/x86_64-linux/otangle
+++ b/Master/bin/x86_64-linux/otangle
diff --git a/Master/bin/x86_64-linux/otfinfo b/Master/bin/x86_64-linux/otfinfo
index 047e61ddba7..0d0ab87cec7 100755
--- a/Master/bin/x86_64-linux/otfinfo
+++ b/Master/bin/x86_64-linux/otfinfo
diff --git a/Master/bin/x86_64-linux/otftotfm b/Master/bin/x86_64-linux/otftotfm
index db589d159f0..bd158d3fb39 100755
--- a/Master/bin/x86_64-linux/otftotfm
+++ b/Master/bin/x86_64-linux/otftotfm
diff --git a/Master/bin/x86_64-linux/otp2ocp b/Master/bin/x86_64-linux/otp2ocp
index d2d295c2aab..30bcfd761e3 100755
--- a/Master/bin/x86_64-linux/otp2ocp
+++ b/Master/bin/x86_64-linux/otp2ocp
diff --git a/Master/bin/x86_64-linux/outocp b/Master/bin/x86_64-linux/outocp
index d47f32105ab..b9bc07222f8 100755
--- a/Master/bin/x86_64-linux/outocp
+++ b/Master/bin/x86_64-linux/outocp
diff --git a/Master/bin/x86_64-linux/patgen b/Master/bin/x86_64-linux/patgen
index 4a90a94f014..a1eae7c56ee 100755
--- a/Master/bin/x86_64-linux/patgen
+++ b/Master/bin/x86_64-linux/patgen
diff --git a/Master/bin/x86_64-linux/pbibtex b/Master/bin/x86_64-linux/pbibtex
new file mode 100755
index 00000000000..b6fb448a615
--- /dev/null
+++ b/Master/bin/x86_64-linux/pbibtex
diff --git a/Master/bin/x86_64-linux/pdfclose b/Master/bin/x86_64-linux/pdfclose
index cee34f058b2..4661b0c98f6 100755
--- a/Master/bin/x86_64-linux/pdfclose
+++ b/Master/bin/x86_64-linux/pdfclose
diff --git a/Master/bin/x86_64-linux/pdfopen b/Master/bin/x86_64-linux/pdfopen
index 4912e6263fe..637825d1485 100755
--- a/Master/bin/x86_64-linux/pdfopen
+++ b/Master/bin/x86_64-linux/pdfopen
diff --git a/Master/bin/x86_64-linux/pdftex b/Master/bin/x86_64-linux/pdftex
index 629c0e71133..55914112e3e 100755
--- a/Master/bin/x86_64-linux/pdftex
+++ b/Master/bin/x86_64-linux/pdftex
diff --git a/Master/bin/x86_64-linux/pdftosrc b/Master/bin/x86_64-linux/pdftosrc
index e524f948cf8..d493ceb3b84 100755
--- a/Master/bin/x86_64-linux/pdftosrc
+++ b/Master/bin/x86_64-linux/pdftosrc
diff --git a/Master/bin/x86_64-linux/pdvitype b/Master/bin/x86_64-linux/pdvitype
new file mode 100755
index 00000000000..2549da974d8
--- /dev/null
+++ b/Master/bin/x86_64-linux/pdvitype
diff --git a/Master/bin/x86_64-linux/pfb2pfa b/Master/bin/x86_64-linux/pfb2pfa
index 8801675d559..44bb4a9f1fd 100755
--- a/Master/bin/x86_64-linux/pfb2pfa
+++ b/Master/bin/x86_64-linux/pfb2pfa
diff --git a/Master/bin/x86_64-linux/pk2bm b/Master/bin/x86_64-linux/pk2bm
index f3edf3de8e0..9c30c5a21fe 100755
--- a/Master/bin/x86_64-linux/pk2bm
+++ b/Master/bin/x86_64-linux/pk2bm
diff --git a/Master/bin/x86_64-linux/pktogf b/Master/bin/x86_64-linux/pktogf
index 49f29fbf665..a14d69e9dcf 100755
--- a/Master/bin/x86_64-linux/pktogf
+++ b/Master/bin/x86_64-linux/pktogf
diff --git a/Master/bin/x86_64-linux/pktype b/Master/bin/x86_64-linux/pktype
index 647d4c8f920..c60986c73a2 100755
--- a/Master/bin/x86_64-linux/pktype
+++ b/Master/bin/x86_64-linux/pktype
diff --git a/Master/bin/x86_64-linux/platex b/Master/bin/x86_64-linux/platex
new file mode 120000
index 00000000000..43a4f13c2a2
--- /dev/null
+++ b/Master/bin/x86_64-linux/platex
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/pltotf b/Master/bin/x86_64-linux/pltotf
index e2d47bb066a..ae44e139a6c 100755
--- a/Master/bin/x86_64-linux/pltotf
+++ b/Master/bin/x86_64-linux/pltotf
diff --git a/Master/bin/x86_64-linux/pooltype b/Master/bin/x86_64-linux/pooltype
index 52786731abe..49ad2225d13 100755
--- a/Master/bin/x86_64-linux/pooltype
+++ b/Master/bin/x86_64-linux/pooltype
diff --git a/Master/bin/x86_64-linux/ppltotf b/Master/bin/x86_64-linux/ppltotf
new file mode 100755
index 00000000000..e045be37bb6
--- /dev/null
+++ b/Master/bin/x86_64-linux/ppltotf
diff --git a/Master/bin/x86_64-linux/ps2pk b/Master/bin/x86_64-linux/ps2pk
index 6ca59a52635..dec3c66bf80 100755
--- a/Master/bin/x86_64-linux/ps2pk
+++ b/Master/bin/x86_64-linux/ps2pk
diff --git a/Master/bin/x86_64-linux/psbook b/Master/bin/x86_64-linux/psbook
index 3ed103c5c48..2e41487e62f 100755
--- a/Master/bin/x86_64-linux/psbook
+++ b/Master/bin/x86_64-linux/psbook
diff --git a/Master/bin/x86_64-linux/psnup b/Master/bin/x86_64-linux/psnup
index 49f4bbff5e3..50c1b0fbb73 100755
--- a/Master/bin/x86_64-linux/psnup
+++ b/Master/bin/x86_64-linux/psnup
diff --git a/Master/bin/x86_64-linux/psresize b/Master/bin/x86_64-linux/psresize
index b71ca28a3de..395efbbde43 100755
--- a/Master/bin/x86_64-linux/psresize
+++ b/Master/bin/x86_64-linux/psresize
diff --git a/Master/bin/x86_64-linux/psselect b/Master/bin/x86_64-linux/psselect
index d413b2cdded..78ffad876bb 100755
--- a/Master/bin/x86_64-linux/psselect
+++ b/Master/bin/x86_64-linux/psselect
diff --git a/Master/bin/x86_64-linux/pstops b/Master/bin/x86_64-linux/pstops
index a01de2e1007..7dee1e362ed 100755
--- a/Master/bin/x86_64-linux/pstops
+++ b/Master/bin/x86_64-linux/pstops
diff --git a/Master/bin/x86_64-linux/ptex b/Master/bin/x86_64-linux/ptex
new file mode 100755
index 00000000000..41144bf577a
--- /dev/null
+++ b/Master/bin/x86_64-linux/ptex
diff --git a/Master/bin/x86_64-linux/ptftopl b/Master/bin/x86_64-linux/ptftopl
new file mode 100755
index 00000000000..5c6101b72b6
--- /dev/null
+++ b/Master/bin/x86_64-linux/ptftopl
diff --git a/Master/bin/x86_64-linux/repstopdf b/Master/bin/x86_64-linux/repstopdf
new file mode 120000
index 00000000000..859052f5166
--- /dev/null
+++ b/Master/bin/x86_64-linux/repstopdf
@@ -0,0 +1 @@
+epstopdf
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/sjisconv b/Master/bin/x86_64-linux/sjisconv
index 68b9b858d36..aa720c534cf 100755
--- a/Master/bin/x86_64-linux/sjisconv
+++ b/Master/bin/x86_64-linux/sjisconv
diff --git a/Master/bin/x86_64-linux/synctex b/Master/bin/x86_64-linux/synctex
index 800986e4d35..df7eb1f4826 100755
--- a/Master/bin/x86_64-linux/synctex
+++ b/Master/bin/x86_64-linux/synctex
diff --git a/Master/bin/x86_64-linux/t1ascii b/Master/bin/x86_64-linux/t1ascii
index 69275e02cf9..264d683b2fb 100755
--- a/Master/bin/x86_64-linux/t1ascii
+++ b/Master/bin/x86_64-linux/t1ascii
diff --git a/Master/bin/x86_64-linux/t1asm b/Master/bin/x86_64-linux/t1asm
index 8c29d26693a..6e68a25b8c7 100755
--- a/Master/bin/x86_64-linux/t1asm
+++ b/Master/bin/x86_64-linux/t1asm
diff --git a/Master/bin/x86_64-linux/t1binary b/Master/bin/x86_64-linux/t1binary
index 7d73d436b0f..a72d0f862dc 100755
--- a/Master/bin/x86_64-linux/t1binary
+++ b/Master/bin/x86_64-linux/t1binary
diff --git a/Master/bin/x86_64-linux/t1disasm b/Master/bin/x86_64-linux/t1disasm
index fd0f4b6ff0c..77a4004c709 100755
--- a/Master/bin/x86_64-linux/t1disasm
+++ b/Master/bin/x86_64-linux/t1disasm
diff --git a/Master/bin/x86_64-linux/t1dotlessj b/Master/bin/x86_64-linux/t1dotlessj
index 96a00f1a9e0..6db9e1e32f8 100755
--- a/Master/bin/x86_64-linux/t1dotlessj
+++ b/Master/bin/x86_64-linux/t1dotlessj
diff --git a/Master/bin/x86_64-linux/t1lint b/Master/bin/x86_64-linux/t1lint
index b63f999023e..bce45c1dda0 100755
--- a/Master/bin/x86_64-linux/t1lint
+++ b/Master/bin/x86_64-linux/t1lint
diff --git a/Master/bin/x86_64-linux/t1mac b/Master/bin/x86_64-linux/t1mac
index e2a3195fb1f..aba112d4b2a 100755
--- a/Master/bin/x86_64-linux/t1mac
+++ b/Master/bin/x86_64-linux/t1mac
diff --git a/Master/bin/x86_64-linux/t1rawafm b/Master/bin/x86_64-linux/t1rawafm
index 776c043656d..fec9f307778 100755
--- a/Master/bin/x86_64-linux/t1rawafm
+++ b/Master/bin/x86_64-linux/t1rawafm
diff --git a/Master/bin/x86_64-linux/t1reencode b/Master/bin/x86_64-linux/t1reencode
index eaee6761811..748ea967b7a 100755
--- a/Master/bin/x86_64-linux/t1reencode
+++ b/Master/bin/x86_64-linux/t1reencode
diff --git a/Master/bin/x86_64-linux/t1testpage b/Master/bin/x86_64-linux/t1testpage
index 54b8725c0fb..dacbaaf6d19 100755
--- a/Master/bin/x86_64-linux/t1testpage
+++ b/Master/bin/x86_64-linux/t1testpage
diff --git a/Master/bin/x86_64-linux/t1unmac b/Master/bin/x86_64-linux/t1unmac
index cee3253d6e3..dc84eabfb9a 100755
--- a/Master/bin/x86_64-linux/t1unmac
+++ b/Master/bin/x86_64-linux/t1unmac
diff --git a/Master/bin/x86_64-linux/t4ht b/Master/bin/x86_64-linux/t4ht
index 11870ca51fe..e92059a8b0c 100755
--- a/Master/bin/x86_64-linux/t4ht
+++ b/Master/bin/x86_64-linux/t4ht
diff --git a/Master/bin/x86_64-linux/tangle b/Master/bin/x86_64-linux/tangle
index f634196fa8d..984cfecd807 100755
--- a/Master/bin/x86_64-linux/tangle
+++ b/Master/bin/x86_64-linux/tangle
diff --git a/Master/bin/x86_64-linux/tcdialog b/Master/bin/x86_64-linux/tcdialog
index c411a8a1a82..b3b931b0977 100755
--- a/Master/bin/x86_64-linux/tcdialog
+++ b/Master/bin/x86_64-linux/tcdialog
diff --git a/Master/bin/x86_64-linux/teckit_compile b/Master/bin/x86_64-linux/teckit_compile
index ea3bedd505d..8851fb218b7 100755
--- a/Master/bin/x86_64-linux/teckit_compile
+++ b/Master/bin/x86_64-linux/teckit_compile
diff --git a/Master/bin/x86_64-linux/tex b/Master/bin/x86_64-linux/tex
index ce1ba210b43..b1caf8a3e6a 100755
--- a/Master/bin/x86_64-linux/tex
+++ b/Master/bin/x86_64-linux/tex
diff --git a/Master/bin/x86_64-linux/tex4ht b/Master/bin/x86_64-linux/tex4ht
index 8b0a24e7c52..23657029db1 100755
--- a/Master/bin/x86_64-linux/tex4ht
+++ b/Master/bin/x86_64-linux/tex4ht
diff --git a/Master/bin/x86_64-linux/texconfig b/Master/bin/x86_64-linux/texconfig
index fe0927136e0..f37b30b1283 100755
--- a/Master/bin/x86_64-linux/texconfig
+++ b/Master/bin/x86_64-linux/texconfig
@@ -25,7 +25,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 progname=texconfig
 
 # the version string
-version=20080708.1050
+version='$Id$'
 
 envVars="
   AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
@@ -586,8 +586,9 @@ Get more help with:
        $progname pdftex
        $progname xdvi
 
-See http://tug.org/texlive/ for other documentation, etc.
-Report bugs to <tex-k@tug.org>."
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 
   case $1 in
     # texconfig conf
diff --git a/Master/bin/x86_64-linux/texlinks b/Master/bin/x86_64-linux/texlinks
index c77ceea60c0..09b3488d263 100755
--- a/Master/bin/x86_64-linux/texlinks
+++ b/Master/bin/x86_64-linux/texlinks
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texlinks 13904 2009-06-23 00:47:00Z karl $
+# $Id: texlinks 18035 2010-04-28 17:41:52Z mpg $
 
 # Thomas Esser, 1999, 2002, 2003. public domain.
 
@@ -39,7 +39,7 @@ export PATH
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
-version=20090623.0228
+version='$Id: texlinks 18035 2010-04-28 17:41:52Z mpg $'
 progname=texlinks
 cnf=fmtutil.cnf   # name of the config file
 
@@ -65,7 +65,9 @@ operate.  If no directories are specified and --multiplatform is
 likewise not specified, the directory of this script itself is used.
 With --multiplatform, all child dirs of an upper-level bin/ dir are used.
 
-Report bugs to tex-k@tug.org.'
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+'
 
 ###############################################################################
 # abort(errmsg)
@@ -308,7 +310,7 @@ main()
       main_args_while="$@"
 
       test "x$fmt" = "x$engine" && continue
-      if test -f "$d/$engine"; then
+      if test -f "$d/$engine$exeext"; then
         case $unlink in
         true)
           rm_link "$d/$fmt";;
diff --git a/Master/bin/x86_64-linux/tftopl b/Master/bin/x86_64-linux/tftopl
index 4f2e598e472..5625089feb8 100755
--- a/Master/bin/x86_64-linux/tftopl
+++ b/Master/bin/x86_64-linux/tftopl
diff --git a/Master/bin/x86_64-linux/tie b/Master/bin/x86_64-linux/tie
index f09d3dd1291..4c780b30913 100755
--- a/Master/bin/x86_64-linux/tie
+++ b/Master/bin/x86_64-linux/tie
diff --git a/Master/bin/x86_64-linux/tpic2pdftex b/Master/bin/x86_64-linux/tpic2pdftex
index 70c1a33c7e8..8277e0d3c7b 100755
--- a/Master/bin/x86_64-linux/tpic2pdftex
+++ b/Master/bin/x86_64-linux/tpic2pdftex
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: tpic2pdftex,v 1.94 2007/01/14 19:05:32 hahe Exp $
+# $Id: tpic2pdftex,v 1.97 2010/01/16 11:51:43 hahe Exp $
 #
 # Experimental awk-script for conversion of tpic \specials as produced
 # by (groff-)pic into pdfTeX \pdfliteral sections for further processing
@@ -20,7 +20,7 @@
 #   Bounding box does not care for line thickness (groff pic feature).
 #   Splines might be outside bounding box.
 #
-# Copyright (C) 2002--2004 by Hartmut Henkel
+# Copyright (C) 2002--2010 by Hartmut Henkel
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,15 +33,15 @@
 # See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # The author may be contacted via the e-mail address
 #
 #         hartmut_henkel@gmx.de
 #
 # NEWS:
+#   24 Dec. 2009 - use gawk for default awk only if it exists
+#   (patch by Karl Berry).
 #   14 Jan. 2007 - make it executable shell script, calling awk
 #   16 Dec. 2004 - Replaced // {print} by {print} (some AWKs did choke)
 #   09 Apr. 2004 - Locale check: Decimal point in float numbers?
@@ -65,7 +65,55 @@
 #
 ########################################################################
 
-AWK=${AWK:-gawk}
+# In case someone pedantic insists on using grep -E.
+: ${EGREP=egrep}}
+
+# Systems which define $COMSPEC or $ComSpec use semicolons to separate
+# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
+# might be inherited, but : is used.
+
+if test -n "$COMSPEC$ComSpec" \
+   && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
+  path_sep=";"
+else
+  path_sep=":"
+fi
+
+# findprog PROG
+# -------------
+# Return true if PROG is somewhere in PATH, else false.
+
+findprog ()
+{
+  local saveIFS="$IFS"
+  IFS=$path_sep  # break path components at the path separator
+  for dir in $PATH; do
+    IFS=$saveIFS
+    # The basic test for an executable is `test -f $f && test -x $f'.
+    # (`test -x' is not enough, because it can also be true for directories.)
+    # We have to try this both for $1 and $1.exe.
+    #
+    # Note: On Cygwin and DJGPP, `test -x' also looks for .exe.  On Cygwin,
+    # also `test -f' has this enhancement, bot not on DJGPP.  (Both are
+    # design decisions, so there is little chance to make them consistent.)
+    # Thusly, it seems to be difficult to make use of these enhancements.
+    #
+    if  { test -f "$dir/$1"	&& test -x "$dir/$1"; } ||
+	{ test -f "$dir/$1.exe"	&& test -x "$dir/$1.exe"; }; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+if test -z "$AWK"; then  # if set by user, leave it.
+  if findprog gawk; then
+    AWK=gawk
+  else
+    AWK=awk
+  fi
+fi
+
 export LANG="C"
 
 AWKPROG='
diff --git a/Master/bin/x86_64-linux/ttf2afm b/Master/bin/x86_64-linux/ttf2afm
index 5304cb305c2..9bbeb0f8556 100755
--- a/Master/bin/x86_64-linux/ttf2afm
+++ b/Master/bin/x86_64-linux/ttf2afm
diff --git a/Master/bin/x86_64-linux/ttf2pk b/Master/bin/x86_64-linux/ttf2pk
index 0ef15319edc..f69fdb332a0 100755
--- a/Master/bin/x86_64-linux/ttf2pk
+++ b/Master/bin/x86_64-linux/ttf2pk
diff --git a/Master/bin/x86_64-linux/ttf2tfm b/Master/bin/x86_64-linux/ttf2tfm
index 02ae0e059c6..c1aac7c7e4d 100755
--- a/Master/bin/x86_64-linux/ttf2tfm
+++ b/Master/bin/x86_64-linux/ttf2tfm
diff --git a/Master/bin/x86_64-linux/ttfdump b/Master/bin/x86_64-linux/ttfdump
index 52964f86570..7e2036c96e0 100755
--- a/Master/bin/x86_64-linux/ttfdump
+++ b/Master/bin/x86_64-linux/ttfdump
diff --git a/Master/bin/x86_64-linux/ttftotype42 b/Master/bin/x86_64-linux/ttftotype42
index c087f8b3c4f..3cf749f40b7 100755
--- a/Master/bin/x86_64-linux/ttftotype42
+++ b/Master/bin/x86_64-linux/ttftotype42
diff --git a/Master/bin/x86_64-linux/updmap b/Master/bin/x86_64-linux/updmap
index 723bde70a02..2483052a7de 100755
--- a/Master/bin/x86_64-linux/updmap
+++ b/Master/bin/x86_64-linux/updmap
@@ -1,10 +1,11 @@
 #!/bin/sh
-# updmap: utility to maintain map files for outline fonts.
-# Thomas Esser. Public domain.
+# updmap - utility to maintain map files for outline fonts.
+# Public domain.  Originally written by Thomas Esser. 
 # Run with --help for usage.
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   Sun May 25 21:05:32 CEST 2008 (Reinhard Kotucha)
 #      add function symlink_or_copy needed by tl-portable.
 #   Post-te retirement, now maintained in TeX Live; see
@@ -94,7 +95,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 # the version string
-version='$Id: updmap 14402 2009-07-23 17:09:15Z karl $'
+version='$Id: updmap 17423 2010-03-11 17:53:34Z karl $'
 
 # 
 ###############################################################################
@@ -104,7 +105,8 @@ version='$Id: updmap 14402 2009-07-23 17:09:15Z karl $'
 help()
 {
   cat <<eof
-Usage: updmap [OPTION]...  [COMMAND]...
+$version
+Usage: updmap [OPTION]... [COMMAND]...
 
 Update the default font map files used by pdftex, dvips, and dvipdfm, as
 determined by updmap.cfg (the one returned by running "kpsewhich
@@ -159,11 +161,13 @@ written, run updmap -n.
 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>.
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
 eof
   (exit 0); exit
 }
 
+# 
 ###############################################################################
 # verboseMsg(msg)
 #   print `msg' to stderr is $verbose is true
@@ -899,7 +903,7 @@ setupCfgFile()
   case "$cnfFile" in
     "") cnfFile=`locateWeb2c $cnfFileShort`
         case "$cnfFile" in
-          "") abort "config file $cnfFileShort not found"
+          "") abort "config file $cnfFileShort not found (ls-R missing?)"
         esac;;
   esac
   setupLog
@@ -1008,7 +1012,7 @@ processOptions()
       --help|-help|-h)
           help;;
       --version)
-          echo "$progname version $version."; (exit 0); exit 0;;
+          echo "$progname version $version"; (exit 0); exit 0;;
       "") break;;
       *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
     esac
diff --git a/Master/bin/x86_64-linux/vftovp b/Master/bin/x86_64-linux/vftovp
index 8737c102f80..42a5399f4eb 100755
--- a/Master/bin/x86_64-linux/vftovp
+++ b/Master/bin/x86_64-linux/vftovp
diff --git a/Master/bin/x86_64-linux/vlna b/Master/bin/x86_64-linux/vlna
index 309e600fcd5..d8434725033 100755
--- a/Master/bin/x86_64-linux/vlna
+++ b/Master/bin/x86_64-linux/vlna
diff --git a/Master/bin/x86_64-linux/vptovf b/Master/bin/x86_64-linux/vptovf
index e7d66a3a341..daac24a6633 100755
--- a/Master/bin/x86_64-linux/vptovf
+++ b/Master/bin/x86_64-linux/vptovf
diff --git a/Master/bin/x86_64-linux/weave b/Master/bin/x86_64-linux/weave
index 72bc6d5d6a8..056673c0ace 100755
--- a/Master/bin/x86_64-linux/weave
+++ b/Master/bin/x86_64-linux/weave
diff --git a/Master/bin/x86_64-linux/xdvi-xaw b/Master/bin/x86_64-linux/xdvi-xaw
index 135615d7fc4..c6d25633d62 100755
--- a/Master/bin/x86_64-linux/xdvi-xaw
+++ b/Master/bin/x86_64-linux/xdvi-xaw
diff --git a/Master/bin/x86_64-linux/xdvipdfmx b/Master/bin/x86_64-linux/xdvipdfmx
index 33504176b45..97bb1e88ade 100755
--- a/Master/bin/x86_64-linux/xdvipdfmx
+++ b/Master/bin/x86_64-linux/xdvipdfmx
diff --git a/Master/bin/x86_64-linux/xetex b/Master/bin/x86_64-linux/xetex
index 416f5b9aab0..850395d8ce9 100755
--- a/Master/bin/x86_64-linux/xetex
+++ b/Master/bin/x86_64-linux/xetex