CVS commit: pkgsrc/print

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Apr 11 00:09:23 UTC 2023

Modified Files:
        pkgsrc/print/tex-texlive-scripts: Makefile distinfo
        pkgsrc/print/tex-texlive-scripts-doc: Makefile distinfo
        pkgsrc/print/tex-texlive-scripts/patches: patch-bin_fmtutil
            patch-bin_rungs patch-bin_updmap patch-texmf-dist_web2c_updmap.cfg

Log Message:
tex-texlive-scripts{,-doc}: update to 2023

TeX Live 2023


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/tex-texlive-scripts/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/tex-texlive-scripts/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-texlive-scripts-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-texlive-scripts-doc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/tex-texlive-scripts/Makefile
diff -u pkgsrc/print/tex-texlive-scripts/Makefile:1.26 pkgsrc/print/tex-texlive-scripts/Makefile:1.27
--- pkgsrc/print/tex-texlive-scripts/Makefile:1.26      Thu Jan 12 10:46:59 2023
+++ pkgsrc/print/tex-texlive-scripts/Makefile   Tue Apr 11 00:09:23 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2023/01/12 10:46:59 markd Exp $
+# $NetBSD: Makefile,v 1.27 2023/04/11 00:09:23 markd Exp $
 
 DISTNAME=      texlive-scripts
-PKGNAME=       tex-${DISTNAME}-2022
-PKGREVISION=   2
-TEXLIVE_REV=   63029
+PKGNAME=       tex-${DISTNAME}-2023
+TEXLIVE_REV=   66797
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       TeX Live infrastructure programs
@@ -58,7 +57,7 @@ SUBST_SED.paths+=     -e 's,@FMTUTIL@,${PREF
 
 post-extract:
        ${MKDIR} ${WRKSRC}/bin
-       ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/rungs.tlu \
+       ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/rungs.lua \
                ${WRKSRC}/bin/rungs
 .for script in mktexmf mktexpk mktextfm
        ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \

Index: pkgsrc/print/tex-texlive-scripts/distinfo
diff -u pkgsrc/print/tex-texlive-scripts/distinfo:1.25 pkgsrc/print/tex-texlive-scripts/distinfo:1.26
--- pkgsrc/print/tex-texlive-scripts/distinfo:1.25      Sun Apr 17 10:23:51 2022
+++ pkgsrc/print/tex-texlive-scripts/distinfo   Tue Apr 11 00:09:23 2023
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.25 2022/04/17 10:23:51 markd Exp $
+$NetBSD: distinfo,v 1.26 2023/04/11 00:09:23 markd Exp $
 
-BLAKE2s (texlive-scripts.r63029.tar.xz) = c70745ad76ca221404f5d1c4a4ef7ebcab720a14cd70b4db2cc5bc89c668c7a3
-SHA512 (texlive-scripts.r63029.tar.xz) = 827e06553a6aaa9321da7cc57df25bcfa5a7b2a6d61ba884ef7f05076b5bc5a439497b03c5ca7915a637c19b059e123a07bddfcc3b5ec8b224b7694a655d2746
-Size (texlive-scripts.r63029.tar.xz) = 109776 bytes
-SHA1 (patch-bin_fmtutil) = 0ac14f781b491357080ec899b0005072c0aa7013
+BLAKE2s (texlive-scripts.r66797.tar.xz) = 01f12d5cec89cb0fc7144804ca74d2fb0ccfbe896d4cd68bc80a699e05e718e0
+SHA512 (texlive-scripts.r66797.tar.xz) = e4efb1759347fdc7f13fa3a081261d46fa4dbe8dfc4bc5dfb9605afbafbbc2e5875607cacc027f93ef57b6dee855efc4863ce9d7de47e06861186716fd0a8a50
+Size (texlive-scripts.r66797.tar.xz) = 113996 bytes
+SHA1 (patch-bin_fmtutil) = 038fdda482a6b3d9603d974bd3b010493706d7ff
 SHA1 (patch-bin_fmtutil-sys) = 85413eb237d1fae9261dddae99e6c347c22db10c
 SHA1 (patch-bin_mktexmf) = e58b8e521c65f44c18251621866ee23052f4de1b
 SHA1 (patch-bin_mktexpk) = d7a81ae56edfc4823a3cd1aa7bb50c98eac20264
 SHA1 (patch-bin_mktextfm) = a6ca49d59a9b67a1765a14d9e3075086c2cd8912
