11 files changed, 17 insertions, 29 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 1faf0fc8ed1..23b3e31521a 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -328,7 +328,7 @@ sub make_tlpobj
         @archfiles = @{$archmatches{$arch}};
       }
       if (!@archfiles) {
-        tlwarn("binpattern without hit: ".$self->name.": $arch: $p\n");
+        tlwarn("binpattern without hit in $self->name ($arch): $p\n");
       }
       $tlp->add_binfiles($arch,@archfiles);
     }
@@ -344,7 +344,7 @@ sub make_tlpobj
         @archfiles = @{$archmatches{$arch}};
       }
       if (!@archfiles) {
-        tlwarn("binpattern without hit: ".$self->name.": $arch: $p\n");
+        tlwarn("negative binpattern without hit: ".$self->name.": $arch: $p\n");
       }
       $tlp->remove_binfiles($arch,@archfiles);
     }
@@ -366,7 +366,7 @@ sub _do_normal_pattern {
   my $matchref = $tltree->get_matching_files($type,$p);
   my @matchfiles = @$matchref;
   if (!$is_default_pattern && !@matchfiles && ($p !~ m/^f ignore/)) {
-    tlwarn("pattern without hit: ".$self->name.": $p\n");
+    tlwarn("pattern without hit in $self->name: $p\n");
   }
   if (defined($negative) && $negative == 1) {
     $tlp->remove_files($type,@matchfiles);
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index 9f532042bf8..0de381f71e9 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -16,14 +16,17 @@ runpattern f tlpkg/installer/config.guess
 # automatically added by tl-make-installer-package
 #runpattern d tlpkg/TeXLive
 runpattern d tlpkg/installer
+
 # but no lzma binaries
 runpattern !d tlpkg/installer/lzma
+
 # and no perl lib
 runpattern !d tlpkg/installer/perllib
-# and no other .exe/.bat./.dll
+
+# and no other .exe/.dll
 runpattern !f tlpkg/installer/*.exe
 runpattern !f tlpkg/installer/*.dll
-runpattern !f tlpkg/installer/*.bat
+
 # binpatterns
 binpattern d/win32 tlpkg/installer/perllib
 binpattern f/win32 tlpkg/installer/*.exe
diff --git a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
index 28f385bef88..31f61221cc8 100644
--- a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
@@ -39,7 +39,6 @@ docpattern f texmf/doc/man/man8/mktexfmt.*
 docpattern f texmf/doc/man/whatis
 docpattern f texmf/doc/man/windex
 docpattern f texmf/doc/web2c/*
-binpattern f bin/${ARCH}/MakeTeXPK
 binpattern f bin/${ARCH}/kpseaccess
 binpattern f bin/${ARCH}/kpsepath
 binpattern f bin/${ARCH}/kpsereadlink
@@ -55,7 +54,6 @@ binpattern f bin/${ARCH}/mktexmf
 binpattern f bin/${ARCH}/mktexpk
 binpattern f bin/${ARCH}/mktextfm
 binpattern f bin/${ARCH}/texhash
-binpattern f bin/${ARCH}/uniqleaf
 binpattern f bin/win32/kpathsea356.dll
 binpattern f bin/win32/kpathsea35671.dll
 binpattern f bin/win32/mktexupd.exe
diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
index 04f65fa6d58..3277f92bdca 100644
--- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
@@ -9,4 +9,3 @@ docpattern f texmf/doc/info/latex.info
 docpattern f texmf/doc/latex/base/*
 docpattern f texmf/doc/man/man1/latex.1
 binpattern f bin/${ARCH}/latex
-binpattern f bin/${ARCH}/olatex
diff --git a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
index 17847a45b64..e62a1f496b5 100644
--- a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
@@ -28,11 +28,8 @@ binpattern f bin/${ARCH}/dvired
 binpattern f bin/${ARCH}/fmtutil
 binpattern f bin/${ARCH}/fmtutil-sys
 binpattern f bin/${ARCH}/fmtutil-sys.pl
-binpattern f bin/${ARCH}/fontexport
-binpattern f bin/${ARCH}/fontimport
 binpattern f bin/${ARCH}/fontinst
 binpattern f bin/${ARCH}/kpsewhere
-binpattern f bin/${ARCH}/mkfontdesc
 binpattern f bin/${ARCH}/ps4pdf
 binpattern f bin/${ARCH}/texconfig-dialog
 binpattern f bin/${ARCH}/texconfig-sys
diff --git a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
index 0af57614b63..580470abba4 100644
--- a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
@@ -7,5 +7,5 @@ runpattern f texmf/texdoctk/*
 docpattern f texmf/doc/man/man1/texdoc.1
 docpattern f texmf/doc/man/man1/texdoctk.1
 binpattern f bin/${ARCH}/texdoc
-binpattern f bin/${ARCH}/texdocc
 binpattern f bin/${ARCH}/texdoctk
+binpattern f bin/win32/texdocc
diff --git a/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
index d7bdce1185f..5ce92a17a16 100644
--- a/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
@@ -3,11 +3,11 @@ category TLCore
 runpattern f tlpkg/tlgs/README.TEXLIVE
 binpattern d/win32 tlpkg/tlgs
 binpattern d/win32 texmf/scripts/texlive/gswin32
-binpattern f bin/${ARCH}/eps2eps.bat
-binpattern f bin/${ARCH}/pdf2dsc.bat
-binpattern f bin/${ARCH}/pdfopt.bat
-binpattern f bin/${ARCH}/ps2ascii.bat
-binpattern f bin/${ARCH}/ps2pdf.bat
-binpattern f bin/${ARCH}/ps2pdf12.bat
-binpattern f bin/${ARCH}/ps2pdf13.bat
-binpattern f bin/${ARCH}/ps2pdf14.bat
+binpattern f bin/win32/eps2eps.bat
+binpattern f bin/win32/pdf2dsc.bat
+binpattern f bin/win32/pdfopt.bat
+binpattern f bin/win32/ps2ascii.bat
+binpattern f bin/win32/ps2pdf.bat
+binpattern f bin/win32/ps2pdf12.bat
+binpattern f bin/win32/ps2pdf13.bat
+binpattern f bin/win32/ps2pdf14.bat
diff --git a/Master/tlpkg/tlpsrc/bin-xdvi.tlpsrc b/Master/tlpkg/tlpsrc/bin-xdvi.tlpsrc
index 5b5e74a3a93..1866887b413 100644
--- a/Master/tlpkg/tlpsrc/bin-xdvi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xdvi.tlpsrc
@@ -7,9 +7,5 @@ docpattern f texmf/doc/man/man1/t1mapper.*
 docpattern f texmf/doc/man/man1/xdvi.*
 docpattern f texmf/doc/man/man1/xdvizilla.*
 binpattern f bin/${ARCH}/oxdvi
-binpattern f bin/${ARCH}/oxdvi.bin
-binpattern f bin/${ARCH}/t1mapper
 binpattern f bin/${ARCH}/xdvi
 binpattern f bin/${ARCH}/xdvi-*.bin
-binpattern f bin/${ARCH}/xdvi.bin
-binpattern f bin/${ARCH}/xdvizilla
diff --git a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
index 6b93097033a..8909baa4e97 100644
--- a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
@@ -4,6 +4,5 @@ depend bin-pdftex
 depend bin-tex
 execute BuildFormat xmltex
 runpattern f texmf/fmtutil/format.xmltex.cnf
-binpattern f bin/${ARCH}/giftopng
 binpattern f bin/${ARCH}/pdfxmltex
 binpattern f bin/${ARCH}/xmltex
diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
index f8674110acf..8b2900a3feb 100644
--- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
@@ -5,7 +5,6 @@ binpattern f bin/${ARCH}/htcontext
 binpattern f bin/${ARCH}/htlatex
 binpattern f bin/${ARCH}/htmex
 binpattern f bin/${ARCH}/httex
-binpattern f bin/${ARCH}/httexexec
 binpattern f bin/${ARCH}/httexi
 binpattern f bin/${ARCH}/htxelatex
 binpattern f bin/${ARCH}/htxetex
diff --git a/Master/tlpkg/tlpsrc/texinfo.tlpsrc b/Master/tlpkg/tlpsrc/texinfo.tlpsrc
index ca69f00a7ee..1c1dca1c7e7 100644
--- a/Master/tlpkg/tlpsrc/texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texinfo.tlpsrc
@@ -12,12 +12,10 @@ docpattern f texmf/doc/man/man1/infokey.1
 docpattern f texmf/doc/man/man1/install-info.1
 docpattern f texmf/doc/man/man1/makeinfo.1
 docpattern f texmf/doc/man/man1/texi2dvi.1
-docpattern f texmf/doc/man/man1/texi2html.1
 docpattern f texmf/doc/man/man1/texi2pdf.1
 docpattern f texmf/doc/man/man1/texindex.1
 docpattern f texmf/doc/man/man5/info.5
 docpattern f texmf/doc/man/man5/texinfo.5
-docpattern f texmf/doc/texi2html/*
 docpattern f texmf/doc/texinfo/*
 binpattern f bin/${ARCH}/info
 binpattern f bin/${ARCH}/infokey
@@ -25,6 +23,5 @@ binpattern f bin/${ARCH}/install-info
 binpattern f bin/${ARCH}/makeinfo
 binpattern f bin/${ARCH}/pdftexi2dvi
 binpattern f bin/${ARCH}/texi2dvi
-binpattern f bin/${ARCH}/texi2html
 binpattern f bin/${ARCH}/texi2pdf
 binpattern f bin/${ARCH}/texindex