CVS commit: pkgsrc/print/tex-texlive.infra

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Apr 17 10:24:32 UTC 2022

Modified Files:
        pkgsrc/print/tex-texlive.infra: Makefile distinfo
        pkgsrc/print/tex-texlive.infra/patches: patch-ab

Log Message:
tex-texlive.infra: update to 2022

texlive 2022 version


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/tex-texlive.infra/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/tex-texlive.infra/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-texlive.infra/patches/patch-ab

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.infra/Makefile
diff -u pkgsrc/print/tex-texlive.infra/Makefile:1.29 pkgsrc/print/tex-texlive.infra/Makefile:1.30
--- pkgsrc/print/tex-texlive.infra/Makefile:1.29        Sun Jun  6 23:16:49 2021
+++ pkgsrc/print/tex-texlive.infra/Makefile     Sun Apr 17 10:24:32 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2021/06/06 23:16:49 markd Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/17 10:24:32 markd Exp $
 
 DISTNAME=      texlive.infra
-PKGNAME=       tex-${DISTNAME}-2021
-TEXLIVE_REV=   59352
+PKGNAME=       tex-${DISTNAME}-2022
+TEXLIVE_REV=   62297
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Basic TeX Live infrastructure

Index: pkgsrc/print/tex-texlive.infra/distinfo
diff -u pkgsrc/print/tex-texlive.infra/distinfo:1.20 pkgsrc/print/tex-texlive.infra/distinfo:1.21
--- pkgsrc/print/tex-texlive.infra/distinfo:1.20        Tue Oct 26 11:14:50 2021
+++ pkgsrc/print/tex-texlive.infra/distinfo     Sun Apr 17 10:24:32 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:14:50 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/04/17 10:24:32 markd Exp $
 
-BLAKE2s (texlive.infra.r59352.tar.xz) = b87445b09e707d4ba71c58170815f3300894e08887b16e47058e82eb98214090
-SHA512 (texlive.infra.r59352.tar.xz) = 318d24e48a2880488924a2beb54552f028f47397b5b75b7a606926b63ad9bb26017bbbd128ca16a7f3c7578e89047b58955d0106fb6a00c4c7085e241d5213f4
-Size (texlive.infra.r59352.tar.xz) = 230640 bytes
+BLAKE2s (texlive.infra.r62297.tar.xz) = 3fee50b18ff1c22f0c8145e7739e8c56deb4ef4f2342e88e4875eec01002137d
+SHA512 (texlive.infra.r62297.tar.xz) = 01713f8087a6d21e186a01bdfae0db8f735792cd20dbf1a1dd5cbbe72f99ef06393a03bcbd0d0129fce2aa3c1f01f55df33e3f3208c62713114a5984afd23191
+Size (texlive.infra.r62297.tar.xz) = 348832 bytes
 SHA1 (patch-aa) = fa49e775842a96e0667b35fb9629cd007d043544
-SHA1 (patch-ab) = e9a708b1d2df9442a30a45f8937a1560840f7be1
+SHA1 (patch-ab) = be4e0ac2390a2d3dc35b5bdcedfdf7525e8598d0

Index: pkgsrc/print/tex-texlive.infra/patches/patch-ab
diff -u pkgsrc/print/tex-texlive.infra/patches/patch-ab:1.1 pkgsrc/print/tex-texlive.infra/patches/patch-ab:1.2
--- pkgsrc/print/tex-texlive.infra/patches/patch-ab:1.1 Tue Jul 24 09:24:22 2012
+++ pkgsrc/print/tex-texlive.infra/patches/patch-ab     Sun Apr 17 10:24:32 2022
@@ -1,37 +1,46 @@
-$NetBSD: patch-ab,v 1.1 2012/07/24 09:24:22 jperkin Exp $
+$NetBSD: patch-ab,v 1.2 2022/04/17 10:24:32 markd Exp $
 
 Fix paths to kpsewhich.
 
---- tlpkg/TeXLive/TLUtils.pm.orig      2012-07-24 09:03:04.471178595 +0000
-+++ tlpkg/TeXLive/TLUtils.pm   2012-07-24 09:03:27.491955121 +0000
-@@ -1609,7 +1609,7 @@
+--- tlpkg/TeXLive/TLUtils.pm.orig      2022-02-28 22:13:17.000000000 +0000
++++ tlpkg/TeXLive/TLUtils.pm
+@@ -1802,7 +1802,7 @@ sub _do_postaction_filetype {
    }
    my $cmd = $keyval{'cmd'};
  
--  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
-+  my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+-  my $texdir = `kpsewhich -var-value=TEXMFROOT`;
++  my $texdir = `@KPSEWHICH@ -var-value=TEXMFROOT`;
    chomp($texdir);
    my $texdir_bsl = conv_to_w32_path($texdir);
    $cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
-@@ -1684,7 +1684,7 @@
+@@ -1877,7 +1877,7 @@ sub _do_postaction_script {
    if (win32() && defined($keyval{'filew32'})) {
      $file = $keyval{'filew32'};
    }
--  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
-+  my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+-  my $texdir = `kpsewhich -var-value=TEXMFROOT`;
++  my $texdir = `@KPSEWHICH@ -var-value=TEXMFROOT`;
    chomp($texdir);
    my @syscmd;
    if ($file =~ m/\.pl$/i) {
-@@ -1759,7 +1759,7 @@
+@@ -1952,7 +1952,7 @@ sub _do_postaction_shortcut {
  
    &log("postaction $how shortcut for " . $tlpobj->name . "\n");
    if ($how eq "install") {
--    my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
-+    my $texdir = `@KPSEWHICH@ -var-value=SELFAUTOPARENT`;
+-    my $texdir = `kpsewhich -var-value=TEXMFROOT`;
++    my $texdir = `@KPSEWHICH@ -var-value=TEXMFROOT`;
      chomp($texdir);
      my $texdir_bsl = conv_to_w32_path($texdir);
      $icon =~ s!^TEXDIR/!$texdir/!;
-@@ -3863,7 +3863,7 @@
+@@ -3193,7 +3193,7 @@ sub create_updmap {
+ }
+ 
+ sub check_for_old_updmap_cfg {
+-  chomp( my $tmfsysconf = `kpsewhich -var-value=TEXMFSYSCONFIG` ) ;
++  chomp( my $tmfsysconf = `@KPSEWHICH@ -var-value=TEXMFSYSCONFIG` ) ;
+   my $oldupd = "$tmfsysconf/web2c/updmap.cfg";
+   return unless -r $oldupd;  # if no such file, good.
+ 
+@@ -4699,7 +4699,7 @@ sub mktexupd {
        }
        my $delim= (&win32)? ';' : ':';
        my $TEXMFDBS;