no everything-but matches for cygwin lz4

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

2 files changed, 22 insertions, 14 deletions

diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index 6948f15be6f..5415d7d1cbe 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -2,7 +2,7 @@
 # $Id$
 # convert a set of tlpsrc files (given as arguments) into tlpdb
 # 
-# Copyright 2007-2014 Norbert Preining
+# Copyright 2007-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
@@ -475,7 +475,8 @@ tl-update-tlpdb [OPTION]... [TLPSRC]...
 The I<Catalogue_file> must point to a valid TeX Catalogue checkout; the
 default is C</home/httpd/html/catalogue>.  If the directory is readable,
 the generated tlpobj files will contain information gathered from the
-TeX Catalogue.
+TeX Catalogue.  To disable this, specify a nonexistent filename, e.g.,
+C<--catalogue=/nonesuch>.
 
 =item B<--fix-reverse-revisions>
 
@@ -533,12 +534,12 @@ program.
 =item B<--tlpsrc-from-cmdline>
 
 By default, C<tl-update-tlpdb> recreates the tlpdb from all the tlpsrc
-files present in the current tree.  If this option is given, the tlpsrc
-file(s), or package names, are given on the command line.  If you're
+files present in the current tree. If this option is given, the tlpsrc
+file(s), or package names, are given on the command line. If you're
 trying to debug the conversion of one particular package, this is the
-option to use (along with C<-n>, most likely).  Indeed, if any
-non-option arguments are given, the program assumes you meant to specify
-this option.
+option to use (along with C<-n> and C<--catalogue=/nonesuch>, most
+likely). Indeed, if any non-option arguments are given, the program
+assumes you meant to specify this option.
 
 =item B<--with-w32-pattern-warning>
 
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 93774f1ecbf..6c71959e97a 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -40,19 +40,27 @@ binpattern f/win32 tlpkg/installer/xz/xz.exe
 binpattern f/win32 tlpkg/installer/wget/wget.exe
 binpattern f/win32 tlpkg/installer/lz4/lz4.exe
 #
+#
+# i386-cygwin with .exe, not without.
 binpattern f/i386-cygwin tlpkg/installer/xz/xzdec.i386-cygwin.exe
-binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
 binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH}
+#
+binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
 binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
+#
 binpattern f/i386-cygwin tlpkg/installer/lz4/lz4.i386-cygwin.exe
-binpattern f/!i386-cygwin tlpkg/installer/lz4/lz4.${ARCH}
+binpattern f/!i386-cygwin tlpkg/installer/lz4/lz4.i386-cygwin
 #
+# x86_64-cygwin with .exe, not without.
 binpattern f/x86_64-cygwin tlpkg/installer/xz/xzdec.x86_64-cygwin.exe
-binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe
 binpattern f/!x86_64-cygwin tlpkg/installer/xz/xzdec.${ARCH}
+#
+binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe
 binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH}
+#
 binpattern f/x86_64-cygwin tlpkg/installer/lz4/lz4.x86_64-cygwin.exe
-binpattern f/!x86_64-cygwin tlpkg/installer/lz4/lz4.${ARCH}
+binpattern f/!x86_64-cygwin tlpkg/installer/lz4/lz4.x86_64-cygwin
+#
 #
 # platforms for which we do not provide wget, because it is part of the
 # normal system install (this list is duplicated in 00texlive.installer):
@@ -67,10 +75,9 @@ x86_64-linux,\
 x86_64-linuxmusl,\
 x86_64-solaris \
   tlpkg/installer/wget/wget.${ARCH}
-
 #
-# platforms for which we do not have lz4 for now
-# this list is not duplicated ;-)
+#
+# platforms for which we do not have lz4. this list is not duplicated ;-).
 binpattern f/!\
 aarch64-linux,\
 amd64-freebsd,\