128 files changed, 297 insertions, 46 deletions

diff --git a/Master/bin/i386-freebsd/afm2pl b/Master/bin/i386-freebsd/afm2pl
index f17be7bef88..83839c31b62 100755
--- a/Master/bin/i386-freebsd/afm2pl
+++ b/Master/bin/i386-freebsd/afm2pl
diff --git a/Master/bin/i386-freebsd/afm2tfm b/Master/bin/i386-freebsd/afm2tfm
index 462271e2361..dddfd4b25a9 100755
--- a/Master/bin/i386-freebsd/afm2tfm
+++ b/Master/bin/i386-freebsd/afm2tfm
diff --git a/Master/bin/i386-freebsd/aleph b/Master/bin/i386-freebsd/aleph
index 2d4f4503a18..3a66b3f9d65 100755
--- a/Master/bin/i386-freebsd/aleph
+++ b/Master/bin/i386-freebsd/aleph
diff --git a/Master/bin/i386-freebsd/asy b/Master/bin/i386-freebsd/asy
index 7eb57e03fb8..9a09557a9f0 100755
--- a/Master/bin/i386-freebsd/asy
+++ b/Master/bin/i386-freebsd/asy
diff --git a/Master/bin/i386-freebsd/bibtex b/Master/bin/i386-freebsd/bibtex
index 46a166a693e..1db7c9f8437 100755
--- a/Master/bin/i386-freebsd/bibtex
+++ b/Master/bin/i386-freebsd/bibtex
diff --git a/Master/bin/i386-freebsd/bibtex8 b/Master/bin/i386-freebsd/bibtex8
index 5d39d04145e..102f5cd204f 100755
--- a/Master/bin/i386-freebsd/bibtex8
+++ b/Master/bin/i386-freebsd/bibtex8
diff --git a/Master/bin/i386-freebsd/bibtexu b/Master/bin/i386-freebsd/bibtexu
new file mode 100755
index 00000000000..3c43c40e138
--- /dev/null
+++ b/Master/bin/i386-freebsd/bibtexu
diff --git a/Master/bin/i386-freebsd/cfftot1 b/Master/bin/i386-freebsd/cfftot1
index fb207d98e3d..235581edf6a 100755
--- a/Master/bin/i386-freebsd/cfftot1
+++ b/Master/bin/i386-freebsd/cfftot1
diff --git a/Master/bin/i386-freebsd/chktex b/Master/bin/i386-freebsd/chktex
new file mode 100755
index 00000000000..25c18da209a
--- /dev/null
+++ b/Master/bin/i386-freebsd/chktex
diff --git a/Master/bin/i386-freebsd/chkweb b/Master/bin/i386-freebsd/chkweb
new file mode 100755
index 00000000000..cbc0caa780d
--- /dev/null
+++ b/Master/bin/i386-freebsd/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-freebsd/ctangle b/Master/bin/i386-freebsd/ctangle
index b03442ac972..fc69cdf5a4d 100755
--- a/Master/bin/i386-freebsd/ctangle
+++ b/Master/bin/i386-freebsd/ctangle
diff --git a/Master/bin/i386-freebsd/ctie b/Master/bin/i386-freebsd/ctie
index d4b896e2487..f6c420cf789 100755
--- a/Master/bin/i386-freebsd/ctie
+++ b/Master/bin/i386-freebsd/ctie
diff --git a/Master/bin/i386-freebsd/cweave b/Master/bin/i386-freebsd/cweave
index 799e59f3bf6..d20ada8afbd 100755
--- a/Master/bin/i386-freebsd/cweave
+++ b/Master/bin/i386-freebsd/cweave
diff --git a/Master/bin/i386-freebsd/detex b/Master/bin/i386-freebsd/detex
index 0f190e6025d..fbc56830d44 100755
--- a/Master/bin/i386-freebsd/detex
+++ b/Master/bin/i386-freebsd/detex
diff --git a/Master/bin/i386-freebsd/devnag b/Master/bin/i386-freebsd/devnag
index f0d59d970a5..b418bdeacee 100755
--- a/Master/bin/i386-freebsd/devnag
+++ b/Master/bin/i386-freebsd/devnag
diff --git a/Master/bin/i386-freebsd/deweb b/Master/bin/i386-freebsd/deweb
new file mode 100755
index 00000000000..245119b134a
--- /dev/null
+++ b/Master/bin/i386-freebsd/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-freebsd/disdvi b/Master/bin/i386-freebsd/disdvi
index c7005f5099d..8051686b6a1 100755
--- a/Master/bin/i386-freebsd/disdvi
+++ b/Master/bin/i386-freebsd/disdvi
diff --git a/Master/bin/i386-freebsd/dt2dv b/Master/bin/i386-freebsd/dt2dv
index 577ec03e3cb..b378962599c 100755
--- a/Master/bin/i386-freebsd/dt2dv
+++ b/Master/bin/i386-freebsd/dt2dv
diff --git a/Master/bin/i386-freebsd/dvi2tty b/Master/bin/i386-freebsd/dvi2tty
index 935b66e9138..6c5819c0a16 100755
--- a/Master/bin/i386-freebsd/dvi2tty
+++ b/Master/bin/i386-freebsd/dvi2tty
diff --git a/Master/bin/i386-freebsd/dvibook b/Master/bin/i386-freebsd/dvibook
index 7bb49afecbf..e25854e6550 100755
--- a/Master/bin/i386-freebsd/dvibook
+++ b/Master/bin/i386-freebsd/dvibook
diff --git a/Master/bin/i386-freebsd/dviconcat b/Master/bin/i386-freebsd/dviconcat
index 2389f7b0147..13e4ee1d36a 100755
--- a/Master/bin/i386-freebsd/dviconcat
+++ b/Master/bin/i386-freebsd/dviconcat
diff --git a/Master/bin/i386-freebsd/dvicopy b/Master/bin/i386-freebsd/dvicopy
index ff1344c61bc..6e9dc35128f 100755
--- a/Master/bin/i386-freebsd/dvicopy
+++ b/Master/bin/i386-freebsd/dvicopy
diff --git a/Master/bin/i386-freebsd/dvihp b/Master/bin/i386-freebsd/dvihp
index 6b149517086..fdaf3fb87bf 100755
--- a/Master/bin/i386-freebsd/dvihp
+++ b/Master/bin/i386-freebsd/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-freebsd/dvilj b/Master/bin/i386-freebsd/dvilj
index 6242267bdd2..2725759708b 100755
--- a/Master/bin/i386-freebsd/dvilj
+++ b/Master/bin/i386-freebsd/dvilj
diff --git a/Master/bin/i386-freebsd/dvilj2p b/Master/bin/i386-freebsd/dvilj2p
index 6c54646dc42..7ca6ff69f42 100755
--- a/Master/bin/i386-freebsd/dvilj2p
+++ b/Master/bin/i386-freebsd/dvilj2p
diff --git a/Master/bin/i386-freebsd/dvilj4 b/Master/bin/i386-freebsd/dvilj4
index 37cbf1ed155..84f2b627b51 100755
--- a/Master/bin/i386-freebsd/dvilj4
+++ b/Master/bin/i386-freebsd/dvilj4
diff --git a/Master/bin/i386-freebsd/dvilj4l b/Master/bin/i386-freebsd/dvilj4l
index f3272517aa3..25637f2e2fc 100755
--- a/Master/bin/i386-freebsd/dvilj4l
+++ b/Master/bin/i386-freebsd/dvilj4l
diff --git a/Master/bin/i386-freebsd/dvipdfmx b/Master/bin/i386-freebsd/dvipdfmx
index d6f95f0cd35..08a8b81e12f 100755
--- a/Master/bin/i386-freebsd/dvipdfmx
+++ b/Master/bin/i386-freebsd/dvipdfmx
diff --git a/Master/bin/i386-freebsd/dvipng b/Master/bin/i386-freebsd/dvipng
index a6256032c52..b9e4f0a11bd 100755
--- a/Master/bin/i386-freebsd/dvipng
+++ b/Master/bin/i386-freebsd/dvipng
diff --git a/Master/bin/i386-freebsd/dvipos b/Master/bin/i386-freebsd/dvipos
index 0bddba96e6e..d20f2cfc364 100755
--- a/Master/bin/i386-freebsd/dvipos
+++ b/Master/bin/i386-freebsd/dvipos
diff --git a/Master/bin/i386-freebsd/dvips b/Master/bin/i386-freebsd/dvips
index fdb3d983dec..d0505840208 100755
--- a/Master/bin/i386-freebsd/dvips
+++ b/Master/bin/i386-freebsd/dvips
diff --git a/Master/bin/i386-freebsd/dviselect b/Master/bin/i386-freebsd/dviselect
index 60de01ab698..02502d81e72 100755
--- a/Master/bin/i386-freebsd/dviselect
+++ b/Master/bin/i386-freebsd/dviselect
diff --git a/Master/bin/i386-freebsd/dvisvgm b/Master/bin/i386-freebsd/dvisvgm
new file mode 100755
index 00000000000..5046063c2f2
--- /dev/null
+++ b/Master/bin/i386-freebsd/dvisvgm
diff --git a/Master/bin/i386-freebsd/dvitodvi b/Master/bin/i386-freebsd/dvitodvi
index 3755b1003e5..45fd5bf1a3b 100755
--- a/Master/bin/i386-freebsd/dvitodvi
+++ b/Master/bin/i386-freebsd/dvitodvi
diff --git a/Master/bin/i386-freebsd/dvitype b/Master/bin/i386-freebsd/dvitype
index 387171602e0..205398b74e9 100755
--- a/Master/bin/i386-freebsd/dvitype
+++ b/Master/bin/i386-freebsd/dvitype
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index f12885629e2..6257aba50e7 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/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-freebsd/gftodvi b/Master/bin/i386-freebsd/gftodvi
index 97744aee55f..6e5f466649b 100755
--- a/Master/bin/i386-freebsd/gftodvi
+++ b/Master/bin/i386-freebsd/gftodvi
diff --git a/Master/bin/i386-freebsd/gftopk b/Master/bin/i386-freebsd/gftopk
index 544b9135fb6..1b9747857d7 100755
--- a/Master/bin/i386-freebsd/gftopk
+++ b/Master/bin/i386-freebsd/gftopk
diff --git a/Master/bin/i386-freebsd/gftype b/Master/bin/i386-freebsd/gftype
index 899bb3bbdd5..27b98d46892 100755
--- a/Master/bin/i386-freebsd/gftype
+++ b/Master/bin/i386-freebsd/gftype
diff --git a/Master/bin/i386-freebsd/gsftopk b/Master/bin/i386-freebsd/gsftopk
index a84e5e4a219..8251bb0b179 100755
--- a/Master/bin/i386-freebsd/gsftopk
+++ b/Master/bin/i386-freebsd/gsftopk
diff --git a/Master/bin/i386-freebsd/hbf2gf b/Master/bin/i386-freebsd/hbf2gf
index ed77ca36f84..2f049fc666e 100755
--- a/Master/bin/i386-freebsd/hbf2gf
+++ b/Master/bin/i386-freebsd/hbf2gf
diff --git a/Master/bin/i386-freebsd/kpseaccess b/Master/bin/i386-freebsd/kpseaccess
index 7451782b002..1b203735d81 100755
--- a/Master/bin/i386-freebsd/kpseaccess
+++ b/Master/bin/i386-freebsd/kpseaccess
diff --git a/Master/bin/i386-freebsd/kpsereadlink b/Master/bin/i386-freebsd/kpsereadlink
index f5693a0d72f..c3e7e2ace6c 100755
--- a/Master/bin/i386-freebsd/kpsereadlink
+++ b/Master/bin/i386-freebsd/kpsereadlink
diff --git a/Master/bin/i386-freebsd/kpsestat b/Master/bin/i386-freebsd/kpsestat
index c23837e616c..20e9cac5c99 100755
--- a/Master/bin/i386-freebsd/kpsestat
+++ b/Master/bin/i386-freebsd/kpsestat
diff --git a/Master/bin/i386-freebsd/kpsewhich b/Master/bin/i386-freebsd/kpsewhich
index 7367ce56ed2..20c506dcbf6 100755
--- a/Master/bin/i386-freebsd/kpsewhich
+++ b/Master/bin/i386-freebsd/kpsewhich
diff --git a/Master/bin/i386-freebsd/luatex b/Master/bin/i386-freebsd/luatex
index d4850634fb5..4dba919f601 100755
--- a/Master/bin/i386-freebsd/luatex
+++ b/Master/bin/i386-freebsd/luatex
diff --git a/Master/bin/i386-freebsd/makeindex b/Master/bin/i386-freebsd/makeindex
index ee5596e2762..384d7b2360c 100755
--- a/Master/bin/i386-freebsd/makeindex
+++ b/Master/bin/i386-freebsd/makeindex
diff --git a/Master/bin/i386-freebsd/makejvf b/Master/bin/i386-freebsd/makejvf
new file mode 100755
index 00000000000..a0dec1ea622
--- /dev/null
+++ b/Master/bin/i386-freebsd/makejvf
diff --git a/Master/bin/i386-freebsd/mendex b/Master/bin/i386-freebsd/mendex
new file mode 100755
index 00000000000..06e0cd0a010
--- /dev/null
+++ b/Master/bin/i386-freebsd/mendex
diff --git a/Master/bin/i386-freebsd/mf b/Master/bin/i386-freebsd/mf
index c223d57ab3e..169a6ea513a 100755
--- a/Master/bin/i386-freebsd/mf
+++ b/Master/bin/i386-freebsd/mf
diff --git a/Master/bin/i386-freebsd/mf-nowin b/Master/bin/i386-freebsd/mf-nowin
index 7305511eca2..26825318e40 100755
--- a/Master/bin/i386-freebsd/mf-nowin
+++ b/Master/bin/i386-freebsd/mf-nowin
diff --git a/Master/bin/i386-freebsd/mft b/Master/bin/i386-freebsd/mft
index ae02c9f01a8..f48a41e8d8b 100755
--- a/Master/bin/i386-freebsd/mft
+++ b/Master/bin/i386-freebsd/mft
diff --git a/Master/bin/i386-freebsd/mktexmf b/Master/bin/i386-freebsd/mktexmf
index 32bb85ec3d8..2bd683c7f0a 100755
--- a/Master/bin/i386-freebsd/mktexmf
+++ b/Master/bin/i386-freebsd/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-freebsd/mktexpk b/Master/bin/i386-freebsd/mktexpk
index baed82a83fa..1d0a4b4e2be 100755
--- a/Master/bin/i386-freebsd/mktexpk
+++ b/Master/bin/i386-freebsd/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-freebsd/mktextfm b/Master/bin/i386-freebsd/mktextfm
index e695f8ffbf4..bc65668e92e 100755
--- a/Master/bin/i386-freebsd/mktextfm
+++ b/Master/bin/i386-freebsd/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-freebsd/mmafm b/Master/bin/i386-freebsd/mmafm
index c46429f4636..c1ddee5a27d 100755
--- a/Master/bin/i386-freebsd/mmafm
+++ b/Master/bin/i386-freebsd/mmafm
diff --git a/Master/bin/i386-freebsd/mmpfb b/Master/bin/i386-freebsd/mmpfb
index abeae5c4943..cbe03e9a5a1 100755
--- a/Master/bin/i386-freebsd/mmpfb
+++ b/Master/bin/i386-freebsd/mmpfb
diff --git a/Master/bin/i386-freebsd/mpost b/Master/bin/i386-freebsd/mpost
index bb79af4d0c1..366f1aaa8e0 100755
--- a/Master/bin/i386-freebsd/mpost
+++ b/Master/bin/i386-freebsd/mpost
diff --git a/Master/bin/i386-freebsd/odvicopy b/Master/bin/i386-freebsd/odvicopy
index 8b729f90f0c..c9e111b977d 100755
--- a/Master/bin/i386-freebsd/odvicopy
+++ b/Master/bin/i386-freebsd/odvicopy
diff --git a/Master/bin/i386-freebsd/odvitype b/Master/bin/i386-freebsd/odvitype
index dae214fd24c..279cb446827 100755
--- a/Master/bin/i386-freebsd/odvitype
+++ b/Master/bin/i386-freebsd/odvitype
diff --git a/Master/bin/i386-freebsd/omfonts b/Master/bin/i386-freebsd/omfonts
index 35a6eb8f920..b7b95fd7e29 100755
--- a/Master/bin/i386-freebsd/omfonts
+++ b/Master/bin/i386-freebsd/omfonts
diff --git a/Master/bin/i386-freebsd/otangle b/Master/bin/i386-freebsd/otangle
index 3086bcd2a66..1628ab5ea1a 100755
--- a/Master/bin/i386-freebsd/otangle
+++ b/Master/bin/i386-freebsd/otangle
diff --git a/Master/bin/i386-freebsd/otfinfo b/Master/bin/i386-freebsd/otfinfo
index 63652b15da0..52a96627a0d 100755
--- a/Master/bin/i386-freebsd/otfinfo
+++ b/Master/bin/i386-freebsd/otfinfo
diff --git a/Master/bin/i386-freebsd/otftotfm b/Master/bin/i386-freebsd/otftotfm
index f122e610326..e1bf7356052 100755
--- a/Master/bin/i386-freebsd/otftotfm
+++ b/Master/bin/i386-freebsd/otftotfm
diff --git a/Master/bin/i386-freebsd/otp2ocp b/Master/bin/i386-freebsd/otp2ocp
index a97a042cf62..3f0895d9b52 100755
--- a/Master/bin/i386-freebsd/otp2ocp
+++ b/Master/bin/i386-freebsd/otp2ocp
diff --git a/Master/bin/i386-freebsd/outocp b/Master/bin/i386-freebsd/outocp
index 77544af3b1b..621a7ef3339 100755
--- a/Master/bin/i386-freebsd/outocp
+++ b/Master/bin/i386-freebsd/outocp
diff --git a/Master/bin/i386-freebsd/patgen b/Master/bin/i386-freebsd/patgen
index faa32fcff6d..6cd88c54236 100755
--- a/Master/bin/i386-freebsd/patgen
+++ b/Master/bin/i386-freebsd/patgen
diff --git a/Master/bin/i386-freebsd/pbibtex b/Master/bin/i386-freebsd/pbibtex
new file mode 100755
index 00000000000..68b14eae6b3
--- /dev/null
+++ b/Master/bin/i386-freebsd/pbibtex
diff --git a/Master/bin/i386-freebsd/pdfclose b/Master/bin/i386-freebsd/pdfclose
index 4b6bf069db0..d087facc1bc 100755
--- a/Master/bin/i386-freebsd/pdfclose
+++ b/Master/bin/i386-freebsd/pdfclose
diff --git a/Master/bin/i386-freebsd/pdfopen b/Master/bin/i386-freebsd/pdfopen
index f95f4b61a0e..e6ce7a0a6ae 100755
--- a/Master/bin/i386-freebsd/pdfopen
+++ b/Master/bin/i386-freebsd/pdfopen
diff --git a/Master/bin/i386-freebsd/pdftex b/Master/bin/i386-freebsd/pdftex
index 648cf5791ae..aa2f6c991e9 100755
--- a/Master/bin/i386-freebsd/pdftex
+++ b/Master/bin/i386-freebsd/pdftex
diff --git a/Master/bin/i386-freebsd/pdftosrc b/Master/bin/i386-freebsd/pdftosrc
index bda66555141..03626bdaaef 100755
--- a/Master/bin/i386-freebsd/pdftosrc
+++ b/Master/bin/i386-freebsd/pdftosrc
diff --git a/Master/bin/i386-freebsd/pdvitype b/Master/bin/i386-freebsd/pdvitype
new file mode 100755
index 00000000000..354eb018fd9
--- /dev/null
+++ b/Master/bin/i386-freebsd/pdvitype
diff --git a/Master/bin/i386-freebsd/pfb2pfa b/Master/bin/i386-freebsd/pfb2pfa
index bca3faf9d4d..83186945826 100755
--- a/Master/bin/i386-freebsd/pfb2pfa
+++ b/Master/bin/i386-freebsd/pfb2pfa
diff --git a/Master/bin/i386-freebsd/pk2bm b/Master/bin/i386-freebsd/pk2bm
index 131140388b8..d94396f836d 100755
--- a/Master/bin/i386-freebsd/pk2bm
+++ b/Master/bin/i386-freebsd/pk2bm
diff --git a/Master/bin/i386-freebsd/pktogf b/Master/bin/i386-freebsd/pktogf
index 45fc18221b9..a91107478e0 100755
--- a/Master/bin/i386-freebsd/pktogf
+++ b/Master/bin/i386-freebsd/pktogf
diff --git a/Master/bin/i386-freebsd/pktype b/Master/bin/i386-freebsd/pktype
index 2e73b5f7105..85eb07c64fd 100755
--- a/Master/bin/i386-freebsd/pktype
+++ b/Master/bin/i386-freebsd/pktype
diff --git a/Master/bin/i386-freebsd/platex b/Master/bin/i386-freebsd/platex
new file mode 120000
index 00000000000..43a4f13c2a2
--- /dev/null
+++ b/Master/bin/i386-freebsd/platex
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/pltotf b/Master/bin/i386-freebsd/pltotf
index bbf1b27184b..87a76576717 100755
--- a/Master/bin/i386-freebsd/pltotf
+++ b/Master/bin/i386-freebsd/pltotf
diff --git a/Master/bin/i386-freebsd/pooltype b/Master/bin/i386-freebsd/pooltype
index 871a1903996..1f3194a2a51 100755
--- a/Master/bin/i386-freebsd/pooltype
+++ b/Master/bin/i386-freebsd/pooltype
diff --git a/Master/bin/i386-freebsd/ppltotf b/Master/bin/i386-freebsd/ppltotf
new file mode 100755
index 00000000000..bef646ef267
--- /dev/null
+++ b/Master/bin/i386-freebsd/ppltotf
diff --git a/Master/bin/i386-freebsd/ps2pk b/Master/bin/i386-freebsd/ps2pk
index 2aa6c98f7b4..67bb6dd5660 100755
--- a/Master/bin/i386-freebsd/ps2pk
+++ b/Master/bin/i386-freebsd/ps2pk
diff --git a/Master/bin/i386-freebsd/psnup b/Master/bin/i386-freebsd/psnup
index 9eee7fdac73..c1a6883a58b 100755
--- a/Master/bin/i386-freebsd/psnup
+++ b/Master/bin/i386-freebsd/psnup
diff --git a/Master/bin/i386-freebsd/psresize b/Master/bin/i386-freebsd/psresize
index 8f8513ef0ae..ab02bc8d62d 100755
--- a/Master/bin/i386-freebsd/psresize
+++ b/Master/bin/i386-freebsd/psresize
diff --git a/Master/bin/i386-freebsd/pstops b/Master/bin/i386-freebsd/pstops
index 1d289c26fd7..9c56ac37fed 100755
--- a/Master/bin/i386-freebsd/pstops
+++ b/Master/bin/i386-freebsd/pstops
diff --git a/Master/bin/i386-freebsd/ptex b/Master/bin/i386-freebsd/ptex
new file mode 100755
index 00000000000..bddb97c59e3
--- /dev/null
+++ b/Master/bin/i386-freebsd/ptex
diff --git a/Master/bin/i386-freebsd/ptftopl b/Master/bin/i386-freebsd/ptftopl
new file mode 100755
index 00000000000..4ee82816cab
--- /dev/null
+++ b/Master/bin/i386-freebsd/ptftopl
diff --git a/Master/bin/i386-freebsd/repstopdf b/Master/bin/i386-freebsd/repstopdf
new file mode 120000
index 00000000000..859052f5166
--- /dev/null
+++ b/Master/bin/i386-freebsd/repstopdf
@@ -0,0 +1 @@
+epstopdf
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/synctex b/Master/bin/i386-freebsd/synctex
index 6cc7acef31f..feb80ffd028 100755
--- a/Master/bin/i386-freebsd/synctex
+++ b/Master/bin/i386-freebsd/synctex
diff --git a/Master/bin/i386-freebsd/t1ascii b/Master/bin/i386-freebsd/t1ascii
index 276d0d11ef3..80bcf5c8a6f 100755
--- a/Master/bin/i386-freebsd/t1ascii
+++ b/Master/bin/i386-freebsd/t1ascii
diff --git a/Master/bin/i386-freebsd/t1asm b/Master/bin/i386-freebsd/t1asm
index 32dcb5e649a..3aa2592cb40 100755
--- a/Master/bin/i386-freebsd/t1asm
+++ b/Master/bin/i386-freebsd/t1asm
diff --git a/Master/bin/i386-freebsd/t1binary b/Master/bin/i386-freebsd/t1binary
index 8b56716c843..262b2de6777 100755
--- a/Master/bin/i386-freebsd/t1binary
+++ b/Master/bin/i386-freebsd/t1binary
diff --git a/Master/bin/i386-freebsd/t1disasm b/Master/bin/i386-freebsd/t1disasm
index d097010c168..6a236acf820 100755
--- a/Master/bin/i386-freebsd/t1disasm
+++ b/Master/bin/i386-freebsd/t1disasm
diff --git a/Master/bin/i386-freebsd/t1dotlessj b/Master/bin/i386-freebsd/t1dotlessj
index bdf675d8719..5b4c6ad23cd 100755
--- a/Master/bin/i386-freebsd/t1dotlessj
+++ b/Master/bin/i386-freebsd/t1dotlessj
diff --git a/Master/bin/i386-freebsd/t1lint b/Master/bin/i386-freebsd/t1lint
index 1f84049790e..d0ac89869dd 100755
--- a/Master/bin/i386-freebsd/t1lint
+++ b/Master/bin/i386-freebsd/t1lint
diff --git a/Master/bin/i386-freebsd/t1mac b/Master/bin/i386-freebsd/t1mac
index 9d4a786fc6b..ef30dd08fb6 100755
--- a/Master/bin/i386-freebsd/t1mac
+++ b/Master/bin/i386-freebsd/t1mac
diff --git a/Master/bin/i386-freebsd/t1rawafm b/Master/bin/i386-freebsd/t1rawafm
index 9ff344d3f75..aa44324c5bb 100755
--- a/Master/bin/i386-freebsd/t1rawafm
+++ b/Master/bin/i386-freebsd/t1rawafm
diff --git a/Master/bin/i386-freebsd/t1reencode b/Master/bin/i386-freebsd/t1reencode
index 37c514544d5..b2b2a9e78fa 100755
--- a/Master/bin/i386-freebsd/t1reencode
+++ b/Master/bin/i386-freebsd/t1reencode
diff --git a/Master/bin/i386-freebsd/t1testpage b/Master/bin/i386-freebsd/t1testpage
index f1a4c1af168..d09afa7dcff 100755
--- a/Master/bin/i386-freebsd/t1testpage
+++ b/Master/bin/i386-freebsd/t1testpage
diff --git a/Master/bin/i386-freebsd/t1unmac b/Master/bin/i386-freebsd/t1unmac
index 7ecb2007610..c902a04c815 100755
--- a/Master/bin/i386-freebsd/t1unmac
+++ b/Master/bin/i386-freebsd/t1unmac
diff --git a/Master/bin/i386-freebsd/t4ht b/Master/bin/i386-freebsd/t4ht
index f40190dafd0..9c1ff1aaf08 100755
--- a/Master/bin/i386-freebsd/t4ht
+++ b/Master/bin/i386-freebsd/t4ht
diff --git a/Master/bin/i386-freebsd/tangle b/Master/bin/i386-freebsd/tangle
index b113b4c9f4a..fd736c556dc 100755
--- a/Master/bin/i386-freebsd/tangle
+++ b/Master/bin/i386-freebsd/tangle
diff --git a/Master/bin/i386-freebsd/tcdialog b/Master/bin/i386-freebsd/tcdialog
index 183ee63240a..e864549a687 100755..120000
--- a/Master/bin/i386-freebsd/tcdialog
+++ b/Master/bin/i386-freebsd/tcdialog
diff --git a/Master/bin/i386-freebsd/teckit_compile b/Master/bin/i386-freebsd/teckit_compile
index 10686f5306c..d518313f1ac 100755
--- a/Master/bin/i386-freebsd/teckit_compile
+++ b/Master/bin/i386-freebsd/teckit_compile
diff --git a/Master/bin/i386-freebsd/tex b/Master/bin/i386-freebsd/tex
index e4917ef6703..1c18a8a0676 100755
--- a/Master/bin/i386-freebsd/tex
+++ b/Master/bin/i386-freebsd/tex
diff --git a/Master/bin/i386-freebsd/tex2xindy b/Master/bin/i386-freebsd/tex2xindy
index ff7d527f4db..fb3f27b934e 100755
--- a/Master/bin/i386-freebsd/tex2xindy
+++ b/Master/bin/i386-freebsd/tex2xindy
diff --git a/Master/bin/i386-freebsd/tex4ht b/Master/bin/i386-freebsd/tex4ht
index a0b67a69f1a..6ac934cf8ec 100755
--- a/Master/bin/i386-freebsd/tex4ht
+++ b/Master/bin/i386-freebsd/tex4ht
diff --git a/Master/bin/i386-freebsd/texconfig b/Master/bin/i386-freebsd/texconfig
index fe0927136e0..f37b30b1283 100755
--- a/Master/bin/i386-freebsd/texconfig
+++ b/Master/bin/i386-freebsd/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-freebsd/texlinks b/Master/bin/i386-freebsd/texlinks
index c77ceea60c0..09b3488d263 100755
--- a/Master/bin/i386-freebsd/texlinks
+++ b/Master/bin/i386-freebsd/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-freebsd/tftopl b/Master/bin/i386-freebsd/tftopl
index 02cedd44a3b..26136405e9c 100755
--- a/Master/bin/i386-freebsd/tftopl
+++ b/Master/bin/i386-freebsd/tftopl
diff --git a/Master/bin/i386-freebsd/tie b/Master/bin/i386-freebsd/tie
index 5e9a66dd7c6..f2b2af86f47 100755
--- a/Master/bin/i386-freebsd/tie
+++ b/Master/bin/i386-freebsd/tie
diff --git a/Master/bin/i386-freebsd/tpic2pdftex b/Master/bin/i386-freebsd/tpic2pdftex
index 70c1a33c7e8..8277e0d3c7b 100755
--- a/Master/bin/i386-freebsd/tpic2pdftex
+++ b/Master/bin/i386-freebsd/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-freebsd/ttf2afm b/Master/bin/i386-freebsd/ttf2afm
index 4e3278328c6..711b640818b 100755
--- a/Master/bin/i386-freebsd/ttf2afm
+++ b/Master/bin/i386-freebsd/ttf2afm
diff --git a/Master/bin/i386-freebsd/ttf2pk b/Master/bin/i386-freebsd/ttf2pk
index 9c73092de0d..8adf6949c7d 100755
--- a/Master/bin/i386-freebsd/ttf2pk
+++ b/Master/bin/i386-freebsd/ttf2pk
diff --git a/Master/bin/i386-freebsd/ttf2tfm b/Master/bin/i386-freebsd/ttf2tfm
index 9dfb626f070..22adb3d9e71 100755
--- a/Master/bin/i386-freebsd/ttf2tfm
+++ b/Master/bin/i386-freebsd/ttf2tfm
diff --git a/Master/bin/i386-freebsd/ttfdump b/Master/bin/i386-freebsd/ttfdump
index 912d2212aea..0b99ea61994 100755
--- a/Master/bin/i386-freebsd/ttfdump
+++ b/Master/bin/i386-freebsd/ttfdump
diff --git a/Master/bin/i386-freebsd/ttftotype42 b/Master/bin/i386-freebsd/ttftotype42
index b48fb53f9be..ce333555f36 100755
--- a/Master/bin/i386-freebsd/ttftotype42
+++ b/Master/bin/i386-freebsd/ttftotype42
diff --git a/Master/bin/i386-freebsd/updmap b/Master/bin/i386-freebsd/updmap
index 723bde70a02..2483052a7de 100755
--- a/Master/bin/i386-freebsd/updmap
+++ b/Master/bin/i386-freebsd/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-freebsd/vftovp b/Master/bin/i386-freebsd/vftovp
index c065cbd2b63..3dc72d24337 100755
--- a/Master/bin/i386-freebsd/vftovp
+++ b/Master/bin/i386-freebsd/vftovp
diff --git a/Master/bin/i386-freebsd/vlna b/Master/bin/i386-freebsd/vlna
index 9d5a6873204..961290acc94 100755
--- a/Master/bin/i386-freebsd/vlna
+++ b/Master/bin/i386-freebsd/vlna
diff --git a/Master/bin/i386-freebsd/vptovf b/Master/bin/i386-freebsd/vptovf
index 18016a73914..e984a2c467c 100755
--- a/Master/bin/i386-freebsd/vptovf
+++ b/Master/bin/i386-freebsd/vptovf
diff --git a/Master/bin/i386-freebsd/weave b/Master/bin/i386-freebsd/weave
index 93a6fcc9ee9..eb7cef51cfe 100755
--- a/Master/bin/i386-freebsd/weave
+++ b/Master/bin/i386-freebsd/weave
diff --git a/Master/bin/i386-freebsd/xdvi-xaw b/Master/bin/i386-freebsd/xdvi-xaw
index ed3d1cf25b5..121e3081f83 100755
--- a/Master/bin/i386-freebsd/xdvi-xaw
+++ b/Master/bin/i386-freebsd/xdvi-xaw
diff --git a/Master/bin/i386-freebsd/xdvipdfmx b/Master/bin/i386-freebsd/xdvipdfmx
index f28821412c5..c9263eb34b8 100755
--- a/Master/bin/i386-freebsd/xdvipdfmx
+++ b/Master/bin/i386-freebsd/xdvipdfmx
diff --git a/Master/bin/i386-freebsd/xetex b/Master/bin/i386-freebsd/xetex
index fde4e075503..5264af8da7b 100755
--- a/Master/bin/i386-freebsd/xetex
+++ b/Master/bin/i386-freebsd/xetex
diff --git a/Master/bin/i386-freebsd/xindy.mem b/Master/bin/i386-freebsd/xindy.mem
index a745b22e8d1..dbed3bc258c 100644
--- a/Master/bin/i386-freebsd/xindy.mem
+++ b/Master/bin/i386-freebsd/xindy.mem
diff --git a/Master/bin/i386-freebsd/xindy.run b/Master/bin/i386-freebsd/xindy.run
index 1507b126b4b..7548c9cf795 100755
--- a/Master/bin/i386-freebsd/xindy.run
+++ b/Master/bin/i386-freebsd/xindy.run
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 3f457548e94..bfe99d809ad 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -109,7 +109,10 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     $grab http://www.math.cornell.edu/~kbrown/cygwin.tgz;;
    i386-freebsd)
-    default_bin_loc=/home/manfred/tl2008.bin.tar.lzma;;
+    download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+    default_bin_loc=$download_loc
+    grab="$download -O $download_loc"
+    $grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/bin-r18349/i386-freebsd7-r18349.tar.xz;;
    i386-linux)
     default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;;
    i386-netbsd)