web2c: update to 2022 - texlive 2022 version

* New engine hitex, which outputs its own HINT format, designed especially
  for reading technical documents on mobile devices. HINT viewers for GNU/Linux,
  Windows, and Android are available separately from TeX Live.
* tangle, weave: support optional third argument to specify output file.
* Knuth’s program twill for making mini-indexes for original WEB programs now
  included.

Cross-engine extensions (except in original TeX, Aleph, and hiTeX):
* New primitive \showstream to redirect \show output to a file.
* New primitives \partokenname and \partokencontext allow overriding the name
  of the \par token emitted at blank lines, the end of vboxes, etc.

4 files changed, 29 insertions, 20 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index aa4cf51a313..5e54b5d28b7 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2021/06/15 13:21:04 nia Exp $
+# $NetBSD: Makefile,v 1.109 2022/04/17 10:46:46 markd Exp $
 
 .include "../../print/texlive/Makefile.common"
 
-PKGNAME=	web2c-2021
+PKGNAME=	web2c-2022
 CATEGORIES=	print
 
 HOMEPAGE=	https://www.tug.org/web2c/
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index 3ef48b44639..f20d1c0a4fd 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/10/29 19:47:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2022/04/17 10:46:46 markd Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
@@ -15,6 +15,9 @@ bin/euptex
 bin/gftodvi
 bin/gftopk
 bin/gftype
+bin/hishrink
+bin/histretch
+bin/hitex
 bin/inimf
 bin/initex
 bin/mf
@@ -57,6 +60,7 @@ bin/tex
 bin/tftopl
 bin/tie
 bin/ttf2afm
+bin/twill
 bin/upbibtex
 bin/updvitomp
 bin/updvitype
@@ -94,9 +98,11 @@ man/man1/euptex.1
 man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
+man/man1/hishrink.1
+man/man1/histretch.1
+man/man1/hitex.1
 man/man1/inimf.1
 man/man1/initex.1
-man/man1/lamed.1
 man/man1/mf-nowin.1
 man/man1/mf.1
 man/man1/mft.1
@@ -113,6 +119,7 @@ man/man1/outocp.1
 man/man1/ovf2ovp.1
 man/man1/ovp2ovf.1
 man/man1/patgen.1
+man/man1/pbibtex.1
 man/man1/pdftex.1
 man/man1/pdftosrc.1
 man/man1/pktogf.1
@@ -128,6 +135,8 @@ man/man1/tex.1
 man/man1/tftopl.1
 man/man1/tie.1
 man/man1/ttf2afm.1
+man/man1/twill.1
+man/man1/upbibtex.1
 man/man1/uppltotf.1
 man/man1/uptex.1
 man/man1/uptftopl.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 873cb178643..64286018117 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.42 2021/10/26 11:15:12 nia Exp $
+$NetBSD: distinfo,v 1.43 2022/04/17 10:46:46 markd Exp $
 
-BLAKE2s (texlive-20210325-source.tar.xz) = 1ff1ac8c15651d79483605f071a71c7eb253477627b3f478c261a87bf98a7186
-SHA512 (texlive-20210325-source.tar.xz) = afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-Size (texlive-20210325-source.tar.xz) = 54837368 bytes
+BLAKE2s (texlive-20220321-source.tar.xz) = 1f3a5c33cba94663158aba15b12da5a265b8ec44eab741a6b9f1037d0c412341
+SHA512 (texlive-20220321-source.tar.xz) = 1c6b4c80d474b661060c3ac126b41782fd34e883139b9bca89ca1ffe543891bd9451df3be5e6297af965ddbceea9802008a61589344c3dee8075044b1b288dd7
+Size (texlive-20220321-source.tar.xz) = 67975836 bytes
 SHA1 (patch-Makefile.in) = e4446fc146b419ca5f2105d2a78c7789149b40ea
-SHA1 (patch-man_Makefile.in) = 9b57fbd750476ef3aff268918135ce63f553ef14
+SHA1 (patch-man_Makefile.in) = 503f9394e2bd7cebeddbef32901cacb96db036b2
diff --git a/print/web2c/patches/patch-man_Makefile.in b/print/web2c/patches/patch-man_Makefile.in
index 6e493d748ae..af120020229 100644
--- a/print/web2c/patches/patch-man_Makefile.in
+++ b/print/web2c/patches/patch-man_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-man_Makefile.in,v 1.3 2020/10/29 19:47:13 markd Exp $
+$NetBSD: patch-man_Makefile.in,v 1.4 2022/04/17 10:46:46 markd Exp $
 
 Don't install some man pages that are installed in later packages.
 
---- man/Makefile.in.orig	2019-11-17 17:05:39.000000000 +0000
+--- man/Makefile.in.orig	2022-02-26 17:51:21.000000000 +0000
 +++ man/Makefile.in
-@@ -446,8 +446,7 @@ x_tool_libs = @x_tool_libs@
+@@ -450,8 +450,7 @@ x_tool_libs = @x_tool_libs@
  man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
  	$(am__append_4) $(am__append_7) $(am__append_8) \
  	$(am__append_9) $(am__append_11) $(am__append_13) \
@@ -13,18 +13,18 @@ Don't install some man pages that are installed in later packages.
 +	$(am__append_15) $(am__append_16) $(am__append_18)
  EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
  	mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
- 	ppltotf.man ptftopl.man luatex.man xetex.man \
-@@ -457,11 +456,8 @@ bootstrap_man_sources = ctie.man cweb.ma
+ 	ppltotf.man ptftopl.man pbibtex.man luatex.man xetex.man \
+@@ -461,11 +460,8 @@ bootstrap_man_sources = ctie.man cweb.ma
  # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
  man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
  	ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
 -	$(am__append_6) $(am__append_10) $(am__append_12) \
--	$(am__append_14) $(am__append_17) $(am__append_19) \
--	latex-dev:pdflatex-dev latex-dev:xelatex-dev \
--	latex-dev:lualatex-dev latex-dev:dvilualatex-dev \
--	latex-dev:platex-dev latex-dev:uplatex-dev
+-	$(am__append_14) $(am__append_17) latex-dev:pdflatex-dev \
+-	latex-dev:xelatex-dev latex-dev:lualatex-dev \
+-	latex-dev:dvilualatex-dev latex-dev:platex-dev \
+-	latex-dev:uplatex-dev
 +	$(am__append_6) $(am__append_12) \
-+	$(am__append_14) $(am__append_17) $(am__append_19)
++	$(am__append_14) $(am__append_17)
  web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
  	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
- 	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+ 	pltotf.man pooltype.man tftopl.man twill.man \