find new binaries in tl16

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

7 files changed, 35 insertions, 7 deletions

diff --git a/Master/tlpkg/tlpsrc/autosp.tlpsrc b/Master/tlpkg/tlpsrc/autosp.tlpsrc
new file mode 100644
index 00000000000..dca338c719c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/autosp.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 6b2ede7bcc3..340bbaf3021 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -50,6 +50,7 @@ depend ltximg
 depend listings-ext
 depend make4ht
 depend match_parens
+depend mflua
 depend mkjobtexmf
 depend patgen
 depend pdfbook2
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index 0bfa128ed18..1886026a954 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -5,9 +5,11 @@ longdesc Music-related fonts and packages.
 depend collection-latex
 #
 depend abc
+depend autosp
 depend bagpipe
 depend figbas
 depend gchords
+depend gregorio
 depend gtrcrd
 depend guitar
 depend guitarchordschemes
diff --git a/Master/tlpkg/tlpsrc/gregorio.tlpsrc b/Master/tlpkg/tlpsrc/gregorio.tlpsrc
new file mode 100644
index 00000000000..dca338c719c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/gregorio.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
index d846543faf2..ea553e937d3 100644
--- a/Master/tlpkg/tlpsrc/lollipop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
@@ -5,10 +5,11 @@ execute AddFormat name=lollipop engine=pdftex \
           options="-translate-file=cp227.tcx *lollipop.ini" \
           fmttriggers=${fmtcomm},pdftex
 #
-binpattern f bin/${ARCH}/lualollipop
-execute AddFormat name=lualollipop engine=luatex \
-          options="lualollipop.ini" \
-          fmttriggers=${fmtcomm},pdftex,luatex
+# does not work with luatex in tl16
+#binpattern f bin/${ARCH}/lualollipop
+#execute AddFormat name=lualollipop engine=luatex \
+#          options="lualollipop.ini" \
+#          fmttriggers=${fmtcomm},pdftex,luatex
 #
 binpattern f bin/${ARCH}/xelollipop
 execute AddFormat name=xelollipop engine=xetex \
@@ -20,6 +21,7 @@ execute AddFormat name=dvilollipop mode=disabled engine=pdftex \
           options="-translate-file=cp227.tcx *lollipop.ini" \
           fmttriggers=${fmtcomm},pdftex
 #
-execute AddFormat name=dvilualollipop mode=disabled engine=luatex \
-          options="-translate-file=cp227.tcx lualollipop.ini" \
-          fmttriggers=${fmtcomm},luatex,pdftex
+# does not work with luatex in tl16
+#execute AddFormat name=dvilualollipop mode=disabled engine=luatex \
+#          options="-translate-file=cp227.tcx lualollipop.ini" \
+#          fmttriggers=${fmtcomm},luatex,pdftex
diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc
new file mode 100644
index 00000000000..5baa5fbc6fe
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc
@@ -0,0 +1,20 @@
+# On platforms where there is no luajittex, it will be ignored
+# due to special options in fmtutil and TLConfig.pm.
+#execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
+#  patterns=language.def,language.dat.lua \
+#  fmttriggers=${fmtdeps},pdftex
+
+binpattern f bin/${ARCH}/mflua
+binpattern f bin/${ARCH}/mflua-nowin
+
+# duplicated in luatex.tlpsrc, sigh.
+tlpsetvar no_luajit_platforms \
+  alpha-linux,sparc-solaris,x86_64-solaris
+#
+binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit
+binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin
+
+# need metafont for support files, luatex for dll's, etc.
+depend metafont
+depend luatex
+
diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc
index 07e93180a17..42a2653012a 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -33,6 +33,7 @@ binpattern f bin/${ARCH}/pmpost
 binpattern f bin/${ARCH}/ppltotf
 binpattern f bin/${ARCH}/ptex
 binpattern f bin/${ARCH}/ptftopl
+binpattern f bin/${ARCH}/upmendex
 #
 runpattern +d texmf-dist/pbibtex
 runpattern +d texmf-dist/tex/platex/base