update triggers with recent latex changes, etc.

tl-check-fmttriggers (compare_pkgs_and_triggers): don't worry about
atbegshi|atveryend; or about l3backend-dev.

00texlive.autopatterns.tlpsrc (global_latex_common_deps): add knuth-lib here.
(global_luatex_deps): remove from here.

jadetex.tlpsrc (fmtcomm): remove auxhook, latexconfig, letltxmacro,
apparently no longer read.

latex-bin-dev.tlpsrc (nonluafmtdeps): remove latexconfig.
latex-bin.tlpsrc (nonluafmtdeps): remove latexconfig.

luahbtex.tlpsrc (luahbtex): remove luatex from fmttriggers.

xmltex.tlpsrc (fmtcomm): remove latexconfig.


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

7 files changed, 14 insertions, 10 deletions

diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers
index 48a6cbac243..77b7744cbc4 100755
--- a/Master/tlpkg/bin/tl-check-fmttriggers
+++ b/Master/tlpkg/bin/tl-check-fmttriggers
@@ -333,6 +333,9 @@ sub compare_pkgs_and_triggers {
           # The hyphen-* packages get loaded anyway? Not sure.
           next if $r =~ /hyph-utf8|hyphen-.*/;
           next if $r =~ /dehyph|dehyph-exptl|ruhyph|ukrhyph/;
+          # LaTeX loads these if available, so they end up in the
+          # recorder, but they are not required.
+          next if $r =~ /atbegshi|atveryend/; 
           push (@recorded_only, $r);
         }
       }
@@ -345,7 +348,8 @@ sub compare_pkgs_and_triggers {
         # luaotfload doesn't show up in the recorder output,
         # unfortunately. It's used in the lualatex patterns.
         # 
-        my @skip_tlpdb = qw(firstaid l3backend l3kernel latex
+        my @skip_tlpdb = qw(firstaid 
+                            l3backend l3backend-dev l3kernel latex
                             luaotfload
                             tex-ini-files unicode-data);
         my %skip_tlpdb; @skip_tlpdb{@skip_tlpdb} = 1; # make into hash
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 1cc1cafed84..c63e7c59764 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -39,17 +39,17 @@ longdesc See the TeXLive::TLPSRC documentation for more.
 # (specifically, tl-compare-tlpdbs).
 # 
 tlpsetvar global_latex_common_deps \
-  babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+  babel,cm,hyphen-base,knuth-lib,latex-fonts,tex-ini-files,unicode-data
 #
 tlpsetvar global_latex_deps \
-  l3backend,l3kernel,latex,latex,firstaid,${global_latex_common_deps}
+  l3backend,l3kernel,latex,firstaid,${global_latex_common_deps}
 #
 tlpsetvar global_latex_dev_deps \
   l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,${global_latex_common_deps}
 #
 # These packages are used by all LuaTeX variants - luatex, luajittex, luahbtex.
 tlpsetvar global_luatex_deps \
-  cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
+  cm,etex,hyphen-base,plain,tex-ini-files,unicode-data
 
 # Platforms that don't support jit.
 tlpsetvar global_no_luajit_platforms i386-solaris,x86_64-solaris
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 23633deb13d..3937c0db9fe 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -5,11 +5,11 @@ depend tex
 
 # most of these are due to hyperref.
 tlpsetvar fmtcomm ${global_latex_deps},\
-amsfonts,auxhook,bigintcalc,bitset,\
+amsfonts,bigintcalc,bitset,\
 colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,\
 graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,\
 infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,\
-latexconfig,letltxmacro,ltxcmds,marvosym,\
+ltxcmds,marvosym,\
 passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,\
 symbol,tipa,tools,ulem,uniquecounter,url,\
 wasysym,zapfding
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index f713b6053eb..43ee6a671ec 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -21,7 +21,7 @@ docpattern f texmf-dist/doc/man/man1/*latex-dev.*
 # cf. latex-bin.tlpsrc.
 tlpsetvar fmtcomm ${global_latex_dev_deps}
 #
-tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps dehyph,hyph-utf8
 tlpsetvar luafmtdeps lm,luaotfload
 
 binpattern f bin/${ARCH}/latex-dev
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 537064024f6..7f776839c21 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -15,7 +15,7 @@ depend graphics
 
 # cf. latex-bin-dev.tlpsrc.
 tlpsetvar fmtcomm ${global_latex_deps}
-tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps dehyph,hyph-utf8
 tlpsetvar luafmtdeps lm,luaotfload
 
 docpattern f texmf-dist/doc/man/man1/latex.*
diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
index 7da3ee74f49..06d5cc4f6ac 100644
--- a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
@@ -6,7 +6,7 @@ binpattern f bin/${ARCH}/luahbtex
 execute AddFormat name=luahbtex engine=luahbtex \
   patterns=language.def,language.dat.lua \
   options="luatex.ini" \
-  fmttriggers=${global_luatex_deps},hyph-utf8,luatex
+  fmttriggers=${global_luatex_deps},hyph-utf8
 
 # can't have luahbtex without luatex.
 depend luatex
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index c698c6e8e20..4993a497fe8 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -2,7 +2,7 @@ depend latex
 depend pdftex
 depend tex
 
-tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8,latexconfig
+tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8
 #
 execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
           options="*xmltex.ini" \