*/tex*: Update version 20210325=>20230313

- devel/tex-kpathsea: Update version 6.3.3=>6.3.5 - print/texlive-tlmgr: Update version 20210325=>20230313 * Add LICENSE GPLv2 - devel/tex-libtexlua: Update distinfo from 20230313 dists - devel/tex-libtexluajit: Update distinfo from 20230313 dists - print/tex-ptexenc: Update version 1.3.9=>1.4.3 * Pet portclippy - devel/tex-web2c: Update version 20210325=>20230313 - devel/tex-synctex: Update distinfo from 20230313 dists - print/tex-basic-engines: Update version 20210325=>20230313 - print/texlive-base: Update version 20210325=>20230313 - print/texlive-docs: Update version 20210325=>20230313 - print/texlive-full: Update version 20210325=>20230313 - print/texlive-texmf: Update version 20210325=>20230313 - print/texlive-texmf-source: Update version 20210325=>20230313 - print/latex-biber: Update version 2.16=>2.19 - print/tex-dvipdfmax: Update version 20210325=>20230313 - print/tex-dvipsk: Update version 2021.1=>2023.1 - print/tex-formats: Update version 20210325=>20230313 - print/tex-jadetex: Update distinfo from 20230313 dists - print/tex-luatex: Update version 1.12.0=>1.16.0 - print/tex-xetex: Update distinfo from 20230313 dists - print/tex-xmltex: Update distinfo from 20230313 dists - japanese/tex-ptex: Fix build * Remove ConTeXt format - textproc/foiltex: Update MASTER_SITES * Adopt port - There are multiple ports which uses the macro USE_TEX=texmf that is downloading a big DISTFILE. Unfortunately it is not possible for me to test all the consumers in runtime. So in the following ports I have removed USE_TEX=texmf so that someone who uses those can report the runtime files those are missing. If possible(based on LICENSE permission) I will try to create a smaller distfile out of the texlive-20230313-texmf and change dependency accordingly otherwise will reinstate USE_TEX=texmf. The list of ports that are affected are following: * arabic/arabtex * graphics/epix * math/cadabra2 * math/coq * math/gnuplot-tex-extras * net-mgmt/netmagis-www * print/dvisvg * print/lilypond * print/mftrace * print/tex-xdvik * print/latex-beamer Sponsored by: Nepustil
2024-11-18 00:10:04 +00:00 · 2023-04-02 19:30:03 -05:00 · 2023-04-02 19:30:03 -05:00 · 24e24a1956
commit 24e24a1956
parent a8fe44053d
93 changed files with 10588 additions and 1345 deletions
--- a/Mk/Uses/tex.mk
+++ b/Mk/Uses/tex.mk
@ -29,7 +29,7 @@
 #  xdvik:		XDvi
 #  gbklatex:	gbklatex

-#  formats:	TeX, LaTeX, AMSTeX, ConTeXT, EplainTeX,
+#  formats:	TeX, LaTeX, AMSTeX, EplainTeX,
 #		CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis
 #  tex:		TeX
 #  latex:	LaTeX
@ -91,8 +91,9 @@ 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
+TEXLIVE_YEAR?=	2023
+TEXLIVE_VERSION?=	${TEXLIVE_YEAR}0313
+DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf

 .for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF
 PLIST_SUB+=	$V="${$V}"
@ -320,20 +321,6 @@ TEX_FORMAT_AMSTEX_DIRS= \
 post-install-amstex:
 	${LN} -fs pdftex ${STAGEDIR}${PREFIX}/bin/amstex

-TEX_FORMAT_CONTEXT?= \
-	"cont-en pdftex cont-usr.tex -8bit *cont-en.mkii"
-# XXX
-#	"metafun mpost - metafun.mp"
-TEX_FORMAT_CONTEXT_FILES=	\
-	${TEXMFVARDIR}/web2c/pdftex/cont-en.log \
-	${TEXMFVARDIR}/web2c/pdftex/cont-en.fmt
-#	bin/metafun
-TEX_FORMAT_CONTEXT_DIRS= \
-	${TEXMFVARDIR}/web2c/pdftex
-post-install-context:
-	@${DO_NADA}
-#	${LN} -sf mpost ${PREFIX}/bin/metafun
-
 TEX_FORMAT_CSPLAIN?= \
 	"csplain pdftex - -etex -enc csplain-utf8.ini" \
 	"pdfcsplain pdftex - -etex -enc csplain-utf8.ini"
@ -544,12 +531,8 @@ TEX_FORMAT_PTEX_FILES= \
 	${TEXMFVARDIR}/web2c/eptex/platex.fmt
 TEX_FORMAT_PTEX_BIN= \
 	bin/eptex \
-	bin/pbibtex \
-	bin/pdvitype \
 	bin/ptex \
 	bin/platex \
-	bin/ppltotf \
-	bin/ptftopl \
 	bin/upbibtex \
 	bin/updvitype \
 	bin/uppltotf \
@ -607,13 +590,10 @@ TEX_FORMAT_XETEX?= \
 	"xetex xetex language.def -etex xetex.ini" \
 	"xelatex xetex language.dat -etex xelatex.ini" \
 	"pdfcsplain xetex - -etex csplain.ini" \
-	"cont-en xetex cont-usr.tex -8bit *cont-en.mkii" \
 	"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 \
 	${TEXMFVARDIR}/web2c/xetex/pdfcsplain.fmt \
 	${TEXMFVARDIR}/web2c/xetex/xetex.log \
--- a/arabic/arabtex/Makefile
+++ b/arabic/arabtex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	arabtex
 PORTVERSION=	3.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	arabic print
 MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/
 DISTNAME=	arab${PORTVERSION:S/.//}
@ -12,7 +12,7 @@ WWW=		http://www2.informatik.uni-stuttgart.de/ivi/bs/research/arab_e.htm
 LICENSE=	LPPL10

 USES=		tar:tgz tex
-USE_TEX=	base texmf
+USE_TEX=	base # texmf

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	kpathsea
-PORTVERSION=	6.3.3
+PORTVERSION=	6.3.5
 CATEGORIES=	devel
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
@ -26,6 +26,7 @@ EXTRACT_FILES=	build-aux texk/kpathsea texk/texlive/tl_support \
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/kpathsea

 INFO=		kpathsea
+PLIST_SUB= VERSION=${PORTVERSION}

 post-install:
 	(cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \
--- a/devel/tex-kpathsea/distinfo
+++ b/devel/tex-kpathsea/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643521077
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680449457
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/devel/tex-kpathsea/files/patch-Makefile.in
+++ b/devel/tex-kpathsea/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2022-01-30 05:38:17 UTC
+--- Makefile.in.orig	2023-04-02 15:35:03 UTC
 +++ Makefile.in
-@@ -364,7 +364,7 @@ am__can_run_installinfo = \
+@@ -364,7 +364,7 @@ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
@ -9,7 +9,7 @@
 	$(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-@@ -2101,7 +2101,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
+@@ -2103,7 +2103,7 @@ installdirs-am:
 
 installdirs: installdirs-recursive
 installdirs-am:
--- a/devel/tex-kpathsea/files/patch-texmf.cnf
+++ b/devel/tex-kpathsea/files/patch-texmf.cnf
@ -1,6 +1,27 @@
--- texmf.cnf.orig	2021-03-23 18:18:30 UTC
+--- texmf.cnf.orig	2023-02-25 22:59:04 UTC
 +++ texmf.cnf
-@@ -59,7 +59,7 @@
+@@ -1,13 +1,13 @@
+ % original texmf.cnf -- runtime path configuration file for kpathsea.
+ % Public domain.
+-% 
+%
+ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
+ % updated.  Instead, put your changes -- and only your changes, not an
+ % entire copy! -- in ../../texmf.cnf.  That is, if this file is
+ % installed in /some/path/to/texlive/2023/texmf-dist/web2c/texmf.cnf,
+ % put your custom settings in /some/path/to/texlive/2023/texmf.cnf.
+ % (Below, we use YYYY in place of the specific year.)
+-% 
+%
+ % What follows is a super-summary of what this .cnf file can
+ % contain. Please read the Kpathsea manual for more information.
+ %
+@@ -55,11 +55,11 @@
+ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+ % Kpathsea sets (in kpathsea/progname.c):
+ % SELFAUTOLOC (directory of the binary=/usr/local/texlive/YYYY/bin/i386-linux),
+-% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin), 
+% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin),
 % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
 % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
 % Sorry for the off-by-one-generation names.
@ -9,7 +30,7 @@
 
 % The main tree of distributed packages and programs:
 TEXMFDIST = $TEXMFROOT/texmf-dist
-@@ -69,7 +69,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -69,7 +69,7 @@ TEXMFMAIN = $TEXMFDIST
 TEXMFMAIN = $TEXMFDIST
 
 % Local additions to the distribution trees.
@ -18,7 +39,79 @@
 
 % TEXMFSYSVAR, where *-sys store cached runtime data.
 TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -566,6 +566,7 @@ $SELFAUTOLOC/texmf-local/web2c,\
+@@ -99,12 +99,12 @@ TEXMFAUXTREES = {}
+ %
+ % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
+ % explicitly and before other trees.
+-% 
+%
+ % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions
+ % should take precedence over distribution files -- although it is
+ % generally a source of confusion to have different versions of a
+ % package installed, whatever the trees, so try to avoid it.
+-% 
+%
+ % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
+ % ever defined (the 99% common case), no extra elements will be added to
+ % the search paths. tlmgr takes care to end any value with a trailing comma.
+@@ -452,7 +452,7 @@ MAILCAPLIBDIR = $TEXMFROOT/etc
+ % Default settings for the fontconfig library as used by the Windows
+ % versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
+ % ConTeXT MkIV (all platforms) also use these values.
+-% 
+%
+ FONTCONFIG_FILE = fonts.conf
+ FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
+ FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
+@@ -499,12 +499,12 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx
+ DVIPDFMXINPUTS = $TEXMF/dvipdfmx
+ 
+ % Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
+-% 
+%
+ % But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
+ % the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
+ % default expansion of TEXINPUTS will not happen and .lua files under
+ % the /tex/ tree will not be found.
+-% 
+%
+ % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
+ % The default LUAINPUTS suffices for luatex and dviluatex.
+ %
+@@ -542,14 +542,14 @@ RUBYINPUTS   = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,
+ % paradoxical), but the compile-time default in paths.h is built from it.
+ % The SELFAUTO* variables are set automatically from the location of
+ % argv[0], in kpse_set_program_name.
+-% 
+%
+ % This main texmf.cnf file is installed, for a release YYYY, in a
+ % directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf.
+ % Since this file is subject to future updates, the TeX Live installer
+ % or human administrator may also create a file
+ % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
+ % will take precedence over the distributed one.
+-% 
+%
+ % For security reasons, it is best not to include . in this path.
+ %
+ % The idea behind this lengthy definition: for each of
+@@ -558,13 +558,13 @@ RUBYINPUTS   = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,
+ % then the subdirectories ./texmf-local, texmf-dist, ./texmf.
+ % At any given installation, most of these directories will not exist,
+ % but they all turn out to be useful somewhere.
+-% 
+%
+ % Special addition -- we want to include one more directory: the
+ % great-grandparent's texmf-local, because that is how TL is installed
+ % by default.  That is, given a binary
+ % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find
+ % /usr/local/texlive/texmf-local/web2c/texmf.cnf.  I.e., not under YYYY.
+-% 
+%
+ % As a result, we cannot use actual brace expansion in the definition,
+ % since we don't want to scatter ../'s throughout the value.  Hence we
+ % explicitly list every directory.  Arguably more understandable anyway.
+@@ -578,6 +578,7 @@ $SELFAUTOLOC/texmf/web2c,\
 $SELFAUTOLOC/texmf-dist/web2c,\
 $SELFAUTOLOC/texmf/web2c,\
 \
@ -26,7 +119,24 @@
 $SELFAUTODIR,\
 $SELFAUTODIR/share/texmf-local/web2c,\
 $SELFAUTODIR/share/texmf-dist/web2c,\
-@@ -804,7 +805,7 @@ hash_extra = 600000
+@@ -634,14 +635,14 @@ shell_escape = p
+ shell_escape = p
+ 
+ % No spaces in this command list.
+-% 
+%
+ % The programs listed here are as safe as any we know: they either do
+ % not write any output files, respect openout_any, or have hard-coded
+ % restrictions similar to or higher than openout_any=p.  They also have
+ % no features to invoke arbitrary other programs, and no known
+ % exploitable bugs.  All to the best of our knowledge.  They also have
+ % practical use for being called from TeX.
+-% 
+%
+ shell_escape_commands = \
+ bibtex,bibtex8,\
+ extractbb,\
+@@ -813,7 +814,7 @@ pool_size = 6250000
 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.
@ -35,7 +145,7 @@
 % Maximum number of strings.
 max_strings = 500000
 % Min pool space left after loading .fmt.
-@@ -816,7 +817,7 @@ strings_free = 100
+@@ -825,7 +826,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,12 +154,14 @@
 
 % Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
 % the sources), but we don't need that much.  The value here suffices
-@@ -828,7 +829,7 @@ trie_size = 1100000
+@@ -837,8 +838,8 @@ hyph_size = 8191        % prime number of hyphenation 
 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 = 1000        % simultaneous semantic levels (e.g., groups)
+-max_in_open = 15        % simultaneous input files and error insertions, 
 +nest_size = 2500        % simultaneous semantic levels (e.g., groups)
- max_in_open = 15        % simultaneous input files and error insertions, 
+max_in_open = 15        % simultaneous input files and error insertions,
                         % also applies to MetaPost
- param_size = 10000      % simultaneous macro parameters, also applies to MP
+ param_size = 20000      % simultaneous macro parameters, also applies to MP
+ save_size  = 200000     % for saving values outside current group
--- a/devel/tex-kpathsea/pkg-plist
+++ b/devel/tex-kpathsea/pkg-plist
@ -55,7 +55,7 @@ include/kpathsea/win32lib.h
 lib/libkpathsea.a
 lib/libkpathsea.so
 lib/libkpathsea.so.6
-lib/libkpathsea.so.6.3.3
+lib/libkpathsea.so.%%VERSION%%
 libdata/pkgconfig/kpathsea.pc
 man/man1/kpseaccess.1.gz
 man/man1/kpsepath.1.gz
--- a/devel/tex-libtexlua/Makefile
+++ b/devel/tex-libtexlua/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	libtexlua
 PORTVERSION=	5.3.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
--- a/devel/tex-libtexlua/distinfo
+++ b/devel/tex-libtexlua/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643545410
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680473625
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/devel/tex-libtexluajit/Makefile
+++ b/devel/tex-libtexluajit/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	libtexluajit
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
--- a/devel/tex-libtexluajit/distinfo
+++ b/devel/tex-libtexluajit/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643545774
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680474121
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/devel/tex-synctex/Makefile
+++ b/devel/tex-synctex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	synctex
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
@ -51,7 +51,7 @@ 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
+			pdftex hitex

 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
--- a/devel/tex-synctex/distinfo
+++ b/devel/tex-synctex/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643546426
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680563845
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
--- a/devel/tex-synctex/files/patch-man-Makefile.in
+++ b/devel/tex-synctex/files/patch-man-Makefile.in
@ -1,8 +1,22 @@
--- man/Makefile.in.orig	2022-02-14 20:13:35 UTC
+--- man/Makefile.in.orig	2023-04-03 23:22:42 UTC
 +++ man/Makefile.in
-@@ -452,27 +452,19 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
+@@ -171,11 +171,11 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
+am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
+am__v_at_1 =
+ SOURCES =
+ DIST_SOURCES =
+ am__can_run_installinfo = \
+@@ -461,16 +461,12 @@ 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 \
+ 	ppltotf.man ptftopl.man pbibtex.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 =
@ -12,14 +26,15 @@
 -	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)
+-	$(am__append_14) $(am__append_17) latex-dev:pdflatex-dev \
+-	latex-dev:xelatex-dev latex-dev:lualatex-dev \
+-	latex-dev:dvilualatex-dev latex-dev:platex-dev \
+-	latex-dev:uplatex-dev
+	$(am__append_14) $(am__append_17)
 web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
 	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
- 	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+ 	pltotf.man pooltype.man tftopl.man twill.man \
+@@ -478,11 +474,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@ -9,6 +9,8 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX implementation translating WEB to C

+LICENSE=	LGPL21+
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libopenjp2.so:graphics/openjpeg \
@ -25,6 +27,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-aleph \
 			--disable-eptex \
 			--disable-euptex \