-SHA1 (patch-bin_rungs) = 198d0e442be6e03424ed1c32fdee391719d4614f
-SHA1 (patch-bin_updmap) = e23c00548792ef907e2c51abfb788ef13afa1770
+SHA1 (patch-bin_rungs) = 1bd96d36a4aab3e71612e8e73145c2de01273e17
+SHA1 (patch-bin_updmap) = c5e3a67fdd493a0ba8ab3b3c4baf894f1805c206
 SHA1 (patch-bin_updmap-sys) = 7825dc2d9ffb10f62ea2e4a3609d6de98785cdbd
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = d10a950eb56a41bd358d71c72f2fa8bb635f07a0
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 64a1c6dd83d4a9394c10a483b72f2023a7888ad7

Index: pkgsrc/print/tex-texlive-scripts-doc/Makefile
diff -u pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.5 pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.6
--- pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.5   Sun Apr 17 10:23:51 2022
+++ pkgsrc/print/tex-texlive-scripts-doc/Makefile       Tue Apr 11 00:09:23 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/04/17 10:23:51 markd Exp $
+# $NetBSD: Makefile,v 1.6 2023/04/11 00:09:23 markd Exp $
 
 DISTNAME=      texlive-scripts.doc
-PKGNAME=       tex-${DISTNAME:S/./-/}-2022
-TEXLIVE_REV=   63029
+PKGNAME=       tex-${DISTNAME:S/./-/}-2023
+TEXLIVE_REV=   66797
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Documentation for tex-texlive-scripts

Index: pkgsrc/print/tex-texlive-scripts-doc/distinfo
diff -u pkgsrc/print/tex-texlive-scripts-doc/distinfo:1.6 pkgsrc/print/tex-texlive-scripts-doc/distinfo:1.7
--- pkgsrc/print/tex-texlive-scripts-doc/distinfo:1.6   Sun Apr 17 10:23:51 2022
+++ pkgsrc/print/tex-texlive-scripts-doc/distinfo       Tue Apr 11 00:09:23 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/04/17 10:23:51 markd Exp $
+$NetBSD: distinfo,v 1.7 2023/04/11 00:09:23 markd Exp $
 
-BLAKE2s (texlive-scripts.doc.r63029.tar.xz) = 6e0bea258e66650acc4bd1bc26aa371167a3ba9d7a9ac3c5f2a24259de404291
-SHA512 (texlive-scripts.doc.r63029.tar.xz) = 64794f64b36670b0065bc0ffdc4f513aafd4cbf4989731fd564679a86d7c01cfae913211024d54993af2763c2d672b1b36af435e3c6185bbf805429e9dd76867
-Size (texlive-scripts.doc.r63029.tar.xz) = 406036 bytes
+BLAKE2s (texlive-scripts.doc.r66797.tar.xz) = 155640d79105a445406f243fde0ae34293ed9b572efede2498c97c0312a7f637
+SHA512 (texlive-scripts.doc.r66797.tar.xz) = e23a6eaee62a46c8640e87b2ee6e2615c54eaac0b97c6f534a97b696da067090d2099c6c77860f9d456937e3ce50e6b4fd5b862b5d9542ea725dc8447041bde8
+Size (texlive-scripts.doc.r66797.tar.xz) = 423472 bytes

Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.1 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.2
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.1      Sun May 10 03:56:44 2020
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil  Tue Apr 11 00:09:23 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_fmtutil,v 1.1 2020/05/10 03:56:44 markd Exp $
+$NetBSD: patch-bin_fmtutil,v 1.2 2023/04/11 00:09:23 markd Exp $
 
 use full path for commands
 
---- bin/fmtutil.orig   2020-03-14 22:04:10.000000000 +0000
+--- bin/fmtutil.orig   2023-02-20 21:52:59.000000000 +0000
 +++ bin/fmtutil
 @@ -14,7 +14,7 @@ my $TEXMFROOT;
  
@@ -13,7 +13,7 @@ use full path for commands
    if ($?) {
      die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
    }
