Update tex-tetex{,-doc} to 3.0.38001

additional options in updmap and fmtutil.

4 files changed, 23 insertions, 261 deletions

diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index e4551cd1002..6b4c6cffa2d 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2015/07/01 10:49:05 markd Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/09 11:04:54 markd Exp $
 
 DISTNAME=	tetex
-PKGNAME=	tex-${DISTNAME}-3.0.37485
-PKGREVISION=	1
-TEXLIVE_REV=	37485
+PKGNAME=	tex-${DISTNAME}-3.0.38001
+TEXLIVE_REV=	38001
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for updmap
diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo
index be4a59302c7..4d2513330c8 100644
--- a/print/tex-tetex/distinfo
+++ b/print/tex-tetex/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/06/14 12:50:05 markd Exp $
+$NetBSD: distinfo,v 1.17 2015/08/09 11:04:54 markd Exp $
 
-SHA1 (tex-tetex-37485/tetex.tar.xz) = 0c54fa5df3fe428d6045fedb17795640c2ccae2a
-RMD160 (tex-tetex-37485/tetex.tar.xz) = b5b74427f38f931e9a10024885eca7f0701bc8aa
-Size (tex-tetex-37485/tetex.tar.xz) = 56756 bytes
+SHA1 (tex-tetex-38001/tetex.tar.xz) = f59165eb1fb249f2ba04e1952a1efb7d08986518
+RMD160 (tex-tetex-38001/tetex.tar.xz) = 5e54cc8c3e4efbfcd7ad6a16b8e8ef7dfde8b9ca
+Size (tex-tetex-38001/tetex.tar.xz) = 57692 bytes
 SHA1 (patch-bin_fmtutil) = aeea4413d8b30c25fba5151daf8eb6f96badc409
 SHA1 (patch-bin_fmtutil-sys) = 41720ed218bbf9980772dc61ead757a3f0633d6b
 SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
@@ -10,6 +10,6 @@ SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e
 SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa
 SHA1 (patch-bin_texconfig-sys) = 8d17ef9242da8d3f541501938aa5cb1f20828343
 SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b
-SHA1 (patch-bin_updmap) = 9b760dc84e086214378e843995522383ae2d86f0
+SHA1 (patch-bin_updmap) = 43553a8f887aec7b83cb746a913f0a5fd94b22da
 SHA1 (patch-bin_updmap-sys) = e8b7248482f1e59ad9be556e5bc222fd41bd514c
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = a3238bd6fff5dbb4babdd2e6ebdbac2c76cc429f
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 20f1a858a389dc0989b525e864f5609232faa023
diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-tetex/patches/patch-bin_updmap
index 46dbe8cb029..886d4d8790a 100644
--- a/print/tex-tetex/patches/patch-bin_updmap
+++ b/print/tex-tetex/patches/patch-bin_updmap
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
+$NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $
 
---- bin/updmap.orig	2015-04-27 17:08:10.000000000 +0000
+--- bin/updmap.orig	2015-07-17 19:00:04.000000000 +0000
 +++ bin/updmap
-@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 37076 2015-0
+@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 37866 2015-0
  my $TEXMFROOT;
  BEGIN {
    $^W = 1;
@@ -11,16 +11,7 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
    if ($?) {
      die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
    }
-@@ -37,7 +37,7 @@ my $version = "r$svnrev ($lastchdate)";
- 
- use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
- use strict;
--use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname 
-+use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname
-   sort_uniq member touch);
- 
- #use Data::Dumper;
-@@ -49,12 +49,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
+@@ -46,12 +46,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  # see more comments at the definition of this function.
  reset_root_home();
  
