From c21905663dd361ff3eb6cde85cbcde0d23dd5476 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Dec 2019 23:16:06 +0000 Subject: remove mktex*.opt from kpathsea, now maintained only in Master/texmf-dist/web2c git-svn-id: svn://tug.org/texlive/trunk@53234 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 8 +++ Build/source/texk/kpathsea/Makefile.am | 2 - Build/source/texk/kpathsea/Makefile.in | 67 ++++++------------ Build/source/texk/kpathsea/mktex.opt | 121 -------------------------------- Build/source/texk/kpathsea/mktexdir.opt | 11 --- Build/source/texk/kpathsea/mktexnam.opt | 107 ---------------------------- 6 files changed, 29 insertions(+), 287 deletions(-) delete mode 100644 Build/source/texk/kpathsea/mktex.opt delete mode 100644 Build/source/texk/kpathsea/mktexdir.opt delete mode 100644 Build/source/texk/kpathsea/mktexnam.opt diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 81c85b1c87f..5f989b3065e 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,11 @@ +2019-12-26 Karl Berry + + * mktex.opt, + * mktexdir.opt, + * mktexnam.opt: remove; these will now be maintained + (if changes are needed) only in Master/texmf-dist/web2c. + * Makefile.am (dist_web2c_DATA): remove. + 2019-12-22 Karl Berry * doc/kpathsea.texi (Path searching): mention translations for TL. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 56cec6af422..c19fd222ccf 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -253,8 +253,6 @@ web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd -dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt - dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm dist_noinst_DATA = texmf.cnf diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 6f62d6f9acf..77d6c121b0b 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -134,7 +134,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(dist_noinst_SCRIPTS) \ - $(dist_web2c_SCRIPTS) $(dist_noinst_DATA) $(dist_web2c_DATA) \ + $(dist_web2c_SCRIPTS) $(dist_noinst_DATA) \ $(kpseinclude_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno @@ -143,9 +143,8 @@ CONFIG_HEADER = c-auto.h CONFIG_CLEAN_FILES = kpathsea.pc CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \ - "$(DESTDIR)$(kpseincludedir)" + "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -367,7 +366,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA) +DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -860,7 +859,6 @@ progname_test_LDADD = libkpathsea.la xdirtest_LDADD = libkpathsea.la web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd -dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm dist_noinst_DATA = texmf.cnf bin_links = mktexlsr:texhash @@ -1608,27 +1606,6 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt -install-dist_web2cDATA: $(dist_web2c_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_web2c_DATA)'; test -n "$(web2cdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(web2cdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(web2cdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(web2cdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(web2cdir)" || exit $$?; \ - done - -uninstall-dist_web2cDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_web2c_DATA)'; test -n "$(web2cdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(web2cdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ @@ -2156,7 +2133,7 @@ install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -2284,9 +2261,9 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_web2cDATA \ - install-dist_web2cSCRIPTS install-kpseincludeHEADERS \ - install-nodist_kpseincludeHEADERS install-pkgconfigDATA +install-data-am: install-data-local install-dist_web2cSCRIPTS \ + install-kpseincludeHEADERS install-nodist_kpseincludeHEADERS \ + install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -2400,10 +2377,10 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ - uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \ - uninstall-libLTLIBRARIES uninstall-local \ - uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA +uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cSCRIPTS \ + uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-local uninstall-nodist_kpseincludeHEADERS \ + uninstall-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check check-am install install-am \ @@ -2419,23 +2396,21 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-data-local install-dist_web2cDATA \ - install-dist_web2cSCRIPTS install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook \ - install-exec-local install-html install-html-am install-info \ - install-info-am install-kpseincludeHEADERS \ - install-libLTLIBRARIES install-man \ + install-data-am install-data-local install-dist_web2cSCRIPTS \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-exec-hook install-exec-local install-html \ + install-html-am install-info install-info-am \ + install-kpseincludeHEADERS install-libLTLIBRARIES install-man \ install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \ install-pkgconfigDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cDATA \ - uninstall-dist_web2cSCRIPTS uninstall-hook \ - uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \ - uninstall-local uninstall-nodist_kpseincludeHEADERS \ - uninstall-pkgconfigDATA + uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cSCRIPTS \ + uninstall-hook uninstall-kpseincludeHEADERS \ + uninstall-libLTLIBRARIES uninstall-local \ + uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA .PRECIOUS: Makefile diff --git a/Build/source/texk/kpathsea/mktex.opt b/Build/source/texk/kpathsea/mktex.opt deleted file mode 100644 index 9b123c77691..00000000000 --- a/Build/source/texk/kpathsea/mktex.opt +++ /dev/null @@ -1,121 +0,0 @@ -# mktex.opt -- common mktex* options, etc. -# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set, -# and optionally mt_min_args and/or mt_max_args. -# -# Originally written by Thomas Esser. Public domain. -# $Id$ - -if test "x$1" = x--help || test "x$1" = x-help; then - echo "$usage" - exit 0 -elif test "x$1" = x--version || test "x$1" = x-version; then - echo "$0 $version" - kpsewhich --version - exit 0 -elif test $# -lt ${mt_min_args-1}; then - echo "$0: Missing argument(s)." >&2 - echo "Try \``basename $0` --help' for more information." >&2 - exit 1 -elif test $# -gt ${mt_max_args-1}; then - num=$# - while test $# -gt `expr $num - ${mt_max_args-1}`; do shift; done - echo "$0: Extra arguments $*." >&2 - echo "Try \``basename $0` --help' for more information." >&2 - exit 1 -fi - -# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate -# directories in path lists whereas Unix uses `:'. Make an exception for -# Cygwin, which pretends to be UNIX. -# Create a variable that holds the right character to be used by the scripts. -DOSISH=no -case `uname -s` in - CYGWIN*|Cygwin*|cygwin*) ;; - *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi -esac -if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi - -# TEMPDIR needs to be unique to each process because of the possibility of two -# people running dvips (or whatever) simultaneously. -if test -n "$TMPDIR"; then - TEMPDIR="${TMPDIR}/mt$$.tmp" -else - TEMPDIR="/tmp/mt$$.tmp" -fi - -# We want to output only filenames to standard output, but it's too -# error-prone to write the scripts that way, so we direct stdout here. -STDOUT="$TEMPDIR/mt$$.out" - -# We will change search paths to include $KPSE_DOT. This is necessary -# since we cd to $TEMPDIR. -: ${KPSE_DOT=`pwd`}; export KPSE_DOT - -# Clean up on normal or abnormal exit. -# The "cd /" is for MS-DOS and MS-Windows, where there is a separate -# current directory on each drive, and therefore "cd $KPSE_DOT" might -# still leave $TMPDIR current directory on its drive, in which case it -# cannot be removed. -trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \ - 0 1 2 3 7 13 15 - -(umask 077 && mkdir "$TEMPDIR") || exit 1 -cd "$TEMPDIR" || exit 1 - -# The alternative location for fonts. The directory need not exist, -# so we use --expand-var here. We also perform a sanity check. -: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} -if test -z "$MT_VARTEXFONTS"; then - echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2 - MT_VARTEXFONTS='$KPSE_DOT' -fi - -# The supporting scripts: -: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} -test -n "$MT_MKTEXNAM" || MT_MKTEXNAM="$MT_TEXMFMAIN/web2c/mktexnam" -: ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`} -test -n "$MT_MKTEXNAM_OPT" || MT_MKTEXNAM_OPT="$MT_TEXMFMAIN/web2c/mktexnam.opt" -: ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`} -test -n "$MT_MKTEXDIR" || MT_MKTEXDIR="$MT_TEXMFMAIN/web2c/mktexdir" -: ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`} -test -n "$MT_MKTEXDIR_OPT" || MT_MKTEXDIR_OPT="$MT_TEXMFMAIN/web2c/mktexdir.opt" -: ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`} -test -n "$MT_MKTEXUPD" || MT_MKTEXUPD="$MT_TEXMFMAIN/web2c/mktexupd" - -# mktexupd and mktexlsr make sure they're coordinated via this. A copy of -# the first string is found in mktexlsr. -ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.' -# Old ls-R files should continue to work. -old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.' - -# Read defaults from mktex.cnf if that file exists. Can be used to -# overwrite anything defined below. Please use the same syntax as -# given here (e.g. ``: ${MODE=ljfour}'', not just ``MODE=ljfour'', as -# this can cause trouble (e.g. when the mode for mktexnam is -# already specified on the command line). -: ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} -test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF" - -# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode -# stripsupplier striptypeface texmfvar varfonts. -if test "$DOSISH" = "yes"; then - : ${MT_FEATURES=appendonlydir:dosnames} -else - : ${MT_FEATURES=appendonlydir} -fi -: ${MODE=ljfour} -: ${BDPI=600} -: ${DPI=600} -: ${MAG=1.0} -: ${ps_to_pk=gsftopk} # some prefer ps2pk - -# Allow fonts to be read and written (especially in case we make -# directories) by everyone. -umask 0 - -# Cache values that may be useful for recursive calls. -export MT_MKTEX_OPT MT_MKTEX_CNF -export MT_MKTEXNAM MT_MKTEXNAM_OPT -export MT_MKTEXDIR MT_MKTEXDIR_OPT -export MT_MKTEXUPD -export MT_TEXMFMAIN MT_VARTEXFONTS diff --git a/Build/source/texk/kpathsea/mktexdir.opt b/Build/source/texk/kpathsea/mktexdir.opt deleted file mode 100644 index 1420faa62d6..00000000000 --- a/Build/source/texk/kpathsea/mktexdir.opt +++ /dev/null @@ -1,11 +0,0 @@ -# mktexdir.opt to determine various manipulations of the filenames. -# Sourced from mktexdir. -# -# Originally written by Thomas Esser. -# Public domain. -# $Id$ - -# Set append-only bit on created directories. -case "$MT_FEATURES" in - *appendonlydir*) MT_APPEND_MASK=+t;; -esac diff --git a/Build/source/texk/kpathsea/mktexnam.opt b/Build/source/texk/kpathsea/mktexnam.opt deleted file mode 100644 index 32d98dfe5b7..00000000000 --- a/Build/source/texk/kpathsea/mktexnam.opt +++ /dev/null @@ -1,107 +0,0 @@ -# mktexnam.opt to determine various manipulations of the filenames. -# Sourced from mktexnam. -# -# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber. -# Public domain. -# $Id$ - -# Get 8.3 filenames like dpiNNN/NAME.pk. -case "$MT_FEATURES" in - *dosnames*) MT_PKBASE='dpi$DPI/$NAME.pk';; -esac - -# Omit the mode directory (e.g., ljfour): -case "$MT_FEATURES" in - *nomode*) MODE="";; -esac - -########################################################################### -# Use this feature if you wish to use the alias files from the -# ftp://ftp.tug.org/tex/fontname.tar.gz distribution. -########################################################################### -case "$MT_FEATURES" in -*fontmaps*) - MT_NAMEPART='$MT_SUPPLIER/$MT_TYPEFACE' - MT_PKDESTREL='pk/$MT_MODE/$MT_NAMEPART' - MT_TFMDESTREL='tfm/$MT_NAMEPART' - MT_MFDESTREL='source/$MT_NAMEPART' - SPECIALMAP=`kpsewhich special.map` - TYPEFACEMAP=`kpsewhich typeface.map` - SUPPLIERMAP=`kpsewhich supplier.map` - if test -r "$SPECIALMAP"; then - set x `awk \ - '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \ - && substr (NAME, length (NAME), 1) ~ /[0-9]/ \ - && substr ($1, length ($1), 1) ~ /[^0-9]/)) \ - { print $2 " " $3; exit; }}' NAME=$NAME "$SPECIALMAP"` - shift; SUPPLIER=$1; TYPEFACE=$2 - - if test -z "$SUPPLIER"; then - # Try the normal case. Source first. - # $NAME might be raw. - name=`echo $NAME | sed 's/^r//'` - s_abbrev=`echo $name | sed 's/^\(.\).*$/\1/'` - SUPPLIER=`awk '{ if ($1 == s_abbrev) { print $2; exit; }}' \ - s_abbrev=$s_abbrev "$SUPPLIERMAP"` - if test -n "$SUPPLIER"; then - # We found the source. Try for the typeface. - t_abbrev=`echo $name | sed 's/^.//;s/\(..\).*$/\1/'` - TYPEFACE=`awk '{ if ($1 == t_abbrev) { print $2; exit; }}' \ - t_abbrev=$t_abbrev "$TYPEFACEMAP"` - fi - fi - fi - - if test -z "$SUPPLIER"; then - echo "$0: Could not map source abbreviation $s_abbrev for $NAME." >&2 - echo "$0: Need to update $SPECIALMAP?" >&2 - else - MT_SUPPLIER="$SUPPLIER" - if test -z "$TYPEFACE"; then - echo "$0: Could not map typeface abbreviation $t_abbrev for $NAME." >&2 - echo "$0: Need to update $SPECIALMAP?" >&2 - else - MT_TYPEFACE="$TYPEFACE" - fi - fi -esac - -########################################################################### -# Use this feature to strip the "supplier" part (e.g. ams) -# of the target name: -########################################################################### - -case "$MT_FEATURES" in -*stripsupplier*) - MT_SUPPLIER="" -esac - -########################################################################### -# Use this feature to strip the "typeface" part (e.g. euler) -# of the target name: -########################################################################### - -case "$MT_FEATURES" in -*striptypeface*) - MT_TYPEFACE="" -esac - -# Put new fonts into the directory named by the VARTEXFONTS environment -# variable or config file value. (A default value for VARTEXFONTS is -# already set in the default texmf.cnf, q.v.) -# -# A user can override this setting in either direction by setting -# USE_VARTEXFONTS to 1 or 0. -case "$MT_FEATURES" in - *varfonts*) test "$USE_VARTEXFONTS" != 0 && USE_VARTEXFONTS=1;; -esac - -# Force generated files that would go into a system tree (as defined by -# SYSTEXMF) into TEXMFVAR. Starting with teTeX-3.0, the variable TEXMFVAR -# is always set. The varfonts feature takes precedence if also set. -# -# A user can override this setting in either direction by setting -# USE_TEXMFVAR to 1 or 0. -case "$MT_FEATURES" in - *texmfvar*) test "$USE_TEXMFVAR" != 0 && USE_TEXMFVAR=1;; -esac -- cgit v1.2.3