148 files changed, 11 insertions, 7 deletions

diff --git a/Master/bin/i386-netbsd/afm2pl b/Master/bin/i386-netbsd/afm2pl
index 7ecf3af8cdf..d7babb5dd6b 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 998776b1d8c..ede1ae80f46 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 0eadf07845c..14db8c6d9a4 100755
--- a/Master/bin/i386-netbsd/aleph
+++ b/Master/bin/i386-netbsd/aleph
diff --git a/Master/bin/i386-netbsd/bbox b/Master/bin/i386-netbsd/bbox
index e956014b856..0185fed20f9 100755
--- a/Master/bin/i386-netbsd/bbox
+++ b/Master/bin/i386-netbsd/bbox
diff --git a/Master/bin/i386-netbsd/bg5conv b/Master/bin/i386-netbsd/bg5conv
index 1674c844b74..7fe448f40e1 100755
--- a/Master/bin/i386-netbsd/bg5conv
+++ b/Master/bin/i386-netbsd/bg5conv
diff --git a/Master/bin/i386-netbsd/bibtex b/Master/bin/i386-netbsd/bibtex
index 7054266ae5f..c51cee2592e 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 32bbeb7e35b..841ff8f65d3 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
index ac60e98517d..dec0d8ad670 100755
--- a/Master/bin/i386-netbsd/bibtexu
+++ b/Master/bin/i386-netbsd/bibtexu
diff --git a/Master/bin/i386-netbsd/cef5conv b/Master/bin/i386-netbsd/cef5conv
index ddc5b51a405..2a7412b90bf 100755
--- a/Master/bin/i386-netbsd/cef5conv
+++ b/Master/bin/i386-netbsd/cef5conv
diff --git a/Master/bin/i386-netbsd/cefconv b/Master/bin/i386-netbsd/cefconv
index 0cc510b012d..7381c122b62 100755
--- a/Master/bin/i386-netbsd/cefconv
+++ b/Master/bin/i386-netbsd/cefconv
diff --git a/Master/bin/i386-netbsd/cefsconv b/Master/bin/i386-netbsd/cefsconv
index eff84a70e66..ac6e3c152c1 100755
--- a/Master/bin/i386-netbsd/cefsconv
+++ b/Master/bin/i386-netbsd/cefsconv
diff --git a/Master/bin/i386-netbsd/cfftot1 b/Master/bin/i386-netbsd/cfftot1
index 52a6db2de10..97d6eba39cb 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
index d6bc183d45d..cd4f94a0d37 100755
--- a/Master/bin/i386-netbsd/chktex
+++ b/Master/bin/i386-netbsd/chktex
diff --git a/Master/bin/i386-netbsd/ctangle b/Master/bin/i386-netbsd/ctangle
index 08dbad0d645..1cbbaa90974 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 8dd112d5fb2..bd7001f8788 100755
--- a/Master/bin/i386-netbsd/ctie
+++ b/Master/bin/i386-netbsd/ctie
diff --git a/Master/bin/i386-netbsd/cweave b/Master/bin/i386-netbsd/cweave
index f666b5fdc93..90ac527dbcb 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 00d5686d332..5f4fd6b8316 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 d549d5c4abe..f37a235cec1 100755
--- a/Master/bin/i386-netbsd/devnag
+++ b/Master/bin/i386-netbsd/devnag
diff --git a/Master/bin/i386-netbsd/disdvi b/Master/bin/i386-netbsd/disdvi
index efadaf71389..89b675e9d0d 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 a80c57988b4..474829cb51d 100755
--- a/Master/bin/i386-netbsd/dt2dv
+++ b/Master/bin/i386-netbsd/dt2dv
diff --git a/Master/bin/i386-netbsd/dv2dt b/Master/bin/i386-netbsd/dv2dt
index 75813276f35..cc5408e9d01 100755
--- a/Master/bin/i386-netbsd/dv2dt
+++ b/Master/bin/i386-netbsd/dv2dt
diff --git a/Master/bin/i386-netbsd/dvi2tty b/Master/bin/i386-netbsd/dvi2tty
index cc472f872f5..639f267504a 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 00e170edac0..a9e6375194e 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 330fd25b20b..e1d30883a7d 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 c152f1e4fcb..e56b450273d 100755
--- a/Master/bin/i386-netbsd/dvicopy
+++ b/Master/bin/i386-netbsd/dvicopy
diff --git a/Master/bin/i386-netbsd/dvidvi b/Master/bin/i386-netbsd/dvidvi
index 2b146e2744a..da4ad677786 100755
--- a/Master/bin/i386-netbsd/dvidvi
+++ b/Master/bin/i386-netbsd/dvidvi
diff --git a/Master/bin/i386-netbsd/dvilj b/Master/bin/i386-netbsd/dvilj
index a6235f135a5..2ee207c27cc 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 f45dc2c9b26..877482a7eb9 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 067a540d92c..6718ef51061 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 e0de06d2a1c..9bd1f04f665 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 cb6157ae1dc..b1c799b858a 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 dc69915e9ff..21af78c8a34 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 f3dd59ad936..e562362a967 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 3c041765ba7..d3e535d0ef6 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 13b1b2316fa..9c6a1101794 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
index 6f41d6587e1..1fea255cce1 100755
--- a/Master/bin/i386-netbsd/dvisvgm
+++ b/Master/bin/i386-netbsd/dvisvgm
diff --git a/Master/bin/i386-netbsd/dvitodvi b/Master/bin/i386-netbsd/dvitodvi
index 2615ee0056c..b3c6e28f49d 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 6e93d6b7f18..aa84fabe2aa 100755
--- a/Master/bin/i386-netbsd/dvitype
+++ b/Master/bin/i386-netbsd/dvitype
diff --git a/Master/bin/i386-netbsd/epsffit b/Master/bin/i386-netbsd/epsffit
index 78792fd009d..28b43f0ec44 100755
--- a/Master/bin/i386-netbsd/epsffit
+++ b/Master/bin/i386-netbsd/epsffit
diff --git a/Master/bin/i386-netbsd/eptex b/Master/bin/i386-netbsd/eptex
index 5111a4ca05c..8719d79184a 100755
--- a/Master/bin/i386-netbsd/eptex
+++ b/Master/bin/i386-netbsd/eptex
diff --git a/Master/bin/i386-netbsd/euptex b/Master/bin/i386-netbsd/euptex
index f24039d5482..627de09b9c6 100755
--- a/Master/bin/i386-netbsd/euptex
+++ b/Master/bin/i386-netbsd/euptex
diff --git a/Master/bin/i386-netbsd/extconv b/Master/bin/i386-netbsd/extconv
index 1757c4908a7..23047e8fa83 100755
--- a/Master/bin/i386-netbsd/extconv
+++ b/Master/bin/i386-netbsd/extconv
diff --git a/Master/bin/i386-netbsd/gftodvi b/Master/bin/i386-netbsd/gftodvi
index b919017719c..9b5a2654610 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 80b1bf37899..b31226399cc 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 efca9a8b4f6..e813bf21d40 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 03be657fb96..aa465b30002 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 8f98b5fd3a0..99e33940d0c 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 78d78c345df..168275159a3 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 6b9eda9c1f1..58d089ca66d 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 267d01719b4..110ef6a9219 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 57d0a234119..e9d4d21cade 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 8d515217d2d..a5938330e39 100755
--- a/Master/bin/i386-netbsd/lacheck
+++ b/Master/bin/i386-netbsd/lacheck
diff --git a/Master/bin/i386-netbsd/luajittex b/Master/bin/i386-netbsd/luajittex
new file mode 100755
index 00000000000..e8606873ee4
--- /dev/null
+++ b/Master/bin/i386-netbsd/luajittex
diff --git a/Master/bin/i386-netbsd/luatex b/Master/bin/i386-netbsd/luatex
index 18e4a92e38c..37155355d96 100755
--- a/Master/bin/i386-netbsd/luatex
+++ b/Master/bin/i386-netbsd/luatex
diff --git a/Master/bin/i386-netbsd/mag b/Master/bin/i386-netbsd/mag
index 36122d25fa6..9181e27fcd6 100755
--- a/Master/bin/i386-netbsd/mag
+++ b/Master/bin/i386-netbsd/mag
diff --git a/Master/bin/i386-netbsd/makeindex b/Master/bin/i386-netbsd/makeindex
index 137f476d6fa..3531562736b 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
index 56f177f8a0e..ccff18c0f14 100755
--- a/Master/bin/i386-netbsd/makejvf
+++ b/Master/bin/i386-netbsd/makejvf
diff --git a/Master/bin/i386-netbsd/mendex b/Master/bin/i386-netbsd/mendex
index a9561610b55..0c45b2a1ef4 100755
--- a/Master/bin/i386-netbsd/mendex
+++ b/Master/bin/i386-netbsd/mendex
diff --git a/Master/bin/i386-netbsd/mf b/Master/bin/i386-netbsd/mf
index be2f56ed1de..0b51ccea7df 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 66b6bbccc1f..803d99705df 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 90b73c93665..0957a64663e 100755
--- a/Master/bin/i386-netbsd/mft
+++ b/Master/bin/i386-netbsd/mft
diff --git a/Master/bin/i386-netbsd/mktexlsr b/Master/bin/i386-netbsd/mktexlsr
index 7253d2693d2..abb5d05b349 100755
--- a/Master/bin/i386-netbsd/mktexlsr
+++ b/Master/bin/i386-netbsd/mktexlsr
@@ -11,7 +11,7 @@
 # <te@dbs.uni-hannover.de>, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 23151 2011-06-27 22:27:02Z karl $'
