148 files changed, 13 insertions, 9 deletions

diff --git a/Master/bin/amd64-netbsd/afm2pl b/Master/bin/amd64-netbsd/afm2pl
index 70e261e7316..7bc26b42e96 100755
--- a/Master/bin/amd64-netbsd/afm2pl
+++ b/Master/bin/amd64-netbsd/afm2pl
diff --git a/Master/bin/amd64-netbsd/afm2tfm b/Master/bin/amd64-netbsd/afm2tfm
index 809fee5dd38..8efadc7fcf5 100755
--- a/Master/bin/amd64-netbsd/afm2tfm
+++ b/Master/bin/amd64-netbsd/afm2tfm
diff --git a/Master/bin/amd64-netbsd/aleph b/Master/bin/amd64-netbsd/aleph
index 37bf319043a..7d89a5c5f2a 100755
--- a/Master/bin/amd64-netbsd/aleph
+++ b/Master/bin/amd64-netbsd/aleph
diff --git a/Master/bin/amd64-netbsd/bbox b/Master/bin/amd64-netbsd/bbox
index 624dfd118c3..dd80900e2c2 100755
--- a/Master/bin/amd64-netbsd/bbox
+++ b/Master/bin/amd64-netbsd/bbox
diff --git a/Master/bin/amd64-netbsd/bg5conv b/Master/bin/amd64-netbsd/bg5conv
index 3018a44858c..e2c61ca92c3 100755
--- a/Master/bin/amd64-netbsd/bg5conv
+++ b/Master/bin/amd64-netbsd/bg5conv
diff --git a/Master/bin/amd64-netbsd/bibtex b/Master/bin/amd64-netbsd/bibtex
index 014d3c3f5ef..672788b189d 100755
--- a/Master/bin/amd64-netbsd/bibtex
+++ b/Master/bin/amd64-netbsd/bibtex
diff --git a/Master/bin/amd64-netbsd/bibtex8 b/Master/bin/amd64-netbsd/bibtex8
index 869f884d466..76a821a98d0 100755
--- a/Master/bin/amd64-netbsd/bibtex8
+++ b/Master/bin/amd64-netbsd/bibtex8
diff --git a/Master/bin/amd64-netbsd/bibtexu b/Master/bin/amd64-netbsd/bibtexu
index 70b131d58cd..8c544966e5f 100755
--- a/Master/bin/amd64-netbsd/bibtexu
+++ b/Master/bin/amd64-netbsd/bibtexu
diff --git a/Master/bin/amd64-netbsd/cef5conv b/Master/bin/amd64-netbsd/cef5conv
index baf67d92136..54009f516d8 100755
--- a/Master/bin/amd64-netbsd/cef5conv
+++ b/Master/bin/amd64-netbsd/cef5conv
diff --git a/Master/bin/amd64-netbsd/cefconv b/Master/bin/amd64-netbsd/cefconv
index 7e95431cd8f..ca85ad5e158 100755
--- a/Master/bin/amd64-netbsd/cefconv
+++ b/Master/bin/amd64-netbsd/cefconv
diff --git a/Master/bin/amd64-netbsd/cefsconv b/Master/bin/amd64-netbsd/cefsconv
index 6796c6845d6..6c8f770b262 100755
--- a/Master/bin/amd64-netbsd/cefsconv
+++ b/Master/bin/amd64-netbsd/cefsconv
diff --git a/Master/bin/amd64-netbsd/cfftot1 b/Master/bin/amd64-netbsd/cfftot1
index c57119f2789..81a019e3be0 100755
--- a/Master/bin/amd64-netbsd/cfftot1
+++ b/Master/bin/amd64-netbsd/cfftot1
diff --git a/Master/bin/amd64-netbsd/chktex b/Master/bin/amd64-netbsd/chktex
index e5b6c046f9c..9882d162798 100755
--- a/Master/bin/amd64-netbsd/chktex
+++ b/Master/bin/amd64-netbsd/chktex
diff --git a/Master/bin/amd64-netbsd/ctangle b/Master/bin/amd64-netbsd/ctangle
index 40e7f46ae16..c01b18bb18f 100755
--- a/Master/bin/amd64-netbsd/ctangle
+++ b/Master/bin/amd64-netbsd/ctangle
diff --git a/Master/bin/amd64-netbsd/ctie b/Master/bin/amd64-netbsd/ctie
index 060b201a625..5ab2369e7e9 100755
--- a/Master/bin/amd64-netbsd/ctie
+++ b/Master/bin/amd64-netbsd/ctie
diff --git a/Master/bin/amd64-netbsd/cweave b/Master/bin/amd64-netbsd/cweave
index 39a02414de0..5f5ed47f4ec 100755
--- a/Master/bin/amd64-netbsd/cweave
+++ b/Master/bin/amd64-netbsd/cweave
diff --git a/Master/bin/amd64-netbsd/detex b/Master/bin/amd64-netbsd/detex
index b1ce362176e..d38e196db24 100755
--- a/Master/bin/amd64-netbsd/detex
+++ b/Master/bin/amd64-netbsd/detex
diff --git a/Master/bin/amd64-netbsd/devnag b/Master/bin/amd64-netbsd/devnag
index 25d553e06dd..76f2f0d955a 100755
--- a/Master/bin/amd64-netbsd/devnag
+++ b/Master/bin/amd64-netbsd/devnag
diff --git a/Master/bin/amd64-netbsd/disdvi b/Master/bin/amd64-netbsd/disdvi
index e34f7390e92..917f5cba91a 100755
--- a/Master/bin/amd64-netbsd/disdvi
+++ b/Master/bin/amd64-netbsd/disdvi
diff --git a/Master/bin/amd64-netbsd/dt2dv b/Master/bin/amd64-netbsd/dt2dv
index 8f2dcb41948..d2b852a19ce 100755
--- a/Master/bin/amd64-netbsd/dt2dv
+++ b/Master/bin/amd64-netbsd/dt2dv
diff --git a/Master/bin/amd64-netbsd/dv2dt b/Master/bin/amd64-netbsd/dv2dt
index 1df0c356945..b845236b37c 100755
--- a/Master/bin/amd64-netbsd/dv2dt
+++ b/Master/bin/amd64-netbsd/dv2dt
diff --git a/Master/bin/amd64-netbsd/dvi2tty b/Master/bin/amd64-netbsd/dvi2tty
index 4463afb63a4..c4303394064 100755
--- a/Master/bin/amd64-netbsd/dvi2tty
+++ b/Master/bin/amd64-netbsd/dvi2tty
diff --git a/Master/bin/amd64-netbsd/dvibook b/Master/bin/amd64-netbsd/dvibook
index 4922d3d40f4..2a061833c7d 100755
--- a/Master/bin/amd64-netbsd/dvibook
+++ b/Master/bin/amd64-netbsd/dvibook
diff --git a/Master/bin/amd64-netbsd/dviconcat b/Master/bin/amd64-netbsd/dviconcat
index d561a91cdfa..76a632bf319 100755
--- a/Master/bin/amd64-netbsd/dviconcat
+++ b/Master/bin/amd64-netbsd/dviconcat
diff --git a/Master/bin/amd64-netbsd/dvicopy b/Master/bin/amd64-netbsd/dvicopy
index bfe3b7e9049..f49e402ecd2 100755
--- a/Master/bin/amd64-netbsd/dvicopy
+++ b/Master/bin/amd64-netbsd/dvicopy
diff --git a/Master/bin/amd64-netbsd/dvidvi b/Master/bin/amd64-netbsd/dvidvi
index 6e0b57532f9..15e1ca94345 100755
--- a/Master/bin/amd64-netbsd/dvidvi
+++ b/Master/bin/amd64-netbsd/dvidvi
diff --git a/Master/bin/amd64-netbsd/dvilj b/Master/bin/amd64-netbsd/dvilj
index 6fd0b6baff0..278cb71f6d4 100755
--- a/Master/bin/amd64-netbsd/dvilj
+++ b/Master/bin/amd64-netbsd/dvilj
diff --git a/Master/bin/amd64-netbsd/dvilj2p b/Master/bin/amd64-netbsd/dvilj2p
index 64ef877f5c6..ffc70c17b71 100755
--- a/Master/bin/amd64-netbsd/dvilj2p
+++ b/Master/bin/amd64-netbsd/dvilj2p
diff --git a/Master/bin/amd64-netbsd/dvilj4 b/Master/bin/amd64-netbsd/dvilj4
index fa1bfa0c407..767b25e3b13 100755
--- a/Master/bin/amd64-netbsd/dvilj4
+++ b/Master/bin/amd64-netbsd/dvilj4
diff --git a/Master/bin/amd64-netbsd/dvilj4l b/Master/bin/amd64-netbsd/dvilj4l
index 8bbc1f2810a..f509aef1df7 100755
--- a/Master/bin/amd64-netbsd/dvilj4l
+++ b/Master/bin/amd64-netbsd/dvilj4l
diff --git a/Master/bin/amd64-netbsd/dvipdfmx b/Master/bin/amd64-netbsd/dvipdfmx
index 5ad96bd8cbc..b0eef8c6489 100755
--- a/Master/bin/amd64-netbsd/dvipdfmx
+++ b/Master/bin/amd64-netbsd/dvipdfmx
diff --git a/Master/bin/amd64-netbsd/dvipng b/Master/bin/amd64-netbsd/dvipng
index 6b78ac2fcfc..c73f40548be 100755
--- a/Master/bin/amd64-netbsd/dvipng
+++ b/Master/bin/amd64-netbsd/dvipng
diff --git a/Master/bin/amd64-netbsd/dvipos b/Master/bin/amd64-netbsd/dvipos
index 45dcf93a721..222961da661 100755
--- a/Master/bin/amd64-netbsd/dvipos
+++ b/Master/bin/amd64-netbsd/dvipos
diff --git a/Master/bin/amd64-netbsd/dvips b/Master/bin/amd64-netbsd/dvips
index 89c564010b3..00ad3a4c7ad 100755
--- a/Master/bin/amd64-netbsd/dvips
+++ b/Master/bin/amd64-netbsd/dvips
diff --git a/Master/bin/amd64-netbsd/dviselect b/Master/bin/amd64-netbsd/dviselect
index 83a830fcbd3..41e22ef5e69 100755
--- a/Master/bin/amd64-netbsd/dviselect
+++ b/Master/bin/amd64-netbsd/dviselect
diff --git a/Master/bin/amd64-netbsd/dvisvgm b/Master/bin/amd64-netbsd/dvisvgm
index 71f5539ea01..1014bb2fb1f 100755
--- a/Master/bin/amd64-netbsd/dvisvgm
+++ b/Master/bin/amd64-netbsd/dvisvgm
diff --git a/Master/bin/amd64-netbsd/dvitodvi b/Master/bin/amd64-netbsd/dvitodvi
index 5f12744c464..2a289936819 100755
--- a/Master/bin/amd64-netbsd/dvitodvi
+++ b/Master/bin/amd64-netbsd/dvitodvi
diff --git a/Master/bin/amd64-netbsd/dvitype b/Master/bin/amd64-netbsd/dvitype
index 5ba2f2a9b49..d4c4da47c8a 100755
--- a/Master/bin/amd64-netbsd/dvitype
+++ b/Master/bin/amd64-netbsd/dvitype
diff --git a/Master/bin/amd64-netbsd/epsffit b/Master/bin/amd64-netbsd/epsffit
index c13e4f977bd..0001b65dd08 100755
--- a/Master/bin/amd64-netbsd/epsffit
+++ b/Master/bin/amd64-netbsd/epsffit
diff --git a/Master/bin/amd64-netbsd/eptex b/Master/bin/amd64-netbsd/eptex
index dba809c796a..8697b55a6ea 100755
--- a/Master/bin/amd64-netbsd/eptex
+++ b/Master/bin/amd64-netbsd/eptex
diff --git a/Master/bin/amd64-netbsd/euptex b/Master/bin/amd64-netbsd/euptex
index ec4c244a856..b7016a7a332 100755
--- a/Master/bin/amd64-netbsd/euptex
+++ b/Master/bin/amd64-netbsd/euptex
diff --git a/Master/bin/amd64-netbsd/extconv b/Master/bin/amd64-netbsd/extconv
index d79961f6f5c..0071756252a 100755
--- a/Master/bin/amd64-netbsd/extconv
+++ b/Master/bin/amd64-netbsd/extconv
diff --git a/Master/bin/amd64-netbsd/gftodvi b/Master/bin/amd64-netbsd/gftodvi
index 162120539c6..78c2eb16551 100755
--- a/Master/bin/amd64-netbsd/gftodvi
+++ b/Master/bin/amd64-netbsd/gftodvi
diff --git a/Master/bin/amd64-netbsd/gftopk b/Master/bin/amd64-netbsd/gftopk
index b5fb023b9af..a87a2cddc6a 100755
--- a/Master/bin/amd64-netbsd/gftopk
+++ b/Master/bin/amd64-netbsd/gftopk
diff --git a/Master/bin/amd64-netbsd/gftype b/Master/bin/amd64-netbsd/gftype
index 284bfabf3ab..1112e6eeafd 100755
--- a/Master/bin/amd64-netbsd/gftype
+++ b/Master/bin/amd64-netbsd/gftype
diff --git a/Master/bin/amd64-netbsd/gsftopk b/Master/bin/amd64-netbsd/gsftopk
index 0f844d38a2d..ba834407567 100755
--- a/Master/bin/amd64-netbsd/gsftopk
+++ b/Master/bin/amd64-netbsd/gsftopk
diff --git a/Master/bin/amd64-netbsd/hbf2gf b/Master/bin/amd64-netbsd/hbf2gf
index 5ef8a2e64d0..5d7de11dc78 100755
--- a/Master/bin/amd64-netbsd/hbf2gf
+++ b/Master/bin/amd64-netbsd/hbf2gf
diff --git a/Master/bin/amd64-netbsd/kpseaccess b/Master/bin/amd64-netbsd/kpseaccess
index 85c6958527e..fb2f12a624a 100755
--- a/Master/bin/amd64-netbsd/kpseaccess
+++ b/Master/bin/amd64-netbsd/kpseaccess
diff --git a/Master/bin/amd64-netbsd/kpsereadlink b/Master/bin/amd64-netbsd/kpsereadlink
index cf0073842c1..cf7fe8f4138 100755
--- a/Master/bin/amd64-netbsd/kpsereadlink
+++ b/Master/bin/amd64-netbsd/kpsereadlink
diff --git a/Master/bin/amd64-netbsd/kpsestat b/Master/bin/amd64-netbsd/kpsestat
index c8cca9b43dc..1d26a4d39fe 100755
--- a/Master/bin/amd64-netbsd/kpsestat
+++ b/Master/bin/amd64-netbsd/kpsestat
diff --git a/Master/bin/amd64-netbsd/kpsewhich b/Master/bin/amd64-netbsd/kpsewhich
index 240b7f98ce9..faef1b77c80 100755
--- a/Master/bin/amd64-netbsd/kpsewhich
+++ b/Master/bin/amd64-netbsd/kpsewhich
diff --git a/Master/bin/amd64-netbsd/lacheck b/Master/bin/amd64-netbsd/lacheck
index 29be235951d..885b8891a1c 100755
--- a/Master/bin/amd64-netbsd/lacheck
+++ b/Master/bin/amd64-netbsd/lacheck
diff --git a/Master/bin/amd64-netbsd/luajittex b/Master/bin/amd64-netbsd/luajittex
new file mode 100755
index 00000000000..ee8d632def6
--- /dev/null
+++ b/Master/bin/amd64-netbsd/luajittex
diff --git a/Master/bin/amd64-netbsd/luatex b/Master/bin/amd64-netbsd/luatex
index bc0cdb4370c..98fa64b202d 100755
--- a/Master/bin/amd64-netbsd/luatex
+++ b/Master/bin/amd64-netbsd/luatex
diff --git a/Master/bin/amd64-netbsd/mag b/Master/bin/amd64-netbsd/mag
index f750f0a763e..f4d67d25845 100755
--- a/Master/bin/amd64-netbsd/mag
+++ b/Master/bin/amd64-netbsd/mag
diff --git a/Master/bin/amd64-netbsd/makeindex b/Master/bin/amd64-netbsd/makeindex
index d4a603bf5c6..06b2b901ed6 100755
--- a/Master/bin/amd64-netbsd/makeindex
+++ b/Master/bin/amd64-netbsd/makeindex
diff --git a/Master/bin/amd64-netbsd/makejvf b/Master/bin/amd64-netbsd/makejvf
index d60fc07f7d4..25a4db183a7 100755
--- a/Master/bin/amd64-netbsd/makejvf
+++ b/Master/bin/amd64-netbsd/makejvf
diff --git a/Master/bin/amd64-netbsd/mendex b/Master/bin/amd64-netbsd/mendex
index c98a471b8fd..1722cf01877 100755
--- a/Master/bin/amd64-netbsd/mendex
+++ b/Master/bin/amd64-netbsd/mendex
diff --git a/Master/bin/amd64-netbsd/mf b/Master/bin/amd64-netbsd/mf
index 2abe97e28af..7859af753c6 100755
--- a/Master/bin/amd64-netbsd/mf
+++ b/Master/bin/amd64-netbsd/mf
diff --git a/Master/bin/amd64-netbsd/mf-nowin b/Master/bin/amd64-netbsd/mf-nowin
index ac3d528ed24..54c3598facc 100755
--- a/Master/bin/amd64-netbsd/mf-nowin
+++ b/Master/bin/amd64-netbsd/mf-nowin
diff --git a/Master/bin/amd64-netbsd/mft b/Master/bin/amd64-netbsd/mft
index 9fb3133796d..184b11c1e7b 100755
--- a/Master/bin/amd64-netbsd/mft
+++ b/Master/bin/amd64-netbsd/mft
diff --git a/Master/bin/amd64-netbsd/mktexlsr b/Master/bin/amd64-netbsd/mktexlsr
index 7253d2693d2..abb5d05b349 100755
--- a/Master/bin/amd64-netbsd/mktexlsr
+++ b/Master/bin/amd64-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/amd64-netbsd/mmafm b/Master/bin/amd64-netbsd/mmafm
index d598b2a3fd6..d717566a6e3 100755
--- a/Master/bin/amd64-netbsd/mmafm
+++ b/Master/bin/amd64-netbsd/mmafm
diff --git a/Master/bin/amd64-netbsd/mmpfb b/Master/bin/amd64-netbsd/mmpfb
index f104ce79cda..9d25844a132 100755
--- a/Master/bin/amd64-netbsd/mmpfb
+++ b/Master/bin/amd64-netbsd/mmpfb
diff --git a/Master/bin/amd64-netbsd/mpost b/Master/bin/amd64-netbsd/mpost
index f0e7db909ac..d9321f313a9 100755
--- a/Master/bin/amd64-netbsd/mpost
+++ b/Master/bin/amd64-netbsd/mpost
diff --git a/Master/bin/amd64-netbsd/odvicopy b/Master/bin/amd64-netbsd/odvicopy
index 9c339c09e65..3c17932edc4 100755
--- a/Master/bin/amd64-netbsd/odvicopy
+++ b/Master/bin/amd64-netbsd/odvicopy
diff --git a/Master/bin/amd64-netbsd/odvitype b/Master/bin/amd64-netbsd/odvitype
index bf3f8451ce7..f08c430deb4 100755
--- a/Master/bin/amd64-netbsd/odvitype
+++ b/Master/bin/amd64-netbsd/odvitype
diff --git a/Master/bin/amd64-netbsd/omfonts b/Master/bin/amd64-netbsd/omfonts
index db4b9701256..6a19ec08fa3 100755
--- a/Master/bin/amd64-netbsd/omfonts
+++ b/Master/bin/amd64-netbsd/omfonts
diff --git a/Master/bin/amd64-netbsd/otangle b/Master/bin/amd64-netbsd/otangle
index 071fc6feb27..3f88690e58f 100755
--- a/Master/bin/amd64-netbsd/otangle
+++ b/Master/bin/amd64-netbsd/otangle
diff --git a/Master/bin/amd64-netbsd/otfinfo b/Master/bin/amd64-netbsd/otfinfo
index 8cf770b5a25..2ac2be4d8a5 100755
--- a/Master/bin/amd64-netbsd/otfinfo
+++ b/Master/bin/amd64-netbsd/otfinfo
diff --git a/Master/bin/amd64-netbsd/otftotfm b/Master/bin/amd64-netbsd/otftotfm
index 50ef388d5aa..be1cde77083 100755
--- a/Master/bin/amd64-netbsd/otftotfm
+++ b/Master/bin/amd64-netbsd/otftotfm
diff --git a/Master/bin/amd64-netbsd/otp2ocp b/Master/bin/amd64-netbsd/otp2ocp
index d8da44c361c..91ba64852a2 100755
--- a/Master/bin/amd64-netbsd/otp2ocp
+++ b/Master/bin/amd64-netbsd/otp2ocp
diff --git a/Master/bin/amd64-netbsd/outocp b/Master/bin/amd64-netbsd/outocp
index 5040778ec3c..5e4357c0c90 100755
--- a/Master/bin/amd64-netbsd/outocp
+++ b/Master/bin/amd64-netbsd/outocp
diff --git a/Master/bin/amd64-netbsd/patgen b/Master/bin/amd64-netbsd/patgen
index 03655579e95..52cb8a65f57 100755
--- a/Master/bin/amd64-netbsd/patgen
+++ b/Master/bin/amd64-netbsd/patgen
diff --git a/Master/bin/amd64-netbsd/pbibtex b/Master/bin/amd64-netbsd/pbibtex
index 5732b36c588..41dce044aff 100755
--- a/Master/bin/amd64-netbsd/pbibtex
+++ b/Master/bin/amd64-netbsd/pbibtex
diff --git a/Master/bin/amd64-netbsd/pdfclose b/Master/bin/amd64-netbsd/pdfclose
index 06ecfc10913..7469c9bcef3 100755
--- a/Master/bin/amd64-netbsd/pdfclose
+++ b/Master/bin/amd64-netbsd/pdfclose
diff --git a/Master/bin/amd64-netbsd/pdfcsplain b/Master/bin/amd64-netbsd/pdfcsplain
index f68cc91498e..8d727021583 120000
--- a/Master/bin/amd64-netbsd/pdfcsplain
+++ b/Master/bin/amd64-netbsd/pdfcsplain
@@ -1 +1 @@
-pdftex
\ No newline at end of file
+luatex
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/pdfopen b/Master/bin/amd64-netbsd/pdfopen
index 54c16963ca5..b89889b312d 100755
--- a/Master/bin/amd64-netbsd/pdfopen
+++ b/Master/bin/amd64-netbsd/pdfopen
diff --git a/Master/bin/amd64-netbsd/pdftex b/Master/bin/amd64-netbsd/pdftex
index ceadc6f6cbf..b9f31b676b9 100755
--- a/Master/bin/amd64-netbsd/pdftex
+++ b/Master/bin/amd64-netbsd/pdftex
diff --git a/Master/bin/amd64-netbsd/pdftosrc b/Master/bin/amd64-netbsd/pdftosrc
index 07095a0ed11..c20106418e4 100755
--- a/Master/bin/amd64-netbsd/pdftosrc
+++ b/Master/bin/amd64-netbsd/pdftosrc
diff --git a/Master/bin/amd64-netbsd/pdvitype b/Master/bin/amd64-netbsd/pdvitype
index 0f9322bf897..17161aa5330 100755
--- a/Master/bin/amd64-netbsd/pdvitype
+++ b/Master/bin/amd64-netbsd/pdvitype
diff --git a/Master/bin/amd64-netbsd/pfb2pfa b/Master/bin/amd64-netbsd/pfb2pfa
index 831a8242fb6..c803db0c0ff 100755
--- a/Master/bin/amd64-netbsd/pfb2pfa
+++ b/Master/bin/amd64-netbsd/pfb2pfa
diff --git a/Master/bin/amd64-netbsd/pk2bm b/Master/bin/amd64-netbsd/pk2bm
index 7d86021ecf2..0dc7e31a712 100755
--- a/Master/bin/amd64-netbsd/pk2bm
+++ b/Master/bin/amd64-netbsd/pk2bm
diff --git a/Master/bin/amd64-netbsd/pktogf b/Master/bin/amd64-netbsd/pktogf
index 557a1bc0ddb..ac897f634a4 100755
--- a/Master/bin/amd64-netbsd/pktogf
+++ b/Master/bin/amd64-netbsd/pktogf
diff --git a/Master/bin/amd64-netbsd/pktype b/Master/bin/amd64-netbsd/pktype
index a700574e7fd..5e12d3ea82e 100755
--- a/Master/bin/amd64-netbsd/pktype
+++ b/Master/bin/amd64-netbsd/pktype
diff --git a/Master/bin/amd64-netbsd/pltotf b/Master/bin/amd64-netbsd/pltotf
index b8d74054b1e..b7b071a22a3 100755
--- a/Master/bin/amd64-netbsd/pltotf
+++ b/Master/bin/amd64-netbsd/pltotf
diff --git a/Master/bin/amd64-netbsd/pmxab b/Master/bin/amd64-netbsd/pmxab
index b8e5838aef5..0c428637481 100755
--- a/Master/bin/amd64-netbsd/pmxab
+++ b/Master/bin/amd64-netbsd/pmxab
diff --git a/Master/bin/amd64-netbsd/pooltype b/Master/bin/amd64-netbsd/pooltype
index 5b95e31484f..62c6ac51ece 100755
--- a/Master/bin/amd64-netbsd/pooltype
+++ b/Master/bin/amd64-netbsd/pooltype
diff --git a/Master/bin/amd64-netbsd/ppltotf b/Master/bin/amd64-netbsd/ppltotf
index 169e69bfe89..bc27e394f56 100755
--- a/Master/bin/amd64-netbsd/ppltotf
+++ b/Master/bin/amd64-netbsd/ppltotf
diff --git a/Master/bin/amd64-netbsd/prepmx b/Master/bin/amd64-netbsd/prepmx
index 20c234aeb73..8e62bb2c039 100755
--- a/Master/bin/amd64-netbsd/prepmx
+++ b/Master/bin/amd64-netbsd/prepmx
diff --git a/Master/bin/amd64-netbsd/ps2pk b/Master/bin/amd64-netbsd/ps2pk
index 7559c0b9759..73a90f2b470 100755
--- a/Master/bin/amd64-netbsd/ps2pk
+++ b/Master/bin/amd64-netbsd/ps2pk
diff --git a/Master/bin/amd64-netbsd/psbook b/Master/bin/amd64-netbsd/psbook
index 93fe813ee05..8a519b19200 100755
--- a/Master/bin/amd64-netbsd/psbook
+++ b/Master/bin/amd64-netbsd/psbook
diff --git a/Master/bin/amd64-netbsd/psjoin b/Master/bin/amd64-netbsd/psjoin
new file mode 120000
index 00000000000..3e35267270e
--- /dev/null
+++ b/Master/bin/amd64-netbsd/psjoin
@@ -0,0 +1 @@
+../../texmf-dist/scripts/psutils/psjoin.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/psnup b/Master/bin/amd64-netbsd/psnup
index f2e30fcf76a..4a2d9dbe2b8 100755
--- a/Master/bin/amd64-netbsd/psnup
+++ b/Master/bin/amd64-netbsd/psnup
diff --git a/Master/bin/amd64-netbsd/psresize b/Master/bin/amd64-netbsd/psresize
index e3b2f114199..19aa0432271 100755
--- a/Master/bin/amd64-netbsd/psresize
+++ b/Master/bin/amd64-netbsd/psresize
diff --git a/Master/bin/amd64-netbsd/psselect b/Master/bin/amd64-netbsd/psselect
index a90aebe3bc2..474d11284ca 100755
--- a/Master/bin/amd64-netbsd/psselect
+++ b/Master/bin/amd64-netbsd/psselect
diff --git a/Master/bin/amd64-netbsd/pstops b/Master/bin/amd64-netbsd/pstops
index 6ccd51f0b43..d8d593363bc 100755
--- a/Master/bin/amd64-netbsd/pstops
+++ b/Master/bin/amd64-netbsd/pstops
diff --git a/Master/bin/amd64-netbsd/ptex b/Master/bin/amd64-netbsd/ptex
index 347a653b6cd..9e6da8c0667 100755
--- a/Master/bin/amd64-netbsd/ptex
+++ b/Master/bin/amd64-netbsd/ptex
diff --git a/Master/bin/amd64-netbsd/ptftopl b/Master/bin/amd64-netbsd/ptftopl
index adca6110fa8..77609c74064 100755
--- a/Master/bin/amd64-netbsd/ptftopl
+++ b/Master/bin/amd64-netbsd/ptftopl
diff --git a/Master/bin/amd64-netbsd/scor2prt b/Master/bin/amd64-netbsd/scor2prt
index d48a2036349..2c0733f1e6f 100755
--- a/Master/bin/amd64-netbsd/scor2prt
+++ b/Master/bin/amd64-netbsd/scor2prt
diff --git a/Master/bin/amd64-netbsd/sjisconv b/Master/bin/amd64-netbsd/sjisconv
index 01c0eed5bbe..0c28ab283dc 100755
--- a/Master/bin/amd64-netbsd/sjisconv
+++ b/Master/bin/amd64-netbsd/sjisconv
diff --git a/Master/bin/amd64-netbsd/synctex b/Master/bin/amd64-netbsd/synctex
index 47c84b14957..afac8111d91 100755
--- a/Master/bin/amd64-netbsd/synctex
+++ b/Master/bin/amd64-netbsd/synctex
diff --git a/Master/bin/amd64-netbsd/t1ascii b/Master/bin/amd64-netbsd/t1ascii
index 121b048cb48..53edb1b1795 100755
--- a/Master/bin/amd64-netbsd/t1ascii
+++ b/Master/bin/amd64-netbsd/t1ascii
diff --git a/Master/bin/amd64-netbsd/t1asm b/Master/bin/amd64-netbsd/t1asm
index 7edbba0bd3e..4396b765502 100755
--- a/Master/bin/amd64-netbsd/t1asm
+++ b/Master/bin/amd64-netbsd/t1asm
diff --git a/Master/bin/amd64-netbsd/t1binary b/Master/bin/amd64-netbsd/t1binary
index 44c0c75b742..4af69a7ee95 100755
--- a/Master/bin/amd64-netbsd/t1binary
+++ b/Master/bin/amd64-netbsd/t1binary
diff --git a/Master/bin/amd64-netbsd/t1disasm b/Master/bin/amd64-netbsd/t1disasm
index aecdf91542b..4432fb42835 100755
--- a/Master/bin/amd64-netbsd/t1disasm
+++ b/Master/bin/amd64-netbsd/t1disasm
diff --git a/Master/bin/amd64-netbsd/t1dotlessj b/Master/bin/amd64-netbsd/t1dotlessj
index 0b0f4e96d2d..41341d91be8 100755
--- a/Master/bin/amd64-netbsd/t1dotlessj
+++ b/Master/bin/amd64-netbsd/t1dotlessj
diff --git a/Master/bin/amd64-netbsd/t1lint b/Master/bin/amd64-netbsd/t1lint
index 97495da625a..95ded96c7e7 100755
--- a/Master/bin/amd64-netbsd/t1lint
+++ b/Master/bin/amd64-netbsd/t1lint
diff --git a/Master/bin/amd64-netbsd/t1mac b/Master/bin/amd64-netbsd/t1mac
index a7f8ee25e25..f856a6b1ee9 100755
--- a/Master/bin/amd64-netbsd/t1mac
+++ b/Master/bin/amd64-netbsd/t1mac
diff --git a/Master/bin/amd64-netbsd/t1rawafm b/Master/bin/amd64-netbsd/t1rawafm
index b8673396f24..ebcb3c7e67c 100755
--- a/Master/bin/amd64-netbsd/t1rawafm
+++ b/Master/bin/amd64-netbsd/t1rawafm
diff --git a/Master/bin/amd64-netbsd/t1reencode b/Master/bin/amd64-netbsd/t1reencode
index 3dfae720901..f5cddd8a5e5 100755
--- a/Master/bin/amd64-netbsd/t1reencode
+++ b/Master/bin/amd64-netbsd/t1reencode
diff --git a/Master/bin/amd64-netbsd/t1testpage b/Master/bin/amd64-netbsd/t1testpage
index 7c221be8b00..48cfc7dca07 100755
--- a/Master/bin/amd64-netbsd/t1testpage
+++ b/Master/bin/amd64-netbsd/t1testpage
diff --git a/Master/bin/amd64-netbsd/t1unmac b/Master/bin/amd64-netbsd/t1unmac
index 1694eecb7a2..374bee9b9f7 100755
--- a/Master/bin/amd64-netbsd/t1unmac
+++ b/Master/bin/amd64-netbsd/t1unmac
diff --git a/Master/bin/amd64-netbsd/t4ht b/Master/bin/amd64-netbsd/t4ht
index 7b4f47f3e72..536cf07dfe8 100755
--- a/Master/bin/amd64-netbsd/t4ht
+++ b/Master/bin/amd64-netbsd/t4ht
diff --git a/Master/bin/amd64-netbsd/tangle b/Master/bin/amd64-netbsd/tangle
index 654d18c5283..b0ea761bd75 100755
--- a/Master/bin/amd64-netbsd/tangle
+++ b/Master/bin/amd64-netbsd/tangle
diff --git a/Master/bin/amd64-netbsd/teckit_compile b/Master/bin/amd64-netbsd/teckit_compile
index 3f538f37036..83130514e9c 100755
--- a/Master/bin/amd64-netbsd/teckit_compile
+++ b/Master/bin/amd64-netbsd/teckit_compile
diff --git a/Master/bin/amd64-netbsd/tex b/Master/bin/amd64-netbsd/tex
index 4a7aa3dc6ad..33ccbe2435b 100755
--- a/Master/bin/amd64-netbsd/tex
+++ b/Master/bin/amd64-netbsd/tex
diff --git a/Master/bin/amd64-netbsd/tex4ht b/Master/bin/amd64-netbsd/tex4ht
index f46220d08ac..dc69730b639 100755
--- a/Master/bin/amd64-netbsd/tex4ht
+++ b/Master/bin/amd64-netbsd/tex4ht
diff --git a/Master/bin/amd64-netbsd/texluajit b/Master/bin/amd64-netbsd/texluajit
new file mode 120000
index 00000000000..bddee6e38c5
--- /dev/null
+++ b/Master/bin/amd64-netbsd/texluajit
@@ -0,0 +1 @@
+luajittex
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/texluajitc b/Master/bin/amd64-netbsd/texluajitc
new file mode 120000
index 00000000000..bddee6e38c5
--- /dev/null
+++ b/Master/bin/amd64-netbsd/texluajitc
@@ -0,0 +1 @@
+luajittex
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/tftopl b/Master/bin/amd64-netbsd/tftopl
index 4b07cd26639..2573713d124 100755
--- a/Master/bin/amd64-netbsd/tftopl
+++ b/Master/bin/amd64-netbsd/tftopl
diff --git a/Master/bin/amd64-netbsd/tie b/Master/bin/amd64-netbsd/tie
index 644f7b7aac8..a4e7514c145 100755
--- a/Master/bin/amd64-netbsd/tie
+++ b/Master/bin/amd64-netbsd/tie
diff --git a/Master/bin/amd64-netbsd/ttf2afm b/Master/bin/amd64-netbsd/ttf2afm
index 98b8a254d44..6910a811040 100755
--- a/Master/bin/amd64-netbsd/ttf2afm
+++ b/Master/bin/amd64-netbsd/ttf2afm
diff --git a/Master/bin/amd64-netbsd/ttf2pk b/Master/bin/amd64-netbsd/ttf2pk
index 91ea6bbe8da..f2e2c27d95e 100755
--- a/Master/bin/amd64-netbsd/ttf2pk
+++ b/Master/bin/amd64-netbsd/ttf2pk
diff --git a/Master/bin/amd64-netbsd/ttf2tfm b/Master/bin/amd64-netbsd/ttf2tfm
index 4f249b6cc4c..749df61cd42 100755
--- a/Master/bin/amd64-netbsd/ttf2tfm
+++ b/Master/bin/amd64-netbsd/ttf2tfm
diff --git a/Master/bin/amd64-netbsd/ttfdump b/Master/bin/amd64-netbsd/ttfdump
index 23022ea73c7..13e7339c1d0 100755
--- a/Master/bin/amd64-netbsd/ttfdump
+++ b/Master/bin/amd64-netbsd/ttfdump
diff --git a/Master/bin/amd64-netbsd/ttftotype42 b/Master/bin/amd64-netbsd/ttftotype42
index 3eae6a69624..0efcb7bbc85 100755
--- a/Master/bin/amd64-netbsd/ttftotype42
+++ b/Master/bin/amd64-netbsd/ttftotype42
diff --git a/Master/bin/amd64-netbsd/upbibtex b/Master/bin/amd64-netbsd/upbibtex
index d0c479ce98f..5386efb88d3 100755
--- a/Master/bin/amd64-netbsd/upbibtex
+++ b/Master/bin/amd64-netbsd/upbibtex
diff --git a/Master/bin/amd64-netbsd/updvitype b/Master/bin/amd64-netbsd/updvitype
index 76ff95e95b6..e938efc313a 100755
--- a/Master/bin/amd64-netbsd/updvitype
+++ b/Master/bin/amd64-netbsd/updvitype
diff --git a/Master/bin/amd64-netbsd/uppltotf b/Master/bin/amd64-netbsd/uppltotf
index ad0022d404b..3f2eb122021 100755
--- a/Master/bin/amd64-netbsd/uppltotf
+++ b/Master/bin/amd64-netbsd/uppltotf
diff --git a/Master/bin/amd64-netbsd/uptex b/Master/bin/amd64-netbsd/uptex
index 9e714a7d38d..4b4ab792e86 100755
--- a/Master/bin/amd64-netbsd/uptex
+++ b/Master/bin/amd64-netbsd/uptex
diff --git a/Master/bin/amd64-netbsd/uptftopl b/Master/bin/amd64-netbsd/uptftopl
index 36dc3f385e3..acb86303b74 100755
--- a/Master/bin/amd64-netbsd/uptftopl
+++ b/Master/bin/amd64-netbsd/uptftopl
diff --git a/Master/bin/amd64-netbsd/vftovp b/Master/bin/amd64-netbsd/vftovp
index f9ee47b9efe..e7648e091a1 100755
--- a/Master/bin/amd64-netbsd/vftovp
+++ b/Master/bin/amd64-netbsd/vftovp
diff --git a/Master/bin/amd64-netbsd/vlna b/Master/bin/amd64-netbsd/vlna
index 37ef420b44d..52534167bdf 100755
--- a/Master/bin/amd64-netbsd/vlna
+++ b/Master/bin/amd64-netbsd/vlna
diff --git a/Master/bin/amd64-netbsd/vptovf b/Master/bin/amd64-netbsd/vptovf
index d6277fcbf69..a93e4407d95 100755
--- a/Master/bin/amd64-netbsd/vptovf
+++ b/Master/bin/amd64-netbsd/vptovf
diff --git a/Master/bin/amd64-netbsd/weave b/Master/bin/amd64-netbsd/weave
index 83b58d6dd6f..fb12a4dafda 100755
--- a/Master/bin/amd64-netbsd/weave
+++ b/Master/bin/amd64-netbsd/weave
diff --git a/Master/bin/amd64-netbsd/wofm2opl b/Master/bin/amd64-netbsd/wofm2opl
new file mode 100755
index 00000000000..92f4bf06da0
--- /dev/null
+++ b/Master/bin/amd64-netbsd/wofm2opl
diff --git a/Master/bin/amd64-netbsd/wopl2ofm b/Master/bin/amd64-netbsd/wopl2ofm
new file mode 100755
index 00000000000..33b215a6ac9
--- /dev/null
+++ b/Master/bin/amd64-netbsd/wopl2ofm
diff --git a/Master/bin/amd64-netbsd/wovf2ovp b/Master/bin/amd64-netbsd/wovf2ovp
new file mode 100755
index 00000000000..1e21c822863
--- /dev/null
+++ b/Master/bin/amd64-netbsd/wovf2ovp
diff --git a/Master/bin/amd64-netbsd/wovp2ovf b/Master/bin/amd64-netbsd/wovp2ovf
index 5da582fee01..ee6baf06f89 100755
--- a/Master/bin/amd64-netbsd/wovp2ovf
+++ b/Master/bin/amd64-netbsd/wovp2ovf
diff --git a/Master/bin/amd64-netbsd/xdvi-xaw b/Master/bin/amd64-netbsd/xdvi-xaw
index 1a119183f5f..d34ffb1fe26 100755
--- a/Master/bin/amd64-netbsd/xdvi-xaw
+++ b/Master/bin/amd64-netbsd/xdvi-xaw
diff --git a/Master/bin/amd64-netbsd/xdvipdfmx b/Master/bin/amd64-netbsd/xdvipdfmx
index 1a2f62b71e5..3dddb78d932 100755
--- a/Master/bin/amd64-netbsd/xdvipdfmx
+++ b/Master/bin/amd64-netbsd/xdvipdfmx
diff --git a/Master/bin/amd64-netbsd/xetex b/Master/bin/amd64-netbsd/xetex
index 6636ce61124..5318336fbae 100755
--- a/Master/bin/amd64-netbsd/xetex
+++ b/Master/bin/amd64-netbsd/xetex
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 928845d9e3a..4b77db3f4bf 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.tar.xz;;
+    $grab http://www.babafou.eu.org/texlive-netbsd/x86_64-unknown-netbsd6.1.3.tar.xz;;
    armel-linux)
     download_loc=$tmpdir/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
