scheme-infraonly needs texlive-scripts; move mktexlsr to texlive-scripts; move mkocp and mkocm to texlive-scripts-extra

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

5 files changed, 8 insertions, 7 deletions

diff --git a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
index a15a2391e7a..d3ad7c0531d 100644
--- a/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/kpathsea.tlpsrc
@@ -16,16 +16,12 @@ docpattern f texmf-dist/doc/man/man1/kpseaccess.*
 docpattern f texmf-dist/doc/man/man1/kpsereadlink.*
 docpattern f texmf-dist/doc/man/man1/kpsestat.*
 docpattern f texmf-dist/doc/man/man1/kpsewhich.*
-docpattern f texmf-dist/doc/man/man1/mkocp.*
-docpattern f texmf-dist/doc/man/man1/mkofm.*
 docpattern f texmf-dist/doc/web2c/*
 #
 binpattern f bin/${ARCH}/kpseaccess
 binpattern f bin/${ARCH}/kpsereadlink
 binpattern f bin/${ARCH}/kpsestat
 binpattern f bin/${ARCH}/kpsewhich
-binpattern f bin/${ARCH}/mkocp
-binpattern f bin/${ARCH}/mkofm
 #
 binpattern f/i386-cygwin bin/i386-cygwin/cygkpathsea*.dll
 binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygkpathsea*.dll
diff --git a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
index 03199ff4f9c..0ec748ab06a 100644
--- a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
@@ -7,3 +7,4 @@ longdesc separately afterwards, with tlmgr install.
 depend texlive.infra
 depend kpathsea
 depend hyphen-base
+depend texlive-scripts
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
index f26952121fa..4f0dd4e1a77 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
@@ -32,6 +32,8 @@ binpattern f bin/${ARCH}/dvired
 binpattern f bin/${ARCH}/e2pall
 binpattern f bin/${ARCH}/kpsetool
 binpattern f bin/${ARCH}/kpsewhere
+binpattern f bin/${ARCH}/mkocp
+binpattern f bin/${ARCH}/mkofm
 binpattern f bin/${ARCH}/ps2frag
 binpattern f bin/${ARCH}/pslatex
 binpattern f bin/${ARCH}/texconfig
@@ -48,6 +50,8 @@ docpattern f texmf-dist/doc/man/man1/dvired.*
 docpattern f texmf-dist/doc/man/man1/e2pall.*
 docpattern f texmf-dist/doc/man/man1/kpsetool.*
 docpattern f texmf-dist/doc/man/man1/kpsewhere.*
+docpattern f texmf-dist/doc/man/man1/mkocp.*
+docpattern f texmf-dist/doc/man/man1/mkofm.*
 docpattern f texmf-dist/doc/man/man1/ps2frag.*
 docpattern f texmf-dist/doc/man/man1/pslatex.*
 docpattern f texmf-dist/doc/man/man1/texconfig-sys.*
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 00190d6847a..0742b79dbff 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -21,6 +21,7 @@ execute addMap mathpple.map
 runpattern f texmf-dist/scripts/texlive/fmtutil-sys.sh
 runpattern f texmf-dist/scripts/texlive/fmtutil-user.sh
 runpattern f texmf-dist/scripts/texlive/fmtutil.pl
+runpattern f texmf-dist/scripts/texlive/mktexlsr
 runpattern f texmf-dist/scripts/texlive/mktexlsr.pl
 runpattern f texmf-dist/scripts/texlive/mktexmf
 runpattern f texmf-dist/scripts/texlive/mktexpk
@@ -34,6 +35,7 @@ runpattern f texmf-dist/scripts/texlive/updmap.pl
 binpattern f bin/${ARCH}/fmtutil
 binpattern f bin/${ARCH}/fmtutil-sys
 binpattern f bin/${ARCH}/fmtutil-user
+binpattern f bin/${ARCH}/mktexlsr
 binpattern f bin/${ARCH}/mktexmf
 binpattern f bin/${ARCH}/mktexpk
 binpattern f bin/${ARCH}/mktextfm
@@ -47,6 +49,7 @@ binpattern f bin/${ARCH}/texhash
 #
 docpattern f texmf-dist/doc/man/man1/fmtutil*
 docpattern f texmf-dist/doc/man/man1/mktexfmt.*
+docpattern f texmf-dist/doc/man/man1/mktexlsr.*
 docpattern f texmf-dist/doc/man/man1/mktexmf.*
 docpattern f texmf-dist/doc/man/man1/mktexpk.*
 docpattern f texmf-dist/doc/man/man1/mktextfm.*
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 3b1d12b5601..24541bfef3c 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -11,7 +11,6 @@ docpattern f README*
 docpattern d readme-html.dir
 docpattern d readme-txt.dir
 docpattern f index.html
-docpattern f texmf-dist/doc/man/man1/mktexlsr.*
 docpattern f texmf-dist/doc/man/man1/tlmgr.*
 docpattern f texmf-dist/scripts/texlive/NEWS
 docpattern f tlpkg/README
@@ -22,7 +21,6 @@ docpattern f tlpkg/installer/COPYING.MinGW-runtime.txt
 runpattern f LICENSE*
 runpattern f release-texlive.txt
 #
-runpattern f texmf-dist/scripts/texlive/mktexlsr
 runpattern f texmf-dist/scripts/texlive/tlmgr.pl
 runpattern f texmf-dist/scripts/texlive/tlmgrgui.pl
 runpattern f texmf-dist/scripts/texlive/uninstall-win32.pl
@@ -34,7 +32,6 @@ runpattern d tlpkg/TeXLive
 runpattern d tlpkg/gpg
 
 binpattern f bin/${ARCH}/tlmgr
-binpattern f bin/${ARCH}/mktexlsr
 # 
 binpattern f/win32 bin/win32/runscript.*
 binpattern f/win32 bin/win32/wrunscript.*