summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-18 17:48:20 +0000
committerKarl Berry <karl@freefriends.org>2009-06-18 17:48:20 +0000
commit6fd6699a451d86200fbc3a030cb1098e0dcea48a (patch)
tree6acbbf0dc6e2f158e5d88a7f94235b925a04c227 /Master/tlpkg
parent4e0d459a6c7828c2ca17ed0bcddaf4bc3cf89e43 (diff)
eradicate remaining name and category Package lines
git-svn-id: svn://tug.org/texlive/trunk@13822 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.config.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.core.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/a2ping.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/accfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/afm2pl.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/aleph.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/allrunes.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ams.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/amsfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/amstex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/antiqua.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/antomega.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/antp.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/antt.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/arabi.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/arabtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/archaic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/arev.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/arphic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ascii.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/augie.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/auncial-new.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/aurical.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/beamer.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/belleek.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bera.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bibtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/bibtex8.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/brushscr.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/burmese.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cbfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cc-pl.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/chemarrow.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cjhebrew.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cjk.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cjkutils.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/cm-lgc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cm-super.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cm.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cmcyr.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cmex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cmll.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-context.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-games.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-humanities.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarab.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langindic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langother.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latex3.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-luatex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-metapost.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-music.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-omega.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-pictures.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-publishers.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-science.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-wintools.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/context-bnf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-chromato.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-construction-plan.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-degrade.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-french.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-games.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-gnuplot.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-letter.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-lettrine.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-lilypond.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-mathsets.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-taspresent.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context-vim.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cs.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cslatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/csplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ctie.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/cweb.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cyklop.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/cyrillic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/datetime.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/dehyph-exptl.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/detex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/devnag.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dictsym.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/doublestroke.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/dtl.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvi2tty.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dviasm.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/dvicopy.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvidvi.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dviljk.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dviout.win32.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfm.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipng.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipos.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvips.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ebong.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/epigrafica.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/epiolmec.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/eplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/epspdf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/esint-type1.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/esint.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/esvect.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ethiop.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/eurofont.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/eurosym.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fge.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/foekfont.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fonetika.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fontinst.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fontools.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fontware.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/fourier.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fragmaster.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/garuda-c90.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/german.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/getafm.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/getnonfreefonts.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfsdidot.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfsporson.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gfssolomos.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/glossaries.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gothic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/graphics.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/groff.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/grotesq.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/grverb.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/gsftopk.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hfbright.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-base.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-french.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-german.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-lithuanian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/ibygrk.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ifluatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/initials.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/iwona.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/jknapltx.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/kerkis.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/koma-script.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/kpathsea.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/kpfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/kurier.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/lacheck.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/lambda.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/latex-fonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/latex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/latexmk.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/lettrine.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/lh.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/libris.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/linearA.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/lithuanian.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ltxmisc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/lxfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/manfnt.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/marvosym.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mathdesign.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/metafont.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mflogo.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mft.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mfware.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/misc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mltex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mnsymbol.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/montex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/mp3d.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/musixflx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/musixtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/norasi-c90.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/oberdiek.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ocherokee.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/oinuit.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/omega.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/paper.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/patch.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pax.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdf-forms-tutorial-de.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdfcrop.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdfpages.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdftex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/pdftools.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/perltex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pgf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pgfplots.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/phaistos.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/physe.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/phyzzx.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pigpen.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/plain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/polski.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ppower4.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ps2pkm.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/psnfss.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pst-uml.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pst2pdf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/psutils.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/purifyeps.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pxfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/rsfs.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/sanskrit.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/scheme-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-context.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-full.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-gust.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-medium.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-omega.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-xml.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/seetexk.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/semaphor.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/skaknew.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/splitindex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/staves.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/stmaryrd.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/stubs.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/svn-multi.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/synctex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/t1utils.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/t2.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tabvar.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tcdialog.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tetex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tex-gyre.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tex4ht.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texconfig.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texcount.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texdirflatten.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texdoc.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-cz.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-de.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-fr.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-pl.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-ru.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texloganalyser.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texpower.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texsis.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texware.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/thumbpdf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tie.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tikz-timing.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tipa.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tools.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tpslifonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/trajan.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/txfonts.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/uhc.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/velthuis.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/venturisadf.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/vlna.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/vntex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/vpe.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/vtex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/wadalab.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/wasy.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/web.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/wintools.win32.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/xecyr.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc7
-rw-r--r--Master/tlpkg/tlpsrc/xypic.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/yhmath.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/zefonts.tlpsrc2
396 files changed, 5 insertions, 593 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 30c7766b3e1..06a4779fc65 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -1,4 +1,3 @@
-name 00texlive.autopatterns
category TLCore
shortdesc Defines the default patterns per category used by tlpsrc2tlpdb.
longdesc As can be seen, the syntax here is slightly different from a
diff --git a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
index b32c0ade986..90c05e5f3d9 100644
--- a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
@@ -1,4 +1,3 @@
-name 00texlive.config
category TLCore
longdesc This package contains configuration options for the TeX Live archive
longdesc If container_split_{doc,src}_files occurs in the depend lines the
diff --git a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
index 624aa00cb14..894751df6b3 100644
--- a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
@@ -1,4 +1,3 @@
-name 00texlive.core
category TLCore
longdesc This package collects some files which are not caught by any of the
longdesc other TL packages. Its primary purpose is to make the file coverage
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 1a779a38da7..69acf2f69be 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -1,4 +1,3 @@
-name 00texlive.installation
category TLCore
longdesc This package serves two purposes:
longdesc
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index 895452e7106..206edbc05aa 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -1,4 +1,3 @@
-name 00texlive.installer
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built
longdesc by the tl-make-installer script. Most of what's here is also
diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
index 76cc4f4b23b..4533b80be29 100644
--- a/Master/tlpkg/tlpsrc/a2ping.tlpsrc
+++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
@@ -1,4 +1,3 @@
-name a2ping
category TLCore
docpattern f texmf/doc/man/man1/a2ping.*
runpattern f texmf/scripts/a2ping/a2ping.pl
diff --git a/Master/tlpkg/tlpsrc/accfonts.tlpsrc b/Master/tlpkg/tlpsrc/accfonts.tlpsrc
index 31fea3106e5..dcdad92c7b7 100644
--- a/Master/tlpkg/tlpsrc/accfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/accfonts.tlpsrc
@@ -1,5 +1,3 @@
-name accfonts
-category Package
binpattern f bin/${ARCH}/mkt1font
binpattern f bin/${ARCH}/vpl2ovp
binpattern f bin/${ARCH}/vpl2vpl
diff --git a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
index 66b53543e13..8cc50358791 100644
--- a/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/afm2pl.tlpsrc
@@ -1,4 +1,3 @@
-name afm2pl
category TLCore
binpattern f bin/${ARCH}/afm2pl
docpattern f texmf/doc/man/man1/afm2pl.*
diff --git a/Master/tlpkg/tlpsrc/aleph.tlpsrc b/Master/tlpkg/tlpsrc/aleph.tlpsrc
index 1e06620f16b..e3941c348ed 100644
--- a/Master/tlpkg/tlpsrc/aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/aleph.tlpsrc
@@ -1,5 +1,3 @@
-name aleph
-category Package
execute AddFormat name=aleph engine=aleph options=*aleph.ini
execute AddFormat name=lamed engine=aleph patterns=language.dat options=*lambda.ini
binpattern f bin/${ARCH}/aleph
diff --git a/Master/tlpkg/tlpsrc/allrunes.tlpsrc b/Master/tlpkg/tlpsrc/allrunes.tlpsrc
index 5eca6285ec1..9e0fc0eada8 100644
--- a/Master/tlpkg/tlpsrc/allrunes.tlpsrc
+++ b/Master/tlpkg/tlpsrc/allrunes.tlpsrc
@@ -1,3 +1 @@
-name allrunes
-category Package
execute addMixedMap allrunes.map
diff --git a/Master/tlpkg/tlpsrc/ams.tlpsrc b/Master/tlpkg/tlpsrc/ams.tlpsrc
index dfad9eea413..efcf762862a 100644
--- a/Master/tlpkg/tlpsrc/ams.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ams.tlpsrc
@@ -1,5 +1,3 @@
-name ams
-category Package
execute addMixedMap ams-bsr-interpolated.map
execute addMixedMap ams-bsr.map
execute addMixedMap ams-cmcsc-bsr-interpolated.map
diff --git a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
index db33ddaeb30..a0610cebe5b 100644
--- a/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amsfonts.tlpsrc
@@ -1,3 +1 @@
-name amsfonts
-category Package
depend ams
diff --git a/Master/tlpkg/tlpsrc/amstex.tlpsrc b/Master/tlpkg/tlpsrc/amstex.tlpsrc
index 2b267c90332..d1c7b924a88 100644
--- a/Master/tlpkg/tlpsrc/amstex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amstex.tlpsrc
@@ -1,5 +1,3 @@
-name amstex
-category Package
depend tex
execute AddFormat name=amstex engine=pdftex options="-translate-file=cp227.tcx *amstex.ini"
# did we ever ship that?
diff --git a/Master/tlpkg/tlpsrc/antiqua.tlpsrc b/Master/tlpkg/tlpsrc/antiqua.tlpsrc
index c6b567aaeed..f0e8ca9cd01 100644
--- a/Master/tlpkg/tlpsrc/antiqua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/antiqua.tlpsrc
@@ -1,3 +1 @@
-name antiqua
-category Package
execute addMap uaq.map
diff --git a/Master/tlpkg/tlpsrc/antomega.tlpsrc b/Master/tlpkg/tlpsrc/antomega.tlpsrc
index 03915ef1c4a..2b455d73c5e 100644
--- a/Master/tlpkg/tlpsrc/antomega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/antomega.tlpsrc
@@ -1,3 +1 @@
-name antomega
-category Package
depend omega
diff --git a/Master/tlpkg/tlpsrc/antp.tlpsrc b/Master/tlpkg/tlpsrc/antp.tlpsrc
index 7bebaa0981a..c32fbfd80f5 100644
--- a/Master/tlpkg/tlpsrc/antp.tlpsrc
+++ b/Master/tlpkg/tlpsrc/antp.tlpsrc
@@ -1,3 +1 @@
-name antp
-category Package
execute addMap antp.map
diff --git a/Master/tlpkg/tlpsrc/antt.tlpsrc b/Master/tlpkg/tlpsrc/antt.tlpsrc
index ef3f751ebf0..88b6cef9f58 100644
--- a/Master/tlpkg/tlpsrc/antt.tlpsrc
+++ b/Master/tlpkg/tlpsrc/antt.tlpsrc
@@ -1,3 +1 @@
-name antt
-category Package
execute addMap antt.map
diff --git a/Master/tlpkg/tlpsrc/arabi.tlpsrc b/Master/tlpkg/tlpsrc/arabi.tlpsrc
index a008f212878..059e630430d 100644
--- a/Master/tlpkg/tlpsrc/arabi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/arabi.tlpsrc
@@ -1,3 +1 @@
-name arabi
-category Package
execute addMap arabi.map
diff --git a/Master/tlpkg/tlpsrc/arabtex.tlpsrc b/Master/tlpkg/tlpsrc/arabtex.tlpsrc
index f3ae8b15aa6..50eaedd234e 100644
--- a/Master/tlpkg/tlpsrc/arabtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/arabtex.tlpsrc
@@ -1,3 +1 @@
-name arabtex
-category Package
execute addMixedMap arabtex.map
diff --git a/Master/tlpkg/tlpsrc/archaic.tlpsrc b/Master/tlpkg/tlpsrc/archaic.tlpsrc
index b38677dc5fa..29bbaa5976f 100644
--- a/Master/tlpkg/tlpsrc/archaic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/archaic.tlpsrc
@@ -1,3 +1 @@
-name archaic
-category Package
execute addMap archaicprw.map
diff --git a/Master/tlpkg/tlpsrc/arev.tlpsrc b/Master/tlpkg/tlpsrc/arev.tlpsrc
index 6d2612c6288..0c5a834c7d9 100644
--- a/Master/tlpkg/tlpsrc/arev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/arev.tlpsrc
@@ -1,3 +1 @@
-name arev
-category Package
execute addMap arev.map
diff --git a/Master/tlpkg/tlpsrc/arphic.tlpsrc b/Master/tlpkg/tlpsrc/arphic.tlpsrc
index dac690b83af..87408ccdc30 100644
--- a/Master/tlpkg/tlpsrc/arphic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/arphic.tlpsrc
@@ -1,5 +1,3 @@
-name arphic
-category Package
execute addMap bkaiu.map
execute addMap bsmiu.map
execute addMap gbsnu.map
diff --git a/Master/tlpkg/tlpsrc/ascii.tlpsrc b/Master/tlpkg/tlpsrc/ascii.tlpsrc
index 29d40b43cbb..4b81df14925 100644
--- a/Master/tlpkg/tlpsrc/ascii.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ascii.tlpsrc
@@ -1,3 +1 @@
-name ascii
-category Package
execute addMap ascii.map
diff --git a/Master/tlpkg/tlpsrc/augie.tlpsrc b/Master/tlpkg/tlpsrc/augie.tlpsrc
index bbe4b8e486f..b6b024328c9 100644
--- a/Master/tlpkg/tlpsrc/augie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/augie.tlpsrc
@@ -1,3 +1 @@
-name augie
-category Package
execute addMap augie.map
diff --git a/Master/tlpkg/tlpsrc/auncial-new.tlpsrc b/Master/tlpkg/tlpsrc/auncial-new.tlpsrc
index 4e3b59c3171..d7af93d1064 100644
--- a/Master/tlpkg/tlpsrc/auncial-new.tlpsrc
+++ b/Master/tlpkg/tlpsrc/auncial-new.tlpsrc
@@ -1,3 +1 @@
-name auncial-new
-category Package
execute addMap auncial.map
diff --git a/Master/tlpkg/tlpsrc/aurical.tlpsrc b/Master/tlpkg/tlpsrc/aurical.tlpsrc
index e110f88389e..df97aaad8fb 100644
--- a/Master/tlpkg/tlpsrc/aurical.tlpsrc
+++ b/Master/tlpkg/tlpsrc/aurical.tlpsrc
@@ -1,3 +1 @@
-name aurical
-category Package
execute addMap aurical.map
diff --git a/Master/tlpkg/tlpsrc/beamer.tlpsrc b/Master/tlpkg/tlpsrc/beamer.tlpsrc
index 3a7ac89108f..14ed423b416 100644
--- a/Master/tlpkg/tlpsrc/beamer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/beamer.tlpsrc
@@ -1,4 +1,2 @@
-name beamer
-category Package
depend pgf
depend xcolor
diff --git a/Master/tlpkg/tlpsrc/belleek.tlpsrc b/Master/tlpkg/tlpsrc/belleek.tlpsrc
index d5401f0dc44..80c6743a0c6 100644
--- a/Master/tlpkg/tlpsrc/belleek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/belleek.tlpsrc
@@ -1,3 +1 @@
-name belleek
-category Package
execute addMap belleek.map
diff --git a/Master/tlpkg/tlpsrc/bera.tlpsrc b/Master/tlpkg/tlpsrc/bera.tlpsrc
index 0c727dcbe4a..2fca9950ef4 100644
--- a/Master/tlpkg/tlpsrc/bera.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bera.tlpsrc
@@ -1,4 +1,2 @@
-name bera
-category Package
execute addMap bera.map
runpattern +!f texmf-dist/fonts/map/vtex/bera/bera.ali
diff --git a/Master/tlpkg/tlpsrc/bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bibtex.tlpsrc
index dbf72cc0389..34d2ca4feef 100644
--- a/Master/tlpkg/tlpsrc/bibtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bibtex.tlpsrc
@@ -1,5 +1,3 @@
-name bibtex
-category Package
depend kpathsea
srcpattern f ignore
runpattern d texmf-dist/bibtex/bib/base
diff --git a/Master/tlpkg/tlpsrc/bibtex8.tlpsrc b/Master/tlpkg/tlpsrc/bibtex8.tlpsrc
index 62f829120e9..5613d603457 100644
--- a/Master/tlpkg/tlpsrc/bibtex8.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bibtex8.tlpsrc
@@ -1,4 +1,3 @@
-name bibtex8
category TLCore
runpattern d texmf-dist/bibtex/csf/base
# this should be its own package, but didn't seem worth it. --karl, 9sep08
diff --git a/Master/tlpkg/tlpsrc/brushscr.tlpsrc b/Master/tlpkg/tlpsrc/brushscr.tlpsrc
index a6de8b67286..8b1eb2ba83a 100644
--- a/Master/tlpkg/tlpsrc/brushscr.tlpsrc
+++ b/Master/tlpkg/tlpsrc/brushscr.tlpsrc
@@ -1,3 +1 @@
-name brushscr
-category Package
execute addMap pbsi.map
diff --git a/Master/tlpkg/tlpsrc/burmese.tlpsrc b/Master/tlpkg/tlpsrc/burmese.tlpsrc
index b2c9f0b234f..b6467db77bd 100644
--- a/Master/tlpkg/tlpsrc/burmese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/burmese.tlpsrc
@@ -1,3 +1 @@
-name burmese
-category Package
execute addMap burmese.map
diff --git a/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc b/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc
index ce5db288322..ab1ef2b0426 100644
--- a/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc
+++ b/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc
@@ -1,3 +1 @@
-name carolmin-ps
-category Package
execute addMap cmin.map
diff --git a/Master/tlpkg/tlpsrc/cbfonts.tlpsrc b/Master/tlpkg/tlpsrc/cbfonts.tlpsrc
index 7ef805091b5..6693efd8675 100644
--- a/Master/tlpkg/tlpsrc/cbfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cbfonts.tlpsrc
@@ -1,3 +1 @@
-name cbfonts
-category Package
execute addMixedMap cbgreek-full.map
diff --git a/Master/tlpkg/tlpsrc/cc-pl.tlpsrc b/Master/tlpkg/tlpsrc/cc-pl.tlpsrc
index 124d3d55081..a03c9baa15e 100644
--- a/Master/tlpkg/tlpsrc/cc-pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cc-pl.tlpsrc
@@ -1,3 +1 @@
-name cc-pl
-category Package
execute addMixedMap ccpl.map
diff --git a/Master/tlpkg/tlpsrc/chemarrow.tlpsrc b/Master/tlpkg/tlpsrc/chemarrow.tlpsrc
index 1d6d5fb94ae..76038b258b8 100644
--- a/Master/tlpkg/tlpsrc/chemarrow.tlpsrc
+++ b/Master/tlpkg/tlpsrc/chemarrow.tlpsrc
@@ -1,3 +1 @@
-name chemarrow
-category Package
execute addMap chemarrow.map
diff --git a/Master/tlpkg/tlpsrc/cjhebrew.tlpsrc b/Master/tlpkg/tlpsrc/cjhebrew.tlpsrc
index 911d9069a16..94f703ef998 100644
--- a/Master/tlpkg/tlpsrc/cjhebrew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cjhebrew.tlpsrc
@@ -1,3 +1 @@
-name cjhebrew
-category Package
execute addMap cjhebrew.map
diff --git a/Master/tlpkg/tlpsrc/cjk.tlpsrc b/Master/tlpkg/tlpsrc/cjk.tlpsrc
index e36e4537603..f2cfac53967 100644
--- a/Master/tlpkg/tlpsrc/cjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cjk.tlpsrc
@@ -1,5 +1,3 @@
-name cjk
-category Package
depend arphic
depend cns
depend garuda-c90
diff --git a/Master/tlpkg/tlpsrc/cjkutils.tlpsrc b/Master/tlpkg/tlpsrc/cjkutils.tlpsrc
index 9996d7d7fdf..2a83193dffb 100644
--- a/Master/tlpkg/tlpsrc/cjkutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cjkutils.tlpsrc
@@ -1,4 +1,3 @@
-name cjkutils
category TLCore
runpattern d texmf/hbf2gf
docpattern d texmf/doc/bg5conv
diff --git a/Master/tlpkg/tlpsrc/cm-lgc.tlpsrc b/Master/tlpkg/tlpsrc/cm-lgc.tlpsrc
index 8214b6bf397..ef094a31cee 100644
--- a/Master/tlpkg/tlpsrc/cm-lgc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cm-lgc.tlpsrc
@@ -1,3 +1 @@
-name cm-lgc
-category Package
execute addMap cm-lgc.map
diff --git a/Master/tlpkg/tlpsrc/cm-super.tlpsrc b/Master/tlpkg/tlpsrc/cm-super.tlpsrc
index a15c3bb8bfb..bcdac997515 100644
--- a/Master/tlpkg/tlpsrc/cm-super.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cm-super.tlpsrc
@@ -1,5 +1,3 @@
-name cm-super
-category Package
execute addMixedMap cm-super-t1.map
execute addMixedMap cm-super-t2a.map
execute addMixedMap cm-super-t2b.map
diff --git a/Master/tlpkg/tlpsrc/cm.tlpsrc b/Master/tlpkg/tlpsrc/cm.tlpsrc
index 0d895a8ce98..9578e3d37e6 100644
--- a/Master/tlpkg/tlpsrc/cm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cm.tlpsrc
@@ -1,5 +1,3 @@
-name cm
-category Package
execute addMixedMap cmother-bsr.map
execute addMixedMap cmtext-bsr-interpolated.map
execute addMixedMap cmtext-bsr.map
diff --git a/Master/tlpkg/tlpsrc/cmcyr.tlpsrc b/Master/tlpkg/tlpsrc/cmcyr.tlpsrc
index 4c72cd85ffa..80545a58753 100644
--- a/Master/tlpkg/tlpsrc/cmcyr.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmcyr.tlpsrc
@@ -1,3 +1 @@
-name cmcyr
-category Package
execute addMap cmcyr.map
diff --git a/Master/tlpkg/tlpsrc/cmex.tlpsrc b/Master/tlpkg/tlpsrc/cmex.tlpsrc
index a877b13f39d..3ac5ff47bd9 100644
--- a/Master/tlpkg/tlpsrc/cmex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmex.tlpsrc
@@ -1,3 +1 @@
-name cmex
-category Package
execute addMixedMap ttcmex.map
diff --git a/Master/tlpkg/tlpsrc/cmll.tlpsrc b/Master/tlpkg/tlpsrc/cmll.tlpsrc
index 2d68b098c30..74f7e07bed9 100644
--- a/Master/tlpkg/tlpsrc/cmll.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cmll.tlpsrc
@@ -1,3 +1 @@
-name cmll
-category Package
execute addMixedMap cmll.map
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 1b8905813cc..71cf7e05599 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -1,4 +1,3 @@
-name collection-basic
category Collection
shortdesc Essential programs and files
longdesc These files are regarded as basic for any TeX system, covering
diff --git a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
index 4a1cc3a88e3..140eec3f06d 100644
--- a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-bibtexextra
category Collection
shortdesc Extra BibTeX styles
longdesc Additional BibTeX styles and bibliography databases.
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 62abe210307..c79eee83219 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-binextra
category Collection
shortdesc TeX auxiliary programs
longdesc Various useful, but non-essential, support programs. Includes
diff --git a/Master/tlpkg/tlpsrc/collection-context.tlpsrc b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
index 9c5c32a5ee5..ac99cbf080b 100644
--- a/Master/tlpkg/tlpsrc/collection-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
@@ -1,4 +1,3 @@
-name collection-context
category Collection
shortdesc ConTeXt format
longdesc Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
index a659188c999..07521047e91 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-base.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-base
category Collection
shortdesc TeX Live documentation
depend texlive-common
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
index 376256b3e98..7ae681f18fe 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-bulgarian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-bulgarian
category Collection
shortdesc Bulgarian documentation
depend lshort-bulgarian
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
index aa6d76df25e..9f86a720022 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-chinese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-chinese
category Collection
shortdesc Chinese documentation
depend texlive-zh-cn
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
index 8f439407855..876975b1f85 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-czechslovak.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-czechslovak
category Collection
shortdesc Czechslovak documentation
depend lshort-slovak
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
index c9b0f7ae7a3..2e16c7073c3 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-dutch.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-dutch
category Collection
shortdesc Dutch documentation
depend lshort-dutch
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
index b94ac43d349..010581179f1 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-english.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-english
category Collection
shortdesc English documentation
depend FAQ-en
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
index d33ef05120d..c47887dac99 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-finnish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-finnish
category Collection
shortdesc Finnish documentation
depend lshort-finnish
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
index 5680a924ccd..54cebe760ab 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-french.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-french
category Collection
shortdesc French documentation
depend epslatex-fr
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
index d6cf39dae42..437697a92d4 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-german.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-german
category Collection
shortdesc German documentation
depend kopka
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
index ffbe8230dc6..3374d2ff8a6 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-greek.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-greek
category Collection
shortdesc Greek documentation
depend gentle-gr
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
index e8c42a81096..18b8104a4ea 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-italian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-italian
category Collection
shortdesc Italian documentation
depend amsldoc-it
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
index da6913ceb04..3a1742b8f3c 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-japanese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-japanese
category Collection
shortdesc Japanese documentation
depend lshort-japanese
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
index b8cb52a8c9d..bb23938741c 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-korean.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-korean
category Collection
shortdesc Korean documentation
depend lshort-korean
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
index 8e7b494acce..a60af3364a5 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-mongolian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-mongolian
category Collection
shortdesc Mongolian documentation
depend lshort-mongol
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
index 84202cd09ea..8919835c5c3 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-polish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-polish
category Collection
shortdesc Polish documentation
depend lshort-polish
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
index 476455495e7..006a1ea0eee 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-portuguese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-portuguese
category Collection
shortdesc Portuguese documentation
depend beamer-tut-pt
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
index 019e7bfaa39..fa81dc4f833 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-russian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-russian
category Collection
shortdesc Russian documentation
depend lshort-russian
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc
index 50153831a7a..dd924efb66b 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-slovenian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-slovenian
category Collection
shortdesc Slovenian documentation
depend lshort-slovenian
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
index db2b283cd3f..f5e74dc1729 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-spanish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-spanish
category Collection
shortdesc Spanish documentation
depend es-tex-faq
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
index 44bd70cee65..100fc43bcf8 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-thai.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-thai
category Collection
shortdesc Thai documentation
depend lshort-thai
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
index 9058688b786..653a7bc180b 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-turkish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-turkish
category Collection
shortdesc Turkish documentation
depend lshort-turkish
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
index e3c5a38722d..cb8eacb075a 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-ukrainian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-ukrainian
category Collection
shortdesc Ukrainian documentation
depend lshort-ukr
diff --git a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
index 978688e07a5..7e0028540c2 100644
--- a/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-documentation-vietnamese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-documentation-vietnamese
category Collection
shortdesc Vietnamese documentation
depend amsldoc-vn
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index ab588e67dd4..9addd012cf9 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-fontsextra
category Collection
shortdesc Extra fonts
depend Asana-Math
diff --git a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
index 34d649432fc..5b3978b0515 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
@@ -1,4 +1,3 @@
-name collection-fontsrecommended
category Collection
shortdesc Recommended fonts
depend avantgar
diff --git a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
index d7f5c357569..ee295a4b373 100644
--- a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
@@ -1,4 +1,3 @@
-name collection-fontutils
category Collection
shortdesc TeX and Outline font utilities
longdesc Programs for conversion between font formats, testing fonts,
diff --git a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
index f424bcd2539..8702c9328da 100644
--- a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-formatsextra
category Collection
shortdesc Extra formats
longdesc A collection of TeX `formats', ie large-scale macro packages
diff --git a/Master/tlpkg/tlpsrc/collection-games.tlpsrc b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
index 50723492df3..a8f5c8ca0b8 100644
--- a/Master/tlpkg/tlpsrc/collection-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
@@ -1,4 +1,3 @@
-name collection-games
category Collection
shortdesc Games typesetting
longdesc Setups for typesetting various games, including chess.
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
index 919d542cf62..348519c359a 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-genericextra
category Collection
shortdesc Extra generic packages
longdesc Extra packages that work with multiple formats, typically both
diff --git a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
index 4afbe135527..b4a8f38679b 100644
--- a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
@@ -1,4 +1,3 @@
-name collection-genericrecommended
category Collection
shortdesc Recommended generic packages
longdesc Recommended packages that work with multiple formats.
diff --git a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
index 584f46ec573..2aa0fbf5ac5 100644
--- a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
@@ -1,4 +1,3 @@
-name collection-htmlxml
category Collection
shortdesc HTML/SGML/XML support
longdesc Packages to convert LaTeX to XML/HTML, and typset XML/SGML
diff --git a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
index 77c8bb1afdd..f299780f291 100644
--- a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
@@ -1,4 +1,3 @@
-name collection-humanities
category Collection
shortdesc Humanities packages
longdesc Packages for law, linguistics, the social sciences, the
diff --git a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
index 3cf125ffb07..f407daf08b4 100644
--- a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langafrican
category Collection
shortdesc African scripts
longdesc Fonts for typesetting some African scripts
diff --git a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
index 36977c291e8..f6779b1d318 100644
--- a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langarab
category Collection
shortdesc Arabic
longdesc Fonts and support for typesetting Arabic
diff --git a/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
index 5f9242d10e2..4e81c6659db 100644
--- a/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarmenian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langarmenian
category Collection
shortdesc Armenian
longdesc Essential armenian
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index 25ac58ffc84..1975936cb99 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langcjk
category Collection
shortdesc Chinese, Japanese, Korean
longdesc CJK (Chinese, Japanese, Korean) macros, fonts, documentation.
diff --git a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
index 0c31f36b1c9..759ff5e9197 100644
--- a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langcroatian
category Collection
shortdesc Croatian
longdesc Essential croatian
diff --git a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
index 1b94edeb197..d9e47909a55 100644
--- a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langcyrillic
category Collection
shortdesc Cyrillic
longdesc Fonts and macro packages to typeset Cyrillic texts.
diff --git a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
index 3645e205e28..6ed53cddb88 100644
--- a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langczechslovak
category Collection
shortdesc Czech/Slovak
longdesc Czech/Slovak packages and hyphenation support.
diff --git a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
index 1806b48e671..25072821201 100644
--- a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langdanish
category Collection
shortdesc Danish
longdesc Essential Danish
diff --git a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
index 3da30e23cca..1001d0b4f9f 100644
--- a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langdutch
category Collection
shortdesc Dutch
longdesc Essential Dutch
diff --git a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
index 2ccc506ce18..ca58fab2d02 100644
--- a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langfinnish
category Collection
shortdesc Finnish
longdesc Essential finnish
diff --git a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
index 49f5cd86d2d..8f2b1b4eb6e 100644
--- a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langfrench
category Collection
shortdesc French
longdesc Packages and hyphenation support for French.
diff --git a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
index 511efa8c2f5..6b85e528951 100644
--- a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langgerman
category Collection
shortdesc German
longdesc Essential German
diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
index f1cbba11ac3..6a0deed58ae 100644
--- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langgreek
category Collection
shortdesc Greek
longdesc Fonts and support for typesetting Greek
diff --git a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
index 01759f100cd..6d0a7c14076 100644
--- a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langhebrew
category Collection
shortdesc Hebrew
longdesc Fonts and support for typesetting Hebrew
diff --git a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
index 02d27424e32..850500383cd 100644
--- a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langhungarian
category Collection
shortdesc Hungarian
longdesc Essential Hungarian
diff --git a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
index a8bf2f866c7..8c27a4b2873 100644
--- a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langindic
category Collection
shortdesc Indic scripts
longdesc Essential indic
diff --git a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
index 7d44e91ae96..d4ff67e3029 100644
--- a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langitalian
category Collection
shortdesc Italian
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
index c5df4114ae7..1e6572d46a0 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langlatin
category Collection
shortdesc Latin
longdesc Essential Latin
diff --git a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
index feddab0ad48..0f7570a6bb2 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langlatvian
category Collection
shortdesc Latvian
longdesc Latvian hyphenation
diff --git a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
index e135ad64eb2..4af4e657cf7 100644
--- a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langlithuanian
category Collection
shortdesc Lithuan language support
longdesc Hyphenations and support for typesetting in Lithuanian
diff --git a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
index 6ab66f5da60..a48b2c03839 100644
--- a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langmongolian
category Collection
shortdesc Mongolian
longdesc Support for Mongolian.
diff --git a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
index 391aef5316c..7aec81ead6f 100644
--- a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langnorwegian
category Collection
shortdesc Norwegian
longdesc Essential Norwegian
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index 2096b2281e8..36da5d8159d 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langother
category Collection
shortdesc Other hyphenation files
longdesc Hyphenation patterns for languages with no other support.
diff --git a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
index b49ff32affa..b6b3590db0f 100644
--- a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langpolish
category Collection
shortdesc Polish
longdesc Pick this if you want Polish fonts and other packages
diff --git a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
index 53ee4824715..e8bd910fbc1 100644
--- a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langportuguese
category Collection
shortdesc Portuguese
depend ordinalpt
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index f3f85ebb786..ce8031ae14c 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langspanish
category Collection
shortdesc Spanish
depend hyphen-spanish
diff --git a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
index 2faee40bed9..6191e96e950 100644
--- a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langswedish
category Collection
shortdesc Swedish
longdesc Essential swedish
diff --git a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
index 07e4331b1c1..8672cb2c423 100644
--- a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langtibetan
category Collection
shortdesc Tibetan
longdesc Fonts and support for typesetting Tibetan
diff --git a/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
index 20453b6bd75..be13eb88872 100644
--- a/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langukenglish.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langukenglish
category Collection
shortdesc UK English
longdesc Essential UK English
diff --git a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
index 9335dee3f16..19b36054edf 100644
--- a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
@@ -1,4 +1,3 @@
-name collection-langvietnamese
category Collection
shortdesc Vietnamese
longdesc Vietnamese support
diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
index 9725e7bc28b..ea696e1b30d 100644
--- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
@@ -1,4 +1,3 @@
-name collection-latex
category Collection
shortdesc Basic LaTeX packages
longdesc These packages are either mandated by the core LaTeX team, or
diff --git a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
index 642fea7d105..d94309ad6bd 100644
--- a/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex3.tlpsrc
@@ -1,4 +1,3 @@
-name collection-latex3
category Collection
shortdesc LaTeX3 packages
depend expl3
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index 92d36f64ac7..7e1ef1b30f7 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -1,4 +1,3 @@
-name collection-latexrecommended
category Collection
shortdesc LaTeX recommended packages
longdesc A collection of recommended add-on packages for LaTeX which have
diff --git a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
index 614b9294151..eebcb594f6c 100644
--- a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
@@ -1,4 +1,3 @@
-name collection-luatex
category Collection
shortdesc LuaTeX packages
longdesc Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using Lua
diff --git a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
index 5f0f315cd1d..c80400778ec 100644
--- a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-mathextra
category Collection
shortdesc Advanced math typesetting
longdesc Extra math
diff --git a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
index a99719e8042..cfedcb93472 100644
--- a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
@@ -1,4 +1,3 @@
-name collection-metapost
category Collection
shortdesc MetaPost (and Metafont) drawing packages
depend automata
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index 40f8020517a..935542ba856 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -1,4 +1,3 @@
-name collection-music
category Collection
shortdesc Music typesetting
longdesc Music-related fonts and packages.
diff --git a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
index e7a1fa7b05b..f2364c36e68 100644
--- a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
@@ -1,4 +1,3 @@
-name collection-omega
category Collection
shortdesc Omega
longdesc Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 197263983e9..0ccc7a06b58 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -1,4 +1,3 @@
-name collection-pictures
category Collection
shortdesc Graphics packages
depend autoarea
diff --git a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
index 529b80c188c..bb68cb8f682 100644
--- a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
@@ -1,4 +1,3 @@
-name collection-plainextra
category Collection
shortdesc Plain TeX supplementary packages
longdesc Add-on packages and macros that work with plain TeX.
diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
index dd89729644b..6be4e11c5f6 100644
--- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
@@ -1,4 +1,3 @@
-name collection-pstricks
category Collection
shortdesc PSTricks packages
depend auto-pst-pdf
diff --git a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
index df66611d889..8179eee11df 100644
--- a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
@@ -1,4 +1,3 @@
-name collection-publishers
category Collection
shortdesc Support for publishers and theses
depend ANUfinalexam
diff --git a/Master/tlpkg/tlpsrc/collection-science.tlpsrc b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
index 8a015c0279b..51345bb390b 100644
--- a/Master/tlpkg/tlpsrc/collection-science.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
@@ -1,4 +1,3 @@
-name collection-science
category Collection
shortdesc Typesetting for natural and computer sciences
longdesc Typesetting for natural and computer sciences
diff --git a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
index 738e9d8a1e3..110b8c2a7e1 100644
--- a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
@@ -1,4 +1,3 @@
-name collection-texinfo
category Collection
shortdesc GNU Texinfo
longdesc Programs and macros for the GNU Texinfo documentation system.
diff --git a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
index 9ff808a22a0..8794938cbef 100644
--- a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
@@ -1,4 +1,3 @@
-name collection-wintools
category Collection
shortdesc Windows support programs
longdesc Utilities for Windows, since they are not readily available there:
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 951e16ab94a..f22edd7cf9a 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -1,4 +1,3 @@
-name collection-xetex
category Collection
shortdesc XeTeX packages
longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
diff --git a/Master/tlpkg/tlpsrc/context-bnf.tlpsrc b/Master/tlpkg/tlpsrc/context-bnf.tlpsrc
index 4bef9fccabb..dd8635574e3 100644
--- a/Master/tlpkg/tlpsrc/context-bnf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-bnf.tlpsrc
@@ -1,4 +1,2 @@
-name context-bnf
-category Package
runpattern d texmf-dist/tex/context/third/bnf
docpattern d texmf-dist/doc/context/third/bnf
diff --git a/Master/tlpkg/tlpsrc/context-chromato.tlpsrc b/Master/tlpkg/tlpsrc/context-chromato.tlpsrc
index 7ba4875338f..737a609a01e 100644
--- a/Master/tlpkg/tlpsrc/context-chromato.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-chromato.tlpsrc
@@ -1,4 +1,2 @@
-name context-chromato
-category Package
runpattern d texmf-dist/tex/context/third/chromato
docpattern d texmf-dist/doc/context/third/chromato
diff --git a/Master/tlpkg/tlpsrc/context-construction-plan.tlpsrc b/Master/tlpkg/tlpsrc/context-construction-plan.tlpsrc
index d2fd3dab294..e785e33e791 100644
--- a/Master/tlpkg/tlpsrc/context-construction-plan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-construction-plan.tlpsrc
@@ -1,4 +1,2 @@
-name context-construction-plan
-category Package
runpattern d texmf-dist/tex/context/third/construction-plan
docpattern d texmf-dist/doc/context/third/construction-plan
diff --git a/Master/tlpkg/tlpsrc/context-degrade.tlpsrc b/Master/tlpkg/tlpsrc/context-degrade.tlpsrc
index f262525f88f..e8db0159bb9 100644
--- a/Master/tlpkg/tlpsrc/context-degrade.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-degrade.tlpsrc
@@ -1,4 +1,2 @@
-name context-degrade
-category Package
runpattern d texmf-dist/tex/context/third/degrade
docpattern d texmf-dist/doc/context/third/degrade
diff --git a/Master/tlpkg/tlpsrc/context-french.tlpsrc b/Master/tlpkg/tlpsrc/context-french.tlpsrc
index 8c0c6415468..8ee426eebbd 100644
--- a/Master/tlpkg/tlpsrc/context-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-french.tlpsrc
@@ -1,4 +1,2 @@
-name context-french
-category Package
runpattern d texmf-dist/tex/context/third/french
docpattern d texmf-dist/doc/context/third/french
diff --git a/Master/tlpkg/tlpsrc/context-games.tlpsrc b/Master/tlpkg/tlpsrc/context-games.tlpsrc
index 6f92e88e815..905eb13f1bc 100644
--- a/Master/tlpkg/tlpsrc/context-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-games.tlpsrc
@@ -1,5 +1,3 @@
-name context-games
-category Package
runpattern d texmf-dist/tex/context/third/games
docpattern d texmf-dist/doc/context/third/games
depend skaknew
diff --git a/Master/tlpkg/tlpsrc/context-gnuplot.tlpsrc b/Master/tlpkg/tlpsrc/context-gnuplot.tlpsrc
index c92d03ae5ff..bf8886c6bdf 100644
--- a/Master/tlpkg/tlpsrc/context-gnuplot.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-gnuplot.tlpsrc
@@ -1,4 +1,2 @@
-name context-gnuplot
-category Package
runpattern d texmf-dist/tex/context/third/gnuplot
runpattern d texmf-dist/metapost/context/third/gnuplot
diff --git a/Master/tlpkg/tlpsrc/context-letter.tlpsrc b/Master/tlpkg/tlpsrc/context-letter.tlpsrc
index ea96817e75a..ee3ca159613 100644
--- a/Master/tlpkg/tlpsrc/context-letter.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-letter.tlpsrc
@@ -1,5 +1,3 @@
-name context-letter
-category Package
runpattern d texmf-dist/tex/context/third/letter
runpattern f texmf-dist/tex/context/interface/third/t-letter.xml
runpattern f texmf-dist/tex/context/interface/third/t-resume.xml
diff --git a/Master/tlpkg/tlpsrc/context-lettrine.tlpsrc b/Master/tlpkg/tlpsrc/context-lettrine.tlpsrc
index a84dd0e7003..b6e6ce45bc0 100644
--- a/Master/tlpkg/tlpsrc/context-lettrine.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-lettrine.tlpsrc
@@ -1,5 +1,3 @@
-name context-lettrine
-category Package
runpattern d texmf-dist/tex/context/third/lettrine
runpattern f texmf-dist/tex/context/interface/third/lettrine.xml
docpattern d texmf-dist/doc/context/third/lettrine
diff --git a/Master/tlpkg/tlpsrc/context-lilypond.tlpsrc b/Master/tlpkg/tlpsrc/context-lilypond.tlpsrc
index 9be49baa470..86744062ea8 100644
--- a/Master/tlpkg/tlpsrc/context-lilypond.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-lilypond.tlpsrc
@@ -1,4 +1,2 @@
-name context-lilypond
-category Package
runpattern d texmf-dist/tex/context/third/lilypond
docpattern d texmf-dist/doc/context/third/lilypond
diff --git a/Master/tlpkg/tlpsrc/context-mathsets.tlpsrc b/Master/tlpkg/tlpsrc/context-mathsets.tlpsrc
index a20c10742a2..c145c606927 100644
--- a/Master/tlpkg/tlpsrc/context-mathsets.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-mathsets.tlpsrc
@@ -1,5 +1,3 @@
-name context-mathsets
-category Package
runpattern d texmf-dist/tex/context/third/mathsets
runpattern f texmf-dist/tex/context/interface/third/t-mathsets.xml
docpattern d texmf-dist/doc/context/third/mathsets
diff --git a/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc b/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
index bb1b69eb130..9f226b4d4d3 100644
--- a/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-simpleslides.tlpsrc
@@ -1,5 +1,3 @@
-name context-simpleslides
-category Package
runpattern f texmf-dist/tex/context/interface/third/t-simpleslides.xml
runpattern d texmf-dist/tex/context/third/simple-slides
runpattern d texmf-dist/scripts/context/lua/third/simple-slides
diff --git a/Master/tlpkg/tlpsrc/context-taspresent.tlpsrc b/Master/tlpkg/tlpsrc/context-taspresent.tlpsrc
index 915ff87dbce..c03c211775f 100644
--- a/Master/tlpkg/tlpsrc/context-taspresent.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-taspresent.tlpsrc
@@ -1,4 +1,2 @@
-name context-taspresent
-category Package
runpattern d texmf-dist/tex/context/third/taspresent
docpattern d texmf-dist/doc/context/third/taspresent
diff --git a/Master/tlpkg/tlpsrc/context-vim.tlpsrc b/Master/tlpkg/tlpsrc/context-vim.tlpsrc
index 50b02628989..264898c0b11 100644
--- a/Master/tlpkg/tlpsrc/context-vim.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-vim.tlpsrc
@@ -1,5 +1,3 @@
-name context-vim
-category Package
runpattern d texmf-dist/tex/context/third/vim
runpattern f texmf-dist/tex/context/interface/third/t-vim.xml
docpattern d texmf-dist/doc/context/third/vim
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index 162bee645ac..aef77d71d08 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -1,5 +1,3 @@
-name context
-category Package
depend pdftex
depend lm
execute AddFormat name=cont-en engine=pdftex patterns=cont-usr.tex options="-8bit *cont-en.ini"
diff --git a/Master/tlpkg/tlpsrc/cs.tlpsrc b/Master/tlpkg/tlpsrc/cs.tlpsrc
index 5f32c175917..bc16563f3cc 100644
--- a/Master/tlpkg/tlpsrc/cs.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cs.tlpsrc
@@ -1,4 +1,2 @@
-name cs
-category Package
execute addMixedMap csother.map
execute addMixedMap cstext.map
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index c131fbc57e8..9247af60230 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -1,5 +1,3 @@
-name cslatex
-category Package
depend latex
execute AddFormat name=cslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
execute AddFormat name=pdfcslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
diff --git a/Master/tlpkg/tlpsrc/csplain.tlpsrc b/Master/tlpkg/tlpsrc/csplain.tlpsrc
index 11d2b541bde..3a37cce537b 100644
--- a/Master/tlpkg/tlpsrc/csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/csplain.tlpsrc
@@ -1,5 +1,3 @@
-name csplain
-category Package
depend tex
execute AddFormat name=csplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
execute AddFormat name=pdfcsplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
diff --git a/Master/tlpkg/tlpsrc/ctie.tlpsrc b/Master/tlpkg/tlpsrc/ctie.tlpsrc
index 47cd05a3d8f..29f9da3b00a 100644
--- a/Master/tlpkg/tlpsrc/ctie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ctie.tlpsrc
@@ -1,4 +1,3 @@
-name ctie
category TLCore
depend kpathsea
docpattern f texmf/doc/man/man1/ctie.*
diff --git a/Master/tlpkg/tlpsrc/cweb.tlpsrc b/Master/tlpkg/tlpsrc/cweb.tlpsrc
index 06bdfa3ba73..90b84158f12 100644
--- a/Master/tlpkg/tlpsrc/cweb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cweb.tlpsrc
@@ -1,5 +1,3 @@
-name cweb
-category Package
docpattern +f texmf/doc/man/man1/ctangle.*
docpattern +f texmf/doc/man/man1/cweave.*
docpattern +f texmf/doc/man/man1/cweb.*
diff --git a/Master/tlpkg/tlpsrc/cyklop.tlpsrc b/Master/tlpkg/tlpsrc/cyklop.tlpsrc
index ec7eb6ed922..98f3796c088 100644
--- a/Master/tlpkg/tlpsrc/cyklop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cyklop.tlpsrc
@@ -1,3 +1 @@
-name cyklop
-category Package
execute addMap cyklop.map
diff --git a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
index 6a0bca1bda8..49a4db0964e 100644
--- a/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cyrillic.tlpsrc
@@ -1,5 +1,3 @@
-name cyrillic
-category Package
docpattern +f texmf/doc/man/man1/rubibtex.*
docpattern +f texmf/doc/man/man1/rumakeindex.*
binpattern f bin/${ARCH}/rubibtex
diff --git a/Master/tlpkg/tlpsrc/datetime.tlpsrc b/Master/tlpkg/tlpsrc/datetime.tlpsrc
index 1928a79cb16..8381f8e383b 100644
--- a/Master/tlpkg/tlpsrc/datetime.tlpsrc
+++ b/Master/tlpkg/tlpsrc/datetime.tlpsrc
@@ -1,3 +1 @@
-name datetime
-category Package
depend fmtcount
diff --git a/Master/tlpkg/tlpsrc/dehyph-exptl.tlpsrc b/Master/tlpkg/tlpsrc/dehyph-exptl.tlpsrc
index 0385b977950..0e21561278c 100644
--- a/Master/tlpkg/tlpsrc/dehyph-exptl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dehyph-exptl.tlpsrc
@@ -1,4 +1,2 @@
-name dehyph-exptl
-category Package
execute AddHyphen name=german-x-2008-06-18 synonyms=german-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehypht-x-2008-06-18.tex
execute AddHyphen name=ngerman-x-2008-06-18 synonyms=ngerman-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehyphn-x-2008-06-18.tex
diff --git a/Master/tlpkg/tlpsrc/detex.tlpsrc b/Master/tlpkg/tlpsrc/detex.tlpsrc
index 27d789bf5d9..1cfee04ca4b 100644
--- a/Master/tlpkg/tlpsrc/detex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/detex.tlpsrc
@@ -1,4 +1,3 @@
-name detex
category TLCore
docpattern f texmf/doc/man/man1/detex.*
binpattern f bin/${ARCH}/detex
diff --git a/Master/tlpkg/tlpsrc/devnag.tlpsrc b/Master/tlpkg/tlpsrc/devnag.tlpsrc
index 4946170b97c..568a44c7cf9 100644
--- a/Master/tlpkg/tlpsrc/devnag.tlpsrc
+++ b/Master/tlpkg/tlpsrc/devnag.tlpsrc
@@ -1,3 +1,2 @@
-name devnag
category TLCore
binpattern f bin/${ARCH}/devnag
diff --git a/Master/tlpkg/tlpsrc/dictsym.tlpsrc b/Master/tlpkg/tlpsrc/dictsym.tlpsrc
index 72c243afc13..bb3911e66b9 100644
--- a/Master/tlpkg/tlpsrc/dictsym.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dictsym.tlpsrc
@@ -1,4 +1,2 @@
-name dictsym
-category Package
execute addMap dictsym.map
runpattern +!f texmf-dist/fonts/map/vtex/dictsym/dictsym.ali
diff --git a/Master/tlpkg/tlpsrc/doublestroke.tlpsrc b/Master/tlpkg/tlpsrc/doublestroke.tlpsrc
index 51564c2efc5..a96e0edd555 100644
--- a/Master/tlpkg/tlpsrc/doublestroke.tlpsrc
+++ b/Master/tlpkg/tlpsrc/doublestroke.tlpsrc
@@ -1,3 +1 @@
-name doublestroke
-category Package
execute addMap dstroke.map
diff --git a/Master/tlpkg/tlpsrc/dtl.tlpsrc b/Master/tlpkg/tlpsrc/dtl.tlpsrc
index 4adff69e9fb..62f19e8e812 100644
--- a/Master/tlpkg/tlpsrc/dtl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dtl.tlpsrc
@@ -1,4 +1,3 @@
-name dtl
category TLCore
runpattern f texmf/doc/man/man1/dt2dv.*
runpattern f texmf/doc/man/man1/dv2dt.*
diff --git a/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc b/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc
index 7638f607f40..6e96aa9438d 100644
--- a/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvi2tty.tlpsrc
@@ -1,4 +1,3 @@
-name dvi2tty
category TLCore
runpattern f texmf/doc/man/man1/dvi2tty.*
binpattern f bin/${ARCH}/disdvi
diff --git a/Master/tlpkg/tlpsrc/dviasm.tlpsrc b/Master/tlpkg/tlpsrc/dviasm.tlpsrc
index 83d36f5d67d..ae2c853cdec 100644
--- a/Master/tlpkg/tlpsrc/dviasm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dviasm.tlpsrc
@@ -1,3 +1 @@
-name dviasm
-category Package
binpattern f bin/${ARCH}/dviasm
diff --git a/Master/tlpkg/tlpsrc/dvicopy.tlpsrc b/Master/tlpkg/tlpsrc/dvicopy.tlpsrc
index 3410ff39218..f32ab01f734 100644
--- a/Master/tlpkg/tlpsrc/dvicopy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvicopy.tlpsrc
@@ -1,4 +1,3 @@
-name dvicopy
category TLCore
docpattern f texmf/doc/man/man1/dvicopy.*
binpattern f bin/${ARCH}/dvicopy
diff --git a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
index 264b4cde2fb..b59403ec626 100644
--- a/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvidvi.tlpsrc
@@ -1,4 +1,3 @@
-name dvidvi
category TLCore
runpattern f texmf/doc/man/man1/dvidvi.*
binpattern f bin/${ARCH}/dvidvi
diff --git a/Master/tlpkg/tlpsrc/dviljk.tlpsrc b/Master/tlpkg/tlpsrc/dviljk.tlpsrc
index 6dcdf5c20e7..ab774972d40 100644
--- a/Master/tlpkg/tlpsrc/dviljk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dviljk.tlpsrc
@@ -1,4 +1,3 @@
-name dviljk
category TLCore
docpattern f texmf/doc/man/man1/dvihp.*
docpattern f texmf/doc/man/man1/dvilj.*
diff --git a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
index 8b2f2ce7f55..8208a724f3f 100644
--- a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
@@ -1,4 +1,3 @@
-name dviout.win32
category TLCore
binpattern d/win32 tlpkg/dviout
binpattern f bin/win32/dviout.bat
diff --git a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc
index 3b206f93f3d..61b7984ff95 100644
--- a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc
@@ -1,4 +1,3 @@
-name dvipdfm
category TLCore
runpattern d texmf/dvipdfm
runpattern f texmf/fonts/map/dvipdfm/updmap/*
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
index ccd6e9ace86..51dc1c099d3 100644
--- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
@@ -1,4 +1,3 @@
-name dvipdfmx
category TLCore
depend glyphlist
depend dvipdfmx-def
diff --git a/Master/tlpkg/tlpsrc/dvipng.tlpsrc b/Master/tlpkg/tlpsrc/dvipng.tlpsrc
index 4be21830608..38559650f96 100644
--- a/Master/tlpkg/tlpsrc/dvipng.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipng.tlpsrc
@@ -1,4 +1,3 @@
-name dvipng
category TLCore
docpattern f texmf/doc/dvipng/*
docpattern f texmf/doc/info/dvipng.info
diff --git a/Master/tlpkg/tlpsrc/dvipos.tlpsrc b/Master/tlpkg/tlpsrc/dvipos.tlpsrc
index d26f47f88c8..4a697ef4506 100644
--- a/Master/tlpkg/tlpsrc/dvipos.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipos.tlpsrc
@@ -1,4 +1,3 @@
-name dvipos
category TLCore
docpattern f texmf/doc/man/man1/dvipos.*
binpattern f bin/${ARCH}/dvipos
diff --git a/Master/tlpkg/tlpsrc/dvips.tlpsrc b/Master/tlpkg/tlpsrc/dvips.tlpsrc
index b4b3fda7509..2084be0fde3 100644
--- a/Master/tlpkg/tlpsrc/dvips.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvips.tlpsrc
@@ -1,5 +1,3 @@
-name dvips
-category Package
srcpattern f ignore
runpattern d texmf-dist/dvips/base
runpattern d texmf-dist/fonts/enc/dvips/base
diff --git a/Master/tlpkg/tlpsrc/ebong.tlpsrc b/Master/tlpkg/tlpsrc/ebong.tlpsrc
index ae527ca21d3..7534bf838bf 100644
--- a/Master/tlpkg/tlpsrc/ebong.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ebong.tlpsrc
@@ -1,3 +1 @@
-name ebong
-category Package
binpattern f bin/${ARCH}/ebong
diff --git a/Master/tlpkg/tlpsrc/epigrafica.tlpsrc b/Master/tlpkg/tlpsrc/epigrafica.tlpsrc
index a316d4ab29c..ae0951b134c 100644
--- a/Master/tlpkg/tlpsrc/epigrafica.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epigrafica.tlpsrc
@@ -1,3 +1 @@
-name epigrafica
-category Package
execute addMap epigrafica.map
diff --git a/Master/tlpkg/tlpsrc/epiolmec.tlpsrc b/Master/tlpkg/tlpsrc/epiolmec.tlpsrc
index 06d5277fc6f..e3f5582a96a 100644
--- a/Master/tlpkg/tlpsrc/epiolmec.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epiolmec.tlpsrc
@@ -1,3 +1 @@
-name epiolmec
-category Package
execute addMap epiolmec.map
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 366a4d9b02a..38b66e97723 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,5 +1,3 @@
-name eplain
-category Package
depend pdftex
execute AddFormat name=eplain engine=pdftex options="-translate-file=cp227.tcx *eplain.ini"
docpattern +f texmf/doc/info/eplain.info
diff --git a/Master/tlpkg/tlpsrc/epspdf.tlpsrc b/Master/tlpkg/tlpsrc/epspdf.tlpsrc
index f9ac7c303ec..36fc3b83267 100644
--- a/Master/tlpkg/tlpsrc/epspdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epspdf.tlpsrc
@@ -1,5 +1,3 @@
-name epspdf
-category Package
docpattern d texmf-dist/doc/support/epspdf
runpattern d texmf-dist/scripts/epspdf
binpattern f bin/${ARCH}/epspdf
diff --git a/Master/tlpkg/tlpsrc/esint-type1.tlpsrc b/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
index 4b8b4447e9d..ed097ce77de 100644
--- a/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
+++ b/Master/tlpkg/tlpsrc/esint-type1.tlpsrc
@@ -1,3 +1 @@
-name esint-type1
-category Package
depend esint
diff --git a/Master/tlpkg/tlpsrc/esint.tlpsrc b/Master/tlpkg/tlpsrc/esint.tlpsrc
index ab07ff066d5..5e373a5b0d5 100644
--- a/Master/tlpkg/tlpsrc/esint.tlpsrc
+++ b/Master/tlpkg/tlpsrc/esint.tlpsrc
@@ -1,3 +1 @@
-name esint
-category Package
execute addMixedMap esint.map
diff --git a/Master/tlpkg/tlpsrc/esvect.tlpsrc b/Master/tlpkg/tlpsrc/esvect.tlpsrc
index 9bbebc0e1a3..6970e056d23 100644
--- a/Master/tlpkg/tlpsrc/esvect.tlpsrc
+++ b/Master/tlpkg/tlpsrc/esvect.tlpsrc
@@ -1,3 +1 @@
-name esvect
-category Package
execute addMap esvect.map
diff --git a/Master/tlpkg/tlpsrc/ethiop.tlpsrc b/Master/tlpkg/tlpsrc/ethiop.tlpsrc
index 1bc862dd3cc..8c149f14ea2 100644
--- a/Master/tlpkg/tlpsrc/ethiop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ethiop.tlpsrc
@@ -1,3 +1 @@
-name ethiop
-category Package
execute addMixedMap ethiop.map
diff --git a/Master/tlpkg/tlpsrc/eurofont.tlpsrc b/Master/tlpkg/tlpsrc/eurofont.tlpsrc
index 2ef72ebe938..f85bb698c89 100644
--- a/Master/tlpkg/tlpsrc/eurofont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eurofont.tlpsrc
@@ -1,3 +1 @@
-name eurofont
-category Package
execute addMap zpeu.map
diff --git a/Master/tlpkg/tlpsrc/eurosym.tlpsrc b/Master/tlpkg/tlpsrc/eurosym.tlpsrc
index 25da2cb14be..91fd755be06 100644
--- a/Master/tlpkg/tlpsrc/eurosym.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eurosym.tlpsrc
@@ -1,3 +1 @@
-name eurosym
-category Package
execute addMixedMap eurosym.map
diff --git a/Master/tlpkg/tlpsrc/fge.tlpsrc b/Master/tlpkg/tlpsrc/fge.tlpsrc
index 8d7362accc9..e7d0aebce20 100644
--- a/Master/tlpkg/tlpsrc/fge.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fge.tlpsrc
@@ -1,3 +1 @@
-name fge
-category Package
execute addMap fge.map
diff --git a/Master/tlpkg/tlpsrc/foekfont.tlpsrc b/Master/tlpkg/tlpsrc/foekfont.tlpsrc
index 03877f157b8..b9d74b11f21 100644
--- a/Master/tlpkg/tlpsrc/foekfont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/foekfont.tlpsrc
@@ -1,3 +1 @@
-name foekfont
-category Package
execute addMap foekfont.map
diff --git a/Master/tlpkg/tlpsrc/fonetika.tlpsrc b/Master/tlpkg/tlpsrc/fonetika.tlpsrc
index 7aeef1818ed..2779c5b0678 100644
--- a/Master/tlpkg/tlpsrc/fonetika.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fonetika.tlpsrc
@@ -1,3 +1 @@
-name fonetika
-category Package
execute addMap fonetika.map
diff --git a/Master/tlpkg/tlpsrc/fontinst.tlpsrc b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
index 2013237c97d..3a50d2c53c4 100644
--- a/Master/tlpkg/tlpsrc/fontinst.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
@@ -1,5 +1,3 @@
-name fontinst
-category Package
binpattern +f bin/${ARCH}/fontinst
srcpattern +!f texmf-dist/source/latex/eulervm/fontinst/*
srcpattern +!f texmf-dist/source/latex/pslatex/fontinst/pslatex.tex
diff --git a/Master/tlpkg/tlpsrc/fontools.tlpsrc b/Master/tlpkg/tlpsrc/fontools.tlpsrc
index 36da759a454..986cca782f8 100644
--- a/Master/tlpkg/tlpsrc/fontools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontools.tlpsrc
@@ -1,5 +1,3 @@
-name fontools
-category Package
binpattern f bin/${ARCH}/afm2afm
binpattern f bin/${ARCH}/autoinst
binpattern f bin/${ARCH}/cmap2enc
diff --git a/Master/tlpkg/tlpsrc/fontware.tlpsrc b/Master/tlpkg/tlpsrc/fontware.tlpsrc
index 5a56d2adadb..0d1ec3d014c 100644
--- a/Master/tlpkg/tlpsrc/fontware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontware.tlpsrc
@@ -1,4 +1,3 @@
-name fontware
category TLCore
docpattern f texmf/doc/man/man1/pltotf.*
docpattern f texmf/doc/man/man1/tftopl.*
diff --git a/Master/tlpkg/tlpsrc/fourier.tlpsrc b/Master/tlpkg/tlpsrc/fourier.tlpsrc
index 2dd21769911..d2ab972fcb2 100644
--- a/Master/tlpkg/tlpsrc/fourier.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fourier.tlpsrc
@@ -1,5 +1,3 @@
-name fourier
-category Package
execute addMap fourier.map
execute addMap fourier-utopia-expert.map
# the utopia expert fonts are proprietary, but since we install the
diff --git a/Master/tlpkg/tlpsrc/fragmaster.tlpsrc b/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
index 1e608d075fd..20ae35c7252 100644
--- a/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fragmaster.tlpsrc
@@ -1,3 +1 @@
-name fragmaster
-category Package
binpattern f bin/${ARCH}/fragmaster
diff --git a/Master/tlpkg/tlpsrc/garuda-c90.tlpsrc b/Master/tlpkg/tlpsrc/garuda-c90.tlpsrc
index 1381d308be6..6bb02fb98c5 100644
--- a/Master/tlpkg/tlpsrc/garuda-c90.tlpsrc
+++ b/Master/tlpkg/tlpsrc/garuda-c90.tlpsrc
@@ -1,3 +1 @@
-name garuda-c90
-category Package
execute addMap garuda-c90.map
diff --git a/Master/tlpkg/tlpsrc/german.tlpsrc b/Master/tlpkg/tlpsrc/german.tlpsrc
index eb5c0d50c44..bb8c81747c7 100644
--- a/Master/tlpkg/tlpsrc/german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/german.tlpsrc
@@ -1,3 +1 @@
-name german
-category Package
docpattern +!f texmf-dist/doc/latex/jurabib/docs/german/*
diff --git a/Master/tlpkg/tlpsrc/getafm.tlpsrc b/Master/tlpkg/tlpsrc/getafm.tlpsrc
index 70e8b9aed64..235bf5068a6 100644
--- a/Master/tlpkg/tlpsrc/getafm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/getafm.tlpsrc
@@ -1,4 +1,3 @@
-name getafm
category TLCore
runpattern f texmf/dvips/getafm/*
docpattern f texmf/doc/man/man1/getafm.*
diff --git a/Master/tlpkg/tlpsrc/getnonfreefonts.tlpsrc b/Master/tlpkg/tlpsrc/getnonfreefonts.tlpsrc
index 526d3be5b6b..7a7c04b88de 100644
--- a/Master/tlpkg/tlpsrc/getnonfreefonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/getnonfreefonts.tlpsrc
@@ -1,4 +1,3 @@
-name getnonfreefonts
category TLCore
runpattern f texmf/scripts/getnonfreefonts/getnonfreefonts.pl
docpattern f texmf/doc/man/man1/getnonfreefonts*.*
diff --git a/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc b/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc
index 6ea9e9cff17..4eaf26d7faa 100644
--- a/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsartemisia.tlpsrc
@@ -1,3 +1 @@
-name gfsartemisia
-category Package
execute addMap gfsartemisia.map
diff --git a/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc b/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc
index b56520f6919..ae0874b3914 100644
--- a/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsbaskerville.tlpsrc
@@ -1,3 +1 @@
-name gfsbaskerville
-category Package
execute addMap gfsbaskerville.map
diff --git a/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc b/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc
index d8da366735c..675fc6f3318 100644
--- a/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsbodoni.tlpsrc
@@ -1,3 +1 @@
-name gfsbodoni
-category Package
execute addMap gfsbodoni.map
diff --git a/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc b/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc
index 39244d37f0b..c8f268f43ea 100644
--- a/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfscomplutum.tlpsrc
@@ -1,3 +1 @@
-name gfscomplutum
-category Package
execute addMap gfscomplutum.map
diff --git a/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc b/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc
index 3a1ff1d8d18..a456140dcb3 100644
--- a/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsdidot.tlpsrc
@@ -1,3 +1 @@
-name gfsdidot
-category Package
execute addMap gfsdidot.map
diff --git a/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc b/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc
index 2e1ad6e43f0..d7732e5eb57 100644
--- a/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsneohellenic.tlpsrc
@@ -1,3 +1 @@
-name gfsneohellenic
-category Package
execute addMap gfsneohellenic.map
diff --git a/Master/tlpkg/tlpsrc/gfsporson.tlpsrc b/Master/tlpkg/tlpsrc/gfsporson.tlpsrc
index a2517193cb0..8dde8c896fd 100644
--- a/Master/tlpkg/tlpsrc/gfsporson.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfsporson.tlpsrc
@@ -1,3 +1 @@
-name gfsporson
-category Package
execute addMap gfsporson.map
diff --git a/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc b/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc
index f54c4c5e9fe..f5f9fb2eaed 100644
--- a/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gfssolomos.tlpsrc
@@ -1,3 +1 @@
-name gfssolomos
-category Package
execute addMap gfssolomos.map
diff --git a/Master/tlpkg/tlpsrc/glossaries.tlpsrc b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
index 49c1e4faacd..aa959af2241 100644
--- a/Master/tlpkg/tlpsrc/glossaries.tlpsrc
+++ b/Master/tlpkg/tlpsrc/glossaries.tlpsrc
@@ -1,4 +1,2 @@
-name glossaries
-category Package
binpattern f bin/${ARCH}/makeglossaries
diff --git a/Master/tlpkg/tlpsrc/gothic.tlpsrc b/Master/tlpkg/tlpsrc/gothic.tlpsrc
index 8148d8a2e59..144406a0dbf 100644
--- a/Master/tlpkg/tlpsrc/gothic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gothic.tlpsrc
@@ -1,3 +1 @@
-name gothic
-category Package
execute addMap yfrak.map
diff --git a/Master/tlpkg/tlpsrc/graphics.tlpsrc b/Master/tlpkg/tlpsrc/graphics.tlpsrc
index 5b3066cb73b..fa0a9322618 100644
--- a/Master/tlpkg/tlpsrc/graphics.tlpsrc
+++ b/Master/tlpkg/tlpsrc/graphics.tlpsrc
@@ -1,5 +1,3 @@
-name graphics
-category Package
runpattern +!f texmf-dist/scripts/context/ruby/graphics/*
docpattern +!f texmf-dist/doc/latex/eCards/graphics/*
docpattern +!d texmf-dist/doc/latex/tufte-latex/graphics
diff --git a/Master/tlpkg/tlpsrc/groff.tlpsrc b/Master/tlpkg/tlpsrc/groff.tlpsrc
index 5176008b8ce..d58e06eb054 100644
--- a/Master/tlpkg/tlpsrc/groff.tlpsrc
+++ b/Master/tlpkg/tlpsrc/groff.tlpsrc
@@ -1,5 +1,3 @@
-name groff
-category Package
execute addMap troff-updmap.map
runpattern +!d texmf-dist/fonts/tfm/groff/avantgar
runpattern +!d texmf-dist/fonts/tfm/groff/bookman
diff --git a/Master/tlpkg/tlpsrc/grotesq.tlpsrc b/Master/tlpkg/tlpsrc/grotesq.tlpsrc
index ce5f0413613..95217934bd0 100644
--- a/Master/tlpkg/tlpsrc/grotesq.tlpsrc
+++ b/Master/tlpkg/tlpsrc/grotesq.tlpsrc
@@ -1,3 +1 @@
-name grotesq
-category Package
execute addMap ugq.map
diff --git a/Master/tlpkg/tlpsrc/grverb.tlpsrc b/Master/tlpkg/tlpsrc/grverb.tlpsrc
index e3bc5ae05ed..c22e600382e 100644
--- a/Master/tlpkg/tlpsrc/grverb.tlpsrc
+++ b/Master/tlpkg/tlpsrc/grverb.tlpsrc
@@ -1,3 +1 @@
-name grverb
-category Package
execute addMap grverb.map
diff --git a/Master/tlpkg/tlpsrc/gsftopk.tlpsrc b/Master/tlpkg/tlpsrc/gsftopk.tlpsrc
index 3df47159aa8..3a460f0a713 100644
--- a/Master/tlpkg/tlpsrc/gsftopk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/gsftopk.tlpsrc
@@ -1,4 +1,3 @@
-name gsftopk
category TLCore
runpattern f texmf/dvips/gsftopk/*
docpattern f texmf/doc/man/man1/gsftopk.*
diff --git a/Master/tlpkg/tlpsrc/hfbright.tlpsrc b/Master/tlpkg/tlpsrc/hfbright.tlpsrc
index 3e22efd125d..32976a6c51a 100644
--- a/Master/tlpkg/tlpsrc/hfbright.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hfbright.tlpsrc
@@ -1,3 +1 @@
-name hfbright
-category Package
execute addMixedMap hfbright.map
diff --git a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
index 8a35a1a1db4..2b8fa491650 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-ancientgreek
category TLCore
execute AddHyphen name=ancientgreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-grc.tex
execute AddHyphen name=ibycus lefthyphenmin=2 righthyphenmin=2 file=ibyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
index abd1364b37f..fd246d8ad65 100644
--- a/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-arabic
category TLCore
execute AddHyphen name=arabic lefthyphenmin= righthyphenmin= file=zerohyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc
index 9a1e2ebf57b..68762e8042c 100644
--- a/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-base.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-base
category TLCore
runpattern f texmf/tex/generic/config/language.dat
runpattern f texmf/tex/generic/config/language.def
diff --git a/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
index f2e4cf597ea..4b4484b65e8 100644
--- a/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-basque
category TLCore
execute AddHyphen name=basque lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eu.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
index 968984b73e5..e1cebad23b7 100644
--- a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-bulgarian
category TLCore
execute AddHyphen name=bulgarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-bg.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
index b072bc05143..80a7749ebad 100644
--- a/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-catalan
category TLCore
execute AddHyphen name=catalan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ca.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
index ba468ccfda2..482f7623ca4 100644
--- a/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-chinese
category TLCore
execute AddHyphen name=pinyin lefthyphenmin=1 righthyphenmin=1 file=loadhyph-zh-latn.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
index c52ae4138c3..3d8f1c8d4f3 100644
--- a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-coptic
category TLCore
execute AddHyphen name=coptic lefthyphenmin=1 righthyphenmin=1 file=loadhyph-cop.tex
runpattern f texmf/tex/generic/hyphen/copthyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
index b8319c0938b..48b5225cdae 100644
--- a/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-croatian
category TLCore
execute AddHyphen name=croatian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hr.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
index 77af60223dd..6c05fcfcf51 100644
--- a/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-czech
category TLCore
execute AddHyphen name=czech lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cs.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
index d41e0e51bed..05380c0e55e 100644
--- a/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-danish
category TLCore
execute AddHyphen name=danish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-da.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
index 16612af2588..626f5ba9907 100644
--- a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-dutch
category TLCore
execute AddHyphen name=dutch lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nl.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
index b2da1d721ae..ee90923f25d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-esperanto
category TLCore
execute AddHyphen name=esperanto lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eo.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
index 593ae74cdfd..546adbb31ab 100644
--- a/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-estonian
category TLCore
execute AddHyphen name=estonian lefthyphenmin=2 righthyphenmin=3 file=loadhyph-et.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc
index bed90cb097a..01319d3382d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-farsi
category TLCore
execute AddHyphen name=farsi synonyms=persian lefthyphenmin= righthyphenmin= file=zerohyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
index e70ceae6775..dfe71495c82 100644
--- a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-finnish
category TLCore
execute AddHyphen name=finnish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fi.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
index 72402812e44..2a8de9f4b0f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-french
category TLCore
execute AddHyphen name=french synonyms=patois,francais \
lefthyphenmin=2 righthyphenmin=3 file=loadhyph-fr.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
index 94ccc22e2bb..02572843843 100644
--- a/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-galician
category TLCore
execute AddHyphen name=galician lefthyphenmin=2 righthyphenmin=2 file=loadhyph-gl.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
index 7093a9f6268..1f3b9c7903a 100644
--- a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-german
category TLCore
execute AddHyphen name=german lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1901.tex
execute AddHyphen name=ngerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1996.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
index c30cd36b0f4..f6e796c1cf1 100644
--- a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-greek
category TLCore
execute AddHyphen name=monogreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-monoton.tex
execute AddHyphen name=greek synonyms=polygreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-polyton.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
index 7a29f327abc..c59eb98411f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-hungarian
category TLCore
execute AddHyphen name=hungarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hu.tex
docpattern d texmf/doc/generic/huhyphen
diff --git a/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
index 14c9bd481b2..45a027e1f90 100644
--- a/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-icelandic
category TLCore
execute AddHyphen name=icelandic lefthyphenmin=2 righthyphenmin=2 file=loadhyph-is.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
index 15ca49226fc..517274154d5 100644
--- a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-indonesian
category TLCore
execute AddHyphen name=indonesian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-id.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
index e921c9457be..731c30cd562 100644
--- a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-interlingua
category TLCore
execute AddHyphen name=interlingua lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ia.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
index 20d317942da..d92136a0072 100644
--- a/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-irish
category TLCore
execute AddHyphen name=irish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-ga.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
index 39e30ac26d8..ee210349111 100644
--- a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-italian
category TLCore
execute AddHyphen name=italian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-it.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
index 555c513854a..eb5959ff55f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-latin
category TLCore
execute AddHyphen name=latin lefthyphenmin=2 righthyphenmin=2 \
file=loadhyph-la.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
index 4fb9dd75a20..a8ca5aad5ce 100644
--- a/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-latvian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-latvian
category TLCore
execute AddHyphen name=latvian lefthyphenmin=2 righthyphenmin=2 \
file=loadhyph-lv.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-lithuanian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-lithuanian.tlpsrc
index 21fe9a42367..94073ecdff1 100644
--- a/Master/tlpkg/tlpsrc/hyphen-lithuanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-lithuanian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-lithuanian
category TLCore
execute AddHyphen name=lithuanian lefthyphenmin=2 righthyphenmin=2 \
file=loadhyph-lt.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
index 65bb3c5aed1..daafb711c26 100644
--- a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-mongolian
category TLCore
execute AddHyphen name=mongolian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl.tex
execute AddHyphen name=mongolian2a lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl-x-2a.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
index 4a0c1470e40..5750795196b 100644
--- a/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-norwegian
category TLCore
execute AddHyphen name=bokmal synonyms=norwegian,norsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nb.tex
execute AddHyphen name=nynorsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nn.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
index 0504b112ac7..c6743f149af 100644
--- a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-polish
category TLCore
execute AddHyphen name=polish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-pl.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
index 81eeb92baf2..78e0d73ed68 100644
--- a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-portuguese
category TLCore
execute AddHyphen name=portuguese synonyms=portuges lefthyphenmin=2 righthyphenmin=3 file=loadhyph-pt.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
index 6db6d9d9369..2db4d3349b9 100644
--- a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-romanian
category TLCore
execute AddHyphen name=romanian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ro.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
index b2d9d6a7246..d59b64f0fb8 100644
--- a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-russian
category TLCore
depend ruhyphen
execute AddHyphen name=russian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ru.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
index 981444d0f05..7a4694b7ea2 100644
--- a/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-sanskrit.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-sanskrit
category TLCore
execute AddHyphen name=sanskrit lefthyphenmin=1 righthyphenmin=5 file=loadhyph-sa.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
index 3c296c8036a..0b361773f79 100644
--- a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-serbian
category TLCore
execute AddHyphen name=serbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-latn.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
index a79155468a0..c9983344534 100644
--- a/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-slovak
category TLCore
execute AddHyphen name=slovak lefthyphenmin=2 righthyphenmin=3 file=loadhyph-sk.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
index 6f7e8fe2aa5..43b2633e8ef 100644
--- a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-slovenian
category TLCore
execute AddHyphen name=slovenian synonyms=slovene lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sl.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
index e21668e0a75..96116518839 100644
--- a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-spanish
category TLCore
execute AddHyphen name=spanish synonyms=espanol lefthyphenmin=2 righthyphenmin=2 file=loadhyph-es.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
index 42fd113e777..269679ef3f8 100644
--- a/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-swedish
category TLCore
execute AddHyphen name=swedish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sv.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
index a3901c23da5..bfd09080eb2 100644
--- a/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-turkish
category TLCore
execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
index 1b1b94ee285..aafa155278b 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-ukenglish
category TLCore
execute AddHyphen name=ukenglish synonyms=british,UKenglish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-en-gb.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
index ceb0166164a..c4fed987603 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
@@ -1,4 +1,3 @@
-name hyphen-ukrainian
category TLCore
execute AddHyphen name=ukrainian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-uk.tex
depend ukrhyph
diff --git a/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc
index eecba0e72d9..392382bc3da 100644
--- a/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-uppersorbian
category TLCore
execute AddHyphen name=uppersorbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hsb.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
index b8f3506458e..67d3d677afb 100644
--- a/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
@@ -1,3 +1,2 @@
-name hyphen-welsh
category TLCore
execute AddHyphen name=welsh lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cy.tex
diff --git a/Master/tlpkg/tlpsrc/ibygrk.tlpsrc b/Master/tlpkg/tlpsrc/ibygrk.tlpsrc
index 9304ceb0f6f..66c57c6de1b 100644
--- a/Master/tlpkg/tlpsrc/ibygrk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ibygrk.tlpsrc
@@ -1,3 +1 @@
-name ibygrk
-category Package
execute addMixedMap iby.map
diff --git a/Master/tlpkg/tlpsrc/ifluatex.tlpsrc b/Master/tlpkg/tlpsrc/ifluatex.tlpsrc
index 9367e042889..320938cfb06 100644
--- a/Master/tlpkg/tlpsrc/ifluatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ifluatex.tlpsrc
@@ -1,5 +1,3 @@
-name ifluatex
-category Package
docpattern f texmf-dist/doc/latex/oberdiek/ifluatex.pdf
docpattern f texmf-dist/doc/latex/oberdiek/test/ifluatex*
srcpattern f texmf-dist/source/latex/oberdiek/ifluatex.dtx
diff --git a/Master/tlpkg/tlpsrc/initials.tlpsrc b/Master/tlpkg/tlpsrc/initials.tlpsrc
index 0d9f7726282..d23cc285a38 100644
--- a/Master/tlpkg/tlpsrc/initials.tlpsrc
+++ b/Master/tlpkg/tlpsrc/initials.tlpsrc
@@ -1,5 +1,3 @@
-name initials
-category Package
execute addMap Acorn.map
execute addMap AnnSton.map
execute addMap ArtNouv.map
diff --git a/Master/tlpkg/tlpsrc/iwona.tlpsrc b/Master/tlpkg/tlpsrc/iwona.tlpsrc
index 1372a74a4d0..2e6c18db57a 100644
--- a/Master/tlpkg/tlpsrc/iwona.tlpsrc
+++ b/Master/tlpkg/tlpsrc/iwona.tlpsrc
@@ -1,3 +1 @@
-name iwona
-category Package
execute addMap iwona.map
diff --git a/Master/tlpkg/tlpsrc/jknapltx.tlpsrc b/Master/tlpkg/tlpsrc/jknapltx.tlpsrc
index cfab28937c1..8bd7e304065 100644
--- a/Master/tlpkg/tlpsrc/jknapltx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jknapltx.tlpsrc
@@ -1,3 +1 @@
-name jknapltx
-category Package
catalogue jknappen
diff --git a/Master/tlpkg/tlpsrc/kerkis.tlpsrc b/Master/tlpkg/tlpsrc/kerkis.tlpsrc
index eab86c786b4..5999e40f0d9 100644
--- a/Master/tlpkg/tlpsrc/kerkis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kerkis.tlpsrc
@@ -1,3 +1 @@
-name kerkis
-category Package
execute addMap kerkis.map
diff --git a/Master/tlpkg/tlpsrc/koma-script.tlpsrc b/Master/tlpkg/tlpsrc/koma-script.tlpsrc
index 62980a6a176..600d874fc89 100644
--- a/Master/tlpkg/tlpsrc/koma-script.tlpsrc
+++ b/Master/tlpkg/tlpsrc/koma-script.tlpsrc
@@ -1,4 +1,3 @@
-name koma-script
# not exactly that it's TLCore, but we don't want the default patterns.
category TLCore
runpattern t texmf-dist tex koma-script
diff --git a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
index 830b103f155..7dacd626896 100644
--- a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
@@ -1,4 +1,3 @@
-name kpathsea
category TLCore
runpattern f texmf/web2c/*.cnf
runpattern !f texmf/web2c/fmtutil-hdr.cnf
diff --git a/Master/tlpkg/tlpsrc/kpfonts.tlpsrc b/Master/tlpkg/tlpsrc/kpfonts.tlpsrc
index 5e7cf0098f1..c11be95deb9 100644
--- a/Master/tlpkg/tlpsrc/kpfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kpfonts.tlpsrc
@@ -1,3 +1 @@
-name kpfonts
-category Package
execute addMap kpfonts.map
diff --git a/Master/tlpkg/tlpsrc/kurier.tlpsrc b/Master/tlpkg/tlpsrc/kurier.tlpsrc
index 57729a7b6b0..d7efc59208c 100644
--- a/Master/tlpkg/tlpsrc/kurier.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kurier.tlpsrc
@@ -1,3 +1 @@
-name kurier
-category Package
execute addMap kurier.map
diff --git a/Master/tlpkg/tlpsrc/lacheck.tlpsrc b/Master/tlpkg/tlpsrc/lacheck.tlpsrc
index 63b30b72335..15ed3fb7e33 100644
--- a/Master/tlpkg/tlpsrc/lacheck.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lacheck.tlpsrc
@@ -1,4 +1,3 @@
-name lacheck
category TLCore
runpattern f texmf/doc/man/man1/lacheck.*
binpattern f bin/${ARCH}/lacheck
diff --git a/Master/tlpkg/tlpsrc/lambda.tlpsrc b/Master/tlpkg/tlpsrc/lambda.tlpsrc
index d1842db9f0e..4827e88f27b 100644
--- a/Master/tlpkg/tlpsrc/lambda.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lambda.tlpsrc
@@ -1,5 +1,3 @@
-name lambda
-category Package
srcpattern f ignore
runpattern d texmf-dist/tex/lambda/base
runpattern d texmf-dist/tex/lambda/config
diff --git a/Master/tlpkg/tlpsrc/latex-fonts.tlpsrc b/Master/tlpkg/tlpsrc/latex-fonts.tlpsrc
index fc12bd8a3f4..801fabf06f5 100644
--- a/Master/tlpkg/tlpsrc/latex-fonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-fonts.tlpsrc
@@ -1,3 +1 @@
-name latex-fonts
-category Package
execute addMixedMap latex-bsr.map
diff --git a/Master/tlpkg/tlpsrc/latex.tlpsrc b/Master/tlpkg/tlpsrc/latex.tlpsrc
index 1a269d7c1af..7f208feaf30 100644
--- a/Master/tlpkg/tlpsrc/latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex.tlpsrc
@@ -1,5 +1,3 @@
-name latex
-category Package
depend luatex
depend pdftex
depend latexconfig
diff --git a/Master/tlpkg/tlpsrc/latexmk.tlpsrc b/Master/tlpkg/tlpsrc/latexmk.tlpsrc
index 74be8b1e4a5..17fe6bb73f1 100644
--- a/Master/tlpkg/tlpsrc/latexmk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latexmk.tlpsrc
@@ -1,3 +1 @@
-name latexmk
-category Package
binpattern f bin/${ARCH}/latexmk
diff --git a/Master/tlpkg/tlpsrc/lettrine.tlpsrc b/Master/tlpkg/tlpsrc/lettrine.tlpsrc
index 909241cc090..a655b4aadb6 100644
--- a/Master/tlpkg/tlpsrc/lettrine.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lettrine.tlpsrc
@@ -1,4 +1,2 @@
-name lettrine
-category Package
runpattern +!d texmf-dist/tex/context/third/lettrine
docpattern +!d texmf-dist/doc/context/third/lettrine
diff --git a/Master/tlpkg/tlpsrc/lh.tlpsrc b/Master/tlpkg/tlpsrc/lh.tlpsrc
index 3ceb8df661a..998243b9730 100644
--- a/Master/tlpkg/tlpsrc/lh.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lh.tlpsrc
@@ -1,3 +1 @@
-name lh
-category Package
depend ec
diff --git a/Master/tlpkg/tlpsrc/libris.tlpsrc b/Master/tlpkg/tlpsrc/libris.tlpsrc
index b2f4630ce83..38a292f8d86 100644
--- a/Master/tlpkg/tlpsrc/libris.tlpsrc
+++ b/Master/tlpkg/tlpsrc/libris.tlpsrc
@@ -1,3 +1 @@
-name libris
execute addMap yly.map
-category Package
diff --git a/Master/tlpkg/tlpsrc/linearA.tlpsrc b/Master/tlpkg/tlpsrc/linearA.tlpsrc
index ac4a69be345..d1fe78742e1 100644
--- a/Master/tlpkg/tlpsrc/linearA.tlpsrc
+++ b/Master/tlpkg/tlpsrc/linearA.tlpsrc
@@ -1,3 +1 @@
-name linearA
-category Package
execute addMap linearA.map
diff --git a/Master/tlpkg/tlpsrc/lithuanian.tlpsrc b/Master/tlpkg/tlpsrc/lithuanian.tlpsrc
index 51b8c532b4d..f29a5fbcbcd 100644
--- a/Master/tlpkg/tlpsrc/lithuanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lithuanian.tlpsrc
@@ -1,3 +1 @@
-name lithuanian
-category Package
execute addMap l7x-urwvn.map
diff --git a/Master/tlpkg/tlpsrc/ltxmisc.tlpsrc b/Master/tlpkg/tlpsrc/ltxmisc.tlpsrc
index 09f35a47718..ff8fc2b2ba8 100644
--- a/Master/tlpkg/tlpsrc/ltxmisc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ltxmisc.tlpsrc
@@ -1,3 +1 @@
-name ltxmisc
-category Package
# It would be nice if this "package" didn't exist.
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index db533bfe6d9..5eff44b35fe 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -1,4 +1,3 @@
-name luatex
category TLCore
shortdesc The LuaTeX engine.
longdesc LuaTeX is an extended version of pdfTeX using Lua as an embedded
diff --git a/Master/tlpkg/tlpsrc/lxfonts.tlpsrc b/Master/tlpkg/tlpsrc/lxfonts.tlpsrc
index fdbb0ca1baf..b6b21ddca66 100644
--- a/Master/tlpkg/tlpsrc/lxfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lxfonts.tlpsrc
@@ -1,3 +1 @@
-name lxfonts
-category Package
execute addMixedMap lxfonts.map
diff --git a/Master/tlpkg/tlpsrc/manfnt.tlpsrc b/Master/tlpkg/tlpsrc/manfnt.tlpsrc
index 96d992b8772..b20434246f7 100644
--- a/Master/tlpkg/tlpsrc/manfnt.tlpsrc
+++ b/Master/tlpkg/tlpsrc/manfnt.tlpsrc
@@ -1,3 +1 @@
-name manfnt
-category Package
execute addMixedMap manfnt.map
diff --git a/Master/tlpkg/tlpsrc/marvosym.tlpsrc b/Master/tlpkg/tlpsrc/marvosym.tlpsrc
index a903d6be260..4290e498594 100644
--- a/Master/tlpkg/tlpsrc/marvosym.tlpsrc
+++ b/Master/tlpkg/tlpsrc/marvosym.tlpsrc
@@ -1,5 +1,3 @@
-name marvosym
-category Package
execute addMap marvosym.map
srcpattern +!f texmf-dist/source/fonts/eurofont/marvosym/*
srcpattern +!f texmf-dist/source/fonts/eurofont/marvosym/tfmfiles/original/*
diff --git a/Master/tlpkg/tlpsrc/mathdesign.tlpsrc b/Master/tlpkg/tlpsrc/mathdesign.tlpsrc
index 60cc09f4a95..53ea8d9f8b7 100644
--- a/Master/tlpkg/tlpsrc/mathdesign.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mathdesign.tlpsrc
@@ -1,5 +1,3 @@
-name mathdesign
-category Package
execute addMap mdbch.map
execute addMap mdput.map
execute addMap mdugm.map
diff --git a/Master/tlpkg/tlpsrc/metafont.tlpsrc b/Master/tlpkg/tlpsrc/metafont.tlpsrc
index 25215313a9f..033175a499a 100644
--- a/Master/tlpkg/tlpsrc/metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/metafont.tlpsrc
@@ -1,5 +1,3 @@
-name metafont
-category Package
depend kpathsea
execute AddFormat name=mf engine=mf-nowin options="-translate-file=cp227.tcx mf.ini"
srcpattern f ignore
diff --git a/Master/tlpkg/tlpsrc/mex.tlpsrc b/Master/tlpkg/tlpsrc/mex.tlpsrc
index 28f257ebd41..467e38475a0 100644
--- a/Master/tlpkg/tlpsrc/mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mex.tlpsrc
@@ -1,5 +1,3 @@
-name mex
-category Package
depend pl
depend hyphen-polish
depend pdftex
diff --git a/Master/tlpkg/tlpsrc/mflogo.tlpsrc b/Master/tlpkg/tlpsrc/mflogo.tlpsrc
index b188b67757c..6fe3b5b3137 100644
--- a/Master/tlpkg/tlpsrc/mflogo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mflogo.tlpsrc
@@ -1,3 +1 @@
-name mflogo
-category Package
execute addMixedMap mflogo.map
diff --git a/Master/tlpkg/tlpsrc/mft.tlpsrc b/Master/tlpkg/tlpsrc/mft.tlpsrc
index de7b83696e2..d04b35cb6f9 100644
--- a/Master/tlpkg/tlpsrc/mft.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mft.tlpsrc
@@ -1,3 +1 @@
-name mft
-category Package
runpattern d texmf-dist/mft/base
diff --git a/Master/tlpkg/tlpsrc/mfware.tlpsrc b/Master/tlpkg/tlpsrc/mfware.tlpsrc
index 06ecbd9e1ad..0e1988f7036 100644
--- a/Master/tlpkg/tlpsrc/mfware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mfware.tlpsrc
@@ -1,4 +1,3 @@
-name mfware
category TLCore
docpattern f texmf/doc/man/man1/gftodvi.*
docpattern f texmf/doc/man/man1/gftopk.*
diff --git a/Master/tlpkg/tlpsrc/misc.tlpsrc b/Master/tlpkg/tlpsrc/misc.tlpsrc
index eaef0be0fe4..9cfa3f02a3f 100644
--- a/Master/tlpkg/tlpsrc/misc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/misc.tlpsrc
@@ -1,5 +1,3 @@
-name misc
-category Package
runpattern d texmf-dist/fonts/source/public/misc
runpattern d texmf-dist/fonts/tfm/public/misc
runpattern d texmf-dist/omega/ocp/misc
diff --git a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
index 3ede184de9d..2a51f5a8744 100644
--- a/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mkjobtexmf.tlpsrc
@@ -1,5 +1,3 @@
-name mkjobtexmf
-category Package
binpattern f bin/${ARCH}/mkjobtexmf
docpattern d texmf-dist/doc/generic/mkjobtexmf
docpattern f texmf/doc/man/man1/mkjobtexmf.*
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index f1094cbade5..e3e8a155b85 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -1,5 +1,3 @@
-name mltex
-category Package
depend latex
execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini"
execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex mllatex.ini"
diff --git a/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc b/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc
index 3f3f6cf2c51..f73f16f05d6 100644
--- a/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mnsymbol.tlpsrc
@@ -1,3 +1 @@
-name mnsymbol
-category Package
execute addMap MnSymbol.map
diff --git a/Master/tlpkg/tlpsrc/montex.tlpsrc b/Master/tlpkg/tlpsrc/montex.tlpsrc
index 51447f0be50..5b1352db50b 100644
--- a/Master/tlpkg/tlpsrc/montex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/montex.tlpsrc
@@ -1,5 +1,3 @@
-name montex
-category Package
execute addMixedMap mongolian.map
# Needs just a couple characters from Greek, but semi-requested ...
# See tex-live mail in April 2009.
diff --git a/Master/tlpkg/tlpsrc/mp3d.tlpsrc b/Master/tlpkg/tlpsrc/mp3d.tlpsrc
index 4d7877ff4a2..1de25ea6b86 100644
--- a/Master/tlpkg/tlpsrc/mp3d.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mp3d.tlpsrc
@@ -1,3 +1 @@
-name mp3d
-category Package
catalogue 3d
diff --git a/Master/tlpkg/tlpsrc/musixflx.tlpsrc b/Master/tlpkg/tlpsrc/musixflx.tlpsrc
index 88a9b7723a3..83ec9f12c17 100644
--- a/Master/tlpkg/tlpsrc/musixflx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/musixflx.tlpsrc
@@ -1,3 +1,2 @@
-name musixflx
category TLCore
binpattern f bin/${ARCH}/musixflx
diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
index 88e6eae70c8..0b1082790aa 100644
--- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
@@ -1,3 +1 @@
-name musixtex
-category Package
execute addMixedMap musix.map
diff --git a/Master/tlpkg/tlpsrc/norasi-c90.tlpsrc b/Master/tlpkg/tlpsrc/norasi-c90.tlpsrc
index 5ffe4da91ac..2f72b55175d 100644
--- a/Master/tlpkg/tlpsrc/norasi-c90.tlpsrc
+++ b/Master/tlpkg/tlpsrc/norasi-c90.tlpsrc
@@ -1,3 +1 @@
-name norasi-c90
-category Package
execute addMap norasi-c90.map
diff --git a/Master/tlpkg/tlpsrc/oberdiek.tlpsrc b/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
index 8cd04510955..f2e188a088b 100644
--- a/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
@@ -1,5 +1,3 @@
-name oberdiek
-category Package
# ignore ifluatex since it is split off
docpattern +!f texmf-dist/doc/latex/oberdiek/ifluatex.pdf
docpattern +!f texmf-dist/doc/latex/oberdiek/test/ifluatex*
diff --git a/Master/tlpkg/tlpsrc/ocherokee.tlpsrc b/Master/tlpkg/tlpsrc/ocherokee.tlpsrc
index b072ecf5443..804e44d2260 100644
--- a/Master/tlpkg/tlpsrc/ocherokee.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ocherokee.tlpsrc
@@ -1,3 +1 @@
-name ocherokee
-category Package
execute addMap cherokee.map
diff --git a/Master/tlpkg/tlpsrc/oinuit.tlpsrc b/Master/tlpkg/tlpsrc/oinuit.tlpsrc
index 5db61948904..db862b113de 100644
--- a/Master/tlpkg/tlpsrc/oinuit.tlpsrc
+++ b/Master/tlpkg/tlpsrc/oinuit.tlpsrc
@@ -1,3 +1 @@
-name oinuit
-category Package
execute addMap oinuit.map
diff --git a/Master/tlpkg/tlpsrc/omega.tlpsrc b/Master/tlpkg/tlpsrc/omega.tlpsrc
index cc240addd08..d13bc223321 100644
--- a/Master/tlpkg/tlpsrc/omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/omega.tlpsrc
@@ -1,5 +1,3 @@
-name omega
-category Package
execute addMap omega.map
runpattern d texmf-dist/dvips/omega
runpattern d texmf-dist/tex/generic/omegahyph
diff --git a/Master/tlpkg/tlpsrc/paper.tlpsrc b/Master/tlpkg/tlpsrc/paper.tlpsrc
index 4a29a620e36..8310c487646 100644
--- a/Master/tlpkg/tlpsrc/paper.tlpsrc
+++ b/Master/tlpkg/tlpsrc/paper.tlpsrc
@@ -1,3 +1 @@
-name paper
-category Package
docpattern +!d texmf-dist/doc/latex/aiaa/pre2004/demos/paper
diff --git a/Master/tlpkg/tlpsrc/patch.tlpsrc b/Master/tlpkg/tlpsrc/patch.tlpsrc
index 071db874f19..7689bca9e79 100644
--- a/Master/tlpkg/tlpsrc/patch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/patch.tlpsrc
@@ -1,3 +1 @@
-name patch
-category Package
srcpattern +!d texmf-dist/source/latex/latex-tds/patch
diff --git a/Master/tlpkg/tlpsrc/pax.tlpsrc b/Master/tlpkg/tlpsrc/pax.tlpsrc
index 098117a374e..1bd4a7fd071 100644
--- a/Master/tlpkg/tlpsrc/pax.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pax.tlpsrc
@@ -1,3 +1 @@
-name pax
-category Package
binpattern f bin/${ARCH}/pdfannotextractor
diff --git a/Master/tlpkg/tlpsrc/pdf-forms-tutorial-de.tlpsrc b/Master/tlpkg/tlpsrc/pdf-forms-tutorial-de.tlpsrc
index 41e070c2393..15a7fdf7877 100644
--- a/Master/tlpkg/tlpsrc/pdf-forms-tutorial-de.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdf-forms-tutorial-de.tlpsrc
@@ -1,3 +1 @@
-name pdf-forms-tutorial-de
-category Package
catalogue pdf-forms-tutorial
diff --git a/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc b/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
index 70bba4dcfa3..6483f7985f3 100644
--- a/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfcrop.tlpsrc
@@ -1,4 +1,2 @@
-name pdfcrop
-category Package
runpattern d texmf-dist/scripts/pdfcrop
binpattern f bin/${ARCH}/pdfcrop
diff --git a/Master/tlpkg/tlpsrc/pdfpages.tlpsrc b/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
index 909f0e55401..aabbc6adadc 100644
--- a/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfpages.tlpsrc
@@ -1,3 +1 @@
-name pdfpages
-category Package
depend eso-pic
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 15f4dd04548..0836d21edf2 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -1,4 +1,3 @@
-name pdftex
category TLCore
depend kpathsea
execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini"
diff --git a/Master/tlpkg/tlpsrc/pdftools.tlpsrc b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
index 6e0b084ba4d..07f2b75dd66 100644
--- a/Master/tlpkg/tlpsrc/pdftools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
@@ -1,4 +1,3 @@
-name pdftools
category TLCore
shortdesc PDF-related utilities, including PostScript-to-PDF conversion
binpattern f bin/${ARCH}/e2pall
diff --git a/Master/tlpkg/tlpsrc/perltex.tlpsrc b/Master/tlpkg/tlpsrc/perltex.tlpsrc
index e4c7d161132..14a7b30f833 100644
--- a/Master/tlpkg/tlpsrc/perltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/perltex.tlpsrc
@@ -1,3 +1 @@
-name perltex
-category Package
binpattern f bin/${ARCH}/perltex
diff --git a/Master/tlpkg/tlpsrc/pgf.tlpsrc b/Master/tlpkg/tlpsrc/pgf.tlpsrc
index 376780133e6..5f53e3838a9 100644
--- a/Master/tlpkg/tlpsrc/pgf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pgf.tlpsrc
@@ -1,3 +1 @@
-name pgf
-category Package
depend xkeyval
diff --git a/Master/tlpkg/tlpsrc/pgfplots.tlpsrc b/Master/tlpkg/tlpsrc/pgfplots.tlpsrc
index 330dccb89f3..6ee86192785 100644
--- a/Master/tlpkg/tlpsrc/pgfplots.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pgfplots.tlpsrc
@@ -1,5 +1,3 @@
-name pgfplots
-category Package
runpattern +d texmf-dist/tex/context/third/pgfplots
srcpattern +d texmf-dist/source/context/third/pgfplots
docpattern +d texmf-dist/doc/context/third/pgfplots
diff --git a/Master/tlpkg/tlpsrc/phaistos.tlpsrc b/Master/tlpkg/tlpsrc/phaistos.tlpsrc
index aabb4bdc3c0..d438af4b444 100644
--- a/Master/tlpkg/tlpsrc/phaistos.tlpsrc
+++ b/Master/tlpkg/tlpsrc/phaistos.tlpsrc
@@ -1,3 +1 @@
-name phaistos
-category Package
execute addMap phaistos.map
diff --git a/Master/tlpkg/tlpsrc/physe.tlpsrc b/Master/tlpkg/tlpsrc/physe.tlpsrc
index ad6dfe1b705..b3779774908 100644
--- a/Master/tlpkg/tlpsrc/physe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/physe.tlpsrc
@@ -1,5 +1,3 @@
-name physe
-category Package
depend tex
execute AddFormat name=physe engine=pdftex options="physe.ini"
binpattern f bin/${ARCH}/physe
diff --git a/Master/tlpkg/tlpsrc/phyzzx.tlpsrc b/Master/tlpkg/tlpsrc/phyzzx.tlpsrc
index 0f983d8823d..2f7895d0839 100644
--- a/Master/tlpkg/tlpsrc/phyzzx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/phyzzx.tlpsrc
@@ -1,5 +1,3 @@
-name phyzzx
-category Package
depend tex
execute AddFormat name=phyzzx engine=pdftex options="physe.ini"
binpattern f bin/${ARCH}/phyzzx
diff --git a/Master/tlpkg/tlpsrc/pigpen.tlpsrc b/Master/tlpkg/tlpsrc/pigpen.tlpsrc
index 88d79fa8d35..10419ab8d7d 100644
--- a/Master/tlpkg/tlpsrc/pigpen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pigpen.tlpsrc
@@ -1,3 +1 @@
-name pigpen
-category Package
execute addMixedMap pigpen.map
diff --git a/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc b/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc
index 21c2c4e39fb..ac14e5d390a 100644
--- a/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pkfix-helper.tlpsrc
@@ -1,4 +1,2 @@
-name pkfix-helper
-category Package
docpattern +f texmf/doc/man/man1/pkfix-helper.*
binpattern f bin/${ARCH}/pkfix-helper
diff --git a/Master/tlpkg/tlpsrc/plain.tlpsrc b/Master/tlpkg/tlpsrc/plain.tlpsrc
index 004f13a610b..c813cd6daf2 100644
--- a/Master/tlpkg/tlpsrc/plain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/plain.tlpsrc
@@ -1,5 +1,3 @@
-name plain
-category Package
srcpattern f ignore
runpattern d texmf-dist/makeindex/plain
runpattern d texmf-dist/tex/plain/base
diff --git a/Master/tlpkg/tlpsrc/polski.tlpsrc b/Master/tlpkg/tlpsrc/polski.tlpsrc
index 8e199770c9e..7aa2af8a3f9 100644
--- a/Master/tlpkg/tlpsrc/polski.tlpsrc
+++ b/Master/tlpkg/tlpsrc/polski.tlpsrc
@@ -1,4 +1,2 @@
-name polski
-category Package
depend pl
depend hyphen-polish
diff --git a/Master/tlpkg/tlpsrc/ppower4.tlpsrc b/Master/tlpkg/tlpsrc/ppower4.tlpsrc
index 0af3075bc62..c98f6ef4b2c 100644
--- a/Master/tlpkg/tlpsrc/ppower4.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ppower4.tlpsrc
@@ -1,4 +1,2 @@
-name ppower4
-category Package
binpattern f bin/${ARCH}/pdfthumb
binpattern f bin/${ARCH}/ppower4
diff --git a/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc b/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc
index 9076c54a219..d49a2600051 100644
--- a/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ps2pkm.tlpsrc
@@ -1,4 +1,3 @@
-name ps2pkm
category TLCore
runpattern f texmf/doc/man/man1/mag.*
runpattern f texmf/doc/man/man1/pfb2pfa.*
diff --git a/Master/tlpkg/tlpsrc/psnfss.tlpsrc b/Master/tlpkg/tlpsrc/psnfss.tlpsrc
index 4ecea59bc8d..4c34c56d77d 100644
--- a/Master/tlpkg/tlpsrc/psnfss.tlpsrc
+++ b/Master/tlpkg/tlpsrc/psnfss.tlpsrc
@@ -1,5 +1,3 @@
-name psnfss
-category Package
execute addMap charter.map
execute addMap fpls.map
execute addMap pazo.map
diff --git a/Master/tlpkg/tlpsrc/pst-uml.tlpsrc b/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
index e40565d09dd..0c71b4009b8 100644
--- a/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pst-uml.tlpsrc
@@ -1,3 +1 @@
-name pst-uml
-category Package
depend multido
diff --git a/Master/tlpkg/tlpsrc/pst2pdf.tlpsrc b/Master/tlpkg/tlpsrc/pst2pdf.tlpsrc
index 3c822d34ccb..a983e1276d0 100644
--- a/Master/tlpkg/tlpsrc/pst2pdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pst2pdf.tlpsrc
@@ -1,3 +1 @@
-name pst2pdf
-category Package
binpattern f bin/${ARCH}/pst2pdf
diff --git a/Master/tlpkg/tlpsrc/psutils.tlpsrc b/Master/tlpkg/tlpsrc/psutils.tlpsrc
index acfd9e092af..e4edaa4859a 100644
--- a/Master/tlpkg/tlpsrc/psutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/psutils.tlpsrc
@@ -1,4 +1,3 @@
-name psutils
category TLCore
runpattern f texmf/dvips/psutils/*
docpattern f texmf/doc/man/man1/epsffit.*
diff --git a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
index 0c24e6eed4a..732d23a1aa7 100644
--- a/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
+++ b/Master/tlpkg/tlpsrc/purifyeps.tlpsrc
@@ -1,4 +1,2 @@
-name purifyeps
-category Package
docpattern +f texmf/doc/man/man1/purifyeps.*
binpattern f bin/${ARCH}/purifyeps
diff --git a/Master/tlpkg/tlpsrc/pxfonts.tlpsrc b/Master/tlpkg/tlpsrc/pxfonts.tlpsrc
index 154eac85592..7e25a3c2137 100644
--- a/Master/tlpkg/tlpsrc/pxfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pxfonts.tlpsrc
@@ -1,3 +1 @@
-name pxfonts
-category Package
execute addMap pxfonts.map
diff --git a/Master/tlpkg/tlpsrc/rsfs.tlpsrc b/Master/tlpkg/tlpsrc/rsfs.tlpsrc
index dfd8dd57cad..9617183e233 100644
--- a/Master/tlpkg/tlpsrc/rsfs.tlpsrc
+++ b/Master/tlpkg/tlpsrc/rsfs.tlpsrc
@@ -1,3 +1 @@
-name rsfs
-category Package
execute addMixedMap rsfs.map
diff --git a/Master/tlpkg/tlpsrc/sanskrit.tlpsrc b/Master/tlpkg/tlpsrc/sanskrit.tlpsrc
index eded9713fe0..690a5976fac 100644
--- a/Master/tlpkg/tlpsrc/sanskrit.tlpsrc
+++ b/Master/tlpkg/tlpsrc/sanskrit.tlpsrc
@@ -1,3 +1 @@
-name sanskrit
-category Package
execute addMap skt.map
diff --git a/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc b/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
index 3dc7c88a01b..53e2cc234c6 100644
--- a/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-basic.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-basic
category Scheme
shortdesc basic scheme (plain and LaTeX)
longdesc This is the basic TeX Live scheme: it is a small set of files
diff --git a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
index 5a1d2e61baa..f1dd5aadfd3 100644
--- a/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-context.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-context
category Scheme
shortdesc ConTeXt scheme
longdesc This is the TeX Live scheme for installing ConTeXt.
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index dcfeca27e20..6ee91773926 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-full
category Scheme
shortdesc full scheme (everything)
longdesc This is the full TeX Live scheme: it installs everything available.
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index b4e531c9490..a347d2b59bc 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-gust
category Scheme
shortdesc GUST TeX Live scheme
longdesc This is the GUST TeX Live scheme: it is a set of files sufficient
diff --git a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
index 934066f43f5..701d63fc25f 100644
--- a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-gutenberg
category Scheme
shortdesc GUTenberg TeX Live scheme
longdesc This is the GUTenberg TeX Live scheme: it is a small set of files
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index 73ea8938266..1a7fc021a82 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-medium
category Scheme
shortdesc medium scheme (plain, latex, recommended packages, some languages)
longdesc This is the medium TeX Live collection: it contains plain TeX,
diff --git a/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc b/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
index c18082537a4..91baae63828 100644
--- a/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-minimal.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-minimal
category Scheme
shortdesc minimal scheme (plain only)
longdesc This is the minimal TeX Live scheme, with support for only plain
diff --git a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
index e265aebcbfc..b3a12beb9ef 100644
--- a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-omega
category Scheme
shortdesc Omega scheme
longdesc This is a collection for people working only with Omega and
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index 2b35bb01157..5428315eb74 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-tetex
category Scheme
shortdesc teTeX scheme
longdesc TeX Live scheme nearly equivalent to the teTeX distribution that
diff --git a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
index 46bf48f5ddb..44e775db939 100644
--- a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
@@ -1,4 +1,3 @@
-name scheme-xml
category Scheme
shortdesc XML scheme
longdesc This contains the things you need to do XML-related work,
diff --git a/Master/tlpkg/tlpsrc/seetexk.tlpsrc b/Master/tlpkg/tlpsrc/seetexk.tlpsrc
index ef535bac419..80f8ae370b6 100644
--- a/Master/tlpkg/tlpsrc/seetexk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/seetexk.tlpsrc
@@ -1,4 +1,3 @@
-name seetexk
category TLCore
runpattern f texmf/doc/man/man1/dvibook.*
runpattern f texmf/doc/man/man1/dviconcat.*
diff --git a/Master/tlpkg/tlpsrc/semaphor.tlpsrc b/Master/tlpkg/tlpsrc/semaphor.tlpsrc
index bf2d74281bc..eee72c861f9 100644
--- a/Master/tlpkg/tlpsrc/semaphor.tlpsrc
+++ b/Master/tlpkg/tlpsrc/semaphor.tlpsrc
@@ -1,3 +1 @@
-name semaphor
-category Package
execute addMixedMap semaf.map
diff --git a/Master/tlpkg/tlpsrc/skaknew.tlpsrc b/Master/tlpkg/tlpsrc/skaknew.tlpsrc
index 0d64c927af6..e5da190e98a 100644
--- a/Master/tlpkg/tlpsrc/skaknew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/skaknew.tlpsrc
@@ -1,4 +1,2 @@
-name skaknew
-category Package
execute addMap SkakNew.map
runpattern +!f texmf-dist/fonts/map/vtex/skaknew/SkakNew.ali
diff --git a/Master/tlpkg/tlpsrc/splitindex.tlpsrc b/Master/tlpkg/tlpsrc/splitindex.tlpsrc
index 981d34e31e1..6f9ad6a1eae 100644
--- a/Master/tlpkg/tlpsrc/splitindex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/splitindex.tlpsrc
@@ -1,4 +1,2 @@
-name splitindex
-category Package
binpattern f bin/${ARCH}/splitindex
docpattern +f texmf/doc/man/man1/splitindex.*
diff --git a/Master/tlpkg/tlpsrc/staves.tlpsrc b/Master/tlpkg/tlpsrc/staves.tlpsrc
index f114ee4fc90..8c0dbe96d27 100644
--- a/Master/tlpkg/tlpsrc/staves.tlpsrc
+++ b/Master/tlpkg/tlpsrc/staves.tlpsrc
@@ -1,3 +1 @@
-name staves
-category Package
execute addMap icelandic.map
diff --git a/Master/tlpkg/tlpsrc/stmaryrd.tlpsrc b/Master/tlpkg/tlpsrc/stmaryrd.tlpsrc
index ca450e80982..05aa94ea896 100644
--- a/Master/tlpkg/tlpsrc/stmaryrd.tlpsrc
+++ b/Master/tlpkg/tlpsrc/stmaryrd.tlpsrc
@@ -1,3 +1 @@
-name stmaryrd
-category Package
execute addMixedMap stmaryrd.map
diff --git a/Master/tlpkg/tlpsrc/stubs.tlpsrc b/Master/tlpkg/tlpsrc/stubs.tlpsrc
index d6aab0561ca..6576070254b 100644
--- a/Master/tlpkg/tlpsrc/stubs.tlpsrc
+++ b/Master/tlpkg/tlpsrc/stubs.tlpsrc
@@ -1,3 +1 @@
-name stubs
-category Package
runpattern +!d texmf-dist/scripts/context/stubs
diff --git a/Master/tlpkg/tlpsrc/svn-multi.tlpsrc b/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
index 04e3cfc8345..1917f544fad 100644
--- a/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
+++ b/Master/tlpkg/tlpsrc/svn-multi.tlpsrc
@@ -1,3 +1 @@
-name svn-multi
-category Package
binpattern f bin/${ARCH}/svn-multi
diff --git a/Master/tlpkg/tlpsrc/synctex.tlpsrc b/Master/tlpkg/tlpsrc/synctex.tlpsrc
index d11bf233fef..9de4548e23e 100644
--- a/Master/tlpkg/tlpsrc/synctex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/synctex.tlpsrc
@@ -1,4 +1,3 @@
-name synctex
category TLCore
binpattern f bin/${ARCH}/synctex
docpattern f texmf/doc/man/man1/synctex.*
diff --git a/Master/tlpkg/tlpsrc/t1utils.tlpsrc b/Master/tlpkg/tlpsrc/t1utils.tlpsrc
index 2e3eb167b13..eaa30b33860 100644
--- a/Master/tlpkg/tlpsrc/t1utils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/t1utils.tlpsrc
@@ -1,4 +1,3 @@
-name t1utils
category TLCore
docpattern f texmf/doc/man/man1/t1ascii.*
docpattern f texmf/doc/man/man1/t1asm.*
diff --git a/Master/tlpkg/tlpsrc/t2.tlpsrc b/Master/tlpkg/tlpsrc/t2.tlpsrc
index 9d9e3c0a943..09e7f36c415 100644
--- a/Master/tlpkg/tlpsrc/t2.tlpsrc
+++ b/Master/tlpkg/tlpsrc/t2.tlpsrc
@@ -1,5 +1,3 @@
-name t2
-category Package
execute AddFormat name=cyramstex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyramstx.ini"
execute AddFormat name=cyrtex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtex.ini"
execute AddFormat name=cyrtexinfo mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtxinf.ini"
diff --git a/Master/tlpkg/tlpsrc/tabvar.tlpsrc b/Master/tlpkg/tlpsrc/tabvar.tlpsrc
index ca7c1abd668..a7f96cffbd8 100644
--- a/Master/tlpkg/tlpsrc/tabvar.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tabvar.tlpsrc
@@ -1,3 +1 @@
-name tabvar
-category Package
execute addMap tabvar.map
diff --git a/Master/tlpkg/tlpsrc/tcdialog.tlpsrc b/Master/tlpkg/tlpsrc/tcdialog.tlpsrc
index 7c801c3555e..31d16917dda 100644
--- a/Master/tlpkg/tlpsrc/tcdialog.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tcdialog.tlpsrc
@@ -1,4 +1,3 @@
-name tcdialog
category TLCore
docpattern f texmf/doc/man/man1/tcdialog.*
binpattern f bin/${ARCH}/tcdialog
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
index b1197815dd2..3bf77a7ece1 100644
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tetex.tlpsrc
@@ -1,4 +1,3 @@
-name tetex
category TLCore
shortdesc scripts and files originally written for or included in teTeX
runpattern f texmf/dvips/tetex/*
diff --git a/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc b/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc
index e0bb1499d73..e11caead019 100644
--- a/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex-gyre.tlpsrc
@@ -1,5 +1,3 @@
-name tex-gyre
-category Package
execute addMap qag.map
execute addMap qbk.map
execute addMap qcr.map
diff --git a/Master/tlpkg/tlpsrc/tex.tlpsrc b/Master/tlpkg/tlpsrc/tex.tlpsrc
index 9076ac58128..73e2fc6c354 100644
--- a/Master/tlpkg/tlpsrc/tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex.tlpsrc
@@ -1,4 +1,3 @@
-name tex
category TLCore
depend kpathsea
execute AddFormat name=tex engine=tex options="tex.ini"
diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
index a59078abd6b..cb007970e31 100644
--- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
@@ -1,5 +1,3 @@
-name tex4ht
-category Package
binpattern f bin/${ARCH}/ht
binpattern f bin/win32/htcmd
binpattern f bin/${ARCH}/htcontext
diff --git a/Master/tlpkg/tlpsrc/texconfig.tlpsrc b/Master/tlpkg/tlpsrc/texconfig.tlpsrc
index a5e21d43d9c..2c3f24ebf7b 100644
--- a/Master/tlpkg/tlpsrc/texconfig.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texconfig.tlpsrc
@@ -1,4 +1,3 @@
-name texconfig
category TLCore
runpattern f texmf/texconfig/*
runpattern f texmf/texconfig/g/*
diff --git a/Master/tlpkg/tlpsrc/texcount.tlpsrc b/Master/tlpkg/tlpsrc/texcount.tlpsrc
index 3263c7e7b7d..90191fd6cc8 100644
--- a/Master/tlpkg/tlpsrc/texcount.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texcount.tlpsrc
@@ -1,3 +1 @@
-name texcount
-category Package
binpattern f bin/${ARCH}/texcount
diff --git a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
index 0f17b057566..27c34c02d13 100644
--- a/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdirflatten.tlpsrc
@@ -1,4 +1,2 @@
-name texdirflatten
-category Package
binpattern f bin/${ARCH}/texdirflatten
docpattern f texmf/doc/man/man1/texdirflatten.*
diff --git a/Master/tlpkg/tlpsrc/texdoc.tlpsrc b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
index 932641918f3..0998beffe4a 100644
--- a/Master/tlpkg/tlpsrc/texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
@@ -1,4 +1,3 @@
-name texdoc
category TLCore
depend kpathsea
postaction shortcut type=menu name="TeXdoc GUI" cmd="TEXDIR/bin/win32/texdoctk.bat" hide=1
diff --git a/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc b/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
index 4d6a381aa94..b747c7619a6 100644
--- a/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-cz
category TLCore
postaction shortcut type=menu name="TeX Live Manual (cz) (PDF)" \
cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.pdf
diff --git a/Master/tlpkg/tlpsrc/texlive-de.tlpsrc b/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
index 93f81bf342f..ee551d735b3 100644
--- a/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-de
category TLCore
postaction shortcut type=menu name="TeX Live Manual (de) (PDF)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.pdf
postaction shortcut type=menu name="TeX Live Manual (de) (HTML)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.html
diff --git a/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc b/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
index 750d468df30..1eb2502481c 100644
--- a/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-fr
category TLCore
postaction shortcut type=menu name="TeX Live Manual (fr) (PDF)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.pdf
postaction shortcut type=menu name="TeX Live Manual (fr) (HTML)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.html
diff --git a/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc b/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
index 4c0425fa728..db4e8950e30 100644
--- a/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-pl
category TLCore
postaction shortcut type=menu name="TeX Live Manual (pl) (PDF)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.pdf
postaction shortcut type=menu name="TeX Live Manual (pl) (HTML)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.html
diff --git a/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc b/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
index 5046141ebdf..f4beb817f94 100644
--- a/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-ru
category TLCore
postaction shortcut type=menu name="TeX Live Manual (ru) (PDF)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.pdf
postaction shortcut type=menu name="TeX Live Manual (ru) (HTML)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.html
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 6560391737d..53d56630bd7 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-scripts
category TLCore
shortdesc executables and files maintained as part of TeX Live
longdesc This packages contains the binaries of the TeX Live tools.
diff --git a/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc b/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
index 7373e6f0f35..f9a45678117 100644
--- a/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
@@ -1,4 +1,3 @@
-name texlive-zh-cn
category TLCore
postaction shortcut type=menu name="TeX Live Manual (zh-cn) (PDF)" \
cmd=TEXDIR/texmf-doc/doc/chinese/texlive-zh-cn/texlive-zh-cn.pdf
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index c188b5b9efa..cce247e8255 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -1,4 +1,3 @@
-name texlive.infra
category TLCore
shortdesc basic TeX Live infrastructure
longdesc This package contains the files needed to get the TeX Live
diff --git a/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc b/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
index 88d39b188e3..ee7a836ee51 100644
--- a/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texloganalyser.tlpsrc
@@ -1,3 +1 @@
-name texloganalyser
-category Package
binpattern f bin/${ARCH}/texloganalyser
diff --git a/Master/tlpkg/tlpsrc/texpower.tlpsrc b/Master/tlpkg/tlpsrc/texpower.tlpsrc
index bca2d7caae7..079f5f006e6 100644
--- a/Master/tlpkg/tlpsrc/texpower.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texpower.tlpsrc
@@ -1,3 +1 @@
-name texpower
-category Package
depend tpslifonts
diff --git a/Master/tlpkg/tlpsrc/texsis.tlpsrc b/Master/tlpkg/tlpsrc/texsis.tlpsrc
index 5d2426b1190..2f94ba67b4d 100644
--- a/Master/tlpkg/tlpsrc/texsis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texsis.tlpsrc
@@ -1,5 +1,3 @@
-name texsis
-category Package
depend tex
execute AddFormat name=texsis engine=pdftex options="-translate-file=cp227.tcx texsis.ini"
binpattern f bin/${ARCH}/texsis
diff --git a/Master/tlpkg/tlpsrc/texware.tlpsrc b/Master/tlpkg/tlpsrc/texware.tlpsrc
index a2c0267e0e6..cc8990f9457 100644
--- a/Master/tlpkg/tlpsrc/texware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texware.tlpsrc
@@ -1,4 +1,3 @@
-name texware
category TLCore
docpattern f texmf/doc/man/man1/dvitype.*
docpattern f texmf/doc/man/man1/pooltype.*
diff --git a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
index e5a9d1129d5..0224b30ee77 100644
--- a/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/thumbpdf.tlpsrc
@@ -1,4 +1,2 @@
-name thumbpdf
-category Package
binpattern f bin/${ARCH}/thumbpdf
docpattern +f texmf/doc/man/man1/thumbpdf.*
diff --git a/Master/tlpkg/tlpsrc/tie.tlpsrc b/Master/tlpkg/tlpsrc/tie.tlpsrc
index 0638e23413e..8d9f9d86b72 100644
--- a/Master/tlpkg/tlpsrc/tie.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tie.tlpsrc
@@ -1,4 +1,3 @@
-name tie
category TLCore
depend kpathsea
docpattern f texmf/doc/man/man1/tie.*
diff --git a/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc b/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
index 6717c40bd6d..d411c06efeb 100644
--- a/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tikz-timing.tlpsrc
@@ -1,3 +1 @@
-name tikz-timing
-category Package
depend svn-prov
diff --git a/Master/tlpkg/tlpsrc/tipa.tlpsrc b/Master/tlpkg/tlpsrc/tipa.tlpsrc
index e1eff8abc9f..3048f77ce4f 100644
--- a/Master/tlpkg/tlpsrc/tipa.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tipa.tlpsrc
@@ -1,3 +1 @@
-name tipa
-category Package
execute addMixedMap tipa.map
diff --git a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc
index f86ea7d5c71..9c65b3c140d 100644
--- a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc
@@ -1,4 +1,3 @@
-name tlgs.win32
category TLCore
binpattern d/win32 tlpkg/tlgs
binpattern d/win32 texmf/scripts/tlgs
diff --git a/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc
index 773e833ada3..b53e8a3df67 100644
--- a/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tlperl.win32.tlpsrc
@@ -1,4 +1,3 @@
-name tlperl.win32
category TLCore
runpattern f tlpkg/tlperl/README.TEXLIVE
runpattern d tlpkg/tlperl/lib
diff --git a/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc
index 9977a1d9941..f88e29ecb26 100644
--- a/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc
@@ -1,4 +1,3 @@
-name tlpsv.win32
category TLCore
# we use runpattern here so that no different binfiles entries for
# all the archs are created
diff --git a/Master/tlpkg/tlpsrc/tools.tlpsrc b/Master/tlpkg/tlpsrc/tools.tlpsrc
index 5e68a197f48..ade555e6cae 100644
--- a/Master/tlpkg/tlpsrc/tools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tools.tlpsrc
@@ -1,3 +1 @@
-name tools
-category Package
srcpattern +!d texmf-dist/source/latex/tcldoc/tools
diff --git a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
index a31c55e4378..d48eadaac73 100644
--- a/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tpic2pdftex.tlpsrc
@@ -1,4 +1,3 @@
-name tpic2pdftex
category TLCore
docpattern f texmf/doc/tpic2pdftex/*
docpattern f texmf/doc/man/man1/tpic2pdftex.*
diff --git a/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc b/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
index 182d9393d23..a9e1fc341e4 100644
--- a/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tpslifonts.tlpsrc
@@ -1,3 +1 @@
-name tpslifonts
-category Package
docpattern +!d texmf-dist/doc/latex/texpower/tpslifonts
diff --git a/Master/tlpkg/tlpsrc/trajan.tlpsrc b/Master/tlpkg/tlpsrc/trajan.tlpsrc
index b96e42e36f2..1094b06756b 100644
--- a/Master/tlpkg/tlpsrc/trajan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/trajan.tlpsrc
@@ -1,3 +1 @@
-name trajan
-category Package
execute addMixedMap trajan.map
diff --git a/Master/tlpkg/tlpsrc/txfonts.tlpsrc b/Master/tlpkg/tlpsrc/txfonts.tlpsrc
index f1a7b2a1c6e..5354d96fc7c 100644
--- a/Master/tlpkg/tlpsrc/txfonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/txfonts.tlpsrc
@@ -1,3 +1 @@
-name txfonts
-category Package
execute addMap txfonts.map
diff --git a/Master/tlpkg/tlpsrc/uhc.tlpsrc b/Master/tlpkg/tlpsrc/uhc.tlpsrc
index 209f3aaa594..b21a78f6b33 100644
--- a/Master/tlpkg/tlpsrc/uhc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uhc.tlpsrc
@@ -1,3 +1 @@
-name uhc
-category Package
execute addMap umj.map
diff --git a/Master/tlpkg/tlpsrc/velthuis.tlpsrc b/Master/tlpkg/tlpsrc/velthuis.tlpsrc
index 22ec164bb44..b9de1410adc 100644
--- a/Master/tlpkg/tlpsrc/velthuis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/velthuis.tlpsrc
@@ -1,3 +1 @@
-name velthuis
-category Package
execute addMixedMap dvng.map
diff --git a/Master/tlpkg/tlpsrc/venturisadf.tlpsrc b/Master/tlpkg/tlpsrc/venturisadf.tlpsrc
index 2db827447ca..8c0caf702d4 100644
--- a/Master/tlpkg/tlpsrc/venturisadf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/venturisadf.tlpsrc
@@ -1,5 +1,3 @@
-name venturisadf
-category Package
binpattern a venturis venturis2 venturisold venturissans venturissans2
docpattern a venturis venturis2 venturisold venturissans venturissans2
runpattern a venturis venturis2 venturisold venturissans venturissans2
diff --git a/Master/tlpkg/tlpsrc/vlna.tlpsrc b/Master/tlpkg/tlpsrc/vlna.tlpsrc
index 57b9bacfa5d..e14eda3bab6 100644
--- a/Master/tlpkg/tlpsrc/vlna.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vlna.tlpsrc
@@ -1,4 +1,3 @@
-name vlna
category TLCore
docpattern f texmf/doc/vlna/*
docpattern f texmf/doc/man/man1/vlna.*
diff --git a/Master/tlpkg/tlpsrc/vntex.tlpsrc b/Master/tlpkg/tlpsrc/vntex.tlpsrc
index 48a6d43ba16..d2162ed6d14 100644
--- a/Master/tlpkg/tlpsrc/vntex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vntex.tlpsrc
@@ -1,5 +1,3 @@
-name vntex
-category Package
depend plnfss
execute addMap arevvn.map
execute addMap chartervn.map
diff --git a/Master/tlpkg/tlpsrc/vpe.tlpsrc b/Master/tlpkg/tlpsrc/vpe.tlpsrc
index 3d5568dd78a..272c8b53f7f 100644
--- a/Master/tlpkg/tlpsrc/vpe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vpe.tlpsrc
@@ -1,3 +1 @@
-name vpe
-category Package
binpattern f bin/${ARCH}/vpe
diff --git a/Master/tlpkg/tlpsrc/vtex.tlpsrc b/Master/tlpkg/tlpsrc/vtex.tlpsrc
index fa9346f1158..777400c42cf 100644
--- a/Master/tlpkg/tlpsrc/vtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/vtex.tlpsrc
@@ -1,5 +1,3 @@
-name vtex
-category Package
docpattern +!d texmf-dist/doc/fonts/marvosym/vtex
runpattern +!d texmf-dist/fonts/map/vtex/cm-super
runpattern +!d texmf-dist/fonts/map/vtex/mnsymbol
diff --git a/Master/tlpkg/tlpsrc/wadalab.tlpsrc b/Master/tlpkg/tlpsrc/wadalab.tlpsrc
index 5f1406ea676..d2e62aa301d 100644
--- a/Master/tlpkg/tlpsrc/wadalab.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wadalab.tlpsrc
@@ -1,5 +1,3 @@
-name wadalab
-category Package
execute addMap dgj.map
execute addMap dmj.map
execute addMap mc2j.map
diff --git a/Master/tlpkg/tlpsrc/wasy.tlpsrc b/Master/tlpkg/tlpsrc/wasy.tlpsrc
index 60a4b7c98a2..a837ed0ed8d 100644
--- a/Master/tlpkg/tlpsrc/wasy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wasy.tlpsrc
@@ -1,3 +1 @@
-name wasy
-category Package
execute addMixedMap wasy.map
diff --git a/Master/tlpkg/tlpsrc/web.tlpsrc b/Master/tlpkg/tlpsrc/web.tlpsrc
index b6d17a782cb..9bee93e6c2b 100644
--- a/Master/tlpkg/tlpsrc/web.tlpsrc
+++ b/Master/tlpkg/tlpsrc/web.tlpsrc
@@ -1,4 +1,3 @@
-name web
category TLCore
shortdesc original web programs tangle and weave
depend kpathsea
diff --git a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
index c21480c2724..4cc3d557dd1 100644
--- a/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/wintools.win32.tlpsrc
@@ -1,4 +1,3 @@
-name wintools.win32
category TLCore
# original bin-winutils
binpattern f bin/win32/aftopl.exe
diff --git a/Master/tlpkg/tlpsrc/xecyr.tlpsrc b/Master/tlpkg/tlpsrc/xecyr.tlpsrc
index f58addb5f65..204adb0f946 100644
--- a/Master/tlpkg/tlpsrc/xecyr.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xecyr.tlpsrc
@@ -1,5 +1,3 @@
-name xecyr
-category Package
binpattern f bin/win32/rubibtexx.bat
binpattern f bin/win32/rumakeindexx.bat
binpattern f bin/win32/rumakeindexx2.bat
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index c5fcb4e9343..9174a879646 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,19 +1,21 @@
-name xetex
category TLCore
#
execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex xetex.ini"
execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini"
+#
postaction script file=tlpkg/tlpostcode/xetex.pl
runpattern f tlpkg/tlpostcode/xetex.pl
+#
# this should only be present in the win32 binary package
binpattern d/win32 tlpkg/tlpostcode/xetex
#
# these are only needed for darwin only, so
-# use arch specific patterns to avoid warnings about not-hit patterns.
+# use arch-specific patterns to avoid warnings about not-hit patterns.
binpattern f/universal-darwin bin/universal-darwin/T1Wrap
binpattern f/universal-darwin bin/universal-darwin/xdv2pdf
#
docpattern d texmf-dist/doc/xetex/base
+#
runpattern d texmf-dist/fonts/misc/xetex/fontmapping/base
runpattern d texmf-dist/scripts/xetex
#
@@ -26,4 +28,5 @@ binpattern f bin/win32/conf/conf.d/*
binpattern f bin/win32/teckit_compile.exe
binpattern f bin/win32/fc-*
binpattern f bin/win32/icu*.dll
+#
depend xetexconfig
diff --git a/Master/tlpkg/tlpsrc/xypic.tlpsrc b/Master/tlpkg/tlpsrc/xypic.tlpsrc
index 4595470a7d6..9aeca78d345 100644
--- a/Master/tlpkg/tlpsrc/xypic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xypic.tlpsrc
@@ -1,3 +1 @@
-name xypic
-category Package
execute addMixedMap xypic.map
diff --git a/Master/tlpkg/tlpsrc/yhmath.tlpsrc b/Master/tlpkg/tlpsrc/yhmath.tlpsrc
index 13139679ec1..9eaec66d1c2 100644
--- a/Master/tlpkg/tlpsrc/yhmath.tlpsrc
+++ b/Master/tlpkg/tlpsrc/yhmath.tlpsrc
@@ -1,3 +1 @@
-name yhmath
-category Package
execute addMixedMap yhmath.map
diff --git a/Master/tlpkg/tlpsrc/zefonts.tlpsrc b/Master/tlpkg/tlpsrc/zefonts.tlpsrc
index 16f9be5c17c..a45fda7096d 100644
--- a/Master/tlpkg/tlpsrc/zefonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/zefonts.tlpsrc
@@ -1,3 +1 @@
-name zefonts
-category Package
execute addMap slantcm.map