+			--disable-hitex \
 			--disable-latex \
 			--disable-luahbtex \
 			--disable-luajithbtex \
@ -54,6 +57,7 @@ CONFLICTS_INSTALL=	cweb

 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux libs/xpdf texk/web2c
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c

 INFO=		web2c
--- a/devel/tex-web2c/distinfo
+++ b/devel/tex-web2c/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643548736
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680479556
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/devel/tex-web2c/files/patch-Makefile.in
+++ b/devel/tex-web2c/files/patch-Makefile.in
--- a/devel/tex-web2c/files/patch-man-Makefile.in
+++ b/devel/tex-web2c/files/patch-man-Makefile.in
@ -1,6 +1,6 @@
--- man/Makefile.in.orig	2022-01-29 15:11:47 UTC
+--- man/Makefile.in.orig	2023-04-06 19:09:14 UTC
 +++ man/Makefile.in
-@@ -468,11 +468,7 @@ web_man_sources = bibtex.man dvicopy.man dvitomp.man d
+@@ -478,11 +478,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man
--- a/devel/tex-web2c/pkg-plist
+++ b/devel/tex-web2c/pkg-plist
@ -18,18 +18,23 @@ bin/mfplain
 bin/mft
 bin/mpost
 bin/patgen
+bin/pbibtex
 bin/pdvitomp
+bin/pdvitype
 bin/pktogf
 bin/pktype
 bin/pltotf
 bin/pmpost
 bin/pooltype
+bin/ppltotf
+bin/ptftopl
 bin/r-mpost
 bin/r-pmpost
 bin/r-upmpost
 bin/tangle
 bin/tftopl
 bin/tie
+bin/twill
 bin/updvitomp
 bin/upmpost
 bin/vftovp
@ -66,6 +71,7 @@ man/man1/pooltype.1.gz
 man/man1/tangle.1.gz
 man/man1/tftopl.1.gz
 man/man1/tie.1.gz
+man/man1/twill.1.gz
 man/man1/uplatex-dev.1.gz
 man/man1/vftovp.1.gz
 man/man1/vptovf.1.gz
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	epix
 DISTVERSION=	1.2.22
+PORTEREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/${PORTNAME}/

@ -14,7 +15,7 @@ BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash

 USES=		gmake makeinfo tar:bzip2 tex
-USE_TEX=	dvipsk:build latex texmf:build
+USE_TEX=	dvipsk:build latex
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bash=${LOCALBASE}/bin/bash \
 		--with-runtime=${CXX}
--- a/japanese/tex-ptex/Makefile
+++ b/japanese/tex-ptex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ptex
 PORTVERSION=	3.6
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	ja-tex-
@ -14,61 +14,48 @@ MAINTAINER=	tex@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX
 WWW=		https://ctan.org/pkg/ptex

-USES=		localbase tar:xz perl5 pkgconfig tex
-USE_TEX=	kpathsea web2c ptexenc texmf formats fmtutil
-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
+USES=				localbase perl5 pkgconfig tar:xz tex
+USE_TEX=			fmtutil formats kpathsea ptexenc web2c
+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}/,}
-DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
-EXTRACT_FILES_TEXMF= \
-	texmf-dist/doc/ptex \
-	texmf-dist/doc/platex \
-	texmf-dist/doc/uptex \
-	texmf-dist/doc/uplatex \
-	texmf-dist/doc/fonts/japanese-otf \
-	texmf-dist/doc/fonts/japanese-otf-uptex \
-	texmf-dist/fonts/vf/public/japanese-otf \
-	texmf-dist/fonts/vf/public/japanese-otf-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/japanese-otf-uptex \
-	texmf-dist/source/fonts/japanese-otf \
-	texmf-dist/source/platex \
-	texmf-dist/source/uplatex \
-	texmf-dist/tex/ptex \
-	texmf-dist/tex/uptex \
-	texmf-dist/tex/platex \
-	texmf-dist/tex/uplatex \
-	texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
-	texmf-dist/fonts/map/dvipdfmx/japanese-otf \
-	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 \
-		mflua mfluajit luahbtex luajithbtex
+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}/,}
+EXTRACT_FILES_TEXMF=		texmf-dist/doc/ptex texmf-dist/doc/platex \
+				texmf-dist/doc/uptex texmf-dist/doc/uplatex \
+				texmf-dist/doc/fonts/japanese-otf \
+				texmf-dist/fonts/vf/public/japanese-otf \
+				texmf-dist/fonts/tfm/public/japanese-otf \
+				texmf-dist/fonts/ofm/public/japanese-otf \
+				texmf-dist/source/fonts/japanese-otf \
+				texmf-dist/source/platex \
+				texmf-dist/source/uplatex texmf-dist/tex/ptex \
+				texmf-dist/tex/uptex texmf-dist/tex/platex \
+				texmf-dist/tex/uplatex \
+				texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
+				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 mflua mfluajit luahbtex luajithbtex

-CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
-		--enable-ptex \
-		--enable-eptex \
-		--enable-uptex \
-		--enable-euptex \
-		--with-system-zlib \
-		--without-x
+CONFIGURE_ARGS=		${EXCLUDE_ENGINES:S/^/--disable-/} \
+			--enable-eptex \
+			--enable-euptex \
+			--enable-ptex \
+			--enable-uptex \
+			--with-system-zlib \
+			--without-x
 .for L in 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
 MAKE_JOBS_UNSAFE=	yes
-TEX_FORMATS=	ptex uptex
+TEX_FORMATS=		ptex uptex

 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
@ -86,18 +73,18 @@ pre-install:

 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
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkmlcidvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/umkjvf
 	${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 | \
--- a/japanese/tex-ptex/distinfo
+++ b/japanese/tex-ptex/distinfo
@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1680794675
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
--- a/japanese/tex-ptex/files/patch-configure
+++ b/japanese/tex-ptex/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2022-01-30 17:17:22 UTC
+--- configure.orig	2023-04-06 16:57:57 UTC
 +++ configure
-@@ -25025,855 +25025,6 @@ $as_echo "#define z_const /**/" >>confdefs.h
+@@ -27067,428 +27067,6 @@ esac
  ;;
 esac
 
@ -46,15 +46,15 @@
 -# 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; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5
+-printf %s "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 ()
+-main (void)
 -{
 -_Unwind_Context *ctx;
 -      _Unwind_GetCFA(ctx);
@ -63,10 +63,11 @@
 -  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
+-if ac_fn_c_try_link "$LINENO"
+-then :
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-else $as_nop
 -
 -    jitlibs="-lc++abi -lpthread"
 -    save_LIBS=$LIBS
@ -77,7 +78,7 @@
 -          typedef struct _Unwind_Context _Unwind_Context;
 -          extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
 -int
-main ()
+-main (void)
 -{
 -_Unwind_Context *ctx;
 -          _Unwind_GetCFA(ctx);
@ -86,26 +87,27 @@
 -  return 0;
 -}
 -_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+-if ac_fn_c_try_link "$LINENO"
+-then :
 -
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
-$as_echo "\"$jitlibs\"" >&6; }
+-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
+-printf "%s\n" "\"$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;}
+-else $as_nop
+-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$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 \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -    LIBS=$save_LIBS
 -
 -
 -fi
-rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -  ;;
 -esac
@ -116,7 +118,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 -
 -# Check whether --with-system-libpng was given.
-if test "${with_system_libpng+set}" = set; then :
+-if test ${with_system_libpng+y}
+-then :
 -  withval=$with_system_libpng;
 -fi
 -if test "x$with_system_libpng" = xyes; then
@ -142,18 +145,20 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
-if test "${with_system_freetype2+set}" = set; then :
+-if test ${with_system_freetype2+y}
+-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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_FT2_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$FT2_CONFIG"; then
 -  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
 -else
@ -161,11 +166,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -176,11 +185,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+-printf "%s\n" "$FT2_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -189,11 +198,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_FT2_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -201,11 +211,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -216,11 +230,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+-printf "%s\n" "$ac_ct_FT2_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_FT2_CONFIG" = x; then
@ -228,8 +242,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    FT2_CONFIG=$ac_ct_FT2_CONFIG
@ -240,11 +254,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$PKG_CONFIG"; then
 -  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 -else
@ -252,11 +267,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -267,11 +286,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-printf "%s\n" "$PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -280,11 +299,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -292,11 +312,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -307,11 +331,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_PKG_CONFIG" = x; then
@ -319,8 +343,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    PKG_CONFIG=$ac_ct_PKG_CONFIG
@ -353,7 +377,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
 -
 -# Check whether --with-system-pixman was given.
-if test "${with_system_pixman+set}" = set; then :
+-if test ${with_system_pixman+y}
+-then :
 -  withval=$with_system_pixman;
 -fi
 -if test "x$with_system_pixman" = xyes; then
@ -379,7 +404,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
 -
 -# Check whether --with-system-cairo was given.
-if test "${with_system_cairo+set}" = set; then :
+-if test ${with_system_cairo+y}
+-then :
 -  withval=$with_system_cairo;
 -fi
 -if test "x$with_system_cairo" = xyes; then
@ -400,22 +426,32 @@
 -	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
+ ##tldbg _KPSE_LIB_FLAGS: Setup potrace (-lpotrace) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=potrace, libname=potrace, options=, tlincl=-IBLD/libs/potrace/include, tllib=BLD/libs/potrace/libpotrace.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/potrace/include/potrace.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: potrace (potrace) .
+@@ -27530,491 +27108,6 @@ fi
+ 	cd ${top_builddir}/../../libs/potrace && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+ 
 -##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 :
+-if test ${with_system_gmp+y}
+-then :
 -  withval=$with_system_gmp;
 -fi
 -
 -# Check whether --with-gmp-includes was given.
-if test "${with_gmp_includes+set}" = set; then :
+-if test ${with_gmp_includes+y}
+-then :
 -  withval=$with_gmp_includes;
 -fi
 -
 -# Check whether --with-gmp-libdir was given.
-if test "${with_gmp_libdir+set}" = set; then :
+-if test ${with_gmp_libdir+y}
+-then :
 -  withval=$with_gmp_libdir;
 -fi
 -if test "x$with_system_gmp" = xyes; then
@ -443,17 +479,20 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) .
 -
 -# Check whether --with-system-mpfr was given.
-if test "${with_system_mpfr+set}" = set; then :
+-if test ${with_system_mpfr+y}
+-then :
 -  withval=$with_system_mpfr;
 -fi
 -
 -# Check whether --with-mpfr-includes was given.
-if test "${with_mpfr_includes+set}" = set; then :
+-if test ${with_mpfr_includes+y}
+-then :
 -  withval=$with_mpfr_includes;
 -fi
 -
 -# Check whether --with-mpfr-libdir was given.
-if test "${with_mpfr_libdir+set}" = set; then :
+-if test ${with_mpfr_libdir+y}
+-then :
 -  withval=$with_mpfr_libdir;
 -fi
 -if test "x$with_system_mpfr" = xyes; then
@ -499,7 +538,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
 -
 -# Check whether --with-system-zziplib was given.
-if test "${with_system_zziplib+set}" = set; then :
+-if test ${with_system_zziplib+y}
+-then :
 -  withval=$with_system_zziplib;
 -fi
 -if test "x$with_system_zziplib" = xyes; then
@ -525,7 +565,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 -
 -# Check whether --with-system-teckit was given.
-if test "${with_system_teckit+set}" = set; then :
+-if test ${with_system_teckit+y}
+-then :
 -  withval=$with_system_teckit;
 -fi
 -if test "x$with_system_teckit" = xyes; then
@ -555,7 +596,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
+-if test ${with_system_graphite2+y}
+-then :
 -  withval=$with_system_graphite2;
 -fi
 -if test "x$with_system_graphite2" = xyes; then
@ -581,7 +623,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
 -
 -# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
+-if test ${with_system_harfbuzz+y}
+-then :
 -  withval=$with_system_harfbuzz;
 -fi
 -if test "x$with_system_harfbuzz" = xyes; then
@ -612,7 +655,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
+-if test ${with_system_icu+y}
+-then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
@ -620,11 +664,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ICU_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$ICU_CONFIG"; then
 -  ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
 -else
@ -632,11 +677,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -647,11 +696,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+-printf "%s\n" "$ICU_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -660,11 +709,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_ICU_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -672,11 +722,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -687,11 +741,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
+-printf "%s\n" "$ac_ct_ICU_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_ICU_CONFIG" = x; then
@ -699,8 +753,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    ICU_CONFIG=$ac_ct_ICU_CONFIG
@ -711,11 +765,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$PKG_CONFIG"; then
 -  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 -else
@ -723,11 +778,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -738,11 +797,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-printf "%s\n" "$PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -751,11 +810,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -763,11 +823,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -778,11 +842,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_PKG_CONFIG" = x; then
@ -790,8 +854,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    PKG_CONFIG=$ac_ct_PKG_CONFIG
@ -830,7 +894,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
+-if test ${with_system_graphite2+y}
+-then :
 -  withval=$with_system_graphite2;
 -fi
 -if test "x$with_system_graphite2" = xyes; then
@ -856,3 +921,9 @@
 # Check size of off_t (using <kpathsea/config.h>)
 eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
+@@ -31534,5 +30627,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cadabra2
 DISTVERSION=	2.4.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math

 MAINTAINER=	yuri@FreeBSD.org
@ -26,7 +26,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
 DOS2UNIX_FILES=	cmake/version.cmake
 USE_GNOME=	glib20 glibmm libsigc++20
-USE_TEX=	base latex texmf texhash
+USE_TEX=	base latex texhash
 OPTIONS_SUB=	yes

 CMAKE_ON=	ENABLE_SYSTEM_JSONCPP USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	coq
 PORTVERSION=	8.6
-PORTREVISION=	14
+PORTREVISION=	15
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
@ -48,7 +48,7 @@ IDE_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 IDE_CONFIGURE_OFF=	-coqide no
 DOCS_USES=		tex
-DOCS_USE=		TEX=latex:build,dvipsk:build,texmf:build
+DOCS_USE=		TEX=latex:build,dvipsk:build
 DOCS_BUILD_DEPENDS=	hevea:textproc/hevea
 DOCS_CONFIGURE_OFF=	-with-doc no

--- a/math/gnuplot-tex-extras/Makefile
+++ b/math/gnuplot-tex-extras/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	gnuplot
 PORTVERSION=	5.2.8
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-tex-extras
@ -11,7 +12,7 @@ WWW=		http://www.gnuplot.info/
 RUN_DEPENDS=	gnuplot:math/gnuplot

 USES=		cpe tex
-USE_TEX=	texmf
+#USE_TEX=	texmf
 NO_BUILD=	yes
 PLIST_FILES=	${TEX_FILES:S,^,${TEX_DIR}/,}

--- a/net-mgmt/netmagis-www/Makefile
+++ b/net-mgmt/netmagis-www/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	netmagis
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-www

 COMMENT=	Netmagis web module
@ -18,7 +18,7 @@ RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \

 NO_ARCH=	# no
 USES=	tex
-USE_TEX=	full
+#USE_TEX=	full

 MASTERDIR=	${.CURDIR}/../netmagis-common

--- a/print/dvisvg/Makefile
+++ b/print/dvisvg/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	dvisvg
 DISTVERSION=	0.7.1d
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	http://dvisvg.sourceforge.net/files/

@ -12,7 +12,7 @@ LICENSE=	GPLv2

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 USES=		ghostscript:run tex
-USE_TEX=	base texmf texhash
+USE_TEX=	base texhash # texmf
 ALL_TARGET=	# empty
 # workaround for svgfonts.c not including kpathsea/c-auto.h
 CFLAGS+=	-DHAVE_PROTOTYPES
--- a/print/latex-beamer/Makefile
+++ b/print/latex-beamer/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	latex-beamer
 PORTVERSION=	3.57
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	print

 MAINTAINER=	hrs@FreeBSD.org
@ -11,21 +12,22 @@ LICENSE=	GPLv2 LPPL13c
 LICENSE_COMB=	dual

 USES=	tex
-USE_TEX=	texmf latex texhash texlua
 USE_GITHUB=	yes
 GH_ACCOUNT=	josephwright
 GH_PROJECT=	beamer
-TEXHASHDIRS=	${TEXMFDIR}
-NO_BUILD=	YES
+USE_TEX=	latex texhash texlua
+
 NO_ARCH=	YES
+NO_BUILD=	YES
+
 PORTDOCS=	*
+
 OPTIONS_DEFINE=	DOCS

 CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
 CLASS_SUBDIRS=	base examples
 DOC_SUBDIRS=	AUTHORS.md CHANGELOG.md README.md doc solutions
