texlive: update to TeXLive 2021

General:
* Donald Knuth’s changes for his 2021 tuneup of TeX and Metafont are
  incorporated (https://tug.org/TUGboat/tb42-1/tb130knuth-tuneup21.pdf). They
  are also available on CTAN as the knuth-dist and knuth-local packages. As
  expected, the fixes are for obscure cases and do not affect any behavior in
  practice.
* Except in original TeX: if \tracinglostchars is set to 3 or more, missing
  characters will result in an error, not just a message in the log file, and
  the missing character code will be shown in hex.
* Except in original TeX: a new integer parameter \tracingstacklevels, if
  positive, and \tracingmacros is also positive, causes a prefix indicating the
  macro expansion depth to be output on each relevant log line (e.g., ~.. at
  depth 2). Also, macro logging is truncated at a depth ≥ the parameter value.

Aleph: The Aleph-based LaTeX format, named lamed, has been removed. The aleph
  binary itself is still included and supported.

LuaTeX:
* Lua 5.3.6.
* Callback for nesting level used in \tracingmacros, as generalized variant
  of the new \tracingstacklevels.
* Mark math glyphs as protected to prevent processing as text.
* Removed width/ic compensation for traditional math code path.

MetaPost:
* SOURCE_DATE_EPOCH environment variable support for reproducible output.
* Avoid wrong final % in mpto.
* Document -T option, other fixes to manual.
* Value of epsilon changed in binary and decimal modes, so mp_solve_rising_cubic
  works as expected.

pdfTeX:
* New primitives \pdfrunninglinkoff and \pdfrunninglinkon; e.g., for
  disabling generation of links in headers and footers.
* Warn instead of aborting when “\pdfendlink ended up in different nesting
  level than \pdfstartlink”.
* Dump \pdfglyphtounicode assignments in fmt file.
* Source: poppler support removed, as it was too hard to keep in sync with
  upstream. In native TL, pdfTeX has always used libs/xpdf, which is cut-down
  and adapted code from xpdf.

XeTeX: Fixes for math kerning.

Dvipdfmx:
* Ghostscript is now invoked safely by default; to override (assuming all
  input files are trusted), use -i dvipdfmx-unsafe.cfg. To use PSTricks with
  XeTeX, this is required, as in:
   xetex -output-driver="xdvipdfmx -i dvipdfmx-unsafe.cfg -q -E" ...
* If an image file is not found, exit with bad status.
* Extended special syntax for color support.
* Specials for manipulating ExtGState.
* Compatibility specials pdfcolorstack and pdffontattr.
* Experimental support for dviluatex’s extended fnt_def.
* Support new feature of virtual font to fallback Japanese font definition.

Dvips:
* Default PostScript document title is now the basename of the input file,
  and can be overridden with the new option -title.
* If an .eps or other image file is not found, exit with bad status.
* Support new feature of virtual font to fallback Japanese font definition.

2 files changed, 10 insertions, 17 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 89a7de92a25..8cbefcd6aad 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.106 2021/05/20 11:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2021/06/06 01:17:19 markd Exp $
 
 .include "../../print/texlive/Makefile.common"
 
-PKGNAME=	web2c-2020
-PKGREVISION=	8
+PKGNAME=	web2c-2021
 CATEGORIES=	print
 
 HOMEPAGE=	https://www.tug.org/web2c/
@@ -12,6 +11,7 @@ COMMENT=	TeX implementation translating WEB to C
 DEPENDS+=	kpathsea>=6.2.1:../../print/kpathsea
 DEPENDS+=	ptexenc>=1.3.7:../../print/ptexenc
 
+EXTRACT_ELEMENTS+=	${DISTNAME}/libs/xpdf
 EXTRACT_ELEMENTS+=	${DISTNAME}/texk/web2c
 
 USE_LANGUAGES=		c c++14
@@ -46,8 +46,6 @@ CONFIGURE_ARGS+=	--with-system-mpfr
 CONFIGURE_ARGS+=	--with-mpfr-includes=${BUILDLINK_PREFIX.mpfr}/include
 CONFIGURE_ARGS+=	--with-mpfr-libdir=${BUILDLINK_PREFIX.mpfr}/lib
 CONFIGURE_ARGS+=	--with-system-pixman
-CONFIGURE_ARGS+=	--with-system-poppler
-CONFIGURE_ARGS+=	--with-system-xpdf
 CONFIGURE_ARGS+=	--with-system-ptexenc
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include
@@ -55,21 +53,16 @@ CONFIGURE_ARGS+=	--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-system-zziplib
 LIBTOOL_OVERRIDE=	../*/libtool */libtool
 
-CONFIGURE_DIRS=		${WRKDIR}/${DISTNAME}/texk/web2c
+CONFIGURE_DIRS=		${WRKDIR}/${DISTNAME}/libs/xpdf
+CONFIGURE_DIRS+=	${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=		${WRKDIR}/${DISTNAME}/texk/web2c
 
-pre-configure:
-	${CP} ${WRKSRC}/pdftexdir/pdftoepdf-poppler0.86.0.cc ${WRKSRC}/pdftexdir/pdftoepdf.cc
-	${CP} ${WRKSRC}/pdftexdir/pdftosrc-poppler0.83.0.cc  ${WRKSRC}/pdftexdir/pdftosrc.cc
-
 .include "../../archivers/zziplib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
-.include "../../print/poppler/buildlink3.mk"
-.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/ptexenc/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 381a015ed77..2cb5eb3b20c 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2020/10/29 19:47:13 markd Exp $
+$NetBSD: distinfo,v 1.40 2021/06/06 01:17:19 markd Exp $
 
-SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b
-RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9
-SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-Size (texlive-20200406-source.tar.xz) = 55383320 bytes
+SHA1 (texlive-20210325-source.tar.xz) = fa68012b86e20410c90684ec2ff50e34023bbaf2
+RMD160 (texlive-20210325-source.tar.xz) = 90f924b7843de99c9b438d66926192020291bbee
+SHA512 (texlive-20210325-source.tar.xz) = afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+Size (texlive-20210325-source.tar.xz) = 54837368 bytes
 SHA1 (patch-Makefile.in) = e4446fc146b419ca5f2105d2a78c7789149b40ea
 SHA1 (patch-man_Makefile.in) = 9b57fbd750476ef3aff268918135ce63f553ef14