CVS commit: pkgsrc/print

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Apr  4 05:10:10 UTC 2026

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_mktexpk patch-bin_updmap
            patch-texmf-dist_web2c_updmap.cfg

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

changes unknown


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/tex-texlive-scripts/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/tex-texlive-scripts/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/tex-texlive-scripts-doc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/tex-texlive-scripts-doc/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk
cvs rdiff -u -r1.6 -r1.7 \
    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.32 pkgsrc/print/tex-texlive-scripts/Makefile:1.33
--- pkgsrc/print/tex-texlive-scripts/Makefile:1.32      Sun May 11 11:16:03 2025
+++ pkgsrc/print/tex-texlive-scripts/Makefile   Sat Apr  4 05:10:10 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2025/05/11 11:16:03 markd Exp $
+# $NetBSD: Makefile,v 1.33 2026/04/04 05:10:10 markd Exp $
 
 DISTNAME=      texlive-scripts
-PKGNAME=       tex-${DISTNAME}-2025
-TEXLIVE_REV=   75165
+PKGNAME=       tex-${DISTNAME}-2026
+TEXLIVE_REV=   78581
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       TeX Live infrastructure programs

Index: pkgsrc/print/tex-texlive-scripts/distinfo
diff -u pkgsrc/print/tex-texlive-scripts/distinfo:1.31 pkgsrc/print/tex-texlive-scripts/distinfo:1.32
--- pkgsrc/print/tex-texlive-scripts/distinfo:1.31      Sun May 11 11:16:03 2025
+++ pkgsrc/print/tex-texlive-scripts/distinfo   Sat Apr  4 05:10:10 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.31 2025/05/11 11:16:03 markd Exp $
+$NetBSD: distinfo,v 1.32 2026/04/04 05:10:10 markd Exp $
 
-BLAKE2s (texlive-scripts.r75165.tar.xz) = cabd95a0f21a249da6b14e75e9f70689a0a10800bf9830ae1802ca76b5146b66
-SHA512 (texlive-scripts.r75165.tar.xz) = 6b342fa3d965d55942e8de776dd7af52580ce63fb1baee7441a6a144743a24165017dd26192941da7f1200400c32bac2374d1ac939aff05866b8510d715321ee
-Size (texlive-scripts.r75165.tar.xz) = 114916 bytes
-SHA1 (patch-bin_fmtutil) = 038fdda482a6b3d9603d974bd3b010493706d7ff
+BLAKE2s (texlive-scripts.r78581.tar.xz) = e856b0d3a15ce722dc3b95b336268595629a137f7175f2b7a4784038fe10f6ad
+SHA512 (texlive-scripts.r78581.tar.xz) = 407b309727601ed3b308009d9c1ce6aa96f07707e2837b0092b617d7f72b6cd881e720d358915fa7ef242dd38030955f2749f32bab9513efe067032ec71a278f
+Size (texlive-scripts.r78581.tar.xz) = 115796 bytes
+SHA1 (patch-bin_fmtutil) = c3e11a3e0e4a4b911d30f5dddb5650666c970578
 SHA1 (patch-bin_fmtutil-sys) = 85413eb237d1fae9261dddae99e6c347c22db10c
 SHA1 (patch-bin_mktexmf) = e58b8e521c65f44c18251621866ee23052f4de1b
-SHA1 (patch-bin_mktexpk) = d7a81ae56edfc4823a3cd1aa7bb50c98eac20264
+SHA1 (patch-bin_mktexpk) = c7ed6f0f4e0ca081215a4db5e090f39e461d47e7
 SHA1 (patch-bin_mktextfm) = a6ca49d59a9b67a1765a14d9e3075086c2cd8912
 SHA1 (patch-bin_rungs) = 1bd96d36a4aab3e71612e8e73145c2de01273e17
-SHA1 (patch-bin_updmap) = c5e3a67fdd493a0ba8ab3b3c4baf894f1805c206
+SHA1 (patch-bin_updmap) = 82fcfeb2cf0ac36e25bcbaa3752dabce7e018e08
 SHA1 (patch-bin_updmap-sys) = 7825dc2d9ffb10f62ea2e4a3609d6de98785cdbd
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 3e167307aa476c3902ab4f723a827f12aac30d0e
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 16e5816c5888b669c001dd7e5230ad12e54633ca

