update updmap.pl from source

git-svn-id: svn://tug.org/texlive/trunk@25347 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 4 deletions

diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index 7f48f7fa562..ac3720d58bf 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -15,7 +15,7 @@ BEGIN {
   unshift (@INC, "$TEXMFROOT/tlpkg");
 }
 
-my $version = '$Id: updmap.pl 25256 2012-01-31 15:12:34Z preining $';
+my $version = '$Id: updmap.pl 25346 2012-02-10 12:51:16Z preining $';
 
 use strict;
 use TeXLive::TLUtils qw(mkdirhier mktexupd win32);
@@ -829,8 +829,8 @@ sub catMaps {
   my @maps = grep { $_ =~ m/$map/ } @cfg;
   map{
     $_ =~ s/\#.*//;
-    $_ =~ s/\@kanjiEmbed@/$kanjiEmbed/;
-    $_ =~ s/\@kanjiVariant@/$kanjiVariant/;
+    # $_ =~ s/\@kanjiEmbed@/$kanjiEmbed/;
+    # $_ =~ s/\@kanjiVariant@/$kanjiVariant/;
     $_ =~ s/\s*([^\s]*)\s*([^\s]*)/$2/;
   } @maps;
 
@@ -843,7 +843,7 @@ sub catMaps {
       my $mf = `kpsewhich --format=map $newm`;
       chomp($mf);
       if (!$mf) {
-        print "$0: generated map $newm (from $m) does not exists, not activating it!\n";
+        print LOG "\n$short_progname: generated map $newm\n\tfrom $m\n\tdoes not exists, not activating it!\n";
       } else {
         push @newmaps, $newm;
       }