+version='$Id: mktexlsr 31723 2013-09-21 22:43:41Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [OPTION]... [DIR]...
 
@@ -185,7 +185,7 @@ for TEXMFLS_R in "$@"; do
   db_file_tmp="$db_dir_tmp/lsR$$.tmp"
   rm -f "$db_file_tmp"
 
-  $verbose && echo "$progname: Updating $db_file... " >&2
+  $verbose && echo "$progname: Updating $db_file... "
   $dry_run && continue
   
   echo "$ls_R_magic" >"$db_file_tmp"
@@ -213,5 +213,6 @@ for TEXMFLS_R in "$@"; do
   mv "$db_file_tmp" "$db_file"
   rm -rf "$db_dir_tmp"
 done
-$verbose && echo "$progname: Done." >&2
+
+$verbose && echo "$progname: Done."
 exit 0
diff --git a/Master/bin/i386-netbsd/mmafm b/Master/bin/i386-netbsd/mmafm
index 4a1aefcc04d..adbc89dbf44 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 a7d14b48526..81eb79ac059 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 d8a652182d8..333a9fd2f65 100755
--- a/Master/bin/i386-netbsd/mpost
+++ b/Master/bin/i386-netbsd/mpost
diff --git a/Master/bin/i386-netbsd/odvicopy b/Master/bin/i386-netbsd/odvicopy
index c2c8b5ba98d..4d170dd6fa9 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 e2fdae37c28..f8282b0a3b7 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 ef0d266ef61..0f01bd7d5f0 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 25ec634e0c4..0918e73ab1e 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 bc5ffd6ff80..4df81c15dca 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 24a56ed0164..852a398f40c 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 500bc95218c..110bcc4154c 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 41cf0b4a73a..18cb244df0f 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 44aac1662f7..b392fb79fc3 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
index 9d1f6c00be5..e4e99ae2371 100755
--- a/Master/bin/i386-netbsd/pbibtex
+++ b/Master/bin/i386-netbsd/pbibtex
diff --git a/Master/bin/i386-netbsd/pdfclose b/Master/bin/i386-netbsd/pdfclose
index 3629a3a4e7c..61a1a30f404 100755
--- a/Master/bin/i386-netbsd/pdfclose
+++ b/Master/bin/i386-netbsd/pdfclose
diff --git a/Master/bin/i386-netbsd/pdfcsplain b/Master/bin/i386-netbsd/pdfcsplain
index f68cc91498e..8d727021583 120000
--- a/Master/bin/i386-netbsd/pdfcsplain
+++ b/Master/bin/i386-netbsd/pdfcsplain
@@ -1 +1 @@
-pdftex
\ No newline at end of file
+luatex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/pdfopen b/Master/bin/i386-netbsd/pdfopen
index 067ec52f19b..5cceea350e9 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 0f6525d25f7..52aedc0a586 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 76cfe8d1606..8a0657b9e08 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
index 24605b24f0d..9f0e85cce42 100755
--- a/Master/bin/i386-netbsd/pdvitype
+++ b/Master/bin/i386-netbsd/pdvitype
diff --git a/Master/bin/i386-netbsd/pfb2pfa b/Master/bin/i386-netbsd/pfb2pfa
index ba58f63096d..9deb7f16ce8 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 0eb836335e5..4a913cb037e 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 f05957e9455..fdb1a009938 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 488a6afd39a..c1060abf80f 100755
--- a/Master/bin/i386-netbsd/pktype
+++ b/Master/bin/i386-netbsd/pktype
diff --git a/Master/bin/i386-netbsd/pltotf b/Master/bin/i386-netbsd/pltotf
index 5cd5ea8ddb2..4ef3a1fd6ca 100755
--- a/Master/bin/i386-netbsd/pltotf
+++ b/Master/bin/i386-netbsd/pltotf
diff --git a/Master/bin/i386-netbsd/pmxab b/Master/bin/i386-netbsd/pmxab
index 5bb8f6d6358..ba1a80705cd 100755
--- a/Master/bin/i386-netbsd/pmxab
+++ b/Master/bin/i386-netbsd/pmxab
diff --git a/Master/bin/i386-netbsd/pooltype b/Master/bin/i386-netbsd/pooltype
index 3e3335c2dd8..69c2f961c27 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
index 129ca91fe48..c718836d74a 100755
--- a/Master/bin/i386-netbsd/ppltotf
+++ b/Master/bin/i386-netbsd/ppltotf
diff --git a/Master/bin/i386-netbsd/prepmx b/Master/bin/i386-netbsd/prepmx
index 1dc12af3acf..322937ff8e9 100755
--- a/Master/bin/i386-netbsd/prepmx
+++ b/Master/bin/i386-netbsd/prepmx
diff --git a/Master/bin/i386-netbsd/ps2pk b/Master/bin/i386-netbsd/ps2pk
index 4e9289eebcc..cc544a59f69 100755
--- a/Master/bin/i386-netbsd/ps2pk
+++ b/Master/bin/i386-netbsd/ps2pk
diff --git a/Master/bin/i386-netbsd/psbook b/Master/bin/i386-netbsd/psbook
index 039d582e35a..52939906b64 100755
--- a/Master/bin/i386-netbsd/psbook
+++ b/Master/bin/i386-netbsd/psbook
diff --git a/Master/bin/i386-netbsd/psjoin b/Master/bin/i386-netbsd/psjoin
new file mode 120000
index 00000000000..3e35267270e
--- /dev/null
+++ b/Master/bin/i386-netbsd/psjoin
@@ -0,0 +1 @@
+../../texmf-dist/scripts/psutils/psjoin.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/psnup b/Master/bin/i386-netbsd/psnup
index 336679d9cfd..2febbec1a41 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 120a86b5730..46233bc3552 100755
--- a/Master/bin/i386-netbsd/psresize
+++ b/Master/bin/i386-netbsd/psresize
diff --git a/Master/bin/i386-netbsd/psselect b/Master/bin/i386-netbsd/psselect
index 791d4fef00e..68364020efa 100755
--- a/Master/bin/i386-netbsd/psselect
+++ b/Master/bin/i386-netbsd/psselect
diff --git a/Master/bin/i386-netbsd/pstops b/Master/bin/i386-netbsd/pstops
index ef42a7162e1..367c714a71f 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
index 66619bcc555..edfe85fd0ee 100755
--- a/Master/bin/i386-netbsd/ptex
+++ b/Master/bin/i386-netbsd/ptex
diff --git a/Master/bin/i386-netbsd/ptftopl b/Master/bin/i386-netbsd/ptftopl
index b1a74d2d180..1953556e970 100755
--- a/Master/bin/i386-netbsd/ptftopl
+++ b/Master/bin/i386-netbsd/ptftopl
diff --git a/Master/bin/i386-netbsd/scor2prt b/Master/bin/i386-netbsd/scor2prt
index cc62cc73d96..01b5446f565 100755
--- a/Master/bin/i386-netbsd/scor2prt
+++ b/Master/bin/i386-netbsd/scor2prt
diff --git a/Master/bin/i386-netbsd/sjisconv b/Master/bin/i386-netbsd/sjisconv
index 41475bfc012..2a7ffad690d 100755
--- a/Master/bin/i386-netbsd/sjisconv
+++ b/Master/bin/i386-netbsd/sjisconv
diff --git a/Master/bin/i386-netbsd/synctex b/Master/bin/i386-netbsd/synctex
index faf9db62788..c7f026b9ab1 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 028a5931de8..c6abc6205c8 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 9a0e155d8ab..82cbb9660ea 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 267cac3ce61..c2d51470cc7 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 f5ed2837260..f774b1b185d 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 a1752699484..36ed73313d6 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 0ffe5f77a05..47f11fef135 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 127e3b63274..83c2a796108 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 ed6010c2e8f..7d56180c994 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 01842b6af92..6f27dfcebdf 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 ab639754fd9..9abbb22f8ca 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 c05630eb448..988e9c3cc97 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 f72bfdaf771..720b479482f 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 6811f5b8e45..4e8a7f0aca3 100755
--- a/Master/bin/i386-netbsd/tangle
+++ b/Master/bin/i386-netbsd/tangle
diff --git a/Master/bin/i386-netbsd/teckit_compile b/Master/bin/i386-netbsd/teckit_compile
index 69d464fa3b0..c4c22ad80f2 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 3b40956a6e4..d599f61834b 100755
--- a/Master/bin/i386-netbsd/tex
+++ b/Master/bin/i386-netbsd/tex
diff --git a/Master/bin/i386-netbsd/tex4ht b/Master/bin/i386-netbsd/tex4ht
index 26a5fa5f824..cbef6910260 100755
--- a/Master/bin/i386-netbsd/tex4ht
+++ b/Master/bin/i386-netbsd/tex4ht
diff --git a/Master/bin/i386-netbsd/texluajit b/Master/bin/i386-netbsd/texluajit
new file mode 120000
index 00000000000..bddee6e38c5
--- /dev/null
+++ b/Master/bin/i386-netbsd/texluajit
@@ -0,0 +1 @@
+luajittex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/texluajitc b/Master/bin/i386-netbsd/texluajitc
new file mode 120000
index 00000000000..bddee6e38c5
--- /dev/null
+++ b/Master/bin/i386-netbsd/texluajitc
@@ -0,0 +1 @@
+luajittex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/tftopl b/Master/bin/i386-netbsd/tftopl
index 9f5ce5fe6c7..1dccfe4ed8b 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 c3b1bf2fa97..70b06bc2240 100755
--- a/Master/bin/i386-netbsd/tie
+++ b/Master/bin/i386-netbsd/tie
diff --git a/Master/bin/i386-netbsd/ttf2afm b/Master/bin/i386-netbsd/ttf2afm
index 8b44f5fae78..fea9b5c2a49 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 b721c66cbdf..cab1ab7c7c8 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 2a04c3e1366..02219e9c6e5 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 d961287fdab..384c874dbcd 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 605397865ce..ce5413ccb8d 100755
--- a/Master/bin/i386-netbsd/ttftotype42
+++ b/Master/bin/i386-netbsd/ttftotype42
diff --git a/Master/bin/i386-netbsd/upbibtex b/Master/bin/i386-netbsd/upbibtex
index 8ab3977d2a9..ee3dec8c861 100755
--- a/Master/bin/i386-netbsd/upbibtex
+++ b/Master/bin/i386-netbsd/upbibtex
diff --git a/Master/bin/i386-netbsd/updvitype b/Master/bin/i386-netbsd/updvitype
index 36f19587bd9..c2c9e691b1b 100755
--- a/Master/bin/i386-netbsd/updvitype
+++ b/Master/bin/i386-netbsd/updvitype
diff --git a/Master/bin/i386-netbsd/uppltotf b/Master/bin/i386-netbsd/uppltotf
index 6116b94dd69..4bcf2379233 100755
--- a/Master/bin/i386-netbsd/uppltotf
+++ b/Master/bin/i386-netbsd/uppltotf
diff --git a/Master/bin/i386-netbsd/uptex b/Master/bin/i386-netbsd/uptex
index 215bd02545f..f4a6e828b45 100755
--- a/Master/bin/i386-netbsd/uptex
+++ b/Master/bin/i386-netbsd/uptex
diff --git a/Master/bin/i386-netbsd/uptftopl b/Master/bin/i386-netbsd/uptftopl
index ac727ccddbe..fe669ec161c 100755
--- a/Master/bin/i386-netbsd/uptftopl
+++ b/Master/bin/i386-netbsd/uptftopl
diff --git a/Master/bin/i386-netbsd/vftovp b/Master/bin/i386-netbsd/vftovp
index 4c94b35776c..312a1937df5 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 4c8130f91ad..062e01cc4d8 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 890b81f60ee..bcdca21d0f8 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 661631570de..244601a3f5c 100755
--- a/Master/bin/i386-netbsd/weave
+++ b/Master/bin/i386-netbsd/weave
diff --git a/Master/bin/i386-netbsd/wofm2opl b/Master/bin/i386-netbsd/wofm2opl
new file mode 100755
index 00000000000..3d5c13746d1
--- /dev/null
+++ b/Master/bin/i386-netbsd/wofm2opl
diff --git a/Master/bin/i386-netbsd/wopl2ofm b/Master/bin/i386-netbsd/wopl2ofm
new file mode 100755
index 00000000000..a8a3381ac2d
--- /dev/null
+++ b/Master/bin/i386-netbsd/wopl2ofm
diff --git a/Master/bin/i386-netbsd/wovf2ovp b/Master/bin/i386-netbsd/wovf2ovp
new file mode 100755
index 00000000000..ff8ae4428a5
--- /dev/null
+++ b/Master/bin/i386-netbsd/wovf2ovp
diff --git a/Master/bin/i386-netbsd/wovp2ovf b/Master/bin/i386-netbsd/wovp2ovf
index 4a639832363..82ac017cdb3 100755
--- a/Master/bin/i386-netbsd/wovp2ovf
+++ b/Master/bin/i386-netbsd/wovp2ovf
diff --git a/Master/bin/i386-netbsd/xdvi-xaw b/Master/bin/i386-netbsd/xdvi-xaw
index 52b6f806be6..d21b15e772d 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 9ce20012ae9..e0fb334544e 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 71d91bdd247..1d49fc0e935 100755
--- a/Master/bin/i386-netbsd/xetex
+++ b/Master/bin/i386-netbsd/xetex
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 33d4e7f250c..48a55eac659 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -114,7 +114,7 @@ for tlname in $tlnames; do
     download_loc=$tmpdir/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