-@@ -70,12 +70,12 @@ TeXLive::TLUtils::prepend_own_path();
+@@ -76,12 +76,12 @@ TeXLive::TLUtils::prepend_own_path();
  # this function checks by itself whether it is running on windows or not
  reset_root_home();
  
@@ -31,8 +31,8 @@ use full path for commands
 +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 {
+ if (wndws()) {
+@@ -297,7 +297,7 @@ sub main {
        for my $e (sort @all_engines) {
          my $hf = $alldata->{'merged'}{$f}{$e}{'hyphen'};
          next if ($hf eq '-');
@@ -41,7 +41,7 @@ use full path for commands
          chomp($ff);
          if ($ff ne "") {
            if ($#all_engines > 0) {
-@@ -494,13 +494,13 @@ sub select_and_rebuild_format {
+@@ -596,13 +596,13 @@ sub select_and_rebuild_format {
      if ($fmthyp ne '-') {
        if ($whatarg =~ m!^/!) {
          # $whatarg is a full path, we need to expand $fmthyp, too
@@ -57,7 +57,7 @@ use full path for commands
            if ($fmthyplong) {
              $fmthyp = $fmthyplong;
            } else {
-@@ -597,7 +597,7 @@ sub rebuild_one_format {
+@@ -724,7 +724,7 @@ sub rebuild_one_format {
    else                         { $prgswitch .= $fmt; }
  
    # check for existence of ini file before doing anything else
@@ -66,7 +66,7 @@ use full path for commands
      # 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
-@@ -626,7 +626,7 @@ sub rebuild_one_format {
+@@ -753,7 +753,7 @@ sub rebuild_one_format {
      $texargs = $addargs;
    }
    if ($pool) {
@@ -75,7 +75,7 @@ use full path for commands
      if ($poolfile && -f $poolfile) {
        print_verbose("attempting to create localized format "
                      . "using pool=$pool and tcx=$tcx.\n");
-@@ -1060,7 +1060,7 @@ sub determine_config_files {
+@@ -1208,7 +1208,7 @@ sub determine_config_files {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -84,10 +84,10 @@ use full path for commands
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-@@ -1070,10 +1070,10 @@ sub determine_config_files {
+@@ -1218,10 +1218,10 @@ sub determine_config_files {
      my $TEXMFLOCALVAR;
      my @TEXMFLOCAL;
-     if (win32()) {
+     if (wndws()) {
 -      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
 +      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path=\$TEXMFLOCAL`);
        @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR);
Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.1 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.2
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.1       Sun May 10 03:56:44 2020
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap   Tue Apr 11 00:09:23 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_updmap,v 1.1 2020/05/10 03:56:44 markd Exp $
+$NetBSD: patch-bin_updmap,v 1.2 2023/04/11 00:09:23 markd Exp $
 
 use full path for commands
 
---- bin/updmap.orig    2019-06-07 16:36:59.000000000 +0000
+--- bin/updmap.orig    2023-02-19 20:49:48.000000000 +0000
 +++ bin/updmap
-@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 51338 2019-0
+@@ -18,7 +18,7 @@ my $svnid = '$Id: updmap.pl 65932 2023-0
  my $TEXMFROOT;
  BEGIN {
    $^W = 1;
@@ -13,7 +13,7 @@ use full path for commands
    if ($?) {
      die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
    }
-@@ -46,12 +46,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
+@@ -45,12 +45,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  # see more comments at the definition of this function.
  reset_root_home();
  
@@ -31,8 +31,8 @@ use full path for commands
 +chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
  
  # make sure that on windows *everything* is in lower case for comparison
- if (win32()) {
-@@ -239,7 +239,7 @@ sub main {
+ if (wndws()) {
+@@ -238,7 +238,7 @@ sub main {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -41,10 +41,10 @@ use full path for commands
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-@@ -249,10 +249,10 @@ sub main {
+@@ -248,10 +248,10 @@ sub main {
      my $TEXMFLOCALVAR;
      my @TEXMFLOCAL;
-     if (win32()) {
+     if (wndws()) {
 -      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
 +      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path=\$TEXMFLOCAL`);
        @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR);
@@ -54,7 +54,7 @@ use full path for commands
        @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
      #
-@@ -1281,7 +1281,7 @@ sub mkMaps {
+@@ -1282,7 +1282,7 @@ sub mkMaps {
  
    sub check_mismatch {
      my ($mm, $d, $f, $prog) = @_;
@@ -63,7 +63,7 @@ use full path for commands
      if (lc("$d/$f") ne lc($kpsefound)) {
        $mm->{$f} = $kpsefound;
      }
-@@ -1397,7 +1397,7 @@ listed below).
+@@ -1398,7 +1398,7 @@ listed below).
  
  sub locateMap {
    my $map = shift;
@@ -72,7 +72,7 @@ use full path for commands
    chomp($ret);
    return $ret;
  }
-@@ -2072,7 +2072,7 @@ sub read_map_files {
+@@ -2073,7 +2073,7 @@ sub read_map_files {
      $alldata->{'maps'}{$m}{'origin'} = 'builtin';
    }
    @maps = sort_uniq(@maps);

Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs:1.2 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs:1.3
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs:1.2        Sun May 10 03:56:44 2020
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_rungs    Tue Apr 11 00:09:23 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-bin_rungs,v 1.2 2020/05/10 03:56:44 markd Exp $
+$NetBSD: patch-bin_rungs,v 1.3 2023/04/11 00:09:23 markd Exp $
 
 use full path for commands
 
---- bin/rungs.orig     2013-04-25 17:29:00.000000000 +0000
+--- bin/rungs.orig     2022-09-11 19:08:51.000000000 +0000
 +++ bin/rungs
-@@ -23,7 +23,7 @@ end
- if os.type == 'windows' then
-    command={'gswin32c'}
+@@ -38,7 +38,7 @@ if os.type == 'windows' then
+       command = {'gswin32c'}
+    end
  else
--   command={'gs'}
-+   command={'@GS@'}
+-   command = {'gs'}
++   command = {'@GS@'}
  end
  
  for i=1, #arg do

Index: pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg:1.3 pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg:1.4
--- pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg:1.3      Sun Apr 17 10:23:51 2022
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg  Tue Apr 11 00:09:23 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.3 2022/04/17 10:23:51 markd Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.4 2023/04/11 00:09:23 markd Exp $
 
 Start with no maps defined. Added by TEX_*MAP_FILES
 
---- texmf-dist/web2c/updmap.cfg.orig   2022-02-21 00:47:40.000000000 +0000
+--- texmf-dist/web2c/updmap.cfg.orig   2023-04-08 23:48:58.000000000 +0000
 +++ texmf-dist/web2c/updmap.cfg
-@@ -104,381 +104,3 @@ jaVariant -04
+@@ -104,386 +104,3 @@ jaVariant -04
  
  
  #  (end of updmap-hdr.cfg)
@@ -77,6 +77,7 @@ Start with no maps defined. Added by TEX
 -MixedMap ccpl.map
 -Map ccicons.map
 -Map clm.map
+-Map charssil.map
 -Map chemarrow.map
 -Map Chivo.map
 -Map cinzel.map
@@ -103,6 +104,7 @@ Start with no maps defined. Added by TEX
 -Map ComicNeue.map
 -Map ComicNeueAngular.map
 -Map original-context-symbol.map
+-Map CooperHewitt.map
 -Map CormorantGaramond.map
 -Map countriesofeurope.map
 -Map ucr.map
@@ -156,6 +158,7 @@ Start with no maps defined. Added by TEX
 -Map frcursive.map
 -Map GaramondLibre.map
 -Map garuda-c90.map
+-Map gelasio.map
 -Map gentium-type1.map
 -Map gfsartemisia.map
 -Map gfsbaskerville.map
@@ -313,11 +316,13 @@ Start with no maps defined. Added by TEX
 -Map scanpages.map
 -Map ScholaX.map
 -MixedMap semaf.map
+-Map simpleicons.map
 -Map SkakNew.map
 -Map SourceCodePro.map
 -Map SourceSansPro.map
 -Map SourceSerifPro.map
 -Map spectral.map
+-Map srbtiks.map
 -Map starfont.map
 -Map icelandic.map
 -Map STEP.map