texmf-dist/scripts/texlive-extra: new directory, for miscellanous

  scripts maintained as part of TeX Live, but not important for
  infrastructure or installation.
allcm.sh, allneeded.sh: move there (from scripts/texlive).

texlive-extra.tlpsrc: new package.
tetex.tlpsrc: remove all*.sh and man pages from here.
collection-binextra.tlpsrc: add texlive-extra here.

bin/*/all*: adjust symlinks.

Build/.../texlive/linked_scripts/texlive-extra: new slave directory.
  Adjust Makefile.am, including creating allec symlink here.
Build/.../texlive/tl_scripts: remove allcm.sh, allneeded.sh here.
  Adjust Makefile.am.

Many more to move ...


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

38 files changed, 83 insertions, 49 deletions

diff --git a/Master/bin/aarch64-linux/allcm b/Master/bin/aarch64-linux/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/aarch64-linux/allcm
+++ b/Master/bin/aarch64-linux/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/aarch64-linux/allneeded b/Master/bin/aarch64-linux/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/aarch64-linux/allneeded
+++ b/Master/bin/aarch64-linux/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/allcm b/Master/bin/amd64-freebsd/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/amd64-freebsd/allcm
+++ b/Master/bin/amd64-freebsd/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/allneeded b/Master/bin/amd64-freebsd/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/amd64-freebsd/allneeded
+++ b/Master/bin/amd64-freebsd/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/allcm b/Master/bin/amd64-netbsd/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/amd64-netbsd/allcm
+++ b/Master/bin/amd64-netbsd/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/allneeded b/Master/bin/amd64-netbsd/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/amd64-netbsd/allneeded
+++ b/Master/bin/amd64-netbsd/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/allcm b/Master/bin/armhf-linux/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/armhf-linux/allcm
+++ b/Master/bin/armhf-linux/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/allneeded b/Master/bin/armhf-linux/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/armhf-linux/allneeded
+++ b/Master/bin/armhf-linux/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/allcm b/Master/bin/i386-cygwin/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/i386-cygwin/allcm
+++ b/Master/bin/i386-cygwin/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/allneeded b/Master/bin/i386-cygwin/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/i386-cygwin/allneeded
+++ b/Master/bin/i386-cygwin/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/allcm b/Master/bin/i386-freebsd/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/i386-freebsd/allcm
+++ b/Master/bin/i386-freebsd/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/allneeded b/Master/bin/i386-freebsd/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/i386-freebsd/allneeded
+++ b/Master/bin/i386-freebsd/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/i386-linux/allcm b/Master/bin/i386-linux/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/i386-linux/allcm
+++ b/Master/bin/i386-linux/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/i386-linux/allneeded b/Master/bin/i386-linux/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/i386-linux/allneeded
+++ b/Master/bin/i386-linux/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/allcm b/Master/bin/i386-netbsd/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/i386-netbsd/allcm
+++ b/Master/bin/i386-netbsd/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/allneeded b/Master/bin/i386-netbsd/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/i386-netbsd/allneeded
+++ b/Master/bin/i386-netbsd/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/allcm b/Master/bin/i386-solaris/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/i386-solaris/allcm
+++ b/Master/bin/i386-solaris/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/allneeded b/Master/bin/i386-solaris/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/i386-solaris/allneeded
+++ b/Master/bin/i386-solaris/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/allcm b/Master/bin/x86_64-cygwin/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-cygwin/allcm
+++ b/Master/bin/x86_64-cygwin/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/allneeded b/Master/bin/x86_64-cygwin/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-cygwin/allneeded
+++ b/Master/bin/x86_64-cygwin/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/allcm b/Master/bin/x86_64-darwin/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-darwin/allcm
+++ b/Master/bin/x86_64-darwin/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/allneeded b/Master/bin/x86_64-darwin/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-darwin/allneeded
+++ b/Master/bin/x86_64-darwin/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/allcm b/Master/bin/x86_64-darwinlegacy/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-darwinlegacy/allcm
+++ b/Master/bin/x86_64-darwinlegacy/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/allneeded b/Master/bin/x86_64-darwinlegacy/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-darwinlegacy/allneeded
+++ b/Master/bin/x86_64-darwinlegacy/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/allcm b/Master/bin/x86_64-linux/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-linux/allcm
+++ b/Master/bin/x86_64-linux/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/allneeded b/Master/bin/x86_64-linux/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-linux/allneeded
+++ b/Master/bin/x86_64-linux/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/allcm b/Master/bin/x86_64-linuxmusl/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-linuxmusl/allcm
+++ b/Master/bin/x86_64-linuxmusl/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/allneeded b/Master/bin/x86_64-linuxmusl/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-linuxmusl/allneeded
+++ b/Master/bin/x86_64-linuxmusl/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/allcm b/Master/bin/x86_64-solaris/allcm
index b035cb3a997..4ab2927df5c 120000
--- a/Master/bin/x86_64-solaris/allcm
+++ b/Master/bin/x86_64-solaris/allcm
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allcm.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allcm.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/allneeded b/Master/bin/x86_64-solaris/allneeded
index b77c69203d8..afd738370f5 120000
--- a/Master/bin/x86_64-solaris/allneeded
+++ b/Master/bin/x86_64-solaris/allneeded
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/allneeded.sh
\ No newline at end of file
+../../texmf-dist/scripts/texlive-extra/allneeded.sh
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/texlive-extra/README b/Master/texmf-dist/scripts/texlive-extra/README
new file mode 100644
index 00000000000..53854c6f407
--- /dev/null
+++ b/Master/texmf-dist/scripts/texlive-extra/README
@@ -0,0 +1,18 @@
+$Id$
+Master/texmf-dist/scripts/texlive-extra
+(This file is public domain.)
+
+This directory contains scripts maintained as part of TeX Live. Unlike
+everything else under Master/texmf-dist/scripts, except scripts/texlive,
+these scripts are actually maintained here, and not under Build.
+
+These scripts are not important for the infrastructure or installation
+of TeX Live. They just happen to be maintained by us; many were
+inherited from teTeX.
+
+See texmf-dist/scripts/texlive/README (i.e., ../texlive/README) for more
+info.
+
+The principal mailing list is http://lists.tug.org/tex-live.
+
+All of these scripts are free software, mostly public domain.
diff --git a/Master/texmf-dist/scripts/texlive/allcm.sh b/Master/texmf-dist/scripts/texlive-extra/allcm.sh
index 945c7c88457..945c7c88457 100755
--- a/Master/texmf-dist/scripts/texlive/allcm.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/allcm.sh
diff --git a/Master/texmf-dist/scripts/texlive/allneeded.sh b/Master/texmf-dist/scripts/texlive-extra/allneeded.sh
index 15c62c84adb..15c62c84adb 100755
--- a/Master/texmf-dist/scripts/texlive/allneeded.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/allneeded.sh
diff --git a/Master/texmf-dist/scripts/texlive/README b/Master/texmf-dist/scripts/texlive/README
index cee1d0fe37f..3076f63941e 100644
--- a/Master/texmf-dist/scripts/texlive/README
+++ b/Master/texmf-dist/scripts/texlive/README
@@ -3,25 +3,27 @@ Master/texmf-dist/scripts/texlive
 (This file is public domain.)
 
 This directory contains scripts for TeX Live. Unlike everything else
-under Master/texmf-dist/scripts (and most of the rest of Master), most
-of these scripts are actually maintained here, and not under Build.
+under Master/texmf-dist/scripts, except scripts/texlive-extra, most of
+these scripts are actually maintained here, and not under Build.
 
 There are slave copies of these Master-maintained scripts in
 Build/source/texk/texlive/linked_scripts, just as for the multitude of
 scripts updated from CTAN.
 
-(Perhaps at some point we will move things around to make this true for
-all the scripts here, instead of just most. The remainder now are in
-Build/source/texk/texlive/tl_scripts.)
+The man pages for the programs here, though, are still maintained in
+Build/, since that is almost 100% true in TL, and it seems better not to
+break that.
 
-One reason for doing this is so we can have $Id$ expansion, so
+Additional scripts maintained as part of TeX Live, but not important for
+infrastructure or installation, are in ../texlive-extra.
+
+One reason for doing this is so we can have $Id expansion, so
 svn:keywords is set for the scripts maintained here. When they were
 maintained in Build, the --version option and doc of the copies in bin/
-would become a literal "$Id$", because svn->git mirror process does not
-preserve $Id$ strings. (Note from Karl: Although many people and
-processes hate keyword expansion, I'm afraid that I find it quite
-useful, so I don't want to give it up as long as I am working here. Feel
-free to change it when I'm gone. :)
+svn->git mirror process does not preserve $Id strings. (Note from Karl:
+Although many people and processes hate keyword expansion, I'm afraid
+that I find it quite useful, so I don't want to give it up as long as I
+am working here. Feel free to change it after I'm gone. :)
 
 Another reason is that almost all scripts in the bin/*/ directories are
 now symlinks into texmf-dist/scripts/, so it's nice for these to follow
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 346b0c498a2..df5ff071c18 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -87,6 +87,7 @@ depend texdirflatten
 depend texdoc
 depend texdoctk
 depend texfot
+depend texlive-extra
 depend texliveonfly
 depend texloganalyser
 depend texosquery
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
index a0a7c7ea4b4..beb946933db 100644
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tetex.tlpsrc
@@ -20,8 +20,6 @@ runpattern f texmf-dist/texconfig/g/*
 runpattern f texmf-dist/texconfig/v/*
 runpattern f texmf-dist/texconfig/x/*
 #
-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/e2pall.pl
@@ -39,9 +37,6 @@ runpattern f texmf-dist/scripts/texlive/updmap-sys.sh
 runpattern f texmf-dist/scripts/texlive/updmap-user.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.*
-docpattern f texmf-dist/doc/man/man1/allneeded.*
 docpattern f texmf-dist/doc/man/man1/dvi2fax.*
 docpattern f texmf-dist/doc/man/man1/dvired.*
 docpattern f texmf-dist/doc/man/man1/e2pall.*
@@ -57,9 +52,6 @@ docpattern f texmf-dist/doc/man/man5/fmtutil.cnf.*
 docpattern f texmf-dist/doc/man/man5/updmap.*
 docpattern d texmf-dist/doc/tetex
 
-binpattern f bin/${ARCH}/allcm
-binpattern f bin/${ARCH}/allec
-binpattern f bin/${ARCH}/allneeded
 binpattern f bin/${ARCH}/dvi2fax
 binpattern f bin/${ARCH}/dvired
 binpattern f bin/${ARCH}/e2pall
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
new file mode 100644
index 00000000000..02b32903b53
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
@@ -0,0 +1,19 @@
+category TLCore
+shortdesc TeX Live scripts
+longdesc Miscellaneous scripts maintained as part of TeX Live, but
+longdesc not important for the infrastructure. Thus, this is not part of
+longdesc scheme-infraonly or tlcritical, just a normal package.
+
+docpattern f texmf-dist/scripts/texlive-extra/README
+
+runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
+docpattern f texmf-dist/doc/man/man1/allcm.*
+binpattern f bin/${ARCH}/allcm
+#
+# symlink to allcm.sh.
+docpattern f texmf-dist/doc/man/man1/allec.*
+binpattern f bin/${ARCH}/allec
+#
+runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
+docpattern f texmf-dist/doc/man/man1/allneeded.*
+binpattern f bin/${ARCH}/allneeded
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 4c1411c1610..648de8ebdef 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -5,6 +5,8 @@ longdesc tlmgr to run but still ours.  Not included in tlcritical.
 #
 depend texlive.infra
 #
+docpattern f texmf-dist/scripts/texlive/README
+#
 runpattern f texmf-dist/scripts/texlive/mktexmf
 runpattern f texmf-dist/scripts/texlive/mktexpk
 runpattern f texmf-dist/scripts/texlive/mktextfm