i386-netbsd binaries for 2010 pretest 1 (jukka)

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

137 files changed, 324 insertions, 61 deletions

diff --git a/Master/bin/i386-netbsd/afm2pl b/Master/bin/i386-netbsd/afm2pl
index 5f2b43bc694..6ae7c75e7d6 100755
--- a/Master/bin/i386-netbsd/afm2pl
+++ b/Master/bin/i386-netbsd/afm2pl
diff --git a/Master/bin/i386-netbsd/afm2tfm b/Master/bin/i386-netbsd/afm2tfm
index 0bd1d7b8597..c4babe21d5b 100755
--- a/Master/bin/i386-netbsd/afm2tfm
+++ b/Master/bin/i386-netbsd/afm2tfm
diff --git a/Master/bin/i386-netbsd/aleph b/Master/bin/i386-netbsd/aleph
index fb91e9c6c3a..54fb438d1a8 100755
--- a/Master/bin/i386-netbsd/aleph
+++ b/Master/bin/i386-netbsd/aleph
diff --git a/Master/bin/i386-netbsd/asy b/Master/bin/i386-netbsd/asy
index 6f773361f93..251a92051d7 100755
--- a/Master/bin/i386-netbsd/asy
+++ b/Master/bin/i386-netbsd/asy
diff --git a/Master/bin/i386-netbsd/bibtex b/Master/bin/i386-netbsd/bibtex
index 63d362fb137..4710e93c35b 100755
--- a/Master/bin/i386-netbsd/bibtex
+++ b/Master/bin/i386-netbsd/bibtex
diff --git a/Master/bin/i386-netbsd/bibtex8 b/Master/bin/i386-netbsd/bibtex8
index 8eafa5385b2..a2cb84e1df7 100755
--- a/Master/bin/i386-netbsd/bibtex8
+++ b/Master/bin/i386-netbsd/bibtex8
diff --git a/Master/bin/i386-netbsd/bibtexu b/Master/bin/i386-netbsd/bibtexu
new file mode 100755
index 00000000000..f8936c5a8ed
--- /dev/null
+++ b/Master/bin/i386-netbsd/bibtexu
diff --git a/Master/bin/i386-netbsd/cfftot1 b/Master/bin/i386-netbsd/cfftot1
index 6f98382d433..529bbb462f8 100755
--- a/Master/bin/i386-netbsd/cfftot1
+++ b/Master/bin/i386-netbsd/cfftot1
diff --git a/Master/bin/i386-netbsd/chktex b/Master/bin/i386-netbsd/chktex
new file mode 100755
index 00000000000..c2d9b090052
--- /dev/null
+++ b/Master/bin/i386-netbsd/chktex
diff --git a/Master/bin/i386-netbsd/chkweb b/Master/bin/i386-netbsd/chkweb
new file mode 100755
index 00000000000..cbc0caa780d
--- /dev/null
+++ b/Master/bin/i386-netbsd/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-netbsd/context b/Master/bin/i386-netbsd/context
index fd177847393..35162a1dfea 120000
--- a/Master/bin/i386-netbsd/context
+++ b/Master/bin/i386-netbsd/context
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs/unix/context
\ No newline at end of file
+../../texmf-dist/scripts/context/context
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/ctangle b/Master/bin/i386-netbsd/ctangle
index 368d18ed863..1f25f9c5379 100755
--- a/Master/bin/i386-netbsd/ctangle
+++ b/Master/bin/i386-netbsd/ctangle
diff --git a/Master/bin/i386-netbsd/ctie b/Master/bin/i386-netbsd/ctie
index a16d6b1e782..9fe72ab4332 100755
--- a/Master/bin/i386-netbsd/ctie
+++ b/Master/bin/i386-netbsd/ctie
diff --git a/Master/bin/i386-netbsd/ctxtools b/Master/bin/i386-netbsd/ctxtools
index 66237b28340..f9d4e38ed66 120000
--- a/Master/bin/i386-netbsd/ctxtools
+++ b/Master/bin/i386-netbsd/ctxtools
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs/unix/ctxtools
\ No newline at end of file
+../../texmf-dist/scripts/context/ctxtools
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/cweave b/Master/bin/i386-netbsd/cweave
index d2fb7ec0d01..c35579d98f6 100755
--- a/Master/bin/i386-netbsd/cweave
+++ b/Master/bin/i386-netbsd/cweave
diff --git a/Master/bin/i386-netbsd/detex b/Master/bin/i386-netbsd/detex
index 10a8b9d58ca..0c4e8b55b1d 100755
--- a/Master/bin/i386-netbsd/detex
+++ b/Master/bin/i386-netbsd/detex
diff --git a/Master/bin/i386-netbsd/devnag b/Master/bin/i386-netbsd/devnag
index d45992f53e7..ef56d60faaa 100755
--- a/Master/bin/i386-netbsd/devnag
+++ b/Master/bin/i386-netbsd/devnag
diff --git a/Master/bin/i386-netbsd/deweb b/Master/bin/i386-netbsd/deweb
new file mode 100755
index 00000000000..245119b134a
--- /dev/null
+++ b/Master/bin/i386-netbsd/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-netbsd/disdvi b/Master/bin/i386-netbsd/disdvi
index fd5c0169d9d..86a367164c2 100755
--- a/Master/bin/i386-netbsd/disdvi
+++ b/Master/bin/i386-netbsd/disdvi
diff --git a/Master/bin/i386-netbsd/dt2dv b/Master/bin/i386-netbsd/dt2dv
index b7fafec4221..478070ee1eb 100755
--- a/Master/bin/i386-netbsd/dt2dv
+++ b/Master/bin/i386-netbsd/dt2dv
diff --git a/Master/bin/i386-netbsd/dvi2tty b/Master/bin/i386-netbsd/dvi2tty
index ffb70ad27a7..16df6f00751 100755
--- a/Master/bin/i386-netbsd/dvi2tty
+++ b/Master/bin/i386-netbsd/dvi2tty
diff --git a/Master/bin/i386-netbsd/dvibook b/Master/bin/i386-netbsd/dvibook
index 04d44ba7da8..c74399c23b7 100755
--- a/Master/bin/i386-netbsd/dvibook
+++ b/Master/bin/i386-netbsd/dvibook
diff --git a/Master/bin/i386-netbsd/dviconcat b/Master/bin/i386-netbsd/dviconcat
index 9b2dc660c42..a9c0010e8f1 100755
--- a/Master/bin/i386-netbsd/dviconcat
+++ b/Master/bin/i386-netbsd/dviconcat
diff --git a/Master/bin/i386-netbsd/dvicopy b/Master/bin/i386-netbsd/dvicopy
index 2aed8a812e6..1e1a9b8799f 100755
--- a/Master/bin/i386-netbsd/dvicopy
+++ b/Master/bin/i386-netbsd/dvicopy
diff --git a/Master/bin/i386-netbsd/dvihp b/Master/bin/i386-netbsd/dvihp
index 6b149517086..fdaf3fb87bf 100755
--- a/Master/bin/i386-netbsd/dvihp
+++ b/Master/bin/i386-netbsd/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-netbsd/dvilj b/Master/bin/i386-netbsd/dvilj
index b13500d33fe..bc90f5f20bd 100755
--- a/Master/bin/i386-netbsd/dvilj
+++ b/Master/bin/i386-netbsd/dvilj
diff --git a/Master/bin/i386-netbsd/dvilj2p b/Master/bin/i386-netbsd/dvilj2p
index 7b02e63e730..523b66a9a2c 100755
--- a/Master/bin/i386-netbsd/dvilj2p
+++ b/Master/bin/i386-netbsd/dvilj2p
diff --git a/Master/bin/i386-netbsd/dvilj4 b/Master/bin/i386-netbsd/dvilj4
index a2b818e2d79..f7ff2430723 100755
--- a/Master/bin/i386-netbsd/dvilj4
+++ b/Master/bin/i386-netbsd/dvilj4
diff --git a/Master/bin/i386-netbsd/dvilj4l b/Master/bin/i386-netbsd/dvilj4l
index 561b524f0e5..e39136918c4 100755
--- a/Master/bin/i386-netbsd/dvilj4l
+++ b/Master/bin/i386-netbsd/dvilj4l
diff --git a/Master/bin/i386-netbsd/dvipdfmx b/Master/bin/i386-netbsd/dvipdfmx
index 3cefeb0d9af..a7fcae63979 100755
--- a/Master/bin/i386-netbsd/dvipdfmx
+++ b/Master/bin/i386-netbsd/dvipdfmx
diff --git a/Master/bin/i386-netbsd/dvipng b/Master/bin/i386-netbsd/dvipng
index 23bc5aea5c3..1937887a1ec 100755
--- a/Master/bin/i386-netbsd/dvipng
+++ b/Master/bin/i386-netbsd/dvipng
diff --git a/Master/bin/i386-netbsd/dvipos b/Master/bin/i386-netbsd/dvipos
index 2bc2741525d..1be9e89d01d 100755
--- a/Master/bin/i386-netbsd/dvipos
+++ b/Master/bin/i386-netbsd/dvipos
diff --git a/Master/bin/i386-netbsd/dvips b/Master/bin/i386-netbsd/dvips
index 6bdd40ee35b..49d9667c464 100755
--- a/Master/bin/i386-netbsd/dvips
+++ b/Master/bin/i386-netbsd/dvips
diff --git a/Master/bin/i386-netbsd/dviselect b/Master/bin/i386-netbsd/dviselect
index 962af78847f..37d4036f28a 100755
--- a/Master/bin/i386-netbsd/dviselect
+++ b/Master/bin/i386-netbsd/dviselect
diff --git a/Master/bin/i386-netbsd/dvisvgm b/Master/bin/i386-netbsd/dvisvgm
new file mode 100755
index 00000000000..2ed7dbc9db3
--- /dev/null
+++ b/Master/bin/i386-netbsd/dvisvgm
diff --git a/Master/bin/i386-netbsd/dvitodvi b/Master/bin/i386-netbsd/dvitodvi
index db67144beb6..f263fcbec3d 100755
--- a/Master/bin/i386-netbsd/dvitodvi
+++ b/Master/bin/i386-netbsd/dvitodvi
diff --git a/Master/bin/i386-netbsd/dvitype b/Master/bin/i386-netbsd/dvitype
index ed00c4900b3..105ab1b0294 100755
--- a/Master/bin/i386-netbsd/dvitype
+++ b/Master/bin/i386-netbsd/dvitype
diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil
index f12885629e2..6257aba50e7 100755
--- a/Master/bin/i386-netbsd/fmtutil
+++ b/Master/bin/i386-netbsd/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-netbsd/gftodvi b/Master/bin/i386-netbsd/gftodvi
index 9b5476d7809..c30e6644c77 100755
--- a/Master/bin/i386-netbsd/gftodvi
+++ b/Master/bin/i386-netbsd/gftodvi
diff --git a/Master/bin/i386-netbsd/gftopk b/Master/bin/i386-netbsd/gftopk
index d8070a5f798..e8167309d12 100755
--- a/Master/bin/i386-netbsd/gftopk
+++ b/Master/bin/i386-netbsd/gftopk
diff --git a/Master/bin/i386-netbsd/gftype b/Master/bin/i386-netbsd/gftype
index 6f6260cc104..0a067292294 100755
--- a/Master/bin/i386-netbsd/gftype
+++ b/Master/bin/i386-netbsd/gftype
diff --git a/Master/bin/i386-netbsd/gsftopk b/Master/bin/i386-netbsd/gsftopk
index 2ad35562195..84ae7de7d3e 100755
--- a/Master/bin/i386-netbsd/gsftopk
+++ b/Master/bin/i386-netbsd/gsftopk
diff --git a/Master/bin/i386-netbsd/hbf2gf b/Master/bin/i386-netbsd/hbf2gf
index 05b5700609a..9477d0a547e 100755
--- a/Master/bin/i386-netbsd/hbf2gf
+++ b/Master/bin/i386-netbsd/hbf2gf
diff --git a/Master/bin/i386-netbsd/kpseaccess b/Master/bin/i386-netbsd/kpseaccess
index 0b2ba143dfb..eaefdade0cc 100755
--- a/Master/bin/i386-netbsd/kpseaccess
+++ b/Master/bin/i386-netbsd/kpseaccess
diff --git a/Master/bin/i386-netbsd/kpsereadlink b/Master/bin/i386-netbsd/kpsereadlink
index ceb849ff4ae..cd71450695e 100755
--- a/Master/bin/i386-netbsd/kpsereadlink
+++ b/Master/bin/i386-netbsd/kpsereadlink
diff --git a/Master/bin/i386-netbsd/kpsestat b/Master/bin/i386-netbsd/kpsestat
index 70752639624..3bd8c9a7e8e 100755
--- a/Master/bin/i386-netbsd/kpsestat
+++ b/Master/bin/i386-netbsd/kpsestat
diff --git a/Master/bin/i386-netbsd/kpsewhich b/Master/bin/i386-netbsd/kpsewhich
index d6a03dfa275..d4e693a54c3 100755
--- a/Master/bin/i386-netbsd/kpsewhich
+++ b/Master/bin/i386-netbsd/kpsewhich
diff --git a/Master/bin/i386-netbsd/lacheck b/Master/bin/i386-netbsd/lacheck
index 5ea97aa2e57..136ff7ff591 100755
--- a/Master/bin/i386-netbsd/lacheck
+++ b/Master/bin/i386-netbsd/lacheck
diff --git a/Master/bin/i386-netbsd/luatex b/Master/bin/i386-netbsd/luatex
index 6adeabd14ac..159a453a513 100755
--- a/Master/bin/i386-netbsd/luatex
+++ b/Master/bin/i386-netbsd/luatex
diff --git a/Master/bin/i386-netbsd/luatools b/Master/bin/i386-netbsd/luatools
index aaf03c419a9..086ecb19b1e 120000
--- a/Master/bin/i386-netbsd/luatools
+++ b/Master/bin/i386-netbsd/luatools
@@ -1 +1 @@
-../../texmf-dist/scripts/context/lua/luatools.lua
\ No newline at end of file
+../../texmf-dist/scripts/context/luatools
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/makeindex b/Master/bin/i386-netbsd/makeindex
index 0318714f4eb..68d2afd9e06 100755
--- a/Master/bin/i386-netbsd/makeindex
+++ b/Master/bin/i386-netbsd/makeindex
diff --git a/Master/bin/i386-netbsd/makejvf b/Master/bin/i386-netbsd/makejvf
new file mode 100755
index 00000000000..92ce4731da1
--- /dev/null
+++ b/Master/bin/i386-netbsd/makejvf
diff --git a/Master/bin/i386-netbsd/mendex b/Master/bin/i386-netbsd/mendex
new file mode 100755
index 00000000000..c2e8f5689b9
--- /dev/null
+++ b/Master/bin/i386-netbsd/mendex
diff --git a/Master/bin/i386-netbsd/metatex b/Master/bin/i386-netbsd/metatex
new file mode 120000
index 00000000000..0ee18aa4209
--- /dev/null
+++ b/Master/bin/i386-netbsd/metatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/metatex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/mf b/Master/bin/i386-netbsd/mf
index bec885f52e8..21af3a8e2e3 100755
--- a/Master/bin/i386-netbsd/mf
+++ b/Master/bin/i386-netbsd/mf
diff --git a/Master/bin/i386-netbsd/mf-nowin b/Master/bin/i386-netbsd/mf-nowin
index d209c24525d..0502742600e 100755
--- a/Master/bin/i386-netbsd/mf-nowin
+++ b/Master/bin/i386-netbsd/mf-nowin
diff --git a/Master/bin/i386-netbsd/mft b/Master/bin/i386-netbsd/mft
index f2d0c67ee39..fc73e08e8ec 100755
--- a/Master/bin/i386-netbsd/mft
+++ b/Master/bin/i386-netbsd/mft
diff --git a/Master/bin/i386-netbsd/mktexmf b/Master/bin/i386-netbsd/mktexmf
index 32bb85ec3d8..2bd683c7f0a 100755
--- a/Master/bin/i386-netbsd/mktexmf
+++ b/Master/bin/i386-netbsd/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-netbsd/mktexpk b/Master/bin/i386-netbsd/mktexpk
index baed82a83fa..48a57bd25c2 100755
--- a/Master/bin/i386-netbsd/mktexpk
+++ b/Master/bin/i386-netbsd/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 18407 2010-05-21 18:16:31Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
   Create a PK font.
