tetex -> texlive, etc.

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

10 files changed, 41 insertions, 25 deletions

diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index 57a9c82b648..c9e01be231a 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -48,6 +48,7 @@ docpattern +!f texmf-dist/doc/context/scripts/mkii/mptopdf.man
 depend mptopdf
 #
 # these have their own TL packages, and are not part of core context.
+runpattern +!d texmf-dist/tex/context/asymptote
 runpattern +!d texmf-dist/tex/context/third
 runpattern +!d texmf-dist/tex/context/interface/third
 runpattern +!d texmf-dist/scripts/context/lua/third
diff --git a/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc b/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc
index 95ed8a48085..22546d3c481 100644
--- a/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cyrillic-bin.tlpsrc
@@ -1,8 +1,8 @@
 category TLCore
 shortdesc Cyrillic bibtex and makeindex.
 
-runpattern f texmf-dist/scripts/tetex/rubibtex.sh
-runpattern f texmf-dist/scripts/tetex/rumakeindex.sh
+runpattern f texmf-dist/scripts/texlive/rubibtex.sh
+runpattern f texmf-dist/scripts/texlive/rumakeindex.sh
 binpattern f bin/${ARCH}/rubibtex
 binpattern f bin/${ARCH}/rumakeindex
 #
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
index 6fe26c59eb6..8705362735a 100644
--- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
@@ -6,8 +6,9 @@ postaction script file=tlpkg/tlpostcode/dvipdfmx.pl
 #
 runpattern f tlpkg/tlpostcode/dvipdfmx.pl
 runpattern d texmf-dist/dvipdfmx
