82 lines
3.0 KiB
Plaintext
82 lines
3.0 KiB
Plaintext
$NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $
|
|
|
|
--- bin/updmap.orig 2015-07-17 19:00:04.000000000 +0000
|
|
+++ bin/updmap
|
|
@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 37866 2015-0
|
|
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";
|
|
}
|
|
@@ -46,12 +46,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
|
|
# see more comments at the definition of this function.
|
|
reset_root_home();
|
|
|
|
-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
|
|
-chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
|
|
-chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
|
|
-chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
|
|
-chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
|
|
-chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`);
|
|
+chomp(my $TEXMFDIST = `@KPSEWHICH@ --var-value=TEXMFDIST`);
|
|
+chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`);
|
|
+chomp(my $TEXMFSYSVAR = `@KPSEWHICH@ -var-value=TEXMFSYSVAR`);
|
|
+chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`);
|
|
+chomp(my $TEXMFSYSCONFIG = `@KPSEWHICH@ -var-value=TEXMFSYSCONFIG`);
|
|
+chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
|
|
|
|
# make sure that on windows *everything* is in lower case for comparison
|
|
if (win32()) {
|
|
@@ -244,7 +244,7 @@ sub main {
|
|
# in the list is the one where changes will be written to.
|
|
($changes_config_file) = @{$opts{'cnffile'}};
|
|
} else {
|
|
- my @all_files = `kpsewhich -all updmap.cfg`;
|
|
+ my @all_files = `@KPSEWHICH@ -all updmap.cfg`;
|
|
chomp(@all_files);
|
|
my @used_files;
|
|
for my $f (@all_files) {
|
|
@@ -254,10 +254,10 @@ sub main {
|
|
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;
|
|
}
|
|
#
|
|
@@ -1251,7 +1251,7 @@ sub mkMaps {
|
|
|
|
sub check_mismatch {
|
|
my ($mm, $d, $f, $prog) = @_;
|
|
- chomp (my $kpsefound = `kpsewhich --progname=$prog $f`);
|
|
+ chomp (my $kpsefound = `@KPSEWHICH@ --progname=$prog $f`);
|
|
if (lc("$d/$f") ne lc($kpsefound)) {
|
|
$mm->{$f} = $kpsefound;
|
|
}
|
|
@@ -1360,7 +1360,7 @@ listed below).
|
|
|
|
sub locateMap {
|
|
my $map = shift;
|
|
- my $ret = `kpsewhich --format=map $map`;
|
|
+ my $ret = `@KPSEWHICH@ --format=map $map`;
|
|
chomp($ret);
|
|
return $ret;
|
|
}
|
|
@@ -1998,7 +1998,7 @@ sub read_map_files {
|
|
$alldata->{'maps'}{$m}{'origin'} = 'builtin';
|
|
}
|
|
@maps = sort_uniq(@maps);
|
|
- my @fullpath = `kpsewhich --format=map @maps`;
|
|
+ my @fullpath = `@KPSEWHICH@ --format=map @maps`;
|
|
chomp @fullpath;
|
|
foreach my $map (@maps) {
|
|
my ($ff) = grep /\/$map(\.map)?$/, @fullpath;
|