pattern reduction

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

38 files changed, 54 insertions, 67 deletions

diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index fe3689302b0..fa734190d27 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -1,6 +1,6 @@
 # $Id$
 # TeXLive::TLTREE.pm - work with the tree of all files
-# Copyright 2007-2014 Norbert Preining
+# Copyright 2007-2016 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
@@ -315,15 +315,58 @@ sub _get_files_matching_regexp_pattern {
   return(@returnfiles);
 }
 
+#
+# go through all dir names in the TLTREE such that 
+# which are named like the last entry of @patwords,
+# and which have initial path component of the 
+# rest of @patwords
+#
+# This is not optimal, because many subsetted 
+# dirs are found, example package graphics contains
+# the following exception line to make sure that 
+# these files are not included.
+# docpattern +!d texmf-dist/doc/latex/graphicxbox/examples/graphics
+#
+# We don't need *arbitrary* depth, because what can happen is
+# that the autopattern
+#   docpattern Package t texmf-dist doc %NAME%
+# can match at one of the following
+#   texmf-dist/doc/%NAME
+#   texmf-dist/doc/<SOMETHING>/%NAME
+# but not deeper.
+# Same for the others.
+#
+# Lets say that we try that <SOMETHING> contains at *most* 
+# one (1) / (forward slash/path separator)
+#
+# only for fonts we need a special treatment with 3
+#
 sub _get_files_matching_dir_pattern {
   my ($self,$type,@patwords) = @_;
   my $tl = pop @patwords;
+  my $maxintermediate = 1;
+  if (($#patwords >= 1 && $patwords[1] eq 'fonts')
+      || 
+      ($#patwords >= 2 && $patwords[2] eq 'context')) {
+    $maxintermediate = 2;
+  }
   my @returnfiles;
   if (defined($self->{'_dirnames'}{$tl})) {
     foreach my $tld (@{$self->{'_dirnames'}{$tl}}) {
-      if (index($tld,join("/",@patwords)."/") == 0) {
-        my @files = $self->files_under_path($tld);
-        TeXLive::TLUtils::push_uniq(\@returnfiles, @files);
+      my $startstr = join("/",@patwords)."/";
+      if (index($tld, $startstr) == 0) {
+        my $middlepart = $tld;
+        $middlepart =~ s/\Q$startstr\E//;
+        $middlepart =~ s!/$tl/!!;
+        # put match into list context returns
+        # all matches, which is than coerced to
+        # an integer which gives the number!
+        my $number = () = $middlepart =~ m!/!g;
+        #printf STDERR "DEBUG: maxint=$maxintermediate, number=$number, patwords=@patwords\n";
+        if ($number <= $maxintermediate) {
+          my @files = $self->files_under_path($tld);
+          TeXLive::TLUtils::push_uniq(\@returnfiles, @files);
+        }
       }
     }
   }
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 866f0949dc5..779e44546c0 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -19,9 +19,13 @@ runpattern Package t texmf-dist mft %NAME%
 runpattern Package t texmf-dist omega %NAME%
 runpattern Package t texmf-dist scripts %NAME%
 runpattern Package t texmf-dist tex %NAME%
+runpattern Package d texmf-dist/tex/context/third/%NAME%
+runpattern Package d texmf-dist/fonts/misc/xetex/fontmapping/%NAME%
+runpattern Package d texmf-dist/scripts/context/lua/third/%NAME%
 srcpattern Package t texmf-dist source %NAME%
 docpattern Package t texmf-dist doc %NAME%
 docpattern Package f texmf-dist/doc/man/man1/%NAME%.*
+docpattern Package d texmf-dist/doc/context/third/%NAME%
 
 # auto patterns for category TLCore
 docpattern TLCore t texmf-dist doc %NAME%
diff --git a/Master/tlpkg/tlpsrc/algorithms.tlpsrc b/Master/tlpkg/tlpsrc/algorithms.tlpsrc
index 624a46291dc..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/algorithms.tlpsrc
+++ b/Master/tlpkg/tlpsrc/algorithms.tlpsrc
@@ -1 +0,0 @@
-runpattern +!d texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/force/jedi/algorithms
diff --git a/Master/tlpkg/tlpsrc/apa.tlpsrc b/Master/tlpkg/tlpsrc/apa.tlpsrc
index 9275ba497d7..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/apa.tlpsrc
+++ b/Master/tlpkg/tlpsrc/apa.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/latex-web-companion/apa
diff --git a/Master/tlpkg/tlpsrc/appendix.tlpsrc b/Master/tlpkg/tlpsrc/appendix.tlpsrc
index 9fb72749dad..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/appendix.tlpsrc
+++ b/Master/tlpkg/tlpsrc/appendix.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/ksp-thesis/demo/full/content/appendix
diff --git a/Master/tlpkg/tlpsrc/background.tlpsrc b/Master/tlpkg/tlpsrc/background.tlpsrc
index 3d1f5887f71..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/background.tlpsrc
+++ b/Master/tlpkg/tlpsrc/background.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/stex/example/background
diff --git a/Master/tlpkg/tlpsrc/beamer.tlpsrc b/Master/tlpkg/tlpsrc/beamer.tlpsrc
index d3dd4d0968f..14ed423b416 100644
--- a/Master/tlpkg/tlpsrc/beamer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/beamer.tlpsrc
@@ -1,4 +1,2 @@
-docpattern +!d texmf-dist/doc/latex/presentations/images/beamer
-docpattern +!d texmf-dist/doc/latex/presentations-en/images/beamer
 depend pgf
 depend xcolor
diff --git a/Master/tlpkg/tlpsrc/c90.tlpsrc b/Master/tlpkg/tlpsrc/c90.tlpsrc
index e69de29bb2d..de6532ef621 100644
--- a/Master/tlpkg/tlpsrc/c90.tlpsrc
+++ b/Master/tlpkg/tlpsrc/c90.tlpsrc
@@ -0,0 +1,2 @@
+docpattern +d texmf-dist/doc/fonts/enc/c90
+srcpattern +d texmf-dist/source/fonts/enc/c90
diff --git a/Master/tlpkg/tlpsrc/cell.tlpsrc b/Master/tlpkg/tlpsrc/cell.tlpsrc
index 6d453a0a07a..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/cell.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cell.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/cals/test/cell
diff --git a/Master/tlpkg/tlpsrc/cm.tlpsrc b/Master/tlpkg/tlpsrc/cm.tlpsrc
index cad7ad2e1dd..a64279c99d8 100644
--- a/Master/tlpkg/tlpsrc/cm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cm.tlpsrc
@@ -1,3 +1,4 @@
 execute addMixedMap cmtext-bsr-interpolated.map
+runpattern +d texmf-dist/fonts/pk/ljfour/public/cm/dpi600
 runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cm
 runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cm
diff --git a/Master/tlpkg/tlpsrc/cmap.tlpsrc b/Master/tlpkg/tlpsrc/cmap.tlpsrc
index 5bcfb52ac3f..b9ea8365bb7 100644
--- a/Master/tlpkg/tlpsrc/cmap.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmap.tlpsrc
@@ -1,2 +1 @@
 runpattern +!d texmf-dist/fonts/cmap
-runpattern +!d texmf-dist/tex/latex/xcjk2uni/cmap
diff --git a/Master/tlpkg/tlpsrc/cmextra.tlpsrc b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
index 95575f5aebe..cbc57809e4f 100644
--- a/Master/tlpkg/tlpsrc/cmextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmextra.tlpsrc
@@ -1,5 +1 @@
 catalogue knuth-local
-runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cmextra
-runpattern +!d texmf-dist/fonts/source/public/amsfonts/cmextra
-runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cmextra
-runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cmextra
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index e9646c936df..409813b380f 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -56,7 +56,6 @@ runpattern +!d texmf-dist/metapost/context/third
 #
 srcpattern +!d texmf-dist/source/context/third
 #
-docpattern +!d texmf-dist/doc/generic/tex-virtual-academy-pl/context
 docpattern +!d texmf-dist/doc/context/third
 docpattern +f texmf-dist/doc/man/man1/luatools.*
 docpattern +f texmf-dist/doc/man/man1/texexec.*
diff --git a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
index 5e291a5cd5b..a4c6e4ff8d7 100644
--- a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
@@ -1,8 +1,2 @@
 catalogue latex-cyrillic
-#
-runpattern +!d texmf-dist/fonts/afm/public/amsfonts/cyrillic
-runpattern +!d texmf-dist/fonts/source/public/amsfonts/cyrillic
-runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/cyrillic
-runpattern +!d texmf-dist/fonts/type1/public/amsfonts/cyrillic
-#
 depend cyrillic-bin
diff --git a/Master/tlpkg/tlpsrc/dirtree.tlpsrc b/Master/tlpkg/tlpsrc/dirtree.tlpsrc
index 4eaf2070114..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/dirtree.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dirtree.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/skb/user-guide/figures/dirtree
diff --git a/Master/tlpkg/tlpsrc/errata.tlpsrc b/Master/tlpkg/tlpsrc/errata.tlpsrc
index 41306fa6a35..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/errata.tlpsrc
+++ b/Master/tlpkg/tlpsrc/errata.tlpsrc
@@ -1,2 +0,0 @@
-docpattern +!d texmf-dist/doc/generic/knuth/errata
-srcpattern +!d texmf-dist/source/generic/knuth/errata
diff --git a/Master/tlpkg/tlpsrc/euler.tlpsrc b/Master/tlpkg/tlpsrc/euler.tlpsrc
index c2fe4c241ec..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/euler.tlpsrc
+++ b/Master/tlpkg/tlpsrc/euler.tlpsrc
@@ -1,3 +0,0 @@
-runpattern +!d texmf-dist/fonts/afm/public/amsfonts/euler
-runpattern +!d texmf-dist/fonts/tfm/public/amsfonts/euler
-runpattern +!d texmf-dist/fonts/type1/public/amsfonts/euler
diff --git a/Master/tlpkg/tlpsrc/exercises.tlpsrc b/Master/tlpkg/tlpsrc/exercises.tlpsrc
index 623481fe1b7..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/exercises.tlpsrc
+++ b/Master/tlpkg/tlpsrc/exercises.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/guide-to-latex/exercises
diff --git a/Master/tlpkg/tlpsrc/german.tlpsrc b/Master/tlpkg/tlpsrc/german.tlpsrc
index cfa108c777c..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/german.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/jurabib/docs/german
diff --git a/Master/tlpkg/tlpsrc/glossaries.tlpsrc b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
index 3675bbd49c4..7ee900670f1 100644
--- a/Master/tlpkg/tlpsrc/glossaries.tlpsrc
+++ b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
@@ -1,3 +1,2 @@
 binpattern f bin/${ARCH}/makeglossaries
 binpattern f bin/${ARCH}/makeglossaries-lite
-docpattern +!d texmf-dist/doc/latex/yathesis/french/documentation/glossaries
diff --git a/Master/tlpkg/tlpsrc/graphics.tlpsrc b/Master/tlpkg/tlpsrc/graphics.tlpsrc
index 99297856e76..f9e465c1375 100644
--- a/Master/tlpkg/tlpsrc/graphics.tlpsrc
+++ b/Master/tlpkg/tlpsrc/graphics.tlpsrc
@@ -2,9 +2,4 @@ catalogue latex-graphics
 #
 runpattern +!d texmf-dist/scripts/context/ruby/graphics
 #
-docpattern +!d texmf-dist/doc/context/sources/general/manuals/start/graphics
-docpattern +!d texmf-dist/doc/latex/graphicxbox/examples/graphics
-docpattern +!d texmf-dist/doc/latex/navydocs/graphics
-docpattern +!d texmf-dist/doc/latex/tufte-latex/graphics
-#
 depend graphics-cfg
diff --git a/Master/tlpkg/tlpsrc/ipaex.tlpsrc b/Master/tlpkg/tlpsrc/ipaex.tlpsrc
index ee9baa3754d..280c77c1294 100644
--- a/Master/tlpkg/tlpsrc/ipaex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ipaex.tlpsrc
@@ -1,2 +1 @@
 shortdesc IPA and IPAex fonts from Information-technology Promotion Agency, Japan.
-runpattern +!d texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex
diff --git a/Master/tlpkg/tlpsrc/japanese.tlpsrc b/Master/tlpkg/tlpsrc/japanese.tlpsrc
index 63786d7e363..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/japanese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/japanese.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/cjk/doc/japanese
diff --git a/Master/tlpkg/tlpsrc/layouts.tlpsrc b/Master/tlpkg/tlpsrc/layouts.tlpsrc
index 0931f0e219d..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/layouts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/layouts.tlpsrc
@@ -1 +0,0 @@
-runpattern +!d texmf-dist/tex/latex/fixme/layouts
diff --git a/Master/tlpkg/tlpsrc/manfnt.tlpsrc b/Master/tlpkg/tlpsrc/manfnt.tlpsrc
index 878a257e2c2..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/manfnt.tlpsrc
+++ b/Master/tlpkg/tlpsrc/manfnt.tlpsrc
@@ -1,4 +0,0 @@
-# this is the latex package; the actual font is in manfnt-font.
-runpattern +!d texmf-dist/fonts/afm/hoekwater/manfnt-font
-runpattern +!d texmf-dist/fonts/type1/hoekwater/manfnt-font
-
diff --git a/Master/tlpkg/tlpsrc/mflogo.tlpsrc b/Master/tlpkg/tlpsrc/mflogo.tlpsrc
index efa168f72c4..8e6f4f87991 100644
--- a/Master/tlpkg/tlpsrc/mflogo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mflogo.tlpsrc
@@ -1,7 +1,4 @@
 # this is the latex package; the actual font is in mflogo-font.
-runpattern +!d texmf-dist/fonts/afm/hoekwater/mflogo-font
-runpattern +!d texmf-dist/fonts/type1/hoekwater/mflogo-font
-runpattern +!d texmf-dist/fonts/map/dvips/mflogo-font
 #
 docpattern +!d texmf-dist/doc/fonts/mflogo-font
 
diff --git a/Master/tlpkg/tlpsrc/ms.tlpsrc b/Master/tlpkg/tlpsrc/ms.tlpsrc
index 6b3f0279b07..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/ms.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ms.tlpsrc
@@ -1 +0,0 @@
-runpattern +!d texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms
diff --git a/Master/tlpkg/tlpsrc/notes.tlpsrc b/Master/tlpkg/tlpsrc/notes.tlpsrc
index 948cd12a0b8..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/notes.tlpsrc
+++ b/Master/tlpkg/tlpsrc/notes.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/fonts/gnu-freefont/notes
diff --git a/Master/tlpkg/tlpsrc/patch.tlpsrc b/Master/tlpkg/tlpsrc/patch.tlpsrc
index 4453184d812..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/patch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/patch.tlpsrc
@@ -1,2 +0,0 @@
-srcpattern +!d texmf-dist/source/latex/latex-tds/patch
-srcpattern +!d texmf-dist/source/fonts/japanese-otf-uptex/patch
diff --git a/Master/tlpkg/tlpsrc/pdfscreen.tlpsrc b/Master/tlpkg/tlpsrc/pdfscreen.tlpsrc
index e34f1b7a347..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/pdfscreen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfscreen.tlpsrc
@@ -1,2 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/presentations/images/pdfscreen
-docpattern +!d texmf-dist/doc/latex/presentations-en/images/pdfscreen
diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc
index 4f08b46bc6c..653b49a1b11 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -25,8 +25,6 @@ binpattern f bin/${ARCH}/upmendex
 binpattern f/i386-cygwin bin/i386-cygwin/cygptexenc*.dll
 binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygptexenc*.dll
 
-runpattern +!d texmf-dist/tex/generic/hyph-utf8/patterns/ptex
-
 docpattern +f texmf-dist/doc/man/man1/mendex.*
 
 # pbibtex excludes:
diff --git a/Master/tlpkg/tlpsrc/shapes.tlpsrc b/Master/tlpkg/tlpsrc/shapes.tlpsrc
index c47ddce33e0..8f7b32878eb 100644
--- a/Master/tlpkg/tlpsrc/shapes.tlpsrc
+++ b/Master/tlpkg/tlpsrc/shapes.tlpsrc
@@ -1,2 +1 @@
 # core pgf files not part of this metapost package.
-runpattern +!d texmf-dist/tex/generic/pgf/libraries/shapes
diff --git a/Master/tlpkg/tlpsrc/talk.tlpsrc b/Master/tlpkg/tlpsrc/talk.tlpsrc
index 55fc3add94d..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/talk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/talk.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/aiaa/pre2004/demos/talk
diff --git a/Master/tlpkg/tlpsrc/texworks.tlpsrc b/Master/tlpkg/tlpsrc/texworks.tlpsrc
index 92ccf47938b..07e79266231 100644
--- a/Master/tlpkg/tlpsrc/texworks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texworks.tlpsrc
@@ -17,4 +17,3 @@ binpattern f/win32 tlpkg/texworks/texworks.exe
 runpattern d tlpkg/texworks
 runpattern +!f tlpkg/texworks/texworks.exe
 #
-docpattern +!d texmf-dist/doc/support/arara/figures/texworks
diff --git a/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc b/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
index a9e1fc341e4..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/latex/texpower/tpslifonts
diff --git a/Master/tlpkg/tlpsrc/units.tlpsrc b/Master/tlpkg/tlpsrc/units.tlpsrc
index d2bad92170e..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/units.tlpsrc
+++ b/Master/tlpkg/tlpsrc/units.tlpsrc
@@ -1 +0,0 @@
-docpattern +!d texmf-dist/doc/context/sources/general/manuals/units
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index f99e19ef65a..b81b2e5e5ee 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -4,7 +4,5 @@ execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
 #
 binpattern f bin/${ARCH}/uplatex
 
-docpattern +!d texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex
-
 # need the binary.
 depend uptex
diff --git a/Master/tlpkg/tlpsrc/wadalab.tlpsrc b/Master/tlpkg/tlpsrc/wadalab.tlpsrc
index d2e62aa301d..9cc8992207e 100644
--- a/Master/tlpkg/tlpsrc/wadalab.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wadalab.tlpsrc
@@ -4,8 +4,3 @@ execute addMap mc2j.map
 execute addMap mcj.map
 execute addMap mr2j.map
 execute addMap mrj.map
-#
-# these are part of the cjk package, despite being in a wadalab subdir.
-srcpattern +!d texmf-dist/source/latex/cjk/contrib/wadalab
-runpattern +!d texmf-dist/tex/latex/cjk/contrib/wadalab
-docpattern +!d texmf-dist/source/latex/cjk/contrib/wadalab