Index: pkgsrc/print/tex-texlive-scripts-doc/Makefile
diff -u pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.11 pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.12
--- pkgsrc/print/tex-texlive-scripts-doc/Makefile:1.11  Sun May 11 11:16:03 2025
+++ pkgsrc/print/tex-texlive-scripts-doc/Makefile       Sat Apr  4 05:10:10 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2025/05/11 11:16:03 markd Exp $
+# $NetBSD: Makefile,v 1.12 2026/04/04 05:10:10 markd Exp $
 
 DISTNAME=      texlive-scripts.doc
-PKGNAME=       tex-${DISTNAME:S/./-/}-2025
-TEXLIVE_REV=   75165
+PKGNAME=       tex-${DISTNAME:S/./-/}-2026
+TEXLIVE_REV=   78581
 
 MAINTAINER=    minskim%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.12 pkgsrc/print/tex-texlive-scripts-doc/distinfo:1.13
--- pkgsrc/print/tex-texlive-scripts-doc/distinfo:1.12  Sun May 11 11:16:03 2025
+++ pkgsrc/print/tex-texlive-scripts-doc/distinfo       Sat Apr  4 05:10:10 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2025/05/11 11:16:03 markd Exp $
+$NetBSD: distinfo,v 1.13 2026/04/04 05:10:10 markd Exp $
 
-BLAKE2s (texlive-scripts.doc.r75165.tar.xz) = a63caecf98621748daf71365dc25583a8a927eca45ea07e931a82b82817810c4
-SHA512 (texlive-scripts.doc.r75165.tar.xz) = f66dc3e7911c42de83509b20620c87f89097ebb0489cf75e2fefc8a3569abd60163bfd76d5202c6849a2ba191f2491e7dd6ef65a85fda8bcaa4ce15e154d8ee8
-Size (texlive-scripts.doc.r75165.tar.xz) = 450600 bytes
+BLAKE2s (texlive-scripts.doc.r78581.tar.xz) = 1778fddccd49df55ac0514b81fd01cb6ae96406036e031e30abf82f413ed528d
+SHA512 (texlive-scripts.doc.r78581.tar.xz) = 9aade8e5e5cd29397e71416e67177b2089d473b555802b6012e8ec027e2230fe56541742365f86e2dfd1c9d5e118c58b9a299bf0968d4d747572ced765751c93
+Size (texlive-scripts.doc.r78581.tar.xz) = 460712 bytes

Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.2 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.3
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil:1.2      Tue Apr 11 00:09:23 2023
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_fmtutil  Sat Apr  4 05:10:10 2026
@@ -1,19 +1,19 @@
-$NetBSD: patch-bin_fmtutil,v 1.2 2023/04/11 00:09:23 markd Exp $
+$NetBSD: patch-bin_fmtutil,v 1.3 2026/04/04 05:10:10 markd Exp $
 
 use full path for commands
 
---- bin/fmtutil.orig   2023-02-20 21:52:59.000000000 +0000
+--- bin/fmtutil.orig   2026-01-09 16:20:28.000000000 +0000
 +++ bin/fmtutil
