head 1.6; access; symbols pkgsrc-2020Q1:1.5.0.14 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.16 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.12 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.10 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.8 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.6 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.4 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.2 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.4.0.18 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.16 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.14 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.10 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.8 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.6 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.4 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.2 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.3.0.8 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.6 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.4 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.2 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.1.0.20 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2020.05.10.03.56.43; author markd; state dead; branches; next 1.5; commitid 6jxkTXO6lRjCYD7C; 1.5 date 2018.05.13.10.41.47; author markd; state Exp; branches; next 1.4; commitid yXyxTrSGZamiL7CA; 1.4 date 2016.06.16.04.06.16; author markd; state Exp; branches; next 1.3; commitid InOg0e2RVA4yWDaz; 1.3 date 2015.06.14.12.50.05; author markd; state Exp; branches; next 1.2; commitid M6UuXWAncmynFopy; 1.2 date 2015.04.25.20.26.37; author markd; state Exp; branches; next 1.1; commitid OsoySUoH7wPZN0jy; 1.1 date 2012.10.13.22.38.20; author minskim; state Exp; branches; next ; desc @@ 1.6 log @texlive: update to 2020 General: * The \input primitive in all TeX engines, including tex, now also accepts a group-delimited filename argument, as a system-dependent extension. The usage with a standard space/token-delimited filename is completely unchanged. The group-delimited argument was previously implemented in LuaTeX; now it is available in all engines. ASCII double quote characters (") are removed from the filename, but it is otherwise left unchanged after tokenization. This does not currently affect LaTeX’s \input command, as that is a macro redefinition of the standard \input primitive. * New option –cnf-line for kpsewhich, tex, mf, and all other engines, to support arbitrary configuration settings on the command line. * The addition of various primitives to various engines in this and previous years is intended to result in a common set of functionality available across all engines. epTeX, eupTeX: New primitives \Uchar, \Ucharcat, \current(x)spacingmode, \ifincsname; revise \fontchar?? and \iffontchar. For eupTeX only: \currentcjktoken. LuaTeX: Integration with HarfBuzz library, available as new engines luahbtex (used for lualatex) and luajithbtex. New primitives: \eTeXgluestretchorder, \eTeXglueshrinkorder. pdfTeX: New primitive \pdfmajorversion; this merely changes the version number in the PDF output; it has no effect on any PDF content. \pdfximage and similar now search for image files in the same way as \openin. pTeX: New primitives \ifjfont, \iftfont. Also in epTeX, upTeX, eupTeX. XeTeX: Fixes for \Umathchardef, \XeTeXinterchartoks, \pdfsavepos. Dvips: Output encodings for bitmap fonts, for better copy/paste capabilities. @ text @$NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $ --- bin/fmtutil.orig 2017-11-21 07:07:45.000000000 +0000 +++ bin/fmtutil @@@@ -14,7 +14,7 @@@@ my $TEXMFROOT; BEGIN { $^W = 1; - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; + $TEXMFROOT = `@@KPSEWHICH@@ -var-value=TEXMFROOT`; if ($?) { die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; } @@@@ -70,12 +70,12 @@@@ TeXLive::TLUtils::prepend_own_path(); # this function checks by itself whether it is running on windows or not reset_root_home(); -chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); -chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); -chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); -chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); -chomp(our $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); -chomp(our $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`); +chomp(our $TEXMFDIST = `@@KPSEWHICH@@ --var-value=TEXMFDIST`); +chomp(our $TEXMFVAR = `@@KPSEWHICH@@ -var-value=TEXMFVAR`); +chomp(our $TEXMFSYSVAR = `@@KPSEWHICH@@ -var-value=TEXMFSYSVAR`); +chomp(our $TEXMFCONFIG = `@@KPSEWHICH@@ -var-value=TEXMFCONFIG`); +chomp(our $TEXMFSYSCONFIG = `@@KPSEWHICH@@ -var-value=TEXMFSYSCONFIG`); +chomp(our $TEXMFHOME = `@@KPSEWHICH@@ -var-value=TEXMFHOME`); # make sure that on windows *everything* is in lower case for comparison if (win32()) { @@@@ -254,7 +254,7 @@@@ sub main { for my $e (sort @@all_engines) { my $hf = $alldata->{'merged'}{$f}{$e}{'hyphen'}; next if ($hf eq '-'); - my $ff = `kpsewhich -progname='$f' -format=tex '$hf'`; + my $ff = `@@KPSEWHICH@@ -progname='$f' -format=tex '$hf'`; chomp($ff); if ($ff ne "") { if ($#all_engines > 0) { @@@@ -494,13 +494,13 @@@@ sub select_and_rebuild_format { if ($fmthyp ne '-') { if ($whatarg =~ m!^/!) { # $whatarg is a full path, we need to expand $fmthyp, too - chomp (my $fmthyplong = `kpsewhich -progname=$fmt -engine=$eng $fmthyp`) ; + chomp (my $fmthyplong = `@@KPSEWHICH@@ -progname=$fmt -engine=$eng $fmthyp`) ; if ($fmthyplong) { $fmthyp = $fmthyplong; } else { # we might have searched language.dat --engine=tex --progname=tex # which will not work. Search again without engine/format - chomp ($fmthyplong = `kpsewhich $fmthyp`) ; + chomp ($fmthyplong = `@@KPSEWHICH@@ $fmthyp`) ; if ($fmthyplong) { $fmthyp = $fmthyplong; } else { @@@@ -595,7 +595,7 @@@@ sub rebuild_one_format { else { $prgswitch .= $fmt; } # check for existence of ini file before doing anything else - if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) { + if (system("@@KPSEWHICH@@ -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) { # we didn't find the ini file, skip print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n"); # The original script just skipped it but in TeX Live we expect that @@@@ -624,7 +624,7 @@@@ sub rebuild_one_format { $texargs = $addargs; } if ($pool) { - chomp ( my $poolfile = `kpsewhich -progname=$eng $pool.poo 2>$nul` ); + chomp ( my $poolfile = `@@KPSEWHICH@@ -progname=$eng $pool.poo 2>$nul` ); if ($poolfile && -f $poolfile) { print_verbose("attempting to create localized format " . "using pool=$pool and tcx=$tcx.\n"); @@@@ -1016,7 +1016,7 @@@@ sub determine_config_files { # in the list is the one where changes will be written to. ($changes_config_file) = @@{$opts{'cnffile'}}; } else { - my @@all_files = `kpsewhich -all $fn`; + my @@all_files = `@@KPSEWHICH@@ -all $fn`; chomp(@@all_files); my @@used_files; for my $f (@@all_files) { @@@@ -1026,10 +1026,10 @@@@ sub determine_config_files { my $TEXMFLOCALVAR; my @@TEXMFLOCAL; if (win32()) { - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); + chomp($TEXMFLOCALVAR =`@@KPSEWHICH@@ --expand-path=\$TEXMFLOCAL`); @@TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR); } else { - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); + chomp($TEXMFLOCALVAR =`@@KPSEWHICH@@ --expand-path='\$TEXMFLOCAL'`); @@TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; } # @ 1.5 log @tex-tetex{,-doc}: update to 3.0.47198 now includes tex-texconfig @ text @d1 1 a1 1 $NetBSD: patch-bin_fmtutil,v 1.4 2016/06/16 04:06:16 markd Exp $ @ 1.4 log @Updated to TexLive 2016: Updated print/cjkutils to 4.8.4nb1 Updated print/dviljk to 2.6.5nb7 Updated print/dvipdfmx to 20160307 Updated print/dvipsk to 5.996 Updated print/kpathsea to 6.2.2 Updated print/lacheck to 1.28nb1 Updated print/luatex to 0.95 Updated print/ptexenc to 1.3.4 Updated print/seetexk to 1.1nb2 Updated print/tex4ht to 0.0.20160522 Updated print/vlna to 1.5nb2 Updated print/web2c to 2016 Updated print/xdvik to 22.87.03 Updated print/xetex to 0.99996 Updated print/xpdfopen to 0.86nb1 Updated print/tex-IEEEtran{,-doc} to 1.8b Updated print/tex-abc{,-doc} to 2.0b Updated print/tex-aleph to 0.2.40768 Updated print/tex-algorithm2e{,-doc} to 5.1 Updated print/tex-algorithms{,-doc} to 0.1 Updated print/tex-amsmath{,-doc} to 2.15b Updated print/tex-babel{,-doc} to 3.9r Updated print/tex-babel-bosnian to 1.1 Updated print/tex-babel-estonian to 1.1a Updated print/tex-babel-french to 3.2c Updated print/tex-babel-friulan to 1.3 Updated print/tex-babel-greek to 1.9f Updated print/tex-babel-hungarian to 1.5c Updated print/tex-babel-icelandic to 1.2b Updated print/tex-babel-latin to 3.5 Updated print/tex-babel-russian to 1.3h Updated print/tex-babel-spanish to 5.0p Updated print/tex-babel-vietnamese to 1.4 Updated print/tex-babel-welsh to 1.1a Updated print/tex-biblatex{,-doc} to 3.4 Updated print/tex-booktabs{,-doc} to 1.618033 Updated print/tex-breqn to 0.98d Updated print/tex-caption{,-doc} to 20160202 Updated print/tex-chess-problem-diagrams{,-doc} to 1.12 Updated print/tex-cjk-gs-integrate{,-doc} to 20160115.0 Updated print/tex-cjk-ko{,-doc} to 1.8 Updated print/tex-cjkpunct{,-doc} to 4.8.4 Updated print/tex-context{,-doc} to 2016 Updated print/tex-csplain to 2016 Updated print/tex-csquotes{,-doc} to 5.1g Updated print/tex-ctable to 1.31 Updated print/tex-cweb{,-doc} to 3.64af Updated print/tex-datatool{,-doc} to 2.25 Updated print/tex-dvipdfmx{,-doc} to 2016 Updated print/tex-dvipdfmx-def to 4.08 Updated print/tex-dvips{,-doc} to 2016 Updated print/tex-eplain{,-doc} to 3.8 Updated print/tex-etex-pkg{,-doc} to 2.6 Updated print/tex-europasscv{,-doc} to 2016 Updated print/tex-fix2col{,-doc} to 0.04 Updated print/tex-font-change{,-doc} to 2015.2 Updated print/tex-glossaries{,-doc} to 4.23 Updated print/tex-graphics{,-doc} to 1.0r Updated print/tex-hausarbeit-jura{,-doc} to 1.4 Updated print/tex-hyperref{,-doc} to 6.83n Updated print/tex-hyph-utf8{,-doc} to 2016 Updated print/tex-hyphen-afrikaans to 2016 Updated print/tex-hyphen-ancientgreek to 2016 Updated print/tex-hyphen-arabic to 2016 Updated print/tex-hyphen-armenian to 2016 Updated print/tex-hyphen-base to 2016 Updated print/tex-hyphen-basque to 2016 Updated print/tex-hyphen-bulgarian to 2016 Updated print/tex-hyphen-catalan to 2016 Updated print/tex-hyphen-chinese to 2016 Updated print/tex-hyphen-coptic to 2016 Updated print/tex-hyphen-croatian to 2016 Updated print/tex-hyphen-czech to 2016 Updated print/tex-hyphen-danish to 2016 Updated print/tex-hyphen-dutch to 2016 Updated print/tex-hyphen-english to 2016 Updated print/tex-hyphen-esperanto to 2016 Updated print/tex-hyphen-estonian to 2016 Updated print/tex-hyphen-ethiopic to 2016 Updated print/tex-hyphen-farsi to 2016 Updated print/tex-hyphen-finnish to 2016 Updated print/tex-hyphen-french to 2016 Updated print/tex-hyphen-friulan to 2016 Updated print/tex-hyphen-galician to 2016 Updated print/tex-hyphen-georgian to 2016 Updated print/tex-hyphen-german to 2016 Updated print/tex-hyphen-greek to 2016 Updated print/tex-hyphen-hungarian to 2016 Updated print/tex-hyphen-icelandic to 2016 Updated print/tex-hyphen-indic to 2016 Updated print/tex-hyphen-indonesian to 2016 Updated print/tex-hyphen-interlingua to 2016 Updated print/tex-hyphen-irish to 2016 Updated print/tex-hyphen-italian to 2016 Updated print/tex-hyphen-kurmanji to 2016 Updated print/tex-hyphen-latin to 3.1.2016 Updated print/tex-hyphen-latvian to 2016 Updated print/tex-hyphen-lithuanian to 2016 Updated print/tex-hyphen-mongolian to 2016 Updated print/tex-hyphen-norwegian to 2016 Updated print/tex-hyphen-piedmontese to 2016 Updated print/tex-hyphen-polish to 3.0a.2016 Updated print/tex-hyphen-portuguese to 2016 Updated print/tex-hyphen-romanian to 2016 Updated print/tex-hyphen-romansh to 2016 Updated print/tex-hyphen-russian to 2016 Updated print/tex-hyphen-sanskrit to 2016 Updated print/tex-hyphen-serbian to 1.0a.2016 Updated print/tex-hyphen-slovak to 2016 Updated print/tex-hyphen-slovenian to 2016 Updated print/tex-hyphen-spanish to 4.5.2016 Updated print/tex-hyphen-swedish to 2016 Updated print/tex-hyphen-thai to 2016 Updated print/tex-hyphen-turkish to 2016 Updated print/tex-hyphen-turkmen to 2016 Updated print/tex-hyphen-ukrainian to 2016 Updated print/tex-hyphen-uppersorbian to 2016 Updated print/tex-hyphen-welsh to 2016 Updated print/tex-ifluatex{,-doc} to 1.4 Updated print/tex-koma-script to 3.20 Updated print/tex-kotex-oblivoir{,-doc} to 2.1.7 Updated print/tex-kotex-plain{,-doc} to 2.1.1.a Updated print/tex-kotex-utf{,-doc} to 2.1.2 Updated print/tex-kotex-utils{,-doc} to 2.1.0 Updated print/tex-kpathsea{,-doc} to 2016 Updated print/tex-latex{,-doc} to 2016 Updated print/tex-latex-bin to 2016 Updated print/tex-latexconfig to 2016 Updated print/tex-leaflet{,-doc} to 1.1a Updated print/tex-lettrine{,-doc} to 1.9 Updated print/tex-lollipop{,-doc} to 1.06 Updated print/tex-luatex to 0.95 Updated print/tex-mathtools to 1.18 Updated print/tex-media9{,-doc} to 0.68 Updated print/tex-memoir{,-doc} to 3.7f Updated print/tex-mhchem{,-doc} to 4.04 Updated print/tex-microtype{,-doc} to 2.6a Updated print/tex-minted{,-doc} to 2.1 Updated print/tex-musixtex{,-doc} to 1.22 Updated print/tex-oberdiek{,-doc} to 2016 Updated print/tex-pageslts to 1.2f Updated print/tex-paralist{,-doc} to 2.5 Updated print/tex-pdfcomment{,-doc} to 2.3b Updated print/tex-pdfpages{,-doc} to 0.5f Updated print/tex-pdftex{,-doc} to 2016 Updated print/tex-pgf{,-doc} to 3.0.1a Updated print/tex-pgfplots{,-doc} to 1.13 Updated print/tex-pict2e{,-doc} to 0.3b Updated print/tex-plain to 3.141592653.40274 Updated print/tex-polyglossia{,-doc} to 1.42.4 Updated print/tex-powerdot to 1.5a Updated print/tex-preview{,-doc} to 11.89 Updated print/tex-ptex to 3.2pl41220 Updated print/tex-realscripts{,-doc} to 0.3d Updated print/tex-schwalbe-chess{,-doc} to 2.1 Updated print/tex-showlabels{,-doc} to 1.7 Updated print/tex-siunitx{,-doc} to 2.6q Updated print/tex-sttools{,-doc} to 1.8 Updated print/tex-tetex{,-doc} to 3.0.41059 Updated print/tex-tex4ht{,-doc} to 2016 Updated print/tex-texinfo to 5.1.40618 Updated print/tex-texlive-scripts to 2016 Updated print/tex-texlive.infra to 2016 Updated print/tex-titlesec{,-doc} to 2.10.2 Updated print/tex-tools{,-doc} to 2016 Updated print/tex-toptesi{,-doc} to 5.91 Updated print/tex-udesoftec{,-doc} to 1.5.2 Updated print/tex-xcjk2uni{,-doc} to 0.6 Updated print/tex-xcolor{,-doc} to 2.12 Updated print/tex-xetex{,-doc} to 2016 Updated print/tex-xetex-def to 4.08 Updated print/tex-xetexconfig to 2016 Updated print/tex-xltxtra{,-doc} to 0.6 Added print/tex-pbibtex-base{,-doc} version 0.0.2016 Added print/tex-ptex-base{,-doc} version 0.0.2016 Added print/tex-tex-ini-files{,-doc} version 2016 Added print/tex-unicode-data{,-doc} version 1.4a Added print/tex-updmap-map version 2016 @ text @d1 1 a1 1 $NetBSD: patch-bin_fmtutil,v 1.3 2015/06/14 12:50:05 markd Exp $ d3 1 a3 1 --- bin/fmtutil.orig 2016-04-22 13:16:07.000000000 +0000 d14 1 a14 1 @@@@ -67,12 +67,12 @@@@ my @@deferred_stdout; d33 1 a33 1 @@@@ -239,7 +239,7 @@@@ sub main { d42 1 a42 1 @@@@ -473,13 +473,13 @@@@ sub select_and_rebuild_format { d58 3 a60 3 @@@@ -557,7 +557,7 @@@@ sub rebuild_one_format { } d67 1 a67 1 @@@@ -578,7 +578,7 @@@@ sub rebuild_one_format { d76 1 a76 1 @@@@ -1002,7 +1002,7 @@@@ sub determine_config_files { d85 1 a85 1 @@@@ -1012,10 +1012,10 @@@@ sub determine_config_files { @ 1.3 log @Update to texlive 2015. pdfTEX: Support JPEG Exif as well as JFIF; do not even emit a warning if \pdfinclusionerrorlevel is negative; sync with xpdf 3.04. LuaTEX: New library newtokenlib for scanning tokens; bug fixes in the normal random number generator and other places. XeTEX: Image handling fixes; xdvipdfmx binary looked for first as a sibling to xetex; internal XDV opcodes changed. MetaPost: New numbersystem binary; new Japanese-enabled upmpost and updvitomp programs, analogous to up*tex. Infrastructure: The fmtutil script has been reimplemented to read fmtutil.cnf on a per-tree basis, analogous to updmap. Web2C mktex* scripts (including mktexlsr, mktextfm, mktexpk) now prefer programs in their own directory, instead of always using the existing PATH. @ text @d1 1 a1 1 $NetBSD: patch-bin_fmtutil,v 1.2 2015/04/25 20:26:37 markd Exp $ d3 1 a3 1 --- bin/fmtutil.orig 2015-05-23 16:52:36.000000000 +0000 d14 1 a14 1 @@@@ -72,12 +72,12 @@@@ my @@deferred_stdout; d33 1 a33 1 @@@@ -211,7 +211,7 @@@@ sub main { d37 2 a38 2 - my $ff = `kpsewhich -progname=$f -format=tex $hf`; + my $ff = `@@KPSEWHICH@@ -progname=$f -format=tex $hf`; d42 17 a58 1 @@@@ -462,7 +462,7 @@@@ sub rebuild_one_format { d67 1 a67 1 @@@@ -483,7 +483,7 @@@@ sub rebuild_one_format { d74 3 a76 3 print_verbose ("attempting to create localized format using pool=$pool and tcx=$tcx.\n"); File::Copy($poolfile, "$eng.pool"); @@@@ -860,7 +860,7 @@@@ sub determine_config_files { d85 1 a85 1 @@@@ -870,10 +870,10 @@@@ sub determine_config_files { @ 1.2 log @Commit the texlive 2014 versions of the patches. @ text @d1 1 a1 1 $NetBSD: patch-bin_fmtutil,v 1.1 2012/10/13 22:38:20 minskim Exp $ d3 1 a3 1 --- bin/fmtutil.orig 2014-11-23 18:10:07.000000000 +0000 d5 1 a5 85 @@@@ -215,7 +215,7 @@@@ getmatch() initTexmfMain() { case $MT_TEXMFMAIN in - "") MT_TEXMFMAIN=`kpsewhich --var-value=TEXMFMAIN`;; + "") MT_TEXMFMAIN=`@@KPSEWHICH@@ --var-value=TEXMFMAIN`;; esac export MT_TEXMFMAIN } @@@@ -227,14 +227,14 @@@@ initTexmfMain() # cache_vars() { - : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} - : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} - : ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`} - : ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`} - : ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`} - : ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`} - : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} - : ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`} + : ${MT_VARTEXFONTS=`@@KPSEWHICH@@ --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} + : ${MT_MKTEXNAM=`@@KPSEWHICH@@ --format='web2c files' mktexnam`} + : ${MT_MKTEXNAM_OPT=`@@KPSEWHICH@@ --format='web2c files' mktexnam.opt`} + : ${MT_MKTEXDIR=`@@KPSEWHICH@@ --format='web2c files' mktexdir`} + : ${MT_MKTEXDIR_OPT=`@@KPSEWHICH@@ --format='web2c files' mktexdir.opt`} + : ${MT_MKTEXUPD=`@@KPSEWHICH@@ --format='web2c files' mktexupd`} + : ${MT_MKTEX_CNF=`@@KPSEWHICH@@ --format='web2c files' mktex.cnf`} + : ${MT_MKTEX_OPT=`@@KPSEWHICH@@ --format='web2c files' mktex.opt`} export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT } @@@@ -579,7 +579,7 @@@@ main() # set up destdir: if test -z "$destdir"; then - : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`} + : ${MT_TEXMFVAR=`@@KPSEWHICH@@ -var-value=TEXMFVAR`} destdir=$MT_TEXMFVAR/web2c fi test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1 @@@@ -686,7 +686,7 @@@@ parse_line() inifile=`echo $lastarg | sed 's%^\*%%'` # See if we can find $inifile for return code: - kpsewhich -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1 + @@KPSEWHICH@@ -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1 } ############################################################################### @@@@ -700,7 +700,7 @@@@ find_hyphenfile() hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex $hyphenation;; + *) @@KPSEWHICH@@ -progname="$format" -format=tex $hyphenation;; esac } @@@@ -729,7 +729,7 @@@@ run_initex() poolfile= tcxflag= test -n "$pool" \ - && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null` + && poolfile=`(@@KPSEWHICH@@ -progname=$engine $pool.pool) 2>/dev/null` if test -n "$poolfile" && test -f "$poolfile"; then verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx." cp "$poolfile" $engine.pool @@@@ -907,7 +907,7 @@@@ recreate_by_fmt() create_missing() { # match_cmd='test ! -f $destdir/$fmtfile' - match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"' + match_cmd='test ! -f "`@@KPSEWHICH@@ -engine=$texengine -progname=$format $fmtfile`"' recreate_loop } @@@@ -916,7 +916,7 @@@@ create_missing() # recreate_existing() { - match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"' + match_cmd='test -f "`@@KPSEWHICH@@ -engine=$texengine -progname=$format $fmtfile`"' recreate_loop } d7 75 @ 1.1 log @Update tex-tetex{,-doc} to 3.0.27774. In TeX Live 2012, this package replaces print/texlive-tetex. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- bin/fmtutil.orig 2012-10-09 17:39:16.000000000 +0000 d5 1 a5 1 @@@@ -213,7 +213,7 @@@@ getmatch() d14 2 a15 2 @@@@ -225,14 +225,14 @@@@ initTexmfMain() ############################################################################### d37 1 a37 1 @@@@ -574,7 +574,7 @@@@ main() d46 1 a46 1 @@@@ -683,7 +683,7 @@@@ parse_line() d55 2 a56 2 @@@@ -696,7 +696,7 @@@@ find_hyphenfile() format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" d64 1 a64 1 @@@@ -727,7 +727,7 @@@@ run_initex() d73 1 a73 1 @@@@ -886,7 +886,7 @@@@ recreate_by_fmt() d82 2 a83 2 @@@@ -896,7 +896,7 @@@@ create_missing() ############################################################################### @