Return to patch-bin_fmtutil CVS log

Up to [cvs.NetBSD.org] / pkgsrc / print / tex-tetex / patches

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.

$NetBSD: patch-bin_fmtutil,v 1.3 2015/06/14 12:50:05 markd Exp $

--- bin/fmtutil.orig	2015-05-23 16:52:36.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";
   }
@@ -72,12 +72,12 @@ my @deferred_stdout;
 # 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()) {
@@ -211,7 +211,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) {
@@ -462,7 +462,7 @@ sub rebuild_one_format {
   }
   
   # 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
@@ -483,7 +483,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");
       File::Copy($poolfile, "$eng.pool");
@@ -860,7 +860,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) {
@@ -870,10 +870,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;
     }
     #