-@@ -14,7 +14,7 @@ my $TEXMFROOT;
- 
- BEGIN {
-   $^W = 1;
+@@ -30,7 +30,7 @@ BEGIN {
+     $Master = "$Master/../..";
+   }
+   $ENV{"PATH"} = "$bindir:$ENV{PATH}";
 -  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
 +  $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`;
-   if ($?) {
-     die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
-   }
-@@ -76,12 +76,12 @@ TeXLive::TLUtils::prepend_own_path();
+   if ($? || ! $TEXMFROOT) {
+     warn "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+     warn "$0:   got TEXMFROOT value: $TEXMFROOT" if $TEXMFROOT;
+@@ -94,12 +94,12 @@ TeXLive::TLUtils::prepend_own_path();
  # this function checks by itself whether it is running on windows or not
  reset_root_home();
  
@@ -32,7 +32,7 @@ use full path for commands
  
  # make sure that on windows *everything* is in lower case for comparison
  if (wndws()) {
-@@ -297,7 +297,7 @@ sub main {
+@@ -316,7 +316,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) {
-@@ -596,13 +596,13 @@ sub select_and_rebuild_format {
+@@ -628,13 +628,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 {
-@@ -724,7 +724,7 @@ sub rebuild_one_format {
+@@ -756,7 +756,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
-@@ -753,7 +753,7 @@ sub rebuild_one_format {
+@@ -785,7 +785,7 @@ sub rebuild_one_format {
      $texargs = $addargs;
    }
    if ($pool) {
@@ -75,7 +75,16 @@ use full path for commands
      if ($poolfile && -f $poolfile) {
        print_verbose("attempting to create localized format "
                      . "using pool=$pool and tcx=$tcx.\n");
-@@ -1208,7 +1208,7 @@ sub determine_config_files {
+@@ -1247,7 +1247,7 @@ sub determine_config_files {
+         # if $f is a pure file name, that is dirname $f == ".",
+         # then try to find it via kpsewhich
+         if (dirname($f) eq ".") {
+-          chomp(my $kpfile = `kpsewhich $f`);
++          chomp(my $kpfile = `@KPSEWHICH@ $f`);
+           if ($kpfile ne "") {
+             $f = $kpfile;
+           } else {
+@@ -1264,7 +1264,7 @@ sub determine_config_files {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -84,7 +93,7 @@ use full path for commands
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-@@ -1218,10 +1218,10 @@ sub determine_config_files {
+@@ -1274,10 +1274,10 @@ sub determine_config_files {
      my $TEXMFLOCALVAR;
      my @TEXMFLOCAL;
      if (wndws()) {
Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.2 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.3
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap:1.2       Tue Apr 11 00:09:23 2023
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_updmap   Sat Apr  4 05:10:10 2026
@@ -1,19 +1,19 @@
-$NetBSD: patch-bin_updmap,v 1.2 2023/04/11 00:09:23 markd Exp $
+$NetBSD: patch-bin_updmap,v 1.3 2026/04/04 05:10:10 markd Exp $
 
 use full path for commands
 
---- bin/updmap.orig    2023-02-19 20:49:48.000000000 +0000
+--- bin/updmap.orig    2026-02-24 16:08:16.000000000 +0000
 +++ bin/updmap
-@@ -18,7 +18,7 @@ my $svnid = '$Id: updmap.pl 65932 2023-0
- my $TEXMFROOT;
- BEGIN {
-   $^W = 1;
+@@ -35,7 +35,7 @@ BEGIN {
+     $Master = "$Master/../..";
+   }
+   $ENV{"PATH"} = "$bindir:$ENV{PATH}";
 -  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
 +  $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`;
-   if ($?) {
-     die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
-   }
-@@ -45,12 +45,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
+   if ($? || ! $TEXMFROOT) {
+     warn "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+     warn "$0:   got TEXMFROOT value: $TEXMFROOT" if $TEXMFROOT;
+@@ -64,12 +64,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  # see more comments at the definition of this function.
  reset_root_home();
  
@@ -32,7 +32,7 @@ use full path for commands
  
  # make sure that on windows *everything* is in lower case for comparison
  if (wndws()) {
-@@ -238,7 +238,7 @@ sub main {
+@@ -261,7 +261,7 @@ sub main {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -41,7 +41,7 @@ use full path for commands
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-@@ -248,10 +248,10 @@ sub main {
+@@ -271,10 +271,10 @@ sub main {
      my $TEXMFLOCALVAR;
      my @TEXMFLOCAL;
      if (wndws()) {
@@ -54,7 +54,7 @@ use full path for commands
        @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
      #
-@@ -1282,7 +1282,7 @@ sub mkMaps {
+@@ -1309,7 +1309,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;
      }
-@@ -1398,7 +1398,7 @@ listed below).
+@@ -1431,7 +1431,7 @@ listed below).
  
  sub locateMap {
    my $map = shift;
@@ -72,7 +72,7 @@ use full path for commands
    chomp($ret);
    return $ret;
  }
-@@ -2073,7 +2073,7 @@ sub read_map_files {
+@@ -2106,7 +2106,7 @@ sub read_map_files {
      $alldata->{'maps'}{$m}{'origin'} = 'builtin';
    }
    @maps = sort_uniq(@maps);

Index: pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk
diff -u pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk:1.1 pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk:1.2
--- pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk:1.1      Sun May 10 03:56:44 2020
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-bin_mktexpk  Sat Apr  4 05:10:10 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_mktexpk,v 1.1 2020/05/10 03:56:44 markd Exp $
+$NetBSD: patch-bin_mktexpk,v 1.2 2026/04/04 05:10:10 markd Exp $
 
 use full path for commands
 
---- bin/mktexpk.orig   2009-06-03 06:07:21.000000000 -0700
+--- bin/mktexpk.orig   2025-10-16 14:46:21.000000000 +0000
 +++ bin/mktexpk
-@@ -60,8 +60,8 @@ fi
+@@ -78,8 +78,8 @@ fi
  mt_max_args=2
  
  # Common code for all scripts.
@@ -15,7 +15,7 @@ use full path for commands
  test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
  if test ! -f "$MT_MKTEX_OPT"; then
    echo "$progname: Cannot find mktex.opt; check your installation." >&2
-@@ -87,7 +87,7 @@ esac
+@@ -105,7 +105,7 @@ esac
  
  NAME=$1
  
@@ -24,16 +24,16 @@ use full path for commands
    # determine the progname of metafont to use; prefer mf-nowin.
    if (mf-nowin --version) >/dev/null 2>&1; then
      MF="mf-nowin -progname=mf"
-@@ -145,7 +145,7 @@ else
+@@ -163,7 +163,7 @@ else
      ps2pk)
        # grep for the font in $PSMAPFILE.  These are base font names, such as
        # rpplr (the original) or pplr0 (an interim step) or pplr8r (current).
 -      : ${PSMAPFILE=`kpsewhich --format=map psfonts.map ps2pk.map`}
 +      : ${PSMAPFILE=`@KPSEWHICH@ --format=map psfonts.map ps2pk.map`}
-       pattern="^$NAME"'([     ]|$)' 
-       psline=`egrep "$pattern" $PSMAPFILE | tail -1`
+       pattern="^$NAME"'\([    ]|$\)' 
+       psline=`grep "$pattern" $PSMAPFILE | tail -1`
        if test -n "$psline"; then
-@@ -165,7 +165,7 @@ else
+@@ -183,7 +183,7 @@ else
          # Guessing the name of the type1 font file as fallback:
          ANAME=`echo $NAME | sed 's/8r$/8a/'`
          for i in $NAME.pfa $NAME.pfb $ANAME.pfa $ANAME.pfb; 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.6 pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg:1.7
--- pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg:1.6      Sun May 11 11:16:03 2025
+++ pkgsrc/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg  Sat Apr  4 05:10:10 2026
@@ -1,13 +1,14 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.6 2025/05/11 11:16:03 markd Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.7 2026/04/04 05:10:10 markd Exp $
 
 Start with no maps defined. Added by TEX_*MAP_FILES
 
---- texmf-dist/web2c/updmap.cfg.orig   2025-05-06 23:40:29.000000000 +0000
+--- texmf-dist/web2c/updmap.cfg.orig   2026-03-20 00:40:35.000000000 +0000
 +++ texmf-dist/web2c/updmap.cfg
-@@ -104,392 +104,3 @@ jaVariant -04
+@@ -104,396 +104,3 @@ jaVariant -04
  
  
  #  (end of updmap-hdr.cfg)
+-Map academicons.map
 -Map accanthis.map
 -Map adforn.map
 -Map adfsymbols.map
@@ -151,6 +152,8 @@ Start with no maps defined. Added by TEX
 -Map fontawesome.map
 -Map fontawesome5.map
 -Map fontawesome6.map
+-Map fontawesome7.map
+-Map arundina.map
 -Map nectec.map
 -Map nf.map
 -Map sipa.map
@@ -325,9 +328,10 @@ Start with no maps defined. Added by TEX
 -Map simpleicons.map
 -Map SkakNew.map
 -Map SourceCodePro.map
--Map SourceSansPro.map
--Map SourceSerifPro.map
+-Map SourceSansThree.map
+-Map SourceSerifFour.map
 -Map spectral.map
+-Map Splentinex.map
 -Map srbtiks.map
 -Map starfont.map
 -Map icelandic.map