-
-.include <bsd.port.options.mk>
+TEXHASHDIRS=	${TEXMFDIR}

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CLASSDIR}
@ -34,11 +36,11 @@ do-install:
 	cd ${WRKSRC} && for d in ${CLASS_SUBDIRS}; do \
 		${PAX} -rw $$d ${STAGEDIR}${PREFIX}/${CLASSDIR}; \
 	done
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && for d in ${DOC_SUBDIRS}; do \
 		${PAX} -rw $$d ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif

 .include <bsd.port.mk>
--- a/print/latex-biber/Makefile
+++ b/print/latex-biber/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	biber
 # https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/development/documentation/biber.pdf/download
 # Keep this in-sync with biblatex.sty (currently at 3.16).
-PORTVERSION=	2.16
+PORTVERSION=	2.19
 PORTEPOCH=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print perl5
@ -15,42 +15,49 @@ WWW=		http://biblatex-biber.sourceforge.net/
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual

-__DEPENDS=	ja-p5-Encode-EUCJPASCII>0:japanese/p5-Encode-EUCJPASCII \
+__DEPENDS=	\
 		p5-Business-ISBN>0:misc/p5-Business-ISBN \
 		p5-Business-ISMN>0:misc/p5-Business-ISMN \
 		p5-Business-ISSN>0:misc/p5-Business-ISSN \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
 		p5-Config-AutoConf>0:devel/p5-Config-AutoConf \
 		p5-Data-Compare>0:devel/p5-Data-Compare \
 		p5-Data-Dump>0:devel/p5-Data-Dump \
 		p5-Data-Uniqid>0:devel/p5-Data-Uniqid \
-		p5-Date-Simple>0:devel/p5-Date-Simple \
-		p5-DateTime>=0:devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder \
 		p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder \
+		p5-Encode-Locale>0:converters/p5-Encode-Locale \
+		ja-p5-Encode-EUCJPASCII>0:japanese/p5-Encode-EUCJPASCII \
 		p5-Encode-HanExtra>0:chinese/p5-Encode-HanExtra \
 		p5-Encode-JIS2K>0:converters/p5-Encode-JIS2K \
 		p5-ExtUtils-LibBuilder>0:devel/p5-ExtUtils-LibBuilder \
-		p5-File-Slurp>0:devel/p5-File-Slurp \
 		p5-File-Slurper>=0:devel/p5-File-Slurper \
-		p5-IPC-Cmd>0:devel/p5-IPC-Cmd p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+		p5-IO-String>0:devel/p5-IO-String \
+		p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+		p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \
+		p5-Lingua-Translit>0:devel/p5-Lingua-Translit \
 		p5-List-AllUtils>0:devel/p5-List-AllUtils \
 		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-List-MoreUtils-XS>0:lang/p5-List-MoreUtils-XS \
 		p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
-		p5-Module-Build>=0.4206:devel/p5-Module-Build \
 		p5-Mozilla-CA>0:www/p5-Mozilla-CA \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+		p5-PerlIO-utf8_strict>0:devel/p5-PerlIO-utf8_strict \
 		p5-Regexp-Common>0:textproc/p5-Regexp-Common \
 		p5-Sort-Key>=0:devel/p5-Sort-Key \
 		p5-Text-BibTeX>0:textproc/p5-Text-BibTeX \
 		p5-Text-CSV>=0:textproc/p5-Text-CSV \
-		p5-Text-Roman>0:textproc/p5-Text-Roman p5-URI>0:net/p5-URI \
+		p5-Text-CSV_XS>0:textproc/p5-Text-CSV_XS \
+		p5-Text-Roman>0:textproc/p5-Text-Roman \
+		p5-URI>0:net/p5-URI \
 		p5-Unicode-Collate>0:textproc/p5-Unicode-Collate \
 		p5-Unicode-LineBreak>0:textproc/p5-Unicode-LineBreak \
+		p5-XML-LibXML>0:textproc/p5-XML-LibXML \
 		p5-XML-LibXML-Simple>0:textproc/p5-XML-LibXML-Simple \
 		p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT \
 		p5-XML-Writer>0:textproc/p5-XML-Writer \
 		p5-autovivification>0:devel/p5-autovivification \
-		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+		p5-libwww>0:www/p5-libwww
 BUILD_DEPENDS=	${__DEPENDS}
 RUN_DEPENDS=	${__DEPENDS}

--- a/print/latex-biber/distinfo
+++ b/print/latex-biber/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1673615863
-SHA256 (TeX/plk-biber-v2.16_GH0.tar.gz) = 57111ebc6d0d1933e55d3fe1a92f8ef57c602388ae83598a8073c8a77fd811e2
-SIZE (TeX/plk-biber-v2.16_GH0.tar.gz) = 1594209
+TIMESTAMP = 1680715566
+SHA256 (TeX/plk-biber-v2.19_GH0.tar.gz) = 1c1266bc8adb1637c4c59e23c47d919c5a38da4e53544a3c22c21de4a68fc9fe
+SIZE (TeX/plk-biber-v2.19_GH0.tar.gz) = 1634803
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	lilypond
 DISTVERSION=	2.22.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/

@ -33,7 +33,7 @@ USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
 USE_CXXSTD=	c++11
 USE_GNOME=	pango
 USE_PERL5=	build
-USE_TEX=	latex texmf
+USE_TEX=	latex

 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mftrace
 PORTVERSION=	1.2.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://lilypond.org/download/sources/mftrace/ \
 		LOCAL/nivit/${PORTNAME}/
@ -22,7 +22,7 @@ RUN_DEPENDS+=	potrace:graphics/potrace

 # Python3 ready
 USES=		gmake python tex
-USE_TEX=	base texmf
+USE_TEX=	base # texmf
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile

--- a/print/tex-basic-engines/Makefile
+++ b/print/tex-basic-engines/Makefile
@ -37,7 +37,7 @@ 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 \
+			synctex hitex \
 			luahbtex \
 			luajithbtex \
 			mflua \
--- a/print/tex-basic-engines/distinfo
+++ b/print/tex-basic-engines/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643549022
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680574061
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/print/tex-basic-engines/files/patch-Makefile.in
+++ b/print/tex-basic-engines/files/patch-Makefile.in
--- a/print/tex-basic-engines/files/patch-man-Makefile.in
+++ b/print/tex-basic-engines/files/patch-man-Makefile.in
@ -1,8 +1,22 @@
--- man/Makefile.in.orig	2020-11-19 18:31:09 UTC
+--- man/Makefile.in.orig	2023-03-08 17:05:16 UTC
 +++ man/Makefile.in
-@@ -452,27 +452,17 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
+@@ -171,11 +171,11 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
+am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
+am__v_at_1 =
+ SOURCES =
+ DIST_SOURCES =
+ am__can_run_installinfo = \
+@@ -461,28 +461,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 \
+ 	ppltotf.man ptftopl.man pbibtex.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 =
@ -12,14 +26,15 @@
 -	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) 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
-+	$(am__append_14) $(am__append_17) $(am__append_19)
+-	pltotf.man pooltype.man tftopl.man twill.man \
+-	vftovp.man vptovf.man weave.man
+	$(am__append_14) $(am__append_17)
 +web_man_sources =
 
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@ -20,8 +20,18 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:print/adobe-cmaps

 USES=		localbase:ldflags pkgconfig tar:xz tex
-USE_TEX=	kpathsea web2c texmf dvipsk luatex texhash
-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFDIR}
+USE_TEX=	kpathsea web2c dvipsk luatex texhash
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-system-kpathsea \
+		--with-kpathsea-includes=${LOCALBASE}/include \
+		--with-kpathsea-libdir=${LOCALBASE}/lib \
+		--with-system-libpaper \
+		--with-libpaper-includes=${LOCALBASE}/include \
+		--with-libpaper-libdir=${LOCALBASE}/lib \
+		--with-system-libpng \
+		--with-system-zlib
+
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	am \
 		m4 \
@ -32,7 +42,6 @@ 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}/,}
-DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
 EXCLUDE_FILES_TEXMF= \
 	texmf-dist/fonts/map/dvipdfmx/jfontmaps \
 	texmf-dist/fonts/map/dvipdfmx/japanese-otf \
@ -44,16 +53,10 @@ EXTRACT_FILES_TEXMF= \
 	texmf-dist/fonts/cmap/dvipdfmx/ \
 	texmf-dist/fonts/map/dvipdfmx/ \
 	texmf-dist/fonts/map/dvipdfm/
+
 WRKSRC=	${WRKDIR}/${DISTNAME}/texk/dvipdfm-x
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-system-kpathsea \
-		--with-kpathsea-includes=${LOCALBASE}/include \
-		--with-kpathsea-libdir=${LOCALBASE}/lib \
-		--with-system-libpaper \
-		--with-libpaper-includes=${LOCALBASE}/include \
-		--with-libpaper-libdir=${LOCALBASE}/lib \
-		--with-system-libpng \
-		--with-system-zlib
+
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFDIR}

 pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
--- a/print/tex-dvipdfmx/distinfo
+++ b/print/tex-dvipdfmx/distinfo
@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1680899460
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/tex-dvipsk/Makefile
+++ b/print/tex-dvipsk/Makefile
@ -17,7 +17,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libpaper.so:print/libpaper

 USES=		gmake localbase:ldflags pkgconfig tar:xz tex
-USE_TEX=	kpathsea texhash texmf web2c
+USE_TEX=	kpathsea texhash web2c

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-kpathsea-includes=${LOCALBASE}/include \
@ -34,7 +34,6 @@ EXTRACT_AFTER_ARGS_TEXMF=	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 				--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/ \
--- a/print/tex-dvipsk/distinfo
+++ b/print/tex-dvipsk/distinfo
@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1680721364
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/tex-formats/Makefile
+++ b/print/tex-formats/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	formats
 PORTVERSION=	${TEXLIVE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	#empty
 PKGNAMEPREFIX=	tex-
@ -19,7 +18,7 @@ NO_BUILD=	yes
 NO_INSTALL=	yes

 TEXHASHDIRS=	${TEXMFVARDIR}
-TEX_FORMATS=	amstex context csplain eplain latex-bin metafont mex mptopdf \
+TEX_FORMATS=	amstex csplain eplain latex-bin metafont mex mptopdf \
 		pdftex tex

 .include <bsd.port.mk>
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	jadetex
 PORTVERSION=	3.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
@ -13,8 +13,8 @@ COMMENT=	TeX backend for Jade, DSSSL processor for SGML/XML documents
 WWW=		http://jadetex.sourceforge.net/

 USES=		tar:xz tex
-USE_TEX=	texmf pdftex xmltex fmtutil
-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
+USE_TEX=	fmtutil pdftex xmltex
+
 EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES:S,^,${DISTNAME}/,}
@ -22,8 +22,11 @@ EXTRACT_FILES= \
 	texmf-dist/doc/otherformats/jadetex \
 	texmf-dist/source/jadetex/base \
 	texmf-dist/tex/jadetex/base
+
 NO_ARCH=	yes
 NO_BUILD=	yes
+
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 TEX_FORMATS=	jadetex

 do-install:
--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1645219534
-SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
-SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
+TIMESTAMP = 1680910730
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	luatex
-PORTVERSION=	1.12.0
+PORTVERSION=	1.16.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@ -12,62 +12,59 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua

-LIB_DEPENDS=	libpng.so:graphics/png \
-		libmpfr.so:math/mpfr \
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libpng.so:graphics/png \
 		libzzip.so:devel/zziplib

-USES=		gnome libtool pkgconfig shebangfix tar:xz tex xorg
-USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
-USE_XORG=	pixman
+USES=		gnome libtool localbase pkgconfig tar:xz tex xorg
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		libs/xpdf \
-		libs/lua53 \
-		libs/luajit \
-		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}/,}
-DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
-EXTRACT_FILES_TEXMF=	\
-	texmf-dist/doc/lualatex \
-	texmf-dist/doc/luatex \
-	texmf-dist/scripts/context/lua \
-	texmf-dist/source/luatex \
-	texmf-dist/source/lualatex \
-	texmf-dist/fonts/map/luatex \
-	texmf-dist/tex/luatex \
-	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/lualatexquotejobname.tex \
-	texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
-	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 \
-		mflua mfluajit luahbtex luajithbtex
-CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
-		--enable-luatex \
-		--enable-luajittex \
-		--with-system-zlib \
-		--with-system-zziplib
+USE_TEX=	fmtutil formats kpathsea texlua texluajit web2c
+USE_XORG=	pixman
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	${EXCLUDE_ENGINES:S/^/--disable-/} \
+			--enable-luajittex \
+			--enable-luatex \
+			--with-system-zlib \
+			--with-system-zziplib \
+			CC="${CC}" \
+			CXX="${CXX}"
 .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
+CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
+			--with-$L-libdir=${LOCALBASE}/lib \
+			--with-system-$L
 .endfor
-CONFIGURE_ARGS+=CC="${CC}" \
-		CXX="${CXX}"
-CPPFLAGS+=	-I${LOCALBASE}/include
+
 MAKE_JOBS_UNSAFE=	yes
-TEX_FORMATS=	luatex
+
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=			build-aux libs/xpdf libs/lua53 libs/luajit \
+				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}/,}
+EXTRACT_FILES_TEXMF=		texmf-dist/doc/lualatex texmf-dist/doc/luatex \
+				texmf-dist/scripts/context/lua \
+				texmf-dist/source/luatex \
+				texmf-dist/source/lualatex \
+				texmf-dist/fonts/map/luatex \
+				texmf-dist/tex/luatex \
+				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/lualatexquotejobname.tex \
+				texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
+				texmf-dist/tex/lualatex
+WRKSRC=				${WRKDIR}/${DISTNAME}/texk/web2c
+EXCLUDE_ENGINES=		aleph etex pdftex mf mf-nowin ptex eptex uptex \
+				euptex otangle mp pmp upmp web2c web-progs \
+				xetex tex synctex mflua mfluajit luahbtex \
+				luajithbtex
+TEX_FORMATS=			luatex
+
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}

 # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
 post-extract:
--- a/print/tex-luatex/distinfo
+++ b/print/tex-luatex/distinfo
@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1680829257
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
--- a/print/tex-luatex/files/patch-configure
+++ b/print/tex-luatex/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2021-02-17 03:03:54 UTC
+--- configure.orig	2023-04-07 15:36:31 UTC
 +++ configure
-@@ -25158,243 +25158,6 @@ ${top_builddir}/../../libs/libpng/include/png.h:
+@@ -27203,292 +27203,6 @@ fi
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
@ -9,18 +9,20 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
-if test "${with_system_freetype2+set}" = set; then :
+-if test ${with_system_freetype2+y}
+-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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_FT2_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$FT2_CONFIG"; then
 -  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
 -else
@ -28,11 +30,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -43,11 +49,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+-printf "%s\n" "$FT2_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -56,11 +62,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_FT2_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -68,11 +75,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -83,11 +94,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+-printf "%s\n" "$ac_ct_FT2_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_FT2_CONFIG" = x; then
@ -95,8 +106,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    FT2_CONFIG=$ac_ct_FT2_CONFIG
@ -107,11 +118,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$PKG_CONFIG"; then
 -  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 -else
@ -119,11 +131,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -134,11 +150,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-printf "%s\n" "$PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -147,11 +163,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -159,11 +176,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -174,11 +195,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_PKG_CONFIG" = x; then
@ -186,8 +207,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    PKG_CONFIG=$ac_ct_PKG_CONFIG
@ -220,7 +241,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
 -
 -# Check whether --with-system-pixman was given.
-if test "${with_system_pixman+set}" = set; then :
+-if test ${with_system_pixman+y}
+-then :
 -  withval=$with_system_pixman;
 -fi
 -if test "x$with_system_pixman" = xyes; then
@ -241,20 +263,47 @@
 -	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:
