diff options
Diffstat (limited to 'print/tex-texlive-scripts-extra/patches')
8 files changed, 595 insertions, 0 deletions
diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_e2pall b/print/tex-texlive-scripts-extra/patches/patch-bin_e2pall new file mode 100644 index 00000000000..1c66b1f20ce --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_e2pall @@ -0,0 +1,15 @@ +$NetBSD: patch-bin_e2pall,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/e2pall.orig 2008-03-03 18:51:04.000000000 +0000 ++++ bin/e2pall +@@ -27,7 +27,7 @@ + + # EDIT these two lines for your system.... + +-$Eps2PdfCom = "epstopdf"; ++$Eps2PdfCom = "@EPSTOPDF@"; + $ThisFunCom = "e2pall"; + + $fname=$ARGV[0]; diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_kpsetool b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsetool new file mode 100644 index 00000000000..7ba6cd48497 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsetool @@ -0,0 +1,20 @@ +$NetBSD: patch-bin_kpsetool,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/kpsetool.orig 2012-10-09 17:39:16.000000000 +0000 ++++ bin/kpsetool +@@ -109,10 +109,10 @@ esac + case "$action" in + kpsewhich) + test $# = 1 || { echo "$progname: missing filename"; echo "$usage"; exit 1; } +- kpsewhich $flags -format="$format" "$1";; ++ @KPSEWHICH@ $flags -format="$format" "$1";; + kpsepath) +- kpsewhich $flags -show-path="$format";; ++ @KPSEWHICH@ $flags -show-path="$format";; + kpsexpand) + test $# = 1 || { echo "$progname: missing string"; echo "$usage"; exit 1; } +- kpsewhich $flags -expand-var="$1";; ++ @KPSEWHICH@ $flags -expand-var="$1";; + esac diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_kpsewhere b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsewhere new file mode 100644 index 00000000000..951d19dc3a6 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsewhere @@ -0,0 +1,18 @@ +$NetBSD: patch-bin_kpsewhere,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/kpsewhere.orig 2012-10-09 17:39:16.000000000 +0000 ++++ bin/kpsewhere +@@ -55,9 +55,9 @@ esac + IFS=':' + for file + do +- for path in `kpsewhich --expand-path='$TEXMF'` ++ for path in `@KPSEWHICH@ --expand-path='$TEXMF'` + do +- eval TEXMF=\$path kpsewhich $options \"\$file\" ++ eval TEXMF=\$path @KPSEWHICH@ $options \"\$file\" + done + done + exit 0 diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig new file mode 100644 index 00000000000..2426bdfd5bc --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig @@ -0,0 +1,243 @@ +$NetBSD: patch-bin_texconfig,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/texconfig.orig 2017-12-17 23:26:29.000000000 +0000 ++++ bin/texconfig +@@ -94,7 +94,7 @@ echoShowKpseVariable() + for eskv + do + var=$eskv +- val=`kpsewhich -var-value="$eskv"` ++ val=`@KPSEWHICH@ -var-value="$eskv"` + echo "$var=$val" + done + } +@@ -126,7 +126,7 @@ echoLocateCfgfile() + for elc + do + case $elc in +- texmf.cnf) elcLoc=`kpsewhich $elc`;; ++ texmf.cnf) elcLoc=`@KPSEWHICH@ $elc`;; + *) elcLoc=`tcfmgr --cmd find --file "$elc"`;; + esac + case $elcLoc in +@@ -193,7 +193,7 @@ setupTmpDir() + setupTexmfroot() + { + case $MT_TEXMFROOT in +- "") MT_TEXMFROOT=`kpsewhich -var-value=TEXMFROOT`;; ++ "") MT_TEXMFROOT=`@KPSEWHICH@ -var-value=TEXMFROOT`;; + *) return;; + esac + } +@@ -205,7 +205,7 @@ setupTexmfroot() + setupTexmfmain() + { + case $MT_TEXMFMAIN in +- "") MT_TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`;; ++ "") MT_TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`;; + *) return;; + esac + } +@@ -216,7 +216,7 @@ setupTexmfmain() + setupTexmfdist() + { + case $MT_TEXMFDIST in +- "") MT_TEXMFDIST=`kpsewhich -var-value=TEXMFDIST`;; ++ "") MT_TEXMFDIST=`@KPSEWHICH@ -var-value=TEXMFDIST`;; + *) return;; + esac + } +@@ -227,7 +227,7 @@ setupTexmfdist() + setupTexmfvar() + { + case $MT_TEXMVAR in +- "") MT_TEXMVAR=`kpsewhich -var-value=TEXMFVAR`;; ++ "") MT_TEXMVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`;; + *) return;; + esac + } +@@ -238,7 +238,7 @@ setupTexmfvar() + setupSystexmf() + { + case $MT_SYSTEXMF in +- "") MT_SYSTEXMF=`kpsewhich -var-value=SYSTEXMF`;; ++ "") MT_SYSTEXMF=`@KPSEWHICH@ -var-value=SYSTEXMF`;; + *) return;; + esac + } +@@ -493,7 +493,7 @@ listDvipsPapers() + # + getFormatsForHyphen() + { +- fmtutil --catcfg | awk '$3 != "-" {print $1}' | sort ++ @FMTUTIL@ --catcfg | awk '$3 != "-" {print $1}' | sort + } + + ############################################################################### +@@ -621,7 +621,7 @@ TeX Live home page: <http://tug.org/texl + echo + echo '============================= font map files =============================' + for m in psfonts.map pdftex.map ps2pk.map; do +- echo "$m: `kpsewhich $m`" ++ echo "$m: `@KPSEWHICH@ $m`" + done + echo + echo '=========================== kpathsea variables ===========================' +@@ -686,7 +686,7 @@ Valid PAPER settings: + *) + otherPrinter=true + otherPrinterName=$2 +- otherPrinterFile=`kpsewhich -format='dvips config' "config.$otherPrinterName"` ++ otherPrinterFile=`@KPSEWHICH@ -format='dvips config' "config.$otherPrinterName"` + case $otherPrinterFile in + "") + echo "$progname: configuration file \`config.$otherPrinterName' for printer \`$otherPrinterName' not found" >&2 +@@ -719,7 +719,7 @@ Valid PAPER settings: + ;; + *) + printerName=$2 +- pFile=`kpsewhich -format='dvips config' "config.$printerName"` ++ pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"` + case $pFile in + "") + setupTmpDir +@@ -756,7 +756,7 @@ Valid PAPER settings: + ;; + *) + printerName=$2 +- pFile=`kpsewhich -format='dvips config' "config.$printerName"` ++ pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"` + case $pFile in + "") + echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2 +@@ -937,7 +937,7 @@ For more information about these \`featu + esac + ;; + rw) +- MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS` ++ MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS` + if test -z "$MT_VARTEXFONTS"; then + echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1 + return +@@ -963,7 +963,7 @@ For more information about these \`featu + fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}" + ;; + ro) +- MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS` ++ MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS` + if test -z "$MT_VARTEXFONTS"; then + echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1 + return +@@ -1014,10 +1014,10 @@ EOM + + setupTmpDir + echo "$progname: analyzing old configuration..." >&2 +- fmtutil --catcfg > $tmpdir/pre +- fmtutil --edit ++ @FMTUTIL@ --catcfg > $tmpdir/pre ++ @FMTUTIL@ --edit + echo "$progname: analyzing new configuration..." >&2 +- fmtutil --catcfg > $tmpdir/post ++ @FMTUTIL@ --catcfg > $tmpdir/post + + if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then + echo "$progname: no new/updated formats available ..." >&2 +@@ -1025,9 +1025,9 @@ EOM + echo "$progname: updating formats ..." >&2 + comm -13 $tmpdir/pre $tmpdir/post > $tmpdir/addOrChange + for i in `awk '{print $1}' $tmpdir/addOrChange`; do +- fmtutil --byfmt "$i" || rc=1 ++ @FMTUTIL@ --byfmt "$i" || rc=1 + done +- texlinks --multiplatform || rc=1 ++ @TEXLINKS@ --multiplatform || rc=1 + fi + ;; + +@@ -1067,7 +1067,7 @@ $formatsForHyphenFmt" + *) + if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then + +- tcBatchHyphenFile=`fmtutil --showhyphen "$tcBatchHyphenFormat"` ++ tcBatchHyphenFile=`@FMTUTIL@ --showhyphen "$tcBatchHyphenFormat"` + case $tcBatchHyphenFile in + "") + echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2 +@@ -1124,7 +1124,7 @@ $formatsForHyphenFmt" + fi + ;; + esac +- fmtutil --byhyphen "$tcBatchHFOut" ++ @FMTUTIL@ --byhyphen "$tcBatchHFOut" + fi + else + echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2 +@@ -1142,9 +1142,9 @@ $formatsForHyphenFmt" + init) + case $2 in + "") +- if fmtutil --all \ +- && texlinks --multiplatform \ +- && updmap; then ++ if @FMTUTIL@ --all \ ++ && @TEXLINKS@ --multiplatform \ ++ && @UPDMAP@; then + : + else + rc=1 +@@ -1153,7 +1153,7 @@ $formatsForHyphenFmt" + *) + shift 1 + for i in "$@"; do +- fmtutil --byfmt "$i" || rc=1 ++ @FMTUTIL@ --byfmt "$i" || rc=1 + done + ;; + esac +@@ -1250,7 +1250,7 @@ Valid PAPER settings: + set x `getRes "$tcBatchPdftexMode"`; shift + fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1" + if $fmgrConfigReplaceChanged; then +- fmtutil --refresh ++ @FMTUTIL@ --refresh + fi + else + echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2 +@@ -1272,7 +1272,7 @@ Valid PAPER settings: + # wChanged=$fmgrConfigReplaceChanged + # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" + # if $wChanged || $fmgrConfigReplaceChanged; then +- # fmtutil --refresh ++ # @FMTUTIL@ --refresh + # fi + # ;; + #a4) +@@ -1281,7 +1281,7 @@ Valid PAPER settings: + # wChanged=$fmgrConfigReplaceChanged + # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" + # if $wChanged || $fmgrConfigReplaceChanged; then +- # fmtutil --refresh ++ # @FMTUTIL@ --refresh + # fi + # ;; + "") echo "$help" >&2; rc=1;; +@@ -1301,7 +1301,7 @@ Valid PAPER settings: + ;; + + rehash) +- mktexlsr ++ @MKTEXLSR@ + ;; + + # +@@ -1434,7 +1434,7 @@ Valid PAPER settings: + ############################################################################### + tcInteractive() + { +- texconfig-dialog ++ @TEXCONFIG_DIALOG@ + } + + ############################################################################### diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-dialog b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-dialog new file mode 100644 index 00000000000..cebd2f41037 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-dialog @@ -0,0 +1,180 @@ +$NetBSD: patch-bin_texconfig-dialog,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/texconfig-dialog.orig 2012-10-09 17:39:16.000000000 +0000 ++++ bin/texconfig-dialog +@@ -81,14 +81,7 @@ logexec() + ############################################################################### + runDialog() + { +- if test -n "$DIALOG_PROG"; then +- termCtl clear +- $DIALOG_PROG --title "TeX setup utility" ${1+"$@"} +- runDialogRc=$? +- termCtl clear +- else +- abort "could not find dialog or whiptail program to run" +- fi ++ @DIALOG@ --title "TeX setup utility" ${1+"$@"} + (exit $runDialogRc) + return $runDialogRc + } +@@ -101,7 +94,7 @@ findDialog() + { + for bin in whiptail dialog + do +- binLoc=`texconfig findprog $bin` ++ binLoc=`@TEXCONFIG@ findprog $bin` + case $binLoc in + "") DIALOG_PROG="";; + *) DIALOG_PROG=$binLoc; break;; +@@ -195,11 +188,11 @@ trouble, you may have more luck with +/- + menuMode + ;; + REHASH) +- logexec texconfig rehash ++ logexec @TEXCONFIG@ rehash + termCtl readln + ;; + FORMATS) +- texconfig formats ++ @TEXCONFIG@ formats + termCtl readln + ;; + HYPHENATION) +@@ -209,11 +202,11 @@ trouble, you may have more luck with +/- + menuDvips + ;; + FAQ) +- texconfig faq ++ @TEXCONFIG@ faq + termCtl readln + ;; + CONF) +- logexec texconfig conf ++ logexec @TEXCONFIG@ conf + termCtl readln + ;; + LOG) +@@ -234,7 +227,7 @@ Chosse a mode to be used when metafont g + be differences between modes of the same resolution. See the comments in the file modes.mf for more details. + \"" \ + 23 80 14 \ +- `texconfig mode-list` 2>"$tmpmenu" ++ `@TEXCONFIG@ mode-list` 2>"$tmpmenu" + } + + menuMode() +@@ -243,7 +236,7 @@ menuMode() + mode=`cat "$tmpmenu"` + + if test -n "$mode"; then +- logexec texconfig mode "$mode" ++ logexec @TEXCONFIG@ mode "$mode" + termCtl readln + fi + } +@@ -312,7 +305,7 @@ NOTE: If you just press return, printing + menuDvipsPrintOpt=$menuDvipsAns + ;; + esac +- logexec texconfig dvips $menuDvipsPrinterOpt printcmd "$menuDvipsPrintOpt" ++ logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt printcmd "$menuDvipsPrintOpt" + termCtl readln + fi + ;; +@@ -321,7 +314,7 @@ NOTE: If you just press return, printing + mode=`cat "$tmpmenu"` + + if test -n "$mode"; then +- logexec texconfig dvips $menuDvipsPrinterOpt mode "$mode" ++ logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt mode "$mode" + termCtl readln + fi + ;; +@@ -331,7 +324,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and + case $menuDvipsAns in + "") : ;; + *) +- logexec texconfig dvips $menuDvipsPrinterOpt offset "$menuDvipsAns" ++ logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt offset "$menuDvipsAns" + termCtl readln + ;; + esac +@@ -339,11 +332,11 @@ offset), e.g. 2mm,-0.5in (right 2mm and + PAPER) + eval runDialog \ + --menu \'\\n\\nChoose the default papersize definition for dvips.\\n\\n\' \ +- 23 80 8 `texconfig dvips paper-list` \ ++ 23 80 8 `@TEXCONFIG@ dvips paper-list` \ + 2>"$tmpmenu" + paper=`cat "$tmpmenu"` + if test -n "$paper"; then +- logexec texconfig dvips paper "$paper" ++ logexec @TEXCONFIG@ dvips paper "$paper" + termCtl readln + fi + ;; +@@ -364,7 +357,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and + case $menuDvipsAns in + "") : ;; + *) +- logexec texconfig dvips add $menuDvipsAns ++ logexec @TEXCONFIG@ dvips add $menuDvipsAns + termCtl readln + ;; + esac +@@ -375,7 +368,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and + case $menuDvipsAns in + "") : ;; + *) +- logexec texconfig dvips del $menuDvipsAns ++ logexec @TEXCONFIG@ dvips del $menuDvipsAns + termCtl readln + ;; + esac +@@ -398,11 +391,11 @@ Select your default paper format. + p=`cat "$tmpmenu"` + case $p in + A4) +- logexec texconfig paper a4 ++ logexec @TEXCONFIG@ paper a4 + termCtl readln + ;; + LETTER) +- logexec texconfig paper letter ++ logexec @TEXCONFIG@ paper letter + termCtl readln + ;; + esac +@@ -415,14 +408,14 @@ menuHyphenation() + Choose format to set up hyphenation for. + " \ + 23 80 14 \ +- `texconfig hyphen-list | sed 's@\(.*\)@\1 \1@'` 2>"$tmpmenu" ++ `@TEXCONFIG@ hyphen-list | sed 's@\(.*\)@\1 \1@'` 2>"$tmpmenu" + p=`cat "$tmpmenu"` + case $p in + "") + return + ;; + *) +- texconfig hyphen "$p" ++ @TEXCONFIG@ hyphen "$p" + termCtl readln + esac + } +@@ -445,9 +438,9 @@ eof + esac + + +-: ${TEXMFCONFIG=`kpsewhich -var-value=TEXMFCONFIG`} +-: ${TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`} +-: ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`} ++: ${TEXMFCONFIG=`@KPSEWHICH@ -var-value=TEXMFCONFIG`} ++: ${TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`} ++: ${TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`} + export TEXMFCONFIG TEXMFVAR TEXMFMAIN + + setupTmpDir diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-sys b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-sys new file mode 100644 index 00000000000..9b17c53c8c1 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-sys @@ -0,0 +1,17 @@ +$NetBSD: patch-bin_texconfig-sys,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/texconfig-sys.orig 2014-07-13 00:07:52.000000000 +0000 ++++ bin/texconfig-sys +@@ -23,8 +23,8 @@ mydir=`echo "$0" | sed 's,/[^/]*$,,'` + mydir=`cd "$mydir" && pwd` + PATH="$mydir:$PATH"; export PATH + +-v=`kpsewhich -var-value TEXMFSYSVAR` +-c=`kpsewhich -var-value TEXMFSYSCONFIG` ++v=`@KPSEWHICH@ -var-value TEXMFSYSVAR` ++c=`@KPSEWHICH@ -var-value TEXMFSYSCONFIG` + + TEXMFVAR="$v" + TEXMFCONFIG="$c" diff --git a/print/tex-texlive-scripts-extra/patches/patch-bin_texlinks b/print/tex-texlive-scripts-extra/patches/patch-bin_texlinks new file mode 100644 index 00000000000..9cb5a904fa5 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texlinks @@ -0,0 +1,42 @@ +$NetBSD: patch-bin_texlinks,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- bin/texlinks.orig 2012-10-09 17:39:16.000000000 +0000 ++++ bin/texlinks +@@ -188,7 +188,7 @@ install_link() + ############################################################################### + search_symlinkdir() + { +- kpsewhich=`check_for_binary kpsewhich` ++ kpsewhich=@KPSEWHICH@ + test -z "$kpsewhich" && return 1 + symlinkdir=`echo $kpsewhich | sed 's@/*kpsewhich$@@'` + kpseaccess -w "$symlinkdir" || return 1 +@@ -251,7 +251,7 @@ main() + silent=false + thisdir=`pwd` + : ${KPSE_DOT=$thisdir}; export KPSE_DOT +- selfautoloc=`kpsewhich --expand-var='$SELFAUTOLOC'` ++ selfautoloc=`@KPSEWHICH@ --expand-var='$SELFAUTOLOC'` + while + case $1 in + --h*|-h) +@@ -272,7 +272,7 @@ main() + dirs="$*" + + # if no cnf_file from command-line, look it up with kpsewhich: +- test -z "$cnf_file" && cnf_file=`kpsewhich --format='web2c files' $cnf` ++ test -z "$cnf_file" && cnf_file=`@KPSEWHICH@ --format='web2c files' $cnf` + test -f "$cnf_file" || abort "config file \`$cnf' not found" + + +@@ -287,7 +287,7 @@ main() + if test $multiplatform = true; then + case $selfautoloc in + */bin) dirs=$selfautoloc;; +- *) parent=`kpsewhich --expand-var='$SELFAUTODIR'` ++ *) parent=`@KPSEWHICH@ --expand-var='$SELFAUTODIR'` + dirs=`find $parent -type f -name kpsewhich -print \ + | sed 's@/kpsewhich$@@'`;; + esac diff --git a/print/tex-texlive-scripts-extra/patches/patch-texmf-dist_texconfig_tcfmgr b/print/tex-texlive-scripts-extra/patches/patch-texmf-dist_texconfig_tcfmgr new file mode 100644 index 00000000000..9f93cd68968 --- /dev/null +++ b/print/tex-texlive-scripts-extra/patches/patch-texmf-dist_texconfig_tcfmgr @@ -0,0 +1,60 @@ +$NetBSD: patch-texmf-dist_texconfig_tcfmgr,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands + +--- texmf-dist/texconfig/tcfmgr.orig 2010-05-20 18:50:17.000000000 +0000 ++++ texmf-dist/texconfig/tcfmgr +@@ -47,7 +47,7 @@ setupMap() + esac + + case $TFC_MAP in +- "") TFC_MAP=`(kpsewhich -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;; ++ "") TFC_MAP=`(@KPSEWHICH@ -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;; + esac + + case $TFC_MAP in +@@ -84,7 +84,7 @@ setupTemp() + setupTexmfConfig() + { + case $TFC_TEXMFCONFIG in +- "") TFC_TEXMFCONFIG=`(kpsewhich -var-value=TEXMFCONFIG) 2>/dev/null`;; ++ "") TFC_TEXMFCONFIG=`(@KPSEWHICH@ -var-value=TEXMFCONFIG) 2>/dev/null`;; + *) (exit 0); return 0;; + esac + case $TFC_TEXMFCONFIG in +@@ -95,7 +95,7 @@ setupTexmfConfig() + setupMktexDir() + { + case $TFC_MKTEXDIR in +- "") TFC_MKTEXDIR=`(kpsewhich --format='web2c files' mktexdir) 2>/dev/null`;; ++ "") TFC_MKTEXDIR=`(@KPSEWHICH@ --format='web2c files' mktexdir) 2>/dev/null`;; + esac + + case $TFC_MKTEXDIR in +@@ -106,7 +106,7 @@ setupMktexDir() + setupMktexupd() + { + case $TFC_MKTEXUPD in +- "") TFC_MKTEXUPD=`(kpsewhich --format='web2c files' mktexupd) 2>/dev/null`;; ++ "") TFC_MKTEXUPD=`(@KPSEWHICH@ --format='web2c files' mktexupd) 2>/dev/null`;; + esac + + case $TFC_MKTEXUPD in +@@ -193,7 +193,7 @@ check_out() + case "$orig" in + "") + get_info +- orig=`(kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null` ++ orig=`(@KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null` + ;; + *) + test -f "$orig" || orig= +@@ -308,7 +308,7 @@ check_in() + find_file() + { + get_info +- kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE" ++ @KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE" + } + + help() |