144 files changed, 296 insertions, 63 deletions

diff --git a/Master/bin/i386-solaris/afm2pl b/Master/bin/i386-solaris/afm2pl
index 6dca0d309a5..81afe508bb4 100755
--- a/Master/bin/i386-solaris/afm2pl
+++ b/Master/bin/i386-solaris/afm2pl
diff --git a/Master/bin/i386-solaris/afm2tfm b/Master/bin/i386-solaris/afm2tfm
index 39e05709412..d10bfc1bf6b 100755
--- a/Master/bin/i386-solaris/afm2tfm
+++ b/Master/bin/i386-solaris/afm2tfm
diff --git a/Master/bin/i386-solaris/aleph b/Master/bin/i386-solaris/aleph
index 8e1bf8fec81..5d385ba1439 100755
--- a/Master/bin/i386-solaris/aleph
+++ b/Master/bin/i386-solaris/aleph
diff --git a/Master/bin/i386-solaris/bbox b/Master/bin/i386-solaris/bbox
index 43aad5ed5ee..7b2510fb846 100755
--- a/Master/bin/i386-solaris/bbox
+++ b/Master/bin/i386-solaris/bbox
diff --git a/Master/bin/i386-solaris/bg5conv b/Master/bin/i386-solaris/bg5conv
index a68238d5bfd..88e7a0c12f2 100755
--- a/Master/bin/i386-solaris/bg5conv
+++ b/Master/bin/i386-solaris/bg5conv
diff --git a/Master/bin/i386-solaris/bibtex b/Master/bin/i386-solaris/bibtex
index 2755b08221a..fa4e39d0cba 100755
--- a/Master/bin/i386-solaris/bibtex
+++ b/Master/bin/i386-solaris/bibtex
diff --git a/Master/bin/i386-solaris/bibtex8 b/Master/bin/i386-solaris/bibtex8
index 3f2439b9a53..69b7fb431f0 100755
--- a/Master/bin/i386-solaris/bibtex8
+++ b/Master/bin/i386-solaris/bibtex8
diff --git a/Master/bin/i386-solaris/bibtexu b/Master/bin/i386-solaris/bibtexu
new file mode 100755
index 00000000000..8337cd2624c
--- /dev/null
+++ b/Master/bin/i386-solaris/bibtexu
diff --git a/Master/bin/i386-solaris/cef5conv b/Master/bin/i386-solaris/cef5conv
index 5e62d1f8734..8a8a8d9ad0d 100755
--- a/Master/bin/i386-solaris/cef5conv
+++ b/Master/bin/i386-solaris/cef5conv
diff --git a/Master/bin/i386-solaris/cefconv b/Master/bin/i386-solaris/cefconv
index 5e2cf739263..9f9d8484baa 100755
--- a/Master/bin/i386-solaris/cefconv
+++ b/Master/bin/i386-solaris/cefconv
diff --git a/Master/bin/i386-solaris/cefsconv b/Master/bin/i386-solaris/cefsconv
index ad65f93c7b1..38499308afa 100755
--- a/Master/bin/i386-solaris/cefsconv
+++ b/Master/bin/i386-solaris/cefsconv
diff --git a/Master/bin/i386-solaris/cfftot1 b/Master/bin/i386-solaris/cfftot1
index 7d7186e4f1e..b76cdfc44a8 100755
--- a/Master/bin/i386-solaris/cfftot1
+++ b/Master/bin/i386-solaris/cfftot1
diff --git a/Master/bin/i386-solaris/chktex b/Master/bin/i386-solaris/chktex
new file mode 100755
index 00000000000..98458bc7fbe
--- /dev/null
+++ b/Master/bin/i386-solaris/chktex
diff --git a/Master/bin/i386-solaris/chkweb b/Master/bin/i386-solaris/chkweb
new file mode 100755
index 00000000000..cbc0caa780d
--- /dev/null
+++ b/Master/bin/i386-solaris/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/i386-solaris/ctangle b/Master/bin/i386-solaris/ctangle
index 5b61ea45932..cf7977e61ff 100755
--- a/Master/bin/i386-solaris/ctangle
+++ b/Master/bin/i386-solaris/ctangle
diff --git a/Master/bin/i386-solaris/ctie b/Master/bin/i386-solaris/ctie
index ce322bd2788..266d429e45f 100755
--- a/Master/bin/i386-solaris/ctie
+++ b/Master/bin/i386-solaris/ctie
diff --git a/Master/bin/i386-solaris/cweave b/Master/bin/i386-solaris/cweave
index 7bf6c99192d..e177c7817b2 100755
--- a/Master/bin/i386-solaris/cweave
+++ b/Master/bin/i386-solaris/cweave
diff --git a/Master/bin/i386-solaris/detex b/Master/bin/i386-solaris/detex
index 74d5b85dda5..2bfa44882b8 100755
--- a/Master/bin/i386-solaris/detex
+++ b/Master/bin/i386-solaris/detex
diff --git a/Master/bin/i386-solaris/devnag b/Master/bin/i386-solaris/devnag
index ff4ccdbc2b8..3754f92ba98 100755
--- a/Master/bin/i386-solaris/devnag
+++ b/Master/bin/i386-solaris/devnag
diff --git a/Master/bin/i386-solaris/deweb b/Master/bin/i386-solaris/deweb
new file mode 100755
index 00000000000..245119b134a
--- /dev/null
+++ b/Master/bin/i386-solaris/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/i386-solaris/disdvi b/Master/bin/i386-solaris/disdvi
index 79a8fd37cfe..6ac7095fb44 100755
--- a/Master/bin/i386-solaris/disdvi
+++ b/Master/bin/i386-solaris/disdvi
diff --git a/Master/bin/i386-solaris/dt2dv b/Master/bin/i386-solaris/dt2dv
index 04cc463804a..324d270d82f 100755
--- a/Master/bin/i386-solaris/dt2dv
+++ b/Master/bin/i386-solaris/dt2dv
diff --git a/Master/bin/i386-solaris/dv2dt b/Master/bin/i386-solaris/dv2dt
index 2bba298afce..dc9313c9a9a 100755
--- a/Master/bin/i386-solaris/dv2dt
+++ b/Master/bin/i386-solaris/dv2dt
diff --git a/Master/bin/i386-solaris/dvi2tty b/Master/bin/i386-solaris/dvi2tty
index 940b042476f..0a89a09acc5 100755
--- a/Master/bin/i386-solaris/dvi2tty
+++ b/Master/bin/i386-solaris/dvi2tty
diff --git a/Master/bin/i386-solaris/dvibook b/Master/bin/i386-solaris/dvibook
index b0f05d9e018..7a52f5979d3 100755
--- a/Master/bin/i386-solaris/dvibook
+++ b/Master/bin/i386-solaris/dvibook
diff --git a/Master/bin/i386-solaris/dviconcat b/Master/bin/i386-solaris/dviconcat
index 546f35eaedb..866bf263268 100755
--- a/Master/bin/i386-solaris/dviconcat
+++ b/Master/bin/i386-solaris/dviconcat
diff --git a/Master/bin/i386-solaris/dvicopy b/Master/bin/i386-solaris/dvicopy
index fd60f5def76..2e9925eb329 100755
--- a/Master/bin/i386-solaris/dvicopy
+++ b/Master/bin/i386-solaris/dvicopy
diff --git a/Master/bin/i386-solaris/dvidvi b/Master/bin/i386-solaris/dvidvi
index fe862010635..571c9008989 100755
--- a/Master/bin/i386-solaris/dvidvi
+++ b/Master/bin/i386-solaris/dvidvi
diff --git a/Master/bin/i386-solaris/dvihp b/Master/bin/i386-solaris/dvihp
index 6b149517086..fdaf3fb87bf 100755
--- a/Master/bin/i386-solaris/dvihp
+++ b/Master/bin/i386-solaris/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/i386-solaris/dvilj b/Master/bin/i386-solaris/dvilj
index 23e7ea323d3..49f565adc54 100755
--- a/Master/bin/i386-solaris/dvilj
+++ b/Master/bin/i386-solaris/dvilj
diff --git a/Master/bin/i386-solaris/dvilj2p b/Master/bin/i386-solaris/dvilj2p
index 73ea1b8cecb..44ff2f0b675 100755
--- a/Master/bin/i386-solaris/dvilj2p
+++ b/Master/bin/i386-solaris/dvilj2p
diff --git a/Master/bin/i386-solaris/dvilj4 b/Master/bin/i386-solaris/dvilj4
index eee4e6d945c..20338df6136 100755
--- a/Master/bin/i386-solaris/dvilj4
+++ b/Master/bin/i386-solaris/dvilj4
diff --git a/Master/bin/i386-solaris/dvilj4l b/Master/bin/i386-solaris/dvilj4l
index 77b795a8932..6e0e7e4741d 100755
--- a/Master/bin/i386-solaris/dvilj4l
+++ b/Master/bin/i386-solaris/dvilj4l
diff --git a/Master/bin/i386-solaris/dvipdfmx b/Master/bin/i386-solaris/dvipdfmx
index b3ebaf9cffe..fe3c1edf621 100755
--- a/Master/bin/i386-solaris/dvipdfmx
+++ b/Master/bin/i386-solaris/dvipdfmx
diff --git a/Master/bin/i386-solaris/dvipng b/Master/bin/i386-solaris/dvipng
index 64d6808fc1c..8bbd7aff32d 100755
--- a/Master/bin/i386-solaris/dvipng
+++ b/Master/bin/i386-solaris/dvipng
diff --git a/Master/bin/i386-solaris/dvipos b/Master/bin/i386-solaris/dvipos
index 7f280671f5f..33f5eb15eaa 100755
--- a/Master/bin/i386-solaris/dvipos
+++ b/Master/bin/i386-solaris/dvipos
diff --git a/Master/bin/i386-solaris/dvips b/Master/bin/i386-solaris/dvips
index 9b58ca0666b..a34b2367e12 100755
--- a/Master/bin/i386-solaris/dvips
+++ b/Master/bin/i386-solaris/dvips
diff --git a/Master/bin/i386-solaris/dviselect b/Master/bin/i386-solaris/dviselect
index 3ce94907493..62c679f5029 100755
--- a/Master/bin/i386-solaris/dviselect
+++ b/Master/bin/i386-solaris/dviselect
diff --git a/Master/bin/i386-solaris/dvisvgm b/Master/bin/i386-solaris/dvisvgm
new file mode 100755
index 00000000000..b1ab67c9707
--- /dev/null
+++ b/Master/bin/i386-solaris/dvisvgm
diff --git a/Master/bin/i386-solaris/dvitodvi b/Master/bin/i386-solaris/dvitodvi
index 89b6a6c281c..3634388a97a 100755
--- a/Master/bin/i386-solaris/dvitodvi
+++ b/Master/bin/i386-solaris/dvitodvi
diff --git a/Master/bin/i386-solaris/dvitype b/Master/bin/i386-solaris/dvitype
index 6418c52d1bd..84f0ef0009d 100755
--- a/Master/bin/i386-solaris/dvitype
+++ b/Master/bin/i386-solaris/dvitype
diff --git a/Master/bin/i386-solaris/epsffit b/Master/bin/i386-solaris/epsffit
index 6a1545cb30c..d6397d6aee0 100755
--- a/Master/bin/i386-solaris/epsffit
+++ b/Master/bin/i386-solaris/epsffit
diff --git a/Master/bin/i386-solaris/extconv b/Master/bin/i386-solaris/extconv
index 30e514ff1fe..6f2fd40f646 100755
--- a/Master/bin/i386-solaris/extconv
+++ b/Master/bin/i386-solaris/extconv
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index f12885629e2..6257aba50e7 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/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/i386-solaris/gftodvi b/Master/bin/i386-solaris/gftodvi
index 361a4510e60..28ec77b9cb6 100755
--- a/Master/bin/i386-solaris/gftodvi
+++ b/Master/bin/i386-solaris/gftodvi
diff --git a/Master/bin/i386-solaris/gftopk b/Master/bin/i386-solaris/gftopk
index 10479a6176e..8480bc47228 100755
--- a/Master/bin/i386-solaris/gftopk
+++ b/Master/bin/i386-solaris/gftopk
diff --git a/Master/bin/i386-solaris/gftype b/Master/bin/i386-solaris/gftype
index 88433fc0573..3b9baaef3b6 100755
--- a/Master/bin/i386-solaris/gftype
+++ b/Master/bin/i386-solaris/gftype
diff --git a/Master/bin/i386-solaris/gsftopk b/Master/bin/i386-solaris/gsftopk
index a447667231e..bfe84cdd5aa 100755
--- a/Master/bin/i386-solaris/gsftopk
+++ b/Master/bin/i386-solaris/gsftopk
diff --git a/Master/bin/i386-solaris/hbf2gf b/Master/bin/i386-solaris/hbf2gf
index b1bff8bcbb0..072b8cf4298 100755
--- a/Master/bin/i386-solaris/hbf2gf
+++ b/Master/bin/i386-solaris/hbf2gf
diff --git a/Master/bin/i386-solaris/kpseaccess b/Master/bin/i386-solaris/kpseaccess
index 2efcd825ce8..cf8ec654d69 100755
--- a/Master/bin/i386-solaris/kpseaccess
+++ b/Master/bin/i386-solaris/kpseaccess
diff --git a/Master/bin/i386-solaris/kpsereadlink b/Master/bin/i386-solaris/kpsereadlink
index ac316385f68..14f49da30af 100755
--- a/Master/bin/i386-solaris/kpsereadlink
+++ b/Master/bin/i386-solaris/kpsereadlink
diff --git a/Master/bin/i386-solaris/kpsestat b/Master/bin/i386-solaris/kpsestat
index 003d4b1ccd1..9a8ae6b0e1f 100755
--- a/Master/bin/i386-solaris/kpsestat
+++ b/Master/bin/i386-solaris/kpsestat
diff --git a/Master/bin/i386-solaris/kpsewhich b/Master/bin/i386-solaris/kpsewhich
index 996236e6cf6..5646c0e6941 100755
--- a/Master/bin/i386-solaris/kpsewhich
+++ b/Master/bin/i386-solaris/kpsewhich
diff --git a/Master/bin/i386-solaris/lacheck b/Master/bin/i386-solaris/lacheck
index 4010c6a624a..1680b0cfebe 100755
--- a/Master/bin/i386-solaris/lacheck
+++ b/Master/bin/i386-solaris/lacheck
diff --git a/Master/bin/i386-solaris/luatex b/Master/bin/i386-solaris/luatex
index 72fe0cfd89a..77c2ea4036a 100755
--- a/Master/bin/i386-solaris/luatex
+++ b/Master/bin/i386-solaris/luatex
diff --git a/Master/bin/i386-solaris/mag b/Master/bin/i386-solaris/mag
index 5ae33091192..f8034e6be55 100755
--- a/Master/bin/i386-solaris/mag
+++ b/Master/bin/i386-solaris/mag
diff --git a/Master/bin/i386-solaris/makeindex b/Master/bin/i386-solaris/makeindex
index 9b33b31fedc..ca8219420a6 100755
--- a/Master/bin/i386-solaris/makeindex
+++ b/Master/bin/i386-solaris/makeindex
diff --git a/Master/bin/i386-solaris/makejvf b/Master/bin/i386-solaris/makejvf
new file mode 100755
index 00000000000..aadedab0110
--- /dev/null
+++ b/Master/bin/i386-solaris/makejvf
diff --git a/Master/bin/i386-solaris/mendex b/Master/bin/i386-solaris/mendex
new file mode 100755
index 00000000000..11a1a1d4476
--- /dev/null
+++ b/Master/bin/i386-solaris/mendex
diff --git a/Master/bin/i386-solaris/mf b/Master/bin/i386-solaris/mf
index 2b564fc1d44..e6381beb760 100755
--- a/Master/bin/i386-solaris/mf
+++ b/Master/bin/i386-solaris/mf
diff --git a/Master/bin/i386-solaris/mf-nowin b/Master/bin/i386-solaris/mf-nowin
index 81bcecffbcd..14448c78839 100755
--- a/Master/bin/i386-solaris/mf-nowin
+++ b/Master/bin/i386-solaris/mf-nowin
diff --git a/Master/bin/i386-solaris/mft b/Master/bin/i386-solaris/mft
index 696492d04e0..daa11c72002 100755
--- a/Master/bin/i386-solaris/mft
+++ b/Master/bin/i386-solaris/mft
diff --git a/Master/bin/i386-solaris/mktexmf b/Master/bin/i386-solaris/mktexmf
index 32bb85ec3d8..2bd683c7f0a 100755
--- a/Master/bin/i386-solaris/mktexmf
+++ b/Master/bin/i386-solaris/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/i386-solaris/mktexpk b/Master/bin/i386-solaris/mktexpk
index baed82a83fa..1d0a4b4e2be 100755
--- a/Master/bin/i386-solaris/mktexpk
+++ b/Master/bin/i386-solaris/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/i386-solaris/mktextfm b/Master/bin/i386-solaris/mktextfm
index e695f8ffbf4..bc65668e92e 100755
--- a/Master/bin/i386-solaris/mktextfm
+++ b/Master/bin/i386-solaris/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/i386-solaris/mmafm b/Master/bin/i386-solaris/mmafm
index 08b4458579c..6d954fcef4b 100755
--- a/Master/bin/i386-solaris/mmafm
+++ b/Master/bin/i386-solaris/mmafm
diff --git a/Master/bin/i386-solaris/mmpfb b/Master/bin/i386-solaris/mmpfb
index 88ad8f9f952..576a9c68c78 100755
--- a/Master/bin/i386-solaris/mmpfb
+++ b/Master/bin/i386-solaris/mmpfb
diff --git a/Master/bin/i386-solaris/mpost b/Master/bin/i386-solaris/mpost
index 007edb92c12..1f8c1b35d57 100755
--- a/Master/bin/i386-solaris/mpost
+++ b/Master/bin/i386-solaris/mpost
diff --git a/Master/bin/i386-solaris/musixflx b/Master/bin/i386-solaris/musixflx
index af3facabfc0..3f4878e6d54 100755
--- a/Master/bin/i386-solaris/musixflx
+++ b/Master/bin/i386-solaris/musixflx
diff --git a/Master/bin/i386-solaris/odvicopy b/Master/bin/i386-solaris/odvicopy
index 2281231e143..4b06aea042e 100755
--- a/Master/bin/i386-solaris/odvicopy
+++ b/Master/bin/i386-solaris/odvicopy
diff --git a/Master/bin/i386-solaris/odvitype b/Master/bin/i386-solaris/odvitype
index 0a40308a996..62c438bf98d 100755
--- a/Master/bin/i386-solaris/odvitype
+++ b/Master/bin/i386-solaris/odvitype
diff --git a/Master/bin/i386-solaris/omfonts b/Master/bin/i386-solaris/omfonts
index 731d478559d..860c2282574 100755
--- a/Master/bin/i386-solaris/omfonts
+++ b/Master/bin/i386-solaris/omfonts
diff --git a/Master/bin/i386-solaris/otangle b/Master/bin/i386-solaris/otangle
index 81466502fec..d7557ff7cb7 100755
--- a/Master/bin/i386-solaris/otangle
+++ b/Master/bin/i386-solaris/otangle
diff --git a/Master/bin/i386-solaris/otfinfo b/Master/bin/i386-solaris/otfinfo
index 19aaf1064a9..f8b6f1ee4fc 100755
--- a/Master/bin/i386-solaris/otfinfo
+++ b/Master/bin/i386-solaris/otfinfo
diff --git a/Master/bin/i386-solaris/otftotfm b/Master/bin/i386-solaris/otftotfm
index 3527d0db510..653ff60a16a 100755
--- a/Master/bin/i386-solaris/otftotfm
+++ b/Master/bin/i386-solaris/otftotfm
diff --git a/Master/bin/i386-solaris/otp2ocp b/Master/bin/i386-solaris/otp2ocp
index 6145b4b6b77..79279732fef 100755
--- a/Master/bin/i386-solaris/otp2ocp
+++ b/Master/bin/i386-solaris/otp2ocp
diff --git a/Master/bin/i386-solaris/outocp b/Master/bin/i386-solaris/outocp
index 6a1f364b7ea..2fe1fb81695 100755
--- a/Master/bin/i386-solaris/outocp
+++ b/Master/bin/i386-solaris/outocp
diff --git a/Master/bin/i386-solaris/patgen b/Master/bin/i386-solaris/patgen
index 5bfe06ef9ec..58dbf768bad 100755
--- a/Master/bin/i386-solaris/patgen
+++ b/Master/bin/i386-solaris/patgen
diff --git a/Master/bin/i386-solaris/pbibtex b/Master/bin/i386-solaris/pbibtex
new file mode 100755
index 00000000000..0724ef2c20e
--- /dev/null
+++ b/Master/bin/i386-solaris/pbibtex
diff --git a/Master/bin/i386-solaris/pdfclose b/Master/bin/i386-solaris/pdfclose
index 615b189a9a6..db69bc0a72c 100755
--- a/Master/bin/i386-solaris/pdfclose
+++ b/Master/bin/i386-solaris/pdfclose
diff --git a/Master/bin/i386-solaris/pdfopen b/Master/bin/i386-solaris/pdfopen
index 651575b6b8a..5e94609738b 100755
--- a/Master/bin/i386-solaris/pdfopen
+++ b/Master/bin/i386-solaris/pdfopen
diff --git a/Master/bin/i386-solaris/pdftex b/Master/bin/i386-solaris/pdftex
index a537ab73151..7e7fc125bc8 100755
--- a/Master/bin/i386-solaris/pdftex
+++ b/Master/bin/i386-solaris/pdftex
diff --git a/Master/bin/i386-solaris/pdftosrc b/Master/bin/i386-solaris/pdftosrc
index d06f771fe18..f8b4362a04a 100755
--- a/Master/bin/i386-solaris/pdftosrc
+++ b/Master/bin/i386-solaris/pdftosrc
diff --git a/Master/bin/i386-solaris/pdvitype b/Master/bin/i386-solaris/pdvitype
new file mode 100755
index 00000000000..4056415d461
--- /dev/null
+++ b/Master/bin/i386-solaris/pdvitype
diff --git a/Master/bin/i386-solaris/pfb2pfa b/Master/bin/i386-solaris/pfb2pfa
index 7b886b2d36b..3274441236b 100755
--- a/Master/bin/i386-solaris/pfb2pfa
+++ b/Master/bin/i386-solaris/pfb2pfa
diff --git a/Master/bin/i386-solaris/pk2bm b/Master/bin/i386-solaris/pk2bm
index 504d495ff52..fa3be7b61a4 100755
--- a/Master/bin/i386-solaris/pk2bm
+++ b/Master/bin/i386-solaris/pk2bm
diff --git a/Master/bin/i386-solaris/pktogf b/Master/bin/i386-solaris/pktogf
index 8d0f5ff5884..75102269ef1 100755
--- a/Master/bin/i386-solaris/pktogf
+++ b/Master/bin/i386-solaris/pktogf
diff --git a/Master/bin/i386-solaris/pktype b/Master/bin/i386-solaris/pktype
index 052de0f76f9..e10daf11abc 100755
--- a/Master/bin/i386-solaris/pktype
+++ b/Master/bin/i386-solaris/pktype
diff --git a/Master/bin/i386-solaris/platex b/Master/bin/i386-solaris/platex
new file mode 120000
index 00000000000..43a4f13c2a2
--- /dev/null
+++ b/Master/bin/i386-solaris/platex
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pltotf b/Master/bin/i386-solaris/pltotf
index f2d8e92a159..15c09926c58 100755
--- a/Master/bin/i386-solaris/pltotf
+++ b/Master/bin/i386-solaris/pltotf
diff --git a/Master/bin/i386-solaris/pooltype b/Master/bin/i386-solaris/pooltype
index 8a98cf4470a..daa13e08f2c 100755
--- a/Master/bin/i386-solaris/pooltype
+++ b/Master/bin/i386-solaris/pooltype
diff --git a/Master/bin/i386-solaris/ppltotf b/Master/bin/i386-solaris/ppltotf
new file mode 100755
index 00000000000..6bd26b55934
--- /dev/null
+++ b/Master/bin/i386-solaris/ppltotf
diff --git a/Master/bin/i386-solaris/ps2pk b/Master/bin/i386-solaris/ps2pk
index 341c14d4a58..87f876f42cd 100755
--- a/Master/bin/i386-solaris/ps2pk
+++ b/Master/bin/i386-solaris/ps2pk
diff --git a/Master/bin/i386-solaris/psbook b/Master/bin/i386-solaris/psbook
index 938cd8900b2..16fa0dcd56a 100755
--- a/Master/bin/i386-solaris/psbook
+++ b/Master/bin/i386-solaris/psbook
diff --git a/Master/bin/i386-solaris/psnup b/Master/bin/i386-solaris/psnup
index bc4068a3fae..20e360352f0 100755
--- a/Master/bin/i386-solaris/psnup
+++ b/Master/bin/i386-solaris/psnup
diff --git a/Master/bin/i386-solaris/psresize b/Master/bin/i386-solaris/psresize
index a49f7cac9e9..0770f15d172 100755
--- a/Master/bin/i386-solaris/psresize
+++ b/Master/bin/i386-solaris/psresize
diff --git a/Master/bin/i386-solaris/psselect b/Master/bin/i386-solaris/psselect
index 0d63f55799b..27122ec81f8 100755
--- a/Master/bin/i386-solaris/psselect
+++ b/Master/bin/i386-solaris/psselect
diff --git a/Master/bin/i386-solaris/pstops b/Master/bin/i386-solaris/pstops
index 7c8d62827a7..fb9ed8ba78c 100755
--- a/Master/bin/i386-solaris/pstops
+++ b/Master/bin/i386-solaris/pstops
diff --git a/Master/bin/i386-solaris/ptex b/Master/bin/i386-solaris/ptex
new file mode 100755
index 00000000000..f226db26245
--- /dev/null
+++ b/Master/bin/i386-solaris/ptex
diff --git a/Master/bin/i386-solaris/ptftopl b/Master/bin/i386-solaris/ptftopl
new file mode 100755
index 00000000000..80c0af4f122
--- /dev/null
+++ b/Master/bin/i386-solaris/ptftopl
diff --git a/Master/bin/i386-solaris/repstopdf b/Master/bin/i386-solaris/repstopdf
new file mode 120000
index 00000000000..859052f5166
--- /dev/null
+++ b/Master/bin/i386-solaris/repstopdf
@@ -0,0 +1 @@
+epstopdf
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/sjisconv b/Master/bin/i386-solaris/sjisconv
index 195f38dca83..8e47bc4cbf2 100755
--- a/Master/bin/i386-solaris/sjisconv
+++ b/Master/bin/i386-solaris/sjisconv
diff --git a/Master/bin/i386-solaris/synctex b/Master/bin/i386-solaris/synctex
index 580dfedfc38..6ac6f7453ca 100755
--- a/Master/bin/i386-solaris/synctex
+++ b/Master/bin/i386-solaris/synctex
diff --git a/Master/bin/i386-solaris/t1ascii b/Master/bin/i386-solaris/t1ascii
index 71c9b5071f8..c827a7c586b 100755
--- a/Master/bin/i386-solaris/t1ascii
+++ b/Master/bin/i386-solaris/t1ascii
diff --git a/Master/bin/i386-solaris/t1asm b/Master/bin/i386-solaris/t1asm
index b820ae2383b..41045b57d01 100755
--- a/Master/bin/i386-solaris/t1asm
+++ b/Master/bin/i386-solaris/t1asm
diff --git a/Master/bin/i386-solaris/t1binary b/Master/bin/i386-solaris/t1binary
index ae45bf19f21..0b9501e885b 100755
--- a/Master/bin/i386-solaris/t1binary
+++ b/Master/bin/i386-solaris/t1binary
diff --git a/Master/bin/i386-solaris/t1disasm b/Master/bin/i386-solaris/t1disasm
index 43f38d8e23a..7d99e30a62c 100755
--- a/Master/bin/i386-solaris/t1disasm
+++ b/Master/bin/i386-solaris/t1disasm
diff --git a/Master/bin/i386-solaris/t1dotlessj b/Master/bin/i386-solaris/t1dotlessj
index 1a380cb4e69..63a32995aec 100755
--- a/Master/bin/i386-solaris/t1dotlessj
+++ b/Master/bin/i386-solaris/t1dotlessj
diff --git a/Master/bin/i386-solaris/t1lint b/Master/bin/i386-solaris/t1lint
index 7e6556ffdfd..0d7c0984db5 100755
--- a/Master/bin/i386-solaris/t1lint
+++ b/Master/bin/i386-solaris/t1lint
diff --git a/Master/bin/i386-solaris/t1mac b/Master/bin/i386-solaris/t1mac
index 78ab1f1ab72..cbe171ece13 100755
--- a/Master/bin/i386-solaris/t1mac
+++ b/Master/bin/i386-solaris/t1mac
diff --git a/Master/bin/i386-solaris/t1rawafm b/Master/bin/i386-solaris/t1rawafm
index 09810a1c220..852496df2f1 100755
--- a/Master/bin/i386-solaris/t1rawafm
+++ b/Master/bin/i386-solaris/t1rawafm
diff --git a/Master/bin/i386-solaris/t1reencode b/Master/bin/i386-solaris/t1reencode
index 9eed13f55e3..efc8b1588d1 100755
--- a/Master/bin/i386-solaris/t1reencode
+++ b/Master/bin/i386-solaris/t1reencode
diff --git a/Master/bin/i386-solaris/t1testpage b/Master/bin/i386-solaris/t1testpage
index e3f93c78095..a4725f83c11 100755
--- a/Master/bin/i386-solaris/t1testpage
+++ b/Master/bin/i386-solaris/t1testpage
diff --git a/Master/bin/i386-solaris/t1unmac b/Master/bin/i386-solaris/t1unmac
index 5fd92f271e2..8276a9759b7 100755
--- a/Master/bin/i386-solaris/t1unmac
+++ b/Master/bin/i386-solaris/t1unmac
diff --git a/Master/bin/i386-solaris/t4ht b/Master/bin/i386-solaris/t4ht
index 44d410158ae..d0adf907840 100755
--- a/Master/bin/i386-solaris/t4ht
+++ b/Master/bin/i386-solaris/t4ht
diff --git a/Master/bin/i386-solaris/tangle b/Master/bin/i386-solaris/tangle
index 106d5b59329..ef75293bceb 100755
--- a/Master/bin/i386-solaris/tangle
+++ b/Master/bin/i386-solaris/tangle
diff --git a/Master/bin/i386-solaris/tcdialog b/Master/bin/i386-solaris/tcdialog
index 3afced39b61..4072ae385dc 100755
--- a/Master/bin/i386-solaris/tcdialog
+++ b/Master/bin/i386-solaris/tcdialog
diff --git a/Master/bin/i386-solaris/teckit_compile b/Master/bin/i386-solaris/teckit_compile
index 52c25c6eb8d..3fd9d10df3f 100755
--- a/Master/bin/i386-solaris/teckit_compile
+++ b/Master/bin/i386-solaris/teckit_compile
diff --git a/Master/bin/i386-solaris/tex b/Master/bin/i386-solaris/tex
index d176f087770..2bd533dbc50 100755
--- a/Master/bin/i386-solaris/tex
+++ b/Master/bin/i386-solaris/tex
diff --git a/Master/bin/i386-solaris/tex2xindy b/Master/bin/i386-solaris/tex2xindy
index 92f2040665e..b77c59b75c1 100755
--- a/Master/bin/i386-solaris/tex2xindy
+++ b/Master/bin/i386-solaris/tex2xindy
diff --git a/Master/bin/i386-solaris/tex4ht b/Master/bin/i386-solaris/tex4ht
index 8d8dfdc3545..715d0b770ed 100755
--- a/Master/bin/i386-solaris/tex4ht
+++ b/Master/bin/i386-solaris/tex4ht
diff --git a/Master/bin/i386-solaris/texconfig b/Master/bin/i386-solaris/texconfig
index fe0927136e0..f37b30b1283 100755
--- a/Master/bin/i386-solaris/texconfig
+++ b/Master/bin/i386-solaris/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/i386-solaris/texlinks b/Master/bin/i386-solaris/texlinks
index c77ceea60c0..09b3488d263 100755
--- a/Master/bin/i386-solaris/texlinks
+++ b/Master/bin/i386-solaris/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/i386-solaris/tftopl b/Master/bin/i386-solaris/tftopl
index 720840c33cc..2ab83b33292 100755
--- a/Master/bin/i386-solaris/tftopl
+++ b/Master/bin/i386-solaris/tftopl
diff --git a/Master/bin/i386-solaris/tie b/Master/bin/i386-solaris/tie
index 82d153df029..271e4868f41 100755
--- a/Master/bin/i386-solaris/tie
+++ b/Master/bin/i386-solaris/tie
diff --git a/Master/bin/i386-solaris/tpic2pdftex b/Master/bin/i386-solaris/tpic2pdftex
index 70c1a33c7e8..8277e0d3c7b 100755
--- a/Master/bin/i386-solaris/tpic2pdftex
+++ b/Master/bin/i386-solaris/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/i386-solaris/ttf2afm b/Master/bin/i386-solaris/ttf2afm
index d594f815165..95abff7644e 100755
--- a/Master/bin/i386-solaris/ttf2afm
+++ b/Master/bin/i386-solaris/ttf2afm
diff --git a/Master/bin/i386-solaris/ttf2pk b/Master/bin/i386-solaris/ttf2pk
index 9723b0ccee1..c3eb165fc0c 100755
--- a/Master/bin/i386-solaris/ttf2pk
+++ b/Master/bin/i386-solaris/ttf2pk
diff --git a/Master/bin/i386-solaris/ttf2tfm b/Master/bin/i386-solaris/ttf2tfm
index 862104b5a77..7a87de7ff9f 100755
--- a/Master/bin/i386-solaris/ttf2tfm
+++ b/Master/bin/i386-solaris/ttf2tfm
diff --git a/Master/bin/i386-solaris/ttfdump b/Master/bin/i386-solaris/ttfdump
index 76629efdb24..24e0e2a6f3f 100755
--- a/Master/bin/i386-solaris/ttfdump
+++ b/Master/bin/i386-solaris/ttfdump
diff --git a/Master/bin/i386-solaris/ttftotype42 b/Master/bin/i386-solaris/ttftotype42
index c2171f89cfb..1b4fd617c2b 100755
--- a/Master/bin/i386-solaris/ttftotype42
+++ b/Master/bin/i386-solaris/ttftotype42
diff --git a/Master/bin/i386-solaris/updmap b/Master/bin/i386-solaris/updmap
index 723bde70a02..2483052a7de 100755
--- a/Master/bin/i386-solaris/updmap
+++ b/Master/bin/i386-solaris/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/i386-solaris/vftovp b/Master/bin/i386-solaris/vftovp
index cac2d2aafe0..89ec6112742 100755
--- a/Master/bin/i386-solaris/vftovp
+++ b/Master/bin/i386-solaris/vftovp
diff --git a/Master/bin/i386-solaris/vlna b/Master/bin/i386-solaris/vlna
index 1c636d3007c..e335fe858d2 100755
--- a/Master/bin/i386-solaris/vlna
+++ b/Master/bin/i386-solaris/vlna
diff --git a/Master/bin/i386-solaris/vptovf b/Master/bin/i386-solaris/vptovf
index f4c2528fed3..303ffebaea0 100755
--- a/Master/bin/i386-solaris/vptovf
+++ b/Master/bin/i386-solaris/vptovf
diff --git a/Master/bin/i386-solaris/weave b/Master/bin/i386-solaris/weave
index 5accba9811b..2afbdd6d4f8 100755
--- a/Master/bin/i386-solaris/weave
+++ b/Master/bin/i386-solaris/weave
diff --git a/Master/bin/i386-solaris/xdvi b/Master/bin/i386-solaris/xdvi
index 2fea0292fde..29632097df1 100755
--- a/Master/bin/i386-solaris/xdvi
+++ b/Master/bin/i386-solaris/xdvi
@@ -2,7 +2,7 @@
 
 # This is the xdvi wrapper script for teTeX, version 0.2.
 # Copyright Thomas Esser, 1998. Permission to distribute under the terms