-    $grab http://www.babafou.eu.org/texlive-netbsd/x86_64-unknown-netbsd6.1.3.tar.xz;;
+    $grab http://www.babafou.eu.org/texlive-netbsd/x86_64-netbsd.tar.xz;;
    armel-linux)
     download_loc=$tmpdir/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
@@ -147,7 +147,7 @@ for tlname in $tlnames; do
     download_loc=$tmpdir/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
-    $grab http://www.babafou.eu.org/texlive-netbsd/i386-unknown-netbsdelf6.0.1.tar.xz;;
+    $grab http://www.babafou.eu.org/texlive-netbsd/i386-netbsd.tar.xz;;
    i386-openbsd)
     default_bin_loc=$download_loc
     $grab http://students.dec.bmth.ac.uk/ebarrett/files/tl-bin-20080810.tgz;;
diff --git a/Master/tlpkg/installer/wget/wget.i386-netbsd b/Master/tlpkg/installer/wget/wget.i386-netbsd
index d3485e82cc9..934c920704c 100755
--- a/Master/tlpkg/installer/wget/wget.i386-netbsd
+++ b/Master/tlpkg/installer/wget/wget.i386-netbsd
diff --git a/Master/tlpkg/installer/xz/xz.i386-netbsd b/Master/tlpkg/installer/xz/xz.i386-netbsd
index 35f523e1cf5..9bcdc244c9e 100755
--- a/Master/tlpkg/installer/xz/xz.i386-netbsd
+++ b/Master/tlpkg/installer/xz/xz.i386-netbsd
diff --git a/Master/tlpkg/installer/xz/xzdec.i386-netbsd b/Master/tlpkg/installer/xz/xzdec.i386-netbsd
index 39254a85300..724ae848f6d 100755
--- a/Master/tlpkg/installer/xz/xzdec.i386-netbsd
+++ b/Master/tlpkg/installer/xz/xzdec.i386-netbsd
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index a9a77e1f1d6..f44ca46525c 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -28,7 +28,7 @@ binpattern f bin/${ARCH}/texluac
 binpattern f bin/win32/lua*.dll
 
 tlpsetvar no_luajit_platforms \
-  alpha-linux,i386-cygwin,i386-netbsd,mips-irix,mipsel-linux,sparc-solaris
+  alpha-linux,i386-cygwin,mips-irix,mipsel-linux,sparc-solaris
 #
 binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex
 binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajit