summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-26 23:58:37 +0000
committerKarl Berry <karl@freefriends.org>2020-01-26 23:58:37 +0000
commitcb1f34f8bcabffe0473d760bf9dd3343f8db537c (patch)
treee5ab8f61ef2d5f8a2e641e760b21e3edd118cc05 /Master/tlpkg
parent767a4e654de5f47d7bb5c671f0df58918cc6347b (diff)
tetex.tlpsrc: remove.
scheme-infraonly.tlpsrc, collection-basic.tlpsrc: no more tetex. texlive.infra.tlpsrc: move fmtutil-hdr.cnf and updmap-hdr.cfg to texlive-scripts, where the scripts are. texmf-dist/doc/tetex: also remove, too old. texmf-dist/scripts/texlive-extra: add remaining auxiliary scripts from tl_scripts, from tetex days. <many>.sh, e2pall.pl: move there (from Build/../tlscripts/). texlive-extra.tlpsrc: new package. collection-binextra.tlpsrc: add texlive-extra here. bin/*/all*: adjust symlinks. Build/.../texlive/linked_scripts/texlive-extra: add new scripts. Adjust Makefile.am, including creating mktexfmt symlink. Build/.../texlive/tl_scripts: remove all scripts from here, leaving only man pages. tl-check-wrapper-consistency: no more scripts in tl_scripts (will rename directory later). git-svn-id: svn://tug.org/texlive/trunk@53554 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-check-wrapper-consistency3
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tetex.tlpsrc71
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc73
-rw-r--r--Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc33
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc3
7 files changed, 98 insertions, 87 deletions
diff --git a/Master/tlpkg/bin/tl-check-wrapper-consistency b/Master/tlpkg/bin/tl-check-wrapper-consistency
index 9ebdcbcc1ae..59e6cb0b3f4 100755
--- a/Master/tlpkg/bin/tl-check-wrapper-consistency
+++ b/Master/tlpkg/bin/tl-check-wrapper-consistency
@@ -122,15 +122,12 @@ sub list_shell_scripts {
# has to be the Work/ directory to get the Makefile, not Makefile.{in,am}.
my $Work = "$Master/../Build/source/Work";
my $Work_linked_scripts = "$Work/texk/texlive/linked_scripts";
- my $Work_tl_scripts = "$Work/texk/texlive/tl_scripts";
-d "$Work_linked_scripts"||die "no linked_scripts dir: $Work_linked_scripts";
- -d "$Work_tl_scripts" || die "no tl_scripts dir: $Work_tl_scripts";
# use make; ensure we get only the last line, although that should be
# all there is.
my $lst = `make -s -C $Work_linked_scripts echo-shell-scripts | tail -1`;
- $lst .= `make -s -C $Work_tl_scripts echo-shell-scripts | tail -1`;
for my $script (split (" ", $lst)) {
$script =~ s,^.*/,,;
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 589173ac5c6..d53cf762ec3 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -36,7 +36,6 @@ depend mflogo
depend mfware
depend pdftex
depend plain
-depend tetex
depend tex
depend tex-ini-files
depend texlive-common
diff --git a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
index 65af78fc8c4..03199ff4f9c 100644
--- a/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-infraonly.tlpsrc
@@ -7,4 +7,3 @@ longdesc separately afterwards, with tlmgr install.
depend texlive.infra
depend kpathsea
depend hyphen-base
-depend tetex
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
deleted file mode 100644
index beb946933db..00000000000
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ /dev/null
@@ -1,71 +0,0 @@
-category TLCore
-shortdesc scripts and files originally from teTeX
-longdesc Includes both core utilities such as fmtutil and updmap, and
-longdesc rarely-used programs such as allec and dvi2fax. Some
-longdesc functionality is now better provided by tlmgr, such as
-longdesc texconfig and texlinks, but everything here is still supported.
-
-# This is in tetex because this two-entry map file was written by te and
-# is maintained in the tetex directory.
-execute addMap mathpple.map
-
-runpattern f texmf-dist/dvips/tetex/*
-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/texconfig/*
-runpattern f texmf-dist/texconfig/g/*
-runpattern f texmf-dist/texconfig/v/*
-runpattern f texmf-dist/texconfig/x/*
-#
-runpattern f texmf-dist/scripts/texlive/dvi2fax.sh
-runpattern f texmf-dist/scripts/texlive/dvired.sh
-runpattern f texmf-dist/scripts/texlive/e2pall.pl
-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/kpsetool.sh
-runpattern f texmf-dist/scripts/texlive/kpsewhere.sh
-runpattern f texmf-dist/scripts/texlive/mktexlsr.pl
-runpattern f texmf-dist/scripts/texlive/texconfig.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-user.sh
-runpattern f texmf-dist/scripts/texlive/updmap.pl
-
-docpattern f texmf-dist/doc/man/man1/dvi2fax.*
-docpattern f texmf-dist/doc/man/man1/dvired.*
-docpattern f texmf-dist/doc/man/man1/e2pall.*
-docpattern f texmf-dist/doc/man/man1/fmtutil*
-docpattern f texmf-dist/doc/man/man1/kpsepath.*
-docpattern f texmf-dist/doc/man/man1/kpsetool.*
-docpattern f texmf-dist/doc/man/man1/kpsewhere.*
-docpattern f texmf-dist/doc/man/man1/kpsexpand.*
-docpattern f texmf-dist/doc/man/man1/texconfig*
-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 d texmf-dist/doc/tetex
-
-binpattern f bin/${ARCH}/dvi2fax
-binpattern f bin/${ARCH}/dvired
-binpattern f bin/${ARCH}/e2pall
-binpattern f bin/${ARCH}/fmtutil
-binpattern f bin/${ARCH}/fmtutil-sys
-binpattern f bin/${ARCH}/fmtutil-user
-binpattern f bin/${ARCH}/kpsepath
-binpattern f bin/${ARCH}/kpsetool
-binpattern f bin/${ARCH}/kpsewhere
-binpattern f bin/${ARCH}/kpsexpand
-binpattern f bin/${ARCH}/texconfig
-binpattern f bin/${ARCH}/texconfig-dialog
-binpattern f bin/${ARCH}/texconfig-sys
-binpattern f bin/${ARCH}/texlinks
-binpattern f bin/${ARCH}/updmap
-binpattern f bin/${ARCH}/updmap-sys
-binpattern f bin/${ARCH}/updmap-user
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
index 02b32903b53..52167790bf6 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts-extra.tlpsrc
@@ -6,14 +6,75 @@ 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.*
+# symlinks to kpsetool.sh.
+docpattern f texmf-dist/doc/man/man1/kpsexpand.*
+binpattern f bin/${ARCH}/kpsexpand
+#
+docpattern f texmf-dist/doc/man/man1/kpsepath.*
+binpattern f bin/${ARCH}/kpsepath
+
+# texconfig support files.
+runpattern f texmf-dist/texconfig/*
+runpattern f texmf-dist/texconfig/g/*
+runpattern f texmf-dist/texconfig/v/*
+runpattern f texmf-dist/texconfig/x/*
+
+binpattern f bin/${ARCH}/allcm
+binpattern f bin/${ARCH}/allcm
binpattern f bin/${ARCH}/allneeded
+binpattern f bin/${ARCH}/allneeded
+binpattern f bin/${ARCH}/dvi2fax
+binpattern f bin/${ARCH}/dvired
+binpattern f bin/${ARCH}/e2pall
+binpattern f bin/${ARCH}/fontinst
+binpattern f bin/${ARCH}/kpsetool
+binpattern f bin/${ARCH}/kpsewhere
+binpattern f bin/${ARCH}/ps2frag
+binpattern f bin/${ARCH}/pslatex
+binpattern f bin/${ARCH}/rubibtex
+binpattern f bin/${ARCH}/rumakeindex
+binpattern f bin/${ARCH}/texconfig
+binpattern f bin/${ARCH}/texconfig-dialog
+binpattern f bin/${ARCH}/texconfig-sys
+binpattern f bin/${ARCH}/texlinks
+
+docpattern f texmf-dist/doc/man/man1/allcm.*
+docpattern f texmf-dist/doc/man/man1/allcm.*
+docpattern f texmf-dist/doc/man/man1/allneeded.*
+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.*
+docpattern f texmf-dist/doc/man/man1/fontinst.*
+docpattern f texmf-dist/doc/man/man1/kpsetool.*
+docpattern f texmf-dist/doc/man/man1/kpsewhere.*
+docpattern f texmf-dist/doc/man/man1/ps2frag.*
+docpattern f texmf-dist/doc/man/man1/pslatex.*
+docpattern f texmf-dist/doc/man/man1/rubibtex.*
+docpattern f texmf-dist/doc/man/man1/rumakeindex.*
+docpattern f texmf-dist/doc/man/man1/texconfig-sys.*
+docpattern f texmf-dist/doc/man/man1/texconfig.*
+docpattern f texmf-dist/doc/man/man1/texlinks.*
+
+runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
+runpattern f texmf-dist/scripts/texlive-extra/allcm.sh
+runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
+runpattern f texmf-dist/scripts/texlive-extra/allneeded.sh
+runpattern f texmf-dist/scripts/texlive-extra/dvi2fax.sh
+runpattern f texmf-dist/scripts/texlive-extra/dvired.sh
+runpattern f texmf-dist/scripts/texlive-extra/e2pall.pl
+runpattern f texmf-dist/scripts/texlive-extra/fontinst.sh
+runpattern f texmf-dist/scripts/texlive-extra/kpsetool.sh
+runpattern f texmf-dist/scripts/texlive-extra/kpsewhere.sh
+runpattern f texmf-dist/scripts/texlive-extra/ps2frag.sh
+runpattern f texmf-dist/scripts/texlive-extra/pslatex.sh
+runpattern f texmf-dist/scripts/texlive-extra/rubibtex.sh
+runpattern f texmf-dist/scripts/texlive-extra/rumakeindex.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+runpattern f texmf-dist/scripts/texlive-extra/texconfig.sh
+runpattern f texmf-dist/scripts/texlive-extra/texlinks.sh
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 648de8ebdef..00190d6847a 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -6,25 +6,54 @@ longdesc tlmgr to run but still ours. Not included in tlcritical.
depend texlive.infra
#
docpattern f texmf-dist/scripts/texlive/README
-#
+
+# updmap support files.
+runpattern f texmf-dist/dvips/tetex/*
+runpattern f texmf-dist/fonts/enc/dvips/tetex/*
+runpattern f texmf-dist/fonts/map/dvips/tetex/*
+runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
+runpattern f texmf-dist/web2c/updmap.cfg
+runpattern f texmf-dist/web2c/updmap-hdr.cfg
+# This two-entry map file was written by te and is maintained in the
+# tetex directory.
+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.pl
runpattern f texmf-dist/scripts/texlive/mktexmf
runpattern f texmf-dist/scripts/texlive/mktexpk
runpattern f texmf-dist/scripts/texlive/mktextfm
runpattern f texmf-dist/scripts/texlive/rungs.tlu
+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
#
# scripts that symlink to the above:
+binpattern f bin/${ARCH}/fmtutil
+binpattern f bin/${ARCH}/fmtutil-sys
+binpattern f bin/${ARCH}/fmtutil-user
binpattern f bin/${ARCH}/mktexmf
binpattern f bin/${ARCH}/mktexpk
binpattern f bin/${ARCH}/mktextfm
-# links:
+binpattern f bin/${ARCH}/updmap
+binpattern f bin/${ARCH}/updmap-sys
+binpattern f bin/${ARCH}/updmap-user
+#
+# further links within bin:
binpattern f bin/${ARCH}/mktexfmt
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/mktexmf.*
docpattern f texmf-dist/doc/man/man1/mktexpk.*
docpattern f texmf-dist/doc/man/man1/mktextfm.*
docpattern f texmf-dist/doc/man/man1/texhash.*
+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.*
#
binpattern f bin/${ARCH}/rungs
binpattern f bin/${ARCH}/man
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 3949a52c4e2..3b1d12b5601 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -24,13 +24,10 @@ 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/tlmgr.pl
runpattern f texmf-dist/scripts/texlive/tlmgrgui.pl
runpattern f texmf-dist/scripts/texlive/uninstall-win32.pl
runpattern f texmf-dist/scripts/texlive/uninstq.vbs
runpattern f texmf-dist/scripts/texlive/tl-errmess.vbs
-runpattern f texmf-dist/web2c/fmtutil-hdr.cnf
-runpattern f texmf-dist/web2c/updmap-hdr.cfg
#
runpattern f tlpkg/installer/config.guess
runpattern d tlpkg/TeXLive