@@ -39,27 +30,7 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
  
  # make sure that on windows *everything* is in lower case for comparison
  if (win32()) {
-@@ -77,8 +77,8 @@ my $updLSR;
- my @cmdline_options = (
-   "sys",
-   "listfiles",
--  "cnffile=s@", 
--  "copy", 
-+  "cnffile=s@",
-+  "copy",
-   "disable=s@",
-   "dvipdfmoutputdir=s",
-   "dvipdfmxoutputdir=s",
-@@ -207,7 +207,7 @@ sub main {
-     save_updmap($opts{'_readsave'});
-     exit 0;
-   }
-- 
-+
-   if ($opts{'showoptions'}) {
-     for my $o (@{$opts{'showoptions'}}) {
-       if (defined($settings{$o})) {
-@@ -247,7 +247,7 @@ sub main {
+@@ -244,7 +244,7 @@ sub main {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -68,7 +39,7 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-@@ -257,10 +257,10 @@ sub main {
+@@ -254,10 +254,10 @@ sub main {
      my $TEXMFLOCALVAR;
      my @TEXMFLOCAL;
      if (win32()) {
@@ -81,94 +52,7 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
        @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
      #
-@@ -292,7 +292,7 @@ sub main {
-     # TEXMFSYSVAR    $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
-     # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
-     # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
--    # 
-+    #
-     # updmap-sys (root):
-     # ==================
-     # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
-@@ -427,7 +427,7 @@ sub main {
- 
- 
-   if ($cmd && !$opts{'force'} && !$changed) {
--    print "$changes_config_file unchanged.  Map files not recreated.\n" 
-+    print "$changes_config_file unchanged.  Map files not recreated.\n"
-       if !$opts{'quiet'};
-   } else {
-     if (!$opts{'nomkmap'}) {
-@@ -921,7 +921,7 @@ sub cidx2dvips_old {
-       if ($_ =~ /.*[@\:\/,]/) {next;}
-       elsif ($_ =~ /^[^ ][^ ]* unicode /) {next;}
-       s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Oo][Tt][Ff]/$1/;
--      s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; 
-+      s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/;
-       s/$/ %/;
-       s/^(([^ ]*).*)/$1$2/;
-       s/^([^ ][^ ]* ([^ ][^ ]*) !*([^ ][^ ]*).*)/$1 $3-$2/;
-@@ -969,11 +969,11 @@ sub mkMaps {
-   }
- 
-   my ($mode, $mode_origin) = get_cfg('LW35');
--  my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = 
-+  my ($dvipsPreferOutline, $dvipsPreferOutline_origin) =
-     get_cfg('dvipsPreferOutline');
--  my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = 
-+  my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) =
-     get_cfg('dvipsDownloadBase35');
--  my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = 
-+  my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) =
-     get_cfg('pdftexDownloadBase14');
-   my ($pxdviUse, $pxdviUse_origin) = get_cfg('pxdviUse');
-   my ($kanjiEmbed, $kanjiEmbed_origin) = get_cfg('kanjiEmbed');
-@@ -1128,23 +1128,23 @@ sub mkMaps {
-   push @ps2pk_map, transLW35($mode, @ps2pk_fonts);
-   push @ps2pk_map, @mixedmaps_fonts;
-   push @ps2pk_map, @notmixedmaps_fonts;
--  &writeLines(">$dvipsoutputdir/ps2pk.map", 
-+  &writeLines(">$dvipsoutputdir/ps2pk.map",
-     normalizeLines(@ps2pk_map));
- 
-   print "Generating output for dvips...\n" if !$opts{'quiet'};
-   my @download35_map;
-   push @download35_map, "% ps2pk35.map";
-   push @download35_map, transLW35($mode, @ps2pk_fonts);
--  &writeLines(">$dvipsoutputdir/download35.map", 
-+  &writeLines(">$dvipsoutputdir/download35.map",
-     normalizeLines(@download35_map));
- 
-   my @builtin35_map;
-   push @builtin35_map, "% dvips35.map";
-   push @builtin35_map, transLW35($mode, @dvips35_fonts);
--  &writeLines(">$dvipsoutputdir/builtin35.map", 
-+  &writeLines(">$dvipsoutputdir/builtin35.map",
-     normalizeLines(@builtin35_map));
- 
--  my @dftdvips_fonts = 
-+  my @dftdvips_fonts =
-     (($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts : @dvips35_fonts);
- 
-   my @psfonts_t1_map;
-@@ -1160,14 +1160,14 @@ sub mkMaps {
-   push @psfonts_t1_map, @mixedmaps_fonts;
-   push @psfonts_t1_map, @notmixedmaps_fonts;
-   push @psfonts_t1_map, @tmpkanji2;
--  &writeLines(">$dvipsoutputdir/psfonts_t1.map", 
-+  &writeLines(">$dvipsoutputdir/psfonts_t1.map",
-     normalizeLines(@psfonts_t1_map));
- 
-   my @psfonts_pk_map;
-   push @psfonts_pk_map, transLW35($mode, @dftdvips_fonts);
-   push @psfonts_pk_map, @notmixedmaps_fonts;
-   push @psfonts_pk_map, @tmpkanji2;
--  &writeLines(">$dvipsoutputdir/psfonts_pk.map", 
-+  &writeLines(">$dvipsoutputdir/psfonts_pk.map",
-     normalizeLines(@psfonts_pk_map));
- 
-   print "Generating output for pdftex...\n" if !$opts{'quiet'};
-@@ -1231,7 +1231,7 @@ sub mkMaps {
+@@ -1251,7 +1251,7 @@ sub mkMaps {
  
    sub check_mismatch {
      my ($mm, $d, $f, $prog) = @_;
@@ -177,7 +61,7 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
      if (lc("$d/$f") ne lc($kpsefound)) {
        $mm->{$f} = $kpsefound;
      }
-@@ -1340,7 +1340,7 @@ listed below).
+@@ -1360,7 +1360,7 @@ listed below).
  
  sub locateMap {
    my $map = shift;
@@ -186,79 +70,8 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
    chomp($ret);
    return $ret;
  }
-@@ -1384,7 +1384,7 @@ sub processOptions {
- 
-   # now continue with normal option handling
- 
--  GetOptions(\%opts, @cmdline_options) or 
-+  GetOptions(\%opts, @cmdline_options) or
-     die "Try \"$prg --help\" for more information.\n";
- }
- 
-@@ -1416,14 +1416,14 @@ sub setupOutputDir {
- #   we can only have "key=value" since that is the way it was prepared
- #   in process_options
- #   (These were the values provided to --setoption.)
--#   
-+#
- sub setOptions {
-   my (@options) = @_;
-   for (my $i = 0; $i < @options; $i++) {
-     my $o = $options[$i];
- 
-     my ($key,$val) = split (/=/, $o, 2);
--    
-+
-     die "$prg: unexpected empty key or val for options (@options), goodbye.\n"
-       if !$key || !defined($val);
- 
-@@ -1505,7 +1505,7 @@ sub disable_map {
-     my $orig = $alldata->{'maps'}{$map}{'origin'};
-     # add a new entry to the top level where we disable it
-     # copy over the type from the last entry
--    $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = 
-+    $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} =
-       $alldata->{'updmap'}{$orig}{'maps'}{$map}{'type'};
-     $alldata->{'updmap'}{$tc}{'maps'}{$map}{'status'} = "disabled";
-     $alldata->{'updmap'}{$tc}{'maps'}{$map}{'line'} = -1;
-@@ -1603,7 +1603,7 @@ sub save_updmap {
- #
- sub check_option {
-   my ($opt, $val) = @_;
--  if ((($settings{$opt}{'type'} eq "binary") && 
-+  if ((($settings{$opt}{'type'} eq "binary") &&
-        $val ne "true" && $val ne "false") ||
-       (($settings{$opt}{'type'} eq "string") &&
-        !member($val, @{$settings{$opt}{'possible'}}))) {
-@@ -1621,12 +1621,12 @@ sub setOption {
-   my ($opt, $val) = @_;
- 
-   die "$prg: Unsupported option $opt." if (!defined($settings{$opt}));
--  die "$0: Invalid value $val for option $opt." 
-+  die "$0: Invalid value $val for option $opt."
-     if (!check_option($opt, $val));
- 
-   # silently accept this old option name, just in case.
-   return if $opt eq "dvipdfmDownloadBase14";
--  
-+
-   #print "Setting option $opt to $val...\n" if !$opts{'quiet'};
-   my $tc = $alldata->{'changes_config'};
- 
-@@ -1774,9 +1774,9 @@ sub normalizeLines {
- # $alldata->{'updmap'}{$full_path_name_of_updmap}{'lines'} = \@lines
- # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'val'} = $val
- # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'line'} = $i
--# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} 
-+# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'}
- #            = 'Map'|'MixedMap'|'KanjiMap'|'disabled'
--# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} 
-+# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'}
- #            = 'enabled'|'disabled'
- # $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'line'} = $i
- # $alldata->{'maps'}{$m}{'origin'} = $updmap_path_name
-@@ -1976,14 +1976,14 @@ sub read_map_files {
-     $alldata->{'maps'}{$m}{'status'} = 'enabled';
+@@ -1998,7 +1998,7 @@ sub read_map_files {
+     $alldata->{'maps'}{$m}{'origin'} = 'builtin';
    }
    @maps = sort_uniq(@maps);
 -  my @fullpath = `kpsewhich --format=map @maps`;
@@ -266,55 +79,3 @@ $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $
    chomp @fullpath;
    foreach my $map (@maps) {
      my ($ff) = grep /\/$map(\.map)?$/, @fullpath;
-     if ($ff) {
-       $alldata->{'maps'}{$map}{'fullpath'} = $ff;
-     } else {
--      # if the map file is not found, then push it onto the list of 
-+      # if the map file is not found, then push it onto the list of
-       # missing map files, since we know that it is enabled
-       push @missing, $map;
-     }
-@@ -2085,13 +2085,13 @@ sub merge_data {
-     for my $f (keys %{$alldata->{'maps'}{$m}{'fonts'}}) {
-       # use the font definition only for those fonts where the origin matches
-       if ($alldata->{'fonts'}{$f}{'origin'} eq $m) {
--        $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = 
-+        $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} =
-           $alldata->{'maps'}{$m}{'fonts'}{$f}
-             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} ne "KanjiMap");
--        $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = 
-+        $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} =
-           $alldata->{'maps'}{$m}{'fonts'}{$f}
-             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "Map");
--        $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = 
-+        $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} =
-           $alldata->{'maps'}{$m}{'fonts'}{$f}
-             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "KanjiMap");
-       }
-@@ -2103,7 +2103,7 @@ sub merge_data {
- #
- # $HOME and sudo and updmap-sys horror
- #   some instances of sudo do not reset $HOME to the home of root
--#   as an effect of "sudo updmap" creates root owned files in the home 
-+#   as an effect of "sudo updmap" creates root owned files in the home
- #   of a normal user, and "sudo updmap-sys" uses map files and updmap.cfg
- #   files from the directory of a normal user, but creating files
- #   in TEXMFSYSCONFIG. This is *all* wrong.
-@@ -2190,7 +2190,7 @@ historical reasons.  A general overview:
- Good luck.
- 
- Options:
--  --cnffile FILE            read FILE for the updmap configuration 
-+  --cnffile FILE            read FILE for the updmap configuration
-                              (can be given multiple times, in which case
-                              all the files are used)
-   --dvipdfmxoutputdir DIR   specify output directory (dvipdfm(x) syntax)
-@@ -2278,7 +2278,7 @@ Explanation of trees and files normally 
-   Thus, if updmap.cfg files are present in all trees, and the default
-   layout is used as shipped with TeX Live, the following files are
-   read, in the given order.
--  
-+
-   For updmap-sys:
-   TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
-   TEXMFSYSVAR    \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
diff --git a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
index 8ec1d6df612..840e7d57f96 100644
--- a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
+++ b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
@@ -1,8 +1,8 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.5 2015/06/14 12:50:05 markd Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.6 2015/08/09 11:04:54 markd Exp $
 
 --- texmf-dist/web2c/updmap.cfg.orig	2015-01-12 02:19:35.000000000 +0000
 +++ texmf-dist/web2c/updmap.cfg
-@@ -100,290 +100,3 @@ kanjiEmbed noEmbed
+@@ -100,292 +100,3 @@ kanjiEmbed noEmbed
  
  
  #  (end of updmap-hdr.cfg)
@@ -75,6 +75,8 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.5 2015/06/14 12:50:05 markd Exp $
 -Map cmcyr.map
 -MixedMap cmll.map
 -Map comfortaa.map
+-Map ComicNeue.map
+-Map ComicNeueAngular.map
 -Map original-context-symbol.map
 -Map CountriesOfEurope.map
 -Map ucr.map