tex* : Update version 20150521=>20210325

- Update MASTER_SITES_TEX_CTAN from https://tug.org/historic/ - Update texlua to use texlua53 library - Deprecate CSLaTeX format - Remove aleph as per Upstream - Add common variables TEXLIVE_YEAR and TEXLIVE_VERSION to be used in all ports related to tex* - Fix dependency of print/texlive-texmf-source [1] - devel/tex-kpathsea: Update version 6.2.1=>6.3.3 - devel/tex-libtexlua: Update version 5.2.4=>5.3.6 - devel/tex-libtexluajit: Update version 2.0.3=>2.1.0 - devel/tex-synctex: Update version 1.17.0=>2.0.0 - devel/tex-web2c: Update version 20150521=>20210325 - editors/texworks: Fix build with newer tex version - print/tex-basic-engines: Update version 20150521=>20210325 - print/tex-dvipdfmax: Update version 20150521=>20210325 - print/tex-dvipsk: Update version 5.995=>20210325.1 - print/tex-formats: Update version 20150521=>20210325 - print/tex-jadetex: - print/tex-luatex: Update version 0.80.0=>1.12.0 * Convert to dynamic pkg-plist - print/tex-ptexenc: Update version 1.3.3=>1.3.9 - print/tex-xetex: Update version 0.99992=>0.99993 * Convert to dynamic pkg-plist - print/texlive-base: Update version 20150521=>20210325 - print/texlive-docs: Update version 20150521=>20210325 * Convert to dynamic pkg-plist - print/texlive-full: Update version 20150521=>20210325 - print/texlive-texmf-source: Update version 20150521=>20210325 - print/texlive-texmf: Update version 20150521=>20210325 * Convert to dynamic pkg-plist - print/texlive-tlmgr: Update version 20150521=>20210325 - print/xpdfopen: Transfer MAINTAINER to tex@ as xpdfopen is an integral part of tex after poppler support has been deprecated from tex [2] - textproc/dblatex: Update version 0.3.11=>0.3.12 * Take MAINTAINERship - textproc/gastex: Fix build - textproc/metauml: Fix build PR: 226983 [1] Reported by: Trond.Endrestol@ximalas.info [1] Reviewed by: tcberner (private repo) Approved by: hrs (maintainer-timeout) [2] Relnotes: https://tug.org/texlive/doc/texlive-en/texlive-en.html#news Sponsored by: Nepustil.net
2025-05-17 01:23:12 -04:00 · 2022-02-18 20:19:20 -06:00 · 2022-02-18 20:19:20 -06:00 · 8374a33c80
commit 8374a33c80
parent 834a0dbd2e
135 changed files with 3123 additions and 133128 deletions
--- a/1
+++ b/1
@ -16893,3 +16893,4 @@ security/php80-openssl||2022-02-12|php80-openssl module is a default module for
 security/php81-openssl||2022-02-12|php81-openssl module is a default module for lang/php81 from now on
 math/qhull|math/qhull7|2022-02-19|qhull as version 8 is the default from now on.
 math/qhull8|math/qhull|2022-02-19|qhull as version 8 is the default from now on.
+print/tex-aleph||2022-02-18|tex-aleph has been removed from texlive-2021 system
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@ -1116,12 +1116,11 @@ MASTER_SITE_TCLTK+= \

 .if !defined(IGNORE_MASTER_SITE_TEX_CTAN)
 MASTER_SITE_TEX_CTAN+= \
-	http://ctan.unsw.edu.au/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
-	ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
-	ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
-	ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/
+	https://ftp.math.utah.edu/pub/tex/historic/%SUBDIR%/ \
+	https://ftp.tu-chemnitz.de/pub/tug/historic/%SUBDIR%/ \
+	https://pi.kwarc.info/historic/%SUBDIR%/ \
+	https://mirrors.tuna.tsinghua.edu.cn/tex-historic-archive/%SUBDIR%/ \
+	https://mirror.nju.edu.cn/tex-historic/%SUBDIR%/
 .endif

 # Derived from: https://www.torproject.org/getinvolved/mirrors.html.en
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@ -22,7 +22,7 @@ TEX_MAINTAINER=	freebsd-tex@FreeBSD.org
 #  ptexenc:	character code conversion library for pTeX
 #  basic:	basic TeX engines including tex and pdftex
 #  tlmgr:	tlmgr dependency (Perl modules)
-#  texlua:	texlua52 library
+#  texlua:	texlua53 library
 #  texluajit:	texluajit library
 #  synctex:	synctex library
 #  xpdfopen:	pdfopen/pdfclose utility
@ -32,12 +32,11 @@ TEX_MAINTAINER=	freebsd-tex@FreeBSD.org
 #  xdvik:	XDvi
 #  gbklatex:	gbklatex
 #
-#  formats:	TeX, LaTeX, AMSTeX, ConTeXT, CSLaTeX, EplainTeX,
+#  formats:	TeX, LaTeX, AMSTeX, ConTeXT, EplainTeX,
 #		CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis
 #  tex:		TeX
 #  latex:	LaTeX
 #  pdftex:	PDFTeX
-#  aleph:	Aleph
 #  jadetex:	JadeTeX
 #  luatex:	LuaTeX
 #  ptex:	pTeX
@ -67,6 +66,8 @@ TEXMFVARDIR?=	share/texmf-var
 TEXMFCONFIGDIR?=share/texmf-config
 FMTUTIL_CNF?=	${TEXMFCONFIGDIR}/web2c/fmtutil.cnf
 TEXHASHDIRS?=	${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXMFCONFIGDIR}
+TEXLIVE_YEAR?=	2021
+TEXLIVE_VERSION?=	${TEXLIVE_YEAR}0325

 .for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF
 PLIST_SUB+=	$V="${$V}"
@ -85,7 +86,7 @@ _USE_TEX_BASE_PKGNAME=	texlive-base
 _USE_TEX_GBKLATEX_DEP=	gbklatex
 _USE_TEX_GBKLATEX_PORT=	${_USE_TEX_BASE_PORT}
 _USE_TEX_GBKLATEX_PKGNAME=${_USE_TEX_BASE_PKGNAME}