+-##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+y}
+-then :
+-  withval=$with_system_cairo;
+-fi
+-if test "x$with_system_cairo" = xyes; then
+-  if $PKG_CONFIG cairo --atleast-version=1.12; then
+-  CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags`
+-  CAIRO_LIBS=`$PKG_CONFIG cairo --libs`
+-elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then
+-  as_fn_error $? "did not find cairo 1.12 or better" "$LINENO" 5
+-fi
+-else
+-  CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo"
+-  CAIRO_LIBS="$kpse_BLD/libs/cairo/libcairo.a"
+-  CAIRO_DEPEND='${top_builddir}/../../libs/cairo/libcairo.a'
+-  CAIRO_RULE='# Rebuild libcairo
+-$(CAIRO_DEPEND): ${top_builddir}/../../libs/cairo/cairo/cairo.h
+-	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/cairo/cairo/cairo.h:
+-	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ##tldbg _KPSE_LIB_FLAGS: Setup potrace (-lpotrace) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=potrace, libname=potrace, options=, tlincl=-IBLD/libs/potrace/include, tllib=BLD/libs/potrace/libpotrace.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/potrace/include/potrace.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: potrace (potrace) .
+@@ -27657,364 +27371,6 @@ fi
 	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.
-if test "${with_system_teckit+set}" = set; then :
+-if test ${with_system_teckit+y}
+-then :
 -  withval=$with_system_teckit;
 -fi
 -if test "x$with_system_teckit" = xyes; then
@ -284,7 +333,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
+-if test ${with_system_graphite2+y}
+-then :
 -  withval=$with_system_graphite2;
 -fi
 -if test "x$with_system_graphite2" = xyes; then
@ -310,7 +360,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
 -
 -# Check whether --with-system-harfbuzz was given.
-if test "${with_system_harfbuzz+set}" = set; then :
+-if test ${with_system_harfbuzz+y}
+-then :
 -  withval=$with_system_harfbuzz;
 -fi
 -if test "x$with_system_harfbuzz" = xyes; then
@ -341,7 +392,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
+-if test ${with_system_icu+y}
+-then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
@ -349,11 +401,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ICU_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$ICU_CONFIG"; then
 -  ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
 -else
@ -361,11 +414,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -376,11 +433,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+-printf "%s\n" "$ICU_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -389,11 +446,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_ICU_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -401,11 +459,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -416,11 +478,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5
+-printf "%s\n" "$ac_ct_ICU_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_ICU_CONFIG" = x; then
@ -428,8 +490,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    ICU_CONFIG=$ac_ct_ICU_CONFIG
@ -440,11 +502,12 @@
 -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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$PKG_CONFIG"; then
 -  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 -else
@ -452,11 +515,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -467,11 +534,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-printf "%s\n" "$PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
@ -480,11 +547,12 @@
 -  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
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  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
@ -492,11 +560,15 @@
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  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
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@ -507,11 +579,11 @@
 -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; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; }
 -else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -  if test "x$ac_ct_PKG_CONFIG" = x; then
@ -519,8 +591,8 @@
 -  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;}
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 -ac_tool_warned=yes ;;
 -esac
 -    PKG_CONFIG=$ac_ct_PKG_CONFIG
@ -559,7 +631,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
-if test "${with_system_graphite2+set}" = set; then :
+-if test ${with_system_graphite2+y}
+-then :
 -  withval=$with_system_graphite2;
 -fi
 -if test "x$with_system_graphite2" = xyes; then
@ -581,6 +654,13 @@
 -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\"
+@@ -31534,5 +30890,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
--- a/print/tex-ptexenc/Makefile
+++ b/print/tex-ptexenc/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	ptexenc
-PORTVERSION=	1.3.9
+PORTVERSION=	1.4.3
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
@ -13,19 +13,26 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT

 USES=		iconv libtool pathfix pkgconfig tar:xz tex
-USE_TEX=	kpathsea
 USE_LDCONFIG=	yes
+USE_TEX=	kpathsea

-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S/^/${DISTNAME}\//}
-EXTRACT_FILES=	build-aux texk/ptexenc
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-kanji-iconv \
 		--with-system-kpathsea \
 		--with-kpathsea-includes=${LOCALBASE}/include \
 		--with-kpathsea-libdir=${LOCALBASE}/lib
-LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
-CPPFLAGS+=	-I${ICONV_PREFIX}/include
+
 INSTALL_TARGET=	install-strip

+CPPFLAGS+=	-I${ICONV_PREFIX}/include
+LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
+
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S/^/${DISTNAME}\//}
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+EXTRACT_FILES=	build-aux texk/ptexenc
+
 .include <bsd.port.mk>
--- a/print/tex-ptexenc/distinfo
+++ b/print/tex-ptexenc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643548489
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680474710
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/print/tex-ptexenc/files/patch-Makefile.in
+++ b/print/tex-ptexenc/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2020-12-31 21:51:18 UTC
+--- Makefile.in.orig	2023-04-02 22:35:25 UTC
 +++ Makefile.in
-@@ -400,7 +400,8 @@ libptexenc_la_SOURCES = \
+@@ -404,7 +404,8 @@ nobase_include_HEADERS = \
 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,38 +1,44 @@
--- configure.orig	2020-01-16 22:02:50 UTC
+--- configure.orig	2023-04-02 22:35:55 UTC
 +++ configure
-@@ -14951,7 +14951,7 @@ if ${ac_cv_lib_iconv_iconv_open+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
+@@ -15940,7 +15940,7 @@ else $as_nop
+   printf %s "(cached) " >&6
+ else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-liconv  $LIBS"
 +LIBS="$LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-@@ -14986,7 +14986,7 @@ if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
- #define HAVE_LIBICONV 1
- _ACEOF
+@@ -15972,7 +15972,7 @@ then :
+ then :
+   printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
 
 -  LIBS="-liconv $LIBS"
 +  LIBS="$LIBS"
 
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
-@@ -14995,7 +14995,7 @@ if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
+ else $as_nop
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
+@@ -15982,7 +15982,7 @@ else $as_nop
+   printf %s "(cached) " >&6
+ else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-liconv  $LIBS"
 +LIBS="$LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-@@ -15030,7 +15030,7 @@ if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then
- #define HAVE_LIBICONV 1
- _ACEOF
+@@ -16014,7 +16014,7 @@ then :
+ then :
+   printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
 
 -  LIBS="-liconv $LIBS"
 +  LIBS="$LIBS"
 
 fi
 
+@@ -18360,5 +18360,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
--- a/print/tex-ptexenc/files/patch-ptexenc.c
+++ b/print/tex-ptexenc/files/patch-ptexenc.c
@ -1,20 +1,21 @@
--- ptexenc.c.orig	2022-01-29 14:44:21 UTC
+--- ptexenc.c.orig	2023-01-01 05:42:55 UTC
 +++ ptexenc.c
@@ -16,6 +16,7 @@
 #include <ptexenc/unicode-jp.h>
 
 #include <ctype.h>
 +#include <fnmatch.h>
+ #include <sys/stat.h>
 
 #define ENC_UNKNOWN  0
- #define ENC_JIS      1
-@@ -24,10 +25,46 @@
+@@ -25,11 +26,47 @@
 #define ENC_UTF8     4
 #define ENC_UPTEX    5
 
 -static int default_kanji_enc;
 +static int default_kanji_is_uptex;
 static boolean UPTEX_enabled;
+ static boolean ptex_mode = false;
 static boolean prior_file_enc = false;
 
 +static struct le {
@ -56,7 +57,7 @@
 #define ESC '\033'
 
 #ifndef NOFILE
-@@ -64,7 +101,7 @@ const_string enc_to_string(int enc)
+@@ -65,7 +102,7 @@ static int string_to_enc(const_string str)
 static int string_to_enc(const_string str)
 {
     if (str == NULL)                    return ENC_UNKNOWN;
@ -65,7 +66,7 @@
     if (strcasecmp(str, "jis")    == 0) return ENC_JIS;
     if (strcasecmp(str, "euc")    == 0) return ENC_EUC;
     if (strcasecmp(str, "sjis")   == 0) return ENC_SJIS;
-@@ -92,7 +129,7 @@ static int get_default_enc(void)
+@@ -95,7 +132,7 @@ static int get_default_enc(void)
     } else if (enc != ENC_UNKNOWN) {
         return enc;
     }
@ -74,7 +75,7 @@
 }
 
 static void set_file_enc(int enc)
-@@ -150,14 +187,14 @@ void enable_UPTEX (boolean enable)
+@@ -165,14 +202,14 @@ void enable_UPTEX (boolean enable)
 {
     UPTEX_enabled = enable;
     if (enable) {
--- a/print/tex-ptexenc/pkg-plist
+++ b/print/tex-ptexenc/pkg-plist
@ -4,5 +4,5 @@ include/ptexenc/unicode.h
 lib/libptexenc.a
 lib/libptexenc.so
 lib/libptexenc.so.1
-lib/libptexenc.so.1.3.9
+lib/libptexenc.so.%%VERSION%%
 libdata/pkgconfig/ptexenc.pc
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xdvik
 PORTVERSION=	22.87.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF/xdvi/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	tex-
@ -18,7 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 RUN_DEPENDS=	tex-dvipsk>=5.995:print/tex-dvipsk

 USES=		autoreconf iconv libtool:build motif pkgconfig tex xorg
-USE_TEX=	kpathsea texhash texmf web2c
+USE_TEX=	kpathsea texhash web2c
 USE_XORG=	ice sm x11 xext xi xmu xpm xt

 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xetex
 PORTVERSION=	0.99993
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@ -22,37 +22,18 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libTECkit.so:textproc/teckit

-USES=		compiler:c++11-lib gnome perl5 pkgconfig python:build tar:xz tex xorg
+USES=		compiler:c++11-lib localbase gnome perl5 pkgconfig \
+		python:build tar:xz tex xorg
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo
 USE_PERL5=	build
-USE_TEX=	kpathsea web2c texmf formats fmtutil dvipdfmx
+USE_TEX=	kpathsea web2c formats fmtutil dvipdfmx
 USE_XORG=	pixman

-TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
-EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	build-aux \
-		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}/,}
-DISTNAME_TEXMF=	texlive-${TEXLIVE_VERSION}-texmf
-EXTRACT_FILES_TEXMF= \
-	texmf-dist/doc/xelatex \
-	texmf-dist/doc/xetex \
-	texmf-dist/fonts/misc/xetex \
-	texmf-dist/source/xelatex \
-	texmf-dist/tex/xelatex \
-	texmf-dist/tex/xetex
-WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
-EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
-		mflua mfluajit luahbtex luajithbtex ptex eptex uptex euptex \
-		otangle mp pmp upmp web2c web-progs tex synctex
-CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
+CONFIGURE_ARGS+=CC="${CC}" \
+		CXX="${CXX}" \
+		${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-xetex \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
@ -71,10 +52,34 @@ CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
-CONFIGURE_ARGS+=CC="${CC}" \
-		CXX="${CXX}"
-CPPFLAGS+=	-I${LOCALBASE}/include/harfbuzz -I${LOCALBASE}/include
+
 MAKE_JOBS_UNSAFE=	yes
+
+CPPFLAGS=	-I${LOCALBASE}/include/harfbuzz
+
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux \
+		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}/,}
+EXTRACT_FILES_TEXMF= \
+	texmf-dist/doc/xelatex \
+	texmf-dist/doc/xetex \
+	texmf-dist/fonts/misc/xetex \
+	texmf-dist/source/xelatex \
+	texmf-dist/tex/xelatex \
+	texmf-dist/tex/xetex
+EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \
+		mflua mfluajit luahbtex luajithbtex ptex eptex uptex euptex \
+		otangle mp pmp upmp web2c web-progs tex synctex
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
+
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 TEX_FORMATS=	xetex

 post-extract:
@ -95,6 +100,8 @@ pre-install:
 		${EXTRACT_AFTER_ARGS_TEXMF}

 post-stage:
+	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/xelatex/hanzibox/build.sh
 	${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 \
--- a/print/tex-xetex/distinfo
+++ b/print/tex-xetex/distinfo
@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1680912912
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/tex-xetex/files/patch-Makefile.in
+++ b/print/tex-xetex/files/patch-Makefile.in
--- a/print/tex-xetex/files/patch-configure
+++ b/print/tex-xetex/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2021-02-17 03:03:54 UTC
+--- configure.orig	2023-03-08 17:05:16 UTC
 +++ configure
-@@ -1055,6 +1055,8 @@ with_mpfr_includes
+@@ -1105,6 +1105,8 @@ with_system_teckit
 with_mpfr_libdir
 with_system_zziplib
 with_system_teckit
@ -9,7 +9,7 @@
 with_system_graphite2
 with_system_harfbuzz
 with_system_icu
-@@ -24940,11 +24942,6 @@ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libn
+@@ -26977,11 +26979,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'
@ -21,7 +21,7 @@
 
 ##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
+@@ -27067,115 +27064,6 @@ esac
  ;;
 esac
 
@ -67,15 +67,15 @@
 -# 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; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5
+-printf %s "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 ()
+-main (void)
 -{
 -_Unwind_Context *ctx;
 -      _Unwind_GetCFA(ctx);
@ -84,10 +84,11 @@
 -  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
+-if ac_fn_c_try_link "$LINENO"
+-then :
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-else $as_nop
 -
 -    jitlibs="-lc++abi -lpthread"
 -    save_LIBS=$LIBS
@ -98,7 +99,7 @@
 -          typedef struct _Unwind_Context _Unwind_Context;
 -          extern uintptr_t _Unwind_GetCFA(_Unwind_Context *);
 -int
-main ()
+-main (void)
 -{
 -_Unwind_Context *ctx;
 -          _Unwind_GetCFA(ctx);
@ -107,26 +108,27 @@
 -  return 0;
 -}
 -_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+-if ac_fn_c_try_link "$LINENO"
+-then :
 -
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
-$as_echo "\"$jitlibs\"" >&6; }
+-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5
+-printf "%s\n" "\"$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;}
+-else $as_nop
+-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$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 \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -    LIBS=$save_LIBS
 -
 -
 -fi
-rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -  ;;
 -esac
@ -135,7 +137,7 @@
 ##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:
+@@ -27630,49 +27518,38 @@ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_
 fi
 test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
 
@ -144,7 +146,8 @@
 -##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
 -
 -# Check whether --with-system-zziplib was given.
-if test "${with_system_zziplib+set}" = set; then :
+-if test ${with_system_zziplib+y}
+-then :
 -  withval=$with_system_zziplib;
 -fi
 -if test "x$with_system_zziplib" = xyes; then
@ -179,7 +182,8 @@
 +if test "${with_teckit_libdir+set}" = set; then :
 +  withval=$with_teckit_libdir;
 +fi
- if test "${with_system_teckit+set}" = set; then :
+ if test ${with_system_teckit+y}
+ then :
   withval=$with_system_teckit;
 fi
 if test "x$with_system_teckit" = xyes; then
@ -206,3 +210,9 @@
 else
   TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include"
   TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a"
+@@ -31534,5 +31411,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
--- a/print/tex-xmltex/Makefile
+++ b/print/tex-xmltex/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xmltex
 PORTVERSION=	1.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
@ -12,8 +12,8 @@ MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Non-validating XML parser, written in TeX

 USES=		tar:xz tex
-USE_TEX=	texmf pdftex fmtutil
-TEXHASHDIRS=	${TEXMFDISTDIR}
+USE_TEX=	pdftex fmtutil
+
 EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES:S,^,${DISTNAME}/,}
@ -22,7 +22,9 @@ EXTRACT_FILES= \
 	texmf-dist/doc/otherformats/xmltex
 NO_ARCH=	yes
 NO_BUILD=	yes
+
 TEX_FORMATS=	xmltex
+TEXHASHDIRS=	${TEXMFDISTDIR}

 do-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
--- a/print/tex-xmltex/distinfo
+++ b/print/tex-xmltex/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643560901
-SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
-SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
+TIMESTAMP = 1680903623
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	texlive
 PORTVERSION=	${TEXLIVE_VERSION}
-PORTREVISION=	14
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMESUFFIX=	-base
@ -39,6 +38,7 @@ SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	texk/texlive/linked_scripts/accfonts/vpl2ovp \
 	texk/texlive/linked_scripts/accfonts/vpl2vpl \
 	texk/texlive/linked_scripts/arara/arara.sh \
+	texk/texlive/linked_scripts/bibcop/bibcop.pl \
 	texk/texlive/linked_scripts/bibexport/bibexport.sh \
 	texk/texlive/linked_scripts/convbkmk/convbkmk.rb \
 	texk/texlive/linked_scripts/ctanupload/ctanupload.pl \
@ -57,6 +57,7 @@ SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	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/optexcount/optexcount \
 	texk/texlive/linked_scripts/pygmentex/*.py \
 	texk/texlive/linked_scripts/pythontex/*.py \
 	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
--- a/print/texlive-base/distinfo
+++ b/print/texlive-base/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643549283
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
+TIMESTAMP = 1680575442
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
--- a/print/texlive-base/files/patch-Makefile.in
+++ b/print/texlive-base/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2021-02-08 15:49:16 UTC
+--- Makefile.in.orig	2023-03-01 22:59:32 UTC
 +++ Makefile.in
-@@ -489,7 +489,7 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o
+@@ -494,7 +494,7 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 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	2021-03-24 21:28:22 UTC
+--- configure.orig	2023-03-09 23:07:06 UTC
 +++ configure
-@@ -5918,7 +5918,16 @@ $as_echo "$as_me:   ->  installed \`zlib' headers and 
+@@ -6840,7 +6840,16 @@ fi
     as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
@ -17,7 +17,7 @@
 test "x$need_teckit" = xyes && {
   need_zlib=yes
 }
-@@ -21447,8 +21456,8 @@ else
+@@ -23067,8 +23076,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
@ -28,7 +28,7 @@
 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" = 
+@@ -23133,11 +23142,12 @@ fi
   as_fn_error $? "did not find graphite2" "$LINENO" 5
 fi
 
--- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
+++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
@ -1,31 +0,0 @@
--- texk/bibtex-x/Makefile.in.orig	2021-02-08 15:49:16 UTC
-+++ texk/bibtex-x/Makefile.in
-@@ -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)$(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) \
-@@ -1514,7 +1513,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
- installdirs:
-	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
-@@ -1586,8 +1585,7 @@ info: info-am
- 
- info-am:
- 
-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_bibtex-x_Makefile.in
+++ b/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in
@ -0,0 +1,131 @@
+--- texk/bibtex-x/Makefile.in.orig	2023-03-01 22:59:32 UTC
+++ texk/bibtex-x/Makefile.in
+@@ -123,9 +123,7 @@ CONFIG_CLEAN_VPATH_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT)
+ @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT)
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+-	"$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(btudocdir)" \
+-	"$(DESTDIR)$(btuexdir)" "$(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) \
+@@ -137,7 +135,7 @@ am__v_lt_0 = --silent
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+-am__v_lt_1 = 
+am__v_lt_1 =
+ am__objects_2 = bibtexu-bibtex-1.$(OBJEXT) bibtexu-bibtex-2.$(OBJEXT) \
+ 	bibtexu-bibtex-3.$(OBJEXT) bibtexu-bibtex-4.$(OBJEXT) \
+ 	bibtexu-bibtex.$(OBJEXT) bibtexu-utils.$(OBJEXT)
+@@ -152,11 +150,11 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
+am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
+am__v_at_1 =
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -179,7 +177,7 @@ am__v_CC_0 = @echo "  CC      " $@;
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+-am__v_CC_1 = 
+am__v_CC_1 =
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -187,7 +185,7 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+-am__v_CCLD_1 = 
+am__v_CCLD_1 =
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+@@ -197,14 +195,14 @@ am__v_CXX_0 = @echo "  CXX     " $@;
+ AM_V_CXX = $(am__v_CXX_@AM_V@)
+ am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo "  CXX     " $@;
+-am__v_CXX_1 = 
+am__v_CXX_1 =
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+-am__v_CXXLD_1 = 
+am__v_CXXLD_1 =
+ SOURCES = $(bibtex8_SOURCES) $(bibtexu_SOURCES) \
+ 	$(nodist_EXTRA_bibtexu_SOURCES)
+ DIST_SOURCES = $(bibtex8_SOURCES) $(bibtexu_SOURCES)
+@@ -774,7 +772,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -831,11 +829,11 @@ clean-binPROGRAMS:
+ 	echo " rm -f" $$list; \
+ 	rm -f $$list
+ 
+-bibtex8$(EXEEXT): $(bibtex8_OBJECTS) $(bibtex8_DEPENDENCIES) $(EXTRA_bibtex8_DEPENDENCIES) 
+bibtex8$(EXEEXT): $(bibtex8_OBJECTS) $(bibtex8_DEPENDENCIES) $(EXTRA_bibtex8_DEPENDENCIES)
+ 	@rm -f bibtex8$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(bibtex8_OBJECTS) $(bibtex8_LDADD) $(LIBS)
+ 
+-bibtexu$(EXEEXT): $(bibtexu_OBJECTS) $(bibtexu_DEPENDENCIES) $(EXTRA_bibtexu_DEPENDENCIES) 
+bibtexu$(EXEEXT): $(bibtexu_OBJECTS) $(bibtexu_DEPENDENCIES) $(EXTRA_bibtexu_DEPENDENCIES)
+ 	@rm -f bibtexu$(EXEEXT)
+ 	$(AM_V_CXXLD)$(CXXLINK) $(bibtexu_OBJECTS) $(bibtexu_LDADD) $(LIBS)
+ 
+@@ -1408,7 +1406,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+ 	fi;								\
+ 	$$success || exit 1
+ 
+-check-TESTS: 
+check-TESTS:
+ 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+ 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+@@ -1418,7 +1416,7 @@ check-TESTS: 
+ 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ 	exit $$?;
+-recheck: all 
+recheck: all
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ 	@set +e; $(am__set_TESTS_bases); \
+ 	bases=`for i in $$bases; do echo $$i; done \
+@@ -1620,7 +1618,7 @@ installdirs:
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(btudocdir)" "$(DESTDIR)$(btuexdir)" "$(DESTDIR)$(csfdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -1692,8 +1690,7 @@ info-am:
+ 
+ info-am:
+ 
+-install-data-am: install-dist_btdocDATA install-dist_btudocDATA \
+-	install-dist_btuexDATA 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	2020-11-19 18:31:09 UTC
+--- texk/chktex/Makefile.in.orig	2023-03-01 22:59:32 UTC
 +++ texk/chktex/Makefile.in
-@@ -125,10 +125,8 @@ mkinstalldirs = $(install_sh) -d
+@@ -125,10 +125,8 @@ CONFIG_CLEAN_VPATH_FILES =
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl
 CONFIG_CLEAN_VPATH_FILES =
@ -13,7 +13,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \
 	@CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \
-@@ -1432,7 +1430,7 @@ check-am: all-am
+@@ -1433,7 +1431,7 @@ installdirs:
 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
-@@ -1504,9 +1502,7 @@ info: info-am
+@@ -1505,9 +1503,7 @@ 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	2020-11-19 18:31:09 UTC
+--- texk/cjkutils/Makefile.in.orig	2023-03-01 22:59:32 UTC
 +++ texk/cjkutils/Makefile.in
-@@ -136,7 +136,7 @@ CONFIG_CLEAN_FILES =
+@@ -121,7 +121,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(b
 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)
-@@ -1451,7 +1451,7 @@ check: check-am
+@@ -1437,7 +1437,7 @@ installdirs:
 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
-@@ -1525,7 +1525,7 @@ info: info-am
+@@ -1511,7 +1511,7 @@ info-am:
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk_dvipng_configure
+++ b/print/texlive-base/files/patch-texk_dvipng_configure
@ -1,6 +1,6 @@
--- texk/dvipng/configure.orig	2020-11-19 18:31:09 UTC
+--- texk/dvipng/configure.orig	2023-03-08 17:05:16 UTC
 +++ texk/dvipng/configure
-@@ -16428,8 +16428,8 @@ else
+@@ -17556,8 +17556,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--- a/print/texlive-base/files/patch-texk_dvisvgm_configure
+++ b/print/texlive-base/files/patch-texk_dvisvgm_configure
@ -1,6 +1,6 @@
--- texk/dvisvgm/configure.orig	2021-02-19 23:13:01 UTC
+--- texk/dvisvgm/configure.orig	2023-03-01 22:59:32 UTC
 +++ texk/dvisvgm/configure
-@@ -21790,8 +21790,8 @@ else
+@@ -23282,8 +23282,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--- a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp
+++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp
@ -1,6 +1,6 @@
--- texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp.orig	2022-01-29 15:54:24 UTC
+--- texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp.orig	2023-01-20 01:55:04 UTC
 +++ texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
 	#endif
 #endif
 
--- a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp
+++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp
@ -1,10 +1,10 @@
--- texk/dvisvgm/dvisvgm-src/src/Font.cpp.orig	2022-01-29 15:59:04 UTC
+--- texk/dvisvgm/dvisvgm-src/src/Font.cpp.orig	2023-01-20 01:55:04 UTC
 +++ texk/dvisvgm/dvisvgm-src/src/Font.cpp
@@ -18,6 +18,7 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
 +#include <sys/time.h>
+ #include <algorithm>
 #include <cstdlib>
- #include <fstream>
 #include <set>
--- a/print/texlive-base/files/patch-texk_gsftopk_Makefile.in
+++ b/print/texlive-base/files/patch-texk_gsftopk_Makefile.in
@ -1,6 +1,6 @@
--- texk/gsftopk/Makefile.in.orig	2020-11-19 18:31:09 UTC
+--- texk/gsftopk/Makefile.in.orig	2023-03-01 22:59:32 UTC
 +++ texk/gsftopk/Makefile.in
-@@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -112,8 +112,7 @@ CONFIG_CLEAN_VPATH_FILES =
 CONFIG_HEADER = c-auto.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@ -10,7 +10,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_gsftopk_OBJECTS = gsftopk.$(OBJEXT)
 gsftopk_OBJECTS = $(am_gsftopk_OBJECTS)
-@@ -836,7 +835,7 @@ check-am: all-am
+@@ -837,7 +836,7 @@ installdirs:
 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
-@@ -893,7 +892,7 @@ info: info-am
+@@ -894,7 +893,7 @@ info-am:
 
 info-am:
 
--- a/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
+++ b/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
@ -1,6 +1,33 @@
--- texk/texlive/tl_support/fmtutil.cnf.orig	2020-10-07 21:13:01 UTC
+--- texk/texlive/tl_support/fmtutil.cnf.orig	2023-02-28 22:55:44 UTC
 +++ texk/texlive/tl_support/fmtutil.cnf
-@@ -41,118 +41,118 @@
+@@ -3,7 +3,7 @@
+ #
+ # For guidance on how to support local formats, see the man
+ # page of fmtutil, or the output of fmtutil --help.
+-# 
+#
+ # any manual edits of this file (fmtutil.cnf in the TEXMFDIST tree) will
+ # be lost on update. So don't do that.
+ #
+@@ -17,7 +17,7 @@
+ # the e-TeX extensions need to be enabled explicitly, the filename must
+ # be prefixed with a * character; this is essentially equivalent to the
+ # -etex option. (So don't use it if the engine doesn't support -etex.)
+-# 
+#
+ # The purpose of the pattern-file is to support fmtutil's --byhyphen
+ # option. It is not included in the command line to rebuild the format.
+ # If no pattern-file is desired, use -.
+@@ -33,7 +33,7 @@
+ #
+ # 3) The symbolic link to the right engines (e.g. bplain -> tex)
+ #    is generated by the "texlinks" script.
+-# 
+#
+ # 4) usual comments start with "# ", whereas disabled configurations
+ #    start with "#! " in this file.
+ #
+@@ -41,114 +41,114 @@
 #    AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here.
 #
 # from aleph:
@ -10,16 +37,6 @@
 # from amstex:
 -amstex pdftex - -translate-file=cp227.tcx *amstex.ini
 +#amstex pdftex - -translate-file=cp227.tcx *amstex.ini
- #
- # from context:
-cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
-cont-en xetex cont-usr.tex -8bit *cont-en.mkii
-+#cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
-+#cont-en xetex cont-usr.tex -8bit *cont-en.mkii
- #! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
- #! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
- #! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
- #! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
 #
 # from cslatex:
 -cslatex pdftex - -etex cslatex.ini
@ -42,6 +59,12 @@
 # from eplain:
 -eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
 +#eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
+ #
+ # from hitex:
+-hilatex hitex language.dat -etex -ltx hilatex.ini
+-hitex hitex language.def -etex -ltx hitex.ini
+#hilatex hitex language.dat -etex -ltx hilatex.ini
+#hitex hitex language.def -etex -ltx hitex.ini
 #
 # from jadetex:
 -jadetex pdftex language.dat *jadetex.ini
@ -115,8 +138,8 @@
 +#mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
 #
 # from optex:
-optex luatex hyphen-lan.opm optex.ini
-+#optex luatex hyphen-lan.opm optex.ini
+-optex luatex - optex.ini
+#optex luatex - optex.ini
 #
 # from pdftex:
 -etex pdftex language.def -translate-file=cp227.tcx *etex.ini
@ -128,15 +151,15 @@
 #
 # from platex:
 -platex eptex language.dat *platex.ini
-platex-dev eptex language.dat *platex.ini
+-platex-dev euptex language.dat *platex.ini
 +#platex eptex language.dat *platex.ini
-+#platex-dev eptex language.dat *platex.ini
+#platex-dev euptex language.dat *platex.ini
 #
 # from ptex:
 -eptex eptex language.def *eptex.ini
-ptex ptex - ptex.ini
+-ptex eptex - ptex.ini
 +#eptex eptex language.def *eptex.ini
-+#ptex ptex - ptex.ini
+#ptex eptex - ptex.ini
 #
 # from tex:
 -tex tex - tex.ini
@ -154,9 +177,9 @@
 #
 # from uptex:
 -euptex euptex language.def *euptex.ini
-uptex uptex - uptex.ini
+-uptex euptex - uptex.ini
 +#euptex euptex language.def *euptex.ini
-+#uptex uptex - uptex.ini
+#uptex euptex - uptex.ini
 #
 # from xelatex-dev:
 -xelatex-dev xetex language.dat -etex xelatex.ini
--- a/print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in
+++ b/print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in
@ -1,6 +1,6 @@
--- texk/ttf2pk2/Makefile.in.orig	2021-02-08 15:49:16 UTC
+--- texk/ttf2pk2/Makefile.in.orig	2023-03-01 22:59:32 UTC
 +++ texk/ttf2pk2/Makefile.in
-@@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -115,9 +115,7 @@ CONFIG_CLEAN_VPATH_FILES =
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@ -11,7 +11,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) ftlib.$(OBJEXT) \
 	ligkern.$(OBJEXT) newobj.$(OBJEXT) parse.$(OBJEXT) \
