use ${PKGNAME}

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

48 files changed, 82 insertions, 82 deletions

diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
index 4533b80be29..a91bbf0fe34 100644
--- a/Master/tlpkg/tlpsrc/a2ping.tlpsrc
+++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
@@ -1,4 +1,4 @@
 category TLCore
-docpattern f texmf/doc/man/man1/a2ping.*
-runpattern f texmf/scripts/a2ping/a2ping.pl
-binpattern f bin/${ARCH}/a2ping
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
+runpattern f texmf/scripts/${PKGNAME}/${PKGNAME}.pl
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
index 434db966c76..21d6c3df7c9 100644
--- a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
@@ -1,6 +1,6 @@
 category TLCore
-binpattern f bin/${ARCH}/afm2pl
-docpattern f texmf/doc/man/man1/afm2pl.*
-runpattern d texmf/fonts/enc/dvips/afm2pl
-runpattern d texmf/fonts/lig/afm2pl
-runpattern d texmf/tex/fontinst/afm2pl
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
+runpattern d texmf/fonts/enc/dvips/${PKGNAME}
+runpattern d texmf/fonts/lig/${PKGNAME}
+runpattern d texmf/tex/fontinst/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/asymptote.tlpsrc b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
index 5d7cef1d8b9..a0fb3f89835 100644
--- a/Master/tlpkg/tlpsrc/asymptote.tlpsrc
+++ b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
@@ -6,10 +6,10 @@ sparc-linux,\
 sparc-solaris\
            bin/${ARCH}/*asy
 binpattern f/i386-cygwin bin/i386-cygwin/freeglut.dll
-binpattern d/win32 tlpkg/asymptote
+binpattern d/win32 tlpkg/${PKGNAME}
 docpattern f texmf/doc/info/asy*.info
 docpattern f texmf/doc/man/man1/*asy.*
-docpattern d texmf/doc/asymptote
-runpattern d texmf/asymptote
-runpattern d texmf/tex/latex/asymptote
-runpattern d texmf/tex/context/asymptote
+docpattern d texmf/doc/${PKGNAME}
+runpattern d texmf/${PKGNAME}
+runpattern d texmf/tex/latex/${PKGNAME}
+runpattern d texmf/tex/context/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/authorindex.tlpsrc b/Master/tlpkg/tlpsrc/authorindex.tlpsrc
index 0f8caa4e351..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/authorindex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/authorindex.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/authorindex
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/bibexport.tlpsrc b/Master/tlpkg/tlpsrc/bibexport.tlpsrc
index 8629bc49b48..aefd3a571c4 100644
--- a/Master/tlpkg/tlpsrc/bibexport.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bibexport.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/bibexport
+binpattern f bin/${ARCH}/${PKGNAME}
 
diff --git a/Master/tlpkg/tlpsrc/bundledoc.tlpsrc b/Master/tlpkg/tlpsrc/bundledoc.tlpsrc
index 714425b8d45..06997a74498 100644
--- a/Master/tlpkg/tlpsrc/bundledoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bundledoc.tlpsrc
@@ -1,3 +1,3 @@
 docpattern +f texmf/doc/man/man1/arlatex.*
 binpattern f bin/${ARCH}/arlatex
-binpattern f bin/${ARCH}/bundledoc
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/cachepic.tlpsrc b/Master/tlpkg/tlpsrc/cachepic.tlpsrc
index f6418e5f712..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/cachepic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cachepic.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/cachepic
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/checkcites.tlpsrc b/Master/tlpkg/tlpsrc/checkcites.tlpsrc
index 278a88d5242..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/checkcites.tlpsrc
+++ b/Master/tlpkg/tlpsrc/checkcites.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/checkcites
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/chktex.tlpsrc b/Master/tlpkg/tlpsrc/chktex.tlpsrc
index 0c15e127fcc..df82172bf37 100644
--- a/Master/tlpkg/tlpsrc/chktex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/chktex.tlpsrc
@@ -1,12 +1,12 @@
 category TLCore
-binpattern f bin/${ARCH}/chktex
+binpattern f bin/${ARCH}/${PKGNAME}
 binpattern f bin/${ARCH}/chkweb
 binpattern f bin/${ARCH}/deweb
 #
-runpattern d texmf/chktex
-runpattern d texmf/scripts/chktex
+runpattern d texmf/${PKGNAME}
+runpattern d texmf/scripts/${PKGNAME}
 #
-docpattern f texmf/doc/man/man1/chktex.*
+docpattern d texmf/doc/${PKGNAME}
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
 docpattern f texmf/doc/man/man1/chkweb.*
 docpattern f texmf/doc/man/man1/deweb.*
-docpattern d texmf/doc/chktex
diff --git a/Master/tlpkg/tlpsrc/ctanify.tlpsrc b/Master/tlpkg/tlpsrc/ctanify.tlpsrc
index e18f9dbb202..67590a934a5 100644
--- a/Master/tlpkg/tlpsrc/ctanify.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ctanify.tlpsrc
@@ -1,2 +1,2 @@
-docpattern +f texmf/doc/man/man1/ctanify.*
-binpattern f bin/${ARCH}/ctanify
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME.*
diff --git a/Master/tlpkg/tlpsrc/ctanupload.tlpsrc b/Master/tlpkg/tlpsrc/ctanupload.tlpsrc
index 56e0d45eb0b..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/ctanupload.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ctanupload.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/ctanupload
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/de-macro.tlpsrc b/Master/tlpkg/tlpsrc/de-macro.tlpsrc
index d23a66e97c0..5344d41efd2 100644
--- a/Master/tlpkg/tlpsrc/de-macro.tlpsrc
+++ b/Master/tlpkg/tlpsrc/de-macro.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/de-macro
+binpattern f bin/${ARCH}/de-${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/detex.tlpsrc b/Master/tlpkg/tlpsrc/detex.tlpsrc
index 1cfee04ca4b..6ca419849b8 100644
--- a/Master/tlpkg/tlpsrc/detex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/detex.tlpsrc
@@ -1,3 +1,3 @@
 category TLCore
-docpattern f texmf/doc/man/man1/detex.*
 binpattern f bin/${ARCH}/detex
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/devnag.tlpsrc b/Master/tlpkg/tlpsrc/devnag.tlpsrc
index b26fcc373ce..13f20e47a7a 100644
--- a/Master/tlpkg/tlpsrc/devnag.tlpsrc
+++ b/Master/tlpkg/tlpsrc/devnag.tlpsrc
@@ -1,3 +1,3 @@
 category TLCore
 catalogue devanagari
-binpattern f bin/${ARCH}/devnag
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc b/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc
index d11ea72b9c0..b5919e3d25d 100644
--- a/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dosepsbin.tlpsrc
@@ -1,4 +1,4 @@
-binpattern f bin/${ARCH}/dosepsbin
-docpattern d texmf-dist/doc/support/dosepsbin
-docpattern f texmf/doc/man/man1/dosepsbin.*
-runpattern d texmf-dist/scripts/dosepsbin
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern d texmf-dist/doc/support/${PKGNAME}
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
+runpattern d texmf-dist/scripts/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/dviasm.tlpsrc b/Master/tlpkg/tlpsrc/dviasm.tlpsrc
index ae2c853cdec..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/dviasm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dviasm.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/dviasm
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/ebong.tlpsrc b/Master/tlpkg/tlpsrc/ebong.tlpsrc
index 7534bf838bf..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/ebong.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ebong.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/ebong
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/epstopdf.tlpsrc b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc
index 80171b8984e..118a49686cc 100644
--- a/Master/tlpkg/tlpsrc/epstopdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc
@@ -1,4 +1,4 @@
-binpattern f bin/${ARCH}/epstopdf
+binpattern f bin/${ARCH}/${PKGNAME}
 binpattern f bin/${ARCH}/repstopdf
-docpattern +f texmf/doc/man/man1/epstopdf.*
+docpattern +f texmf/doc/man/man1/${PKGNAME.*
 docpattern +f texmf/doc/man/man1/repstopdf.*
diff --git a/Master/tlpkg/tlpsrc/exceltex.tlpsrc b/Master/tlpkg/tlpsrc/exceltex.tlpsrc
index 8040625946d..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/exceltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/exceltex.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/exceltex
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/fig4latex.tlpsrc b/Master/tlpkg/tlpsrc/fig4latex.tlpsrc
index 2f077e9a783..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/fig4latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fig4latex.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/fig4latex
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/findhyph.tlpsrc b/Master/tlpkg/tlpsrc/findhyph.tlpsrc
index 2da7b08c4b6..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/findhyph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/findhyph.tlpsrc
@@ -1,2 +1,2 @@
-docpattern +f texmf/doc/man/man1/findhyph.*
-binpattern f bin/${ARCH}/findhyph
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/fontinst.tlpsrc b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
index 3a50d2c53c4..1da911ffa99 100644
--- a/Master/tlpkg/tlpsrc/fontinst.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
@@ -1,3 +1,3 @@
-binpattern +f bin/${ARCH}/fontinst
+binpattern +f bin/${ARCH}/${PKGNAME}
 srcpattern +!f texmf-dist/source/latex/eulervm/fontinst/*
 srcpattern +!f texmf-dist/source/latex/pslatex/fontinst/pslatex.tex
diff --git a/Master/tlpkg/tlpsrc/fragmaster.tlpsrc b/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
index 20ae35c7252..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/fragmaster
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/glossaries.tlpsrc b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
index aa959af2241..aefd3a571c4 100644
--- a/Master/tlpkg/tlpsrc/glossaries.tlpsrc
+++ b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/makeglossaries
+binpattern f bin/${ARCH}/${PKGNAME}
 
diff --git a/Master/tlpkg/tlpsrc/latex2man.tlpsrc b/Master/tlpkg/tlpsrc/latex2man.tlpsrc
index 01ada41e814..721a347cd4d 100644
--- a/Master/tlpkg/tlpsrc/latex2man.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex2man.tlpsrc
@@ -1,2 +1,2 @@
-docpattern +f texmf/doc/info/latex2man.info
-binpattern f bin/${ARCH}/latex2man
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/info/${PKGNAME}.info
diff --git a/Master/tlpkg/tlpsrc/latexmk.tlpsrc b/Master/tlpkg/tlpsrc/latexmk.tlpsrc
index 02c729e4f0b..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/latexmk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latexmk.tlpsrc
@@ -1,2 +1,2 @@
-docpattern +f texmf/doc/man/man1/latexmk.*
-binpattern f bin/${ARCH}/latexmk
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/match_parens.tlpsrc b/Master/tlpkg/tlpsrc/match_parens.tlpsrc
index c3dea21c491..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/match_parens.tlpsrc
+++ b/Master/tlpkg/tlpsrc/match_parens.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/match_parens
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/mathspic.tlpsrc b/Master/tlpkg/tlpsrc/mathspic.tlpsrc
index eac14b9f5ce..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/mathspic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mathspic.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/mathspic
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc b/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc
index 4e0010796a6..0817a4a80c4 100644
--- a/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc
@@ -1,2 +1,2 @@
 catalogue greek-makeindex
-binpattern f bin/${ARCH}/mkgrkindex
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
index 2a51f5a8744..483f5cfd355 100644
--- a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
@@ -1,4 +1,4 @@
-binpattern f bin/${ARCH}/mkjobtexmf
-docpattern d texmf-dist/doc/generic/mkjobtexmf
-docpattern f texmf/doc/man/man1/mkjobtexmf.*
-runpattern d texmf-dist/scripts/mkjobtexmf
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern d texmf-dist/doc/generic/${PKGNAME}
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
+runpattern d texmf-dist/scripts/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc b/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
index 2d6367ae7fe..91dad534441 100644
--- a/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
@@ -1,2 +1,2 @@
-runpattern d texmf-dist/scripts/pdfcrop
-binpattern f bin/${ARCH}/*pdfcrop
+binpattern f bin/${ARCH}/*${PKGNAME}
+runpattern d texmf-dist/scripts/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/pedigree-perl.tlpsrc b/Master/tlpkg/tlpsrc/pedigree-perl.tlpsrc
index 49994731de4..a78f8b338b6 100644
--- a/Master/tlpkg/tlpsrc/pedigree-perl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pedigree-perl.tlpsrc
@@ -1,2 +1,2 @@
-runpattern d texmf-dist/scripts/pedigree-perl
 binpattern f bin/${ARCH}/pedigree
+runpattern d texmf-dist/scripts/pedigree-perl
diff --git a/Master/tlpkg/tlpsrc/perltex.tlpsrc b/Master/tlpkg/tlpsrc/perltex.tlpsrc
index 2df83a3f87e..f624d0dbcec 100644
--- a/Master/tlpkg/tlpsrc/perltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/perltex.tlpsrc
@@ -1,3 +1,3 @@
-binpattern f bin/${ARCH}/perltex
-docpattern +f texmf/doc/man/man1/perltex.*
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
 
diff --git a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
index 732d23a1aa7..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
+++ b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
@@ -1,2 +1,2 @@
-docpattern +f texmf/doc/man/man1/purifyeps.*
-binpattern f bin/${ARCH}/purifyeps
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/splitindex.tlpsrc b/Master/tlpkg/tlpsrc/splitindex.tlpsrc
index 6f9ad6a1eae..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/splitindex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/splitindex.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/splitindex
-docpattern +f texmf/doc/man/man1/splitindex.*
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/sty2dtx.tlpsrc b/Master/tlpkg/tlpsrc/sty2dtx.tlpsrc
index 37b3de290fa..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/sty2dtx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/sty2dtx.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/sty2dtx
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/svn-multi.tlpsrc b/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
index 1917f544fad..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/svn-multi
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/texcount.tlpsrc b/Master/tlpkg/tlpsrc/texcount.tlpsrc
index 90191fd6cc8..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/texcount.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texcount.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/texcount
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/texdef.tlpsrc b/Master/tlpkg/tlpsrc/texdef.tlpsrc
index 9e971494919..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/texdef.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdef.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/texdef
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/texdiff.tlpsrc b/Master/tlpkg/tlpsrc/texdiff.tlpsrc
index 82d715df4fe..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/texdiff.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdiff.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/texdiff
-docpattern +f texmf/doc/man/man1/texdiff.*
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
index 27c34c02d13..5ba0569a641 100644
--- a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/texdirflatten
-docpattern f texmf/doc/man/man1/texdirflatten.*
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/texliveonfly.tlpsrc b/Master/tlpkg/tlpsrc/texliveonfly.tlpsrc
index d8e8088eefc..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/texliveonfly.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texliveonfly.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/texliveonfly
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc b/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
index ee7a836ee51..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/texloganalyser
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
index 0224b30ee77..b086c0c650a 100644
--- a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
@@ -1,2 +1,2 @@
-binpattern f bin/${ARCH}/thumbpdf
-docpattern +f texmf/doc/man/man1/thumbpdf.*
+binpattern f bin/${ARCH}/${PKGNAME}
+docpattern +f texmf/doc/man/man1/${PKGNAME}.*
diff --git a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
index d48eadaac73..39c29eb9c50 100644
--- a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
@@ -1,4 +1,4 @@
 category TLCore
-docpattern f texmf/doc/tpic2pdftex/*
-docpattern f texmf/doc/man/man1/tpic2pdftex.*
-binpattern f bin/${ARCH}/tpic2pdftex
+docpattern f texmf/doc/${PKGNAME}/*
+docpattern f texmf/doc/man/man1/${PKGNAME}.*
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/typeoutfileinfo.tlpsrc b/Master/tlpkg/tlpsrc/typeoutfileinfo.tlpsrc
index 51b0573321b..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/typeoutfileinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/typeoutfileinfo.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/typeoutfileinfo
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/ulqda.tlpsrc b/Master/tlpkg/tlpsrc/ulqda.tlpsrc
index bcaa0be7a60..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/ulqda.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ulqda.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/ulqda
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/urlbst.tlpsrc b/Master/tlpkg/tlpsrc/urlbst.tlpsrc
index e82849482c4..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/urlbst.tlpsrc
+++ b/Master/tlpkg/tlpsrc/urlbst.tlpsrc
@@ -1 +1 @@
-binpattern f bin/${ARCH}/urlbst
+binpattern f bin/${ARCH}/${PKGNAME}