-_USE_TEX_SOURCE_DEP=	${LOCALBASE}/${TEXMFDISTDIR}/source/.keep_me
+_USE_TEX_SOURCE_DEP=   ${_USE_TEX_SOURCE_PKGNAME}>=${TEXLIVE_VERSION}
 _USE_TEX_SOURCE_PORT=	print/${_USE_TEX_SOURCE_PKGNAME}
 _USE_TEX_SOURCE_PKGNAME=texlive-texmf-source
 _USE_TEX_DOCS_DEP=	${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README
@ -129,7 +130,7 @@ _USE_TEX_KPATHSEA_PKGNAME=tex-kpathsea
 _USE_TEX_PTEXENC_DEP=	libptexenc.so
 _USE_TEX_PTEXENC_PORT=	print/${_USE_TEX_PTEXENC_PKGNAME}
 _USE_TEX_PTEXENC_PKGNAME=tex-ptexenc
-_USE_TEX_TEXLUA_DEP=	libtexlua52.so
+_USE_TEX_TEXLUA_DEP=	libtexlua53.so
 _USE_TEX_TEXLUA_PORT=	devel/${_USE_TEX_TEXLUA_PKGNAME}
 _USE_TEX_TEXLUA_PKGNAME=tex-libtexlua
 _USE_TEX_TEXLUAJIT_DEP=	libtexluajit.so
@ -144,9 +145,6 @@ _USE_TEX_SYNCTEX_PKGNAME=tex-synctex
 _USE_TEX_XPDFOPEN_DEP=	pdfopen
 _USE_TEX_XPDFOPEN_PORT=	print/${_USE_TEX_XPDFOPEN_PKGNAME}
 _USE_TEX_XPDFOPEN_PKGNAME=	xpdfopen
-_USE_TEX_ALEPH_DEP=	aleph
-_USE_TEX_ALEPH_PORT=	print/${_USE_TEX_ALEPH_PKGNAME}
-_USE_TEX_ALEPH_PKGNAME=	tex-aleph
 _USE_TEX_LUATEX_DEP=	luatex
 _USE_TEX_LUATEX_PORT=	print/${_USE_TEX_LUATEX_PKGNAME}
 _USE_TEX_LUATEX_PKGNAME=tex-luatex
@ -154,9 +152,9 @@ _USE_TEX_XETEX_DEP=	xetex
 _USE_TEX_XETEX_PORT=	print/${_USE_TEX_XETEX_PKGNAME}
 _USE_TEX_XETEX_PKGNAME=	tex-xetex

-_USE_TEX_FULLLIST=	texmf>=20150523_3 base>=20150521_5 \
+_USE_TEX_FULLLIST=	texmf>=${TEXLIVE_VERSION} base>=${TEXLIVE_VERSION} \
 		web2c tlmgr:run \
-		basic formats aleph xetex jadetex luatex xmltex ptex \
+		basic formats xetex jadetex luatex xmltex ptex \
 		dvipsk dvipdfmx xdvik xpdfopen:run \
 		kpathsea:lib ptexenc:lib texlua:lib texluajit:lib synctex:lib

@ -168,10 +166,10 @@ USE_TEX:=	${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
 _U:=	${_UU}	# ugly but necessary in for loop
 _VOP:=
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
-_U:=	${_U}>=20150523_3
+_U:=	${_U}>=${TEXLIVE_VERSION}
 . endif
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
-_U:=	${_U}>=20150521_5
+_U:=	${_U}>=${TEXLIVE_VERSION}
 . endif
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \
     !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \
@ -290,21 +288,6 @@ do-updmap:
 post-install-script: do-updmap
 .endif

-TEX_FORMAT_ALEPH?= \
-	"aleph aleph - *aleph.ini" \
-	"lamed aleph language.dat *lambda.ini"
-TEX_FORMAT_ALEPH_FILES=	\
-	${TEXMFVARDIR}/web2c/aleph/aleph.log \
-	${TEXMFVARDIR}/web2c/aleph/aleph.fmt \
-	${TEXMFVARDIR}/web2c/aleph/lamed.log \
-	${TEXMFVARDIR}/web2c/aleph/lamed.fmt
-TEX_FORMAT_ALEPH_BIN=	\
-	bin/lamed
-TEX_FORMAT_ALEPH_DIRS=	\
-	${TEXMFVARDIR}/web2c/aleph
-post-install-aleph:
-	${LN} -sf aleph ${STAGEDIR}${PREFIX}/bin/lamed
-
 TEX_FORMAT_AMSTEX?= \
 	"amstex pdftex - -translate-file=cp227.tcx *amstex.ini"
 TEX_FORMAT_AMSTEX_FILES= \
@ -331,23 +314,6 @@ post-install-context:
 	@${DO_NADA}
 #	${LN} -sf mpost ${PREFIX}/bin/metafun

-TEX_FORMAT_CSLATEX?= \
-	"cslatex pdftex - -etex cslatex.ini" \
-	"pdfcslatex pdftex - -etex cslatex.ini"
-TEX_FORMAT_CSLATEX_FILES= \
-	${TEXMFVARDIR}/web2c/pdftex/cslatex.log \
-	${TEXMFVARDIR}/web2c/pdftex/cslatex.fmt \
-	${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.log \
-	${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.fmt
-TEX_FORMAT_CSLATEX_BIN= \
-	bin/cslatex \
-	bin/pdfcslatex
-TEX_FORMAT_CSLATEX_DIRS= \
-	${TEXMFVARDIR}/web2c/pdftex
-post-install-cslatex:
-	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/cslatex
-	${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfcslatex
-
 TEX_FORMAT_CSPLAIN?= \
 	"csplain pdftex - -etex -enc csplain-utf8.ini" \
 	"pdfcsplain pdftex - -etex -enc csplain-utf8.ini"
@ -416,7 +382,7 @@ TEX_FORMAT_LUATEX?= \
 	"lualatex luatex language.dat,language.dat.lua lualatex.ini" \
 	"luajittex luajittex language.def,language.dat.lua luatex.ini" \
 	"pdfcsplain luatex - -etex csplain.ini" \
-	"lualollipop luatex - lualollipop.in"
+	"lollipop luatex - lollipop.ini"
 TEX_FORMAT_LUATEX_FILES= \
 	${TEXMFVARDIR}/web2c/luatex/dviluatex.log \
 	${TEXMFVARDIR}/web2c/luatex/dviluatex.fmt \
@ -558,8 +524,16 @@ TEX_FORMAT_PTEX_FILES= \
 	${TEXMFVARDIR}/web2c/eptex/platex.fmt
 TEX_FORMAT_PTEX_BIN= \
 	bin/eptex \
+	bin/pbibtex \
+	bin/pdvitype \
 	bin/ptex \
-	bin/platex
+	bin/platex \
+	bin/ppltotf \
+	bin/ptftopl \
+	bin/upbibtex \
+	bin/updvitype \
+	bin/uppltotf \
+	bin/uptftopl
 TEX_FORMAT_PTEX_DIRS= \
 	${TEXMFVARDIR}/web2c/ptex \
 	${TEXMFVARDIR}/web2c/eptex
@ -614,8 +588,10 @@ TEX_FORMAT_XETEX?= \
 	"xelatex xetex language.dat -etex xelatex.ini" \
 	"pdfcsplain xetex - -etex csplain.ini" \
 	"cont-en xetex cont-usr.tex -8bit *cont-en.mkii" \
-	"xelollipop xetex - -etex xelollipop.ini"
+	"lollipop xetex - -etex lollipop.ini"
 TEX_FORMAT_XETEX_FILES=	\
+	${TEXMFVARDIR}/web2c/xetex/lollipop.fmt \
+	${TEXMFVARDIR}/web2c/xetex/lollipop.log \
 	${TEXMFVARDIR}/web2c/xetex/cont-en.log \
 	${TEXMFVARDIR}/web2c/xetex/cont-en.fmt \
 	${TEXMFVARDIR}/web2c/xetex/pdfcsplain.log \
@ -623,9 +599,7 @@ TEX_FORMAT_XETEX_FILES=	\
 	${TEXMFVARDIR}/web2c/xetex/xetex.log \
 	${TEXMFVARDIR}/web2c/xetex/xetex.fmt \
 	${TEXMFVARDIR}/web2c/xetex/xelatex.log \
-	${TEXMFVARDIR}/web2c/xetex/xelatex.fmt \
-	${TEXMFVARDIR}/web2c/xetex/xelollipop.log \
-	${TEXMFVARDIR}/web2c/xetex/xelollipop.fmt
+	${TEXMFVARDIR}/web2c/xetex/xelatex.fmt
 TEX_FORMAT_XETEX_BIN=	\
 	bin/xetex \
 	bin/xelatex \
--- a/13
+++ b/13
@ -13,6 +13,19 @@ you update your ports collection, before attempting any port upgrades.
  It is recommended that you delete qhull and ports depending upon it, and
  then reinstalling all the dependent ports.

+20220218:
+  AFFECTS: users of TeX*
+  AUTHOR: bofh@FreeBSD.org
+
+  TeX system has been updated to 2021 from 2015. Normal pkg upgrade or
+  portmaster -a should handle all the upgrade properly. In case not please
+  create a ticket or send a mail to tex@FreeBSD.org
+
+  print/tex-aleph has been removed as per upstream. This package should be
+  removed manually:
+
+  # pkg remove tex-aleph
+
 20220218:
  AFFECTS: users of net-mgmt/librenms
  AUTHOR: dvl@FreeBSD.org
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	kpathsea
-PORTVERSION=	6.2.1
-PORTREVISION=	2
+PORTVERSION=	6.3.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
@ -15,26 +14,30 @@ LICENSE=	LGPL21+
 USES=		libtool pathfix tar:xz
 USE_LDCONFIG=	yes
 USE_TEX=	yes
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		texk/kpathsea \
-		texk/texlive/tl_scripts
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/kpathsea
+
 GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip

+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux texk/kpathsea texk/texlive/tl_support \
+		texk/texlive/linked_scripts/texlive-extra \
+		texk/texlive/linked_scripts/texlive
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/kpathsea
+
 INFO=		kpathsea

 post-install:
-	cd ${WRKDIR}/${DISTNAME}/texk/texlive/tl_scripts && \
+	(cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \
 	    for f in kpsetool kpsewhere; do \
 		${INSTALL_SCRIPT} $${f}.sh ${STAGEDIR}${PREFIX}/bin/$$f; \
-		${INSTALL_MAN} $${f}.1 \
+		${INSTALL_MAN} ../../tl_support/$${f}.1 \
 		    ${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \
 	    done; \
 	    for l in kpsexpand kpsepath; do \
 		${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \
 		${LN} -sf kpsetool.1 ${STAGEDIR}${MANPREFIX}/man/man1/$${l}.1; \
-	    done
+	    done)

 .include <bsd.port.mk>
--- a/devel/tex-kpathsea/distinfo
+++ b/devel/tex-kpathsea/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643521077
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/devel/tex-kpathsea/files/patch-Makefile.in
+++ b/devel/tex-kpathsea/files/patch-Makefile.in
@ -1,84 +1,20 @@
--- Makefile.in.orig	2015-03-16 07:52:01 UTC
+--- Makefile.in.orig	2022-01-30 05:38:17 UTC
 +++ Makefile.in
-@@ -170,8 +170,8 @@ am__uninstall_files_from_dir = { \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
-	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
-+	"$(DESTDIR)$(web2cdir)" \
-+	"$(DESTDIR)$(pkgconfigdir)" \
- 	"$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
-@@ -306,7 +306,7 @@ am__can_run_installinfo = \
+@@ -364,7 +364,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
- DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA)
+ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
 -HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \
-+HEADERS = $(kpseinclude_HEADERS) \
- 	$(nodist_kpselib_HEADERS) $(noinst_HEADERS)
+HEADERS = $(nodist_kpseinclude_HEADERS) \
+ 	$(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-@@ -717,12 +717,12 @@ libkpathsea_la_SOURCES = tex-file.c abso
- kpseincludedir = ${includedir}/kpathsea
- nodist_kpseinclude_HEADERS = \
- 	kpathsea.h \
-	paths.h
-+	paths.h \
-+	c-auto.h
- 
- kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
- kpselibdir = ${libdir}/kpathsea
-nodist_kpselib_HEADERS = \
-	c-auto.h
-+nodist_kpselib_HEADERS =
- 
- 
- # Headers included directly into kpathsea.h
-@@ -785,7 +785,7 @@ noinst_HEADERS = \
- 	xopendir.h \
- 	xstat.h
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = kpathsea.pc
- DISTCLEANFILES = paths.h stamp-paths kpathsea.h
- kpseaccess_SOURCES = access.c
-@@ -2103,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRAR
+@@ -2101,7 +2101,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"; do \
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
 +	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
-@@ -2167,10 +2167,9 @@ info: info-recursive
- 
- info-am:
- 
-install-data-am: install-data-local install-dist_web2cDATA \
-	install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
-+install-data-am: install-data-local install-kpseincludeHEADERS \
- 	install-nodist_kpseincludeHEADERS \
-	install-nodist_kpselibHEADERS install-pkgconfigDATA
-+	install-pkgconfigDATA
- 
- install-dvi: install-dvi-recursive
- 
-@@ -2319,13 +2318,13 @@ install-data-local: installdirs-am
- uninstall-local:
- @WIN32_FALSE@	@for f in $(dist_noinst_SCRIPTS); do \
- @WIN32_FALSE@	  if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
-@WIN32_FALSE@	    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+@WIN32_FALSE@	    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- @WIN32_FALSE@	    rm -f "$(DESTDIR)$(bindir)/$$f"; \
- @WIN32_FALSE@	  else :; fi; \
- @WIN32_FALSE@	done
- 	@for f in $(dist_noinst_DATA); do \
- 	  if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
-	    echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
-+	    echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
- 	    rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
- 	  else :; fi; \
- 	done
--- a/devel/tex-kpathsea/files/patch-texmf.cnf
+++ b/devel/tex-kpathsea/files/patch-texmf.cnf
@ -1,15 +1,15 @@
--- texmf.cnf.orig	2015-04-13 00:20:30.000000000 +0900
-+++ texmf.cnf	2015-09-26 04:35:35.579765000 +0900
-@@ -51,7 +51,7 @@
- % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
- % Kpathsea sets SELFAUTOLOC (the directory with the binary),
- % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
+--- texmf.cnf.orig	2021-03-23 18:18:30 UTC
+++ texmf.cnf
+@@ -59,7 +59,7 @@
+ % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
+ % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
+ % Sorry for the off-by-one-generation names.
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
 
 % The main tree of distributed packages and programs:
 TEXMFDIST = $TEXMFROOT/texmf-dist
-@@ -61,7 +61,7 @@
+@@ -69,7 +69,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
 TEXMFMAIN = $TEXMFDIST
 
 % Local additions to the distribution trees.
@ -18,7 +18,7 @@
 
 % TEXMFSYSVAR, where *-sys store cached runtime data.
 TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -495,6 +495,7 @@
+@@ -566,6 +566,7 @@ $SELFAUTOLOC/texmf-local/web2c,\
 $SELFAUTOLOC/texmf-dist/web2c,\
 $SELFAUTOLOC/texmf/web2c,\
 \
@ -26,7 +26,7 @@
 $SELFAUTODIR,\
 $SELFAUTODIR/share/texmf-local/web2c,\
 $SELFAUTODIR/share/texmf-dist/web2c,\
-@@ -722,7 +723,7 @@
+@@ -804,7 +805,7 @@ hash_extra = 600000
 pool_size = 6250000
 % Minimum pool space after TeX's own strings; must be at least
 % 25000 less than pool_size, but doesn't need to be nearly that large.
@ -34,8 +34,8 @@
 +string_vacancies = 150000
 % Maximum number of strings.
 max_strings = 500000
- % min pool space left after loading .fmt
-@@ -732,7 +733,7 @@
+ % Min pool space left after loading .fmt.
+@@ -816,7 +817,7 @@ strings_free = 100
 % expansion works by writing material into the buffer and reparsing the
 % line.  As a consequence, certain constructs require the buffer to be
 % very large, even though most documents can be handled with a small value.
@ -44,10 +44,10 @@
 
 % Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
 % the sources), but we don't need that much.  The value here suffices
-@@ -743,7 +744,7 @@
- 
- hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
+@@ -828,7 +829,7 @@ trie_size = 1100000
+ hyph_size = 8191        % prime number of hyphenation exceptions, >610, <65535
                         % http://primes.utm.edu/curios/page.php/8191.html
+                         % dynamically increased as necessary, so not important.
 -nest_size = 500         % simultaneous semantic levels (e.g., groups)
 +nest_size = 2500        % simultaneous semantic levels (e.g., groups)
 max_in_open = 15        % simultaneous input files and error insertions, 
--- a/devel/tex-kpathsea/pkg-plist
+++ b/devel/tex-kpathsea/pkg-plist
@ -1,16 +1,11 @@
 bin/kpseaccess
+bin/kpsepath
 bin/kpsereadlink
 bin/kpsestat
-bin/kpsewhich
-bin/mktexlsr
-bin/mktexmf
-bin/mktexpk
-bin/mktextfm
-bin/texhash
-bin/kpsewhere
 bin/kpsetool
+bin/kpsewhere
+bin/kpsewhich
 bin/kpsexpand
-bin/kpsepath
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@ -57,22 +52,17 @@ include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/version.h
 include/kpathsea/win32lib.h
-man/man1/kpseaccess.1.gz
-man/man1/kpsereadlink.1.gz
-man/man1/kpsestat.1.gz
-man/man1/kpsewhich.1.gz
-man/man1/kpsepath.1.gz
-man/man1/kpsetool.1.gz
-man/man1/kpsewhere.1.gz
-man/man1/kpsexpand.1.gz
-man/man1/mktexlsr.1.gz
-man/man1/mktexmf.1.gz
-man/man1/mktexpk.1.gz
-man/man1/mktextfm.1.gz
-man/man1/texhash.1.gz
 lib/libkpathsea.a
 lib/libkpathsea.so
 lib/libkpathsea.so.6
-lib/libkpathsea.so.6.2.1
+lib/libkpathsea.so.6.3.3
 libdata/pkgconfig/kpathsea.pc
+man/man1/kpseaccess.1.gz
+man/man1/kpsepath.1.gz
+man/man1/kpsereadlink.1.gz
+man/man1/kpsestat.1.gz
+man/man1/kpsetool.1.gz
+man/man1/kpsewhere.1.gz
+man/man1/kpsewhich.1.gz
+man/man1/kpsexpand.1.gz
 %%TEXMFDISTDIR%%/web2c/texmf.cnf
--- a/devel/tex-libtexlua/Makefile
+++ b/devel/tex-libtexlua/Makefile
@ -1,9 +1,9 @@
 PORTNAME=	libtexlua
-PORTVERSION=	5.2.4
+PORTVERSION=	5.3.6
 CATEGORIES=	devel
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
@ -12,16 +12,20 @@ COMMENT=	Lua library for TeXLive
 LICENSE=	MIT
 LICENSE_FILE=	${WRKDIR}/LICENSE.MIT

-USES=		tar:xz libtool pathfix pkgconfig
+USES=		libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=		build-aux libs/lua52
-WRKSRC=		${WRKDIR}/${DISTNAME}/libs/lua52
+USE_TEX=	yes
+
 GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip

+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux libs/lua53
+WRKSRC=		${WRKDIR}/${DISTNAME}/libs/lua53
+
 post-extract:
 	${SED} -e '/\*\ Copyright/,/\*\//!d;s/^\*//;/^\*\*/d' \
-	    ${WRKSRC}/lua-5.2.4/src/lua.h > ${WRKDIR}/LICENSE.MIT
+	    ${WRKSRC}/lua53-src/src/lua.h > ${WRKDIR}/LICENSE.MIT

 .include <bsd.port.mk>
--- a/devel/tex-libtexlua/distinfo
+++ b/devel/tex-libtexlua/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643545410
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/devel/tex-libtexlua/pkg-plist
+++ b/devel/tex-libtexlua/pkg-plist
@ -1,10 +1,10 @@
-include/texlua52/lauxlib.h
-include/texlua52/lua.h
-include/texlua52/lua.hpp
-include/texlua52/luaconf.h
-include/texlua52/lualib.h
-lib/libtexlua52.a
-lib/libtexlua52.so
-lib/libtexlua52.so.5
-lib/libtexlua52.so.5.2.4
-libdata/pkgconfig/texlua52.pc
+include/texlua53/lauxlib.h
+include/texlua53/lua.h
+include/texlua53/lua.hpp
+include/texlua53/luaconf.h
+include/texlua53/lualib.h
+lib/libtexlua53.a
+lib/libtexlua53.so
+lib/libtexlua53.so.5
+lib/libtexlua53.so.5.3.6
+libdata/pkgconfig/texlua53.pc
--- a/devel/tex-libtexluajit/Makefile
+++ b/devel/tex-libtexluajit/Makefile
@ -1,32 +1,36 @@
 PORTNAME=	libtexluajit
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	LuaJIT library for TeXLive

 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LuaJIT-2.0.3/COPYRIGHT
+LICENSE_FILE=	${WRKSRC}/LuaJIT-src/COPYRIGHT

-BROKEN_aarch64=		Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_mips=		Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_mips64=		Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_aarch64=	Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_mips=	Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_mips64=	Does not configure: error: Sorry, cannot preprocess lj_arch.h
 BROKEN_powerpc64=	Does not build: uninitialized constant Config (NameError)
-BROKEN_riscv64=		Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_sparc64=		Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_riscv64=	Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_sparc64=	Does not configure: error: Sorry, cannot preprocess lj_arch.h

-USES=		tar:xz libtool pathfix pkgconfig
+USES=		libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=		build-aux libs/luajit
-WRKSRC=		${WRKDIR}/${DISTNAME}/libs/luajit
+USE_TEX=	yes
+
 GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip

+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux libs/luajit
+WRKSRC=		${WRKDIR}/${DISTNAME}/libs/luajit
+
 .include <bsd.port.options.mk>

 .if ${ARCH} == powerpc
--- a/devel/tex-libtexluajit/distinfo
+++ b/devel/tex-libtexluajit/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643545774
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/devel/tex-libtexluajit/pkg-plist
+++ b/devel/tex-libtexluajit/pkg-plist
@ -7,5 +7,5 @@ include/texluajit/lualib.h
 lib/libtexluajit.a
 lib/libtexluajit.so
 lib/libtexluajit.so.2
-lib/libtexluajit.so.2.0.3
+lib/libtexluajit.so.2.1.0
 libdata/pkgconfig/texluajit.pc
--- a/devel/tex-synctex/Makefile
+++ b/devel/tex-synctex/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	synctex
-PORTVERSION=	1.17.0
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
@ -13,23 +12,32 @@ COMMENT=	Synchronization TeXnology parser library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/synctexdir/README.txt

-CONFLICTS=	tex-web2c-20150521
-USES=		libtool pathfix pkgconfig tar:xz
-USE_TEX=	kpathsea
+USES=		libtool localbase pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux texk/web2c
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+USE_TEX=	kpathsea
+
 GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=etex aleph luatex luajittex pdftex mf mf-nowin ptex \
-		eptex uptex euptex xetex tex otangle mp pmp upmp web2c \
-		web-progs
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
-		--with-x=no \
-		--without-mf-x-toolkit \
+		--with-system-kpathsea \
 		--with-system-zlib \
-		--with-system-kpathsea
-CFLAGS+=	-I${LOCALBASE}/include
+		--with-x=no \
+		--without-mf-x-toolkit
+
 INSTALL_TARGET=	install-strip

+CONFLICTS=	tex-web2c-${TEXLIVE_VERSION}
+
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+
+EXTRACT_FILES=		build-aux texk/web2c
+EXCLUDE_ENGINES=	etex aleph luatex luajittex pdftex mf mf-nowin ptex \
+			eptex uptex euptex xetex tex otangle mp pmp upmp web2c \
+			web-progs luahbtex luajithbtex mflua mfluajit latex \
+			pdftex
+
+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+
 .include <bsd.port.mk>
--- a/devel/tex-synctex/distinfo
+++ b/devel/tex-synctex/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643546426
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
@ -1,31 +1,31 @@
--- Makefile.in.orig	2015-04-17 04:53:45.000000000 +0900
-+++ Makefile.in	2015-07-25 22:52:31.390521000 +0900
-@@ -99,8 +99,8 @@
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+--- Makefile.in.orig	2022-01-30 12:41:33 UTC
+++ Makefile.in
+@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
-	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+-	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+-	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
 +bin_PROGRAMS = $(am__EXEEXT_5) \
-+	$(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
- 	$(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
- 	$(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
-@@ -108,7 +108,7 @@
- 	$(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \
- 	$(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
- 	$(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27)
+ 	$(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
+ 	$(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
+ 	$(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
+@@ -129,7 +127,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__
+ 	$(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
+ 	$(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
+ 	$(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32)
 -noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
 +noinst_PROGRAMS = \
- 	$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
- 	$(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42)
- check_PROGRAMS = $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \
-@@ -2081,7 +2081,7 @@
+ 	$(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \
+ 	$(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38) \
+ 	$(am__EXEEXT_39) $(am__EXEEXT_40) $(am__EXEEXT_41) \
+@@ -3108,7 +3106,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = lib man .
 proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
+ 
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
--- a/devel/tex-synctex/files/patch-configure
+++ b/devel/tex-synctex/files/patch-configure
@ -1,10 +1,12 @@
--- configure.orig	2015-04-12 20:22:39.000000000 +0900
-+++ configure	2015-07-25 06:32:59.629591000 +0900
-@@ -23614,28 +23614,6 @@
+--- configure.orig	2022-01-30 12:55:25 UTC
+++ configure
+@@ -24910,30 +24910,6 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 -
 -# Check whether --with-system-ptexenc was given.
 -if test "${with_system_ptexenc+set}" = set; then :
@ -26,14 +28,29 @@
 -	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
- ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
- 
- # Check whether --with-system-zlib was given.
-@@ -23712,575 +23690,6 @@
+ ##tldbg _KPSE_LIB_FLAGS: Setup pplib (-lpplib) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libname=pplib, options=tree, tlincl=-IBLD/libs/pplib/include, tllib=BLD/libs/pplib/libpplib.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pplib/include/pplib.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: pplib (pplib) tree.
+@@ -25024,855 +25000,6 @@ $as_echo "#define ZLIB_CONST 1" >>confdefs.h
+ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
- 
-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree.
+-  LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include"
+-  LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la"
+-  LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la'
+-  LUA53_RULE='# Rebuild libtexlua53
+-$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/lua53/include/lua.h:
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree.
 -  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
 -  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
 -  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
@ -43,7 +60,10 @@
 -${top_builddir}/../../libs/lua52/include/lua.h:
 -	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -
-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+-echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree.
 -  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
 -  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
 -  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
@ -52,8 +72,80 @@
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
 -${top_builddir}/../../libs/luajit/include/luajit.h:
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-#
+-# checking for openbsd for additional jit libraries needed, which is the
+-# case for clang; no point in going to the trouble elsewhere since no
+-# other system needs it.
+-case $build_os in
+-openbsd*)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5
+-$as_echo_n "checking on openbsd if additional jit libraries are needed... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-      typedef struct _Unwind_Context _Unwind_Context;
+-      extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-      _Unwind_GetCFA(ctx);
 -
-## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-else
+-
+-    jitlibs="-lc++abi -lpthread"
+-    save_LIBS=$LIBS
+-    LIBS="$LIBS $jitlibs"
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-          typedef struct _Unwind_Context _Unwind_Context;
+-          extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-          _Unwind_GetCFA(ctx);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
+-$as_echo "\"$jitlibs\"" >&6; }
+-        LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "luajit could not be linked
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    LIBS=$save_LIBS
+-
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-  ;;
+-esac
+-echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 -
 -# Check whether --with-system-libpng was given.
 -if test "${with_system_libpng+set}" = set; then :
@ -77,7 +169,9 @@
 -	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
 -if test "${with_system_freetype2+set}" = set; then :
@ -175,9 +269,103 @@
 -else
 -  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+-  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
 -  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 -fi
@ -192,7 +380,9 @@
 -	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
 -
 -# Check whether --with-system-pixman was given.
 -if test "${with_system_pixman+set}" = set; then :
@ -216,7 +406,9 @@
 -	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
 -
 -# Check whether --with-system-cairo was given.
 -if test "${with_system_cairo+set}" = set; then :
@ -240,7 +432,9 @@
 -	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) .
 -
 -# Check whether --with-system-gmp was given.
 -if test "${with_system_gmp+set}" = set; then :
@ -257,7 +451,8 @@
 -  withval=$with_gmp_libdir;
 -fi
 -if test "x$with_system_gmp" = xyes; then
-  if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gmp (gmp).
+-if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
 -  GMP_INCLUDES="-I$with_gmp_includes"
 -fi
 -GMP_LIBS="-lgmp"
@ -275,7 +470,9 @@
 -	cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfr, libname=mpfr, options=, tlincl=-IBLD/libs/mpfr/include, tllib=BLD/libs/mpfr/libmpfr.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfr/include/mpfr.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) .
 -
 -# Check whether --with-system-mpfr was given.
 -if test "${with_system_mpfr+set}" = set; then :
@ -292,7 +489,8 @@
 -  withval=$with_mpfr_libdir;
 -fi
 -if test "x$with_system_mpfr" = xyes; then
-  if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: mpfr (mpfr).
+-if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
 -  MPFR_INCLUDES="-I$with_mpfr_includes"
 -fi
 -MPFR_LIBS="-lmpfr"
@ -310,50 +508,12 @@
 -	cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
-
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
-  withval=$with_system_poppler;
-fi
-if test "x$with_system_poppler" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.18; then
-  POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
-  POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
-fi
-
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
-else
-  POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include"
-  POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a"
-  POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a'
-  POPPLER_RULE='# Rebuild libpoppler
-$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/include/Stream.h
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/poppler/include/Stream.h:
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
-
-## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
-
-# Check whether --with-system-xpdf was given.
-if test "${with_system_xpdf+set}" = set; then :
-  withval=$with_system_xpdf;
-fi
+-##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) .
+-: "kpse_xpdf_options - no-op"
 -if test "x$with_system_xpdf" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.12; then
-  XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags`
-  XPDF_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.12 or better" "$LINENO" 5
-fi
-
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES"
+-  : "kpse_xpdf_system_flags - no-op"
 -else
 -  XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf"
 -  XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a"
@ -366,7 +526,9 @@
 -fi
 -test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
 -
-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
 -
 -# Check whether --with-system-zziplib was given.
 -if test "${with_system_zziplib+set}" = set; then :
@ -390,7 +552,9 @@
 -	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 -
 -# Check whether --with-system-teckit was given.
 -if test "${with_system_teckit+set}" = set; then :
@ -414,14 +578,78 @@
 -	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# LuaTeX and XeTeX need harfbuzz.
+-if test "x$enable_xetex" = xyes \
+-   || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-fi # end xetex/luatex for harfbuzz
+-
+-# XeTeX, but not LuaTeX, needs icu and graphite.
+-if test "x$enable_xetex" = xyes; then
+-  echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
 -if test "${with_system_icu+set}" = set; then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
-  if test -n "$ac_tool_prefix"; then
+-  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
+-if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}icu-config; ac_word=$2
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@ -512,11 +740,105 @@
 -else
 -  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $ICU_CONFIG --version >/dev/null 2>&1; then
 -  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
 -  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+-  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 -elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 -fi
 -else
 -  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
@ -528,8 +850,16 @@
 -${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 -	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
+-# checking for openbsd to add -lpthread for icu.
+-case $build_os in
+-openbsd*)
+-  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+-  ;;
+-esac
 -
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
 -if test "${with_system_graphite2+set}" = set; then :
@ -553,55 +883,7 @@
 -	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
-
-# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if $PKG_CONFIG harfbuzz-icu; then
-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
-fi
-else
-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
-  HARFBUZZ_RULE='# Rebuild libharfbuzz
-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/harfbuzz/include/hb.h:
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
-
-# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-
+-fi # end xetex for icu/graphite
+ 
 # Check size of off_t (using <kpathsea/config.h>)
 eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
- eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
--- a/devel/tex-synctex/files/patch-man-Makefile.in
+++ b/devel/tex-synctex/files/patch-man-Makefile.in
@ -1,25 +1,32 @@
--- man/Makefile.in.orig	2015-07-25 06:17:56.308987000 +0900
-+++ man/Makefile.in	2015-07-25 06:20:43.483764000 +0900
-@@ -437,10 +437,10 @@
- 	$(otangle_man_sources) aleph.man $(misc_man_sources) \
- 	amslatex.min initex.min lamstex.min slitex.min spell.add \
- 	virtex.min
-bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
+--- man/Makefile.in.orig	2022-02-14 20:13:35 UTC
+++ man/Makefile.in
+@@ -452,27 +452,19 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
+ 	mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
+ 	ppltotf.man ptftopl.man luatex.man xetex.man \
+ 	$(otangle_man_sources) aleph.man $(misc_man_sources) spell.add
+-bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man
 +bootstrap_man_sources =
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = cweb:ctangle cweb:cweave $(am__append_4) $(am__append_8) \
-+man1_links = $(am__append_4) $(am__append_8) \
- 	$(am__append_10) $(am__append_13) $(am__append_15)
+-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
+-	ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
+man1_links = $(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) $(am__append_19)
 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 \
-@@ -448,10 +448,7 @@
+ 	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
 -misc_man_sources = \
 -	amstex.man \
 -	latex.man \
+-	latex-dev.man \
 -	pdfetex.man
 +misc_man_sources =
 
--- a/devel/tex-synctex/pkg-plist
+++ b/devel/tex-synctex/pkg-plist
@ -1,10 +1,11 @@
 bin/synctex
 include/synctex/synctex_parser.h
 include/synctex/synctex_parser_utils.h
+include/synctex/synctex_version.h
 lib/libsynctex.a
 lib/libsynctex.so
-lib/libsynctex.so.1
-lib/libsynctex.so.1.17.0
+lib/libsynctex.so.2
+lib/libsynctex.so.2.0.0
 libdata/pkgconfig/synctex.pc
 man/man1/synctex.1.gz
 man/man5/synctex.5.gz
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	web2c
-PORTVERSION=	20150521
-PORTREVISION=	3
+PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMEPREFIX=	tex-
@ -10,49 +9,57 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX implementation translating WEB to C

-LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libopenjp2.so:graphics/openjpeg \
 		libpng.so:graphics/png \
-		libzzip.so:devel/zziplib \
-		libmpfr.so:math/mpfr
+		libzzip.so:devel/zziplib

-USES=		gnome pathfix pkgconfig libtool tar:xz xorg
-USE_TEX=	kpathsea ptexenc
-USE_XORG=	pixman
+USES=		gnome libtool localbase pathfix pkgconfig tar:xz xorg
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		libs/xpdf \
-		texk/web2c
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-luatex \
-		--disable-luajittex \
-		--disable-xetex \
-		--disable-aleph \
-		--disable-ptex \
-		--disable-tex \
-		--disable-latex \
-		--disable-pdftex \
-		--disable-eptex \
-		--disable-uptex \
-		--disable-euptex \
-		--disable-synctex \
-		--with-x=no \
-		--without-mf-x-toolkit \
-		--with-system-zlib \
-		--with-system-zziplib
+USE_TEX=	kpathsea ptexenc
+USE_XORG=	pixman
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-aleph \
+			--disable-eptex \
+			--disable-euptex \
+			--disable-latex \
+			--disable-luahbtex \
+			--disable-luajithbtex \
+			--disable-luajittex \
+			--disable-luatex \
+			--disable-mflua \
+			--disable-mfluajit \
+			--disable-pdftex \
+			--disable-ptex \
+			--disable-synctex \
+			--disable-tex \
+			--disable-uptex \
+			--disable-xetex \
+			--with-system-zlib \
+			--with-system-zziplib \
+			--with-x=no \
+			--without-mf-x-toolkit
 .for L in pixman cairo gmp mpfr libpng icu kpathsea ptexenc
-CONFIGURE_ARGS+=--with-system-$L \
-		--with-$L-include=${LOCALBASE}/include \
-		--with-$L-libdir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
+			--with-$L-libdir=${LOCALBASE}/lib \
+			--with-system-$L
 .endfor
-CFLAGS+=	-I${LOCALBASE}/include
+
 INSTALL_TARGET=	install-strip

 CONFLICTS_INSTALL=	cweb

-INFO=	web2c
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux libs/xpdf texk/web2c
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+
+INFO=		web2c
+
+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete

 pre-configure:
 	for D in libs/xpdf; do \
--- a/devel/tex-web2c/distinfo
+++ b/devel/tex-web2c/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643548736
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/devel/tex-web2c/files/patch-Makefile.in
+++ b/devel/tex-web2c/files/patch-Makefile.in
@ -1,17 +1,15 @@
--- Makefile.in.orig	2015-04-17 04:53:45.000000000 +0900
-+++ Makefile.in	2015-07-26 07:55:27.835477000 +0900
-@@ -2086,11 +2086,11 @@
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
- 	libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \
-	libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a
+--- Makefile.in.orig	2022-01-30 13:19:25 UTC
+++ Makefile.in
+@@ -3125,10 +3125,10 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l
+ 	libluajittexspecific.a libluahbtexspecific.a \
+ 	libluajithbtexspecific.a libluaffi.a libluaharfbuzz.a \
+ 	libluajitharfbuzz.a libxetex.a libsynctex.a libmd5.a
 -EXTRA_LTLIBRARIES = libsynctex.la
-+	libluatex.a libluajittex.a libxetex.a libmd5.a
 +EXTRA_LTLIBRARIES =
- lib_LIBRARIES = $(am__append_98)
- lib_LTLIBRARIES = $(am__append_97)
+ lib_LIBRARIES = $(am__append_122)
+ lib_LTLIBRARIES = $(am__append_121)
 -dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 +dist_man_MANS =
 nodist_man_MANS = 
+ TEST_EXTENSIONS = .pl .test
 EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
- 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
--- a/devel/tex-web2c/files/patch-man-Makefile.in
+++ b/devel/tex-web2c/files/patch-man-Makefile.in
@ -1,12 +1,13 @@
--- man/Makefile.in.orig	2015-07-26 05:24:02.711529000 +0900
-+++ man/Makefile.in	2015-07-26 05:24:25.464588000 +0900
-@@ -448,10 +448,7 @@
+--- man/Makefile.in.orig	2022-01-29 15:11:47 UTC
+++ man/Makefile.in
+@@ -468,11 +468,7 @@ web_man_sources = bibtex.man dvicopy.man dvitomp.man d
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
 -misc_man_sources = \
 -	amstex.man \
 -	latex.man \
+-	latex-dev.man \
 -	pdfetex.man
 +misc_man_sources =
 
--- a/devel/tex-web2c/pkg-plist
+++ b/devel/tex-web2c/pkg-plist
@ -1,12 +1,22 @@
-bin/tangle
-bin/ctangle
 bin/bibtex
+bin/ctangle
+bin/ctie
+bin/ctwill
+bin/ctwill-refsort
+bin/ctwill-twinx
+bin/cweave
 bin/dvicopy
+bin/dvitomp
 bin/dvitype
 bin/gftodvi
 bin/gftopk
 bin/gftype
+bin/inimf
+bin/mf
+bin/mf-nowin
+bin/mfplain
 bin/mft
+bin/mpost
 bin/patgen
 bin/pdvitomp
 bin/pktogf
@ -14,44 +24,50 @@ bin/pktype
 bin/pltotf
 bin/pmpost
 bin/pooltype
+bin/r-mpost
+bin/r-pmpost
+bin/r-upmpost
+bin/tangle
 bin/tftopl
+bin/tie
 bin/updvitomp
 bin/upmpost
 bin/vftovp
 bin/vptovf
 bin/weave
-bin/ctie
-bin/cweave
-bin/tie
-bin/mf
-bin/mf-nowin
-bin/mpost
-bin/dvitomp
-bin/inimf
-bin/mfplain
 man/man1/bibtex.1.gz
 man/man1/ctangle.1.gz
 man/man1/ctie.1.gz
+man/man1/ctwill-refsort.1.gz
+man/man1/ctwill-twinx.1.gz
+man/man1/ctwill.1.gz
 man/man1/cweave.1.gz
 man/man1/cweb.1.gz
 man/man1/dvicopy.1.gz
+man/man1/dvilualatex-dev.1.gz
 man/man1/dvitomp.1.gz
 man/man1/dvitype.1.gz
 man/man1/gftodvi.1.gz
 man/man1/gftopk.1.gz
 man/man1/gftype.1.gz
+man/man1/inimf.1.gz
+man/man1/lualatex-dev.1.gz
 man/man1/mf-nowin.1.gz
 man/man1/mf.1.gz
 man/man1/mft.1.gz
 man/man1/mpost.1.gz
 man/man1/patgen.1.gz
+man/man1/pdflatex-dev.1.gz
 man/man1/pktogf.1.gz
 man/man1/pktype.1.gz
+man/man1/platex-dev.1.gz
 man/man1/pltotf.1.gz
 man/man1/pooltype.1.gz
 man/man1/tangle.1.gz
 man/man1/tftopl.1.gz
 man/man1/tie.1.gz
+man/man1/uplatex-dev.1.gz
 man/man1/vftovp.1.gz
 man/man1/vptovf.1.gz
 man/man1/weave.1.gz
+man/man1/xelatex-dev.1.gz
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	texworks
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	0.6.2
-PORTREVISION=	36
+PORTREVISION=	37
 CATEGORIES=	editors

 MAINTAINER=	hrs@FreeBSD.org
@ -50,4 +50,7 @@ PYTHON_USES=		python:3.4+
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 PYTHON_PLIST_FILES=	lib/texworks/libTWPythonPlugin.so

+post-patch:
+	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} 's|synctex_next_result|synctex_scanner_next_result|g'
+
 .include <bsd.port.mk>
--- a/japanese/tex-ptex/Makefile
+++ b/japanese/tex-ptex/Makefile
@ -1,19 +1,19 @@
 PORTNAME=	ptex
 PORTVERSION=	3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	ja-tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
-EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
+EXTRACT_ONLY=	texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}

 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX

-USES=		tar:xz pkgconfig
+USES=		localbase tar:xz perl5 pkgconfig
 USE_TEX=	kpathsea web2c ptexenc texmf formats fmtutil
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
@ -24,9 +24,7 @@ EXTRACT_AFTER_ARGS_TEXMF= \
 	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 	    --strip-components 1 --no-same-permission --no-same-owner \
 	    ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=	20150521
-DISTVERSION_TEXLIVE_TEXMF=	20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
+DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/ptex \
 	texmf-dist/doc/platex \
@ -34,20 +32,11 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/uplatex \
 	texmf-dist/doc/fonts/japanese-otf \
 	texmf-dist/doc/fonts/japanese-otf-uptex \
-	texmf-dist/doc/fonts/jfontmaps \
-	texmf-dist/fonts/source/ptex \
-	texmf-dist/fonts/ovp/public/japanese-otf-uptex \
-	texmf-dist/fonts/vf/ptex \
-	texmf-dist/fonts/vf/uptex \
 	texmf-dist/fonts/vf/public/japanese-otf \
 	texmf-dist/fonts/vf/public/japanese-otf-uptex \
-	texmf-dist/fonts/type1/ptex \
-	texmf-dist/fonts/tfm/ptex \
-	texmf-dist/fonts/tfm/uptex \
 	texmf-dist/fonts/tfm/public/japanese-otf-uptex \
 	texmf-dist/fonts/tfm/public/japanese-otf \
 	texmf-dist/fonts/ofm/public/japanese-otf \
-	texmf-dist/source/fonts/uptex \
 	texmf-dist/source/fonts/japanese-otf-uptex \
 	texmf-dist/source/fonts/japanese-otf \
 	texmf-dist/source/platex \
@ -57,15 +46,14 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/tex/platex \
 	texmf-dist/tex/uplatex \
 	texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
-	texmf-dist/fonts/map/dvipdfmx/ptex \
 	texmf-dist/fonts/map/dvipdfmx/japanese-otf \
-	texmf-dist/fonts/map/dvipdfmx/jfontmaps \
-	texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map \
-	texmf-dist/fonts/cmap/uptex
+	texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
-		otangle mp pmp upmp web2c web-progs xetex tex synctex
+		otangle mp pmp upmp web2c web-progs xetex tex synctex \
+		mflua mfluajit luahbtex luajithbtex
+
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-ptex \
 		--enable-eptex \
@ -78,10 +66,12 @@ CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
-CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	ptex uptex

+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+
 pre-configure:
 	for D in libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
@ -90,7 +80,26 @@ pre-configure:
 	done

 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 	    ${EXTRACT_AFTER_ARGS_TEXMF}

+post-install:
+	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/mkjvf \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkmlcidvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl
+	${FIND} -s ${STAGEDIR}${PREFIX}/share -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${PREFIX}/share -type d -empty | ${SORT} -r | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
+
 .include <bsd.port.mk>
--- a/japanese/tex-ptex/distinfo
+++ b/japanese/tex-ptex/distinfo
@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643562741
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
@ -1,38 +1,39 @@
--- Makefile.in.orig	2015-04-16 19:53:45 UTC
+--- Makefile.in.orig	2021-02-17 11:40:54 UTC
 +++ Makefile.in
-@@ -99,6 +99,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+@@ -117,6 +117,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 +inst_bin_PROGRAMS = ptex$(EXEEXT) $(am__EXEEXT_2) \
 +	eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-@@ -2081,7 +2083,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+ 	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+ 	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+@@ -3108,7 +3110,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
 proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -2431,9 +2433,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
- TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- 	$(am__append_42) $(am__append_48) $(am__append_54) \
- 	$(am__append_60) $(am__append_66)
-bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
-	$(am__append_31) $(am__append_36) $(am__append_75) \
-	$(am__append_80)
-+bin_links =
- install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
- 	$(am__append_73) $(am__append_78)
- uninstall_exe_links = $(am__append_21) $(am__append_30) \
-@@ -4739,9 +4739,9 @@ synctexdir/libsynctex_la-synctex_parser_
 
- libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3603,10 +3605,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
+ 	$(am__append_35) $(am__append_43) $(am__append_59) \
+ 	$(am__append_64) $(am__append_69) $(am__append_74) \
+ 	$(am__append_79)
+-bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+-	$(am__append_24) $(am__append_33) $(am__append_41) \
+-	$(am__append_49) $(am__append_54) $(am__append_88) \
+-	$(am__append_93) $(am__append_98) $(am__append_103)
+bin_links =
+ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+ 	$(am__append_39) $(am__append_47) $(am__append_52) \
+ 	$(am__append_86) $(am__append_91) $(am__append_96) \
+@@ -5555,9 +5554,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
 -install-binPROGRAMS: $(bin_PROGRAMS)
 +install-binPROGRAMS: $(inst_bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@ -41,7 +42,7 @@
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4771,7 +4771,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -5587,7 +5586,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
@ -50,7 +51,7 @@
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
-@@ -14447,7 +14447,7 @@ install-data: install-data-recursive
+@@ -19270,7 +19269,7 @@ install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
--- a/japanese/tex-ptex/files/patch-configure
+++ b/japanese/tex-ptex/files/patch-configure
@ -1,10 +1,24 @@
--- configure.orig	2015-07-26 08:05:58.971291000 +0900
-+++ configure	2015-07-26 08:07:31.209478000 +0900
-@@ -23712,575 +23712,6 @@
+--- configure.orig	2022-01-30 17:17:22 UTC
+++ configure
+@@ -25025,855 +25025,6 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree.
+-  LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include"
+-  LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la"
+-  LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la'
+-  LUA53_RULE='# Rebuild libtexlua53
+-$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/lua53/include/lua.h:
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree.
 -  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
 -  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
 -  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
@ -14,7 +28,10 @@
 -${top_builddir}/../../libs/lua52/include/lua.h:
 -	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -
-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+-echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree.
 -  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
 -  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
 -  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
@ -23,8 +40,80 @@
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
 -${top_builddir}/../../libs/luajit/include/luajit.h:
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-#
+-# checking for openbsd for additional jit libraries needed, which is the
+-# case for clang; no point in going to the trouble elsewhere since no
+-# other system needs it.
+-case $build_os in
+-openbsd*)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5
+-$as_echo_n "checking on openbsd if additional jit libraries are needed... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-      typedef struct _Unwind_Context _Unwind_Context;
+-      extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-      _Unwind_GetCFA(ctx);
 -
-## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-else
+-
+-    jitlibs="-lc++abi -lpthread"
+-    save_LIBS=$LIBS
+-    LIBS="$LIBS $jitlibs"
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-          typedef struct _Unwind_Context _Unwind_Context;
+-          extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-          _Unwind_GetCFA(ctx);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
+-$as_echo "\"$jitlibs\"" >&6; }
+-        LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "luajit could not be linked
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    LIBS=$save_LIBS
+-
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-  ;;
+-esac
+-echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 -
 -# Check whether --with-system-libpng was given.
 -if test "${with_system_libpng+set}" = set; then :
@ -48,7 +137,9 @@
 -	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
 -if test "${with_system_freetype2+set}" = set; then :
@ -146,9 +237,103 @@
 -else
 -  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+-  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
 -  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 -fi
@ -163,7 +348,9 @@
 -	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
 -
 -# Check whether --with-system-pixman was given.
 -if test "${with_system_pixman+set}" = set; then :
@ -187,7 +374,9 @@
 -	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
 -
 -# Check whether --with-system-cairo was given.
 -if test "${with_system_cairo+set}" = set; then :
@ -211,7 +400,9 @@
 -	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) .
 -
 -# Check whether --with-system-gmp was given.
 -if test "${with_system_gmp+set}" = set; then :
@ -228,7 +419,8 @@
 -  withval=$with_gmp_libdir;
 -fi
 -if test "x$with_system_gmp" = xyes; then
-  if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gmp (gmp).
+-if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
 -  GMP_INCLUDES="-I$with_gmp_includes"
 -fi
 -GMP_LIBS="-lgmp"
@ -246,7 +438,9 @@
 -	cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfr, libname=mpfr, options=, tlincl=-IBLD/libs/mpfr/include, tllib=BLD/libs/mpfr/libmpfr.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfr/include/mpfr.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) .
 -
 -# Check whether --with-system-mpfr was given.
 -if test "${with_system_mpfr+set}" = set; then :
@ -263,7 +457,8 @@
 -  withval=$with_mpfr_libdir;
 -fi
 -if test "x$with_system_mpfr" = xyes; then
-  if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: mpfr (mpfr).
+-if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
 -  MPFR_INCLUDES="-I$with_mpfr_includes"
 -fi
 -MPFR_LIBS="-lmpfr"
@ -281,50 +476,12 @@
 -	cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
-
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
-  withval=$with_system_poppler;
-fi
-if test "x$with_system_poppler" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.18; then
-  POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
-  POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
-fi
-
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
-else
-  POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include"
-  POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a"
-  POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a'
-  POPPLER_RULE='# Rebuild libpoppler
-$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/include/Stream.h
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/poppler/include/Stream.h:
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
-
-## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
-
-# Check whether --with-system-xpdf was given.
-if test "${with_system_xpdf+set}" = set; then :
-  withval=$with_system_xpdf;
-fi
+-##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) .
+-: "kpse_xpdf_options - no-op"
 -if test "x$with_system_xpdf" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.12; then
-  XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags`
-  XPDF_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.12 or better" "$LINENO" 5
-fi
-
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES"
+-  : "kpse_xpdf_system_flags - no-op"
 -else
 -  XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf"
 -  XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a"
@ -337,7 +494,9 @@
 -fi
 -test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
 -
-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
 -
 -# Check whether --with-system-zziplib was given.
 -if test "${with_system_zziplib+set}" = set; then :
@ -361,7 +520,9 @@
 -	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 -
 -# Check whether --with-system-teckit was given.
 -if test "${with_system_teckit+set}" = set; then :
@ -385,14 +546,78 @@
 -	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# LuaTeX and XeTeX need harfbuzz.
+-if test "x$enable_xetex" = xyes \
+-   || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-fi # end xetex/luatex for harfbuzz
+-
+-# XeTeX, but not LuaTeX, needs icu and graphite.
+-if test "x$enable_xetex" = xyes; then
+-  echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
 -if test "${with_system_icu+set}" = set; then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
-  if test -n "$ac_tool_prefix"; then
+-  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
+-if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}icu-config; ac_word=$2
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@ -483,11 +708,105 @@
 -else
 -  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $ICU_CONFIG --version >/dev/null 2>&1; then
 -  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
 -  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+-  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 -elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 -fi
 -else
 -  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
@ -499,56 +818,16 @@
 -${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 -	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
+-# checking for openbsd to add -lpthread for icu.
+-case $build_os in
+-openbsd*)
+-  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+-  ;;
+-esac
 -
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
-
-# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
-
-# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if $PKG_CONFIG harfbuzz-icu; then
-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
-fi
-else
-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
-  HARFBUZZ_RULE='# Rebuild libharfbuzz
-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/harfbuzz/include/hb.h:
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
 -if test "${with_system_graphite2+set}" = set; then :
@ -572,6 +851,7 @@
 -	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
+-fi # end xetex for icu/graphite
 -
 # Check size of off_t (using <kpathsea/config.h>)
 eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
--- a/japanese/tex-ptex/pkg-plist
+++ b/japanese/tex-ptex/pkg-plist
--- a/print/Makefile
+++ b/print/Makefile
@ -232,7 +232,6 @@
    SUBDIR += splix
    SUBDIR += system-config-printer
    SUBDIR += t1utils
-    SUBDIR += tex-aleph
    SUBDIR += tex-basic-engines
    SUBDIR += tex-dvipdfmx
    SUBDIR += tex-dvipsk
--- a/print/tex-aleph/Makefile
+++ b/print/tex-aleph/Makefile
@ -1,82 +0,0 @@
-PORTNAME=	aleph
-PORTVERSION=	1.15.2.1.r.4
-PORTREVISION=	4
-CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
-PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME_TEXMF}${EXTRACT_SUFX}
-DIST_SUBDIR=	TeX
-EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
-
-MAINTAINER=	tex@FreeBSD.org
-COMMENT=	TeX Engine including Omega and e-TeX features
-
-LIB_DEPENDS=	libmpfr.so:math/mpfr \
-		libpng.so:graphics/png
-
-USES=		gnome pkgconfig tar:xz xorg
-USE_TEX=	kpathsea web2c texmf formats fmtutil
-USE_XORG=	pixman
-USE_GNOME=	cairo
-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		libs/xpdf \
-		texk/web2c
-EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
-		--strip-components 1 --no-same-permission --no-same-owner \
-		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=	20150521
-DISTVERSION_TEXLIVE_TEXMF=	20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
-EXTRACT_FILES_TEXMF= \
-	texmf-dist/tex/plain/config/aleph.ini \
-	texmf-dist/doc/aleph \
-	texmf-dist/source/lambda \
-	texmf-dist/tex/lambda
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
-GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=etex pdftex luatex luajittex mf mf-nowin \
-		ptex eptex uptex euptex \
-		otangle mp pmp upmp web2c web-progs xetex tex synctex
-CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
-		--enable-aleph \
-		--with-system-zlib
-.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
-CONFIGURE_ARGS+=--with-system-$L \
-		--with-$L-include=${LOCALBASE}/include \
-		--with-$L-libdir=${LOCALBASE}/lib
-.endfor
-CFLAGS+=	-I${LOCALBASE}/include
-INSTALL_TARGET=	install-strip
-MAKE_JOBS_UNSAFE=	yes
-TEX_FORMATS=	aleph
-
-OPTIONS_DEFINE=	SOURCE
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MSOURCE)
-EXTRACT_FILES_TEXMF:=	${EXTRACT_FILES_TEXMF:Ntexmf-dist/source/*}
-.endif
-
-# buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
-post-extract:
-	cd ${WRKSRC}/.. && \
-	    ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea
-
-pre-configure:
-	for D in libs/xpdf; do \
-		cd ${WRKDIR}/${DISTNAME}/$$D && \
-		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
-		    ${CONFIGURE_ARGS}; \
-	done
-
-pre-su-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
-		${EXTRACT_AFTER_ARGS_TEXMF}
-
-.include <bsd.port.mk>
--- a/print/tex-aleph/distinfo
+++ b/print/tex-aleph/distinfo
@ -1,4 +0,0 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
--- a/print/tex-aleph/files/patch-Makefile.in
+++ b/print/tex-aleph/files/patch-Makefile.in
@ -1,60 +0,0 @@
--- Makefile.in.orig	2015-04-16 19:53:45 UTC
-+++ Makefile.in
-@@ -99,6 +99,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
-+inst_bin_PROGRAMS = aleph$(EXEEXT) $(am__EXEEXT_26) $(am__append_94)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-@@ -2081,7 +2082,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
- AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
- AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
- version = $(WEB2CVERSION)
-SUBDIRS = doc lib man web2c . window omegafonts otps
-+SUBDIRS = man . omegafonts otps
- proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -2431,9 +2432,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
- TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- 	$(am__append_42) $(am__append_48) $(am__append_54) \
- 	$(am__append_60) $(am__append_66)
-bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
-	$(am__append_31) $(am__append_36) $(am__append_75) \
-	$(am__append_80)
-+bin_links =
- install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
- 	$(am__append_73) $(am__append_78)
- uninstall_exe_links = $(am__append_21) $(am__append_30) \
-@@ -4739,9 +4738,9 @@ synctexdir/libsynctex_la-synctex_parser_
- 
- libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: $(inst_bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+	@list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- 	if test -n "$$list"; then \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4771,7 +4770,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+	@list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- 	files=`for p in $$list; do echo "$$p"; done | \
- 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- 	      -e 's/$$/$(EXEEXT)/' \
-@@ -14447,7 +14446,7 @@ install-data: install-data-recursive
- uninstall: uninstall-recursive
- 
- install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
--- a/print/tex-aleph/files/patch-configure
+++ b/print/tex-aleph/files/patch-configure
@ -1,429 +0,0 @@
--- configure.orig	2015-04-12 11:22:39 UTC
-+++ configure
-@@ -23712,26 +23712,6 @@ $as_echo "#define z_const /**/" >>confde
-  ;;
- esac
- 
-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
-  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
-  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
-  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
-  LUA52_RULE='# Rebuild libtexlua52
-$(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h
-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/lua52/include/lua.h:
-	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-
-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
-  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
-  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
-  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
-  LUAJIT_RULE='# Rebuild libtexluajit
-$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/luajit/include/luajit.h:
-	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-
- ## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
- 
- # Check whether --with-system-libpng was given.
-@@ -23756,121 +23736,6 @@ ${top_builddir}/../../libs/libpng/includ
- 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
- fi
- 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
-
-# Check whether --with-system-freetype2 was given.
-if test "${with_system_freetype2+set}" = set; then :
-  withval=$with_system_freetype2;
-fi
-if test "x$with_system_freetype2" = xyes; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FT2_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$FT2_CONFIG"; then
-  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
-if test -n "$FT2_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
-$as_echo "$FT2_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_FT2_CONFIG"; then
-  ac_ct_FT2_CONFIG=$FT2_CONFIG
-  # Extract the first word of "freetype-config", so it can be a program name with args.
-set dummy freetype-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_FT2_CONFIG"; then
-  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
-if test -n "$ac_ct_FT2_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
-$as_echo "$ac_ct_FT2_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    FT2_CONFIG=$ac_ct_FT2_CONFIG
-  fi
-else
-  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
-fi
-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
-fi
-else
-  FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2"
-  FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
-  FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
-  FREETYPE2_RULE='# Rebuild libfreetype
-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h
-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
-	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
- ## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
- 
- # Check whether --with-system-pixman was given.
-@@ -23989,34 +23854,6 @@ ${top_builddir}/../../libs/mpfr/include/
- 	cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
- fi
- 
-## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
-
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
-  withval=$with_system_poppler;
-fi
-if test "x$with_system_poppler" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.18; then
-  POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
-  POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
-fi
-
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
-else
-  POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include"
-  POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a"
-  POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a'
-  POPPLER_RULE='# Rebuild libpoppler
-$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/include/Stream.h
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/poppler/include/Stream.h:
-	cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
-
- ## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
- 
- # Check whether --with-system-xpdf was given.
-@@ -24045,242 +23882,6 @@ ${top_builddir}/../../libs/xpdf/xpdf/Str
- fi
- test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
- 
-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
-
-# Check whether --with-system-zziplib was given.
-if test "${with_system_zziplib+set}" = set; then :
-  withval=$with_system_zziplib;
-fi
-if test "x$with_system_zziplib" = xyes; then
-  if $PKG_CONFIG zziplib --atleast-version=0.12; then
-  ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
-  ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
-elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
-  as_fn_error $? "did not find zziplib 0.12 or better" "$LINENO" 5
-fi
-else
-  ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include"
-  ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a"
-  ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a'
-  ZZIPLIB_RULE='# Rebuild libzzip
-$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h
-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
-	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
-
-# Check whether --with-system-teckit was given.
-if test "${with_system_teckit+set}" = set; then :
-  withval=$with_system_teckit;
-fi
-if test "x$with_system_teckit" = xyes; then
-  if $PKG_CONFIG teckit; then
-  TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
-  TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
-  as_fn_error $? "did not find teckit" "$LINENO" 5
-fi
-else
-  TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
-  TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
-  TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a'
-  TECKIT_RULE='# Rebuild libTECkit
-$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h
-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h:
-	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
-
-# Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
-  withval=$with_system_icu;
-fi
-if test "x$with_system_icu" = xyes; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}icu-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ICU_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ICU_CONFIG"; then
-  ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
-if test -n "$ICU_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
-$as_echo "$ICU_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_ICU_CONFIG"; then
-  ac_ct_ICU_CONFIG=$ICU_CONFIG
-  # Extract the first word of "icu-config", so it can be a program name with args.
-set dummy icu-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_ICU_CONFIG"; then
-  ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_ICU_CONFIG="icu-config"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
-if test -n "$ac_ct_ICU_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
-$as_echo "$ac_ct_ICU_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_ICU_CONFIG" = x; then
-    ICU_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    ICU_CONFIG=$ac_ct_ICU_CONFIG
-  fi
-else
-  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
-fi
-if $ICU_CONFIG --version >/dev/null 2>&1; then
-  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
-  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
-elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
-fi
-else
-  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
-  ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
-  ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
-  ICU_RULE='# Rebuild libicuxxx
-$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/icu/include/unicode/uversion.h:
-	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
-
-# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
-
-# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if $PKG_CONFIG harfbuzz-icu; then
-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
-fi
-else
-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
-  HARFBUZZ_RULE='# Rebuild libharfbuzz
-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/harfbuzz/include/hb.h:
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
-
-# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-
- # Check size of off_t (using <kpathsea/config.h>)
- eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
- eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
--- a/print/tex-aleph/files/patch-man-Makefile.in
+++ b/print/tex-aleph/files/patch-man-Makefile.in
@ -1,24 +0,0 @@
--- man/Makefile.in.orig	2015-03-09 10:53:09 UTC
-+++ man/Makefile.in
-@@ -428,10 +428,10 @@ top_srcdir = @top_srcdir@
- wlibs = @wlibs@
- x_ext_lib = @x_ext_lib@
- x_tool_libs = @x_tool_libs@
-man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
-+man_sources = $(am__append_1) $(am__append_2) \
- 	$(am__append_3) $(am__append_5) $(am__append_6) \
- 	$(am__append_7) $(am__append_9) $(am__append_11) \
-	$(am__append_12) $(am__append_14) $(misc_man_sources)
-+	$(am__append_12) $(am__append_14)
- EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
- 	mf.man mpost.man etex.man $(pdftex_man_sources) luatex.man \
- 	$(otangle_man_sources) aleph.man $(misc_man_sources) \
-@@ -440,7 +440,7 @@ EXTRA_DIST = $(bootstrap_man_sources) $(
- bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
- 
- # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = cweb:ctangle cweb:cweave $(am__append_4) $(am__append_8) \
-+man1_links = $(am__append_4) $(am__append_8) \
- 	$(am__append_10) $(am__append_13) $(am__append_15)
- 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 \
--- a/print/tex-aleph/pkg-descr
+++ b/print/tex-aleph/pkg-descr
@ -1,4 +0,0 @@
-Aleph, formerly known as e-Omega, is a project whose aim is to
-provide an extension to Knuth's TeX comprising both Omega 1.15
-and e-TeX 2.1 features. Its main goals are stability, speed and
-power.
--- a/print/tex-aleph/pkg-plist
+++ b/print/tex-aleph/pkg-plist
@ -1,92 +0,0 @@
-bin/aleph
-bin/omfonts
-bin/otp2ocp
-bin/outocp
-bin/mkocp
-bin/mkofm
-bin/ofm2opl
-bin/opl2ofm
-bin/ovf2ovp
-bin/ovp2ovf
-man/man1/aleph.1.gz
-man/man1/lamed.1.gz
-man/man1/mkocp.1.gz
-man/man1/mkofm.1.gz
-man/man1/odvicopy.1.gz
-man/man1/odvitype.1.gz
-man/man1/ofm2opl.1.gz
-man/man1/opl2ofm.1.gz
-man/man1/otangle.1.gz
-man/man1/otp2ocp.1.gz
-man/man1/outocp.1.gz
-man/man1/ovf2ovp.1.gz
-man/man1/ovp2ovf.1.gz
-%%TEXMFDISTDIR%%/tex/plain/config/aleph.ini
-%%TEXMFDISTDIR%%/doc/aleph/base/readme.txt
-%%TEXMFDISTDIR%%/doc/aleph/base/News
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/antomega/antenc.dtx
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/antomega/antomega.ins
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/antomega/antomega.dtx
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/antomega/antenc.ins
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/oinuit/oinuit.dtx
-%%SOURCE%%%%TEXMFDISTDIR%%/source/lambda/oinuit/oinuit.ins
-%%TEXMFDISTDIR%%/tex/lambda/base/usenglish.bgd
-%%TEXMFDISTDIR%%/tex/lambda/base/UT1omlgc.fd
-%%TEXMFDISTDIR%%/tex/lambda/base/lchcmr.fd
-%%TEXMFDISTDIR%%/tex/lambda/base/greek.bgd
-%%TEXMFDISTDIR%%/tex/lambda/base/ot1uctt.fd
-%%TEXMFDISTDIR%%/tex/lambda/base/usenglish.lay
-%%TEXMFDISTDIR%%/tex/lambda/base/omarab.cfg
-%%TEXMFDISTDIR%%/tex/lambda/base/omega.sty
-%%TEXMFDISTDIR%%/tex/lambda/base/inuit.hpn
-%%TEXMFDISTDIR%%/tex/lambda/base/lambda.tex
-%%TEXMFDISTDIR%%/tex/lambda/base/greek.lay
-%%TEXMFDISTDIR%%/tex/lambda/base/ut1enc.def
-%%TEXMFDISTDIR%%/tex/lambda/base/ot1omlgc.fd
-%%TEXMFDISTDIR%%/tex/lambda/base/odev.sty
-%%TEXMFDISTDIR%%/tex/lambda/base/grmhyph.tex
-%%TEXMFDISTDIR%%/tex/lambda/base/french.lay
-%%TEXMFDISTDIR%%/tex/lambda/base/french.bgd
-%%TEXMFDISTDIR%%/tex/lambda/base/omlgc.cfg
-%%TEXMFDISTDIR%%/tex/lambda/base/ocherokee.sty
-%%TEXMFDISTDIR%%/tex/lambda/base/ojapan.sty
-%%TEXMFDISTDIR%%/tex/lambda/base/ot1omarb.fd
-%%TEXMFDISTDIR%%/tex/lambda/base/elhyph16.tex
-%%TEXMFDISTDIR%%/tex/lambda/base/lchenc.def
-%%TEXMFDISTDIR%%/tex/lambda/base/grcodes.tex
-%%TEXMFDISTDIR%%/tex/lambda/base/UT1cmr.fd
-%%TEXMFDISTDIR%%/tex/lambda/ocherokee/lchcmr.fd
-%%TEXMFDISTDIR%%/tex/lambda/ocherokee/ocherokee.sty
-%%TEXMFDISTDIR%%/tex/lambda/ocherokee/lchenc.def
-%%TEXMFDISTDIR%%/tex/lambda/config/language.dat
-%%TEXMFDISTDIR%%/tex/lambda/config/lambda.ini
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-latvian.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/ogrmhyph4.tex
-%%TEXMFDISTDIR%%/tex/lambda/antomega/ut1enc-antomega.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/ograhyph4.tex
-%%TEXMFDISTDIR%%/tex/lambda/antomega/ogrphyph4.tex
-%%TEXMFDISTDIR%%/tex/lambda/antomega/uni0400.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/uni0100.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/t2aenc-antomega.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/ruhyph16.tex
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-greek.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-spanish.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/hyphen.cfg
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-french.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/language.dat.sample
-%%TEXMFDISTDIR%%/tex/lambda/antomega/antomega.sty
-%%TEXMFDISTDIR%%/tex/lambda/antomega/lgc0700.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-latin.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/antomega.cfg
-%%TEXMFDISTDIR%%/tex/lambda/antomega/lgrenc-antomega.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/uni0370.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-german.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-russian.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/uni1f00.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/grhyph16.tex
-%%TEXMFDISTDIR%%/tex/lambda/antomega/t1enc-antomega.def
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-polish.ldf
-%%TEXMFDISTDIR%%/tex/lambda/antomega/omega-english.ldf
-%%TEXMFDISTDIR%%/tex/lambda/oinuit/oinuit.sty
-%%TEXMFDISTDIR%%/tex/lambda/oinuit/litcmr.fd
-%%TEXMFDISTDIR%%/tex/lambda/oinuit/litenc.def
--- a/print/tex-basic-engines/Makefile
+++ b/print/tex-basic-engines/Makefile
@ -1,9 +1,9 @@
 PORTNAME=	basic-engines
-PORTVERSION=	20150521
+PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/Source/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${PORTVERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
@ -11,31 +11,41 @@ COMMENT=	Basic TeX Engines

 LIB_DEPENDS=	libpng.so:graphics/png

-USES=		pkgconfig libtool tar:xz
-USE_TEX=	kpathsea web2c>=20150521_1
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		libs/xpdf \
-		texk/web2c
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
-GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=aleph luatex luajittex mf \
-		mf-nowin ptex eptex uptex euptex xetex \
-		otangle mp pmp upmp web2c web-progs synctex
-CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
-		--disable-missing \
-		--with-x=no \
-		--without-mf-x-toolkit \
-		--with-system-zlib \
-		--with-system-kpathsea
+USES=		libtool localbase pkgconfig tar:xz
+USE_TEX=	kpathsea web2c>=${PORTVERSION}
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		${EXCLUDE_ENGINES:S/^/--disable-/} \
+			--disable-missing \
+			--with-system-kpathsea \
+			--with-system-zlib \
+			--with-x=no \
+			--without-mf-x-toolkit
 .for L in libpng
-CONFIGURE_ARGS+=--with-system-$L \
-		--with-$L-include=${LOCALBASE}/include \
-		--with-$L-libdir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
+			--with-$L-libdir=${LOCALBASE}/lib \
+			--with-system-$L
 .endfor
-CFLAGS+=	-I${LOCALBASE}/include
+
 INSTALL_TARGET=	install-strip

+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux libs/xpdf texk/web2c
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+
+EXCLUDE_ENGINES=	aleph luatex luajittex mf mf-nowin ptex eptex uptex \
+			euptex xetex otangle mp pmp upmp web2c web-progs \
+			synctex \
+			luahbtex \
+			luajithbtex \
+			mflua \
+			mfluajit \
+			latex
+
+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+
 post-configure:
 	cd ${WRKDIR}/${DISTNAME}/libs/xpdf && \
 	    ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
--- a/print/tex-basic-engines/distinfo
+++ b/print/tex-basic-engines/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643549022
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/print/tex-basic-engines/files/patch-Makefile.in
+++ b/print/tex-basic-engines/files/patch-Makefile.in
@ -1,31 +1,31 @@
--- Makefile.in.orig	2015-04-17 04:53:45.000000000 +0900
-+++ Makefile.in	2015-07-26 07:48:39.326669000 +0900
-@@ -99,8 +99,8 @@
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+--- Makefile.in.orig	2021-02-17 11:40:54 UTC
+++ Makefile.in
+@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
-	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+-	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+-	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
 +bin_PROGRAMS = $(am__EXEEXT_5) \
-+	$(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
- 	$(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
- 	$(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
-@@ -2081,7 +2081,7 @@
+ 	$(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
+ 	$(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
+ 	$(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
+@@ -3108,7 +3106,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = lib man web2c .
 proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -2090,7 +2090,7 @@
+ 
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3128,7 +3126,7 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l
 EXTRA_LTLIBRARIES = libsynctex.la
- lib_LIBRARIES = $(am__append_98)
- lib_LTLIBRARIES = $(am__append_97)
+ lib_LIBRARIES = $(am__append_122)
+ lib_LTLIBRARIES = $(am__append_121)
 -dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 +dist_man_MANS =
 nodist_man_MANS = 
+ TEST_EXTENSIONS = .pl .test
 EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
- 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
--- a/print/tex-basic-engines/files/patch-man-Makefile.in
+++ b/print/tex-basic-engines/files/patch-man-Makefile.in
@ -1,24 +1,36 @@
--- man/Makefile.in.orig	2015-07-26 05:53:09.990626000 +0900
-+++ man/Makefile.in	2015-07-26 05:54:10.576804000 +0900
-@@ -437,17 +437,15 @@
- 	$(otangle_man_sources) aleph.man $(misc_man_sources) \
- 	amslatex.min initex.min lamstex.min slitex.min spell.add \
- 	virtex.min
-bootstrap_man_sources = ctie.man cweb.man tangle.man tie.man
-+bootstrap_man_sources = 
+--- man/Makefile.in.orig	2020-11-19 18:31:09 UTC
+++ man/Makefile.in
+@@ -452,27 +452,17 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
+ 	mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
+ 	ppltotf.man ptftopl.man luatex.man xetex.man \
+ 	$(otangle_man_sources) aleph.man $(misc_man_sources) spell.add
+-bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man
+bootstrap_man_sources =
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = cweb:ctangle cweb:cweave $(am__append_4) $(am__append_8) \
-+man1_links = $(am__append_4) $(am__append_8) \
- 	$(am__append_10) $(am__append_13) $(am__append_15)
+-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
+-	ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
+man1_links = $(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
 -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
-+web_man_sources = 
+	$(am__append_14) $(am__append_17) $(am__append_19)
+web_man_sources =
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 -otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
-+otangle_man_sources = 
- misc_man_sources = \
- 	amstex.man \
- 	latex.man \
+-misc_man_sources = \
+-	amstex.man \
+-	latex.man \
+-	latex-dev.man \
+-	pdfetex.man
+otangle_man_sources =
+misc_man_sources =
+ 
+ SUFFIXES = .1 .man .ps .dvi
+ man_files = $(man_sources:.man=.1)
--- a/print/tex-basic-engines/pkg-plist
+++ b/print/tex-basic-engines/pkg-plist
@ -3,9 +3,7 @@ bin/pdftex
 bin/pdftosrc
 bin/tex
 bin/ttf2afm
-man/man1/amstex.1.gz
-man/man1/latex.1.gz
-man/man1/pdfetex.1.gz
+man/man1/initex.1.gz
 man/man1/pdflatex.1.gz
 man/man1/pdftex.1.gz
 man/man1/pdftosrc.1.gz
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@ -1,12 +1,11 @@
 # Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>

 PORTNAME=	dvipdfmx
-PORTVERSION=	20150315
-PORTREVISION=	1
+PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
@ -21,7 +20,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libpaper.so:print/libpaper
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:print/adobe-cmaps

-USES=		pkgconfig tar:xz
+USES=		localbase:ldflags pkgconfig tar:xz
 USE_TEX=	kpathsea web2c texmf dvipsk luatex texhash
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
@ -34,9 +33,7 @@ EXTRACT_AFTER_ARGS_TEXMF= \
 	--strip-components 1 --no-same-permission --no-same-owner \
 	${EXCLUDE_FILES_TEXMF:S,^,--exclude ${DISTNAME_TEXMF}/,} \
 	${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=	20150521
-DISTVERSION_TEXLIVE_TEXMF=	20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
+DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXCLUDE_FILES_TEXMF= \
 	texmf-dist/fonts/map/dvipdfmx/jfontmaps \
 	texmf-dist/fonts/map/dvipdfmx/japanese-otf \
@ -58,11 +55,9 @@ CONFIGURE_ARGS=	--with-system-kpathsea \
 		--with-libpaper-libdir=${LOCALBASE}/lib \
 		--with-system-libpng \
 		--with-system-zlib
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib

 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}

 post-install:
--- a/print/tex-dvipdfmx/distinfo
+++ b/print/tex-dvipdfmx/distinfo
@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643589490
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/tex-dvipdfmx/files/patch-Makefile.in
+++ b/print/tex-dvipdfmx/files/patch-Makefile.in
@ -1,24 +1,24 @@
--- Makefile.in.orig	2015-02-23 08:21:46 UTC
+--- Makefile.in.orig	2020-11-19 18:31:09 UTC
 +++ Makefile.in
-@@ -136,7 +136,7 @@ CONFIG_CLEAN_VPATH_FILES =
- @XDVIPDFMX_TRUE@am__EXEEXT_2 = xdvipdfmx$(EXEEXT)
+@@ -137,7 +137,7 @@ CONFIG_CLEAN_FILES = callexe.c
+ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cmapdatadir)" \
 -	"$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" \
 +	"$(DESTDIR)$(configdatadir)" \
 	"$(DESTDIR)$(mapdatadir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
- nodist_call_dvipdfmx_OBJECTS = call_dvipdfmx-callexe.$(OBJEXT)
-@@ -294,7 +294,7 @@ man1dir = $(mandir)/man1
+ nodist_call_xdvipdfmx_OBJECTS = call_xdvipdfmx-callexe.$(OBJEXT)
+@@ -288,7 +288,7 @@ man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
 DATA = $(dist_cmapdata_DATA) $(dist_configdata_DATA) \
 -	$(dist_glyphlistdata_DATA) $(dist_mapdata_DATA)
 +	$(dist_mapdata_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- 	$(LISP)config.h.in
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ 	config.h.in
 # Read a list of newline-separated strings from the standard input,
-@@ -2713,7 +2713,7 @@ check: check-am
+@@ -1666,7 +1666,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h \
 		all-local
 installdirs:
@ -27,7 +27,7 @@
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -2775,7 +2775,7 @@ info: info-am
+@@ -1800,7 +1800,7 @@ info: info-am
 info-am:
 
 install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
--- a/print/tex-dvipdfmx/pkg-plist
+++ b/print/tex-dvipdfmx/pkg-plist
@ -12,6 +12,14 @@ man/man1/extractbb.1.gz
 man/man1/xdvipdfmx.1.gz
 %%TEXMFDISTDIR%%/doc/dvipdfmx/dvipdfmx-special.pdf
 %%TEXMFDISTDIR%%/doc/dvipdfmx/dvipdfmx-special.tex
+%%TEXMFDISTDIR%%/doc/dvipdfmx/README
+%%TEXMFDISTDIR%%/doc/dvipdfmx/dvipdfmx.pdf
+%%TEXMFDISTDIR%%/doc/dvipdfmx/dvipdfmx.tex
+%%TEXMFDISTDIR%%/doc/dvipdfmx/fdl-1.3.txt
+%%TEXMFDISTDIR%%/doc/dvipdfmx/tug2003-slides-src.zip
+%%TEXMFDISTDIR%%/doc/dvipdfmx/tug2003-slides.pdf
+%%TEXMFDISTDIR%%/doc/dvipdfmx/tug2005.pdf
+%%TEXMFDISTDIR%%/dvipdfmx/dvipdfmx-unsafe.cfg
 %%TEXMFDISTDIR%%/dvipdfmx/dvipdfmx.cfg
 %%TEXMFDISTDIR%%/fonts/cmap/adobe-cmaps
 %%TEXMFDISTDIR%%/fonts/cmap/dvipdfmx/EUC-UCS2
@ -23,4 +31,215 @@ man/man1/xdvipdfmx.1.gz
 %%TEXMFDISTDIR%%/fonts/map/dvipdfm/lm/lm-texnansi.map
 %%TEXMFDISTDIR%%/fonts/map/dvipdfmx/cid-x.map
 %%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ckx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/morisawa/morisawa5.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/otf-ko-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/otf-sc-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/otf-tc-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/uptex-ko-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/uptex-sc-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/adobe/uptex-tc-adobe.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/apple/otf-ko-apple.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/apple/uptex-ko-apple.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/arphic/otf-sc-arphic.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/arphic/otf-tc-arphic.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/arphic/uptex-sc-arphic.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/arphic/uptex-tc-arphic.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/baekmuk/otf-ko-baekmuk.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/baekmuk/uptex-ko-baekmuk.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/canon/otf-canon.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/canon/otf-up-canon.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/canon/ptex-canon.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/canon/uptex-canon.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts-ttf/otf-sc-cjkunifonts-ttf.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts-ttf/otf-tc-cjkunifonts-ttf.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts-ttf/uptex-sc-cjkunifonts-ttf.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts-ttf/uptex-tc-cjkunifonts-ttf.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts/otf-sc-cjkunifonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts/otf-tc-cjkunifonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts/uptex-sc-cjkunifonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts/uptex-tc-cjkunifonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/dynacomware/otf-tc-dynacomware.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/dynacomware/uptex-tc-dynacomware.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/fandol/otf-sc-fandol.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/fandol/uptex-sc-fandol.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/founder/otf-sc-founder.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/founder/uptex-sc-founder.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-ko-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-sc-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-tc-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-ko-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-sc-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-tc-haranoaji.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-hiragino-pron.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-up-hiragino-pron.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/ptex-hiragino-pron-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/ptex-hiragino-pron.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/uptex-hiragino-pron-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/uptex-hiragino-pron.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/otf-hiragino.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/otf-up-hiragino.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/ptex-hiragino-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/ptex-hiragino.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/uptex-hiragino-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/hiragino/uptex-hiragino.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipa/otf-ipa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipa/otf-up-ipa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipa/ptex-ipa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipa/uptex-ipa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipaex/otf-ipaex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipaex/otf-up-ipaex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipaex/ptex-ipaex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ipaex/uptex-ipaex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/otf-kozuka-pr6.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/ptex-kozuka-pr6.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/uptex-kozuka-pr6.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/otf-kozuka.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/otf-up-kozuka.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/ptex-kozuka-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/ptex-kozuka.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/uptex-kozuka-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/kozuka/uptex-kozuka.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/otf-moga-mobo-ex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/otf-up-moga-mobo-ex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/ptex-moga-mobo-ex-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/ptex-moga-mobo-ex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/uptex-moga-mobo-ex-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/uptex-moga-mobo-ex.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/otf-moga-mobo.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/otf-up-moga-mobo.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/ptex-moga-mobo-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/ptex-moga-mobo.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/uptex-moga-mobo-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/uptex-moga-mobo.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/otf-morisawa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/otf-up-morisawa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/ptex-morisawa-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/ptex-morisawa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/uptex-morisawa-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/morisawa/uptex-morisawa.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-up-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/ptex-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/otf-tc-ms-win10.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-ko-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-sc-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-up-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/ptex-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-ko-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-sc-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/otf-ko-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/otf-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/otf-sc-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/otf-tc-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/otf-up-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/ptex-noEmbed-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/ptex-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/uptex-ko-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/uptex-noEmbed-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/uptex-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/uptex-sc-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/uptex-tc-noEmbed.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/otf-ko-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/otf-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/otf-sc-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/otf-tc-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/otf-up-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/ptex-noto-otc-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/ptex-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/uptex-ko-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/uptex-noto-otc-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/uptex-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/uptex-sc-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/uptex-tc-noto-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/otf-ko-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/otf-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/otf-sc-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/otf-tc-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/otf-up-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/ptex-noto-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/ptex-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/uptex-ko-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/uptex-noto-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/uptex-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/uptex-sc-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/noto/uptex-tc-noto.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/solaris/otf-ko-solaris.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/solaris/uptex-ko-solaris.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/otf-ko-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/otf-sc-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/otf-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/otf-tc-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/otf-up-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/ptex-sourcehan-otc-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/ptex-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/uptex-ko-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/uptex-sc-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/uptex-sourcehan-otc-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/uptex-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/uptex-tc-sourcehan-otc.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/otf-ko-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/otf-sc-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/otf-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/otf-tc-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/otf-up-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/ptex-sourcehan-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/ptex-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/uptex-ko-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/uptex-sc-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/uptex-sourcehan-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/uptex-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/uptex-tc-sourcehan.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ume/otf-ume.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ume/otf-up-ume.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ume/ptex-ume.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/ume/uptex-ume.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/unfonts/otf-ko-unfonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/unfonts/uptex-ko-unfonts.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/otf-up-yu-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/otf-yu-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/ptex-yu-osx-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/ptex-yu-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/uptex-yu-osx-04.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/uptex-yu-osx.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-up-yu-win.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-yu-win.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/ptex-yu-win.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/uptex-yu-win.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-up-yu-win10.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-yu-win10.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/ptex-yu-win10.map
+%%TEXMFDISTDIR%%/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/uptex-yu-win10.map
@dir %%TEXMFDISTDIR%%/fonts/map/dvipdfmx/updmap
--- a/print/tex-dvipsk/Makefile
+++ b/print/tex-dvipsk/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	dvipsk
-PORTVERSION=	5.995
-PORTREVISION=	2
+PORTVERSION=	${TEXLIVE_YEAR}.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
@ -17,46 +16,46 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libpaper.so:print/libpaper

-USES=		gmake tar:xz pkgconfig
-USE_TEX=	kpathsea web2c texmf texhash
-TEXHASHDIRS=	${TEXMFDISTDIR}
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	am \
-		m4 \
-		build-aux \
-		texk/dvipsk \
-		texk/lcdf-typetools
-EXTRACT_AFTER_ARGS_TEXMF= \
-	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
-	--strip-components 1 --no-same-permission --no-same-owner \
-	${EXCLUDE_FILES:S,^,--exclude ,} \
-	${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=	20150521
-DISTVERSION_TEXLIVE_TEXMF=	20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
-EXTRACT_FILES_TEXMF= \
-	texmf-dist/doc/dvips/ \
-	texmf-dist/dvips/ \
-	texmf-dist/fonts/map/dvips/ \
-	texmf-dist/fonts/enc/dvips/ \
-	texmf-dist/tex/generic/dvips/
-EXCLUDE_FILES= \
-	texmf-dist/dvips/xdvi
-WRKSRC=	${WRKDIR}/${DISTNAME}/texk/dvipsk
+USES=		gmake localbase:ldflags pkgconfig tar:xz
+USE_TEX=	kpathsea texhash texmf web2c
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-paper \
-		--with-system-kpathsea \
-		--with-kpathsea-includes=${LOCALBASE}/include \
+CONFIGURE_ARGS=	--with-kpathsea-includes=${LOCALBASE}/include \
 		--with-kpathsea-libdir=${LOCALBASE}/lib \
+		--with-paper \
+		--with-system-kpathsea \
 		--with-system-libpng \
 		--with-system-zlib
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpaper -L${LOCALBASE}/lib

-INFO=	dvips
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=			am m4 build-aux texk/dvipsk texk/lcdf-typetools
+EXTRACT_AFTER_ARGS_TEXMF=	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
+				--strip-components 1 --no-same-permission \
+				--no-same-owner \
+				${EXCLUDE_FILES:S,^,--exclude ,} \
+				${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
+DISTNAME_TEXMF=			texlive-${TEXLIVE_VERSION}-texmf
+EXTRACT_FILES_TEXMF=		texmf-dist/doc/dvips/ texmf-dist/dvips/ \
+				texmf-dist/fonts/map/dvips/ \
+				texmf-dist/fonts/enc/dvips/ \
+				texmf-dist/tex/generic/dvips/
+EXCLUDE_FILES=			texmf-dist/dvips/xdvi
+WRKSRC=				${WRKDIR}/${DISTNAME}/texk/dvipsk
+
+INFO=		dvips
+PLIST_FILES=	bin/afm2tfm \
+		bin/dvips \
+		man/man1/afm2tfm.1.gz \
+		man/man1/dvips.1.gz

 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
-	    ${EXTRACT_AFTER_ARGS_TEXMF}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
+		${EXTRACT_AFTER_ARGS_TEXMF}
+
+post-install:
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}

 .include <bsd.port.mk>
--- a/print/tex-dvipsk/distinfo
+++ b/print/tex-dvipsk/distinfo
@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643561901
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/tex-dvipsk/pkg-plist
+++ b/print/tex-dvipsk/pkg-plist
--- a/print/tex-formats/Makefile
+++ b/print/tex-formats/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	formats
-PORTVERSION=	20150521
-PORTREVISION=	2
+PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	#empty
 PKGNAMEPREFIX=	tex-
@ -10,13 +9,14 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Formats for basic TeX engines and the 'latex' command

+USE_TEX=	basic fmtutil texhash texmf web2c
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes

-USE_TEX=	web2c basic texmf fmtutil texhash
 TEXHASHDIRS=	${TEXMFVARDIR}
-TEX_FORMATS=	amstex context cslatex csplain eplain latex-bin \
-		metafont mex mptopdf pdftex tex
+TEX_FORMATS=	amstex context csplain eplain latex-bin metafont mex mptopdf \
+		tex

 .include <bsd.port.mk>
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@ -1,10 +1,10 @@
 PORTNAME=	jadetex
 PORTVERSION=	3.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150523-texmf
+DISTNAME=	texlive-${TEXLIVE_VERSION}-texmf
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=

--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1645219534
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	luatex
-PORTVERSION=	0.80.0
-PORTREVISION=	24
+PORTVERSION=	1.12.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
@ -17,7 +16,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libmpfr.so:math/mpfr \
 		libzzip.so:devel/zziplib

-USES=		gnome libtool pkgconfig tar:xz xorg
+USES=		gnome libtool pkgconfig shebangfix tar:xz xorg
 USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
 USE_XORG=	pixman
 USE_GNOME=	cairo
@ -26,16 +25,14 @@ TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
 		libs/xpdf \
-		libs/lua52 \
+		libs/lua53 \
 		libs/luajit \
-		libs/poppler \
+		libs/pplib \
 		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=	20150521
-DISTVERSION_TEXLIVE_TEXMF=	20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
+DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXTRACT_FILES_TEXMF=	\
 	texmf-dist/doc/lualatex \
 	texmf-dist/doc/luatex \
@ -43,28 +40,22 @@ EXTRACT_FILES_TEXMF=	\
 	texmf-dist/source/luatex \
 	texmf-dist/source/lualatex \
 	texmf-dist/fonts/map/luatex \
-	texmf-dist/tex/plain/config/dviluatex.ini \
 	texmf-dist/tex/luatex \
-	texmf-dist/tex/plain/config/luatex.ini \
 	texmf-dist/tex/generic/config/luatex-unicode-letters.tex \
 	texmf-dist/tex/generic/config/luatexiniconfig.tex \
 	texmf-dist/tex/generic/context/luatex \
-	texmf-dist/tex/latex/latexconfig/dvilualatex.ini \
-	texmf-dist/tex/latex/latexconfig/lualatex-reset-codes.tex \
 	texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \
-	texmf-dist/tex/latex/latexconfig/lualatex-patch-kernel.tex \
 	texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
-	texmf-dist/tex/latex/latexconfig/lualatex.ini \
 	texmf-dist/tex/lualatex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin \
 		ptex eptex uptex euptex \
-		otangle mp pmp upmp web2c web-progs xetex tex synctex
+		otangle mp pmp upmp web2c web-progs xetex tex synctex \
+		mflua mfluajit luahbtex luajithbtex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-luatex \
 		--enable-luajittex \
-		--without-system-poppler \
 		--with-system-zlib \
 		--with-system-zziplib
 .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc
@ -80,18 +71,31 @@ TEX_FORMATS=	luatex

 # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
 post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	cd ${WRKSRC}/.. && \
 	    ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea

 pre-configure:
-	for D in libs/xpdf libs/poppler; do \
+	for D in libs/xpdf libs/pplib; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 		    ${CONFIGURE_ARGS}; \
 	done
+	cd ${WRKDIR}/${DISTNAME}/libs/pplib && \
+		${MAKE}

 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 	    ${EXTRACT_AFTER_ARGS_TEXMF}
+	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh
+
+post-install:
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
+	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.log" >> ${TMPPLIST}
+	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.fmt" >> ${TMPPLIST} 

 .include <bsd.port.mk>
--- a/print/tex-luatex/distinfo
+++ b/print/tex-luatex/distinfo
@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643562044
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@ -1,60 +1,71 @@
--- Makefile.in.orig	2015-04-16 19:53:45 UTC
+--- Makefile.in.orig	2021-02-17 11:40:54 UTC
 +++ Makefile.in
-@@ -99,6 +99,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+@@ -117,6 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 +inst_bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-@@ -1939,14 +1940,16 @@ LTLIBOBJS = @LTLIBOBJS@
- LTLIBSYNCTEX = @LTLIBSYNCTEX@
- LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
- LUA52_DEFINES = @LUA52_DEFINES@
-LUA52_DEPEND = @LUA52_DEPEND@
-LUA52_INCLUDES = @LUA52_INCLUDES@
-LUA52_LIBS = @LUA52_LIBS@
-+LUA52_DEPEND =
-+LUA52_INCLUDES = -I${LOCALBASE}/include/texlua52 \
-+    -I@top_srcdir@/../../libs/lua52/lua-5.2.4/src
-+LUA52_LIBS = -L${LOCALBASE}/lib -ltexlua52
+ 	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+ 	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+@@ -2966,14 +2967,16 @@ LUA52_DEPEND = @LUA52_DEPEND@
+ LUA52_INCLUDES = @LUA52_INCLUDES@
+ LUA52_LIBS = @LUA52_LIBS@
+ LUA53_DEFINES = @LUA53_DEFINES@
+-LUA53_DEPEND = @LUA53_DEPEND@
+-LUA53_INCLUDES = @LUA53_INCLUDES@
+-LUA53_LIBS = @LUA53_LIBS@
+LUA53_DEPEND =
+LUA53_INCLUDES = -I${LOCALBASE}/include/texlua53 \
+	-I@top_srcdir@/../../libs/lua53/lua53-src/src
+LUA53_LIBS = -L${LOCALBASE}/lib -ltexlua53
 LUAJIT_DEFINES = @LUAJIT_DEFINES@
 -LUAJIT_DEPEND = @LUAJIT_DEPEND@
 -LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
 +LUAJIT_DEPEND =
 +LUAJIT_INCLUDES = -I${LOCALBASE}/include/texluajit \
-+    -I@top_srcdir@/../../libs/luajit/LuaJIT-2.0.3/src
+	-I@top_srcdir@/../../libs/luajit/LuaJIT-src/src
 LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
 -LUAJIT_LIBS = @LUAJIT_LIBS@
 +LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-@@ -2081,7 +2084,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+@@ -3004,7 +3007,8 @@ PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+ PIXMAN_LIBS = @PIXMAN_LIBS@
+ PKG_CONFIG = @PKG_CONFIG@
+ PPLIB_DEPEND = @PPLIB_DEPEND@
+-PPLIB_INCLUDES = @PPLIB_INCLUDES@
+PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
+	-I@top_srcdir@/../../libs/pplib/pplib-src/src
+ PPLIB_LIBS = @PPLIB_LIBS@
+ PTEXENC_DEPEND = @PTEXENC_DEPEND@
+ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+@@ -3108,7 +3112,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
 proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -2431,9 +2434,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
- TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- 	$(am__append_42) $(am__append_48) $(am__append_54) \
- 	$(am__append_60) $(am__append_66)
-bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
-	$(am__append_31) $(am__append_36) $(am__append_75) \
-	$(am__append_80)
-+bin_links = $(am__append_75) $(am__append_80)
- install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
- 	$(am__append_73) $(am__append_78)
- uninstall_exe_links = $(am__append_21) $(am__append_30) \
-@@ -4739,9 +4740,9 @@ synctexdir/libsynctex_la-synctex_parser_
 
- libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3603,10 +3607,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
+ 	$(am__append_35) $(am__append_43) $(am__append_59) \
+ 	$(am__append_64) $(am__append_69) $(am__append_74) \
+ 	$(am__append_79)
+-bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+-	$(am__append_24) $(am__append_33) $(am__append_41) \
+-	$(am__append_49) $(am__append_54) $(am__append_88) \
+-	$(am__append_93) $(am__append_98) $(am__append_103)
+bin_links = $(am__append_75) $(am__append_80)
+ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+ 	$(am__append_39) $(am__append_47) $(am__append_52) \
+ 	$(am__append_86) $(am__append_91) $(am__append_96) \
+@@ -5555,9 +5556,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
 -install-binPROGRAMS: $(bin_PROGRAMS)
 +install-binPROGRAMS: $(inst_bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@ -63,7 +74,7 @@
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4771,7 +4772,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -5587,7 +5588,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
@ -72,7 +83,7 @@
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
-@@ -14447,7 +14448,7 @@ install-data: install-data-recursive
+@@ -19270,7 +19271,7 @@ install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
@ -81,11 +92,12 @@
 
 installcheck: installcheck-recursive
 install-strip:
-@@ -14668,8 +14669,6 @@ $(proglib): ${srcdir}/lib/*.c
+@@ -21003,9 +21004,6 @@ $(proglib): ${srcdir}/lib/*.c
 @KPATHSEA_RULE@
 @PTEXENC_RULE@
 @ZLIB_RULE@
 -@LUA52_RULE@
+-@LUA53_RULE@
 -@LUAJIT_RULE@
 @LIBPNG_RULE@
 @FREETYPE2_RULE@
--- a/print/tex-luatex/files/patch-configure
+++ b/print/tex-luatex/files/patch-configure
@ -1,10 +1,12 @@
--- configure.orig	2015-04-12 11:22:39 UTC
+--- configure.orig	2021-02-17 03:03:54 UTC
 +++ configure
-@@ -23756,121 +23756,6 @@ ${top_builddir}/../../libs/libpng/includ
+@@ -25158,243 +25158,6 @@ ${top_builddir}/../../libs/libpng/include/png.h:
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
 -if test "${with_system_freetype2+set}" = set; then :
@ -102,9 +104,103 @@
 -else
 -  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+-  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
 -  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 -fi
@ -119,14 +215,43 @@
 -	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
- ## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
- 
- # Check whether --with-system-pixman was given.
-@@ -24069,218 +23954,6 @@ ${top_builddir}/../../libs/zziplib/inclu
+-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
+-
+-# Check whether --with-system-pixman was given.
+-if test "${with_system_pixman+set}" = set; then :
+-  withval=$with_system_pixman;
+-fi
+-if test "x$with_system_pixman" = xyes; then
+-  if $PKG_CONFIG pixman-1 --atleast-version=0.18; then
+-  PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
+-  PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
+-elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then
+-  as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5
+-fi
+-else
+-  PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
+-  PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.a"
+-  PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.a'
+-  PIXMAN_RULE='# Rebuild libpixman
+-$(PIXMAN_DEPEND): ${top_builddir}/../../libs/pixman/include/pixman.h
+-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/pixman/include/pixman.h:
+-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
+@@ -25540,339 +25303,6 @@ $(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/
+ ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
 	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
- 
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 -
 -# Check whether --with-system-teckit was given.
 -if test "${with_system_teckit+set}" = set; then :
@ -150,14 +275,78 @@
 -	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# LuaTeX and XeTeX need harfbuzz.
+-if test "x$enable_xetex" = xyes \
+-   || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-fi # end xetex/luatex for harfbuzz
+-
+-# XeTeX, but not LuaTeX, needs icu and graphite.
+-if test "x$enable_xetex" = xyes; then
+-  echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
 -if test "${with_system_icu+set}" = set; then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
-  if test -n "$ac_tool_prefix"; then
+-  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
+-if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}icu-config; ac_word=$2
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@ -248,11 +437,105 @@
 -else
 -  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $ICU_CONFIG --version >/dev/null 2>&1; then
 -  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
 -  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+-  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 -elif test "x$need_icu:$with_system_icu" = xyes:yes; then
-  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 -fi
 -else
 -  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
@ -264,8 +547,16 @@
 -${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 -	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
+-# checking for openbsd to add -lpthread for icu.
+-case $build_os in
+-openbsd*)
+-  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+-  ;;
+-esac
 -
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
 -if test "${with_system_graphite2+set}" = set; then :
@ -289,55 +580,7 @@
 -	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
-
-# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
-  withval=$with_system_harfbuzz;
-fi
-if test "x$with_system_harfbuzz" = xyes; then
-  if $PKG_CONFIG harfbuzz-icu; then
-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
-  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
-fi
-else
-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
-  HARFBUZZ_RULE='# Rebuild libharfbuzz
-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/harfbuzz/include/hb.h:
-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
-
-# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
-  withval=$with_system_graphite2;
-fi
-if test "x$with_system_graphite2" = xyes; then
-  if $PKG_CONFIG graphite2; then
-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
-  as_fn_error $? "did not find graphite2" "$LINENO" 5
-fi
-else
-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
-  GRAPHITE2_RULE='# Rebuild libgraphite2
-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
-
+-fi # end xetex for icu/graphite
+ 
 # Check size of off_t (using <kpathsea/config.h>)
 eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
- eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
--- a/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
+++ b/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
@ -1,11 +1,11 @@
--- luatexdir/font/luatexfont.h.orig	2015-03-20 07:59:58 UTC
+--- luatexdir/font/luatexfont.h.orig	2020-10-04 19:39:39 UTC
 +++ luatexdir/font/luatexfont.h
-@@ -149,8 +149,6 @@ void replace_packet_fonts(internal_font_number f, int 
-                           int *new_fontid, int count);
+@@ -129,8 +129,6 @@ void glyph_unicode_free(void);
+ void replace_packet_fonts(internal_font_number f, int *old_fontid, int *new_fontid, int count);
 int *packet_local_fonts(internal_font_number f, int *num);
 
-int packet_cur_s;               /* current |do_vf_packet()| recursion level */
-int packet_stack_ptr;           /* pointer into |packet_stack| */
+-extern int packet_cur_s;               /* current |do_vf_packet()| recursion level */
+-extern int packet_stack_ptr;           /* pointer into |packet_stack| */
 vf_struct *new_vfstruct(void);
 
 /* writecff.c */
--- a/print/tex-luatex/files/patch-luatexdir_image_writeimg.h
+++ b/print/tex-luatex/files/patch-luatexdir_image_writeimg.h
@ -1,11 +0,0 @@
--- luatexdir/image/writeimg.h.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/image/writeimg.h
-@@ -27,7 +27,7 @@
- #  include "pdf/pdfpage.h"
- 
- typedef image_dict *idict_entry;
-idict_entry *idict_array;
-+extern idict_entry *idict_array;
- 
- void new_img_pdfstream_struct(image_dict *);
- image *new_image(void);
--- a/print/tex-luatex/files/patch-luatexdir_image_writeimg.w
+++ b/print/tex-luatex/files/patch-luatexdir_image_writeimg.w
@ -1,11 +0,0 @@
--- luatexdir/image/writeimg.w.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/image/writeimg.w
-@@ -125,6 +125,8 @@
- #define HEADER_PDF "%PDF-1."
- #define MAX_HEADER (sizeof(HEADER_PNG)-1)
- 
-+idict_entry *idict_array;
-+
- static void check_type_by_header(image_dict * idict)
- {
-     int i;
--- a/print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
+++ b/print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
@ -1,11 +0,0 @@
--- luatexdir/pdf/pdftables.h.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/pdf/pdftables.h
-@@ -21,7 +21,7 @@
- #ifndef PDFTABLES_H
- #  define PDFTABLES_H
- 
-const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
-+extern const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
- 
- typedef enum {
-     union_type_int,
--- a/print/tex-luatex/files/patch-luatexdir_tex_textoken.w
+++ b/print/tex-luatex/files/patch-luatexdir_tex_textoken.w
@ -1,11 +0,0 @@
--- luatexdir/tex/textoken.w.orig	2015-03-28 00:34:27 UTC
-+++ luatexdir/tex/textoken.w
-@@ -75,7 +75,7 @@ maximum memory usage. When code between the delimiters
- report these statistics when |tracing_stats| is sufficiently large.
- 
- @c
-int var_used, dyn_used;         /* how much memory is in use */
-+int dyn_used;                   /* how much memory is in use */
- 
- halfword avail;                 /* head of the list of available one-word nodes */
- unsigned fix_mem_end;           /* the last one-word node used in |mem| */
--- a/print/tex-luatex/files/patch-pdftoepdf.w
+++ b/print/tex-luatex/files/patch-pdftoepdf.w
@ -1,19 +0,0 @@
--- luatexdir/image/pdftoepdf.w.orig	2018-01-31 15:17:41 UTC
-+++ luatexdir/image/pdftoepdf.w
-@@ -70,8 +70,14 @@ static char *get_file_checksum(char *a, 
-         if (ck == NULL)
-             luatex_fail("PDF inclusion: out of memory while processing '%s'",
-                         a);
-        snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,
-                 (uint64_t) mtime);
-+       // snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,
-+       //          (uint64_t) mtime);
-+	        snprintf(ck, PDF_CHECKSUM_SIZE, "%"
-+		PRIu64
-+		"_%"
-+		PRIu64,
-+		(uint64_t) size,
-+		(uint64_t) mtime);
-    } else {
-         switch (fe) {
-         case FE_FAIL:
--- a/print/tex-luatex/pkg-plist
+++ b/print/tex-luatex/pkg-plist
@ -1,994 +0,0 @@
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/CHANGES.md
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/INSTALL
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/README
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/README-scripts
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/VERSION
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example-400.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example-600.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example-de.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example-de.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs-example.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/lilyglyphs_private.zip
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-088c978c.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-1981c3c7.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-20e8632d.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-2abb8a04.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-2be182be.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-3b47d3fe.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-3f4afecc.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-40869867.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-5b13ce04.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-5c91a201.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-707477b7.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-76dbcd67.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-7fd84ff8.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-8155deab.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-8b332c94.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-8d82df0c.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-8d8bb8a3.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-907bc72d.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-a2bf82dd.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-ae3fd948.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-b3dc0958.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-b69af986.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-d9988a2c.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-dffaecd2.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lily-f4d0afc9.png
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lilyglyphsManualFonts.sty
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lilyglyphsStyle.sty
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/resources/lilypond-manuals.css
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/documentation/the-feta-font-2-18-0.html
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/license/COPYING.LPPL
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/license/MANIFEST
-%%TEXMFDISTDIR%%/doc/lualatex/lilyglyphs/license/license-preamble.inp
-%%TEXMFDISTDIR%%/doc/lualatex/lua-check-hyphen/doc/README.md
-%%TEXMFDISTDIR%%/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lua-check-hyphen/doc/sample.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lua-check-hyphen/doc/sample.tex
-%%TEXMFDISTDIR%%/doc/lualatex/luabibentry/News
-%%TEXMFDISTDIR%%/doc/lualatex/luabibentry/README
-%%TEXMFDISTDIR%%/doc/lualatex/luabibentry/luabibentry.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luabidi/README
-%%TEXMFDISTDIR%%/doc/lualatex/luabidi/test.tex
-%%TEXMFDISTDIR%%/doc/lualatex/luacode/News
-%%TEXMFDISTDIR%%/doc/lualatex/luacode/README
-%%TEXMFDISTDIR%%/doc/lualatex/luacode/luacode.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/README
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/luaindex-example.ldx
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/luaindex-example.ltx
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/luaindex-example.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/luaindex.ltx
-%%TEXMFDISTDIR%%/doc/lualatex/luaindex/luaindex.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luainputenc/NEWS
-%%TEXMFDISTDIR%%/doc/lualatex/luainputenc/README
-%%TEXMFDISTDIR%%/doc/lualatex/luainputenc/inputenc.sty.diff
-%%TEXMFDISTDIR%%/doc/lualatex/luainputenc/luainputenc.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luainputenc/test.tex
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/News
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/README
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/lualatex-doc.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/README
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/lualatex-math-de.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/lualatex-math.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-amsmath.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-icomma-unicode.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-icomma.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel-alloc.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel-style.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-unicode.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luasseq/luasseq.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luatextra/News
-%%TEXMFDISTDIR%%/doc/lualatex/luatextra/README
-%%TEXMFDISTDIR%%/doc/lualatex/luatextra/luatextra.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/luatextra/test.tex
-%%TEXMFDISTDIR%%/doc/lualatex/luatodonotes/README.md
-%%TEXMFDISTDIR%%/doc/lualatex/luatodonotes/luatodonotes.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/odsfile/README
-%%TEXMFDISTDIR%%/doc/lualatex/odsfile/odsfile.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/odsfile/odsfile.tex
-%%TEXMFDISTDIR%%/doc/lualatex/odsfile/pokus.ods
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/README
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleGff.gff
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleScf.scf
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleUniprot.txt
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/pgfmolbio.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/placeat/README
-%%TEXMFDISTDIR%%/doc/lualatex/placeat/placeat.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/placeat/placeat.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/README
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/gpp-ft.fea
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-bugreport.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-english-test.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-english-test.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-english-wordlist.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-german-test.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-german-test.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig-german-wordlist.tex
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/selnolig/selnolig.tex
-%%TEXMFDISTDIR%%/doc/lualatex/showhyphens/README
-%%TEXMFDISTDIR%%/doc/lualatex/showhyphens/showhyphens-doc.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/showhyphens/showhyphens-doc.tex
-%%TEXMFDISTDIR%%/doc/lualatex/showhyphens/showhyphens-sample.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/ChangeLog
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/README.doc
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-doc.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-doc.tex
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-logo.pdf
-%%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-logo.tex
-%%TEXMFDISTDIR%%/doc/luatex/base/luatexref-env.tex
-%%TEXMFDISTDIR%%/doc/luatex/base/luatexref-t.pdf
-%%TEXMFDISTDIR%%/doc/luatex/base/luatexref-t.tex
-%%TEXMFDISTDIR%%/doc/luatex/chickenize/README
-%%TEXMFDISTDIR%%/doc/luatex/chickenize/chickenize.pdf
-%%TEXMFDISTDIR%%/doc/luatex/hyph-utf8/README
-%%TEXMFDISTDIR%%/doc/luatex/hyph-utf8/luatex-hyphen.pdf
-%%TEXMFDISTDIR%%/doc/luatex/interpreter/README
-%%TEXMFDISTDIR%%/doc/luatex/interpreter/i-doc.lua
-%%TEXMFDISTDIR%%/doc/luatex/interpreter/interpreter-doc.pdf
-%%TEXMFDISTDIR%%/doc/luatex/interpreter/interpreter-doc.tex
-%%TEXMFDISTDIR%%/doc/luatex/interpreter/interpreter-doc.txt
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/README
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/README.doc
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/lvdebug-doc.pdf
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/lvdebug-doc.tex
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/lvdebugdetail1-num.png
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/sample-plain.pdf
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/sample-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/sample.pdf
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/sample.tex
-%%TEXMFDISTDIR%%/doc/luatex/lua-visual-debug/strut.png
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-01-1.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-10.ltx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-11.ltx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-12.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-13.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-14.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-15.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-16.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-17.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-18.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-19.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-20.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-21.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-22.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-7.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-8.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-02-9.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-2.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-3.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-4.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-5.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-03-6.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-04-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-04-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-04-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-04-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/01-04-5.ctx1crop
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-01-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-01-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-01-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-01-4.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-01-5.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-10.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-11.lualtx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-12.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-13.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-14.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-15.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-16.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-6.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-7.lualtx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-8.lualtx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/02-02-9.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-01-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-03-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-04-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-06-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-06-2.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-06-3.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-07-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-07-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-08-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-08-2.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-08-3.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-10-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-10-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-10-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-1.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-1.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-7.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-01-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-01-2.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-01-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-10.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-11.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-12.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-13.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-14.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-15.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-16.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-17.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-5.lualtx2
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-7.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-8.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/04-04-9.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/05-01-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/05-01-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/05-02-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-02-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-03-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-04-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-05-1.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-05-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-06-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-07-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-07-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-07-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-07-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-07-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-09-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-10-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-1.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-10.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-11.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-12.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-13.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-14.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-15.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-16.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-17.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-18.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-2.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-7.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-8.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-11-9.sh
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-10.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-11.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-12.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-13.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-14.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-7.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-8.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-12-9.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/06-13-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/07-02-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/07-02-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/07-02-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-1.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-10.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-11.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-2.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-3.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-4.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-5.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-6.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-7.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-8.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-01-9.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/08-02-1.lua
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-3.lualtx3
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-01-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-1.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-2.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-3.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-4.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-5.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/09-03-6.lualtx
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/CTdefault.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/DEexa.sty
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/DEoptions.sty
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/Letter.ist
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/LetterC.ist
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/LoadFonts.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/README
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/beispiel.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/bspcalweekly.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/bspdvdcoll.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/bspfont.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/bsppstricks.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exa-fontconfig.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaarticle.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaarticle2.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaartplain.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exabeamer.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exabook.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exabook2.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exadante.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exafoils.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exafubeamer.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exafupd.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/examargin.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/examemoir.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/examinimal-mathsymbols.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/examinimal.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exapd.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaprosper.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exareport.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaseminar.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaslidenotes.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exasymbol.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/exaxetex.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/screxa.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/screxabook.cls
-%%TEXMFDISTDIR%%/doc/luatex/luaintro/screxareport.cls
-%%TEXMFDISTDIR%%/doc/luatex/lualibs/LICENSE
-%%TEXMFDISTDIR%%/doc/luatex/lualibs/NEWS
-%%TEXMFDISTDIR%%/doc/luatex/lualibs/README
-%%TEXMFDISTDIR%%/doc/luatex/lualibs/lualibs.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luamplib/NEWS
-%%TEXMFDISTDIR%%/doc/luatex/luamplib/README
-%%TEXMFDISTDIR%%/doc/luatex/luamplib/luamplib.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luamplib/test-luamplib-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luamplib/test-luamplib-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/COPYING
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/NEWS
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/README
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/filegraph.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/luaotfload.conf.example
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/luaotfload.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luaotfload/valgrind-kpse-suppression.sup
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/NEWS
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/README
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/TODO
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-attr.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-cctb.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-compat.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-loader.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-mcb.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-modutils.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase-regs.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/luatexbase.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-attr-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-attr-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-base-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-base-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-cctb-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-cctb-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-compat-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-compat-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-loader-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-loader-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-loader.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-loader.sub.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-mcb-aux.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-mcb-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-mcb-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-mcb.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-modutils-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-modutils-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-modutils.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-regs-latex.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexbase/test-regs-plain.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/COPYING
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/README
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/jfm-test.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/jfm-ujisc33.lua
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/lltjp-geometry.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/lltjp-geometry.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjclasses.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjltxdoc.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjsclasses.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-en.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-ja.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-ruby.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-ruby.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-zhfonts.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja-zhfonts.tex
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja.dtx
-%%TEXMFDISTDIR%%/doc/luatex/luatexja/luatexja.ins
-%%TEXMFDISTDIR%%/doc/luatex/luatexko/ChangeLog
-%%TEXMFDISTDIR%%/doc/luatex/luatexko/README
-%%TEXMFDISTDIR%%/doc/luatex/luatexko/luatexko-doc.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luatexko/luatexko-doc.tex
-%%TEXMFDISTDIR%%/doc/luatex/luaxml/README
-%%TEXMFDISTDIR%%/doc/luatex/luaxml/luaxml.pdf
-%%TEXMFDISTDIR%%/doc/luatex/luaxml/luaxml.tex
-%%TEXMFDISTDIR%%/doc/luatex/spelling/CHANGES
-%%TEXMFDISTDIR%%/doc/luatex/spelling/LICENSE
-%%TEXMFDISTDIR%%/doc/luatex/spelling/README
-%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc-lst-lua.tex
-%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc.bad
-%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc.pdf
-%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc.tex
-%%TEXMFDISTDIR%%/fonts/map/luatex/context/demo-font.lum
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-babel.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-base.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-bibtex.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-cache.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-chars.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-check.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-colors.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.xml
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-convert.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-epub.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fcd.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-flac.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fonts.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-grep.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-interface.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metapost.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metatex.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mk-help.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-modules.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mtxworks.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-package.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-patterns.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-pdf.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-plain.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-profile.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-rsync.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-scite.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-fonttest.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-help.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-startup.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-texworks.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-timing.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-tools.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-unzip.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-update.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-watch.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-youless.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtxlibs.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtxrun.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/enigma/mtx-t-enigma.lua/mtx-t-enigma.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/rst/mtx-t-rst.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/simpleslides/mtx-simpleslides.lua
-%%TEXMFDISTDIR%%/source/lualatex/luabibentry/Makefile
-%%TEXMFDISTDIR%%/source/lualatex/luabibentry/luabibentry.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luacode/Makefile
-%%TEXMFDISTDIR%%/source/lualatex/luacode/luacode.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luaindex/luaindex.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luainputenc/Makefile
-%%TEXMFDISTDIR%%/source/lualatex/luainputenc/luainputenc.dtx
-%%TEXMFDISTDIR%%/source/lualatex/lualatex-doc/Makefile
-%%TEXMFDISTDIR%%/source/lualatex/lualatex-doc/lltxdoc.cls
-%%TEXMFDISTDIR%%/source/lualatex/lualatex-doc/lualatex-doc.tex
-%%TEXMFDISTDIR%%/source/lualatex/lualatex-math/lualatex-math.dtx
-%%TEXMFDISTDIR%%/source/lualatex/lualatex-math/lualatex-math.ins
-%%TEXMFDISTDIR%%/source/lualatex/luasseq/luasseq.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luasseq/luasseq.ins
-%%TEXMFDISTDIR%%/source/lualatex/luatextra/Makefile
-%%TEXMFDISTDIR%%/source/lualatex/luatextra/luatextra.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luatodonotes/luatodonotes.dtx
-%%TEXMFDISTDIR%%/source/lualatex/luatodonotes/luatodonotes.ins
-%%TEXMFDISTDIR%%/source/lualatex/pgfmolbio/pgfmolbio.dtx
-%%TEXMFDISTDIR%%/source/lualatex/pgfmolbio/pgfmolbio.ins
-%%TEXMFDISTDIR%%/source/lualatex/placeat/placeat.dtx
-%%TEXMFDISTDIR%%/source/luatex/chickenize/chickenize.dtx
-%%TEXMFDISTDIR%%/source/luatex/hyph-utf8/Makefile
-%%TEXMFDISTDIR%%/source/luatex/hyph-utf8/luatex-hyphen.dtx
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/fonts/README-emmentaler
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/fonts/emmentaler-2-18-0.zip
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/_template.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/beamednotes.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/dynamicsigns.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/fancyexamples.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/score.ily
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/singlenotes.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/definitions/singlenotes.pdf
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crescHairpin.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchet.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchetDotted.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchetDottedDouble.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchetDottedDoubleDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchetDottedDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-crotchetDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-decrescHairpin.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaver.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaverDotted.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaverDottedDouble.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaverDottedDoubleDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaverDottedDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-demisemiquaverDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-fancyExample.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNote.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNoteDotted.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNoteDottedDouble.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNoteDottedDoubleDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNoteDottedDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-halfNoteDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaver.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDotted.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDottedDouble.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDottedDoubleDdown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDottedDoubleDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDottedDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-quaverDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaver.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaverDotted.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaverDottedDouble.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaverDottedDoubleDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaverDottedDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-semiquaverDown.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-threeBeamedQuavers.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-threeBeamedQuaversI.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-threeBeamedQuaversII.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-threeBeamedQuaversIII.ly
-%%TEXMFDISTDIR%%/source/luatex/lilyglyphs/glyphimages/generated_src/lily-twoBeamedQuavers.ly
-%%TEXMFDISTDIR%%/source/luatex/lualibs/Makefile
-%%TEXMFDISTDIR%%/source/luatex/lualibs/lualibs.dtx
-%%TEXMFDISTDIR%%/source/luatex/lualibs/test-lualibs.lua
-%%TEXMFDISTDIR%%/source/luatex/lualibs/whatsnew.lua
-%%TEXMFDISTDIR%%/source/luatex/luamplib/Makefile
-%%TEXMFDISTDIR%%/source/luatex/luamplib/luamplib.dtx
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/Makefile
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/filegraph.dot
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-latex.tex
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-main.tex
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-tool.rst
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload.conf.rst
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/Makefile
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-attr.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-cctb.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-compat.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-loader.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-mcb.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-modutils.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-regs.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltj-kinsoku_make.tex
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjclasses.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjclasses.ins
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjltxdoc.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjltxdoc.ins
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjsclasses.dtx
-%%TEXMFDISTDIR%%/source/luatex/luatexja/ltjsclasses.ins
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/blocks2defcharrange.rb
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/chars2defcharrange.rb
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/ivslist.tex
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jfm-convert.lua
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jfm-readable.rb
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jisx0208table.tex
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/kyoikukanji.txt
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/kyoikukanjiChars.tex
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/ltj-unicode-ccfix_make2.pl
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeMingStd-Light.txt
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeMyungjoStd-Medium.txt
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeSongStd-Light.txt
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-KozMinPr6N-Regular.txt
-%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/unicodeBlocks.tex
-%%TEXMFDISTDIR%%/tex/generic/config/luatex-unicode-letters.tex
-%%TEXMFDISTDIR%%/tex/generic/config/luatexiniconfig.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics-gen.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics-nod.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-cbk.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-def.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-enc.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-ext.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-inj.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-lua.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-merged.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-ota.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-otn.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-syn.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-tfm.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-languages.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-languages.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-math.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-math.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-mplib.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-mplib.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-plain.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-preprocessor-test.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-preprocessor.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-preprocessor.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-swiglib-test.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-swiglib-test.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-swiglib.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-swiglib.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-test.tex
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/dvilualatex.ini
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatex-patch-kernel.tex
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatex-reset-codes.tex
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatex.ini
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatexiniconfig.tex
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatexquotejobname.tex
-%%TEXMFDISTDIR%%/tex/lualatex/dad/OT1dad.fd
-%%TEXMFDISTDIR%%/tex/lualatex/dad/T1dad.fd
-%%TEXMFDISTDIR%%/tex/lualatex/dad/dad.sty
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/README-tex
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/README-commands
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/accidentals.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/accordion.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/beamednotes.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/clefs.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/dynamics.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/fancyexamples.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/noteheads.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/numbers.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/rests.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/scripts.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/singlenotes.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/timesignatures.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/core/README-core
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/core/dotted.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/core/genericAccess.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/core/keyval.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/core/opticals.inp
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/lilyglyphs.sty
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crescHairpin.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchet.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchetDotted.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchetDottedDouble.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchetDottedDoubleDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchetDottedDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-crotchetDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-decrescHairpin.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaver.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaverDotted.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaverDottedDouble.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaverDottedDoubleDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaverDottedDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-demisemiquaverDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-fancyExample.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNote.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNoteDotted.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNoteDottedDouble.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNoteDottedDoubleDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNoteDottedDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-halfNoteDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaver.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDotted.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDottedDouble.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDottedDoubleDdown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDottedDoubleDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDottedDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-quaverDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaver.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaverDotted.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaverDottedDouble.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaverDottedDoubleDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaverDottedDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-semiquaverDown.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-threeBeamedQuavers.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-threeBeamedQuaversI.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-threeBeamedQuaversII.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-threeBeamedQuaversIII.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/pdfs/lily-twoBeamedQuavers.pdf
-%%TEXMFDISTDIR%%/tex/lualatex/lua-check-hyphen/lua-check-hyphen.lua
-%%TEXMFDISTDIR%%/tex/lualatex/lua-check-hyphen/lua-check-hyphen.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luabibentry/luabibentry.lua
-%%TEXMFDISTDIR%%/tex/lualatex/luabibentry/luabibentry.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luabidi/arabmaths.tex
-%%TEXMFDISTDIR%%/tex/lualatex/luabidi/autofootnoterule.tex
-%%TEXMFDISTDIR%%/tex/lualatex/luabidi/luabidi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luabidi/textwidthfootnoterule.tex
-%%TEXMFDISTDIR%%/tex/lualatex/luacode/luacode.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luaindex/luaindex.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luainputenc/luainputenc.lua
-%%TEXMFDISTDIR%%/tex/lualatex/luainputenc/luainputenc.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luainputenc/lutf8.def
-%%TEXMFDISTDIR%%/tex/lualatex/luainputenc/lutf8x.def
-%%TEXMFDISTDIR%%/tex/lualatex/lualatex-math/lualatex-math.lua
-%%TEXMFDISTDIR%%/tex/lualatex/lualatex-math/lualatex-math.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luasseq/luasseq.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luatextra/luatextra.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/inspect.lua
-%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/luatodonotes.lua
-%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/luatodonotes.sty
-%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/path_line.lua
-%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/path_point.lua
-%%TEXMFDISTDIR%%/tex/lualatex/odsfile/odsfile.lua
-%%TEXMFDISTDIR%%/tex/lualatex/odsfile/odsfile.sty
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.chromatogram.lua
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.chromatogram.tex
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.convert.tex
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.domains.lua
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.domains.tex
-%%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.sty
-%%TEXMFDISTDIR%%/tex/lualatex/placeat/placeat.sty
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig-english-hyphex.sty
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig-english-patterns.sty
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig-german-hyphex.sty
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig-german-patterns.sty
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig.lua
-%%TEXMFDISTDIR%%/tex/lualatex/selnolig/selnolig.sty
-%%TEXMFDISTDIR%%/tex/lualatex/showhyphens/showhyphens.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-abjad.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-adadi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-algorithm.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-algorithmic.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-amsart.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-amsbook.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-amsmath.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-amstext.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-amsthm.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-array.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-article.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-artikel1.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-artikel2.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-artikel3.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-arydshln.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-backref.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-bidi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-boek.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-boek3.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-book.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-bookest.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-caption3.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-char-def.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-char-ini.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-chkeng.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-clss.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-counters.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-cptns.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-doc.cls
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-empheq.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-extarticle.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-extbook.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-extletter.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-extreport.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-fleqn.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-fonts.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-footnotes.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-ftnxtra.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-glossaries.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-harfi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-jalalical.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-leqno.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-letter.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-lettrine.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-loader.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-ltx.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-mathdigitspec.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-memoir.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-minitoc.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-natbib.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-pkgs.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-poem.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-rapport1.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-rapport3.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-refrep.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-report.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-scrartcl.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-scrbook.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-scrlettr.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-scrreprt.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-shellescape.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-tags.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-tartibi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-tools.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-unibidi-core.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-unibidi-ini.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-unibidi-math.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-unibidi.lua
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh-unibidi.sty
-%%TEXMFDISTDIR%%/tex/lualatex/simurgh/simurgh.sty
-%%TEXMFDISTDIR%%/tex/luatex/chickenize/chickenize.lua
-%%TEXMFDISTDIR%%/tex/luatex/chickenize/chickenize.sty
-%%TEXMFDISTDIR%%/tex/luatex/chickenize/chickenize.tex
-%%TEXMFDISTDIR%%/tex/luatex/hyph-utf8/etex.src
-%%TEXMFDISTDIR%%/tex/luatex/hyph-utf8/luatex-hyphen.lua
-%%TEXMFDISTDIR%%/tex/luatex/interpreter/interpreter.lua
-%%TEXMFDISTDIR%%/tex/luatex/interpreter/interpreter.sty
-%%TEXMFDISTDIR%%/tex/luatex/interpreter/interpreter.tex
-%%TEXMFDISTDIR%%/tex/luatex/lua-visual-debug/lua-visual-debug.lua
-%%TEXMFDISTDIR%%/tex/luatex/lua-visual-debug/lua-visual-debug.sty
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-basic.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-boolean.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-compat.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-dir.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-extended.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-file.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-function.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-gzip.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-io.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-lpeg.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-lua.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-math.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-md5.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-number.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-os.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-package.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-set.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-string.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-table.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-trac-inf.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-unicode.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-url.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-deb.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-dim.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-fmt.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-jsn.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-lua.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-prs.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-sta.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-sto.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-str.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-tab.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-tpl.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs.lua
-%%TEXMFDISTDIR%%/tex/luatex/luamplib/luamplib.lua
-%%TEXMFDISTDIR%%/tex/luatex/luamplib/luamplib.sty
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-auxiliary.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-basics-gen.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-basics-nod.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-blacklist.cnf
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-characters.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-colors.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-configuration.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-database.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-diagnostics.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-features.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fontloader.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-cbk.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-def.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-enc.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-ext.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-inj.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-lua.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-otn.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-tfm.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-glyphlist.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-letterspace.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-loaders.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-log.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-main.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-override.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-parsers.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-status.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/attr.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/cctb.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-attr.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-cctb.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-compat.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-loader.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-mcb.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-modutils.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase-regs.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase.loader.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/luatexbase.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/mcb.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexbase/modutils.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-adjust.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-fontspec.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-otf.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-preset.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-ruby.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-zhfonts.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-CCT.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-banjiao.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-jis.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-kaiming.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-min.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-mono.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-prop.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-propv.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-quanjiao.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-tmin.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-ujis.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-ujisv.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/lltjext.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-adjust.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-base.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-base.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-charrange.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-compat-ptex.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-compat.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-debug.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-direction.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-infomute.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-inputbuf.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-jfmglue.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-jfont.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-jisx0208.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-kinsoku.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-latex.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-math.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-otf.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-plain.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-pretreat.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-rmlgbm.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-ruby.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-setwidth.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-stack.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-tangle.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-unicode-ccfix.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjarticle.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbk10.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbk11.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbk12.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbook.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjltxdoc.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjreport.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsarticle.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsbook.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsize10.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsize11.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsize12.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjskiyou.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjspf.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtarticle.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk10.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk11.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk12.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbook.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtreport.cls
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize10.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize11.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize12.clo
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja-compat.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja-core.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjcore.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjdefs.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjfont.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-fontspec.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-footmisc.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-geometry.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-listings.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-stfloats.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-tascmac.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-xunicode.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko-core.sty
-%%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko-normalize.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko-uhc2utf8.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko.sty
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/dom-sample.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-mod-handler.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-mod-xml.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-pretty.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-selectors.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-stack.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaxml/luaxml-testxml.lua
-%%TEXMFDISTDIR%%/tex/luatex/spelling/spelling.sty
-%%TEXMFDISTDIR%%/tex/plain/config/dviluatex.ini
-%%TEXMFDISTDIR%%/tex/plain/config/luatex.ini
--- a/print/tex-ptexenc/Makefile
+++ b/print/tex-ptexenc/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	ptexenc
-PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTVERSION=	1.3.9
 CATEGORIES=	print
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/Source/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150521-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
--- a/print/tex-ptexenc/distinfo
+++ b/print/tex-ptexenc/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643548489
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/print/tex-ptexenc/files/patch-Makefile.in
+++ b/print/tex-ptexenc/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2016-10-04 13:42:08 UTC
+--- Makefile.in.orig	2020-12-31 21:51:18 UTC
 +++ Makefile.in
-@@ -396,7 +396,8 @@ libptexenc_la_SOURCES = \
+@@ -400,7 +400,8 @@ libptexenc_la_SOURCES = \
 libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
 nobase_include_HEADERS = \
 	ptexenc/ptexenc.h \
--- a/print/tex-ptexenc/files/patch-configure
+++ b/print/tex-ptexenc/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2015-07-25 21:31:25 UTC
+--- configure.orig	2020-01-16 22:02:50 UTC
 +++ configure
-@@ -14889,7 +14889,7 @@ if ${ac_cv_lib_iconv_iconv_open+:} false
+@@ -14951,7 +14951,7 @@ if ${ac_cv_lib_iconv_iconv_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -9,7 +9,7 @@
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-@@ -14924,7 +14924,7 @@ if test "x$ac_cv_lib_iconv_iconv_open" =
+@@ -14986,7 +14986,7 @@ if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
 #define HAVE_LIBICONV 1
 _ACEOF
 
@ -18,7 +18,7 @@
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
-@@ -14933,7 +14933,7 @@ if ${ac_cv_lib_iconv_libiconv_open+:} fa
+@@ -14995,7 +14995,7 @@ if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@ -27,7 +27,7 @@
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-@@ -14968,7 +14968,7 @@ if test "x$ac_cv_lib_iconv_libiconv_open
+@@ -15030,7 +15030,7 @@ if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then
 #define HAVE_LIBICONV 1
 _ACEOF
 
--- a/print/tex-ptexenc/files/patch-ptexenc.c
+++ b/print/tex-ptexenc/files/patch-ptexenc.c
@ -1,6 +1,6 @@
--- ptexenc.c.orig	2014-04-28 06:37:18 UTC
+--- ptexenc.c.orig	2022-01-29 14:44:21 UTC
 +++ ptexenc.c
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
 #include <ptexenc/unicode-jp.h>
 
 #include <ctype.h>
@ -8,7 +8,7 @@
 
 #define ENC_UNKNOWN  0
 #define ENC_JIS      1
-@@ -23,10 +24,46 @@
+@@ -24,10 +25,46 @@
 #define ENC_UTF8     4
 #define ENC_UPTEX    5
 
@ -18,45 +18,45 @@
 static boolean prior_file_enc = false;
 
 +static struct le {
-+	char *name;
-+	int enc;
-+	int flag;
+    char *name;
+    int enc;
+    int flag;
 +} letable[] = {
-+	{"*.UTF-8",     ENC_UTF8, FNM_NOESCAPE},
-+	{"*.eucJP",     ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.EUC-JP",    ENC_EUC, FNM_NOESCAPE},
-+	{"*.EUC",       ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.PCK",       ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.SJIS",      ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{"*.ISO-2022-JP",       ENC_JIS, FNM_NOESCAPE | FNM_CASEFOLD},
-+	{NULL, 0, 0}
+    {"*.UTF-8",     ENC_UTF8, FNM_NOESCAPE},
+    {"*.eucJP",     ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
+    {"*.EUC-JP",    ENC_EUC, FNM_NOESCAPE},
+    {"*.EUC",       ENC_EUC, FNM_NOESCAPE | FNM_CASEFOLD},
+    {"*.PCK",       ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
+    {"*.SJIS",      ENC_SJIS, FNM_NOESCAPE | FNM_CASEFOLD},
+    {"*.ISO-2022-JP",       ENC_JIS, FNM_NOESCAPE | FNM_CASEFOLD},
+    {NULL, 0, 0}
 +};
 +
 +static int
 +default_kanji_enc(void)
 +{
-+	struct le *le;
-+	const char *name;
-+	int i;
+    struct le *le;
+    const char *name;
+    int i;
 +
-+	if (default_kanji_is_uptex)
-+		return (ENC_UPTEX);
-+	name = getenv("LANG");
-+	if (name == NULL)
-+		return (ENC_UTF8);
+    if (default_kanji_is_uptex)
+        return (ENC_UPTEX);
+    name = getenv("LANG");
+    if (name == NULL)
+        return (ENC_UTF8);
 +
-+	for (i = 0; letable[i].name != NULL; i++) {
-+		if (fnmatch(letable[i].name, name, letable[i].flag) !=
-+		    FNM_NOMATCH)
-+			return (letable[i].enc);
-+	}
-+	return (ENC_UTF8);
+    for (i = 0; letable[i].name != NULL; i++) {
+        if (fnmatch(letable[i].name, name, letable[i].flag) !=
+            FNM_NOMATCH)
+                return (letable[i].enc);
+    }
+    return (ENC_UTF8);
 +}
 +
 #define ESC '\033'
 
 #ifndef NOFILE
-@@ -64,7 +101,7 @@ static const_string enc_to_string(int en
+@@ -64,7 +101,7 @@ const_string enc_to_string(int enc)
 static int string_to_enc(const_string str)
 {
     if (str == NULL)                    return ENC_UNKNOWN;
@ -83,7 +83,7 @@
         internal_enc = ENC_UPTEX;
     } else {
 #ifdef WIN32
-         default_kanji_enc = ENC_SJIS;
+         default_kanji_enc = ENC_UTF8;
         internal_enc = ENC_SJIS;
 #else
 -        default_kanji_enc = ENC_UTF8;
--- a/print/tex-ptexenc/pkg-plist
+++ b/print/tex-ptexenc/pkg-plist
@ -1,8 +1,8 @@
 include/ptexenc/ptexenc.h
-include/ptexenc/unicode.h
 include/ptexenc/unicode-jp.h
+include/ptexenc/unicode.h
 lib/libptexenc.a
 lib/libptexenc.so
 lib/libptexenc.so.1
-lib/libptexenc.so.1.3.3
+lib/libptexenc.so.1.3.9
 libdata/pkgconfig/ptexenc.pc
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@ -1,19 +1,19 @@
 PORTNAME=	xetex
-PORTVERSION=	0.99992
-PORTREVISION=	42
+PORTVERSION=	0.99993
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
-EXTRACT_ONLY=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX}
+EXTRACT_ONLY=	texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}

 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX System with Unicode and Modern Font Technologies

-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libicuio.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
@ -21,39 +21,35 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libTECkit.so:textproc/teckit

-USES=		compiler:c++11-lib gnome pkgconfig tar:xz xorg
+USES=		compiler:c++11-lib gnome perl5 pkgconfig python:build tar:xz xorg
 USE_CXXSTD=	gnu++11
+USE_GNOME=	cairo
+USE_PERL5=	build
 USE_TEX=	kpathsea web2c texmf formats fmtutil dvipdfmx
 USE_XORG=	pixman
-USE_GNOME=	cairo
+
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
-		libs/poppler \
+		libs/pplib \
 		libs/xpdf \
 		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF= \
 	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=20150521
-DISTVERSION_TEXLIVE_TEXMF=20150523
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
+DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/xelatex \
 	texmf-dist/doc/xetex \
 	texmf-dist/fonts/misc/xetex \
-	texmf-dist/scripts/xetex \
 	texmf-dist/source/xelatex \
-	texmf-dist/tex/latex/latexconfig/xelatex.ini \
-	texmf-dist/tex/plain/config/xetex.ini \
 	texmf-dist/tex/xelatex \
-	texmf-dist/tex/xetex \
-	texmf-dist/tex/generic/xetexconfig/unicode-letters.tex
+	texmf-dist/tex/xetex
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
-		ptex eptex uptex euptex \
+		mflua mfluajit luahbtex luajithbtex ptex eptex uptex euptex \
 		otangle mp pmp upmp web2c web-progs tex synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-xetex \
@ -64,7 +60,6 @@ CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--with-graphite2-includes=${LOCALBASE}/include/graphite2 \
 		--with-graphite2-libdir=${LOCALBASE}/lib \
 		--with-system-harfbuzz \
-		--without-system-poppler \
 		--with-system-teckit \
 		--with-teckit-includes=${LOCALBASE}/include/teckit \
 		--with-teckit-libdir=${LOCALBASE}/lib \
@ -81,16 +76,34 @@ CPPFLAGS+=	-I${LOCALBASE}/include/harfbuzz -I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	xetex

+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+
 pre-configure:
-	for D in libs/xpdf libs/poppler; do \
+	for D in libs/xpdf libs/pplib; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		    ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 			${CONFIGURE_ARGS}; \
 	done
+	cd ${WRKDIR}/${DISTNAME}/libs/pplib && \
+		${MAKE}

 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}

+post-stage:
+	${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.3.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/dkun-0.4.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/undk-0.6.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/xepersian/unldk-0.2.py
+	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/xelatex/arabxetex/makemaps.pl
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
+
 .include <bsd.port.mk>
--- a/print/tex-xetex/distinfo
+++ b/print/tex-xetex/distinfo
@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643590670
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/tex-xetex/files/patch-Makefile.in
+++ b/print/tex-xetex/files/patch-Makefile.in
@ -1,26 +1,36 @@
--- Makefile.in.orig	2015-04-16 19:53:45 UTC
+--- Makefile.in.orig	2021-02-17 11:40:54 UTC
 +++ Makefile.in
-@@ -99,6 +99,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+@@ -117,6 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 +inst_bin_PROGRAMS = xetex$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-@@ -2081,7 +2082,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+ 	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+ 	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+@@ -3004,7 +3005,8 @@ PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+ PIXMAN_LIBS = @PIXMAN_LIBS@
+ PKG_CONFIG = @PKG_CONFIG@
+ PPLIB_DEPEND = @PPLIB_DEPEND@
+-PPLIB_INCLUDES = @PPLIB_INCLUDES@
+PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
+	-I@top_srcdir@/../../libs/pplib/pplib-src/src
+ PPLIB_LIBS = @PPLIB_LIBS@
+ PTEXENC_DEPEND = @PTEXENC_DEPEND@
+ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+@@ -3108,7 +3110,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
 proglib = lib/lib.a
- EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -4739,9 +4740,9 @@ synctexdir/libsynctex_la-synctex_parser_
 
- libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -5555,9 +5557,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
 -install-binPROGRAMS: $(bin_PROGRAMS)
 +install-binPROGRAMS: $(inst_bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@ -29,7 +39,7 @@
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4771,7 +4772,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -5587,7 +5589,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
@ -38,7 +48,7 @@
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
-@@ -14447,7 +14448,7 @@ install-data: install-data-recursive
+@@ -19270,7 +19272,7 @@ install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
@ -47,7 +57,7 @@
 
 installcheck: installcheck-recursive
 install-strip:
-@@ -14567,7 +14568,6 @@ install-dvi-am:
+@@ -20184,7 +20186,6 @@ install-dvi-am:
 install-exec-am: install-binPROGRAMS install-libLIBRARIES \
 	install-libLTLIBRARIES
 	@$(NORMAL_INSTALL)
--- a/print/tex-xetex/files/patch-configure
+++ b/print/tex-xetex/files/patch-configure
@ -1,19 +1,45 @@
--- configure.orig	2015-04-12 11:22:39.000000000 +0000
-+++ configure	2015-07-25 21:47:24.532843000 +0000
-@@ -1033,6 +1033,8 @@ with_system_poppler
- with_system_xpdf
+--- configure.orig	2021-02-17 03:03:54 UTC
+++ configure
+@@ -1055,6 +1055,8 @@ with_mpfr_includes
+ with_mpfr_libdir
 with_system_zziplib
 with_system_teckit
 +with_teckit_includes
 +with_teckit_libdir
- with_system_icu
 with_system_graphite2
 with_system_harfbuzz
-@@ -23712,26 +23714,6 @@ $as_echo "#define z_const /**/" >>confde
+ with_system_icu
+@@ -24940,11 +24942,6 @@ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libn
+   PPLIB_INCLUDES="-I$kpse_BLD/libs/pplib/include"
+   PPLIB_LIBS="$kpse_BLD/libs/pplib/libpplib.a"
+   PPLIB_DEPEND='${top_builddir}/../../libs/pplib/libpplib.a'
+-  PPLIB_RULE='# Rebuild libpplib
+-$(PPLIB_DEPEND): ${top_builddir}/../../libs/pplib/include/pplib.h
+-	cd ${top_builddir}/../../libs/pplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/pplib/include/pplib.h:
+-	cd ${top_builddir}/../../libs/pplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ 
+ ##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+@@ -25025,113 +25022,6 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree.
+-  LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include"
+-  LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la"
+-  LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la'
+-  LUA53_RULE='# Rebuild libtexlua53
+-$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/lua53/include/lua.h:
+-	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree.
 -  LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
 -  LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
 -  LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
@ -23,7 +49,10 @@
 -${top_builddir}/../../libs/lua52/include/lua.h:
 -	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -
-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+-echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree.
 -  LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
 -  LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
 -  LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
@ -32,17 +61,88 @@
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
 -${top_builddir}/../../libs/luajit/include/luajit.h:
 -	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-#
+-# checking for openbsd for additional jit libraries needed, which is the
+-# case for clang; no point in going to the trouble elsewhere since no
+-# other system needs it.
+-case $build_os in
+-openbsd*)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5
+-$as_echo_n "checking on openbsd if additional jit libraries are needed... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-      typedef struct _Unwind_Context _Unwind_Context;
+-      extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-      _Unwind_GetCFA(ctx);
 -
- ## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
- 
- # Check whether --with-system-libpng was given.
-@@ -24045,43 +24027,35 @@ ${top_builddir}/../../libs/xpdf/xpdf/Str
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-else
+-
+-    jitlibs="-lc++abi -lpthread"
+-    save_LIBS=$LIBS
+-    LIBS="$LIBS $jitlibs"
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include "stdint.h"
+-          typedef struct _Unwind_Context _Unwind_Context;
+-          extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
+-int
+-main ()
+-{
+-_Unwind_Context *ctx;
+-          _Unwind_GetCFA(ctx);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
+-$as_echo "\"$jitlibs\"" >&6; }
+-        LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "luajit could not be linked
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    LIBS=$save_LIBS
+-
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-  ;;
+-esac
+-echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5
+-
+ ##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
+@@ -25515,47 +25405,37 @@ ${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
 fi
 test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
 
-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
-+## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
- 
+-##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
+-
 -# Check whether --with-system-zziplib was given.
 -if test "${with_system_zziplib+set}" = set; then :
 -  withval=$with_system_zziplib;
@ -63,14 +163,18 @@
 -	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
 -${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
 -	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
+ 
+-# Check whether --with-system-teckit was given.
 +# Check whether --with-teckit-includes was given.
 +if test "${with_teckit_includes+set}" = set; then :
 +  withval=$with_teckit_includes;
- fi
- 
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
-
-# Check whether --with-system-teckit was given.
+fi
+
 +# Check whether --with-teckit-libdir was given.
 +if test "${with_teckit_libdir+set}" = set; then :
 +  withval=$with_teckit_libdir;
--- a/print/tex-xetex/pkg-plist
+++ b/print/tex-xetex/pkg-plist
@ -1,704 +0,0 @@
-%%TEXMFDISTDIR%%/doc/xelatex/arabxetex/README
-%%TEXMFDISTDIR%%/doc/xelatex/arabxetex/arabxetex.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/arabxetex/examples/ednotes_example.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/arabxetex/examples/ednotes_example.tex
-%%TEXMFDISTDIR%%/doc/xelatex/arabxetex/examples/minimal.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/README
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/bidi-atbegshi-doc.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/bidi-atbegshi-doc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-LTR.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-LTR.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-RTL.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-RTL.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-foreground-LTR.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-foreground-LTR.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-foreground-RTL.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi-atbegshi/test-foreground-RTL.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/README
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/bidi-logo.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/bidi-logo.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/bidi.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/bidisample2e.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/bidismall2e.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/gull.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/picture.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/presentation-sample.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-arydshln.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-bidi.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-brochure.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-casualcv.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-classiccv.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-color.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-supertabular.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-tabular.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-tabularx.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test-tabulary.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test1-colortbl.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test1-wrapfig.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test2-colortbl.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test2-wrapfig.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidi/test3-wrapfig.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/README
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-doc.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-doc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-example-copies.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-example-copies.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-example-outline.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidicontour/bidicontour-example-outline.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidipagegrid/README
-%%TEXMFDISTDIR%%/doc/xelatex/bidipagegrid/bidipagegrid-doc.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidipagegrid/bidipagegrid-doc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidipresentation/README
-%%TEXMFDISTDIR%%/doc/xelatex/bidipresentation/fig-1.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidipresentation/sample.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidipresentation/sample.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidishadowtext/bidishadowtext-demo.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidishadowtext/bidishadowtext-demo.tex
-%%TEXMFDISTDIR%%/doc/xelatex/bidishadowtext/bidishadowtext-doc.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/bidishadowtext/bidishadowtext-doc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/facture/README
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemple.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemple.tex
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemplesansTVA.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemplesansTVA.tex
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemplesansremise.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/facture/exemplesansremise.tex
-%%TEXMFDISTDIR%%/doc/xelatex/facture/facture.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/facture/makefile
-%%TEXMFDISTDIR%%/doc/xelatex/fixlatvian/Makefile
-%%TEXMFDISTDIR%%/doc/xelatex/fixlatvian/README
-%%TEXMFDISTDIR%%/doc/xelatex/fixlatvian/fixlatvian.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/fontbook/README
-%%TEXMFDISTDIR%%/doc/xelatex/fontbook/fontbook-freefonts.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/fontbook/fontbook-freefonts.tex
-%%TEXMFDISTDIR%%/doc/xelatex/fontbook/fontbook.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/fontwrap/README
-%%TEXMFDISTDIR%%/doc/xelatex/fontwrap/fontwrap.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/fontwrap/fontwrap.tex
-%%TEXMFDISTDIR%%/doc/xelatex/fontwrap/fontwrap_example.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/fontwrap/fontwrap_example.tex
-%%TEXMFDISTDIR%%/doc/xelatex/imsproc/README
-%%TEXMFDISTDIR%%/doc/xelatex/imsproc/logo.JPG
-%%TEXMFDISTDIR%%/doc/xelatex/imsproc/sample-imsproc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/README
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchar.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchar.tex
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchardemo1.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchardemo1.tex
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchartest.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/interchar/interchartest.tex
-%%TEXMFDISTDIR%%/doc/xelatex/mathspec/README
-%%TEXMFDISTDIR%%/doc/xelatex/mathspec/mathspec.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/mathspec/mathspec.tex
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/MyReferences.bib
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/Persian-bib-userguide.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/Persian-bib-userguide.tex
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/README
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/bibtex-example.tex
-%%TEXMFDISTDIR%%/doc/xelatex/persian-bib/gen_pdf.pl
-%%TEXMFDISTDIR%%/doc/xelatex/philokalia/philokalia.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/ptext/README
-%%TEXMFDISTDIR%%/doc/xelatex/ptext/ptext.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/ptext/ptext.tex
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/Makefile
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/README
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/Makefile
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/README.md
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/config-sample.mk
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/config.mk
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/resume-en.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/resume-en.tex
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/resume-zh.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/resume-zh.tex
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/example/resume.bib
-%%TEXMFDISTDIR%%/doc/xelatex/resumecls/resumecls.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/ucharclasses/README
-%%TEXMFDISTDIR%%/doc/xelatex/ucharclasses/ucharclasses.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/ucharclasses/ucharclasses.tex
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/Makefile
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/README
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/gedit-mixed-sugar.png
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/gedit-mixed-traditional.png
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/sugar.png
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/traditional.png
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/unisugar.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/unisugar/unisugar.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/README
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-CJKecglue.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-CM.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-autofake.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-checksingle.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-fallback.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-listings.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-punctstyle.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-subCJKblock.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/example/xeCJK-example-verbatim.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/xeCJK.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/xunicode-combine-marks.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/xunicode-commands.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/xunicode-symbols.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecjk/xunicode-symbols.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecolor/README
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/1251.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/866.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/NEWS
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/README
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/iso.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/koi8-r.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/language.dat.add
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/listings-utf8-ex.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/listings-utf8-ex.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/pict2e-ex.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/pict2e-ex.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/rubibtex-ex-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/rubibtex-ex-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/rubibtex-ex.bib
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/rumakeindex-ex-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/rumakeindex-ex-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-doc-ru.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-doc-ru.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex1-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex2-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex3-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex4-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex5-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex6-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xeindex/README
-%%TEXMFDISTDIR%%/doc/xelatex/xeindex/xeindex.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xeindex/xeindex.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/README
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/dkun-0.3.py
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/dkun-0.4.py
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/ftxe-0.12.py
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/img/ireland.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/img/weather/clouds.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/img/weather/rain.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/img/weather/sun.jpg
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/magazine-sample.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/test-correction.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/test-empty-form.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/test-question-only.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/test-solution-form.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/undk-0.6.py
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/unldk-0.2.py
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/xepersian-logo.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/xepersian-logo.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xepersian/xepersian.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/README
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/jatestspot.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/jatestspot.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/spotcolor-test.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/spotcolor-test.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xespotcolor/xespotcolor.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xetex-itrans/README
-%%TEXMFDISTDIR%%/doc/xelatex/xetex-itrans/itrans-tamil-sample.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xetex-itrans/itrans-tamil-sample.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xevlna/License.txt
-%%TEXMFDISTDIR%%/doc/xelatex/xevlna/README
-%%TEXMFDISTDIR%%/doc/xelatex/xevlna/xevlna-inc.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xevlna/xevlna.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xevlna/xevlna.tex
-%%TEXMFDISTDIR%%/doc/xelatex/xgreek/README
-%%TEXMFDISTDIR%%/doc/xelatex/xgreek/xgreek.pdf
-%%TEXMFDISTDIR%%/doc/xelatex/xunicode/README
-%%TEXMFDISTDIR%%/doc/xetex/base/NEWS
-%%TEXMFDISTDIR%%/doc/xetex/base/README
-%%TEXMFDISTDIR%%/doc/xetex/base/XeTeX-notes.pdf
-%%TEXMFDISTDIR%%/doc/xetex/base/XeTeX-notes.tex
-%%TEXMFDISTDIR%%/doc/xetex/xesearch/README
-%%TEXMFDISTDIR%%/doc/xetex/xesearch/xesearch.pdf
-%%TEXMFDISTDIR%%/doc/xetex/xesearch/xesearch.tex
-%%TEXMFDISTDIR%%/doc/xetex/xetex-devanagari/Changelog
-%%TEXMFDISTDIR%%/doc/xetex/xetex-pstricks/README
-%%TEXMFDISTDIR%%/doc/xetex/xetex-tibetan/Changelog
-%%TEXMFDISTDIR%%/doc/xetex/xetex-tibetan/README
-%%TEXMFDISTDIR%%/doc/xetex/xetexfontinfo/README
-%%TEXMFDISTDIR%%/doc/xetex/xetexko/ChangeLog
-%%TEXMFDISTDIR%%/doc/xetex/xetexko/README
-%%TEXMFDISTDIR%%/doc/xetex/xetexko/xetexko-doc.pdf
-%%TEXMFDISTDIR%%/doc/xetex/xetexko/xetexko-doc.tex
-%%TEXMFDISTDIR%%/doc/xetex/xetexref/Makefile
-%%TEXMFDISTDIR%%/doc/xetex/xetexref/Makefile.ini
-%%TEXMFDISTDIR%%/doc/xetex/xetexref/README
-%%TEXMFDISTDIR%%/doc/xetex/xetexref/xetex-reference.pdf
-%%TEXMFDISTDIR%%/doc/xetex/xetexref/xetex-reference.tex
-%%TEXMFDISTDIR%%/doc/xetex/zhspacing/README
-%%TEXMFDISTDIR%%/doc/xetex/zhspacing/test/zhspacing-context-test.tex
-%%TEXMFDISTDIR%%/doc/xetex/zhspacing/zhs-man.pdf
-%%TEXMFDISTDIR%%/doc/xetex/zhspacing/zhs-man.tex
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabicdigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabicdigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-farsi-trans-loc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-farsi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kashmiri-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-kurdish.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-maghribi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-malay-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-pashto-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-sindhi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-turk-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-uighur.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-urdu-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2alif-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-farsi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kashmiri-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-kurdish.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-maghribi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-malay-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-pashto-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-sindhi-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-turk-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-uighur.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-fullvoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-novoc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-urdu-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-fdf2noalif-voc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-pashto-trans-loc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-trans-loc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-sindhi-trans-loc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-dmg.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-trans-loc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/arabtex-urdu-trans-loc.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/farsidigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/farsidigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/fixlamalif.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/fixlamalif.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/mirrorpunct.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/arabxetex/mirrorpunct.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/base/qx-unicode.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/base/qx-unicode.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/base/tex-text.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/base/tex-text.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/context/tlig.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/context/tlig.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/arabicdigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/arabicdigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/bengalidigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/bengalidigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/devanagaridigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/devanagaridigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/farsidigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/farsidigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/thaidigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/polyglossia/thaidigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/full-stop.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/full-stop.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/fullwidth-stop.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/fullwidth-stop.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/han-simp.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/han-simp.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/han-trad.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xecjk/han-trad.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xepersian/parsidigits.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xepersian/parsidigits.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/README
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/devanagarinumerals.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/harvardkyoto.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/iast.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis-sanskrit.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-devanagari/velthuis.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/brh-kan.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/brh-kan.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-dvn.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-dvn.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-iast.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-iast.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-kan.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-kan.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-sankan.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-sankan.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-santel.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-santel.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-sdvn.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-sdvn.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-tamil.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-tamil.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-tel.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-itrans/itrans-tel.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-tibetan/loctib.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-tibetan/loctib.tec
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-tibetan/wylie.map
-%%TEXMFDISTDIR%%/fonts/misc/xetex/fontmapping/xetex-tibetan/wylie.tec
-%%TEXMFDISTDIR%%/scripts/xetex/perl/lib/PDF/Reuse.pm
-%%TEXMFDISTDIR%%/scripts/xetex/perl/lib/PDF/Reuse/Util.pm
-%%TEXMFDISTDIR%%/scripts/xetex/perl/xdv2pdf_mergemarks
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-farsi-trans-loc.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-kurdish.maps
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-pashto-trans-loc.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-sindhi-trans-loc.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-trans-dmg.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-trans-loc.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-uighur.maps
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex-urdu-trans-loc.map
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabtex.maps
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/arabxetex.dtx
-%%TEXMFDISTDIR%%/source/xelatex/arabxetex/makemaps.pl
-%%TEXMFDISTDIR%%/source/xelatex/bidi/bidi.dtx
-%%TEXMFDISTDIR%%/source/xelatex/bidi/bidi.ins
-%%TEXMFDISTDIR%%/source/xelatex/facture/facture.dtx
-%%TEXMFDISTDIR%%/source/xelatex/facture/facture.ins
-%%TEXMFDISTDIR%%/source/xelatex/fixlatvian/fixlatvian.dtx
-%%TEXMFDISTDIR%%/source/xelatex/fixlatvian/fixlatvian.ins
-%%TEXMFDISTDIR%%/source/xelatex/fontbook/fontbook.dtx
-%%TEXMFDISTDIR%%/source/xelatex/fontbook/fontbook.ins
-%%TEXMFDISTDIR%%/source/xelatex/philokalia/philokalia.dtx
-%%TEXMFDISTDIR%%/source/xelatex/philokalia/philokalia.ins
-%%TEXMFDISTDIR%%/source/xelatex/resumecls/resumecls.dtx
-%%TEXMFDISTDIR%%/source/xelatex/resumecls/resumecls.ins
-%%TEXMFDISTDIR%%/source/xelatex/xecjk/xeCJK.dtx
-%%TEXMFDISTDIR%%/source/xelatex/xecjk/xeCJK.ins
-%%TEXMFDISTDIR%%/source/xelatex/xepersian/xepersian.dtx
-%%TEXMFDISTDIR%%/source/xelatex/xepersian/xepersian.ins
-%%TEXMFDISTDIR%%/source/xelatex/xespotcolor/xespotcolor.dtx
-%%TEXMFDISTDIR%%/source/xelatex/xespotcolor/xespotcolor.ins
-%%TEXMFDISTDIR%%/source/xelatex/xgreek/xgreek.dtx
-%%TEXMFDISTDIR%%/source/xelatex/xgreek/xgreek.ins
-%%TEXMFDISTDIR%%/tex/generic/xetexconfig/unicode-letters.tex
-%%TEXMFDISTDIR%%/tex/latex/latexconfig/xelatex.ini
-%%TEXMFDISTDIR%%/tex/plain/config/xetex.ini
-%%TEXMFDISTDIR%%/tex/xelatex/arabxetex/arabxetex.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi-atbegshi/bidi-atbegshi.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/adjmulticol-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/algorithm2e-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/amsart-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/amsbook-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/amsmath-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/amstext-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/amsthm-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/array-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/article-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/artikel1-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/artikel2-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/artikel3-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/arydshln-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bibitem.pdf
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidi-longtable.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidi.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidi.tex
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidi2in1.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidicode.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidiftnxtra.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidimoderncv.cls
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidipoem.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/biditools.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/biditufte-book.cls
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/biditufte-handout.cls
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftefloat.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftegeneralstructure.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftehyperref.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftesidenote.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftetitle.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bidituftetoc.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/boek-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/boek3-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/book-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/bookest-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/breqn-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/cals-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/caption-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/caption3-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/color-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/colortbl-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/combine-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/crop-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/cuted-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/cutwin-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/cvthemebidicasual.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/cvthemebidiclassic.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/dblfnote-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/draftwatermark-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/empheq-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/eso-pic-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/extarticle-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/extbook-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/extletter-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/extreport-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/fancybox-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/fancyhdr-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/fix2col-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/fleqn-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/float-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/floatrow-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/flowfram-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/footnote-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/framed-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/ftnright-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/geometry-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/graphicx-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/hvfloat-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/hyperref-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/latex-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/leqno-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/letter-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/lettrine-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/listings-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/loadingorder-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/longtable-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/mdframed-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/memoir-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/midfloat-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/minitoc-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/multicol-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/multienum-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/natbib-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/newfloat-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/ntheorem-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/pdfpages-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/pgf-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/picinpar-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/plain-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/pstricks-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/quotchap-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/ragged2e-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/rapport1-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/rapport3-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/refrep-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/report-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/rotating-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/scrartcl-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/scrbook-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/scrlettr-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/scrreprt-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/sidecap-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/stabular-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/subfigure-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tabls-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tabularx-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tabulary-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tc-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tikz-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/titlesec-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/titletoc-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tocbibind-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tocloft-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/tocstyle-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/todonotes-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/wrapfig-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/xcolor-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidi/xltxtra-xetex-bidi.def
-%%TEXMFDISTDIR%%/tex/xelatex/bidicontour/bidicontour.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidipagegrid/bidipagegrid.sty
-%%TEXMFDISTDIR%%/tex/xelatex/bidipresentation/bidiprescolors.cfg
-%%TEXMFDISTDIR%%/tex/xelatex/bidipresentation/bidipresentation.cls
-%%TEXMFDISTDIR%%/tex/xelatex/bidishadowtext/bidishadowtext.sty
-%%TEXMFDISTDIR%%/tex/xelatex/facture/facture.cls
-%%TEXMFDISTDIR%%/tex/xelatex/fixlatvian/fixlatvian.sty
-%%TEXMFDISTDIR%%/tex/xelatex/fontbook/fontbook.sty
-%%TEXMFDISTDIR%%/tex/xelatex/fontwrap/fontwrap.sty
-%%TEXMFDISTDIR%%/tex/xelatex/imsproc/imsproc.cls
-%%TEXMFDISTDIR%%/tex/xelatex/interchar/interchar.sty
-%%TEXMFDISTDIR%%/tex/xelatex/mathspec/mathspec.sty
-%%TEXMFDISTDIR%%/tex/xelatex/philokalia/eu1plk.fd
-%%TEXMFDISTDIR%%/tex/xelatex/philokalia/philokalia.sty
-%%TEXMFDISTDIR%%/tex/xelatex/ptext/ptext.sty
-%%TEXMFDISTDIR%%/tex/xelatex/resumecls/resumecls.cls
-%%TEXMFDISTDIR%%/tex/xelatex/ucharclasses/ucharclasses.sty
-%%TEXMFDISTDIR%%/tex/xelatex/unisugar/unisugar.sty
-%%TEXMFDISTDIR%%/tex/xelatex/velthuis/hindicaptions.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xeCJK-listings.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xeCJK.cfg
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xeCJK.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xeCJKfntef.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xunicode-addon.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecjk/xunicode-extra.def
-%%TEXMFDISTDIR%%/tex/xelatex/xecolor/xecolor.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xecyr/xecyr.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xeindex/xeindex.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/algorithm-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/algorithmic-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/amsart-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/amsbook-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/appendix-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/article-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/artikel1-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/artikel2-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/artikel3-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/backref-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/bidimoderncv-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/bidituftesidenote-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/boek-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/boek3-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/book-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/bookest-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/breqn-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/color-localise-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/enumerate-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/extarticle-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/extbook-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/extreport-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/flowfram-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/footnote-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/framed-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/glossaries-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/hyperref-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/imsproc-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/kashida-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/latex-localise-commands-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/latex-localise-environments-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/latex-localise-messages-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/latex-localise-misc-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/listings-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/loadingorder-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/localise-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/memoir-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/minitoc-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/natbib-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/packages-localise-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/rapport1-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/rapport3-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/refrep-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/report-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/scrartcl-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/scrbook-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/scrreprt-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/tkz-linknodes-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/tocloft-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-magazine.cls
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-multiplechoice.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian-persiancal.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xepersian/xepersian.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xespotcolor/xespotcolor.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xetex-def/xetex.def
-%%TEXMFDISTDIR%%/tex/xelatex/xetex-pstricks/pstricks.con
-%%TEXMFDISTDIR%%/tex/xelatex/xetexconfig/crop.cfg
-%%TEXMFDISTDIR%%/tex/xelatex/xevlna/xevlna.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xgreek/xgreek.sty
-%%TEXMFDISTDIR%%/tex/xelatex/xunicode/xunicode.sty
-%%TEXMFDISTDIR%%/tex/xetex/xesearch/t-xesearch.tex
-%%TEXMFDISTDIR%%/tex/xetex/xesearch/xesearch.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetex-pstricks/pstricks.con
-%%TEXMFDISTDIR%%/tex/xetex/xetexfontinfo/aat-info.tex
-%%TEXMFDISTDIR%%/tex/xetex/xetexfontinfo/opentype-info.tex
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/hanja_hangul.tab
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/hanjacom_hangul.tab
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/hanjaexa_hangul.tab
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko-font.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko-hanging.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko-josa.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko-space.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko-vertical.sty
-%%TEXMFDISTDIR%%/tex/xetex/xetexko/xetexko.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/context/t-zhspacing.tex
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/generic/zhmath.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/generic/zhsmyclass.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/generic/zhspacing.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/generic/zhsusefulmacros.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/latex/zhfont.sty
-%%TEXMFDISTDIR%%/tex/xetex/zhspacing/latex/zhulem.sty
--- a/print/tex-xmltex/Makefile
+++ b/print/tex-xmltex/Makefile
@ -1,10 +1,10 @@
 PORTNAME=	xmltex
 PORTVERSION=	1.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-20150523-texmf
+DISTNAME=	texlive-${TEXLIVE_VERSION}-texmf
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=

--- a/print/tex-xmltex/distinfo
+++ b/print/tex-xmltex/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1643560901
+SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
+SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@ -1,10 +1,9 @@
 PORTNAME=	texlive
-PORTVERSION=	20150521
-PORTREVISION=	77
+PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMESUFFIX=	-base
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	TeX

 MAINTAINER=	tex@FreeBSD.org
@ -27,12 +26,13 @@ RUN_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
 		psbook:print/psutils

 USES=		compiler:c++11-lib cpe ghostscript gnome localbase pkgconfig perl5 \
-		python:run shebangfix tar:xz
+		python:run shebangfix tar:xz xorg
 CPE_VENDOR=	tug
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo
 USE_PERL5=	run
 USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
+USE_XORG=x11
 SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	texk/texlive/linked_scripts/accfonts/vpl2ovp \
 	texk/texlive/linked_scripts/accfonts/vpl2vpl \
@ -46,25 +46,37 @@ SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	texk/texlive/linked_scripts/exceltex/exceltex \
 	texk/texlive/linked_scripts/findhyph/findhyph \
 	texk/texlive/linked_scripts/fragmaster/fragmaster.pl \
+	texk/texlive/linked_scripts/git-latexdiff/git-latexdiff \
 	texk/texlive/linked_scripts/installfont/installfont-tl \
 	texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \
 	texk/texlive/linked_scripts/latexpand/latexpand \
 	texk/texlive/linked_scripts/lilyglyphs/*.py \
 	texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
-	texk/texlive/linked_scripts/lua2dox/lua2dox_filter \
 	texk/texlive/linked_scripts/mathspic/mathspic.pl \
 	texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \
 	texk/texlive/linked_scripts/multibibliography/multibibliography.pl \
 	texk/texlive/linked_scripts/pygmentex/*.py \
 	texk/texlive/linked_scripts/pythontex/*.py \
 	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
+	texk/texlive/linked_scripts/spix/spix.py \
 	texk/texlive/linked_scripts/splitindex/splitindex.pl \
 	texk/texlive/linked_scripts/svn-multi/svn-multi.pl \
 	texk/texlive/linked_scripts/texdirflatten/texdirflatten \
 	texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \
 	texk/texlive/linked_scripts/ulqda/ulqda.pl \
 	texk/texlive/linked_scripts/urlbst/urlbst \
-	texk/texlive/linked_scripts/yplan/yplan
+	texk/texlive/linked_scripts/yplan/yplan \
+	texk/texlive/linked_scripts/webquiz/webquiz.py \
+	texk/texlive/linked_scripts/petri-nets/pn2pdf \
+	texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl \
+	texk/texlive/linked_scripts/pdfxup/pdfxup \
+	texk/texlive/linked_scripts/tlcockpit/tlcockpit.sh \
+	texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat.pl \
+	texk/texlive/linked_scripts/pdftex-quiet/pdftex-quiet \
+	texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler \
+	texk/texlive/linked_scripts/latex-papersize/latex-papersize.py \
+	texk/texlive/linked_scripts/makedtx/makedtx.pl \
+	texk/texlive/linked_scripts/pdfbook2/pdfbook2

 # during build phase gnu configure is run a lot
 GNU_CONFIGURE=	yes
@ -76,7 +88,6 @@ CONFIGURE_ARGS=	--disable-native-texlive-build \
 		--disable-dvipdfmx \
 		--disable-dvipdfm-x \
 		--disable-xdvipdfmx \
-		--disable-xpdfopen \
 		--enable-build-in-source-tree \
 		--datarootdir=${LOCALBASE}/share \
 		--with-system-freetype2 \
@ -87,11 +98,8 @@ CONFIGURE_ARGS=	--disable-native-texlive-build \
 		--with-system-harfbuzz \
 		--with-system-graphite2 \
 		--with-system-pixman \
-		--with-system-poppler \
 		--with-system-t1lib \
-		--with-xpdf-includes=${LOCALBASE}/include/poppler \
-		--with-xpdf-libdir=${LOCALBASE}/lib \
-		--with-system-xpdf \
+		--without-system-xpdf \
 		--with-system-zziplib \
 		--with-system-zlib
 .for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit
@ -121,26 +129,29 @@ EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
 		${DISTNAME}/texk/xdvik \
 		${DISTNAME}/texk/dvipdfm-x \
 		${DISTNAME}/texk/dvipsk \
-		${DISTNAME}/libs \
 		${DISTNAME}/utils/t1utils \
 		${DISTNAME}/utils/xpdfopen

+post-extract:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+
 post-patch:
-	cd ${WRKSRC}/texk/texlive && \
-	    ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
-	    linked_scripts/texlive/fmtutil-sys.sh \
-	    tl_scripts/texconfig-sys.sh \
-	    linked_scripts/texlive/updmap-sys.sh
 	${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \
 		${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro
+	${REINPLACE_CMD} -e 's|exec texconfig|exec ${PREFIX}/bin/texconfig|' \
+		${WRKSRC}/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
+	${REINPLACE_CMD} -e 's|exec fmtutil|exec ${PREFIX}/bin/fmtutil|' \
+		${WRKSRC}/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+	${REINPLACE_CMD} -e 's|exec updmap|exec ${PREFIX}/bin/updmap|' \
+		${WRKSRC}/texk/texlive/linked_scripts/texlive/updmap-sys.sh
+	${REINPLACE_CMD} -e '/tlmgr/d' \
+		${WRKSRC}/texk/texlive/linked_scripts/Makefile.in

 post-install-fmtutil:
 	for D in ${TEXHASHDIRS}; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \
-		${TOUCH} ${STAGEDIR}${PREFIX}/$$D/.keep_me; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c
-	${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me
 	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \
 	    ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF}

--- a/print/texlive-base/distinfo
+++ b/print/texlive-base/distinfo
@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643549283
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
--- a/print/texlive-base/files/patch-Makefile.in
+++ b/print/texlive-base/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2015-07-23 10:46:25.620611000 +0900
-+++ Makefile.in	2015-07-23 10:46:40.645948000 +0900
-@@ -487,7 +487,7 @@
+--- Makefile.in.orig	2021-02-08 15:49:16 UTC
+++ Makefile.in
+@@ -489,7 +489,7 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o
 NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 
 # Files not to be distributed
--- a/print/texlive-base/files/patch-configure
+++ b/print/texlive-base/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2015-04-12 11:22:39 UTC
+--- configure.orig	2021-03-24 21:28:22 UTC
 +++ configure
-@@ -5685,7 +5685,16 @@ $as_echo "$as_me:   ->  installed \`zlib' headers and 
+@@ -5918,7 +5918,16 @@ $as_echo "$as_me:   ->  installed \`zlib' headers and 
     as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
@ -17,18 +17,18 @@
 test "x$need_teckit" = xyes && {
   need_zlib=yes
 }
-@@ -21198,8 +21207,8 @@ else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+@@ -21447,8 +21456,8 @@ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 +  FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags`
 +  FREETYPE2_LIBS=`pkg-config freetype2 --libs`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi
-@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = 
+ elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+@@ -21513,11 +21522,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = 
   as_fn_error $? "did not find graphite2" "$LINENO" 5
 fi
 
@ -45,4 +45,4 @@
 +  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
 fi
 
- if test -n "$ac_tool_prefix"; then
+ echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
--- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
+++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
@ -1,29 +1,30 @@
--- texk/bibtex-x/Makefile.in.orig	2015-03-12 14:42:02 UTC
+--- texk/bibtex-x/Makefile.in.orig	2021-02-08 15:49:16 UTC
 +++ texk/bibtex-x/Makefile.in
-@@ -121,8 +121,7 @@ CONFIG_CLEAN_FILES =
+@@ -122,8 +122,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT)
 @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" \
-	"$(DESTDIR)$(csfdir)"
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+-	"$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"
 +am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \
 	bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \
-@@ -1438,7 +1437,7 @@ check-am: all-am
+@@ -1514,7 +1513,7 @@ check-am: all-am
 check: check-am
- all-am: Makefile $(PROGRAMS) $(DATA) config.h
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"; do \
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"; do \
 +	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -1498,7 +1497,7 @@ info: info-am
+@@ -1586,8 +1585,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_btdocDATA install-dist_csfDATA
+-install-data-am: install-dist_btdocDATA install-dist_csfDATA \
+-	install-man
 +install-data-am: install-dist_csfDATA
 
 install-dvi: install-dvi-am
--- a/print/texlive-base/files/patch-texk-chktex-Makefile.in
+++ b/print/texlive-base/files/patch-texk-chktex-Makefile.in
@ -1,6 +1,6 @@
--- texk/chktex/Makefile.in.orig	2015-04-13 09:45:32 UTC
+--- texk/chktex/Makefile.in.orig	2020-11-19 18:31:09 UTC
 +++ texk/chktex/Makefile.in
-@@ -119,10 +119,8 @@ mkinstalldirs = $(install_sh) -d
+@@ -125,10 +125,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl
 CONFIG_CLEAN_VPATH_FILES =
@ -8,12 +8,12 @@
 -	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \
 -	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \
 -	"$(DESTDIR)$(pdfdocdir)"
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir) \
 +	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \
 	@CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \
-@@ -1405,7 +1403,7 @@ check-am: all-am
+@@ -1432,7 +1430,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
 installdirs:
@ -22,7 +22,7 @@
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -1469,9 +1467,7 @@ info: info-am
+@@ -1504,9 +1502,7 @@ info: info-am
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in
+++ b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in
@ -1,6 +1,6 @@
--- texk/cjkutils/Makefile.in.orig	2015-03-12 14:42:02 UTC
+--- texk/cjkutils/Makefile.in.orig	2020-11-19 18:31:09 UTC
 +++ texk/cjkutils/Makefile.in
-@@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES =
+@@ -136,7 +136,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
@ -9,7 +9,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 bg5conv_SOURCES = bg5conv.c
 bg5conv_OBJECTS = bg5conv.$(OBJEXT)
-@@ -1412,7 +1412,7 @@ check: check-am
+@@ -1451,7 +1451,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \
 		all-local
 installdirs:
@ -18,7 +18,7 @@
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -1477,7 +1477,7 @@ info: info-am
+@@ -1525,7 +1525,7 @@ info: info-am
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp
@ -1,10 +0,0 @@
--- texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp.orig	2015-03-02 08:48:21 UTC
-+++ texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp
-@@ -34,6 +34,7 @@
- 	#endif
- #endif
- 
-+#include <sys/time.h>
- #include <cstdlib>
- #include <fstream>
- #include <map>
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp
@ -1,10 +0,0 @@
--- texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp.orig	2015-03-02 08:48:21 UTC
-+++ texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp
-@@ -19,6 +19,7 @@
- *************************************************************************/
- 
- #include <config.h>
-+#include <sys/time.h>
- #include <cstdlib>
- #include <iostream>
- #include <fstream>
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp
@ -1,10 +0,0 @@
--- texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp.orig	2015-03-02 08:48:21 UTC
-+++ texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp
-@@ -19,6 +19,7 @@
- *************************************************************************/
- 
- #include <config.h>
-+#include <sys/time.h>
- #include "CMap.h"
- #include "CMapManager.h"
- #include "EncFile.h"
--- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp
+++ b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp
@ -1,10 +0,0 @@
--- texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp.orig	2015-03-02 08:48:21 UTC
-+++ texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp
-@@ -19,6 +19,7 @@
- *************************************************************************/
- 
- #include <config.h>
-+#include <sys/time.h>
- #include <cstdarg>
- #include <cstdlib>
- #include <cstring>
--- a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in
+++ b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in
@ -1,4 +1,4 @@
--- texk/gsftopk/Makefile.in.orig	2015-03-12 14:42:02 UTC
+--- texk/gsftopk/Makefile.in.orig	2020-11-19 18:31:09 UTC
 +++ texk/gsftopk/Makefile.in
@@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = c-auto.h
@ -10,7 +10,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_gsftopk_OBJECTS = gsftopk.$(OBJEXT)
 gsftopk_OBJECTS = $(am_gsftopk_OBJECTS)
-@@ -818,7 +817,7 @@ check-am: all-am
+@@ -836,7 +835,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
 installdirs:
@ -19,7 +19,7 @@
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -875,7 +874,7 @@ info: info-am
+@@ -893,7 +892,7 @@ info: info-am
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc
+++ b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc
@ -1,10 +0,0 @@
--- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc.orig	2014-07-08 06:44:39 UTC
-+++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc
-@@ -30,6 +30,7 @@
- #define CHECK_PATH_START()	do { _state = S_PATH; } while (0)
- #define CHECK_PATH_END()	do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0)
- 
-+#undef static_assert
- #ifndef static_assert
- # define static_assert(c, msg)	switch ((int) (c)) case 0: case (c):
- #endif
--- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in
+++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in
@ -1,10 +0,0 @@
--- texk/texlive/linked_scripts/Makefile.in.orig	2015-09-25 04:27:05.446437000 +0900
-+++ texk/texlive/linked_scripts/Makefile.in	2015-09-25 04:27:13.904147000 +0900
-@@ -386,7 +386,6 @@
- 	texlive/fmtutil.pl \
- 	texlive/fmtutil-sys.sh \
- 	texlive/rungs.tlu \
-	texlive/tlmgr.pl \
- 	texlive/updmap.pl \
- 	texlive/updmap-sys.sh \
- 	texliveonfly/texliveonfly.py \
--- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh
+++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh
@ -1,8 +0,0 @@
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig	2015-04-20 07:45:42 UTC
-+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
-@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH
- # hack around a bug in zsh:
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
- 
-exec fmtutil --sys ${1+"$@"}
-+exec %%PREFIX%%/bin/fmtutil --sys ${1+"$@"}
--- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh
+++ b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh
@ -1,8 +0,0 @@
--- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig	2015-04-20 07:45:42 UTC
-+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh
-@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH
- # hack around a bug in zsh:
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
- 
-exec updmap --sys ${1+"$@"}
-+exec %%PREFIX%%/bin/updmap --sys ${1+"$@"}
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
@ -1,69 +0,0 @@
--- texk/texlive/tl_scripts/Makefile.in.orig	2015-04-26 23:57:20 UTC
-+++ texk/texlive/tl_scripts/Makefile.in
-@@ -128,10 +128,9 @@ am__uninstall_files_from_dir = { \
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
-am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" \
-+am__installdirs = "$(DESTDIR)$(texmfdir)" \
- 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \
-	"$(DESTDIR)$(web2cdir)"
-+	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"
- SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \
- 	$(nodist_bin_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -263,8 +262,6 @@ sh_scripts = \
- 	dvi2fax \
- 	dvired \
- 	fontinst \
-	kpsetool \
-	kpsewhere \
- 	ps2frag \
- 	pslatex \
- 	rubibtex \
-@@ -293,8 +290,6 @@ dist_man_MANS = \
- 	fmtutil.1 \
- 	fmtutil.cnf.5 \
- 	fontinst.1 \
-	kpsetool.1 \
-	kpsewhere.1 \
- 	ps2frag.1 \
- 	pslatex.1 \
- 	rubibtex.1 \
-@@ -306,14 +301,10 @@ dist_man_MANS = \
- 
- bin_links = \
- 	allcm:allec \
-	fmtutil:mktexfmt \
-	kpsetool:kpsexpand \
-	kpsetool:kpsepath
-+	fmtutil:mktexfmt
- 
- man1_links = \
- 	fmtutil:fmtutil-sys \
-	kpsetool:kpsexpand \
-	kpsetool:kpsepath \
- 	fmtutil:mktexfmt \
- 	texconfig:texconfig-sys \
- 	updmap:updmap-sys
-@@ -638,7 +629,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
- installdirs:
-	for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
-+	for dir in "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
-@@ -692,8 +683,8 @@ info: info-am
- 
- info-am:
- 
-install-data-am: install-dist_texconfigDATA \
-	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
-+install-data-am: \
-+	install-dist_texmfSCRIPTS \
- 	install-dist_web2cDATA install-man
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf
@ -1,13 +1,11 @@
--- texk/texlive/tl_scripts/fmtutil.cnf.orig	2015-05-05 22:32:32 UTC
-+++ texk/texlive/tl_scripts/fmtutil.cnf
-@@ -37,80 +37,80 @@
- 
+--- texk/texlive/tl_support/fmtutil.cnf.orig	2020-10-07 21:13:01 UTC
+++ texk/texlive/tl_support/fmtutil.cnf
+@@ -41,118 +41,118 @@
+ #    AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here.
 #
 # from aleph:
 -aleph aleph - *aleph.ini
-lamed aleph language.dat *lambda.ini
 +#aleph aleph - *aleph.ini
-+#lamed aleph language.dat *lambda.ini
 #
 # from amstex:
 -amstex pdftex - -translate-file=cp227.tcx *amstex.ini
@ -31,13 +29,15 @@
 #
 # from csplain:
 -csplain pdftex - -etex -enc csplain-utf8.ini
+-luacsplain luatex - -etex csplain.ini
+-pdfcsplain luatex - -etex csplain.ini
 -pdfcsplain pdftex - -etex -enc csplain-utf8.ini
 -pdfcsplain xetex - -etex csplain.ini
-pdfcsplain luatex - -etex csplain.ini
 +#csplain pdftex - -etex -enc csplain-utf8.ini
+#luacsplain luatex - -etex csplain.ini
+#pdfcsplain luatex - -etex csplain.ini
 +#pdfcsplain pdftex - -etex -enc csplain-utf8.ini
 +#pdfcsplain xetex - -etex csplain.ini
-+#pdfcsplain luatex - -etex csplain.ini
 #
 # from eplain:
 -eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
@ -50,33 +50,44 @@
 +#pdfjadetex pdftex language.dat *pdfjadetex.ini
 #
 # from latex-bin:
-latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
 -dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
-lualatex luatex language.dat,language.dat.lua lualatex.ini
-+#latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-+#pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
+-latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+-lualatex luahbtex language.dat,language.dat.lua lualatex.ini
+-pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
 +#dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
-+#lualatex luatex language.dat,language.dat.lua lualatex.ini
- #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
+#latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+#lualatex luahbtex language.dat,language.dat.lua lualatex.ini
+#pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
+ #
+ # from latex-bin-dev:
+-dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini
+-latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini
+-lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini
+-pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
+#dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini
+#latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini
+#lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini
+#pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
 #
 # from lollipop:
-lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
-lualollipop luatex - lualollipop.ini
-xelollipop xetex - -etex xelollipop.ini
-+#lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
-+#lualollipop luatex - lualollipop.ini
-+#xelollipop xetex - -etex xelollipop.ini
- #! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini
- #! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini
+-lollipop tex - lollipop.ini
+#lollipop tex - lollipop.ini
+ #
+ # from luahbtex:
+-luahbtex luahbtex language.def,language.dat.lua luatex.ini
+#luahbtex luahbtex language.def,language.dat.lua luatex.ini
+ #
+ # from luajittex:
+-luajithbtex luajithbtex language.def,language.dat.lua luatex.ini
+-luajittex luajittex language.def,language.dat.lua luatex.ini
+#luajithbtex luajithbtex language.def,language.dat.lua luatex.ini
+#luajittex luajittex language.def,language.dat.lua luatex.ini
 #
 # from luatex:
-luatex luatex language.def,language.dat.lua luatex.ini
 -dviluatex luatex language.def,language.dat.lua dviluatex.ini
-luajittex luajittex language.def,language.dat.lua luatex.ini
-+#luatex luatex language.def,language.dat.lua luatex.ini
+-luatex luatex language.def,language.dat.lua luatex.ini
 +#dviluatex luatex language.def,language.dat.lua dviluatex.ini
-+#luajittex luajittex language.def,language.dat.lua luatex.ini
+#luatex luatex language.def,language.dat.lua luatex.ini
 #
 # from metafont:
 -mf mf-nowin - -translate-file=cp227.tcx mf.ini
@ -89,6 +100,9 @@
 +#mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
 +#pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
 +#utf8mex pdftex mexconf.tex -enc *utf8mex.ini
+ #
+ # from mflua:
+ #! mflua mflua-nowin - mf.ini
 #
 # from mltex:
 -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini
@ -99,52 +113,63 @@
 # from mptopdf:
 -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
 +#mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
+ #
+ # from optex:
+-optex luatex hyphen-lan.opm optex.ini
+#optex luatex hyphen-lan.opm optex.ini
 #
 # from pdftex:
-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
 -etex pdftex language.def -translate-file=cp227.tcx *etex.ini
 -pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
-+#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
 +#etex pdftex language.def -translate-file=cp227.tcx *etex.ini
 +#pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+ #
+ # from platex:
+-platex eptex language.dat *platex.ini
+-platex-dev eptex language.dat *platex.ini
+#platex eptex language.dat *platex.ini
+#platex-dev eptex language.dat *platex.ini
 #
 # from ptex:
-ptex ptex - ptex.ini
 -eptex eptex language.def *eptex.ini
-platex eptex language.dat *platex.ini
-+#ptex ptex - ptex.ini
+-ptex ptex - ptex.ini
 +#eptex eptex language.def *eptex.ini
-+#platex eptex language.dat *platex.ini
- #
- # from t2:
- #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
-@@ -118,20 +118,20 @@ platex eptex language.dat *platex.ini
- #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
+#ptex ptex - ptex.ini
 #
 # from tex:
 -tex tex - tex.ini
-+# tex tex - tex.ini
+#tex tex - tex.ini
 #
 # from texsis:
 -texsis pdftex - -translate-file=cp227.tcx texsis.ini
-+# texsis pdftex - -translate-file=cp227.tcx texsis.ini
+#texsis pdftex - -translate-file=cp227.tcx texsis.ini
+ #
+ # from uplatex:
+-uplatex euptex language.dat *uplatex.ini
+-uplatex-dev euptex language.dat *uplatex.ini
+#uplatex euptex language.dat *uplatex.ini
+#uplatex-dev euptex language.dat *uplatex.ini
 #
 # from uptex:
-uptex uptex - uptex.ini
 -euptex euptex language.def *euptex.ini
-uplatex euptex language.dat *uplatex.ini
-+# uptex uptex - uptex.ini
-+# euptex euptex language.def *euptex.ini
-+# uplatex euptex language.dat *uplatex.ini
+-uptex uptex - uptex.ini
+#euptex euptex language.def *euptex.ini
+#uptex uptex - uptex.ini
+ #
+ # from xelatex-dev:
+-xelatex-dev xetex language.dat -etex xelatex.ini
+#xelatex-dev xetex language.dat -etex xelatex.ini
 #
 # from xetex:
-xetex xetex language.def -etex xetex.ini
 -xelatex xetex language.dat -etex xelatex.ini
-+# xetex xetex language.def -etex xetex.ini
-+# xelatex xetex language.dat -etex xelatex.ini
+-xetex xetex language.def -etex xetex.ini
+#xelatex xetex language.dat -etex xelatex.ini
+#xetex xetex language.def -etex xetex.ini
 #
 # from xmltex:
-xmltex pdftex language.dat *xmltex.ini
 -pdfxmltex pdftex language.dat *pdfxmltex.ini
-+# xmltex pdftex language.dat *xmltex.ini
-+# pdfxmltex pdftex language.dat *pdfxmltex.ini
+-xmltex pdftex language.dat *xmltex.ini
+#pdfxmltex pdftex language.dat *pdfxmltex.ini
+#xmltex pdftex language.dat *xmltex.ini
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh
+++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh
@ -1,8 +0,0 @@
--- texk/texlive/tl_scripts/texconfig-sys.sh.orig	2014-07-13 00:06:11 UTC
-+++ texk/texlive/tl_scripts/texconfig-sys.sh
-@@ -30,4 +30,4 @@ TEXMFVAR="$v"
- TEXMFCONFIG="$c"
- export TEXMFVAR TEXMFCONFIG
- 
-exec texconfig ${1+"$@"}
-+exec %%PREFIX%%/bin/texconfig ${1+"$@"}
--- a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
+++ b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
@ -1,4 +1,4 @@
--- texk/ttf2pk2/Makefile.in.orig	2015-03-12 14:42:02 UTC
+--- texk/ttf2pk2/Makefile.in.orig	2021-02-08 15:49:16 UTC
 +++ texk/ttf2pk2/Makefile.in
@@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
@ -11,7 +11,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) ftlib.$(OBJEXT) \
 	ligkern.$(OBJEXT) newobj.$(OBJEXT) parse.$(OBJEXT) \
-@@ -1321,7 +1319,7 @@ check-am: all-am
+@@ -1349,7 +1347,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
 installdirs:
@ -20,7 +20,7 @@
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
-@@ -1381,8 +1379,7 @@ info: info-am
+@@ -1425,8 +1423,7 @@ info: info-am
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk_dvipng_configure
+++ b/print/texlive-base/files/patch-texk_dvipng_configure
@ -1,13 +1,13 @@
--- texk/dvipng/configure.orig	2021-08-02 22:16:56 UTC
+--- texk/dvipng/configure.orig	2020-11-19 18:31:09 UTC
 +++ texk/dvipng/configure
-@@ -16273,8 +16273,8 @@ else
-   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+@@ -16428,8 +16428,8 @@ else
+   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 +  FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags`
 +  FREETYPE2_LIBS=`pkg-config freetype2 --libs`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
- fi
+ elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+   FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+   FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
--- a/Show more
+++ b/Show more