-@@ -1349,7 +1347,7 @@ check-am: all-am
+@@ -1350,7 +1348,7 @@ installdirs:
 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
-@@ -1425,8 +1423,7 @@ info: info-am
+@@ -1426,8 +1424,7 @@ info-am:
 
 info-am:
 
--- a/print/texlive-base/pkg-plist
+++ b/print/texlive-base/pkg-plist
@ -21,6 +21,7 @@ bin/bg5conv
 bin/bg5latex
 bin/bg5pdflatex
 bin/bib2gls
+bin/bibcop
 bin/bibdoiadd
 bin/bibexport
 bin/bibmradd
@ -46,12 +47,11 @@ bin/chkdvifont
 bin/chklref
 bin/chktex
 bin/chkweb
+bin/citeproc-lua
 bin/cjk-gs-integrate
 bin/cllualatex
 bin/cluttex
 bin/clxelatex
-bin/context
-bin/contextjit
 bin/convbkmk
 bin/convertgls2bib
 bin/ctan-o-mat
@ -64,6 +64,7 @@ bin/detex
 bin/devnag
 bin/deweb
 bin/diadia
+bin/digestif
 bin/disdvi
 bin/dosepsbin
 bin/dt2dv
@ -152,8 +153,8 @@ bin/llmk
 bin/ltx2crossrefxml
 bin/ltxfileinfo
 bin/ltximg
+bin/luafindfont
 bin/luaotfload-tool
-bin/luatools
 bin/lwarpmk
 bin/m-tx
 bin/mag
@ -182,14 +183,14 @@ bin/mmafm
 bin/mmpfb
 bin/mptopdf
 bin/msxlint
-bin/mtxrun
-bin/mtxrunjit
 bin/multibibliography
 bin/musixflx
 bin/musixtex
+bin/optexcount
 bin/ot2kpx
 bin/otfinfo
 bin/otftotfm
+bin/pagelayoutapi
 bin/pamphletangler
 bin/pdfannotextractor
 bin/pdfatfi
@ -245,6 +246,7 @@ bin/t4ht
 bin/tex2aspc
 bin/tex4ebook
 bin/tex4ht
+bin/texaccents
 bin/texconfig
 bin/texconfig-dialog
 bin/texconfig-sys
@ -254,17 +256,18 @@ bin/texdiff
 bin/texdirflatten
 bin/texdoc
 bin/texdoctk
-bin/texexec
 bin/texfot
 bin/texhash
 bin/texlinks
 bin/texliveonfly
 bin/texloganalyser
-bin/texmfstart
+bin/texlogfilter
+bin/texlogsieve
 bin/texosquery
 bin/texosquery-jre5
 bin/texosquery-jre8
 bin/texplate
