diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index 8d39c4ba39fe355d2282cc414828c01b762df133..6d86a1e2f77b3f89d0ce8efa7741c611aa2d6edf 100755
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2016-03-30'
+timestamp='2016-05-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1399,7 +1399,7 @@ case $os in
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos*)
+ | -onefs* | -tirtos* | -phoenix*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index 95b726e684c88b2ff9dd2ae288829797f147e4f9..8dbdea03a61e820909af18e4a9d512b2c494a279 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-13 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (RISINPUTS, BLTXMLINPUTS): $TEXMF/biber
+ rather than $TEXMF/bibtex.
+
2016-02-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
*knj.c: Disable unnecessary warning (w32 only).
diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf
index 928de4f6e76559f20949822562cb2a90b14f828a..5ad28fbe9d60d44be9453349f0979e4d73106774 100644
--- a/source/texk/kpathsea/texmf.cnf
+++ b/source/texk/kpathsea/texmf.cnf
@@ -319,8 +319,8 @@ MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
+RISINPUTS = .;$TEXMF/biber/ris//
+BLTXMLINPUTS = .;$TEXMF/biber/bltxml//
% MFT style files.
MFTINPUTS = .;$TEXMF/mft//
diff --git a/source/texk/texlive/linked_scripts/Makefile.am b/source/texk/texlive/linked_scripts/Makefile.am
index c43019224b2171e00f19dac6d5d51e885c3716ef..6d79c490a6a947f7673750a99bd3a2ccce567a47 100644
--- a/source/texk/texlive/linked_scripts/Makefile.am
+++ b/source/texk/texlive/linked_scripts/Makefile.am
@@ -136,6 +136,7 @@ texmf_other_scripts = \
lilyglyphs/lily-rebuild-pdfs.py \
ltximg/ltximg.pl \
luaotfload/luaotfload-tool.lua \
+ m-tx/m-tx.lua \
makedtx/makedtx.pl \
make4ht/make4ht \
match_parens/match_parens \
@@ -157,6 +158,7 @@ texmf_other_scripts = \
pfarrei/pfarrei.tlu \
pkfix-helper/pkfix-helper \
pkfix/pkfix.pl \
+ pmx/pmx2pdf.lua \
pmxchords/pmxchords.lua \
pst2pdf/pst2pdf.pl \
ptex2pdf/ptex2pdf.lua \
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index 7b625af4ce480893c8b17ae8f0ae9feb1de922b3..77d96e79dbbf8dfa9d20bdd6378392bd6cfac13e 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -351,6 +351,7 @@ texmf_other_scripts = \
lilyglyphs/lily-rebuild-pdfs.py \
ltximg/ltximg.pl \
luaotfload/luaotfload-tool.lua \
+ m-tx/m-tx.lua \
makedtx/makedtx.pl \
make4ht/make4ht \
match_parens/match_parens \
@@ -372,6 +373,7 @@ texmf_other_scripts = \
pfarrei/pfarrei.tlu \
pkfix-helper/pkfix-helper \
pkfix/pkfix.pl \
+ pmx/pmx2pdf.lua \
pmxchords/pmxchords.lua \
pst2pdf/pst2pdf.pl \
ptex2pdf/ptex2pdf.lua \
diff --git a/source/texk/texlive/tl_scripts/fmtutil.cnf b/source/texk/texlive/tl_scripts/fmtutil.cnf
index 885096479d70b50ff00d2325b5abec994c6b3aa9..d382bc94f80c70bf26ecf8279253c5ab51cb771f 100644
--- a/source/texk/texlive/tl_scripts/fmtutil.cnf
+++ b/source/texk/texlive/tl_scripts/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Apr 19 03:16:09 2016
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun May 15 03:17:09 2016
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
@@ -76,9 +76,7 @@ lualatex luatex language.dat,language.dat.lua lualatex.ini
#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
#
# from lollipop:
-lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
-lualollipop luatex - lualollipop.ini
-xelollipop xetex - -etex xelollipop.ini
+lollipop tex - lollipop.ini
#
# from luatex:
luatex luatex language.def,language.dat.lua luatex.ini
@@ -108,10 +106,12 @@ pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
#
+# from platex:
+platex eptex language.dat *platex.ini
+#
# from ptex:
ptex ptex - ptex.ini
eptex eptex language.def *eptex.ini
-platex eptex language.dat *platex.ini
#
# from tex:
tex tex - tex.ini
@@ -119,10 +119,12 @@ tex tex - tex.ini
# from texsis:
texsis pdftex - -translate-file=cp227.tcx texsis.ini
#
+# from uplatex:
+uplatex euptex language.dat *uplatex.ini
+#
# from uptex:
uptex uptex - uptex.ini
euptex euptex language.def *euptex.ini
-uplatex euptex language.dat *uplatex.ini
#
# from xetex:
xetex xetex language.def -etex xetex.ini
diff --git a/source/texk/texlive/w32_wrapper/runscript.tlu b/source/texk/texlive/w32_wrapper/runscript.tlu
index 53deaf07125dc194ac6889e81ac6680950db581f..bd67db241c7bce5f64669c77bc14460d72444978 100644
--- a/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 39067 $", "%d+") or "0"
-local svndate = string.match("$Date: 2015-12-10 23:28:26 +0100 (Thu, 10 Dec 2015) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 40700 $", "%d+") or "0"
+local svndate = string.match("$Date: 2016-04-23 14:35:18 +0200 (Sat, 23 Apr 2016) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -253,6 +253,8 @@ local docstr = [[
- more slash flipping for the sake of vbscript and unc paths
2015/12/11
- fix spurious arguments for updmap and fmtutil
+ 2016/04/22
+ - Warning if external perl is requested but missing
]]
-- HELPER SUBROUTINES --
@@ -471,7 +473,15 @@ local scripts4tlperl = {
local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and
not (guimode or is_restricted_progname or scripts4tlperl[progname])
local PERLEXE = try_extern_perl and search_path('perl.exe', PATH)
-if not PERLEXE then
+local extperl_warn
+if not PERLEXE then
+ if try_extern_perl then extperl_warn = [[
+External Perl missing or outdated. Please install a recent Perl, or configure
+TeX Live to always use the builtin Perl:
+ tlmgr conf texmf TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL 0
+Meanwhile, continuing with built-in Perl...
+]]
+ end -- if try_extern_perl
PERLEXE = TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
PATH = prepend_path(PATH, TEXDIR..'/tlpkg/tlperl/bin')
@@ -662,6 +672,10 @@ end
if ARGV then
table.insert(ARGV, argline) -- pass through original arguments
+ if string.find (table.concat(ARGV, ' '), 'perl.exe') and extperl_warn then
+
+ io.stderr:write(extperl_warn)
+ end
local ret = assert(os.spawn(ARGV))
if ret ~= 0 then
local dbginfo = debug.getinfo(1)
@@ -687,6 +701,6 @@ if not success then
end
-- about RUNSCRIPT_ERROR_MESSAGE environment variable:
--- it stores an error message that is catched and displayed
+-- it stores an error message that is caught and displayed
-- in a message box on the C side at process exit
-- (currently used only by gui mode stubs)
diff --git a/source/utils/README b/source/utils/README
index 40f735764fbe1d70c08f3d4611aa0f7003236e7a..d4fe11ecca417e9f0b171257480f906841f27af0 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,11 +1,11 @@
-$Id: README 40025 2016-03-14 22:52:10Z karl $
+$Id: README 41077 2016-05-12 23:14:19Z karl $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
See comments in ../texk/README.
-asymptote 2.37 - checked 14mar16
+asymptote 2.38 - checked 13may16
(this version for dev build testing only, not to be installed)
update to TL from CTAN, to include prebuilt doc.
see http://tug.org/texlive/build.html#asymptote
@@ -21,7 +21,7 @@ lacheck - maintained here, by us
m-tx 0.62 - checked 10feb16
http://ctan.org/pkg/m-tx/
-pmx 2.7.3 - checked 10feb16
+pmx 2.7.4 - checked 13may16
http://ctan.org/pkg/pmx/
ps2eps 1.68 - checked 10may12