@@ -19,14 +19,27 @@ usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
 --mfmode MODE       use MODE as the METAFONT mode.
 --destdir DESTDIR   write fonts in DESTDIR.
 
-Try to create a PK file for NAME at resolution DPI, with an assumed
-device base resolution of BDPI, and a Metafont \`mag' of MAG. Use MODE
-for the METAFONT mode.  Use DESTDIR for the root of where to install
-into, either the absolute directory name to use (if it starts with a
-/) or relative to the default DESTDIR (if not). REDIRECT, if supplied,
-is a string of the form '>&n', where n is the number of the file
-descriptor which is to receive, instead of stdout, the name of the
-newly created pk file."
+Try to create a bitmap PK file for NAME at resolution DPI, with an
+assumed device base resolution of BDPI, and a Metafont \`mag' of
+MAG. Use MODE for the METAFONT mode.  Use DESTDIR for the root of where
+to install into, either the absolute directory name to use (if it starts
+with a /) or relative to the default DESTDIR (if not). REDIRECT, if
+supplied, is a string of the form '>&n', where n is the number of the
+file descriptor which is to receive, instead of stdout, the name of the
+newly created pk file.
+
+If you expected the font to be available as an outline, and thus this
+script does not work and should not have been called, most likely the
+font's .tfm name is missing from the relevant map file (e.g.,
+psfonts.map for dvips, pdftex.map for pdftex).  These map files are
+typically maintained using updmap; q.v.
+
+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
+TeX Live home page: <http://tug.org/texlive/>
+"
 
 # Handle non-positional options, except for --version/--help
 while test $# -gt 0; do
@@ -190,6 +203,7 @@ else
       cmd="hbf2gf -q -p $NAME $DPI"
     else
       echo "$progname: don't know how to create bitmap font for $NAME." >&2
+      echo "$progname: perhaps $NAME is missing from the map file." >&2
       exit 1
     fi
   fi
diff --git a/Master/bin/i386-netbsd/mktextfm b/Master/bin/i386-netbsd/mktextfm
index e695f8ffbf4..bc65668e92e 100755
--- a/Master/bin/i386-netbsd/mktextfm
+++ b/Master/bin/i386-netbsd/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-netbsd/mmafm b/Master/bin/i386-netbsd/mmafm
index 0804823ab58..95c5bf2e5d8 100755
--- a/Master/bin/i386-netbsd/mmafm
+++ b/Master/bin/i386-netbsd/mmafm
diff --git a/Master/bin/i386-netbsd/mmpfb b/Master/bin/i386-netbsd/mmpfb
index 01fd70ba627..8c473dbefa5 100755
--- a/Master/bin/i386-netbsd/mmpfb
+++ b/Master/bin/i386-netbsd/mmpfb
diff --git a/Master/bin/i386-netbsd/mpost b/Master/bin/i386-netbsd/mpost
index 10c1abfec78..732a2b14919 100755
--- a/Master/bin/i386-netbsd/mpost
+++ b/Master/bin/i386-netbsd/mpost
diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun
index 8825f964657..4271d66891b 120000
--- a/Master/bin/i386-netbsd/mtxrun
+++ b/Master/bin/i386-netbsd/mtxrun
@@ -1 +1 @@
-../../texmf-dist/scripts/context/lua/mtxrun.lua
\ No newline at end of file
+../../texmf-dist/scripts/context/mtxrun
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/odvicopy b/Master/bin/i386-netbsd/odvicopy
index abadaedde1c..18796001238 100755
--- a/Master/bin/i386-netbsd/odvicopy
+++ b/Master/bin/i386-netbsd/odvicopy
diff --git a/Master/bin/i386-netbsd/odvitype b/Master/bin/i386-netbsd/odvitype
index f3db849947f..9b470612f5e 100755
--- a/Master/bin/i386-netbsd/odvitype
+++ b/Master/bin/i386-netbsd/odvitype
diff --git a/Master/bin/i386-netbsd/omfonts b/Master/bin/i386-netbsd/omfonts
index c602946b4c8..e68ff413f9f 100755
--- a/Master/bin/i386-netbsd/omfonts
+++ b/Master/bin/i386-netbsd/omfonts
diff --git a/Master/bin/i386-netbsd/otangle b/Master/bin/i386-netbsd/otangle
index bd95d195602..9df4d1dd8ad 100755
--- a/Master/bin/i386-netbsd/otangle
+++ b/Master/bin/i386-netbsd/otangle
diff --git a/Master/bin/i386-netbsd/otfinfo b/Master/bin/i386-netbsd/otfinfo
index c755e575538..52171f3f1cb 100755
--- a/Master/bin/i386-netbsd/otfinfo
+++ b/Master/bin/i386-netbsd/otfinfo
diff --git a/Master/bin/i386-netbsd/otftotfm b/Master/bin/i386-netbsd/otftotfm
index 82b41ec886d..74b048d85f6 100755
--- a/Master/bin/i386-netbsd/otftotfm
+++ b/Master/bin/i386-netbsd/otftotfm
diff --git a/Master/bin/i386-netbsd/otp2ocp b/Master/bin/i386-netbsd/otp2ocp
index ea88b78be41..5508dd2005c 100755
--- a/Master/bin/i386-netbsd/otp2ocp
+++ b/Master/bin/i386-netbsd/otp2ocp
diff --git a/Master/bin/i386-netbsd/outocp b/Master/bin/i386-netbsd/outocp
index 9bc208a6bec..344f93d3d32 100755
--- a/Master/bin/i386-netbsd/outocp
+++ b/Master/bin/i386-netbsd/outocp
diff --git a/Master/bin/i386-netbsd/patgen b/Master/bin/i386-netbsd/patgen
index 0a440d765de..cbc63688fcd 100755
--- a/Master/bin/i386-netbsd/patgen
+++ b/Master/bin/i386-netbsd/patgen
diff --git a/Master/bin/i386-netbsd/pbibtex b/Master/bin/i386-netbsd/pbibtex
new file mode 100755
index 00000000000..aba8cfeda94
--- /dev/null
+++ b/Master/bin/i386-netbsd/pbibtex
diff --git a/Master/bin/i386-netbsd/pdfclose b/Master/bin/i386-netbsd/pdfclose
index c5a3957e852..d52802adcdd 100755
--- a/Master/bin/i386-netbsd/pdfclose
+++ b/Master/bin/i386-netbsd/pdfclose
diff --git a/Master/bin/i386-netbsd/pdfopen b/Master/bin/i386-netbsd/pdfopen
index 1040b07e32d..85c6565acfd 100755
--- a/Master/bin/i386-netbsd/pdfopen
+++ b/Master/bin/i386-netbsd/pdfopen
diff --git a/Master/bin/i386-netbsd/pdftex b/Master/bin/i386-netbsd/pdftex
index 99a34955c06..a66dbe86243 100755
--- a/Master/bin/i386-netbsd/pdftex
+++ b/Master/bin/i386-netbsd/pdftex
diff --git a/Master/bin/i386-netbsd/pdftosrc b/Master/bin/i386-netbsd/pdftosrc
index ee969b63c64..0f565520879 100755
--- a/Master/bin/i386-netbsd/pdftosrc
+++ b/Master/bin/i386-netbsd/pdftosrc
diff --git a/Master/bin/i386-netbsd/pdvitype b/Master/bin/i386-netbsd/pdvitype
new file mode 100755
index 00000000000..9873a8190ce
--- /dev/null
+++ b/Master/bin/i386-netbsd/pdvitype
diff --git a/Master/bin/i386-netbsd/pfb2pfa b/Master/bin/i386-netbsd/pfb2pfa
index 6ed6a129e44..788c48346fb 100755
--- a/Master/bin/i386-netbsd/pfb2pfa
+++ b/Master/bin/i386-netbsd/pfb2pfa
diff --git a/Master/bin/i386-netbsd/pk2bm b/Master/bin/i386-netbsd/pk2bm
index 485c9c90145..f1503676bce 100755
--- a/Master/bin/i386-netbsd/pk2bm
+++ b/Master/bin/i386-netbsd/pk2bm
diff --git a/Master/bin/i386-netbsd/pktogf b/Master/bin/i386-netbsd/pktogf
index 3f3ed4d49e8..033a260c2b1 100755
--- a/Master/bin/i386-netbsd/pktogf
+++ b/Master/bin/i386-netbsd/pktogf
diff --git a/Master/bin/i386-netbsd/pktype b/Master/bin/i386-netbsd/pktype
index d7e376582e5..7c6238ac877 100755
--- a/Master/bin/i386-netbsd/pktype
+++ b/Master/bin/i386-netbsd/pktype
diff --git a/Master/bin/i386-netbsd/platex b/Master/bin/i386-netbsd/platex
new file mode 120000
index 00000000000..43a4f13c2a2
--- /dev/null
+++ b/Master/bin/i386-netbsd/platex
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/pltotf b/Master/bin/i386-netbsd/pltotf
index 67d9e39a419..76a5d74c53a 100755
--- a/Master/bin/i386-netbsd/pltotf
+++ b/Master/bin/i386-netbsd/pltotf
diff --git a/Master/bin/i386-netbsd/pooltype b/Master/bin/i386-netbsd/pooltype
index cb4ed21e682..578454daa98 100755
--- a/Master/bin/i386-netbsd/pooltype
+++ b/Master/bin/i386-netbsd/pooltype
diff --git a/Master/bin/i386-netbsd/ppltotf b/Master/bin/i386-netbsd/ppltotf
new file mode 100755
index 00000000000..8ef3a0a69e4
--- /dev/null
+++ b/Master/bin/i386-netbsd/ppltotf
diff --git a/Master/bin/i386-netbsd/ps2pk b/Master/bin/i386-netbsd/ps2pk
index 074e6ad0eba..0142f31e029 100755
--- a/Master/bin/i386-netbsd/ps2pk
+++ b/Master/bin/i386-netbsd/ps2pk
diff --git a/Master/bin/i386-netbsd/psnup b/Master/bin/i386-netbsd/psnup
index 660156e86e1..5255fb4b4eb 100755
--- a/Master/bin/i386-netbsd/psnup
+++ b/Master/bin/i386-netbsd/psnup
diff --git a/Master/bin/i386-netbsd/psresize b/Master/bin/i386-netbsd/psresize
index 3d4fb223433..4f92e16de28 100755
--- a/Master/bin/i386-netbsd/psresize
+++ b/Master/bin/i386-netbsd/psresize
diff --git a/Master/bin/i386-netbsd/pstops b/Master/bin/i386-netbsd/pstops
index a6156cd17a6..21869ffc857 100755
--- a/Master/bin/i386-netbsd/pstops
+++ b/Master/bin/i386-netbsd/pstops
diff --git a/Master/bin/i386-netbsd/ptex b/Master/bin/i386-netbsd/ptex
new file mode 100755
index 00000000000..56b1dcf14f2
--- /dev/null
+++ b/Master/bin/i386-netbsd/ptex
diff --git a/Master/bin/i386-netbsd/ptftopl b/Master/bin/i386-netbsd/ptftopl
new file mode 100755
index 00000000000..4dfd9e076cb
--- /dev/null
+++ b/Master/bin/i386-netbsd/ptftopl
diff --git a/Master/bin/i386-netbsd/repstopdf b/Master/bin/i386-netbsd/repstopdf
new file mode 120000
index 00000000000..859052f5166
--- /dev/null
+++ b/Master/bin/i386-netbsd/repstopdf
@@ -0,0 +1 @@
+epstopdf
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/rlxtools b/Master/bin/i386-netbsd/rlxtools
index a5078af4f10..6bdf3919d46 120000
--- a/Master/bin/i386-netbsd/rlxtools
+++ b/Master/bin/i386-netbsd/rlxtools
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs/unix/rlxtools
\ No newline at end of file
+../../texmf-dist/scripts/context/rlxtools
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/synctex b/Master/bin/i386-netbsd/synctex
index 6970d032f00..6d3e03b286f 100755
--- a/Master/bin/i386-netbsd/synctex
+++ b/Master/bin/i386-netbsd/synctex
diff --git a/Master/bin/i386-netbsd/t1ascii b/Master/bin/i386-netbsd/t1ascii
index e351c0fc8e9..e9e23bd174e 100755
--- a/Master/bin/i386-netbsd/t1ascii
+++ b/Master/bin/i386-netbsd/t1ascii
diff --git a/Master/bin/i386-netbsd/t1asm b/Master/bin/i386-netbsd/t1asm
index 370268f4157..484943a5cdb 100755
--- a/Master/bin/i386-netbsd/t1asm
+++ b/Master/bin/i386-netbsd/t1asm
diff --git a/Master/bin/i386-netbsd/t1binary b/Master/bin/i386-netbsd/t1binary
index d7a8fb42ef3..627cf7b8812 100755
--- a/Master/bin/i386-netbsd/t1binary
+++ b/Master/bin/i386-netbsd/t1binary
diff --git a/Master/bin/i386-netbsd/t1disasm b/Master/bin/i386-netbsd/t1disasm
index 35b5977ba17..a4a0e6d2084 100755
--- a/Master/bin/i386-netbsd/t1disasm
+++ b/Master/bin/i386-netbsd/t1disasm
diff --git a/Master/bin/i386-netbsd/t1dotlessj b/Master/bin/i386-netbsd/t1dotlessj
index e25d2d3f6bc..c42a0345f35 100755
--- a/Master/bin/i386-netbsd/t1dotlessj
+++ b/Master/bin/i386-netbsd/t1dotlessj
diff --git a/Master/bin/i386-netbsd/t1lint b/Master/bin/i386-netbsd/t1lint
index f3b628176a7..4b732f94db3 100755
--- a/Master/bin/i386-netbsd/t1lint
+++ b/Master/bin/i386-netbsd/t1lint
diff --git a/Master/bin/i386-netbsd/t1mac b/Master/bin/i386-netbsd/t1mac
index 10b07590871..b2a1ae4b9f6 100755
--- a/Master/bin/i386-netbsd/t1mac
+++ b/Master/bin/i386-netbsd/t1mac
diff --git a/Master/bin/i386-netbsd/t1rawafm b/Master/bin/i386-netbsd/t1rawafm
index 022f0e748fe..a63a57184b8 100755
--- a/Master/bin/i386-netbsd/t1rawafm
+++ b/Master/bin/i386-netbsd/t1rawafm
diff --git a/Master/bin/i386-netbsd/t1reencode b/Master/bin/i386-netbsd/t1reencode
index dca65479c3f..9cdbd283902 100755
--- a/Master/bin/i386-netbsd/t1reencode
+++ b/Master/bin/i386-netbsd/t1reencode
diff --git a/Master/bin/i386-netbsd/t1testpage b/Master/bin/i386-netbsd/t1testpage
index 15b269896d8..46bd6af6504 100755
--- a/Master/bin/i386-netbsd/t1testpage
+++ b/Master/bin/i386-netbsd/t1testpage
diff --git a/Master/bin/i386-netbsd/t1unmac b/Master/bin/i386-netbsd/t1unmac
index c975c97495f..a624fd008f3 100755
--- a/Master/bin/i386-netbsd/t1unmac
+++ b/Master/bin/i386-netbsd/t1unmac
diff --git a/Master/bin/i386-netbsd/t4ht b/Master/bin/i386-netbsd/t4ht
index c8a7ea6bb96..7554ef9b296 100755
--- a/Master/bin/i386-netbsd/t4ht
+++ b/Master/bin/i386-netbsd/t4ht
diff --git a/Master/bin/i386-netbsd/tangle b/Master/bin/i386-netbsd/tangle
index f5f4b37a7ce..2467c9b2213 100755
--- a/Master/bin/i386-netbsd/tangle
+++ b/Master/bin/i386-netbsd/tangle
diff --git a/Master/bin/i386-netbsd/tcdialog b/Master/bin/i386-netbsd/tcdialog
index 530bce57c68..ffcb2953afc 100755
--- a/Master/bin/i386-netbsd/tcdialog
+++ b/Master/bin/i386-netbsd/tcdialog
diff --git a/Master/bin/i386-netbsd/teckit_compile b/Master/bin/i386-netbsd/teckit_compile
index c43bf79c9b4..1abc46c4953 100755
--- a/Master/bin/i386-netbsd/teckit_compile
+++ b/Master/bin/i386-netbsd/teckit_compile
diff --git a/Master/bin/i386-netbsd/tex b/Master/bin/i386-netbsd/tex
index cce5ace9914..b7c410a2236 100755
--- a/Master/bin/i386-netbsd/tex
+++ b/Master/bin/i386-netbsd/tex
diff --git a/Master/bin/i386-netbsd/tex2xindy b/Master/bin/i386-netbsd/tex2xindy
index 2e6e0f6fc74..9d149871031 100755
--- a/Master/bin/i386-netbsd/tex2xindy
+++ b/Master/bin/i386-netbsd/tex2xindy
diff --git a/Master/bin/i386-netbsd/tex4ht b/Master/bin/i386-netbsd/tex4ht
index 1bf74b1a679..71c0db50fbb 100755
--- a/Master/bin/i386-netbsd/tex4ht
+++ b/Master/bin/i386-netbsd/tex4ht
diff --git a/Master/bin/i386-netbsd/texconfig b/Master/bin/i386-netbsd/texconfig
index fe0927136e0..f37b30b1283 100755
--- a/Master/bin/i386-netbsd/texconfig
+++ b/Master/bin/i386-netbsd/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-netbsd/texexec b/Master/bin/i386-netbsd/texexec
index 36d22caefe7..ef21d649cd4 120000
--- a/Master/bin/i386-netbsd/texexec
+++ b/Master/bin/i386-netbsd/texexec
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs/unix/texexec
\ No newline at end of file
+../../texmf-dist/scripts/context/texexec
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texlinks b/Master/bin/i386-netbsd/texlinks
index c77ceea60c0..09b3488d263 100755
--- a/Master/bin/i386-netbsd/texlinks
+++ b/Master/bin/i386-netbsd/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-netbsd/texmfstart b/Master/bin/i386-netbsd/texmfstart
index db6dee0a29c..598c06c269b 120000
--- a/Master/bin/i386-netbsd/texmfstart
+++ b/Master/bin/i386-netbsd/texmfstart
@@ -1 +1 @@
-../../texmf-dist/scripts/context/ruby/texmfstart.rb
\ No newline at end of file
+../../texmf-dist/scripts/context/texmfstart
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/tftopl b/Master/bin/i386-netbsd/tftopl
index 5d0f079321d..22bdb6ada27 100755
--- a/Master/bin/i386-netbsd/tftopl
+++ b/Master/bin/i386-netbsd/tftopl
diff --git a/Master/bin/i386-netbsd/tie b/Master/bin/i386-netbsd/tie
index 489e47e3591..3a1fa0f333a 100755
--- a/Master/bin/i386-netbsd/tie
+++ b/Master/bin/i386-netbsd/tie
diff --git a/Master/bin/i386-netbsd/tpic2pdftex b/Master/bin/i386-netbsd/tpic2pdftex
index 70c1a33c7e8..8277e0d3c7b 100755
--- a/Master/bin/i386-netbsd/tpic2pdftex
+++ b/Master/bin/i386-netbsd/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-netbsd/ttf2afm b/Master/bin/i386-netbsd/ttf2afm
index 9df770c11db..b0808999813 100755
--- a/Master/bin/i386-netbsd/ttf2afm
+++ b/Master/bin/i386-netbsd/ttf2afm
diff --git a/Master/bin/i386-netbsd/ttf2pk b/Master/bin/i386-netbsd/ttf2pk
index e560722c895..dacba69402c 100755
--- a/Master/bin/i386-netbsd/ttf2pk
+++ b/Master/bin/i386-netbsd/ttf2pk
diff --git a/Master/bin/i386-netbsd/ttf2tfm b/Master/bin/i386-netbsd/ttf2tfm
index 755f47250a6..14d844fae43 100755
--- a/Master/bin/i386-netbsd/ttf2tfm
+++ b/Master/bin/i386-netbsd/ttf2tfm
diff --git a/Master/bin/i386-netbsd/ttfdump b/Master/bin/i386-netbsd/ttfdump
index 1c64992b345..004157e60d8 100755
--- a/Master/bin/i386-netbsd/ttfdump
+++ b/Master/bin/i386-netbsd/ttfdump
diff --git a/Master/bin/i386-netbsd/ttftotype42 b/Master/bin/i386-netbsd/ttftotype42
index 3ca1b75e737..58cb3f82637 100755
--- a/Master/bin/i386-netbsd/ttftotype42
+++ b/Master/bin/i386-netbsd/ttftotype42
diff --git a/Master/bin/i386-netbsd/updmap b/Master/bin/i386-netbsd/updmap
index 723bde70a02..2483052a7de 100755
--- a/Master/bin/i386-netbsd/updmap
+++ b/Master/bin/i386-netbsd/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-netbsd/vftovp b/Master/bin/i386-netbsd/vftovp
index 355180033ca..2adbd2351a4 100755
--- a/Master/bin/i386-netbsd/vftovp
+++ b/Master/bin/i386-netbsd/vftovp
diff --git a/Master/bin/i386-netbsd/vlna b/Master/bin/i386-netbsd/vlna
index b9a54e26e37..cd2f662ce6a 100755
--- a/Master/bin/i386-netbsd/vlna
+++ b/Master/bin/i386-netbsd/vlna
diff --git a/Master/bin/i386-netbsd/vptovf b/Master/bin/i386-netbsd/vptovf
index 9a1da214534..fcb28c38f23 100755
--- a/Master/bin/i386-netbsd/vptovf
+++ b/Master/bin/i386-netbsd/vptovf
diff --git a/Master/bin/i386-netbsd/weave b/Master/bin/i386-netbsd/weave
index d9c9e0cf1fd..be4775d8526 100755
--- a/Master/bin/i386-netbsd/weave
+++ b/Master/bin/i386-netbsd/weave
diff --git a/Master/bin/i386-netbsd/xdvi-xaw b/Master/bin/i386-netbsd/xdvi-xaw
index 273f54496fa..4df3f817d82 100755
--- a/Master/bin/i386-netbsd/xdvi-xaw
+++ b/Master/bin/i386-netbsd/xdvi-xaw
diff --git a/Master/bin/i386-netbsd/xdvipdfmx b/Master/bin/i386-netbsd/xdvipdfmx
index 6bc4dd15b7a..d3496b51973 100755
--- a/Master/bin/i386-netbsd/xdvipdfmx
+++ b/Master/bin/i386-netbsd/xdvipdfmx
diff --git a/Master/bin/i386-netbsd/xetex b/Master/bin/i386-netbsd/xetex
index 24fc30e4713..1c43e708d27 100755
--- a/Master/bin/i386-netbsd/xetex
+++ b/Master/bin/i386-netbsd/xetex
diff --git a/Master/bin/i386-netbsd/xindy.mem b/Master/bin/i386-netbsd/xindy.mem
index 8645843bbb5..ebf7ed02682 100755
--- a/Master/bin/i386-netbsd/xindy.mem
+++ b/Master/bin/i386-netbsd/xindy.mem
diff --git a/Master/bin/i386-netbsd/xindy.run b/Master/bin/i386-netbsd/xindy.run
index 53df276de7e..ae207ea8ab6 100755
--- a/Master/bin/i386-netbsd/xindy.run
+++ b/Master/bin/i386-netbsd/xindy.run
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 5a029b99108..7749df3b853 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -129,7 +129,7 @@ for tlname in $tlnames; do
     default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;;
    i386-netbsd)
     default_bin_loc=$download_loc
-    $grab http://salmi.ch/~jukka/TL/TL2009bin_i386-netbsd.tgz;;
+    $grab http://salmi.ch/~jukka/TL/TL2010bin_i386-netbsd.tgz;;
    i386-openbsd)
     default_bin_loc=$download_loc
     $grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;;