+bin/textestvis
 bin/thumbpdf
 bin/tikztosvg
 bin/tlcockpit
@ -288,6 +291,8 @@ bin/vpl2ovp
 bin/vpl2vpl
 bin/webquiz
 bin/wordcount
+bin/xelatex-unsafe
+bin/xetex-unsafe
 bin/xhlatex
 bin/xindex
 bin/xml2pmx
@ -409,6 +414,7 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/authorindex/authorindex
 %%TEXMFDISTDIR%%/scripts/bib2gls/bib2gls.sh
 %%TEXMFDISTDIR%%/scripts/bib2gls/convertgls2bib.sh
+%%TEXMFDISTDIR%%/scripts/bibcop/bibcop.pl
 %%TEXMFDISTDIR%%/scripts/bibexport/bibexport.sh
 %%TEXMFDISTDIR%%/scripts/bundledoc/arlatex
 %%TEXMFDISTDIR%%/scripts/bundledoc/bundledoc
@ -416,17 +422,11 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/checkcites/checkcites.lua
 %%TEXMFDISTDIR%%/scripts/checklistings/checklistings.sh
 %%TEXMFDISTDIR%%/scripts/chklref/chklref.pl
+%%TEXMFDISTDIR%%/scripts/citation-style-language/citeproc-lua.lua
 %%TEXMFDISTDIR%%/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
 %%TEXMFDISTDIR%%/scripts/clojure-pamphlet/pamphletangler
 %%TEXMFDISTDIR%%/scripts/cluttex/cluttex.lua
 %%TEXMFDISTDIR%%/scripts/context/perl/mptopdf.pl
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/context
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/contextjit
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/luatools
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/mtxrun
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/mtxrunjit
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/texexec
-%%TEXMFDISTDIR%%/scripts/context/stubs/unix/texmfstart
 %%TEXMFDISTDIR%%/scripts/convbkmk/convbkmk.rb
 %%TEXMFDISTDIR%%/scripts/crossrefware/bbl2bib.pl
 %%TEXMFDISTDIR%%/scripts/crossrefware/bibdoiadd.pl
@ -440,6 +440,7 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/ctanupload/ctanupload.pl
 %%TEXMFDISTDIR%%/scripts/de-macro/de-macro
 %%TEXMFDISTDIR%%/scripts/diadia/diadia.lua
+%%TEXMFDISTDIR%%/scripts/digestif/digestif.texlua
 %%TEXMFDISTDIR%%/scripts/dosepsbin/dosepsbin.pl
 %%TEXMFDISTDIR%%/scripts/dtxgen/dtxgen
 %%TEXMFDISTDIR%%/scripts/dviasm/dviasm.py
@ -486,6 +487,7 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/listings-ext/listings-ext.sh
 %%TEXMFDISTDIR%%/scripts/ltxfileinfo/ltxfileinfo
 %%TEXMFDISTDIR%%/scripts/ltximg/ltximg.pl
+%%TEXMFDISTDIR%%/scripts/luafindfont/luafindfont.lua
 %%TEXMFDISTDIR%%/scripts/luaotfload/luaotfload-tool.lua
 %%TEXMFDISTDIR%%/scripts/lwarp/lwarpmk.lua
 %%TEXMFDISTDIR%%/scripts/m-tx/m-tx.lua
@ -500,6 +502,9 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/multibibliography/multibibliography.pl
 %%TEXMFDISTDIR%%/scripts/musixtex/musixflx.lua
 %%TEXMFDISTDIR%%/scripts/musixtex/musixtex.lua
+%%TEXMFDISTDIR%%/scripts/optexcount/optexcount
+%%TEXMFDISTDIR%%/scripts/pagelayout/pagelayoutapi
+%%TEXMFDISTDIR%%/scripts/pagelayout/textestvis
 %%TEXMFDISTDIR%%/scripts/pax/pdfannotextractor.pl
 %%TEXMFDISTDIR%%/scripts/pdfbook2/pdfbook2
 %%TEXMFDISTDIR%%/scripts/pdfcrop/pdfcrop.pl
@ -545,6 +550,7 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/tex4ht/htxetex.sh
 %%TEXMFDISTDIR%%/scripts/tex4ht/mk4ht.pl
 %%TEXMFDISTDIR%%/scripts/tex4ht/xhlatex.sh
+%%TEXMFDISTDIR%%/scripts/texaccents/texaccents.sno
 %%TEXMFDISTDIR%%/scripts/texcount/texcount.pl
 %%TEXMFDISTDIR%%/scripts/texdef/texdef.pl
 %%TEXMFDISTDIR%%/scripts/texdiff/texdiff
@ -566,6 +572,8 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-sys.sh
 %%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig.sh
 %%TEXMFDISTDIR%%/scripts/texlive-extra/texlinks.sh
+%%TEXMFDISTDIR%%/scripts/texlive-extra/xelatex-unsafe.sh
+%%TEXMFDISTDIR%%/scripts/texlive-extra/xetex-unsafe.sh
 %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-sys.sh
 %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-user.sh
 %%TEXMFDISTDIR%%/scripts/texlive/fmtutil.pl
@ -573,12 +581,14 @@ man/man5/updmap.cfg.5.gz
 %%TEXMFDISTDIR%%/scripts/texlive/mktexmf
 %%TEXMFDISTDIR%%/scripts/texlive/mktexpk
 %%TEXMFDISTDIR%%/scripts/texlive/mktextfm
-%%TEXMFDISTDIR%%/scripts/texlive/rungs.tlu
+%%TEXMFDISTDIR%%/scripts/texlive/rungs.lua
 %%TEXMFDISTDIR%%/scripts/texlive/updmap-sys.sh
 %%TEXMFDISTDIR%%/scripts/texlive/updmap-user.sh
 %%TEXMFDISTDIR%%/scripts/texlive/updmap.pl
 %%TEXMFDISTDIR%%/scripts/texliveonfly/texliveonfly.py
 %%TEXMFDISTDIR%%/scripts/texloganalyser/texloganalyser
+%%TEXMFDISTDIR%%/scripts/texlogfilter/texlogfilter
+%%TEXMFDISTDIR%%/scripts/texlogsieve/texlogsieve
 %%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre5.sh
 %%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre8.sh
 %%TEXMFDISTDIR%%/scripts/texosquery/texosquery.sh
--- a/print/texlive-docs/Makefile
+++ b/print/texlive-docs/Makefile
@ -11,7 +11,6 @@ COMMENT=	TeX Live Typesetting System, documentation
 WWW=		https://tug.org/texlive/

 USES=		perl5 tar:xz tex
-USE_TEX=	texmf

 EXTRACT_AFTER_ARGS=	| ${TAR} xf - \
 			${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,}
