summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2023-02-20 12:25:40 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2023-02-20 12:25:40 +0000
commit04e398adab268585f8e0fa76d587ab5d5a475dc2 (patch)
treee774a3a467ef28de845db6be96755d8c77d394d2 /Master/tlpkg
parent9ee58eb9194a4e75c74da705559b56c8204cffef (diff)
Transition 32-bit => 64-bit for Windows; tlpsrc
git-svn-id: svn://tug.org/texlive/trunk@65952 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc17
-rw-r--r--Master/tlpkg/tlpsrc/asymptote.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/collection-wintools.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/dvidvi.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/dviout.win32.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/dviout.windows.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/kpathsea.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/luajittex.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/mptopdf.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tex4ht.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc10
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc16
-rw-r--r--Master/tlpkg/tlpsrc/texworks.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc14
-rw-r--r--Master/tlpkg/tlpsrc/tlgs.windows.tlpsrc14
-rw-r--r--Master/tlpkg/tlpsrc/tlperl.windows.tlpsrc (renamed from Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc)0
-rw-r--r--Master/tlpkg/tlpsrc/tlshell.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/wintools.win32.tlpsrc71
-rw-r--r--Master/tlpkg/tlpsrc/wintools.windows.tlpsrc71
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/xpdfopen.tlpsrc2
23 files changed, 148 insertions, 148 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index db6a4c73f75..e0ee38cb0ab 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -47,7 +47,7 @@ tlpsetvar global_no_luajit_platforms i386-solaris,x86_64-solaris
# the patterns, in preparation for supporting w64 in addition to w32,
# and perhaps others in the future. The name ${global_wndws} was just
# too long, so there is a super-special case in the code.
-tlpsetvar wndws win32
+#tlpsetvar wndws windows
# It would be ideal to be able to specify the non-jit platforms here,
# but it's not crucial, so we haven't implemented ${global_} expansion
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index f0a916e42d6..175396871c6 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -24,14 +24,14 @@ runpattern !d tlpkg/installer/xz
runpattern !f tlpkg/installer/tar.exe
#
# Windows only:
-binpattern d/${wndws} tlpkg/tlperl
-binpattern d/${wndws} tlpkg/tltcl/bin
-binpattern d/${wndws} tlpkg/tltcl/lib
-binpattern f/${wndws} tlpkg/installer/tar.exe
-binpattern f/${wndws} tlpkg/installer/wget/wget.exe
-binpattern f/${wndws} tlpkg/installer/xz/xz.exe
-binpattern f/${wndws} install-tl-windows.bat
-binpattern f/${wndws} install-tl-advanced.bat
+binpattern d/windows tlpkg/tlperl
+binpattern d/windows tlpkg/tltcl/bin
+binpattern d/windows tlpkg/tltcl/lib
+binpattern f/windows tlpkg/installer/tar.exe
+binpattern f/windows tlpkg/installer/wget/wget.exe
+binpattern f/windows tlpkg/installer/xz/xz.exe
+binpattern f/windows install-tl-windows.bat
+binpattern f/windows install-tl-advanced.bat
# xz binaries for all
binpattern f tlpkg/installer/xz/xz.${ARCH}
@@ -42,6 +42,7 @@ binpattern f tlpkg/installer/xz/xz.${ARCH}
binpattern f/!\
aarch64-linux,\
armhf-linux,\
+i386-cygwin,\
i386-linux,\
universal-darwin,\
x86_64-cygwin,\
diff --git a/Master/tlpkg/tlpsrc/asymptote.tlpsrc b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
index 0202640731c..e11cbb8e749 100644
--- a/Master/tlpkg/tlpsrc/asymptote.tlpsrc
+++ b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
@@ -5,8 +5,8 @@ i386-netbsd,\
x86_64-linuxmusl\
bin/${ARCH}/*asy
#
-binpattern d/win32 tlpkg/${PKGNAME}
-binpattern d/win32 tlpkg/${PKGNAME}64
+binpattern d/windows tlpkg/${PKGNAME}
+binpattern d/windows tlpkg/${PKGNAME}64
#
docpattern f texmf-dist/doc/info/asy*.info
docpattern f texmf-dist/doc/man/man1/*asy.*
diff --git a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
index 848addc7f18..423d5010450 100644
--- a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
@@ -2,5 +2,5 @@ category Collection
shortdesc Windows-only support programs
longdesc Utilities for Windows, since they are not readily available there:
longdesc chktex, unzip, wget, xpdf, and the dviout previewer.
-depend wintools.win32
-depend dviout.win32
+depend wintools.windows
+depend dviout.windows
diff --git a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
index 61afc12c7d3..2466bfb9748 100644
--- a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
@@ -1,5 +1,5 @@
category TLCore
docpattern f texmf-dist/doc/man/man1/dvidvi.*
binpattern f bin/${ARCH}/dvidvi
-binpattern f/win32 bin/win32/a5bookle
-binpattern f/win32 bin/win32/doubside
+binpattern f/windows bin/windows/a5bookle.exe
+binpattern f/windows bin/windows/doubside.exe
diff --git a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
deleted file mode 100644
index 506dfaa2861..00000000000
--- a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category TLCore
-binpattern d/win32 tlpkg/dviout
-binpattern f/win32 bin/win32/dviout
-postaction shortcut type=menu name="DVIOUT DVI viewer" \
- cmd=TEXDIR/bin/win32/dviout.exe
-postaction filetype name=TL.DVIOUT.view \
- cmd='"TEXDIR/bin/win32/dviout.exe" "%1"'
-postaction fileassoc extension=.dvi filetype=TL.DVIOUT.view
diff --git a/Master/tlpkg/tlpsrc/dviout.windows.tlpsrc b/Master/tlpkg/tlpsrc/dviout.windows.tlpsrc
new file mode 100644
index 00000000000..3a08906d64a
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/dviout.windows.tlpsrc
@@ -0,0 +1,8 @@
+category TLCore
+binpattern d/windows tlpkg/dviout
+binpattern f/windows bin/windows/dviout.exe
+postaction shortcut type=menu name="DVIOUT DVI viewer" \
+ cmd=TEXDIR/bin/windows/dviout.exe
+postaction filetype name=TL.DVIOUT.view \
+ cmd='"TEXDIR/bin/windows/dviout.exe" "%1"'
+postaction fileassoc extension=.dvi filetype=TL.DVIOUT.view
diff --git a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
index 895c30c8e03..871fb7c6927 100644
--- a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
@@ -24,6 +24,6 @@ binpattern f bin/${ARCH}/kpsewhich
#
binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygkpathsea*.dll
#
-binpattern f bin/win32/kpathsea*.dll
-binpattern f bin/win32/mktexupd.exe
-binpattern f bin/win32/msvc*.dll
+binpattern f bin/windows/kpathsea*.dll
+binpattern f bin/windows/mktexupd.exe
+binpattern f bin/windows/msvc*.dll
diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc
index bdf430253f5..78fbb4282ae 100644
--- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc
@@ -11,9 +11,9 @@ binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajitc
binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajithbtex
#
# Windows has additional .dll files as usual. The .exe are matched above.
-binpattern f bin/win32/luajit51.dll
-binpattern f bin/win32/luajittex.dll
-binpattern f bin/win32/luajithbtex.dll
+binpattern f bin/windows/luajit51w64.dll
+binpattern f bin/windows/luajithbtex.dll
+binpattern f bin/windows/luajittex.dll
#
binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexluajit*.dll
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index e178661d7ed..fa5cea92cbc 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -22,13 +22,13 @@ binpattern f bin/${ARCH}/luatex
binpattern f bin/${ARCH}/texlua
binpattern f bin/${ARCH}/texluac
#
-binpattern f bin/win32/lua53.dll
-binpattern f bin/win32/luatex.dll
+binpattern f bin/windows/lua53w64.dll
+binpattern f bin/windows/luatex.dll
#
binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexlua5*.dll
#
# Visual Studio 2015 (for C++11) dlls for LuaTeX.
-binpattern f bin/win32/api-ms-win-*.dll
-binpattern f bin/win32/pdfddeservername.txt
-binpattern f bin/win32/ucrtbase.dll
-binpattern f bin/win32/vcruntime140.dll
+binpattern f bin/windows/api-ms-win-*.dll
+binpattern f bin/windows/pdfddeservername.txt
+binpattern f bin/windows/ucrtbase.dll
+binpattern f bin/windows/vcruntime140.dll
diff --git a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
index b5086c82478..6f165023230 100644
--- a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
@@ -19,7 +19,6 @@ runpattern f texmf-dist/tex/context/base/mkii/supp-mpe.mkii
runpattern f texmf-dist/tex/context/base/mkii/supp-pdf.mkii
runpattern f texmf-dist/tex/context/base/mkii/syst-tex.mkii
runpattern f texmf-dist/scripts/context/perl/mptopdf.pl
-runpattern f texmf-dist/scripts/context/stubs/mswin/mptopdf.exe
runpattern f texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
#
binpattern f bin/${ARCH}/mptopdf
diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
index cd0c7a95666..b7a627b9bd7 100644
--- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
@@ -1,5 +1,5 @@
binpattern f bin/${ARCH}/ht
-binpattern f bin/win32/htcmd
+binpattern f bin/windows/htcmd
binpattern f bin/${ARCH}/htcontext
binpattern f bin/${ARCH}/htlatex
binpattern f bin/${ARCH}/htmex
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 45804237b20..4c301e98747 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -69,13 +69,13 @@ runpattern f install-tl
runpattern f tlpkg/installer/install-menu-*.pl
runpattern f tlpkg/installer/install-tl-gui.tcl
runpattern f tlpkg/installer/ctan-mirrors.pl
-binpattern f/win32 install-tl-windows.bat
-binpattern f/win32 install-tl-advanced.bat
+binpattern f/windows install-tl-windows.bat
+binpattern f/windows install-tl-advanced.bat
docpattern f texmf-dist/doc/man/man1/install-tl.*
#
-binpattern f/win32 tl-tray-menu.exe
-binpattern f/win32 tlpkg/installer/tl-cmd.bat
-binpattern f/win32 tlpkg/installer/tl-tray-menu.ini
+binpattern f/windows tl-tray-menu.exe
+binpattern f/windows tlpkg/installer/tl-cmd.bat
+binpattern f/windows tlpkg/installer/tl-tray-menu.ini
#
# post-install/update actions
postaction shortcut type=menu name="TeX Live command-line" \
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 3be32a23ed8..bdc8655ad08 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -30,7 +30,7 @@ runpattern f texmf-dist/web2c/updmap-hdr.cfg
runpattern f texmf-dist/scripts/texlive/mktexlsr
runpattern f texmf-dist/scripts/texlive/tlmgr.pl
runpattern f texmf-dist/scripts/texlive/tlmgrgui.pl
-runpattern f texmf-dist/scripts/texlive/uninstall-win32.pl
+runpattern f texmf-dist/scripts/texlive/uninstall-windows.pl
runpattern f texmf-dist/scripts/texlive/uninstq.vbs
runpattern f texmf-dist/scripts/texlive/tl-errmess.vbs
#
@@ -42,13 +42,13 @@ runpattern d tlpkg/gpg
binpattern f bin/${ARCH}/tlmgr
binpattern f bin/${ARCH}/mktexlsr
#
-binpattern f/win32 bin/win32/runscript.*
-binpattern f/win32 bin/win32/wrunscript.*
-binpattern f/win32 tlpkg/installer/tar.exe
-binpattern f/win32 tlpkg/installer/xz/xz.exe
-binpattern f/win32 tlpkg/installer/wget/wget.exe
-binpattern f/win32 tlpkg/installer/lz4/lz4.exe
-binpattern f/win32 tlpkg/installer/curl/curl.exe
+binpattern f/windows bin/windows/runscript.*
+binpattern f/windows bin/windows/wrunscript.*
+binpattern f/windows tlpkg/installer/tar.exe
+binpattern f/windows tlpkg/installer/xz/xz.exe
+binpattern f/windows tlpkg/installer/wget/wget.exe
+binpattern f/windows tlpkg/installer/lz4/lz4.exe
+binpattern f/windows tlpkg/installer/curl/curl.exe
# xz.
binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH}
diff --git a/Master/tlpkg/tlpsrc/texworks.tlpsrc b/Master/tlpkg/tlpsrc/texworks.tlpsrc
index 9c62911e3e1..4f25be5f36c 100644
--- a/Master/tlpkg/tlpsrc/texworks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texworks.tlpsrc
@@ -4,17 +4,17 @@ longdesc See http://tug.org/texworks for information and downloads.
longdesc TeX Live includes executables and support files only for Windows.
postaction shortcut type=menu name="TeXworks editor" \
- cmd=TEXDIR/bin/win32/texworks.exe
+ cmd=TEXDIR/bin/windows/texworks.exe
postaction filetype name=TL.TeXworks.edit \
- cmd='"TEXDIR/bin/win32/texworks.exe" "%1"'
+ cmd='"TEXDIR/bin/windows/texworks.exe" "%1"'
postaction fileassoc extension=.tex filetype=TL.TeXworks.edit
postaction fileassoc extension=.sty filetype=TL.TeXworks.edit
postaction fileassoc extension=.cls filetype=TL.TeXworks.edit
#
-binpattern f/win32 bin/${ARCH}/texworks
-#binpattern f/win32 tlpkg/texworks/texworks.exe
+binpattern f/windows bin/${ARCH}/texworks
+#binpattern f/windows tlpkg/texworks/texworks.exe
#
# These are the support files, not binaries, but we only want to install
-# this mass of stuff on Windows, so just declare them /win32.
-binpattern d/win32 tlpkg/texworks
+# this mass of stuff on Windows, so just declare them /windows.
+binpattern d/windows tlpkg/texworks
#runpattern +!f tlpkg/texworks/texworks.exe
diff --git a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc
deleted file mode 100644
index 329eaedb71e..00000000000
--- a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc
+++ /dev/null
@@ -1,14 +0,0 @@
-category TLCore
-catalogue ghostscript
-binpattern d/win32 tlpkg/tlgs
-binpattern d/win32 texmf-dist/scripts/tlgs
-binpattern f/win32 bin/win32/eps2eps
-binpattern f/win32 bin/win32/pdf2dsc
-binpattern f/win32 bin/win32/pdfopt
-binpattern f/win32 bin/win32/ps2ascii
-binpattern f/win32 bin/win32/ps2pdf
-binpattern f/win32 bin/win32/ps2pdf12
-binpattern f/win32 bin/win32/ps2pdf13
-binpattern f/win32 bin/win32/ps2pdf14
-binpattern f/win32 bin/win32/ps2ps
-binpattern f/win32 bin/win32/pdf2ps
diff --git a/Master/tlpkg/tlpsrc/tlgs.windows.tlpsrc b/Master/tlpkg/tlpsrc/tlgs.windows.tlpsrc
new file mode 100644
index 00000000000..295a9f2a428
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/tlgs.windows.tlpsrc
@@ -0,0 +1,14 @@
+category TLCore
+catalogue ghostscript
+runpattern d tlpkg/tlgs
+runpattern d texmf-dist/scripts/tlgs
+binpattern f/windows bin/windows/eps2eps
+binpattern f/windows bin/windows/pdf2dsc
+binpattern f/windows bin/windows/pdfopt
+binpattern f/windows bin/windows/ps2ascii
+binpattern f/windows bin/windows/ps2pdf
+binpattern f/windows bin/windows/ps2pdf12
+binpattern f/windows bin/windows/ps2pdf13
+binpattern f/windows bin/windows/ps2pdf14
+binpattern f/windows bin/windows/ps2ps
+binpattern f/windows bin/windows/pdf2ps
diff --git a/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlperl.windows.tlpsrc
index 8c77d622e0c..8c77d622e0c 100644
--- a/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tlperl.windows.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/tlshell.tlpsrc b/Master/tlpkg/tlpsrc/tlshell.tlpsrc
index cad2139d5c8..fc7487c99d2 100644
--- a/Master/tlpkg/tlpsrc/tlshell.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tlshell.tlpsrc
@@ -1,8 +1,8 @@
category TLCore
shortdesc GUI frontend (tcl/tk-based) for tlmgr
binpattern f bin/${ARCH}/${PKGNAME}
-binpattern d/win32 tlpkg/tltcl/bin
-binpattern d/win32 tlpkg/tltcl/lib
+binpattern d/windows tlpkg/tltcl/bin
+binpattern d/windows tlpkg/tltcl/lib
#
runpattern d texmf-dist/scripts/tlshell
runpattern f tlpkg/tltcl/*.tcl
@@ -13,4 +13,4 @@ docpattern f tlpkg/tltcl/README.TEXLIVE
# post-install/update actions
postaction shortcut type=menu name="TLShell TeX Live Manager" \
- cmd=TEXDIR/bin/win32/tlshell.exe
+ cmd=TEXDIR/bin/windows/tlshell.exe
diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
deleted file mode 100644
index 1cca9ccce20..00000000000
--- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
+++ /dev/null
@@ -1,71 +0,0 @@
-category TLCore
-shortdesc utilities provided only for Windows
-longdesc Common utilities, mainly from the w32tex distribution.
-#
-# these are provided on Windows only, sources come from w32tex.
-binpattern f bin/win32/aftopl.exe
-binpattern f bin/win32/bmeps.exe
-binpattern f bin/win32/bmp2png.exe
-binpattern f bin/win32/cjpeg.exe
-binpattern f bin/win32/djpeg.exe
-binpattern f bin/win32/gunzip.exe
-binpattern f bin/win32/gzip.exe
-binpattern f bin/win32/jbig2.exe
-binpattern f bin/win32/pdfattach.exe
-binpattern f bin/win32/pdfdetach.exe
-binpattern f bin/win32/pdffonts.exe
-binpattern f bin/win32/pdfimages.exe
-binpattern f bin/win32/pdfinfo.exe
-binpattern f bin/win32/pdfseparate.exe
-binpattern f bin/win32/pdftocairo.exe
-binpattern f bin/win32/pdftohtml.exe
-binpattern f bin/win32/pdftoppm.exe
-binpattern f bin/win32/pdftops.exe
-binpattern f bin/win32/pdftotext.exe
-binpattern f bin/win32/pdfunite.exe
-binpattern f bin/win32/png22pnm.exe
-binpattern f bin/win32/png2bmp.exe
-binpattern f bin/win32/sam2p.exe
-binpattern f bin/win32/texview.exe
-binpattern f bin/win32/tif22pnm.exe
-binpattern f bin/win32/tiff2png.exe
-binpattern f bin/win32/tlaunch.exe
-binpattern f bin/win32/tlaunchmode.exe
-binpattern f bin/win32/todos.exe
-binpattern f bin/win32/tomac.exe
-binpattern f bin/win32/tounix.exe
-binpattern f bin/win32/type1afm.exe
-binpattern f bin/win32/unzip.exe
-binpattern f bin/win32/zip.exe
-#
-binpattern f/win32 tlpkg/sam2p/sam2p.exe
-#
-# for extra utilities we supply only on Windows.
-docpattern d texmf-dist/doc/support/wintools
-#
-# tlaunch is by Siep.
-docpattern d texmf-dist/doc/support/tlaunch
-runpattern d texmf-dist/scripts/tlaunch
-runpattern f texmf-dist/web2c/tlaunch.ini
-#
-# bitmap2eps is by Siep.
-binpattern f/win32 bin/win32/bitmap2eps.exe
-runpattern f texmf-dist/scripts/bitmap2eps/bitmap2eps.vbs
-postaction filetype name="TL.bitmap2eps.convert" \
- cmd='"TEXDIR/bin/win32/bitmap2eps.exe" "%1"'
-postaction progid extension=.bmp filetype="TL.bitmap2eps.convert"
-postaction progid extension=.png filetype="TL.bitmap2eps.convert"
-postaction progid extension=.gif filetype="TL.bitmap2eps.convert"
-postaction progid extension=.jpg filetype="TL.bitmap2eps.convert"
-postaction progid extension=.jpe filetype="TL.bitmap2eps.convert"
-postaction progid extension=.jpeg filetype="TL.bitmap2eps.convert"
-postaction progid extension=.tif filetype="TL.bitmap2eps.convert"
-postaction progid extension=.tiff filetype="TL.bitmap2eps.convert"
-# also psviewer
-binpattern f bin/win32/psviewer.exe
-runpattern d texmf-dist/scripts/psviewer
-docpattern d texmf-dist/doc/psviewer
-postaction filetype name="TL.PSViewer.view" \
- cmd='"TEXDIR/bin/win32/psviewer.exe" "%1"'
-postaction progid extension=.eps filetype="TL.PSViewer.view"
-postaction progid extension=.ps filetype="TL.PSViewer.view"
diff --git a/Master/tlpkg/tlpsrc/wintools.windows.tlpsrc b/Master/tlpkg/tlpsrc/wintools.windows.tlpsrc
new file mode 100644
index 00000000000..e309de26047
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/wintools.windows.tlpsrc
@@ -0,0 +1,71 @@
+category TLCore
+shortdesc utilities provided only for Windows
+longdesc Common utilities, mainly from the w32tex distribution.
+#
+# these are provided on Windows only, sources come from w32tex.
+binpattern f bin/windows/aftopl.exe
+binpattern f bin/windows/bmeps.exe
+binpattern f bin/windows/bmp2png.exe
+binpattern f bin/windows/cjpeg.exe
+binpattern f bin/windows/djpeg.exe
+binpattern f bin/windows/gunzip.exe
+binpattern f bin/windows/gzip.exe
+binpattern f bin/windows/jbig2.exe
+binpattern f bin/windows/pdfattach.exe
+binpattern f bin/windows/pdfdetach.exe
+binpattern f bin/windows/pdffonts.exe
+binpattern f bin/windows/pdfimages.exe
+binpattern f bin/windows/pdfinfo.exe
+binpattern f bin/windows/pdfseparate.exe
+binpattern f bin/windows/pdftocairo.exe
+binpattern f bin/windows/pdftohtml.exe
+binpattern f bin/windows/pdftoppm.exe
+binpattern f bin/windows/pdftops.exe
+binpattern f bin/windows/pdftotext.exe
+binpattern f bin/windows/pdfunite.exe
+binpattern f bin/windows/png22pnm.exe
+binpattern f bin/windows/png2bmp.exe
+binpattern f bin/windows/sam2p.exe
+binpattern f bin/windows/texview.exe
+binpattern f bin/windows/tif22pnm.exe
+binpattern f bin/windows/tiff2png.exe
+binpattern f bin/windows/tlaunch.exe
+binpattern f bin/windows/tlaunchmode.exe
+binpattern f bin/windows/todos.exe
+binpattern f bin/windows/tomac.exe
+binpattern f bin/windows/tounix.exe
+binpattern f bin/windows/type1afm.exe
+binpattern f bin/windows/unzip.exe
+binpattern f bin/windows/zip.exe
+#
+binpattern f/windows tlpkg/sam2p/sam2p.exe
+#
+# for extra utilities we supply only on Windows.
+docpattern d texmf-dist/doc/support/wintools
+#
+# tlaunch is by Siep.
+docpattern d texmf-dist/doc/support/tlaunch
+runpattern d texmf-dist/scripts/tlaunch
+runpattern f texmf-dist/web2c/tlaunch.ini
+#
+# bitmap2eps is by Siep.
+binpattern f/windows bin/windows/bitmap2eps.exe
+runpattern f texmf-dist/scripts/bitmap2eps/bitmap2eps.vbs
+postaction filetype name="TL.bitmap2eps.convert" \
+ cmd='"TEXDIR/bin/windows/bitmap2eps.exe" "%1"'
+postaction progid extension=.bmp filetype="TL.bitmap2eps.convert"
+postaction progid extension=.png filetype="TL.bitmap2eps.convert"
+postaction progid extension=.gif filetype="TL.bitmap2eps.convert"
+postaction progid extension=.jpg filetype="TL.bitmap2eps.convert"
+postaction progid extension=.jpe filetype="TL.bitmap2eps.convert"
+postaction progid extension=.jpeg filetype="TL.bitmap2eps.convert"
+postaction progid extension=.tif filetype="TL.bitmap2eps.convert"
+postaction progid extension=.tiff filetype="TL.bitmap2eps.convert"
+# also psviewer
+binpattern f bin/windows/psviewer.exe
+runpattern d texmf-dist/scripts/psviewer
+docpattern d texmf-dist/doc/psviewer
+postaction filetype name="TL.PSViewer.view" \
+ cmd='"TEXDIR/bin/windows/psviewer.exe" "%1"'
+postaction progid extension=.eps filetype="TL.PSViewer.view"
+postaction progid extension=.ps filetype="TL.PSViewer.view"
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index f4b23cc3d2d..27a485122be 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -17,11 +17,11 @@ execute AddFormat name=xelatex engine=xetex patterns=language.dat \
# do fontconfig stuff, especially on Windows.
postaction script file=tlpkg/tlpostcode/xetex.pl
runpattern f tlpkg/tlpostcode/xetex.pl
-binpattern f bin/win32/fc-*
-binpattern f bin/win32/icu*.dll
+binpattern f bin/windows/fc-*
+binpattern f bin/windows/icu*.dll
#
# this subdir is only used on Windows.
-binpattern d/win32 tlpkg/tlpostcode/xetex
+binpattern d/windows tlpkg/tlpostcode/xetex
docpattern d texmf-dist/doc/xetex/base
docpattern f texmf-dist/doc/man/man1/xelatex.*
diff --git a/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc b/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
index 045fb3f6108..cc715f29d06 100644
--- a/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xpdfopen.tlpsrc
@@ -4,7 +4,7 @@ binpattern f/!x86_64-darwinlegacy bin/${ARCH}/pdfclose
binpattern f/!x86_64-darwinlegacy bin/${ARCH}/pdfopen
#
# Needed on Windows.
-binpattern f bin/win32/pdfdde.exe
+binpattern f bin/windows/pdfdde.exe
docpattern f texmf-dist/doc/man/man1/pdfclose.*
docpattern f texmf-dist/doc/man/man1/pdfopen.*