summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texlive.tlpdb42
-rw-r--r--Master/tlpkg/TODO19
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm20
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm20
-rw-r--r--Master/tlpkg/doc/Perl-API.txt12
-rw-r--r--Master/tlpkg/doc/specification.txt8
-rw-r--r--Master/tlpkg/man/TeXLive::TLPSRC.124
-rw-r--r--Master/tlpkg/tlpsrc/bin-afm2pl.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-aleph.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-amstex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-bibtex8.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-bzip2.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-cjkutils.tlpsrc22
-rw-r--r--Master/tlpkg/tlpsrc/bin-context.tlpsrc22
-rw-r--r--Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-csplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ctie.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-cweb.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-detex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-devnag.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dtl.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvi2tty.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvicopy.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvidvi.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dviljk.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipdfm.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipng.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipos.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-dvipsk.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/bin-ebong.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-eplain.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-etex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-fontware.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-getnonfreefonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-gsftopk.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-gzip.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/bin-lacheck.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-latex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/bin-makeindex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-metafont.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-metapost.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/bin-mex.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/bin-mfware.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/bin-mltex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-musixflx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-omega.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-omegaware.tlpsrc11
-rw-r--r--Master/tlpkg/tlpsrc/bin-patgen.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-pdftools.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/bin-perltex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-physe.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-platex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-ps2pkm.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-pstools.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-psutils.tlpsrc19
-rw-r--r--Master/tlpkg/tlpsrc/bin-seetexk.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-t1utils.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/bin-tetex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-tex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc13
-rw-r--r--Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/bin-texsis.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-texware.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-thumbpdf.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-tie.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-ttfutils.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/bin-vpe.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/bin-web.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bin-xetex.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc2
79 files changed, 95 insertions, 307 deletions
diff --git a/Master/texlive.tlpdb b/Master/texlive.tlpdb
index 7c2f47f725f..48e1017ce31 100644
--- a/Master/texlive.tlpdb
+++ b/Master/texlive.tlpdb
@@ -7896,7 +7896,7 @@ binfiles arch=sparc-solaris size=208211
bin/sparc-solaris/sjisconv
bin/sparc-solaris/sjislatex
bin/sparc-solaris/sjispdflatex
-binfiles arch=win32 size=150528
+binfiles arch=win32 size=136192
bin/win32/bg5conv.exe
bin/win32/bg5latex.exe
bin/win32/bg5pdflatex.exe
@@ -7909,8 +7909,6 @@ binfiles arch=win32 size=150528
bin/win32/cefsconv.exe
bin/win32/cefslatex.exe
bin/win32/cefspdflatex.exe
- bin/win32/cjklatex.exe
- bin/win32/cjkpdflatex.exe
bin/win32/extconv.exe
bin/win32/gbklatex.exe
bin/win32/gbkpdflatex.exe
@@ -8223,12 +8221,11 @@ binfiles arch=sparc-solaris size=87267
bin/sparc-solaris/texutil
bin/sparc-solaris/tmftools
bin/sparc-solaris/xmltools
-binfiles arch=win32 size=912513
+binfiles arch=win32 size=909953
bin/win32/ctxtools.bat
bin/win32/exatools.bat
bin/win32/luatools.bat
bin/win32/makempy.bat
- bin/win32/metafun.exe
bin/win32/mpstools.bat
bin/win32/mptopdf.bat
bin/win32/mtxtools.bat
@@ -11205,8 +11202,7 @@ binfiles arch=sparc-solaris size=1739369
bin/sparc-solaris/pdflatex
bin/sparc-solaris/pdftex
bin/sparc-solaris/simpdftex
-binfiles arch=win32 size=1083904
- bin/win32/pdfelatex.exe
+binfiles arch=win32 size=1081344
bin/win32/pdfetex.exe
bin/win32/pdflatex.exe
bin/win32/pdftex.dll
@@ -16422,7 +16418,7 @@ execute addMap cjhebrew.map
docfiles size=115830
texmf-dist/doc/fonts/cjhebrew/cjhebtst.tex
texmf-dist/doc/fonts/cjhebrew/manual.pdf
-runfiles size=74062
+runfiles size=73762
texmf-dist/fonts/afm/public/cjhebrew/cjheblsm.afm
texmf-dist/fonts/afm/public/cjhebrew/cjhebltx.afm
texmf-dist/fonts/enc/dvips/cjhebrew/cjhebltx.enc
@@ -25176,7 +25172,7 @@ runfiles size=3124
name dottex
category Package
revision 2240
-docfiles size=110872
+docfiles size=111155
texmf-dist/doc/latex/dottex/README
texmf-dist/doc/latex/dottex/dottex.pdf
texmf-dist/doc/latex/dottex/example.tex
@@ -32239,7 +32235,7 @@ runfiles size=24312
name gnuplottex
category Package
revision 2382
-docfiles size=106614
+docfiles size=106897
texmf-dist/doc/latex/gnuplottex/README
texmf-dist/doc/latex/gnuplottex/example.tex
texmf-dist/doc/latex/gnuplottex/gnuplottex.pdf
@@ -42385,7 +42381,7 @@ runfiles size=7278
name ltxmisc
category Package
revision 2948
-runfiles size=491155
+runfiles size=491856
texmf-dist/tex/latex/ltxmisc/2in1.sty
texmf-dist/tex/latex/ltxmisc/3parttable.sty
texmf-dist/tex/latex/ltxmisc/a4wide.sty
@@ -43867,11 +43863,11 @@ runfiles size=3741917
name mathdots
category Package
revision 4396
-docfiles size=112178
+docfiles size=112126
texmf-dist/doc/generic/mathdots/README
texmf-dist/doc/generic/mathdots/mathdots.pdf
texmf-dist/doc/generic/mathdots/mdtest.tex
-srcfiles size=16179
+srcfiles size=15802
texmf-dist/source/generic/mathdots/mathdots.dtx
texmf-dist/source/generic/mathdots/mathdots.ins
runfiles size=7128
@@ -44210,7 +44206,7 @@ runfiles size=305950
name metaplot
category Package
revision 2411
-docfiles size=548625
+docfiles size=549634
texmf-dist/doc/latex/metaplot/README
texmf-dist/doc/latex/metaplot/examples/cap1.cc
texmf-dist/doc/latex/metaplot/examples/cap1.mp
@@ -44226,7 +44222,7 @@ docfiles size=548625
texmf-dist/doc/latex/metaplot/examples/metacontour.h
texmf-dist/doc/latex/metaplot/examples/metacontour_main.cc
texmf-dist/doc/latex/metaplot/metaplot_preprint.pdf
-runfiles size=14684
+runfiles size=14903
texmf-dist/metapost/metaplot/axes.mp
texmf-dist/metapost/metaplot/metaplot.mp
@@ -48731,7 +48727,7 @@ runfiles size=4820
name osa
category Package
revision 84
-docfiles size=945618
+docfiles size=948567
texmf-dist/doc/latex/osa/README
texmf-dist/doc/latex/osa/journals/OSAstyle.tex
texmf-dist/doc/latex/osa/journals/OSAstyle_pdf.pdf
@@ -51764,7 +51760,7 @@ docfiles size=111823
texmf-dist/doc/generic/pst-bar/LICENSE
texmf-dist/doc/generic/pst-bar/README
texmf-dist/doc/generic/pst-bar/pst-bar-doc.pdf
-runfiles size=13440
+runfiles size=13890
texmf-dist/dvips/pst-bar/pst-bar.pro
texmf-dist/tex/generic/pst-bar/pst-bar.tex
texmf-dist/tex/latex/pst-bar/pst-bar.sty
@@ -52159,7 +52155,7 @@ docfiles size=336613
texmf-dist/doc/generic/pst-infixplot/pst-infixplot-doc.ps
texmf-dist/doc/generic/pst-infixplot/pst-infixplot-doc.tex
texmf-dist/doc/generic/pst-infixplot/pst-infixplot.pdf
-runfiles size=14347
+runfiles size=14410
texmf-dist/tex/generic/pst-infixplot/infix-RPN.tex
texmf-dist/tex/generic/pst-infixplot/pst-infixplot.tex
texmf-dist/tex/latex/pst-infixplot/infix-RPN.sty
@@ -52265,7 +52261,7 @@ docfiles size=1399856
texmf-dist/doc/generic/pst-osci/oscilloscope.tex
texmf-dist/doc/generic/pst-osci/pst-osci-doc.pdf
texmf-dist/doc/generic/pst-osci/pst-osci-doc.tex
-runfiles size=13033
+runfiles size=13296
texmf-dist/tex/generic/pst-osci/pst-osci.tex
texmf-dist/tex/latex/pst-osci/pst-osci.sty
@@ -54092,7 +54088,7 @@ category Package
revision 1299
docfiles size=2656
texmf-dist/doc/latex/scientificpaper/README
-runfiles size=3591
+runfiles size=3722
texmf-dist/tex/latex/scientificpaper/science.sty
name sciposter
@@ -55068,7 +55064,7 @@ srcfiles size=132022
texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip
texmf-dist/source/latex/stellenbosch/USthesis-3.0-src.zip
texmf-dist/source/latex/stellenbosch/UStitle-1.0-src.zip
-runfiles size=1452456
+runfiles size=1446900
texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst
texmf-dist/bibtex/bst/stellenbosch/ussagus.bst
@@ -55639,7 +55635,7 @@ docfiles size=530596
srcfiles size=27405
texmf-dist/source/latex/tabvar/tabvar.dtx
texmf-dist/source/latex/tabvar/tabvar.ins
-runfiles size=16131
+runfiles size=16100
texmf-dist/fonts/afm/public/tabvar/tabvar.afm
texmf-dist/fonts/map/dvips/tabvar/tabvar.map
texmf-dist/fonts/tfm/public/tabvar/tabvar.tfm
@@ -62583,7 +62579,7 @@ docfiles size=234155
texmf-dist/doc/latex/trfsigns/README
texmf-dist/doc/latex/trfsigns/trfexamp.tex
texmf-dist/doc/latex/trfsigns/trfsigns.pdf
-srcfiles size=18267
+srcfiles size=18656
texmf-dist/source/latex/trfsigns/trfsigns.drv
texmf-dist/source/latex/trfsigns/trfsigns.dtx
texmf-dist/source/latex/trfsigns/trfsigns.ins
diff --git a/Master/tlpkg/TODO b/Master/tlpkg/TODO
index 5e976312dd9..72ec5c671df 100644
--- a/Master/tlpkg/TODO
+++ b/Master/tlpkg/TODO
@@ -1,25 +1,10 @@
TODO for new-infra
==================
-PRE SWITCH
-----------
-done, but in need of testing:
-- change longdesc to use the "longdesc" on every line, so that only files
- are indented with one space
-- dont writeout catalogue if it is eq name
-- categories
- Package -> under texmf-dist
- Documentation -> under texmf-doc
- Collection -> under texmf and is collection
- Scheme -> under texmf and is scheme
- TLCore -> under texmf but is neither collection nor scheme
-
-
-really todo:
-- intelligentify the patterns that on windows foo{.exe,.bat,...} is taken
+PRE SWITCH (which we already have done ...)
+-------------------------------------------
- list files
we should somehow check for equivalence of the two sets of files
a simple grep -v emptylines | sort |uniq ... diff should do it
-- rewrite the place script
POST SWITCH
-----------
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 4d4ab734aa1..4d65bf1fa24 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -579,6 +579,26 @@ If the C<PREFIX> contains the symbol ! the meaning of the pattern is
reversed, i.e., file matching this pattern are removed from the list
of included files.
+=head2 arch expansion
+
+In case the string C<${ARCH}> occurs in one C<binpattern> it is
+automatically expanded to the respective architecture.
+
+=head2 bat/exe for win32
+
+For C<binpatterns> of the form C<f bin/win32/foobar> (i.e., also for a
+binpattern of the form C<f bin/${ARCH}/foobar>) files F<foobar.bat> and
+F<foobar.exe> are also matched.
+
+The above two properties allows to capture the binaries for all architectures
+in one binpattern
+
+ binpattern f bin/${ARCH}/dvips
+
+and would get F<bin/win32/dvips.exe> into the runfiles for arch=win32.
+
+Note that the bat/exe expansion B<only> works for patterns of the C<f> type!
+
=head1 MEMBER ACCESS FUNCTIONS
For any of the above I<keys> a function
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index 39c650665b6..1246a6893a9 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -176,9 +176,7 @@ sub get_matching_files {
my %returnfiles;
foreach $a (@Architectures) {
# return empty list of arch!=win32 and pattern matches bin/win32
- # this is a special case to treat with tlsrc files auto generated
- # from tpm files
- if (($p =~ m@f bin/win32/@) && ($a ne "win32")) {
+ if (($p =~ m@f bin/win32/@) && ($a ne "win32")) {
$returnfiles{$a} = [ ];
next;
}
@@ -204,7 +202,7 @@ sub _get_matching_files {
if ($pattype eq "t") {
@matchfiles = $self->_get_files_matching_dir_pattern($type,$patdata,@rest);
} elsif ($pattype eq "f") {
- @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata);
+ @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata,$arch);
} elsif ($pattype eq "r") {
@matchfiles = $self->_get_files_matching_regexp_pattern($type,$patdata);
} elsif ($pattype eq "d") {
@@ -244,6 +242,16 @@ sub _get_files_matching_glob_pattern {
push @returnfiles, "$dirpart/$f";
}
}
+ if ($dirpart =~ m@^bin/win32@) {
+ # for arch=win32 under bin we also want to match .bat and .exe files
+ foreach my $f (@candfiles) {
+ &TeXLive::TLUtils::debug("matching $f in $dirpart via glob $globline.{bat/exe}\n");
+ if ($f =~ /^$basepart\.(bat|exe)$/) {
+ &TeXLive::TLUtils::debug("hit: globline=$globline, $dirpart/$f\n");
+ push @returnfiles, "$dirpart/$f";
+ }
+ }
+ }
return(@returnfiles);
}
@@ -306,8 +314,6 @@ sub architectures {
return @Architectures;
}
-
-
1;
### Local Variables:
@@ -315,4 +321,4 @@ sub architectures {
### tab-width: 2
### indent-tabs-mode: nil
### End:
-# vim:set tabstop=2: #
+# vim:set tabstop=2 expandtab: #
diff --git a/Master/tlpkg/doc/Perl-API.txt b/Master/tlpkg/doc/Perl-API.txt
index fdb9be418b6..6859acfa6ea 100644
--- a/Master/tlpkg/doc/Perl-API.txt
+++ b/Master/tlpkg/doc/Perl-API.txt
@@ -6,6 +6,8 @@ API for Perl Modules for new infra
Module TeXLive::TLPSRC
----------------------
+PLEASE SEE THE MANPAGE OF TeXLive::TLPSRC which is MORE UP 2 DATE!!!!
+
Constructor:
TeXLive::TLPSRC->new;
TeXLive::TLPSRC->new( name => "foobar", shortdesc => "The foobar package", ...);
@@ -39,6 +41,8 @@ Generation function
Module TeXLive::TLPOBJ
----------------------
+PLEASE SEE THE MANPAGE OF TeXLive::TLPOBJ which is MORE UP 2 DATE!!!!
+
Package variables:
&TeXLive::TLPOBJ->zipdir
set/returns the default location for created zip files
@@ -141,7 +145,7 @@ Read/Write functions (with argument set, without arg read)
NOT FOR binfiles!
-Module TeXLive::TKTREE
+Module TeXLive::TLTREE
----------------------
(this one is still quite hacky)
@@ -176,6 +180,12 @@ Pattern matching functions
returns a ref to an array
(see specification)
+ Note that a pattern of the form
+ bin/${ARCH}/foobar
+ also matches for arch=win32
+ bin/${ARCH}/foobar.{exe,bat}
+
+
Other functions
$tltree->file_svn_lastrevision($file)
diff --git a/Master/tlpkg/doc/specification.txt b/Master/tlpkg/doc/specification.txt
index 9cefac9a834..18c79d83f90 100644
--- a/Master/tlpkg/doc/specification.txt
+++ b/Master/tlpkg/doc/specification.txt
@@ -6,6 +6,10 @@ Specifications
1) tlpsrc
---------
+
+PLEASE SEE THE MANPAGE OF TeXLive::TLPSRC which is MORE UP 2 DATE!!!!
+
+
one file *WITHOUT* empty lines (but beginning and end)
every line looks like
key value
@@ -50,6 +54,7 @@ catalogue
include file "string" where the LAST(!!!) entry (basename)
of string can contain glob characters * and ? (but no other!)
(cheap)
+
d string
include all files in and below the directory "string"
(cheap)
@@ -99,6 +104,9 @@ longdesc
2) tlpobj file
--------------
+
+PLEASE SEE THE MANPAGE OF TeXLive::TLPOBJ which is MORE UP 2 DATE!!!!
+
same format as tlpsrc, but the keys are
name
category
diff --git a/Master/tlpkg/man/TeXLive::TLPSRC.1 b/Master/tlpkg/man/TeXLive::TLPSRC.1
index 1841f7f51f9..512b3770683 100644
--- a/Master/tlpkg/man/TeXLive::TLPSRC.1
+++ b/Master/tlpkg/man/TeXLive::TLPSRC.1
@@ -128,8 +128,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "TeXLive::TLPSRC 3"
-.TH TeXLive::TLPSRC 3 "2007-06-27" "perl v5.8.8" "User Contributed Perl Documentation"
+.IX Title "TLPSRC 3"
+.TH TLPSRC 3 "2007-06-28" "perl v5.8.8" "User Contributed Perl Documentation"
.SH "NAME"
TeXLive::TLPSRC \- TeX Live Package Source access module
.SH "SYNOPSIS"
@@ -320,6 +320,26 @@ binpatterns are never automatically added.
If the \f(CW\*(C`PREFIX\*(C'\fR contains the symbol ! the meaning of the pattern is
reversed, i.e., file matching this pattern are removed from the list
of included files.
+.Sh "arch expansion"
+.IX Subsection "arch expansion"
+In case the string \f(CW\*(C`${ARCH}\*(C'\fR occurs in one \f(CW\*(C`binpattern\*(C'\fR it is
+automatically expanded to the respective architecture.
+.Sh "bat/exe for win32"
+.IX Subsection "bat/exe for win32"
+For \f(CW\*(C`binpatterns\*(C'\fR of the form \f(CW\*(C`f bin/win32/foobar\*(C'\fR (i.e., also for a
+binpattern of the form \f(CW\*(C`f bin/${ARCH}/foobar\*(C'\fR) files \fIfoobar.bat\fR and
+\&\fIfoobar.exe\fR are also matched.
+.PP
+The above two properties allows to capture the binaries for all architectures
+in one binpattern
+.PP
+.Vb 1
+\& binpattern f bin/${ARCH}/dvips
+.Ve
+.PP
+and would get \fIbin/win32/dvips.exe\fR into the runfiles for arch=win32.
+.PP
+Note that the bat/exe expansion \fBonly\fR works for patterns of the \f(CW\*(C`f\*(C'\fR type!
.SH "MEMBER ACCESS FUNCTIONS"
.IX Header "MEMBER ACCESS FUNCTIONS"
For any of the above \fIkeys\fR a function
diff --git a/Master/tlpkg/tlpsrc/bin-afm2pl.tlpsrc b/Master/tlpkg/tlpsrc/bin-afm2pl.tlpsrc
index dc4dd6f31a4..35dd6eba6ba 100644
--- a/Master/tlpkg/tlpsrc/bin-afm2pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-afm2pl.tlpsrc
@@ -7,5 +7,3 @@ runpattern f texmf/tex/latex/afm2pl/*
docpattern f texmf/doc/man/man1/afm2pl.1
docpattern f texmf/doc/man/man1/afm2pl.1.html
binpattern f bin/${ARCH}/afm2pl
-binpattern f bin/win32-static/afm2pl.exe
-binpattern f bin/win32/afm2pl.exe
diff --git a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
index c508aa9559f..ca0e507aa41 100644
--- a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
@@ -7,5 +7,3 @@ runpattern f texmf/web2c/aleph.pool
binpattern f bin/${ARCH}/aleph
binpattern f bin/${ARCH}/lamed
binpattern f bin/win32/aleph.dll
-binpattern f bin/win32/aleph.exe
-binpattern f bin/win32/lamed.exe
diff --git a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
index 0a61cb13979..5b2e51d66b9 100644
--- a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
@@ -7,4 +7,3 @@ docpattern f texmf/doc/man/man1/amstex.1
docpattern f texmf/doc/man/man1/amstex.1.html
binpattern f bin/${ARCH}/altpdfamstex
binpattern f bin/${ARCH}/amstex
-binpattern f bin/win32/amstex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
index c7778bfa312..1b387f4a8a3 100644
--- a/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-bibtex.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-kpathsea
docpattern f texmf/doc/man/man1/bibtex.1
docpattern f texmf/doc/man/man1/bibtex.1.html
binpattern f bin/${ARCH}/bibtex
-binpattern f bin/win32/bibtex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-bibtex8.tlpsrc b/Master/tlpkg/tlpsrc/bin-bibtex8.tlpsrc
index 36c60e0efaf..25ec9343189 100644
--- a/Master/tlpkg/tlpsrc/bin-bibtex8.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-bibtex8.tlpsrc
@@ -3,4 +3,3 @@ category TLCore
runpattern f texmf/bibtex/csf/base/*
docpattern f texmf/doc/bibtex8/*
binpattern f bin/${ARCH}/bibtex8
-binpattern f bin/win32/bibtex8.exe
diff --git a/Master/tlpkg/tlpsrc/bin-bzip2.tlpsrc b/Master/tlpkg/tlpsrc/bin-bzip2.tlpsrc
index 70486573284..45374cfabc7 100644
--- a/Master/tlpkg/tlpsrc/bin-bzip2.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-bzip2.tlpsrc
@@ -4,8 +4,6 @@ docpattern f texmf/doc/bzip2/*
docpattern f texmf/doc/info/bzip2.info
docpattern f texmf/doc/man/man1/bzip2.1
docpattern f texmf/doc/man/man1/bzip2.1.html
-binpattern f bin/win32-static/bzip2.exe
-binpattern f bin/win32-static/bzip2recover.exe
binpattern f bin/win32/bzip2.exe
binpattern f bin/win32/bzip2recover.exe
binpattern f bin/win32/tl90bzip2.dll
diff --git a/Master/tlpkg/tlpsrc/bin-cjkutils.tlpsrc b/Master/tlpkg/tlpsrc/bin-cjkutils.tlpsrc
index 9865af9c093..ad36a39fdf5 100644
--- a/Master/tlpkg/tlpsrc/bin-cjkutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cjkutils.tlpsrc
@@ -45,25 +45,3 @@ binpattern f bin/${ARCH}/hbf2gf
binpattern f bin/${ARCH}/sjisconv
binpattern f bin/${ARCH}/sjislatex
binpattern f bin/${ARCH}/sjispdflatex
-binpattern f bin/win32/bg5conv.exe
-binpattern f bin/win32/bg5latex.exe
-binpattern f bin/win32/bg5pdflatex.exe
-binpattern f bin/win32/bg5pltx.exe
-binpattern f bin/win32/cef5conv.exe
-binpattern f bin/win32/cef5latex.exe
-binpattern f bin/win32/cef5pdflatex.exe
-binpattern f bin/win32/cefconv.exe
-binpattern f bin/win32/ceflatex.exe
-binpattern f bin/win32/cefpdflatex.exe
-binpattern f bin/win32/cefsconv.exe
-binpattern f bin/win32/cefslatex.exe
-binpattern f bin/win32/cefspdflatex.exe
-binpattern f bin/win32/cjklatex.exe
-binpattern f bin/win32/cjkpdflatex.exe
-binpattern f bin/win32/extconv.exe
-binpattern f bin/win32/gbklatex.exe
-binpattern f bin/win32/gbkpdflatex.exe
-binpattern f bin/win32/hbf2gf.exe
-binpattern f bin/win32/sjisconv.exe
-binpattern f bin/win32/sjislatex.exe
-binpattern f bin/win32/sjispdflatex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-context.tlpsrc b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
index 1d620c77197..76803269a27 100644
--- a/Master/tlpkg/tlpsrc/bin-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
@@ -37,25 +37,3 @@ binpattern f bin/${ARCH}/textools
binpattern f bin/${ARCH}/texutil
binpattern f bin/${ARCH}/tmftools
binpattern f bin/${ARCH}/xmltools
-binpattern f bin/win32/cont-en.exe
-binpattern f bin/win32/context.exe
-binpattern f bin/win32/ctxtools.bat
-binpattern f bin/win32/exatools.bat
-binpattern f bin/win32/luatools.bat
-binpattern f bin/win32/makempy.bat
-binpattern f bin/win32/metafun.exe
-binpattern f bin/win32/mpstools.bat
-binpattern f bin/win32/mptopdf.bat
-binpattern f bin/win32/mtxtools.bat
-binpattern f bin/win32/pdftools.bat
-binpattern f bin/win32/pstopdf.bat
-binpattern f bin/win32/rlxtools.bat
-binpattern f bin/win32/runtools.bat
-binpattern f bin/win32/texexec.bat
-binpattern f bin/win32/texfont.bat
-binpattern f bin/win32/texmfstart.bat
-binpattern f bin/win32/texmfstart.exe
-binpattern f bin/win32/textools.bat
-binpattern f bin/win32/texutil.bat
-binpattern f bin/win32/tmftools.bat
-binpattern f bin/win32/xmltools.bat
diff --git a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
index 788ebe72cb4..a0ceb37bb06 100644
--- a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
@@ -5,5 +5,3 @@ execute BuildFormat cslatex
runpattern f texmf/fmtutil/format.cslatex.cnf
binpattern f bin/${ARCH}/cslatex
binpattern f bin/${ARCH}/pdfcslatex
-binpattern f bin/win32/cslatex.exe
-binpattern f bin/win32/pdfcslatex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
index 2ced9fad078..6515c1cf7f8 100644
--- a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
@@ -5,5 +5,3 @@ execute BuildFormat csplain
runpattern f texmf/fmtutil/format.csplain.cnf
binpattern f bin/${ARCH}/csplain
binpattern f bin/${ARCH}/pdfcsplain
-binpattern f bin/win32/csplain.exe
-binpattern f bin/win32/pdfcsplain.exe
diff --git a/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
index fdc10e2820a..ddc4cab3c8b 100644
--- a/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ctie.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-kpathsea
docpattern f texmf/doc/man/man1/ctie.1
docpattern f texmf/doc/man/man1/ctie.1.html
binpattern f bin/${ARCH}/ctie
-binpattern f bin/win32/ctie.exe
diff --git a/Master/tlpkg/tlpsrc/bin-cweb.tlpsrc b/Master/tlpkg/tlpsrc/bin-cweb.tlpsrc
index d7c0d2f3bfd..7293b92536a 100644
--- a/Master/tlpkg/tlpsrc/bin-cweb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cweb.tlpsrc
@@ -5,5 +5,3 @@ docpattern f texmf/doc/man/man1/cweave.1
docpattern f texmf/doc/man/man1/cweb.1
binpattern f bin/${ARCH}/ctangle
binpattern f bin/${ARCH}/cweave
-binpattern f bin/win32/ctangle.exe
-binpattern f bin/win32/cweave.exe
diff --git a/Master/tlpkg/tlpsrc/bin-detex.tlpsrc b/Master/tlpkg/tlpsrc/bin-detex.tlpsrc
index cc3bb02aad8..314fa846d51 100644
--- a/Master/tlpkg/tlpsrc/bin-detex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-detex.tlpsrc
@@ -3,4 +3,3 @@ category TLCore
docpattern f texmf/doc/man/man1/detex.1
docpattern f texmf/doc/man/man1/detex.1.html
binpattern f bin/${ARCH}/detex
-binpattern f bin/win32/detex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-devnag.tlpsrc b/Master/tlpkg/tlpsrc/bin-devnag.tlpsrc
index 88893ec3fb4..615261590fc 100644
--- a/Master/tlpkg/tlpsrc/bin-devnag.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-devnag.tlpsrc
@@ -1,4 +1,3 @@
name bin-devnag
category TLCore
binpattern f bin/${ARCH}/devnag
-binpattern f bin/win32/devnag.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dtl.tlpsrc b/Master/tlpkg/tlpsrc/bin-dtl.tlpsrc
index 12cc5b54fdb..32afc15eb75 100644
--- a/Master/tlpkg/tlpsrc/bin-dtl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dtl.tlpsrc
@@ -6,5 +6,3 @@ runpattern f texmf/doc/man/man1/dv2dt.1
runpattern f texmf/doc/man/man1/dv2dt.1.html
binpattern f bin/${ARCH}/dt2dv
binpattern f bin/${ARCH}/dv2dt
-binpattern f bin/win32/dt2dv.exe
-binpattern f bin/win32/dv2dt.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvi2tty.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvi2tty.tlpsrc
index 00f2ac58926..fc53572a369 100644
--- a/Master/tlpkg/tlpsrc/bin-dvi2tty.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvi2tty.tlpsrc
@@ -4,5 +4,3 @@ runpattern f texmf/doc/man/man1/dvi2tty.1
runpattern f texmf/doc/man/man1/dvi2tty.1.html
binpattern f bin/${ARCH}/disdvi
binpattern f bin/${ARCH}/dvi2tty
-binpattern f bin/win32/disdvi.exe
-binpattern f bin/win32/dvi2tty.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvicopy.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvicopy.tlpsrc
index 526c0906e54..8bb50c8e9ab 100644
--- a/Master/tlpkg/tlpsrc/bin-dvicopy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvicopy.tlpsrc
@@ -3,4 +3,3 @@ category TLCore
docpattern f texmf/doc/man/man1/dvicopy.1
docpattern f texmf/doc/man/man1/dvicopy.1.html
binpattern f bin/${ARCH}/dvicopy
-binpattern f bin/win32/dvicopy.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvidvi.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvidvi.tlpsrc
index ead508f0923..037f022dce4 100644
--- a/Master/tlpkg/tlpsrc/bin-dvidvi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvidvi.tlpsrc
@@ -5,4 +5,3 @@ runpattern f texmf/doc/man/man1/dvidvi.1.html
binpattern f bin/${ARCH}/dvidvi
binpattern f bin/win32/a5bookle.bat
binpattern f bin/win32/doubside.bat
-binpattern f bin/win32/dvidvi.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dviljk.tlpsrc b/Master/tlpkg/tlpsrc/bin-dviljk.tlpsrc
index 755a43b7946..13fa4b9ea06 100644
--- a/Master/tlpkg/tlpsrc/bin-dviljk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dviljk.tlpsrc
@@ -13,9 +13,3 @@ binpattern f bin/${ARCH}/dvilj2p
binpattern f bin/${ARCH}/dvilj4
binpattern f bin/${ARCH}/dvilj4l
binpattern f bin/${ARCH}/dvilj6
-binpattern f bin/win32/dvihp.exe
-binpattern f bin/win32/dvilj.exe
-binpattern f bin/win32/dvilj2p.exe
-binpattern f bin/win32/dvilj4.exe
-binpattern f bin/win32/dvilj4l.exe
-binpattern f bin/win32/dvilj6.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvipdfm.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipdfm.tlpsrc
index 76bfa76e060..13e82b399d6 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipdfm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipdfm.tlpsrc
@@ -14,7 +14,3 @@ docpattern f texmf/doc/man/man1/ebb.1.html
binpattern f bin/${ARCH}/dvipdfm
binpattern f bin/${ARCH}/dvipdft
binpattern f bin/${ARCH}/ebb
-binpattern f bin/win32-static/dvipdfm.exe
-binpattern f bin/win32-static/ebb.exe
-binpattern f bin/win32/dvipdfm.exe
-binpattern f bin/win32/ebb.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
index 9e4cc05c236..c4cff3abb4b 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipdfmx.tlpsrc
@@ -5,4 +5,3 @@ runpattern f texmf/dvipdfm/*
runpattern f texmf/fonts/map/dvipdfm/dvipdfmx/*
runpattern f texmf/tex/latex/dvipdfmx/*
binpattern f bin/${ARCH}/dvipdfmx
-binpattern f bin/win32/dvipdfmx.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvipng.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipng.tlpsrc
index c3f6917d79a..c64d9c9ebfd 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipng.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipng.tlpsrc
@@ -5,4 +5,3 @@ docpattern f texmf/doc/info/dvipng.info
docpattern f texmf/doc/man/man1/dvipng.*
binpattern f bin/${ARCH}/dvigif
binpattern f bin/${ARCH}/dvipng
-binpattern f bin/win32/dvipng.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvipos.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipos.tlpsrc
index 563cf2df07e..f72ab48e050 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipos.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipos.tlpsrc
@@ -2,4 +2,3 @@ name bin-dvipos
category TLCore
docpattern f texmf/doc/man/man1/dvipos.*
binpattern f bin/${ARCH}/dvipos
-binpattern f bin/win32/dvipos.exe
diff --git a/Master/tlpkg/tlpsrc/bin-dvipsk.tlpsrc b/Master/tlpkg/tlpsrc/bin-dvipsk.tlpsrc
index 651cd6d286c..4dc849a7877 100644
--- a/Master/tlpkg/tlpsrc/bin-dvipsk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dvipsk.tlpsrc
@@ -14,6 +14,3 @@ docpattern f texmf/doc/pkfix/*
binpattern f bin/${ARCH}/afm2tfm
binpattern f bin/${ARCH}/dvips
binpattern f bin/${ARCH}/pkfix
-binpattern f bin/win32/afm2tfm.exe
-binpattern f bin/win32/dvips.exe
-binpattern f bin/win32/pkfix.exe
diff --git a/Master/tlpkg/tlpsrc/bin-ebong.tlpsrc b/Master/tlpkg/tlpsrc/bin-ebong.tlpsrc
index fbcc6c3c42b..65e5970c6d9 100644
--- a/Master/tlpkg/tlpsrc/bin-ebong.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ebong.tlpsrc
@@ -1,4 +1,3 @@
name bin-ebong
category TLCore
binpattern f bin/${ARCH}/ebong
-binpattern f bin/win32/ebong.exe
diff --git a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
index b117c13b71e..d58a7b7decf 100644
--- a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
@@ -7,4 +7,3 @@ docpattern f texmf/doc/info/eplain.info
docpattern f texmf/doc/man/man1/eplain.1
docpattern f texmf/doc/man/man1/eplain.1.html
binpattern f bin/${ARCH}/eplain
-binpattern f bin/win32/eplain.exe
diff --git a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc b/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
index 294f72eab81..5b37929d2a7 100644
--- a/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-etex.tlpsrc
@@ -8,4 +8,3 @@ docpattern f texmf/doc/man/man1/etex.1.html
binpattern f bin/${ARCH}/einitex
binpattern f bin/${ARCH}/etex
binpattern f bin/${ARCH}/evirtex
-binpattern f bin/win32/etex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-fontware.tlpsrc b/Master/tlpkg/tlpsrc/bin-fontware.tlpsrc
index 66dbdc65d4e..4d503b1248a 100644
--- a/Master/tlpkg/tlpsrc/bin-fontware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-fontware.tlpsrc
@@ -12,7 +12,3 @@ binpattern f bin/${ARCH}/pltotf
binpattern f bin/${ARCH}/tftopl
binpattern f bin/${ARCH}/vftovp
binpattern f bin/${ARCH}/vptovf
-binpattern f bin/win32/pltotf.exe
-binpattern f bin/win32/tftopl.exe
-binpattern f bin/win32/vftovp.exe
-binpattern f bin/win32/vptovf.exe
diff --git a/Master/tlpkg/tlpsrc/bin-getnonfreefonts.tlpsrc b/Master/tlpkg/tlpsrc/bin-getnonfreefonts.tlpsrc
index 9652f4defb0..ab3194602e6 100644
--- a/Master/tlpkg/tlpsrc/bin-getnonfreefonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-getnonfreefonts.tlpsrc
@@ -3,5 +3,3 @@ category TLCore
docpattern f texmf/doc/man/man1/getnonfreefonts*.1
binpattern f bin/${ARCH}/getnonfreefonts
binpattern f bin/${ARCH}/getnonfreefonts-sys
-binpattern f bin/win32/getnonfreefonts-sys.bat
-binpattern f bin/win32/getnonfreefonts.bat
diff --git a/Master/tlpkg/tlpsrc/bin-gsftopk.tlpsrc b/Master/tlpkg/tlpsrc/bin-gsftopk.tlpsrc
index 42cc306468b..35141e31329 100644
--- a/Master/tlpkg/tlpsrc/bin-gsftopk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-gsftopk.tlpsrc
@@ -4,5 +4,3 @@ runpattern f texmf/dvips/gsftopk/*
docpattern f texmf/doc/man/man1/gsftopk.1
docpattern f texmf/doc/man/man1/gsftopk.1.html
binpattern f bin/${ARCH}/gsftopk
-binpattern f bin/win32-static/gsftopk.exe
-binpattern f bin/win32/gsftopk.exe
diff --git a/Master/tlpkg/tlpsrc/bin-gzip.tlpsrc b/Master/tlpkg/tlpsrc/bin-gzip.tlpsrc
index 9763fc5a457..dfd1c1a5b24 100644
--- a/Master/tlpkg/tlpsrc/bin-gzip.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-gzip.tlpsrc
@@ -4,7 +4,5 @@ docpattern f texmf/doc/gzip/*
docpattern f texmf/doc/info/gzip.info
docpattern f texmf/doc/man/man1/gzip.1
docpattern f texmf/doc/man/man1/gzip.1.html
-binpattern f bin/win32-static/gunzip.exe
-binpattern f bin/win32-static/gzip.exe
binpattern f bin/win32/gunzip.exe
binpattern f bin/win32/gzip.exe
diff --git a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
index 88b395dba19..1bcaef5abdd 100644
--- a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
@@ -6,5 +6,3 @@ execute BuildFormat jadetex
runpattern f texmf/fmtutil/format.jadetex.cnf
binpattern f bin/${ARCH}/jadetex
binpattern f bin/${ARCH}/pdfjadetex
-binpattern f bin/win32/jadetex.exe
-binpattern f bin/win32/pdfjadetex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
index 0d9aa4e7f4d..28297e1d264 100644
--- a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
@@ -74,25 +74,13 @@ binpattern f bin/${ARCH}/uniqleaf
binpattern f bin/win32/irun.exe
binpattern f bin/win32/kpathsea356.dll
binpattern f bin/win32/kpathsea35671.dll
-binpattern f bin/win32/kpseaccess.exe
binpattern f bin/win32/kpsecheck.exe
-binpattern f bin/win32/kpsereadlink.exe
-binpattern f bin/win32/kpsestat.exe
-binpattern f bin/win32/kpsewhich.exe
-binpattern f bin/win32/mkocp.exe
-binpattern f bin/win32/mkofm.exe
binpattern f bin/win32/mktex.exe
binpattern f bin/win32/mktexdir.exe
-binpattern f bin/win32/mktexfmt.exe
-binpattern f bin/win32/mktexlsr.exe
-binpattern f bin/win32/mktexmf.exe
binpattern f bin/win32/mktexnam.exe
-binpattern f bin/win32/mktexpk.exe
-binpattern f bin/win32/mktextfm.exe
binpattern f bin/win32/mktexupd.exe
binpattern f bin/win32/msvcp71.dll
binpattern f bin/win32/msvcr71.dll
binpattern f bin/win32/msvcrt.dll
-binpattern f bin/win32/texhash.exe
binpattern f bin/win32/tl90kpse.dll
binpattern f bin/win32/tl90mktex.dll
diff --git a/Master/tlpkg/tlpsrc/bin-lacheck.tlpsrc b/Master/tlpkg/tlpsrc/bin-lacheck.tlpsrc
index 6cf0e4d2a24..1ad7bfdad2b 100644
--- a/Master/tlpkg/tlpsrc/bin-lacheck.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-lacheck.tlpsrc
@@ -3,4 +3,3 @@ category TLCore
runpattern f texmf/doc/man/man1/lacheck.1
runpattern f texmf/doc/man/man1/lacheck.1.html
binpattern f bin/${ARCH}/lacheck
-binpattern f bin/win32/lacheck.exe
diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
index 8041f8a918f..516d12d856a 100644
--- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
@@ -11,5 +11,3 @@ docpattern f texmf/doc/man/man1/latex.1
docpattern f texmf/doc/man/man1/latex.1.html
binpattern f bin/${ARCH}/latex
binpattern f bin/${ARCH}/olatex
-binpattern f bin/win32/LATEX2E.HLP
-binpattern f bin/win32/latex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc b/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
index dd3cab16fac..c46c5a635b5 100644
--- a/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-lcdftypetools.tlpsrc
@@ -29,13 +29,3 @@ binpattern f bin/${ARCH}/t1lint
binpattern f bin/${ARCH}/t1reencode
binpattern f bin/${ARCH}/t1testpage
binpattern f bin/${ARCH}/ttftotype42
-binpattern f bin/win32/cfftot1.exe
-binpattern f bin/win32/mmafm.exe
-binpattern f bin/win32/mmpfb.exe
-binpattern f bin/win32/otfinfo.exe
-binpattern f bin/win32/otftotfm.exe
-binpattern f bin/win32/t1dotlessj.exe
-binpattern f bin/win32/t1lint.exe
-binpattern f bin/win32/t1reencode.exe
-binpattern f bin/win32/t1testpage.exe
-binpattern f bin/win32/ttftotype42.exe
diff --git a/Master/tlpkg/tlpsrc/bin-makeindex.tlpsrc b/Master/tlpkg/tlpsrc/bin-makeindex.tlpsrc
index 923c4964a31..bc3fdbac26b 100644
--- a/Master/tlpkg/tlpsrc/bin-makeindex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-makeindex.tlpsrc
@@ -6,4 +6,3 @@ docpattern f texmf/doc/man/man1/makeindex.1.html
docpattern f texmf/doc/man/man1/mkindex.1
binpattern f bin/${ARCH}/makeindex
binpattern f bin/${ARCH}/mkindex
-binpattern f bin/win32/makeindex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
index 91cae9eb066..9386b390bb1 100644
--- a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
@@ -9,5 +9,3 @@ docpattern f texmf/doc/man/man1/mf-nowin.1
docpattern f texmf/doc/man/man1/mf.1
binpattern f bin/${ARCH}/mf
binpattern f bin/${ARCH}/mf-nowin
-binpattern f bin/win32/mf-nowin.exe
-binpattern f bin/win32/mf.exe
diff --git a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
index cd6f82859f0..26c8a6124d4 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -22,12 +22,6 @@ binpattern f bin/${ARCH}/makempx
binpattern f bin/${ARCH}/mpost
binpattern f bin/${ARCH}/mpto
binpattern f bin/${ARCH}/newer
-binpattern f bin/win32/dmp.exe
-binpattern f bin/win32/dvitomp.exe
binpattern f bin/win32/makempx-without-g-prefix.exe
-binpattern f bin/win32/makempx.exe
binpattern f bin/win32/mfmp.exe
binpattern f bin/win32/mpost.dll
-binpattern f bin/win32/mpost.exe
-binpattern f bin/win32/mpto.exe
-binpattern f bin/win32/newer.exe
diff --git a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
index 3e26751516b..320817a4b70 100644
--- a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
@@ -9,6 +9,3 @@ runpattern f texmf/fmtutil/format.utf8mex.cnf
binpattern f bin/${ARCH}/mex
binpattern f bin/${ARCH}/pdfmex
binpattern f bin/${ARCH}/utf8mex
-binpattern f bin/win32/mex.exe
-binpattern f bin/win32/pdfmex.exe
-binpattern f bin/win32/utf8mex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-mfware.tlpsrc b/Master/tlpkg/tlpsrc/bin-mfware.tlpsrc
index bb37d4872f6..24f98a13b7d 100644
--- a/Master/tlpkg/tlpsrc/bin-mfware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mfware.tlpsrc
@@ -18,9 +18,3 @@ binpattern f bin/${ARCH}/gftype
binpattern f bin/${ARCH}/mft
binpattern f bin/${ARCH}/pktogf
binpattern f bin/${ARCH}/pktype
-binpattern f bin/win32/gftodvi.exe
-binpattern f bin/win32/gftopk.exe
-binpattern f bin/win32/gftype.exe
-binpattern f bin/win32/mft.exe
-binpattern f bin/win32/pktogf.exe
-binpattern f bin/win32/pktype.exe
diff --git a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
index 4814d05ecf9..9cacc3da24b 100644
--- a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
@@ -5,5 +5,3 @@ execute BuildFormat mltex
runpattern f texmf/fmtutil/format.mltex.cnf
binpattern f bin/${ARCH}/mllatex
binpattern f bin/${ARCH}/mltex
-binpattern f bin/win32/mllatex.exe
-binpattern f bin/win32/mltex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-musixflx.tlpsrc b/Master/tlpkg/tlpsrc/bin-musixflx.tlpsrc
index b122704b7b4..3ba3ac99d0a 100644
--- a/Master/tlpkg/tlpsrc/bin-musixflx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-musixflx.tlpsrc
@@ -1,4 +1,3 @@
name bin-musixflx
category TLCore
binpattern f bin/${ARCH}/musixflx
-binpattern f bin/win32/musixflx.exe
diff --git a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
index 49be47ef31c..813cde973fa 100644
--- a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
@@ -9,6 +9,4 @@ docpattern f texmf/doc/man/man1/omega.1
docpattern f texmf/doc/man/man1/omega.1.html
binpattern f bin/${ARCH}/lambda
binpattern f bin/${ARCH}/omega
-binpattern f bin/win32/lambda.exe
binpattern f bin/win32/omega.dll
-binpattern f bin/win32/omega.exe
diff --git a/Master/tlpkg/tlpsrc/bin-omegaware.tlpsrc b/Master/tlpkg/tlpsrc/bin-omegaware.tlpsrc
index 308e1e040e3..59d36de773b 100644
--- a/Master/tlpkg/tlpsrc/bin-omegaware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-omegaware.tlpsrc
@@ -19,14 +19,3 @@ binpattern f bin/${ARCH}/otp2ocp
binpattern f bin/${ARCH}/outocp
binpattern f bin/${ARCH}/ovf2ovp
binpattern f bin/${ARCH}/ovp2ovf
-binpattern f bin/win32/odvicopy.exe
-binpattern f bin/win32/odvips.exe
-binpattern f bin/win32/odvitype.exe
-binpattern f bin/win32/ofm2opl.exe
-binpattern f bin/win32/omfonts.exe
-binpattern f bin/win32/opl2ofm.exe
-binpattern f bin/win32/otangle.exe
-binpattern f bin/win32/otp2ocp.exe
-binpattern f bin/win32/outocp.exe
-binpattern f bin/win32/ovf2ovp.exe
-binpattern f bin/win32/ovp2ovf.exe
diff --git a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
index ef49a44db18..2965b9eed71 100644
--- a/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-patgen.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-kpathsea
docpattern f texmf/doc/man/man1/patgen.1
docpattern f texmf/doc/man/man1/patgen.1.html
binpattern f bin/${ARCH}/patgen
-binpattern f bin/win32/patgen.exe
diff --git a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
index 67c15fddf26..6e824dcf11b 100644
--- a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
@@ -24,8 +24,4 @@ binpattern f bin/${ARCH}/pdfetex
binpattern f bin/${ARCH}/pdflatex
binpattern f bin/${ARCH}/pdftex
binpattern f bin/${ARCH}/simpdftex
-binpattern f bin/win32/pdfelatex.exe
-binpattern f bin/win32/pdfetex.exe
-binpattern f bin/win32/pdflatex.exe
binpattern f bin/win32/pdftex.dll
-binpattern f bin/win32/pdftex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-pdftools.tlpsrc b/Master/tlpkg/tlpsrc/bin-pdftools.tlpsrc
index c2fb919e5b4..c561692fd5b 100644
--- a/Master/tlpkg/tlpsrc/bin-pdftools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pdftools.tlpsrc
@@ -15,11 +15,5 @@ binpattern f bin/${ARCH}/pdfclose
binpattern f bin/${ARCH}/pdfcrop
binpattern f bin/${ARCH}/pdfopen
binpattern f bin/${ARCH}/pdftosrc
-binpattern f bin/win32/e2pall.exe
-binpattern f bin/win32/epstopdf.exe
binpattern f bin/win32/pdfatfi.exe
-binpattern f bin/win32/pdfclose.exe
-binpattern f bin/win32/pdfcrop.exe
binpattern f bin/win32/pdfdde.exe
-binpattern f bin/win32/pdfopen.exe
-binpattern f bin/win32/pdftosrc.exe
diff --git a/Master/tlpkg/tlpsrc/bin-perltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-perltex.tlpsrc
index 149dbaf97b7..4fe25481c68 100644
--- a/Master/tlpkg/tlpsrc/bin-perltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-perltex.tlpsrc
@@ -1,4 +1,3 @@
name bin-perltex
category TLCore
binpattern f bin/${ARCH}/perltex
-binpattern f bin/win32/perltex.bat
diff --git a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
index 744f7cef5fe..5a15156e24d 100644
--- a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-tex
execute BuildFormat physe
runpattern f texmf/fmtutil/format.physe.cnf
binpattern f bin/${ARCH}/physe
-binpattern f bin/win32/physe.exe
diff --git a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
index 9d329c2bb48..60f77fd955e 100644
--- a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-tex
execute BuildFormat phyzzx
runpattern f texmf/fmtutil/format.phyzzx.cnf
binpattern f bin/${ARCH}/phyzzx
-binpattern f bin/win32/phyzzx.exe
diff --git a/Master/tlpkg/tlpsrc/bin-platex.tlpsrc b/Master/tlpkg/tlpsrc/bin-platex.tlpsrc
index e4f8bc30c18..f38b8f6ea72 100644
--- a/Master/tlpkg/tlpsrc/bin-platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-platex.tlpsrc
@@ -6,5 +6,3 @@ execute BuildFormat platex
runpattern f texmf/fmtutil/format.platex.cnf
binpattern f bin/${ARCH}/pdfplatex
binpattern f bin/${ARCH}/platex
-binpattern f bin/win32/pdfplatex.exe
-binpattern f bin/win32/platex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc b/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc
index cbc3294845c..273eb51dfe4 100644
--- a/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc
@@ -10,5 +10,3 @@ docpattern f texmf/doc/ppower4/examplee/*
docpattern f texmf/doc/ppower4/leveldemo/*
binpattern f bin/${ARCH}/pdfthumb
binpattern f bin/${ARCH}/ppower4
-binpattern f bin/win32/pdfthumb.exe
-binpattern f bin/win32/ppower4.exe
diff --git a/Master/tlpkg/tlpsrc/bin-ps2pkm.tlpsrc b/Master/tlpkg/tlpsrc/bin-ps2pkm.tlpsrc
index a0f37d47dcc..04e397fe8fa 100644
--- a/Master/tlpkg/tlpsrc/bin-ps2pkm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ps2pkm.tlpsrc
@@ -12,7 +12,3 @@ binpattern f bin/${ARCH}/mag
binpattern f bin/${ARCH}/pfb2pfa
binpattern f bin/${ARCH}/pk2bm
binpattern f bin/${ARCH}/ps2pk
-binpattern f bin/win32/mag.exe
-binpattern f bin/win32/pfb2pfa.exe
-binpattern f bin/win32/pk2bm.exe
-binpattern f bin/win32/ps2pk.exe
diff --git a/Master/tlpkg/tlpsrc/bin-pstools.tlpsrc b/Master/tlpkg/tlpsrc/bin-pstools.tlpsrc
index 562db69b16b..cb73e832040 100644
--- a/Master/tlpkg/tlpsrc/bin-pstools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pstools.tlpsrc
@@ -9,5 +9,3 @@ binpattern f bin/${ARCH}/bbox
binpattern f bin/${ARCH}/ps2eps
binpattern f bin/${ARCH}/ps2frag
binpattern f bin/${ARCH}/pslatex
-binpattern f bin/win32/bbox.exe
-binpattern f bin/win32/ps2eps.exe
diff --git a/Master/tlpkg/tlpsrc/bin-psutils.tlpsrc b/Master/tlpkg/tlpsrc/bin-psutils.tlpsrc
index 7e5cd38b94d..22fd43a855d 100644
--- a/Master/tlpkg/tlpsrc/bin-psutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-psutils.tlpsrc
@@ -59,22 +59,3 @@ binpattern f bin/${ARCH}/psnup
binpattern f bin/${ARCH}/psresize
binpattern f bin/${ARCH}/psselect
binpattern f bin/${ARCH}/pstops
-binpattern f bin/win32/epsffit.exe
-binpattern f bin/win32/extractres.bat
-binpattern f bin/win32/fixdlsrps.bat
-binpattern f bin/win32/fixfmps.bat
-binpattern f bin/win32/fixmacps.bat
-binpattern f bin/win32/fixpsditps.bat
-binpattern f bin/win32/fixpspps.bat
-binpattern f bin/win32/fixscribeps.bat
-binpattern f bin/win32/fixtpps.bat
-binpattern f bin/win32/fixwfwps.bat
-binpattern f bin/win32/fixwpps.bat
-binpattern f bin/win32/fixwwps.bat
-binpattern f bin/win32/includeres.bat
-binpattern f bin/win32/psbook.exe
-binpattern f bin/win32/psmerge.bat
-binpattern f bin/win32/psnup.exe
-binpattern f bin/win32/psresize.exe
-binpattern f bin/win32/psselect.exe
-binpattern f bin/win32/pstops.exe
diff --git a/Master/tlpkg/tlpsrc/bin-seetexk.tlpsrc b/Master/tlpkg/tlpsrc/bin-seetexk.tlpsrc
index dd6cbf8bec6..b80f59fa5fe 100644
--- a/Master/tlpkg/tlpsrc/bin-seetexk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-seetexk.tlpsrc
@@ -12,7 +12,3 @@ binpattern f bin/${ARCH}/dvibook
binpattern f bin/${ARCH}/dviconcat
binpattern f bin/${ARCH}/dviselect
binpattern f bin/${ARCH}/dvitodvi
-binpattern f bin/win32/dvibook.exe
-binpattern f bin/win32/dviconcat.exe
-binpattern f bin/win32/dviselect.exe
-binpattern f bin/win32/dvitodvi.exe
diff --git a/Master/tlpkg/tlpsrc/bin-t1utils.tlpsrc b/Master/tlpkg/tlpsrc/bin-t1utils.tlpsrc
index 181b1ba394d..15ef5b1eef3 100644
--- a/Master/tlpkg/tlpsrc/bin-t1utils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-t1utils.tlpsrc
@@ -18,15 +18,3 @@ binpattern f bin/${ARCH}/t1binary
binpattern f bin/${ARCH}/t1disasm
binpattern f bin/${ARCH}/t1mac
binpattern f bin/${ARCH}/t1unmac
-binpattern f bin/win32-static/t1ascii.exe
-binpattern f bin/win32-static/t1asm.exe
-binpattern f bin/win32-static/t1binary.exe
-binpattern f bin/win32-static/t1disasm.exe
-binpattern f bin/win32-static/t1mac.exe
-binpattern f bin/win32-static/t1unmac.exe
-binpattern f bin/win32/t1ascii.exe
-binpattern f bin/win32/t1asm.exe
-binpattern f bin/win32/t1binary.exe
-binpattern f bin/win32/t1disasm.exe
-binpattern f bin/win32/t1mac.exe
-binpattern f bin/win32/t1unmac.exe
diff --git a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
index 9e069bf5793..f2c3822817a 100644
--- a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
@@ -40,7 +40,3 @@ binpattern f bin/${ARCH}/texconfig-sys
binpattern f bin/${ARCH}/texlinks
binpattern f bin/${ARCH}/updmap
binpattern f bin/${ARCH}/updmap-sys
-binpattern f bin/win32-static/fmtutil.exe
-binpattern f bin/win32/fmtutil.exe
-binpattern f bin/win32/fontinst.bat
-binpattern f bin/win32/updmap.exe
diff --git a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
index 929623e5114..2efda5c2ce6 100644
--- a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
@@ -8,5 +8,4 @@ docpattern f texmf/doc/man/man1/tex.1
docpattern f texmf/doc/man/man1/tex.1.html
binpattern f bin/${ARCH}/tex
binpattern f bin/win32/tex.dll
-binpattern f bin/win32/tex.exe
binpattern f bin/win32/tl90tex.dll
diff --git a/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc
index 8fd36d42878..db6115afd7a 100644
--- a/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc
@@ -26,18 +26,9 @@ binpattern f bin/win32/eslatex.bat
binpattern f bin/win32/esmex.bat
binpattern f bin/win32/estex.bat
binpattern f bin/win32/estexi.bat
-binpattern f bin/win32/ht.bat
binpattern f bin/win32/htcmd.exe
-binpattern f bin/win32/htcontext.bat
binpattern f bin/win32/htcopy.exe
-binpattern f bin/win32/htlatex.bat
-binpattern f bin/win32/htlatex.exe
-binpattern f bin/win32/htmex.bat
binpattern f bin/win32/htmove.exe
-binpattern f bin/win32/httex.bat
-binpattern f bin/win32/httex.exe
-binpattern f bin/win32/httexi.bat
-binpattern f bin/win32/httexi.exe
binpattern f bin/win32/jh1context.bat
binpattern f bin/win32/jh1latex.bat
binpattern f bin/win32/jh1mex.bat
@@ -58,8 +49,6 @@ binpattern f bin/win32/jslatex.bat
binpattern f bin/win32/jsmex.bat
binpattern f bin/win32/jstex.bat
binpattern f bin/win32/jstexi.bat
-binpattern f bin/win32/mk4ht
-binpattern f bin/win32/mk4ht.exe
binpattern f bin/win32/mzcontext.bat
binpattern f bin/win32/mzlatex.bat
binpattern f bin/win32/mzmex.bat
@@ -71,7 +60,6 @@ binpattern f bin/win32/oomex.bat
binpattern f bin/win32/ootex.bat
binpattern f bin/win32/ootexi.bat
binpattern f bin/win32/pdf2dsc.bat
-binpattern f bin/win32/t4ht.exe
binpattern f bin/win32/teicontext.bat
binpattern f bin/win32/teilatex.bat
binpattern f bin/win32/teimcontext.bat
@@ -82,7 +70,6 @@ binpattern f bin/win32/teimtex.bat
binpattern f bin/win32/teimtexi.bat
binpattern f bin/win32/teitex.bat
binpattern f bin/win32/teitexi.bat
-binpattern f bin/win32/tex4ht.exe
binpattern f bin/win32/uxhcontext.bat
binpattern f bin/win32/uxhlatex.bat
binpattern f bin/win32/uxhmex.bat
diff --git a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
index 0d99a9ccbdb..c911bc97d7f 100644
--- a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
@@ -9,5 +9,3 @@ docpattern f texmf/doc/man/man1/texdoctk.1
docpattern f texmf/doc/man/man1/texdoctk.html
binpattern f bin/${ARCH}/texdoc
binpattern f bin/${ARCH}/texdoctk
-binpattern f bin/win32/texdoctk.exe
-binpattern f bin/win32/texdoc.exe
diff --git a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
index f3a6f5e1f86..02d0518a453 100644
--- a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
@@ -37,7 +37,3 @@ binpattern f bin/${ARCH}/texi2dvi
binpattern f bin/${ARCH}/texi2html
binpattern f bin/${ARCH}/texi2pdf
binpattern f bin/${ARCH}/texindex
-binpattern f bin/win32/install-info.exe
-binpattern f bin/win32/makeinfo.exe
-binpattern f bin/win32/texi2html.exe
-binpattern f bin/win32/texindex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
index 15f0bc22714..3aa2534863b 100644
--- a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-tex
execute BuildFormat texsis
runpattern f texmf/fmtutil/format.texsis.cnf
binpattern f bin/${ARCH}/texsis
-binpattern f bin/win32/texsis.exe
diff --git a/Master/tlpkg/tlpsrc/bin-texware.tlpsrc b/Master/tlpkg/tlpsrc/bin-texware.tlpsrc
index d54b8971db5..f4cbf02d398 100644
--- a/Master/tlpkg/tlpsrc/bin-texware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texware.tlpsrc
@@ -6,5 +6,3 @@ docpattern f texmf/doc/man/man1/pooltype.1
docpattern f texmf/doc/man/man1/pooltype.1.html
binpattern f bin/${ARCH}/dvitype
binpattern f bin/${ARCH}/pooltype
-binpattern f bin/win32/dvitype.exe
-binpattern f bin/win32/pooltype.exe
diff --git a/Master/tlpkg/tlpsrc/bin-thumbpdf.tlpsrc b/Master/tlpkg/tlpsrc/bin-thumbpdf.tlpsrc
index c675af861dc..04653e0f8b8 100644
--- a/Master/tlpkg/tlpsrc/bin-thumbpdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-thumbpdf.tlpsrc
@@ -4,4 +4,3 @@ runpattern f texmf/scripts/thumbpdf/*
docpattern f texmf/doc/man/man1/thumbpdf.1
docpattern f texmf/doc/man/man1/thumbpdf.1.html
binpattern f bin/${ARCH}/thumbpdf
-binpattern f bin/win32/thumbpdf.exe
diff --git a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
index 1a6e8a8017e..b37465726d6 100644
--- a/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tie.tlpsrc
@@ -4,4 +4,3 @@ depend TLCore/bin-kpathsea
docpattern f texmf/doc/man/man1/tie.1
docpattern f texmf/doc/man/man1/tie.1.html
binpattern f bin/${ARCH}/tie
-binpattern f bin/win32/tie.exe
diff --git a/Master/tlpkg/tlpsrc/bin-ttfutils.tlpsrc b/Master/tlpkg/tlpsrc/bin-ttfutils.tlpsrc
index eb24d0ad167..46852fe0f8c 100644
--- a/Master/tlpkg/tlpsrc/bin-ttfutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-ttfutils.tlpsrc
@@ -12,7 +12,4 @@ docpattern f texmf/doc/ttf2pk/*
binpattern f bin/${ARCH}/ttf2afm
binpattern f bin/${ARCH}/ttf2pk
binpattern f bin/${ARCH}/ttf2tfm
-binpattern f bin/win32/ttf2afm.exe
-binpattern f bin/win32/ttf2pk.exe
-binpattern f bin/win32/ttf2tfm.exe
binpattern f bin/win32/ttfdump.exe
diff --git a/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc b/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
index c12a7b5f3c7..76ddef6dd25 100644
--- a/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-vpe.tlpsrc
@@ -2,4 +2,3 @@ name bin-vpe
category TLCore
runpattern f texmf/scripts/vpe/*
binpattern f bin/${ARCH}/vpe
-binpattern f bin/win32/vpe.exe
diff --git a/Master/tlpkg/tlpsrc/bin-web.tlpsrc b/Master/tlpkg/tlpsrc/bin-web.tlpsrc
index 7e32440b48c..0af71827b09 100644
--- a/Master/tlpkg/tlpsrc/bin-web.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-web.tlpsrc
@@ -7,5 +7,3 @@ docpattern f texmf/doc/man/man1/weave.1
docpattern f texmf/doc/man/man1/weave.1.html
binpattern f bin/${ARCH}/tangle
binpattern f bin/${ARCH}/weave
-binpattern f bin/win32/tangle.exe
-binpattern f bin/win32/weave.exe
diff --git a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
index e506bb4c23e..82092ab804f 100644
--- a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
@@ -15,7 +15,4 @@ binpattern f bin/win32/conf/*
binpattern f bin/win32/conf/conf.d/*
binpattern f bin/win32/fc-*
binpattern f bin/win32/icu*.dll
-binpattern f bin/win32/xdvipdfmx.exe
-binpattern f bin/win32/xelatex.exe
binpattern f bin/win32/xetex.dll
-binpattern f bin/win32/xetex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
index 798a963eb9a..3e0c507a6a8 100644
--- a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
@@ -7,5 +7,3 @@ runpattern f texmf/fmtutil/format.xmltex.cnf
binpattern f bin/${ARCH}/giftopng
binpattern f bin/${ARCH}/pdfxmltex
binpattern f bin/${ARCH}/xmltex
-binpattern f bin/win32/pdfxmltex.exe
-binpattern f bin/win32/xmltex.exe