diff --git a/Master/tlpkg/installer/wget/wget.amd64-netbsd b/Master/tlpkg/installer/wget/wget.amd64-netbsd
index fdcd6b374ed..019db4c23f0 100755
--- a/Master/tlpkg/installer/wget/wget.amd64-netbsd
+++ b/Master/tlpkg/installer/wget/wget.amd64-netbsd
diff --git a/Master/tlpkg/installer/xz/xz.amd64-netbsd b/Master/tlpkg/installer/xz/xz.amd64-netbsd
index d1aeb8db7fd..615fa183ac7 100755
--- a/Master/tlpkg/installer/xz/xz.amd64-netbsd
+++ b/Master/tlpkg/installer/xz/xz.amd64-netbsd
diff --git a/Master/tlpkg/installer/xz/xzdec.amd64-netbsd b/Master/tlpkg/installer/xz/xzdec.amd64-netbsd
index 264f35c0814..aa7976bc52e 100755
--- a/Master/tlpkg/installer/xz/xzdec.amd64-netbsd
+++ b/Master/tlpkg/installer/xz/xzdec.amd64-netbsd
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 3b5b34d3e70..103bdb1b0d1 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -8,9 +8,9 @@ execute AddFormat \
   options="dviluatex.ini"
 #
 # On platforms where there is no luajittex, it will just be ignored?
-execute AddFormat \
-  name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
-  options="luatex.ini"
+#execute AddFormat \
+#  name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
+#  options="luatex.ini"
 #
 docpattern d texmf-dist/doc/luatex/base
 docpattern f texmf-dist/doc/man/man1/luatex.*
@@ -28,7 +28,7 @@ binpattern f bin/${ARCH}/texluac
 binpattern f bin/win32/lua*.dll
 
 tlpsetvar no_luajit_platforms \
-  alpha-linux,amd64-kfreebsd,amd64-netbsd,armhf-linux,\
+  alpha-linux,amd64-kfreebsd,armhf-linux,\
 i386-cygwin,i386-kfreebsd,i386-netbsd,i386-solaris,\
 mips-irix,mipsel-linux,powerpc-linux,sparc-solaris,x86_64-solaris
 #