@ -66,11 +65,12 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/latex-web-companion/ch7/sgmlspl.pl \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/unsupported/u2ps \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/gustprog/porzadki.pl
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
+	${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/hex_range.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/xcharter/altone.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/aramaic-serto/serto.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/scanpages/replicate.py
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/scanpages/replicate.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/songproj/song2tex.py
 	${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHO_CMD}|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/unicode_joining.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/arabic_test.py \
@ -78,28 +78,35 @@ do-install:
 	${REINPLACE_CMD} -i '' -e 's|/usr/bin/texlua|${PREFIX}/bin/texlua|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
 	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/drm/allfonts.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/e-french/bin/linux/makefrindex \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/uspace/uspace-ctanify.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runAll.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runEXA.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hepnames/mkmacrotables \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/bardiag/example/compile.all \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/tlc-article/bin/deploy \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfreview.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfshrink.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/beamerappendixnote/build.sh  \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/seminar/run.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-abnt/test.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shdoc/shreformat.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-software/mkbiblatexstubs.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ctable/inst \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkfc \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkf \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/drm/allfonts.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/e-french/bin/linux/makefrindex \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/bardiag/example/compile.all \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/beamerappendixnote/build.sh  \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-abnt/test.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-software/mkbiblatexstubs.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/chinesechess/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/circledtext/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/codebox/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ctable/inst \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gamebooklib/gamebooklib_countpagesperseed.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hepnames/mkmacrotables \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runAll.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runEXA.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pascaltriangle/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfreview.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfshrink.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/seminar/run.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shdoc/shreformat.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/termsim/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/tlc-article/bin/deploy \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/uspace/uspace-ctanify.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/plain/transparent-io/TrIO.org \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/chklref/release.sh \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
--- a/print/texlive-docs/distinfo
+++ b/print/texlive-docs/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643558999
-SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
-SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
+TIMESTAMP = 1680719111
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/texlive-texmf-source/Makefile
+++ b/print/texlive-texmf-source/Makefile
@ -13,7 +13,6 @@ WWW=		https://tug.org/texlive/
 USES=		cpe perl5 python:build tar:xz tex
 CPE_VENDOR=	tug
 USE_PERL5=	build
-USE_TEX=	texmf

 CONFLICTS_INSTALL=	texlive-base-202[0-9]*

@ -43,21 +42,22 @@ do-install:
 	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/ae/clean \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/ae/install \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/avremu/test-suite/test-suite \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/fifinddo-info/makevars/bashvars.sh \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/fifinddo-info/makevars/texvars.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/stex/bin/installFonts.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/avremu/test-suite/test-suite
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/nwafuthesis/build.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/support/optexcount/install.sh
+	${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/gentium-tug/type1/kerncorrection.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/gentium-tug/type1/afmcreator.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/gentium-tug/type1/greekcorrection.py
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/gentium-tug/type1/greekcorrection.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/wargame/utils/wgexport.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/wargame/utils/wgsvg2tikz.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/support/optexcount/optexcount.py
 	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/generic/hyph-utf8/contributed/make-exhyph.pl \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/generic/ruhyphen/sorthyph \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/generic/ruhyphen/reduce-patt \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/stex/bin/sms \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/stex/bin/checksum \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/stex/bin/filedate \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/proposal/bin/checksum \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/source/latex/proposal/bin/filedate
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
--- a/print/texlive-texmf-source/distinfo
+++ b/print/texlive-texmf-source/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643559082
-SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
-SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
+TIMESTAMP = 1680721280
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@ -11,293 +11,112 @@ MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, texmf Tree
 WWW=		https://tug.org/texlive/

-USES=		cpe python:run shebangfix tar:xz tex
+USES=		cpe python:run tar:xz tex
 CPE_VENDOR=	tug
 USE_TEX=	base basic:extract texhash tlmgr:run

 EXTRACT_AFTER_ARGS=	| ${TAR} xf - \
 			${EXCLUDE_FILES:S,^,--exclude ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}/,}
-DISABLE_SIZE=	yes # XXX bug 262056: distfile too large
+
 NO_ARCH=	yes
 NO_BUILD=	yes
+
 NO_WRKSUBDIR=	yes

-EXCLUDE_FILES=	\*/doc/man texmf-dist/ls-R texmf-dist/bibtex/csf/base \
-		texmf-dist/doc texmf-dist/dvipdfm texmf-dist/dvipdfmx \
-		texmf-dist/dvips texmf-dist/fonts/cmap/dvipdfmx \
-		texmf-dist/fonts/cmap/uptex texmf-dist/fonts/enc/dvips \
-		texmf-dist/fonts/map/dvipdfm texmf-dist/fonts/map/dvipdfmx \
-		texmf-dist/fonts/map/dvips texmf-dist/fonts/map/luatex \
-		texmf-dist/fonts/misc/xetex \
-		texmf-dist/fonts/ofm/public/japanese-otf \
-		texmf-dist/fonts/ovp/public/japanese-otf-uptex \
-		texmf-dist/fonts/source/ptex texmf-dist/fonts/tfm/ptex \
-		texmf-dist/fonts/tfm/public/japanese-otf \
-		texmf-dist/fonts/tfm/public/japanese-otf-uptex \
-		texmf-dist/fonts/tfm/uptex texmf-dist/fonts/type1/ptex \
-		texmf-dist/fonts/vf/ptex \
-		texmf-dist/fonts/vf/public/japanese-otf \
-		texmf-dist/fonts/vf/public/japanese-otf-uptex \
-		texmf-dist/fonts/vf/uptex texmf-dist/scripts/xetex \
-		texmf-dist/source \
-		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/generic/dvips \
-		texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
-		texmf-dist/tex/generic/xetexconfig texmf-dist/tex/jadetex \
-		texmf-dist/tex/lambda texmf-dist/tex/latex/base \
-		texmf-dist/tex/latex/latexconfig/dvilualatex.ini \
-		texmf-dist/tex/latex/latexconfig/lualatex-patch-kernel.tex \
-		texmf-dist/tex/latex/latexconfig/lualatex-reset-codes.tex \
-		texmf-dist/tex/latex/latexconfig/lualatex.ini \
-		texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
-		texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \
-		texmf-dist/tex/latex/latexconfig/xelatex.ini \
-		texmf-dist/tex/lualatex texmf-dist/tex/luatex \
-		texmf-dist/tex/plain/config/aleph.ini \
-		texmf-dist/tex/plain/config/dviluatex.ini \
-		texmf-dist/tex/plain/config/luatex.ini \
-		texmf-dist/tex/plain/config/xetex.ini texmf-dist/tex/platex \
-		texmf-dist/tex/ptex texmf-dist/tex/uplatex texmf-dist/tex/uptex \
-		texmf-dist/tex/xelatex texmf-dist/tex/xetex \
-		texmf-dist/tex/xmltex texmf-dist/web2c/fmtutil-hdr.cnf \
-		texmf-dist/tex/cslatex \
-		texmf-dist/web2c/fmtutil.cnf texmf-dist/web2c/texmf.cnf \
-		texmf-dist/web2c/updmap-hdr.cfg texmf-dist/web2c/updmap.cfg \
-		texmf-dist/xdvi texmf-dist/scripts/a2ping/a2ping.pl \
-		texmf-dist/scripts/accfonts/mkt1font \
-		texmf-dist/scripts/accfonts/vpl2ovp \
-		texmf-dist/scripts/accfonts/vpl2vpl \
-		texmf-dist/scripts/adhocfilelist/adhocfilelist.sh \
-		texmf-dist/scripts/albatross/albatross.sh \
-		texmf-dist/scripts/arara/arara.sh \
-		texmf-dist/scripts/authorindex/authorindex \
-		texmf-dist/scripts/bibexport/bibexport.sh \
-		texmf-dist/scripts/bundledoc/arlatex \
-		texmf-dist/scripts/bundledoc/bundledoc \
-		texmf-dist/scripts/cachepic/cachepic.tlu \
-		texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl \
-		texmf-dist/scripts/checkcites/checkcites.lua \
-		texmf-dist/scripts/context/perl/mptopdf.pl \
-		texmf-dist/scripts/context/stubs/unix/context \
-		texmf-dist/scripts/context/stubs/unix/contextjit \
-		texmf-dist/scripts/context/stubs/unix/luatools \
-		texmf-dist/scripts/context/stubs/unix/mtxrun \
-		texmf-dist/scripts/context/stubs/unix/mtxrunjit \
-		texmf-dist/scripts/context/stubs/unix/texexec \
-		texmf-dist/scripts/context/stubs/unix/texmfstart \
-		texmf-dist/scripts/context/lua \
-		texmf-dist/scripts/convbkmk/convbkmk.rb \
-		texmf-dist/scripts/crossrefware/bibdoiadd.pl \
-		texmf-dist/scripts/crossrefware/bibzbladd.pl \
-		texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl \
-		texmf-dist/scripts/ctanify/ctanify \
-		texmf-dist/scripts/ctanupload/ctanupload.pl \
-		texmf-dist/scripts/de-macro/de-macro \
-		texmf-dist/scripts/dosepsbin/dosepsbin.pl \
-		texmf-dist/scripts/dtxgen/dtxgen \
-		texmf-dist/scripts/dviasm/dviasm.py \
-		texmf-dist/scripts/ebong/ebong.py \
-		texmf-dist/scripts/epspdf/epspdf.tlu \
-		texmf-dist/scripts/epspdf/epspdftk.tcl \
-		texmf-dist/scripts/epstopdf/epstopdf.pl \
-		texmf-dist/scripts/exceltex/exceltex \
-		texmf-dist/scripts/fig4latex/fig4latex \
-		texmf-dist/scripts/findhyph/findhyph \
-		texmf-dist/scripts/fontools/afm2afm \
-		texmf-dist/scripts/fontools/autoinst \
-		texmf-dist/scripts/fontools/ot2kpx \
-		texmf-dist/scripts/fragmaster/fragmaster.pl \
-		texmf-dist/scripts/getmap/getmapdl.lua \
-		texmf-dist/scripts/git-latexdiff/git-latexdiff \
-		texmf-dist/scripts/glossaries/makeglossaries \
-		texmf-dist/scripts/hyperxmp/hyperxmp-add-bytecount.pl \
-		texmf-dist/scripts/installfont/installfont-tl \
-		texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh \
-		texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl \
-		texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl \
-		texmf-dist/scripts/kotex-utils/jamo-normalize.pl \
-		texmf-dist/scripts/kotex-utils/komkindex.pl \
-		texmf-dist/scripts/kotex-utils/ttf2kotexfont.pl \
-		texmf-dist/scripts/latex-git-log/latex-git-log \
-		texmf-dist/scripts/latex2man/latex2man \
-		texmf-dist/scripts/latexdiff/latexdiff-vc.pl \
-		texmf-dist/scripts/latexdiff/latexdiff.pl \
-		texmf-dist/scripts/latexdiff/latexrevise.pl \
-		texmf-dist/scripts/latexfileversion/latexfileversion \
-		texmf-dist/scripts/latexindent/latexindent.pl \
-		texmf-dist/scripts/latexmk/latexmk.pl \
-		texmf-dist/scripts/latexpand/latexpand \
-		texmf-dist/scripts/light-latex-make/llmk.lua \
-		texmf-dist/scripts/lilyglyphs/lily-glyph-commands.py \
-		texmf-dist/scripts/lilyglyphs/lily-image-commands.py \
-		texmf-dist/scripts/lilyglyphs/lily-rebuild-pdfs.py \
-		texmf-dist/scripts/listbib/listbib \
-		texmf-dist/scripts/listings-ext/listings-ext.sh \
-		texmf-dist/scripts/ltxfileinfo/ltxfileinfo \
-		texmf-dist/scripts/ltximg/ltximg.pl \
-		texmf-dist/scripts/lua2dox/lua2dox_filter \
-		texmf-dist/scripts/luaotfload/luaotfload-tool.lua \
-		texmf-dist/scripts/m-tx/m-tx.lua \
-		texmf-dist/scripts/match_parens/match_parens \
-		texmf-dist/scripts/mathspic/mathspic.pl \
-		texmf-dist/scripts/mf2pt1/mf2pt1.pl \
-		texmf-dist/scripts/mkgrkindex/mkgrkindex \
-		texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \
-		texmf-dist/scripts/mkpic/mkpic \
-		texmf-dist/scripts/multibibliography/multibibliography.pl \
-		texmf-dist/scripts/musixtex/musixflx.lua \
-		texmf-dist/scripts/musixtex/musixtex.lua \
-		texmf-dist/scripts/attachfile2/pdfatfi.pl \
-		texmf-dist/scripts/pax/pdfannotextractor.pl \
-		texmf-dist/scripts/pdfcrop/pdfcrop.pl \
-		texmf-dist/scripts/pdfjam/pdf180 \
-		texmf-dist/scripts/pdfjam/pdf270 \
-		texmf-dist/scripts/pdfjam/pdf90 \
-		texmf-dist/scripts/pdfjam/pdfbook \
-		texmf-dist/scripts/pdfjam/pdfflip \
-		texmf-dist/scripts/pdfjam/pdfjam \
-		texmf-dist/scripts/pdfjam/pdfjam-pocketmod \
-		texmf-dist/scripts/pdfjam/pdfjam-slides3up \
-		texmf-dist/scripts/pdfjam/pdfjam-slides6up \
-		texmf-dist/scripts/pdfjam/pdfjoin \
-		texmf-dist/scripts/pdfjam/pdfnup \
-		texmf-dist/scripts/pdfjam/pdfpun \
-		texmf-dist/scripts/pedigree-perl/pedigree.pl \
-		texmf-dist/scripts/perltex/perltex.pl \
-		texmf-dist/scripts/pfarrei/a5toa4.tlu \
-		texmf-dist/scripts/pfarrei/pfarrei.tlu \
-		texmf-dist/scripts/pkfix-helper/pkfix-helper \
-		texmf-dist/scripts/pkfix/pkfix.pl \
-		texmf-dist/scripts/pmx/pmx2pdf.lua \
-		texmf-dist/scripts/pmxchords/pmxchords.lua \
-		texmf-dist/scripts/ps2eps/ps2eps.pl \
-		texmf-dist/scripts/pst-pdf/ps4pdf \
-		texmf-dist/scripts/pst2pdf/pst2pdf.pl \
-		texmf-dist/scripts/ptex2pdf/ptex2pdf.lua \
-		texmf-dist/scripts/purifyeps/purifyeps \
-		texmf-dist/scripts/pygmentex/pygmentex.py \
-		texmf-dist/scripts/pythontex/depythontex.py \
-		texmf-dist/scripts/pythontex/pythontex.py \
-		texmf-dist/scripts/rubik/rubikrotation.pl \
-		texmf-dist/scripts/simpdftex/simpdftex \
-		texmf-dist/scripts/spix/spix.py \
-		texmf-dist/scripts/splitindex/splitindex.pl \
-		texmf-dist/scripts/sty2dtx/sty2dtx.pl \
-		texmf-dist/scripts/svn-multi/svn-multi.pl \
-		texmf-dist/scripts/tex4ht/ht.sh \
-		texmf-dist/scripts/tex4ht/htcontext.sh \
-		texmf-dist/scripts/tex4ht/htlatex.sh \
-		texmf-dist/scripts/tex4ht/htmex.sh \
-		texmf-dist/scripts/tex4ht/httex.sh \
-		texmf-dist/scripts/tex4ht/httexi.sh \
-		texmf-dist/scripts/tex4ht/htxelatex.sh \
-		texmf-dist/scripts/tex4ht/htxetex.sh \
-		texmf-dist/scripts/tex4ht/mk4ht.pl \
-		texmf-dist/scripts/texcount/texcount.pl \
-		texmf-dist/scripts/texdef/texdef.pl \
-		texmf-dist/scripts/texdiff/texdiff \
-		texmf-dist/scripts/texdirflatten/texdirflatten \
-		texmf-dist/scripts/texdoc/texdoc.tlu \
-		texmf-dist/scripts/texdoctk/texdoctk.pl \
-		texmf-dist/scripts/texfot/texfot.pl \
-		texmf-dist/scripts/texlive/allcm.sh \
-		texmf-dist/scripts/texlive/allneeded.sh \
-		texmf-dist/scripts/texlive/dvi2fax.sh \
-		texmf-dist/scripts/texlive/dvired.sh \
-		texmf-dist/scripts/texlive/e2pall.pl \
-		texmf-dist/scripts/texlive/fmtutil-sys.sh \
-		texmf-dist/scripts/texlive/fmtutil.pl \
-		texmf-dist/scripts/texlive/fontinst.sh \
-		texmf-dist/scripts/texlive/kpsetool.sh \
-		texmf-dist/scripts/texlive/kpsewhere.sh \
-		texmf-dist/scripts/texlive/ps2frag.sh \
-		texmf-dist/scripts/texlive/pslatex.sh \
-		texmf-dist/scripts/texlive/rubibtex.sh \
-		texmf-dist/scripts/texlive/rumakeindex.sh \
-		texmf-dist/scripts/texlive/rungs.tlu \
-		texmf-dist/scripts/texlive/texconfig-dialog.sh \
-		texmf-dist/scripts/texlive/texconfig-sys.sh \
-		texmf-dist/scripts/texlive/texconfig.sh \
-		texmf-dist/scripts/texlive/texlinks.sh \
-		texmf-dist/scripts/texlive/tlmgr.pl \
-		texmf-dist/scripts/texlive/updmap-sys.sh \
-		texmf-dist/scripts/texlive/updmap.pl \
-		texmf-dist/scripts/texliveonfly/texliveonfly.py \
-		texmf-dist/scripts/texloganalyser/texloganalyser \
-		texmf-dist/scripts/thumbpdf/thumbpdf.pl \
-		texmf-dist/scripts/tikztosvg/tikztosvg \
-		texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh \
-		texmf-dist/scripts/ulqda/ulqda.pl \
-		texmf-dist/scripts/urlbst/urlbst texmf-dist/scripts/vpe/vpe.pl \
-		texmf-dist/scripts/yplan/yplan \
-		texmf-dist/scripts/bib2gls/bib2gls.sh \
-		texmf-dist/scripts/bib2gls/convertgls2bib.sh \
-		texmf-dist/scripts/checklistings/checklistings.sh \
-		texmf-dist/scripts/chklref/chklref.pl \
-		texmf-dist/scripts/clojure-pamphlet/pamphletangler \
-		texmf-dist/scripts/cluttex/cluttex.lua \
-		texmf-dist/scripts/crossrefware/bbl2bib.pl \
-		texmf-dist/scripts/crossrefware/bibmradd.pl \
-		texmf-dist/scripts/crossrefware/biburl2doi.pl \
-		texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl \
-		texmf-dist/scripts/ctanbib/ctanbib \
-		texmf-dist/scripts/diadia/diadia.lua \
-		texmf-dist/scripts/dviinfox/dviinfox.pl \
-		texmf-dist/scripts/glossaries/makeglossaries-lite.lua \
-		texmf-dist/scripts/jfmutil/jfmutil.pl \
-		texmf-dist/scripts/ketcindy/ketcindy.pl \
-		texmf-dist/scripts/l3build/l3build.lua \
-		texmf-dist/scripts/latex-papersize/latex-papersize.py \
-		texmf-dist/scripts/latex2nemeth/latex2nemeth \
-		texmf-dist/scripts/lwarp/lwarpmk.lua \
-		texmf-dist/scripts/make4ht/make4ht \
-		texmf-dist/scripts/makedtx/makedtx.pl \
-		texmf-dist/scripts/pdfbook2/pdfbook2 \
-		texmf-dist/scripts/pdflatexpicscale/pdflatexpicscale.pl \
-		texmf-dist/scripts/pdftex-quiet/pdftex-quiet \
-		texmf-dist/scripts/pdfxup/pdfxup \
-		texmf-dist/scripts/petri-nets/pn2pdf \
-		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-sys.sh \
-		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \
-		texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl \
-		texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl \
-		texmf-dist/scripts/srcredact/srcredact.pl \
-		texmf-dist/scripts/tex4ebook/tex4ebook \
-		texmf-dist/scripts/tex4ht/xhlatex.sh \
-		texmf-dist/scripts/texlive-extra/allcm.sh \
-		texmf-dist/scripts/texlive-extra/allneeded.sh \
-		texmf-dist/scripts/texlive-extra/dvi2fax.sh \
-		texmf-dist/scripts/texlive-extra/dvired.sh \
-		texmf-dist/scripts/texlive-extra/e2pall.pl \
-		texmf-dist/scripts/texlive-extra/fontinst.sh \
-		texmf-dist/scripts/texlive-extra/ps2frag.sh \
-		texmf-dist/scripts/texlive-extra/pslatex.sh \
-		texmf-dist/scripts/texlive-extra/rubibtex.sh \
-		texmf-dist/scripts/texlive-extra/rumakeindex.sh \
-		texmf-dist/scripts/texlive-extra/texconfig-dialog.sh \
-		texmf-dist/scripts/texlive-extra/texconfig-sys.sh \
-		texmf-dist/scripts/texlive-extra/texconfig.sh \
-		texmf-dist/scripts/texlive-extra/texlinks.sh \
-		texmf-dist/scripts/texlive/fmtutil-user.sh \
-		texmf-dist/scripts/texlive/mktexlsr \
-		texmf-dist/scripts/texlive/mktexmf \
-		texmf-dist/scripts/texlive/mktexpk \
-		texmf-dist/scripts/texlive/mktextfm \
-		texmf-dist/scripts/texlive/updmap-user.sh \
-		texmf-dist/scripts/texosquery/texosquery-jre5.sh \
-		texmf-dist/scripts/texosquery/texosquery-jre8.sh \
-		texmf-dist/scripts/texosquery/texosquery.sh \
-		texmf-dist/scripts/texplate/texplate.sh \
-		texmf-dist/scripts/tlcockpit/tlcockpit.sh \
-		texmf-dist/scripts/tlshell/tlshell.tcl \
-		texmf-dist/scripts/webquiz/webquiz.py \
-		texmf-dist/scripts/wordcount/wordcount.sh \
-		texmf-dist/scripts/xindex/xindex.lua \
-		texmf-dist/texconfig/tcfmgr \
-		texmf-dist/texconfig/tcfmgr.map \
-
+EXCLUDE_FILES=		\*/doc/man texmf-dist/ls-R texmf-dist/doc \
+			texmf-dist/dvipdfm texmf-dist/dvipdfmx texmf-dist/dvips \
+			texmf-dist/fonts/cmap/dvipdfmx \
+			texmf-dist/fonts/cmap/uptex texmf-dist/fonts/enc/dvips \
+			texmf-dist/fonts/map/dvipdfm \
+			texmf-dist/fonts/map/dvipdfmx \
+			texmf-dist/fonts/map/dvips texmf-dist/fonts/map/luatex \
+			texmf-dist/fonts/misc/xetex \
+			texmf-dist/fonts/ofm/public/japanese-otf \
+			texmf-dist/fonts/ovp/public/japanese-otf-uptex \
+			texmf-dist/fonts/source/ptex texmf-dist/fonts/tfm/ptex \
+			texmf-dist/fonts/tfm/public/japanese-otf \
+			texmf-dist/fonts/tfm/public/japanese-otf-uptex \
+			texmf-dist/fonts/tfm/uptex texmf-dist/fonts/type1/ptex \
+			texmf-dist/fonts/vf/ptex \
+			texmf-dist/fonts/vf/public/japanese-otf \
+			texmf-dist/fonts/vf/public/japanese-otf-uptex \
+			texmf-dist/fonts/vf/uptex texmf-dist/scripts/xetex \
+			texmf-dist/source \
+			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/generic/dvips \
+			texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
+			texmf-dist/tex/generic/xetexconfig \
+			texmf-dist/tex/jadetex texmf-dist/tex/lambda \
+			texmf-dist/tex/latex/base \
+			texmf-dist/tex/latex/latexconfig/dvilualatex.ini \
+			texmf-dist/tex/latex/latexconfig/lualatex-patch-kernel.tex \
+			texmf-dist/tex/latex/latexconfig/lualatex-reset-codes.tex \
+			texmf-dist/tex/latex/latexconfig/lualatex.ini \
+			texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
+			texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex \
+			texmf-dist/tex/latex/latexconfig/xelatex.ini \
+			texmf-dist/tex/lualatex texmf-dist/tex/luatex \
+			texmf-dist/tex/plain/config/aleph.ini \
+			texmf-dist/tex/plain/config/dviluatex.ini \
+			texmf-dist/tex/plain/config/luatex.ini \
+			texmf-dist/tex/plain/config/xetex.ini \
+			texmf-dist/tex/platex texmf-dist/tex/ptex \
+			texmf-dist/tex/uplatex texmf-dist/tex/uptex \
+			texmf-dist/tex/xelatex texmf-dist/tex/xetex \
+			texmf-dist/tex/xmltex texmf-dist/web2c/fmtutil-hdr.cnf \
+			texmf-dist/tex/cslatex texmf-dist/web2c/texmf.cnf \
+			texmf-dist/web2c/updmap-hdr.cfg \
+			texmf-dist/web2c/updmap.cfg texmf-dist/xdvi \
+			texmf-dist/scripts/context/stubs/unix/context \
+			texmf-dist/scripts/context/stubs/unix/contextjit \
+			texmf-dist/scripts/context/stubs/unix/luatools \
+			texmf-dist/scripts/context/stubs/unix/mtxrun \
+			texmf-dist/scripts/context/stubs/unix/mtxrunjit \
+			texmf-dist/scripts/context/stubs/unix/texexec \
+			texmf-dist/scripts/context/stubs/unix/texmfstart \
+			texmf-dist/scripts/context/lua \
+			texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh \
+			texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl \
+			texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl \
+			texmf-dist/scripts/lua2dox/lua2dox_filter \
+			texmf-dist/scripts/pdfjam/pdf180 \
+			texmf-dist/scripts/pdfjam/pdf270 \
+			texmf-dist/scripts/pdfjam/pdf90 \
+			texmf-dist/scripts/pdfjam/pdfbook \
+			texmf-dist/scripts/pdfjam/pdfflip \
+			texmf-dist/scripts/pdfjam/pdfjam-pocketmod \
+			texmf-dist/scripts/pdfjam/pdfjam-slides3up \
+			texmf-dist/scripts/pdfjam/pdfjam-slides6up \
+			texmf-dist/scripts/pdfjam/pdfjoin \
+			texmf-dist/scripts/pdfjam/pdfnup \
+			texmf-dist/scripts/pdfjam/pdfpun \
+			texmf-dist/scripts/pmx/pmx2pdf.lua \
+			texmf-dist/scripts/texlive/allcm.sh \
+			texmf-dist/scripts/texlive/allneeded.sh \
+			texmf-dist/scripts/texlive/dvi2fax.sh \
+			texmf-dist/scripts/texlive/dvired.sh \
+			texmf-dist/scripts/texlive/e2pall.pl \
+			texmf-dist/scripts/texlive/fontinst.sh \
+			texmf-dist/scripts/texlive/kpsetool.sh \
+			texmf-dist/scripts/texlive/kpsewhere.sh \
+			texmf-dist/scripts/texlive/ps2frag.sh \
+			texmf-dist/scripts/texlive/pslatex.sh \
+			texmf-dist/scripts/texlive/rubibtex.sh \
+			texmf-dist/scripts/texlive/rumakeindex.sh \
+			texmf-dist/scripts/texlive/rungs.tlu \
+			texmf-dist/scripts/texlive/texconfig-dialog.sh \
+			texmf-dist/scripts/texlive/texconfig-sys.sh \
+			texmf-dist/scripts/texlive/texconfig.sh \
+			texmf-dist/scripts/texlive/texlinks.sh \
+			texmf-dist/scripts/texlive/tlmgr.pl \
+			texmf-dist/scripts/texliveonfly/texliveonfly.py \
+			texmf-dist/scripts/crossrefware/bbl2bib.pl \
+			texmf-dist/scripts/crossrefware/bibmradd.pl \
+			texmf-dist/scripts/crossrefware/biburl2doi.pl \
+			${TEXLIVE_BASE_PLIST}
+TEXLIVE_BASE_PLIST!=	grep TEXMFDISTDIR ${.CURDIR}/../texlive-base/pkg-plist | sed 's|%%TEXMFDISTDIR%%|texmf-dist|g'
 PKG_CREATE_VERBOSE=	yes
 TEXHASHDIRS=		${TEXMFDIR} ${TEXMFDISTDIR}

@ -315,17 +134,19 @@ do-install:
 post-install:
 	@${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/createlpsudoku \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/lpsmag \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/pgf/pgfrevisionfile.sh
+		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/logicpuzzle/lpsmag
 	@${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/mycv/mycv_split_contents.pl
 	@${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|; \
 		1s|/usr/bin/python|${python_CMD}|;' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/asymptote/GUI/*.py \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/webquiz/webquiz \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/*/*.py
+		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/*/*.py \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/latex/wargame/*.py
 	@${REINPLACE_CMD} -i '' -E -e '/ec\.tex/d' \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex \
 		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex
+	@${REINPLACE_CMD} -i '' -e '1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/pgfplots/lua/*.lua

 .include <bsd.port.mk>
--- a/print/texlive-texmf/distinfo
+++ b/print/texlive-texmf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643556789
-SHA256 (TeX/texlive-20210325-texmf.tar.xz) = ff12d436c23e99fb30aad55924266104356847eb0238c193e839c150d9670f1c
-SIZE (TeX/texlive-20210325-texmf.tar.xz) = 3474113420
+TIMESTAMP = 1680621601
+SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
+SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
--- a/print/texlive-tlmgr/Makefile
+++ b/print/texlive-tlmgr/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	texlive
 PORTVERSION=	${TEXLIVE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMESUFFIX=	-tlmgr
@ -13,6 +12,8 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeXLive manager modules

+LICENSE=	GPLv2
+
 USES=		cpe perl5 tar:xz tex
 CPE_VENDOR=	tug
 USE_PERL5=	run
@ -21,10 +22,11 @@ USE_TEX=	kpathsea
 NO_ARCH=	yes
 NO_BUILD=	yes

-TLPKG_FILE=			${PORTNAME}-${PORTVERSION}-tlpdb-full
+TLPKG_FILE=			${PORTNAME}-${TEXLIVE_YEAR}0311-tlpdb-full
 EXTRACT_AFTER_ARGS_SOURCE=	| ${TAR} -xf - -C ${WRKDIR} \
 				--no-same-permission --no-same-owner \
-				${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive
+				${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive \
+				${PORTNAME}-${PORTVERSION}-source/build-aux/config.guess

 PATCH_WRKSRC=	${WRKDIR}

@ -39,6 +41,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive
 	cd ${STAGEDIR}${PREFIX}/bin && \
 	    ${LN} -s ../${TEXMFDISTDIR}/scripts/texlive/tlmgr.pl tlmgr
+	# texlive-20230313-source/build-aux/config.guess
+	# /usr/local/share/tlpkg/installer/config.guess
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}-extra/tlpkg/TeXLive/*.pm \
 	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
@ -46,10 +50,13 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}
 	${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/.texlive-tlmgr
-	${MKDIR} ${STAGEDIR}/var/db/tlpkg
+	${MKDIR} ${STAGEDIR}/var/db/tlpkg/installer
 	${TOUCH} ${STAGEDIR}/var/db/tlpkg/tlmgr.log
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${TLPKG_FILE}.tar.gz -C \
 	    ${STAGEDIR}/var/db/tlpkg/ texlive.tlpdb
+	${INSTALL_SCRIPT} \
+	    ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/build-aux/config.guess \
+	    ${STAGEDIR}/var/db/tlpkg/installer/
 	${INSTALL_DATA} ${LOCALBASE}/share/texmf-dist/web2c/texmf.cnf \
 	    ${STAGEDIR}/var/db/tlpkg
 	${MKDIR} ${STAGEDIR}/var/db/tlpkg/backups
--- a/print/texlive-tlmgr/distinfo
+++ b/print/texlive-tlmgr/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1643547649
-SHA256 (TeX/texlive-20210325-extra.tar.xz) = 46a3f385d0b30893eec6b39352135d2929ee19a0a81df2441bfcaa9f6c78339c
-SIZE (TeX/texlive-20210325-extra.tar.xz) = 1751632
-SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
-SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
-SHA256 (TeX/texlive-20210325-tlpdb-full.tar.gz) = 21d218dcf56160081e8c376ec9d6b4cfc750e2a0fea14ee24884b1d5039f2566
-SIZE (TeX/texlive-20210325-tlpdb-full.tar.gz) = 3093230
+TIMESTAMP = 1680098317
+SHA256 (TeX/texlive-20230313-extra.tar.xz) = 80a676facc174e6853550c87898a982c96dfc63ac30de19e6fcaa7635edb38c2
+SIZE (TeX/texlive-20230313-extra.tar.xz) = 1893692
+SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
+SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+SHA256 (TeX/texlive-20230311-tlpdb-full.tar.gz) = bf3360ebe897dac8424425ba3a87dbd41433aa92924c04be1e47285f264f6c8a
+SIZE (TeX/texlive-20230311-tlpdb-full.tar.gz) = 3295736
--- a/print/texlive-tlmgr/files/patch-texlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm
+++ b/print/texlive-tlmgr/files/patch-texlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm
@ -1,33 +0,0 @@
--- texlive-20210325-extra/tlpkg/TeXLive/TLUtils.pm.orig	2021-03-05 00:26:37 UTC
-+++ texlive-20210325-extra/tlpkg/TeXLive/TLUtils.pm
-@@ -250,22 +250,14 @@ subsequent calls just return that value.
- 
- sub platform {
-   unless (defined $::_platform_) {
-    if ($^O =~ /^MSWin/i) {
-      $::_platform_ = "win32";
-    } else {
-      my $config_guess = "$::installerdir/tlpkg/installer/config.guess";
-
-      # We cannot rely on #! in config.guess but have to call /bin/sh
-      # explicitly because sometimes the 'noexec' flag is set in
-      # /etc/fstab for ISO9660 file systems.
-      chomp (my $guessed_platform = `/bin/sh '$config_guess'`);
-
-      # For example, if the disc or reader has hardware problems.
-      die "$0: could not run $config_guess, cannot proceed, sorry"
-        if ! $guessed_platform;
-
-      $::_platform_ = platform_name($guessed_platform);
-    }
-+    chomp(my $uname_m = `uname -m`);
-+    chomp(my $uname_r = `uname -r`);
-+    chomp(my $uname_s = `uname -s`);
-+    $uname_r =~ s/-.*$//;
-+    $uname_s = lc($uname_s);
-+    $guessed_platform = sprintf("%s-unknown-%s%s", $uname_m,
-+        $uname_s, $uname_r);
-+    $::_platform_ = platform_name($guessed_platform);
-   }
-   return $::_platform_;
- }
--- a/print/texlive-tlmgr/files/patch-texlive-20210325-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
+++ b/print/texlive-tlmgr/files/patch-texlive-20210325-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
@ -1,87 +0,0 @@
--- texlive-20210325-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig	2021-03-06 21:58:15 UTC
-+++ texlive-20210325-source/texk/texlive/linked_scripts/texlive/tlmgr.pl
-@@ -62,7 +62,7 @@ BEGIN {
-   }
-   if (-r "$bindir/$kpsewhichname") {
-     # if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
-    chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
-+    chomp($Master = `kpsewhich -var-value=TEXMFROOT`);
-   }
- 
-   # if we have no directory in which to find our modules,
-@@ -631,13 +631,16 @@ for the full story.\n";
-   # besides doing normal logging if -logfile is specified, we try to log
-   # package related actions (install, remove, update) to
-   # the package-log file TEXMFSYSVAR/web2c/tlmgr.log
-+  #
-+  # *** FreeBSD specific: FreeBSD port uses /var/db/tlpkg/tlmgr.log.
-+  #
-   $packagelogged = 0;  # how many msgs we logged
-   chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`);
-   $packagelogfile = $opts{"package-logfile"};
-   if ($opts{"usermode"}) {
-     $packagelogfile ||= "$::maintree/web2c/tlmgr.log";
-   } else {
-    $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log";
-+    $packagelogfile ||= "/var/db/tlpkg/tlmgr.log";
-   }
-   #
-   # Try to open the packagelog file, but do NOT die when that does not work
-@@ -725,9 +728,9 @@ sub give_version {
-     $::mrversion = "";
-     $::version_string .= "tlmgr revision $tlmgrversion\n";
-     $::mrversion .= "revision $tlmgrrevision\n";
-    $::version_string .= "tlmgr using installation: $Master\n";
-    $::mrversion .= "installation $Master\n";
-    if (open (REL_TL, "$Master/release-texlive.txt")) {
-+    $::version_string .= "tlmgr using installation: $Master/tlpkg\n";
-+    $::mrversion .= "installation $Master/tlpkg\n";
-+    if (open (REL_TL, "$Master/tlpkg/release-texlive.txt")) {
-       # print first, which has the TL version info.
-       my $rel_tl = <REL_TL>;
-       $::version_string .= $rel_tl;
-@@ -2264,7 +2267,7 @@ sub write_w32_updater {
-   my $opt_src = $localtlpdb->option("install_srcfiles");
-   my $opt_doc = $localtlpdb->option("install_docfiles");
-   my $root = $localtlpdb->root;
-  my $temp = "$root/temp";
-+  my $temp = "$root/tlpkg/temp";
-   TeXLive::TLUtils::mkdirhier($temp);
-   tlwarn("$prg: Backup option not implemented for infrastructure update.\n") if ($opts{"backup"});
-   if ($media eq 'local_uncompressed') {
-@@ -5266,21 +5269,19 @@ sub uninstall_texlive {
-   system("rm", "-rf", "$Master/texmf-var");
-   system("rm", "-rf", "$Master/tlpkg");
-   system("rm", "-rf", "$Master/bin");
-  system("rm", "-rf", "$Master/readme-html.dir");
-  system("rm", "-rf", "$Master/readme-txt.dir");
-+  system("rm", "-rf", "$Master/tlpkg/readme-html.dir");
-+  system("rm", "-rf", "$Master/tlpkg/readme-txt.dir");
-   for my $f (qw/doc.html index.html install-tl 
-                 LICENSE.CTAN LICENSE.TL README README.usergroups
-                 release-texlive.txt texmf.cnf texmfcnf.lua/) {
-    system("rm", "-f", "$Master/$f");
-+    system("rm", "-f", "$Master/tlpkg/$f");
-   }
-  if (-d "$Master/temp") {
-+  if (-d "$Master/tlpkg/temp") {
-     finddepth(sub { rmdir; }, "$Master/temp");
-   }
-  unlink("$Master/install-tl.log");
-+  unlink("$Master/tlpkg/install-tl.log");
-   # if they want removal, give them removal. Hopefully they know how to
-   # regenerate any changed config files.
-  system("rm", "-rf", "$Master/texmf-config");
-  finddepth(sub { rmdir; }, "$Master");
-   
-   return -d "$Master";
- }
-@@ -6183,7 +6184,7 @@ sub action_conf {
-       $fn || ( $fn = "$TEXMFCONFIG/tlmgr/config" ) ;
-       $cf = TeXLive::TLConfFile->new($fn, "#", "=");
-     } elsif ($arg eq "texmf" || $arg eq "auxtrees") {
-      $fn || ( $fn = "$Master/texmf.cnf" ) ;
-+      $fn || ( $fn = "$Master/tlpkg/texmf.cnf" ) ;
-       $cf = TeXLive::TLConfFile->new($fn, "[%#]", "=");
-     } elsif ($arg eq "updmap") {
-       $fn || ( chomp ($fn = `kpsewhich updmap.cfg`) ) ;
--- a/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
+++ b/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
--- a/print/texlive-tlmgr/pkg-plist
+++ b/print/texlive-tlmgr/pkg-plist
@ -15,9 +15,11 @@ bin/tlmgr
 %%TEXMFDISTDIR%%/.texlive-tlmgr
 %%TEXMFDISTDIR%%/scripts/texlive/tlmgr.pl
 share/tlpkg
+/var/db/tlpkg/installer/config.guess
 /var/db/tlpkg/texlive.tlpdb
 /var/db/tlpkg/texmf.cnf
 /var/db/tlpkg/tlmgr.log
@dir /var/db/tlpkg/backups
+@dir /var/db/tlpkg/installer
@dir /var/db/tlpkg/tlpobj
@dir /var/db/tlpkg
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@ -1,11 +1,11 @@
 PORTNAME=	foiltex
 PORTVERSION=	2.1.4b
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	textproc
-MASTER_SITES=	TEX_CTAN/macros/latex/contrib/${PORTNAME}
+MASTER_SITES=	https://mirror.ctan.org/macros/latex/contrib/${PORTNAME}/
 DISTFILES=	foiltex.dtx foiltex.ins

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Collection of LaTeX files for making foils
 WWW=		https://ctan.org/pkg/foiltex

@ -17,21 +17,22 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept

 USES=		tex
 USE_TEX=	latex
-NO_WRKSUBDIR=	yes
+
 NO_ARCH=	yes

-LATEX_CMD=	${LOCALBASE}/bin/latex
-
-FOIL_DIR=	share/texmf/tex/latex/${PORTNAME}
-FOIL_FILES=	foil17.clo foil20.clo foil25.clo foil30.clo foils.cls \
-		foils.sty foilshrt.clo fltfonts.def
+NO_WRKSUBDIR=	yes

+PLIST_FILES=	${FOIL_FILES:S,^,${FOIL_DIR}/,}
 PORTDOCS=	foiltex.dtx foiltex.dvi
 PORTEXAMPLES=	sampfoil.tex
-PLIST_FILES=	${FOIL_FILES:S,^,${FOIL_DIR}/,}

 OPTIONS_DEFINE=	DOCS EXAMPLES

+LATEX_CMD=	${LOCALBASE}/bin/latex
+FOIL_DIR=	${TEXMFDIR}/tex/latex/${PORTNAME}
+FOIL_FILES=	foil17.clo foil20.clo foil25.clo foil30.clo foils.cls \
+		foils.sty foilshrt.clo fltfonts.def
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/foiltex.ins ${WRKSRC}/foiltex.ins
--- a/textproc/foiltex/distinfo
+++ b/textproc/foiltex/distinfo
@ -1,3 +1,4 @@
+TIMESTAMP = 1680898601
 SHA256 (foiltex.dtx) = ff6236c475e9662d12f7cf2e16c1ae3d5ea184cc3c7b45399bf3fc9b27f8d91d
 SIZE (foiltex.dtx) = 174081
 SHA256 (foiltex.ins) = 2939b7a6477e0a9bb49d213659fb0d11ae7a3de5c168d7f1fec38ed95bf49327