-# of the GNU General Public License version 2 or later.
+# of the GNU general public license version 2 or later.
 
 # This script sets some environment variables to make sure that xdvi's
 # resource file in $XDVIINPUTS/xdvi is read by xdvi.bin.
@@ -50,17 +50,4 @@ if test -n "$xdviappfile"; then
   XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
 fi
 
-# 2009 modification by Ettore Aldrovandi for TeX Live specifically;
-# since the regular xdvi-xaw binary is built on OpenSolaris, and there's
-# a separate binary for Solaris 10, use the right one.  This needs to be
-# patched back in the source tree, or otherwise fixed, but for now, just
-# do it here, where it's needed.
-if test x"`(uname -s) 2>&1`" = xSunOS \
-    && test x"`(uname -r) 2>&1`" = x5.10 \
-    && test x"`(uname -m) 2>&1`" = xi86pc ; then
-    xdviprogram=xdvi-xaw_solaris10_x86
-else
-    xdviprogram=xdvi-xaw
-fi
-
-exec $xdviprogram $NAMEOPT ${1+"$@"}
+exec xdvi-xaw $NAMEOPT ${1+"$@"}
diff --git a/Master/bin/i386-solaris/xdvi-xaw b/Master/bin/i386-solaris/xdvi-xaw
index 61ce8a5ee9e..5c1184a647b 100755
--- a/Master/bin/i386-solaris/xdvi-xaw
+++ b/Master/bin/i386-solaris/xdvi-xaw
diff --git a/Master/bin/i386-solaris/xdvi-xaw_solaris10_x86 b/Master/bin/i386-solaris/xdvi-xaw_solaris10_x86
deleted file mode 100755
index fef59872d0f..00000000000
--- a/Master/bin/i386-solaris/xdvi-xaw_solaris10_x86
+++ /dev/null
diff --git a/Master/bin/i386-solaris/xdvipdfmx b/Master/bin/i386-solaris/xdvipdfmx
index 900bf806ae5..0b518942e6b 100755
--- a/Master/bin/i386-solaris/xdvipdfmx
+++ b/Master/bin/i386-solaris/xdvipdfmx
diff --git a/Master/bin/i386-solaris/xetex b/Master/bin/i386-solaris/xetex
index 6b8dcfd94fb..03946c03c4d 100755
--- a/Master/bin/i386-solaris/xetex
+++ b/Master/bin/i386-solaris/xetex
diff --git a/Master/bin/i386-solaris/xindy.mem b/Master/bin/i386-solaris/xindy.mem
index 4e2a7b883ea..93aebb69c3e 100644
--- a/Master/bin/i386-solaris/xindy.mem
+++ b/Master/bin/i386-solaris/xindy.mem
diff --git a/Master/bin/i386-solaris/xindy.run b/Master/bin/i386-solaris/xindy.run
index 47966bd1709..a3ee7a4bbf5 100755
--- a/Master/bin/i386-solaris/xindy.run
+++ b/Master/bin/i386-solaris/xindy.run
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index c46208a80c7..4934f5e33ad 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -124,10 +124,8 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     $grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;;
    i386-solaris)
-    download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
-    grab="$download -O $download_loc"
-    $grab http://ocean1.ee.duth.gr/~apostolo/i386-pc-solaris2.11.tar.xz;;
+    $grab http://ocean1.ee.duth.gr/~apostolo/i386-pc-solaris2.11.tar.gz;;
    *-darwin)
     default_bin_loc=$download_loc
     $grab http://www.uoregon.edu/~koch/$tlname.tar.gz;;