-runpattern d texmf-dist/fonts/cmap
-runpattern d texmf-dist/fonts/map/dvipdfmx
+runpattern d texmf-dist/fonts/cmap/dvipdfmx
+runpattern d texmf-dist/fonts/map/dvipdfmx/updmap
+runpattern f texmf-dist/fonts/map/dvipdfmx/*.map
 #
 binpattern f bin/${ARCH}/dvipdfmx
 binpattern f bin/${ARCH}/ebb
diff --git a/Master/tlpkg/tlpsrc/fontinst.tlpsrc b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
index f38af7e5443..2e84b2eddc9 100644
--- a/Master/tlpkg/tlpsrc/fontinst.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontinst.tlpsrc
@@ -1,4 +1,7 @@
-runpattern +f texmf-dist/scripts/tetex/fontinst.sh
-binpattern +f bin/${ARCH}/${PKGNAME}
+runpattern +f  texmf-dist/scripts/texlive/fontinst.sh
+runpattern +!d texmf-dist/tex/fontinst/afm2pl
+#
+binpattern +f  bin/${ARCH}/${PKGNAME}
+#
 srcpattern +!f texmf-dist/source/latex/eulervm/fontinst/*
 srcpattern +!f texmf-dist/source/latex/pslatex/fontinst/pslatex.tex
diff --git a/Master/tlpkg/tlpsrc/koma-script.tlpsrc b/Master/tlpkg/tlpsrc/koma-script.tlpsrc
index 600d874fc89..915e8a6dff1 100644
--- a/Master/tlpkg/tlpsrc/koma-script.tlpsrc
+++ b/Master/tlpkg/tlpsrc/koma-script.tlpsrc
@@ -7,3 +7,6 @@ runpattern t texmf-dist tex koma-script
 # we try to satisfy anyway.
 runpattern t texmf-dist source koma-script
 runpattern t texmf-dist doc koma-script
+#
+# thus, nothing in doc.
+docpattern d nonesuch
diff --git a/Master/tlpkg/tlpsrc/pdftools.tlpsrc b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
index d6e200b083f..07d069401f5 100644
--- a/Master/tlpkg/tlpsrc/pdftools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
@@ -12,4 +12,5 @@ docpattern f texmf-dist/doc/man/man1/e2pall.*
 docpattern f texmf-dist/doc/man/man1/pdfclose.*
 docpattern f texmf-dist/doc/man/man1/pdfopen.*
 docpattern f texmf-dist/doc/man/man1/pdftosrc.*
-runpattern f texmf-dist/scripts/tetex/e2pall.pl
+#
+runpattern f texmf-dist/scripts/texlive/e2pall.pl
diff --git a/Master/tlpkg/tlpsrc/pstools.tlpsrc b/Master/tlpkg/tlpsrc/pstools.tlpsrc
index d9f53b0fc14..d6a16cb5166 100644
--- a/Master/tlpkg/tlpsrc/pstools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pstools.tlpsrc
@@ -3,9 +3,11 @@ docpattern f texmf-dist/doc/man/man1/bbox.*
 docpattern f texmf-dist/doc/man/man1/ps2eps.*
 docpattern f texmf-dist/doc/man/man1/ps2frag.*
 docpattern f texmf-dist/doc/man/man1/pslatex.*
+#
 runpattern d texmf-dist/scripts/ps2eps
-runpattern f texmf-dist/scripts/tetex/ps2frag.sh
-runpattern f texmf-dist/scripts/tetex/pslatex.sh
+runpattern f texmf-dist/scripts/texlive/ps2frag.sh
+runpattern f texmf-dist/scripts/texlive/pslatex.sh
+#
 binpattern f bin/${ARCH}/bbox
 binpattern f bin/${ARCH}/ps2eps
 binpattern f bin/${ARCH}/ps2frag
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
index f6888221495..ed1836bad48 100644
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tetex.tlpsrc
@@ -10,20 +10,20 @@ runpattern f texmf-dist/fonts/enc/dvips/tetex/*
 runpattern f texmf-dist/fonts/map/dvips/tetex/*
 runpattern f texmf-dist/web2c/updmap.cfg
 runpattern f texmf-dist/web2c/updmap.cfg
-runpattern f texmf-dist/scripts/tetex/allcm.sh
-runpattern f texmf-dist/scripts/tetex/allneeded.sh
-runpattern f texmf-dist/scripts/tetex/dvi2fax.sh
-runpattern f texmf-dist/scripts/tetex/dvired.sh
-runpattern f texmf-dist/scripts/tetex/kpsewhere.sh
-runpattern f texmf-dist/scripts/tetex/kpsetool.sh
-runpattern f texmf-dist/scripts/tetex/updmap.pl
-runpattern f texmf-dist/scripts/tetex/updmap-sys.sh
 #
-runpattern f texmf-dist/scripts/tetex/fmtutil.sh
-runpattern f texmf-dist/scripts/tetex/fmtutil-sys.sh
-runpattern f texmf-dist/scripts/tetex/texconfig-dialog.sh
-runpattern f texmf-dist/scripts/tetex/texconfig-sys.sh
-runpattern f texmf-dist/scripts/tetex/texlinks.sh
+runpattern f texmf-dist/scripts/texlive/allcm.sh
+runpattern f texmf-dist/scripts/texlive/allneeded.sh
+runpattern f texmf-dist/scripts/texlive/dvi2fax.sh
+runpattern f texmf-dist/scripts/texlive/dvired.sh
+runpattern f texmf-dist/scripts/texlive/fmtutil-sys.sh
+runpattern f texmf-dist/scripts/texlive/fmtutil.sh
+runpattern f texmf-dist/scripts/texlive/kpsetool.sh
+runpattern f texmf-dist/scripts/texlive/kpsewhere.sh
+runpattern f texmf-dist/scripts/texlive/texconfig-dialog.sh
+runpattern f texmf-dist/scripts/texlive/texconfig-sys.sh
+runpattern f texmf-dist/scripts/texlive/texlinks.sh
+runpattern f texmf-dist/scripts/texlive/updmap-sys.sh
+runpattern f texmf-dist/scripts/texlive/updmap.pl
 
 docpattern f texmf-dist/doc/man/man1/allcm.*
 docpattern f texmf-dist/doc/man/man1/allec.*
@@ -39,7 +39,7 @@ docpattern f texmf-dist/doc/man/man1/texlinks.*
 docpattern f texmf-dist/doc/man/man1/updmap*
 docpattern f texmf-dist/doc/man/man5/fmtutil.cnf.*
 docpattern f texmf-dist/doc/man/man5/updmap.*
-docpattern f texmf-dist/doc/tetex/*
+docpattern d texmf-dist/doc/tetex
 
 binpattern f bin/${ARCH}/allcm
 binpattern f bin/${ARCH}/allec
diff --git a/Master/tlpkg/tlpsrc/texconfig.tlpsrc b/Master/tlpkg/tlpsrc/texconfig.tlpsrc
index 48cc977e181..b4dcfc75cd9 100644
--- a/Master/tlpkg/tlpsrc/texconfig.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texconfig.tlpsrc
@@ -1,8 +1,10 @@
 category TLCore
-runpattern f texmf-dist/scripts/tetex/texconfig.sh
+runpattern f texmf-dist/scripts/texlive/texconfig.sh
 runpattern f texmf-dist/texconfig/*
 runpattern f texmf-dist/texconfig/g/*
 runpattern f texmf-dist/texconfig/v/*
 runpattern f texmf-dist/texconfig/x/*
+#
 docpattern f texmf-dist/doc/man/man1/texconfig*
+#
 binpattern f bin/${ARCH}/texconfig
diff --git a/Master/tlpkg/tlpsrc/texdoc.tlpsrc b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
index cdc6efee73f..43196241b68 100644
--- a/Master/tlpkg/tlpsrc/texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
@@ -2,13 +2,16 @@ category TLCore
 depend kpathsea
 postaction shortcut type=menu name="TeXdoc GUI" \
            cmd="TEXDIR/bin/win32/texdoctk.exe"
-runpattern f texmf-dist/scripts/tetex/texdoctk.pl
+#
+runpattern f texmf-dist/scripts/texlive/texdoctk.pl
 runpattern f texmf-dist/scripts/texdoc/*
 runpattern f texmf-dist/texdoctk/*
 runpattern f texmf-dist/texdoc/*
+#
 docpattern f texmf-dist/doc/man/man1/texdoc.*
 docpattern f texmf-dist/doc/man/man1/texdoctk.*
 docpattern f texmf-dist/doc/texdoc/*
+#
 binpattern f bin/${ARCH}/texdoc
 binpattern f bin/${ARCH}/texdoctk
 binpattern f bin/win32/texdocc