aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-04-03 00:30:03 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-04-11 15:43:18 +0000
commit24e24a19568e8038e3926d7050e1a6052a8b0df5 (patch)
treee3ad6f62879e9c378a9a44a85260e023fcb3a269
parenta8fe44053d6117e4bce4de523aaf7001480fbdbc (diff)
downloadports-24e24a19568e8038e3926d7050e1a6052a8b0df5.tar.gz
ports-24e24a19568e8038e3926d7050e1a6052a8b0df5.zip
*/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
-rw-r--r--Mk/Uses/tex.mk28
-rw-r--r--arabic/arabtex/Makefile4
-rw-r--r--devel/tex-kpathsea/Makefile3
-rw-r--r--devel/tex-kpathsea/distinfo6
-rw-r--r--devel/tex-kpathsea/files/patch-Makefile.in6
-rw-r--r--devel/tex-kpathsea/files/patch-texmf.cnf132
-rw-r--r--devel/tex-kpathsea/pkg-plist2
-rw-r--r--devel/tex-libtexlua/Makefile1
-rw-r--r--devel/tex-libtexlua/distinfo6
-rw-r--r--devel/tex-libtexluajit/Makefile1
-rw-r--r--devel/tex-libtexluajit/distinfo6
-rw-r--r--devel/tex-synctex/Makefile4
-rw-r--r--devel/tex-synctex/distinfo6
-rw-r--r--devel/tex-synctex/files/patch-Makefile.in1339
-rw-r--r--devel/tex-synctex/files/patch-man-Makefile.in33
-rw-r--r--devel/tex-web2c/Makefile4
-rw-r--r--devel/tex-web2c/distinfo6
-rw-r--r--devel/tex-web2c/files/patch-Makefile.in1326
-rw-r--r--devel/tex-web2c/files/patch-man-Makefile.in4
-rw-r--r--devel/tex-web2c/pkg-plist6
-rw-r--r--graphics/epix/Makefile3
-rw-r--r--japanese/tex-ptex/Makefile107
-rw-r--r--japanese/tex-ptex/distinfo10
-rw-r--r--japanese/tex-ptex/files/patch-Makefile.in1366
-rw-r--r--japanese/tex-ptex/files/patch-configure347
-rw-r--r--math/cadabra2/Makefile4
-rw-r--r--math/coq/Makefile4
-rw-r--r--math/gnuplot-tex-extras/Makefile3
-rw-r--r--net-mgmt/netmagis-www/Makefile4
-rw-r--r--print/dvisvg/Makefile4
-rw-r--r--print/latex-beamer/Makefile16
-rw-r--r--print/latex-biber/Makefile27
-rw-r--r--print/latex-biber/distinfo6
-rw-r--r--print/lilypond/Makefile4
-rw-r--r--print/mftrace/Makefile4
-rw-r--r--print/tex-basic-engines/Makefile2
-rw-r--r--print/tex-basic-engines/distinfo6
-rw-r--r--print/tex-basic-engines/files/patch-Makefile.in1328
-rw-r--r--print/tex-basic-engines/files/patch-man-Makefile.in33
-rw-r--r--print/tex-dvipdfmx/Makefile27
-rw-r--r--print/tex-dvipdfmx/distinfo10
-rw-r--r--print/tex-dvipsk/Makefile3
-rw-r--r--print/tex-dvipsk/distinfo10
-rw-r--r--print/tex-formats/Makefile3
-rw-r--r--print/tex-jadetex/Makefile9
-rw-r--r--print/tex-jadetex/distinfo6
-rw-r--r--print/tex-luatex/Makefile97
-rw-r--r--print/tex-luatex/distinfo10
-rw-r--r--print/tex-luatex/files/patch-Makefile.in1382
-rw-r--r--print/tex-luatex/files/patch-configure320
-rw-r--r--print/tex-ptexenc/Makefile21
-rw-r--r--print/tex-ptexenc/distinfo6
-rw-r--r--print/tex-ptexenc/files/patch-Makefile.in4
-rw-r--r--print/tex-ptexenc/files/patch-configure36
-rw-r--r--print/tex-ptexenc/files/patch-ptexenc.c13
-rw-r--r--print/tex-ptexenc/pkg-plist2
-rw-r--r--print/tex-xdvik/Makefile4
-rw-r--r--print/tex-xetex/Makefile65
-rw-r--r--print/tex-xetex/distinfo10
-rw-r--r--print/tex-xetex/files/patch-Makefile.in1357
-rw-r--r--print/tex-xetex/files/patch-configure56
-rw-r--r--print/tex-xmltex/Makefile8
-rw-r--r--print/tex-xmltex/distinfo6
-rw-r--r--print/texlive-base/Makefile3
-rw-r--r--print/texlive-base/distinfo6
-rw-r--r--print/texlive-base/files/patch-Makefile.in4
-rw-r--r--print/texlive-base/files/patch-configure8
-rw-r--r--print/texlive-base/files/patch-texk-bibtex-x-Makefile.in31
-rw-r--r--print/texlive-base/files/patch-texk_bibtex-x_Makefile.in131
-rw-r--r--print/texlive-base/files/patch-texk_chktex_Makefile.in (renamed from print/texlive-base/files/patch-texk-chktex-Makefile.in)8
-rw-r--r--print/texlive-base/files/patch-texk_cjkutils_Makefile.in (renamed from print/texlive-base/files/patch-texk-cjkutils-Makefile.in)8
-rw-r--r--print/texlive-base/files/patch-texk_dvipng_configure4
-rw-r--r--print/texlive-base/files/patch-texk_dvisvgm_configure4
-rw-r--r--print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp4
-rw-r--r--print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp4
-rw-r--r--print/texlive-base/files/patch-texk_gsftopk_Makefile.in (renamed from print/texlive-base/files/patch-texk-gsftopk-Makefile.in)8
-rw-r--r--print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf (renamed from print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf)63
-rw-r--r--print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in (renamed from print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in)8
-rw-r--r--print/texlive-base/pkg-plist40
-rw-r--r--print/texlive-docs/Makefile41
-rw-r--r--print/texlive-docs/distinfo6
-rw-r--r--print/texlive-texmf-source/Makefile16
-rw-r--r--print/texlive-texmf-source/distinfo6
-rw-r--r--print/texlive-texmf/Makefile383
-rw-r--r--print/texlive-texmf/distinfo6
-rw-r--r--print/texlive-tlmgr/Makefile15
-rw-r--r--print/texlive-tlmgr/distinfo14
-rw-r--r--print/texlive-tlmgr/files/patch-texlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm33
-rw-r--r--print/texlive-tlmgr/files/patch-texlive-20210325-source_texk_texlive_linked__scripts_texlive_tlmgr.pl87
-rw-r--r--print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl1294
-rw-r--r--print/texlive-tlmgr/pkg-plist2
-rw-r--r--textproc/foiltex/Makefile21
-rw-r--r--textproc/foiltex/distinfo1
93 files changed, 10584 insertions, 1341 deletions
diff --git a/Mk/Uses/tex.mk b/Mk/Uses/tex.mk
index ec6c56e1d6e1..015f5fffa478 100644
--- 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 \
diff --git a/arabic/arabtex/Makefile b/arabic/arabtex/Makefile
index 04ee20ab0336..20451ed47ce6 100644
--- 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
diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
index 06dd5d76d70f..6575ad4cdc37 100644
--- 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 && \
diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo
index f55c23e66138..01e363d09aaf 100644
--- 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
diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in
index 4b6bd7e58501..ccaf8dc65e6a 100644
--- 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:
diff --git a/devel/tex-kpathsea/files/patch-texmf.cnf b/devel/tex-kpathsea/files/patch-texmf.cnf
index 479f30bfd775..d66797fc00a9 100644
--- 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
diff --git a/devel/tex-kpathsea/pkg-plist b/devel/tex-kpathsea/pkg-plist
index 29d754fbf112..5a0ed243b302 100644
--- 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
diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile
index b08794aa305e..d585124d12a4 100644
--- 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-
diff --git a/devel/tex-libtexlua/distinfo b/devel/tex-libtexlua/distinfo
index ad76eb98848f..3e66aa4907af 100644
--- 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
diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
index d751bae68cc6..755a50d673a9 100644
--- 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-
diff --git a/devel/tex-libtexluajit/distinfo b/devel/tex-libtexluajit/distinfo
index 9f03f2a837a5..959e16ad385d 100644
--- 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
diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile
index b787334520cc..20156853274c 100644
--- 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
diff --git a/devel/tex-synctex/distinfo b/devel/tex-synctex/distinfo
index 9a206f6bfd5e..a00c4263f5e7 100644
--- 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
diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in
index e4b70dc02869..6bf9346c3b06 100644
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
@@ -1,26 +1,111 @@
---- Makefile.in.orig 2022-01-30 12:41:33 UTC
+--- Makefile.in.orig 2023-04-03 23:25:20 UTC
+++ Makefile.in
-@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
--bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
-+bin_PROGRAMS = $(am__EXEEXT_5) \
- $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
- $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
-@@ -129,7 +127,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__
- $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
- $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
- $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32)
++bin_PROGRAMS = $(am__EXEEXT_4) \
+ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+@@ -113,7 +111,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__
+ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
-noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+noinst_PROGRAMS = \
- $(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \
- $(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38) \
- $(am__EXEEXT_39) $(am__EXEEXT_40) $(am__EXEEXT_41) \
-@@ -3108,7 +3106,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
+ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+ $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
+@@ -488,7 +486,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1232,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1697,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2393,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) \
+@@ -2403,7 +2401,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) \
+@@ -2413,14 +2411,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2428,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2436,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -3105,14 +3103,14 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -29,3 +114,1223 @@
proglib = lib/lib.a
#EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3128,7 +3126,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
+ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
++nodist_man_MANS =
+ TEST_EXTENSIONS = .pl .test
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3634,8 +3632,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app
+ bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+ $(am__append_24) $(am__append_33) $(am__append_41) \
+ $(am__append_49) $(am__append_54) $(am__append_67) \
+- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+ $(am__append_78) $(am__append_92) $(am__append_97) \
+ $(am__append_102) $(am__append_107)
+ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+@@ -3711,19 +3707,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3728,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3736,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3769,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3816,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3844,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3876,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3908,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4170,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4181,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4190,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4230,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4238,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4250,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4307,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4601,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4754,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4888,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4910,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4928,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4936,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5043,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5176,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5293,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5642,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5930,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5945,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5968,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6021,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6073,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6143,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6202,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6609,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6626,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6655,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6708,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7054,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7071,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7084,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7105,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7115,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7129,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7137,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7658,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7672,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7704,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7775,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7786,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7801,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7842,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7900,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7911,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7926,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8020,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8034,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8048,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8078,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8104,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8112,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8120,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8128,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8167,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8206,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8274,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8340,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19271,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)
+@@ -19285,7 +19281,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 \
+@@ -21636,7 +21632,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21797,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21844,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22095,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22162,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/devel/tex-synctex/files/patch-man-Makefile.in b/devel/tex-synctex/files/patch-man-Makefile.in
index 97effd89845e..d5ba9febe698 100644
--- 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
diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile
index 1b3d068d0b0e..811d535be414 100644
--- 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
diff --git a/devel/tex-web2c/distinfo b/devel/tex-web2c/distinfo
index 64d7fc608142..85bbbc168250 100644
--- 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
diff --git a/devel/tex-web2c/files/patch-Makefile.in b/devel/tex-web2c/files/patch-Makefile.in
index 59e072dd3eaf..66997ea418d5 100644
--- a/devel/tex-web2c/files/patch-Makefile.in
+++ b/devel/tex-web2c/files/patch-Makefile.in
@@ -1,15 +1,1323 @@
---- Makefile.in.orig 2022-01-30 13:19:25 UTC
+--- Makefile.in.orig 2023-04-06 19:09:14 UTC
+++ Makefile.in
-@@ -3125,10 +3125,10 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l
- libluajittexspecific.a libluahbtexspecific.a \
- libluajithbtexspecific.a libluaffi.a libluaharfbuzz.a \
- libluajitharfbuzz.a libxetex.a libsynctex.a libmd5.a
+@@ -96,7 +96,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \
+ mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
+ pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \
+- uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \
++ uptex$(EXEEXT) euptex$(EXEEXT) pdftex$(EXEEXT) \
+ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -109,7 +109,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__
+ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+ $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+ $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+- $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
++ $(am__EXEEXT_21) $(am__EXEEXT_22) \
+ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
+@@ -488,7 +488,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1234,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1699,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2395,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) \
+@@ -2403,7 +2403,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) \
+@@ -2413,14 +2413,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2430,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2438,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -3112,7 +3112,7 @@ proglib = lib/lib.a
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3124,11 +3124,11 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l
+ libluahbtexspecific.a libluajithbtexspecific.a libluaffi.a \
+ libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
+ libmd5.a
-EXTRA_LTLIBRARIES = libsynctex.la
+EXTRA_LTLIBRARIES =
- lib_LIBRARIES = $(am__append_122)
- lib_LTLIBRARIES = $(am__append_121)
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
+dist_man_MANS =
- nodist_man_MANS =
++nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
- EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3711,19 +3711,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3732,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3740,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3773,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3820,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3848,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3880,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3912,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4174,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4185,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4194,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4234,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4242,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4254,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4311,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4605,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4758,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4892,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4914,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4932,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4940,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5047,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5180,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5297,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5646,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5934,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5949,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5972,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6025,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6077,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6147,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6206,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6613,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6630,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6659,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6712,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7058,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7075,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7088,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7109,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7119,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7133,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7141,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7662,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7676,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7708,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7779,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7790,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7805,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7846,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7904,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7915,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7930,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8024,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8038,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8052,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8082,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8108,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8116,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8124,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8132,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8171,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8210,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8278,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8344,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19275,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)
+@@ -19285,7 +19285,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 \
+@@ -21636,7 +21636,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21801,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21848,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22099,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22166,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/devel/tex-web2c/files/patch-man-Makefile.in b/devel/tex-web2c/files/patch-man-Makefile.in
index 590c3d0acb23..4d18d6082340 100644
--- 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
diff --git a/devel/tex-web2c/pkg-plist b/devel/tex-web2c/pkg-plist
index 95c10937818f..a532aef430a4 100644
--- 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
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index d9d3d54a4898..eb31408be37c 100644
--- 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}
diff --git a/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile
index 29b4e97f25e8..ea7f061b9e04 100644
--- 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/mkcidvf.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/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/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 | \
diff --git a/japanese/tex-ptex/distinfo b/japanese/tex-ptex/distinfo
index 651ecfc23e48..6f4e6f089cb6 100644
--- 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
diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in
index 3e3bf3783ae9..df80777cdb98 100644
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
@@ -1,15 +1,112 @@
---- Makefile.in.orig 2021-02-17 11:40:54 UTC
+--- Makefile.in.orig 2023-03-08 17:05:16 UTC
+++ Makefile.in
-@@ -117,6 +117,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -101,18 +101,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
-+inst_bin_PROGRAMS = ptex$(EXEEXT) $(am__EXEEXT_2) \
-+ eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
-@@ -3108,7 +3110,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
+- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+- $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+- $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+- $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+- $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+- $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+- $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
+- $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+- $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+- $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
++bin_PROGRAMS = $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) euptex$(EXEEXT) \
++ ptex$(EXEEXT)
+ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
+ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+@@ -488,7 +478,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1224,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1689,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2385,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) \
+@@ -2403,7 +2393,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) \
+@@ -2413,14 +2403,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2420,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2428,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -3105,14 +3095,14 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -18,40 +115,1149 @@
proglib = lib/lib.a
#EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
-@@ -3603,10 +3605,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3128,7 +3118,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
+ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
++nodist_man_MANS =
+ TEST_EXTENSIONS = .pl .test
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3631,13 +3621,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
$(am__append_35) $(am__append_43) $(am__append_59) \
- $(am__append_64) $(am__append_69) $(am__append_74) \
- $(am__append_79)
+ $(am__append_63) $(am__append_69) $(am__append_74) \
+ $(am__append_80)
-bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
- $(am__append_24) $(am__append_33) $(am__append_41) \
-- $(am__append_49) $(am__append_54) $(am__append_88) \
-- $(am__append_93) $(am__append_98) $(am__append_103)
+- $(am__append_49) $(am__append_54) $(am__append_67) \
+- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+- $(am__append_78) $(am__append_92) $(am__append_97) \
+- $(am__append_102) $(am__append_107)
+bin_links =
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_86) $(am__append_91) $(am__append_96) \
-@@ -5555,9 +5554,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
- cd $(top_builddir) && $(SHELL) ./config.status $@
- synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
--install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: $(inst_bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -5587,7 +5586,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
-@@ -19270,7 +19269,7 @@ install-data: install-data-recursive
+ $(am__append_90) $(am__append_95) $(am__append_100) \
+@@ -3711,19 +3695,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3716,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3724,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3757,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3804,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3832,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3864,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3896,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4158,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4169,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4178,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4218,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4226,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4238,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4295,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4589,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4742,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4876,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4898,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4916,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4924,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5031,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5164,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5281,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5630,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5918,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5933,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5956,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6009,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6061,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6131,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6190,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6597,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6614,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6643,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6696,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7042,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7059,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7072,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7093,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7103,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7117,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7125,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7646,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7660,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7692,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7763,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7774,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7789,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7830,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7888,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7899,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7914,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8008,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8022,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8036,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8066,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8092,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8100,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8108,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8116,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8155,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8194,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8262,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8328,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19259,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)
+@@ -19285,7 +19269,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 \
+@@ -19546,7 +19530,7 @@ install-am: all-am
uninstall: uninstall-recursive
install-am: all-am
@@ -60,3 +1266,87 @@
installcheck: installcheck-recursive
install-strip:
+@@ -21636,7 +21620,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21785,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21832,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22083,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22150,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/japanese/tex-ptex/files/patch-configure b/japanese/tex-ptex/files/patch-configure
index 54e5e0b43ec3..5ff153617eff 100644
--- 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
+-
+-
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 017bd3d6852c..8bd117017000 100644
--- 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
diff --git a/math/coq/Makefile b/math/coq/Makefile
index e773ee831201..a2c62b27f785 100644
--- 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
diff --git a/math/gnuplot-tex-extras/Makefile b/math/gnuplot-tex-extras/Makefile
index 75221d69d81b..17f3aa868f1c 100644
--- 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}/,}
diff --git a/net-mgmt/netmagis-www/Makefile b/net-mgmt/netmagis-www/Makefile
index c1e5966d3d83..ce4506679d3d 100644
--- 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
diff --git a/print/dvisvg/Makefile b/print/dvisvg/Makefile
index 9b68ad1b5de0..45ed62b51a87 100644
--- 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
diff --git a/print/latex-beamer/Makefile b/print/latex-beamer/Makefile
index 474ae44168de..36162dca458b 100644
--- 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>
diff --git a/print/latex-biber/Makefile b/print/latex-biber/Makefile
index f8ef46887571..40b70b1e150b 100644
--- 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}
diff --git a/print/latex-biber/distinfo b/print/latex-biber/distinfo
index ea842619b257..614369a236ca 100644
--- 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
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 3a89d76d7a02..2b6b88d086b6 100644
--- 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
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index a5ade679df62..af69fc825068 100644
--- 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
diff --git a/print/tex-basic-engines/Makefile b/print/tex-basic-engines/Makefile
index ef57e961bceb..6de48b09a038 100644
--- 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 \
diff --git a/print/tex-basic-engines/distinfo b/print/tex-basic-engines/distinfo
index e92a19258472..6847675b4134 100644
--- 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
diff --git a/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in
index 7a7c4305243a..07afcca8731c 100644
--- a/print/tex-basic-engines/files/patch-Makefile.in
+++ b/print/tex-basic-engines/files/patch-Makefile.in
@@ -1,17 +1,102 @@
---- Makefile.in.orig 2021-02-17 11:40:54 UTC
+--- Makefile.in.orig 2023-03-08 17:05:16 UTC
+++ Makefile.in
-@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
--bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
-+bin_PROGRAMS = $(am__EXEEXT_5) \
- $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
- $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
-@@ -3108,7 +3106,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
++bin_PROGRAMS = $(am__EXEEXT_4) \
+ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+@@ -488,7 +486,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1232,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1697,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2393,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) \
+@@ -2403,7 +2401,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) \
+@@ -2413,14 +2411,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2428,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2436,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -3105,14 +3103,14 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -20,12 +105,1225 @@
proglib = lib/lib.a
#EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
-@@ -3128,7 +3126,7 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a l
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3127,8 +3125,8 @@ lib_LTLIBRARIES = $(am__append_125)
EXTRA_LTLIBRARIES = libsynctex.la
- lib_LIBRARIES = $(am__append_122)
- lib_LTLIBRARIES = $(am__append_121)
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
+dist_man_MANS =
- nodist_man_MANS =
++nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
- EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3634,8 +3632,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app
+ bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+ $(am__append_24) $(am__append_33) $(am__append_41) \
+ $(am__append_49) $(am__append_54) $(am__append_67) \
+- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+ $(am__append_78) $(am__append_92) $(am__append_97) \
+ $(am__append_102) $(am__append_107)
+ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+@@ -3711,19 +3707,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3728,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3736,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3769,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3816,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3844,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3876,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3908,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4170,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4181,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4190,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4230,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4238,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4250,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4307,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4601,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4754,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4888,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4910,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4928,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4936,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5043,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5176,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5293,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5642,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5930,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5945,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5968,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6021,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6073,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6143,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6202,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6609,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6626,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6655,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6708,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7054,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7071,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7084,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7105,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7115,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7129,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7137,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7658,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7672,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7704,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7775,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7786,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7801,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7842,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7900,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7911,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7926,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8020,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8034,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8048,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8078,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8104,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8112,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8120,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8128,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8167,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8206,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8274,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8340,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19271,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)
+@@ -19285,7 +19281,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 \
+@@ -21636,7 +21632,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21797,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21844,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22095,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22162,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/print/tex-basic-engines/files/patch-man-Makefile.in b/print/tex-basic-engines/files/patch-man-Makefile.in
index 1ce7f21be60a..f54bd8c5e720 100644
--- 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
diff --git a/print/tex-dvipdfmx/Makefile b/print/tex-dvipdfmx/Makefile
index 28e62b1be43f..fa86a12ee7c5 100644
--- 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} \
diff --git a/print/tex-dvipdfmx/distinfo b/print/tex-dvipdfmx/distinfo
index bd570f1eeba0..77ebcd18ba9f 100644
--- 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
diff --git a/print/tex-dvipsk/Makefile b/print/tex-dvipsk/Makefile
index 87fb526889fc..216f9fb7c4d7 100644
--- 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/ \
diff --git a/print/tex-dvipsk/distinfo b/print/tex-dvipsk/distinfo
index 361da0cb0f7d..d2f5a56f927b 100644
--- 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
diff --git a/print/tex-formats/Makefile b/print/tex-formats/Makefile
index 3cca71cec4d9..4d3bada80a04 100644
--- 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>
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index fd92fa5ec159..eb38460ec46c 100644
--- 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:
diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo
index 14feb87de987..3b94c01ff22d 100644
--- 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
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index e072e78b3e7d..dc53fa866e6e 100644
--- 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:
diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo
index 7890695d9868..8e206b821b6d 100644
--- 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
diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in
index ad2ef6f7ab49..d9c9b5de1bd2 100644
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@@ -1,14 +1,111 @@
---- Makefile.in.orig 2021-02-17 11:40:54 UTC
+--- Makefile.in.orig 2023-04-07 15:22:30 UTC
+++ Makefile.in
-@@ -117,6 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
-+inst_bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
-@@ -2966,14 +2967,16 @@ LUA52_DEPEND = @LUA52_DEPEND@
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
+- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+- $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+- $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+- $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+- $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+- $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+- $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
+- $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+- $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+- $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
++bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
+ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
+ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+@@ -488,7 +477,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1223,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1688,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2384,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) \
+@@ -2403,7 +2392,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) \
+@@ -2413,14 +2402,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2419,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2427,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -2959,14 +2948,16 @@ LUA53_DEFINES = @LUA53_DEFINES@
LUA52_INCLUDES = @LUA52_INCLUDES@
LUA52_LIBS = @LUA52_LIBS@
LUA53_DEFINES = @LUA53_DEFINES@
@@ -17,31 +114,31 @@
-LUA53_LIBS = @LUA53_LIBS@
+LUA53_DEPEND =
+LUA53_INCLUDES = -I${LOCALBASE}/include/texlua53 \
-+ -I@top_srcdir@/../../libs/lua53/lua53-src/src
++ -I@top_srcdir@/../../libs/lua53/lua53-src/src
+LUA53_LIBS = -L${LOCALBASE}/lib -ltexlua53
LUAJIT_DEFINES = @LUAJIT_DEFINES@
-LUAJIT_DEPEND = @LUAJIT_DEPEND@
-LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_DEPEND =
+LUAJIT_INCLUDES = -I${LOCALBASE}/include/texluajit \
-+ -I@top_srcdir@/../../libs/luajit/LuaJIT-src/src
++ -I@top_srcdir@/../../libs/luajit/LuaJIT-src/src
LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
-LUAJIT_LIBS = @LUAJIT_LIBS@
+LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
-@@ -3004,7 +3007,8 @@ PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
- PIXMAN_LIBS = @PIXMAN_LIBS@
- PKG_CONFIG = @PKG_CONFIG@
+@@ -3000,7 +2991,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@
+ POTRACE_INCLUDES = @POTRACE_INCLUDES@
+ POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
-PPLIB_INCLUDES = @PPLIB_INCLUDES@
+PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
-+ -I@top_srcdir@/../../libs/pplib/pplib-src/src
++ -I@top_srcdir@/../../libs/pplib/pplib-src/src
PPLIB_LIBS = @PPLIB_LIBS@
PTEXENC_DEPEND = @PTEXENC_DEPEND@
PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
-@@ -3108,7 +3112,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+@@ -3105,14 +3097,14 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -50,40 +147,1149 @@
proglib = lib/lib.a
#EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
-@@ -3603,10 +3607,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3128,7 +3120,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
+ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
++nodist_man_MANS =
+ TEST_EXTENSIONS = .pl .test
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3631,13 +3623,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
$(am__append_35) $(am__append_43) $(am__append_59) \
- $(am__append_64) $(am__append_69) $(am__append_74) \
- $(am__append_79)
+ $(am__append_63) $(am__append_69) $(am__append_74) \
+ $(am__append_80)
-bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
- $(am__append_24) $(am__append_33) $(am__append_41) \
-- $(am__append_49) $(am__append_54) $(am__append_88) \
-- $(am__append_93) $(am__append_98) $(am__append_103)
-+bin_links = $(am__append_75) $(am__append_80)
+- $(am__append_49) $(am__append_54) $(am__append_67) \
+- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+- $(am__append_78) $(am__append_92) $(am__append_97) \
+- $(am__append_102) $(am__append_107)
++bin_links = $(am__append_75) $(am__append_81)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_86) $(am__append_91) $(am__append_96) \
-@@ -5555,9 +5556,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
- cd $(top_builddir) && $(SHELL) ./config.status $@
- synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
--install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: $(inst_bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -5587,7 +5588,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
-@@ -19270,7 +19271,7 @@ install-data: install-data-recursive
+ $(am__append_90) $(am__append_95) $(am__append_100) \
+@@ -3711,19 +3697,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3718,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3726,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3759,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3806,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3834,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3866,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3898,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4160,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4171,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4180,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4220,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4228,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4240,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4297,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4591,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4744,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4878,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4900,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4918,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4926,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5033,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5166,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5283,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5632,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5920,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5935,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5958,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6011,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6063,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6133,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6192,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6599,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6616,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6645,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6698,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7044,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7061,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7074,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7095,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7105,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7119,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7127,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7648,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7662,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7694,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7765,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7776,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7791,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7832,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7890,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7901,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7916,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8010,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8024,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8038,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8068,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8094,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8102,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8110,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8118,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8157,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8196,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8264,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8330,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19261,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)
+@@ -19285,7 +19271,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 \
+@@ -19546,7 +19532,7 @@ install-am: all-am
uninstall: uninstall-recursive
install-am: all-am
@@ -92,7 +1298,7 @@
installcheck: installcheck-recursive
install-strip:
-@@ -21003,9 +21004,6 @@ $(proglib): ${srcdir}/lib/*.c
+@@ -21302,9 +21288,6 @@ $(proglib): $(proglib_sources)
@KPATHSEA_RULE@
@PTEXENC_RULE@
@ZLIB_RULE@
@@ -102,3 +1308,87 @@
@LIBPNG_RULE@
@FREETYPE2_RULE@
@PIXMAN_RULE@
+@@ -21636,7 +21619,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21784,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21831,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22082,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22149,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/print/tex-luatex/files/patch-configure b/print/tex-luatex/files/patch-configure
index e9c37aa92393..619e3e07e38e 100644
--- 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
+-
+-
diff --git a/print/tex-ptexenc/Makefile b/print/tex-ptexenc/Makefile
index 17dbb100e72f..794cc64cf839 100644
--- 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>
diff --git a/print/tex-ptexenc/distinfo b/print/tex-ptexenc/distinfo
index 655b1550d6b5..7529ce9d886e 100644
--- 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
diff --git a/print/tex-ptexenc/files/patch-Makefile.in b/print/tex-ptexenc/files/patch-Makefile.in
index b215f34b9687..3c7682343701 100644
--- 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 \
diff --git a/print/tex-ptexenc/files/patch-configure b/print/tex-ptexenc/files/patch-configure
index d3e5d57b9161..c9be2825b406 100644
--- 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
+-
+-
diff --git a/print/tex-ptexenc/files/patch-ptexenc.c b/print/tex-ptexenc/files/patch-ptexenc.c
index e90f45a594c2..72b2be8560b5 100644
--- 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) {
diff --git a/print/tex-ptexenc/pkg-plist b/print/tex-ptexenc/pkg-plist
index 688831369a9e..a3ac9c367d35 100644
--- 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
diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index a8207c05464d..b891cd07765a 100644
--- 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}
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 65125e6ff5e3..8ec42677470b 100644
--- 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 \
diff --git a/print/tex-xetex/distinfo b/print/tex-xetex/distinfo
index 9fc754586b31..2efa46e0a39a 100644
--- 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
diff --git a/print/tex-xetex/files/patch-Makefile.in b/print/tex-xetex/files/patch-Makefile.in
index 7a591521bdf2..274935e147ac 100644
--- a/print/tex-xetex/files/patch-Makefile.in
+++ b/print/tex-xetex/files/patch-Makefile.in
@@ -1,16 +1,113 @@
---- Makefile.in.orig 2021-02-17 11:40:54 UTC
+--- Makefile.in.orig 2023-04-08 00:33:55 UTC
+++ Makefile.in
-@@ -117,6 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
-+inst_bin_PROGRAMS = xetex$(EXEEXT)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
-@@ -3004,7 +3005,8 @@ PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
- PIXMAN_LIBS = @PIXMAN_LIBS@
- PKG_CONFIG = @PKG_CONFIG@
+-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
+- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+- $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+- $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+- $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+- $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+- $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+- $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
+- $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+- $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+- $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
++bin_PROGRAMS = xetex$(EXEEXT)
+ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
+ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+@@ -488,7 +477,7 @@ am__v_AR_0 = @echo " AR " $@;
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+-am__v_AR_1 =
++am__v_AR_1 =
+ libff_a_AR = $(AR) $(ARFLAGS)
+ libff_a_LIBADD =
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -1234,7 +1223,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 =
+ libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -1699,11 +1688,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@ -I$(top_builddir)/w2c
+ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -2395,7 +2384,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) \
+@@ -2403,7 +2392,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) \
+@@ -2413,14 +2402,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 =
+ OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+@@ -2430,7 +2419,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+ AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+ am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+-am__v_OBJCXX_1 =
++am__v_OBJCXX_1 =
+ OBJCXXLD = $(OBJCXX)
+ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+@@ -2438,7 +2427,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+ am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+-am__v_OBJCXXLD_1 =
++am__v_OBJCXXLD_1 =
+ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \
+ $(nodist_libluahbtexspecific_a_SOURCES) \
+@@ -3000,7 +2989,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@
+ POTRACE_INCLUDES = @POTRACE_INCLUDES@
+ POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
-PPLIB_INCLUDES = @PPLIB_INCLUDES@
+PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
@@ -18,7 +115,7 @@
PPLIB_LIBS = @PPLIB_LIBS@
PTEXENC_DEPEND = @PTEXENC_DEPEND@
PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
-@@ -3108,7 +3110,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+@@ -3105,14 +3095,14 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -27,28 +124,1134 @@
proglib = lib/lib.a
#EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
-@@ -5555,9 +5557,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
- cd $(top_builddir) && $(SHELL) ./config.status $@
- synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
--install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: $(inst_bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -5587,7 +5589,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ @list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
-@@ -19270,7 +19272,7 @@ install-data: install-data-recursive
+
+ #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a
+
+-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a
+ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \
+ libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \
+@@ -3128,7 +3118,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m
+ lib_LIBRARIES = $(am__append_126)
+ lib_LTLIBRARIES = $(am__append_125)
+ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+-nodist_man_MANS =
++nodist_man_MANS =
+ TEST_EXTENSIONS = .pl .test
+ #
+ # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
+@@ -3711,19 +3701,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si
+ tangle_silent = $(tangle_silent_@AM_V@)
+ tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@)
+ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ #
+-tangle_silent_1 =
++tangle_silent_1 =
+ #
+ ctangle = $(buildenv) $(CTANGLE)
+ ctangle_silent = $(ctangle_silent_@AM_V@)
+ ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@)
+ ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ #
+-ctangle_silent_1 =
++ctangle_silent_1 =
+ #
+ tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE)
+ tie_silent = $(tie_silent_@AM_V@)
+ tie_silent_ = $(tie_silent_@AM_DEFAULT_V@)
+ tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+-tie_silent_1 =
++tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+
+@@ -3732,7 +3722,7 @@ DIFF = diff
+
+ # For trip, trap, and other tests
+ DIFF = diff
+-DIFFFLAGS =
++DIFFFLAGS =
+ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+ DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+ DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+@@ -3740,29 +3730,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor
+
+ # To run, e.g., just the original trip test, in the build directory:
+ # make -C $ww TRIPTRAP=trip.diffs triptrap
+-# where $ww is the web2c build directory.
+-#
++# where $ww is the web2c build directory.
++#
+ # This will run the triptrap-sh script
+ # which then runs make TEST=triptest.test check-am,
+ # which then runs the (srcdir file) triptest.test script;
+ # its output will be in (builddir file) trip.diffs,
+-# and triptest.out if the test failed,
++# and triptest.out if the test failed,
+ # plus various created files in the tripdir/ subdirectory.
+ # The triptest.diffs file will have the actual abs_srcdir value replaced
+ # with the constant string "SRCDIR" to minimize differences, and "../"
+ # replaced with "./" to match the canonical output. Confusing. For the
+ # real output, see triptest.log.
+-#
++#
+ # To build only tex, make -C $ww tex (i.e., in builddir) should do it.
+ # Unfortunately the check-am target depends on all-am, so all engines
+ # are built before any tests are run. If this is a problem, just have to
+ # edit the generated Makefile in builddir to remove the dependency.
+-#
++#
+ # Other per-engine invocations (see triptrap-sh for complete list):
+ # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap
+-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
+-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
+-#
++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap
++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap
++#
+ triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
+
+ # The environment for making dumps.
+@@ -3773,7 +3763,7 @@ cp_silent_0 = @echo " COPY " $@;
+ cp_silent = $(cp_silent_@AM_V@)
+ cp_silent_ = $(cp_silent_@AM_DEFAULT_V@)
+ cp_silent_0 = @echo " COPY " $@;
+-cp_silent_1 =
++cp_silent_1 =
+ nodist_tangle_SOURCES = tangle.c tangle.h
+ nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
+ tangleboot_DEPENDENCIES = $(default_dependencies)
+@@ -3820,7 +3810,7 @@ nodist_initex_SOURCES = callexe.c
+ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
+ initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
+ nodist_initex_SOURCES = callexe.c
+-initex_LDADD =
++initex_LDADD =
+ tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
+
+ # With --enable-ipc, TeX may need to link with -lsocket.
+@@ -3848,7 +3838,7 @@ nodist_call_mf_SOURCES = callexe.c
+ tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+ call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\"
+ nodist_call_mf_SOURCES = callexe.c
+-call_mf_LDADD =
++call_mf_LDADD =
+ dist_mf_SOURCES = mfextra.c
+ mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
+@@ -3880,7 +3870,7 @@ nodist_call_mflua_SOURCES = callexe.c
+ mf_tests = mftraptest.test
+ call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+ nodist_call_mflua_SOURCES = callexe.c
+-call_mflua_LDADD =
++call_mflua_LDADD =
+ dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+ mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+ mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
+@@ -3912,7 +3902,7 @@ libmfluaotfcc_a_CPPFLAGS = \
+ -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \
+ -I$(top_srcdir)/mfluadir/otfcc/include \
+ -I$(top_srcdir)/mfluadir/otfcc/include/dep \
+- -I$(top_srcdir)/mfluadir/otfcc/lib
++ -I$(top_srcdir)/mfluadir/otfcc/lib
+
+ libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS)
+
+@@ -4174,7 +4164,7 @@ libmfluaotfcc_a_SOURCES = \
+ mfluadir/otfcc/lib/table/VDMX.h \
+ mfluadir/otfcc/lib/table/SVG.c \
+ mfluadir/otfcc/lib/table/head.h \
+- mfluadir/otfcc/lib/table/TSI5.c
++ mfluadir/otfcc/lib/table/TSI5.c
+
+ libmfluapotrace_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/potrace \
+@@ -4185,7 +4175,7 @@ libmfluapotrace_a_SOURCES = \
+ #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
+ libmfluapotrace_a_SOURCES = \
+ mfluadir/potrace/luafunc.c \
+- mfluadir/potrace/luafunc.h
++ mfluadir/potrace/luafunc.h
+
+ libmflualpeg_a_CPPFLAGS = \
+ -I$(top_srcdir)/mfluadir/luapeg \
+@@ -4194,11 +4184,11 @@ libmflualpeg_a_SOURCES = \
+ libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmflualpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+ nodist_call_mfluajit_SOURCES = callexe.c
+-call_mfluajit_LDADD =
++call_mfluajit_LDADD =
+ dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+ mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+ mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
+@@ -4234,7 +4224,7 @@ libmfluajitlpeg_a_SOURCES = \
+ libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS)
+ libmfluajitlpeg_a_SOURCES = \
+ mfluadir/luapeg/lpeg.c \
+- mfluadir/luapeg/lpeg.h
++ mfluadir/luapeg/lpeg.h
+
+ mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
+ mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+@@ -4242,7 +4232,7 @@ nodist_call_mpost_SOURCES = callexe.c
+
+ call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+ nodist_call_mpost_SOURCES = callexe.c
+-call_mpost_LDADD =
++call_mpost_LDADD =
+
+ # Creating one file: just one rule
+ mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
+@@ -4254,10 +4244,10 @@ nodist_call_pmpost_SOURCES = callexe.c
+ mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test
+ call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+ nodist_call_pmpost_SOURCES = callexe.c
+-call_pmpost_LDADD =
++call_pmpost_LDADD =
+ call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+ nodist_call_upmpost_SOURCES = callexe.c
+-call_upmpost_LDADD =
++call_upmpost_LDADD =
+ pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+@@ -4311,7 +4301,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h)
+
+ nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h)
+ nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h)
+@@ -4605,7 +4595,7 @@ hiformat_c_h_l_y = \
+ hiskip.c \
+ histretch.c
+
+-hitex_c = hitex.c
++hitex_c = hitex.c
+
+ # hitex
+ nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)
+@@ -4758,11 +4748,11 @@ libluasocket_sources = \
+ luatexdir/luasocket/src/timeout.h \
+ luatexdir/luasocket/src/udp.c \
+ luatexdir/luasocket/src/udp.h \
+- luatexdir/luasocket/src/usocket.h
++ luatexdir/luasocket/src/usocket.h
+
+-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
+-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
+-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a
++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
+ libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
+ #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
+ libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+@@ -4892,8 +4882,8 @@ LUA_DEPEND = $(LUA53_DEPEND)
+ LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES)
+ LUA_LIBS = $(LUA53_LIBS)
+ LUA_DEPEND = $(LUA53_DEPEND)
+-libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
++libluatex_a_DEPENDENCIES = libff.a libluamisc.a
++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
+ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \
+ -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \
+@@ -4914,7 +4904,7 @@ dist_libluatex_a_SOURCES = \
+ dist_libluatex_a_SOURCES = \
+ luatexdir/lua/lstrlibext.c \
+ luatexdir/lua/helpers.c \
+- luatexdir/lua/texluac.c
++ luatexdir/lua/texluac.c
+
+ nodist_libluatex_a_SOURCES = \
+ $(dist_libluatex_sources) \
+@@ -4932,7 +4922,7 @@ nodist_libluatexspecific_a_SOURCES = \
+
+ #dist_libluatexspecific_a_SOURCES =
+ nodist_libluatexspecific_a_SOURCES = \
+- $(dist_libluatexspecific_sources)
++ $(dist_libluatexspecific_sources)
+
+ #dist_libluajittexspecific_a_SOURCES =
+ nodist_libluajittexspecific_a_SOURCES = \
+@@ -4940,46 +4930,46 @@ nodist_libluahbtexspecific_a_SOURCES = \
+
+ #dist_libluahbtexspecific_a_SOURCES =
+ nodist_libluahbtexspecific_a_SOURCES = \
+- $(dist_libluahbtexspecific_sources)
++ $(dist_libluahbtexspecific_sources)
+
+-#dist_libluajithbtexspecific_a_SOURCES =
++#dist_libluajithbtexspecific_a_SOURCES =
+ nodist_libluajithbtexspecific_a_SOURCES = \
+- $(dist_libluajithbtexspecific_sources)
++ $(dist_libluajithbtexspecific_sources)
+
+ dist_libluatexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+ dist_libluajittexspecific_sources = \
+ luatexdir/utils/utils.c \
+ luatexdir/lua/luatex-api.h \
+ luatexdir/lua/luastuff.c \
+ luatexdir/lua/luainit.c \
+- luatexdir/tex/printing.c
++ luatexdir/tex/printing.c
+
+
+-# luatexdir/utils/utils-hb.c
++# luatexdir/utils/utils-hb.c
+ dist_libluahbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+
+-#luatexdir/utils/utils-hb.c
++#luatexdir/utils/utils-hb.c
+ dist_libluajithbtexspecific_sources = \
+ utils-hb.c \
+ luatex-api-hb.h \
+ luastuff-hb.c \
+ luainit-hb.c \
+- printing-hb.c
++ printing-hb.c
+
+-libluatex_web =
+-nodist_libluatex_sources =
++libluatex_web =
++nodist_libluatex_sources =
+
+ # dist_libluatex_sources += \
+ # luatexdir/tex/align.h \
+@@ -5047,7 +5037,7 @@ nodist_libluatex_sources =
+ # luatexdir/tex/texmath.c \
+ # luatexdir/tex/texnodes.c \
+ # luatexdir/tex/textcodes.c \
+-# luatexdir/tex/textoken.c
++# luatexdir/tex/textoken.c
+ dist_libluatex_sources = luatexdir/luatexcallbackids.h \
+ luatexdir/luatex.h luatexdir/luatex-common.h \
+ luatexdir/ptexlib.h luatexdir/luafontloader/src/ffdummies.c \
+@@ -5180,7 +5170,7 @@ luatex_lua_ctangle = $(ctangle_silent)CWEBINPUTS=$(src
+ # luatexdir/lua/luanode.c \
+ # luatexdir/lua/luastuff.c \
+ # luatexdir/lua/luatoken.c \
+-# luatexdir/lua/mplibstuff.c
++# luatexdir/lua/mplibstuff.c
+ luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle)
+
+ ################################################################################
+@@ -5297,16 +5287,16 @@ nodist_call_luatex_SOURCES = callexe.c
+
+ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+ nodist_call_luatex_SOURCES = callexe.c
+-call_luatex_LDADD =
++call_luatex_LDADD =
+ call_luahbtex_CPPFLAGS = -DEXEPROG=\"luahbtex.exe\"
+ nodist_call_luahbtex_SOURCES = callexe.c
+-call_luahbtex_LDADD =
++call_luahbtex_LDADD =
+ call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\"
+ nodist_call_luajittex_SOURCES = callexe.c
+-call_luajittex_LDADD =
++call_luajittex_LDADD =
+ call_luajithbtex_CPPFLAGS = -DEXEPROG=\"luajithbtex.exe\"
+ nodist_call_luajithbtex_SOURCES = callexe.c
+-call_luajithbtex_LDADD =
++call_luajithbtex_LDADD =
+
+ # LuaTeX/LuaJITTeX Tests
+ #
+@@ -5646,7 +5636,7 @@ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/conf
+ w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+ @rm -f w2c/stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f w2c/stamp-h1
+ touch $@
+@@ -5934,7 +5924,7 @@ luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.
+ luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+
+-libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
++libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libff.a
+ $(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libff.a
+@@ -5949,7 +5939,7 @@ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am_
+ ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
++libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
+@@ -5972,7 +5962,7 @@ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+-libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
++libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
+@@ -6025,12 +6015,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
++libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaharfbuzz.a
+ $(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+
+-libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
++libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluahbtexspecific.a
+ $(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+@@ -6077,12 +6067,12 @@ luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuz
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
+ luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
++libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitharfbuzz.a
+ $(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+
+-libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
++libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajithbtexspecific.a
+ $(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+@@ -6147,7 +6137,7 @@ luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
++libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitmisc.a
+ $(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitmisc.a
+@@ -6206,7 +6196,7 @@ luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
++libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajitsocket.a
+ $(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajitsocket.a
+@@ -6613,7 +6603,7 @@ synctexdir/libluajittex_a-synctex.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
++libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittex.a
+ $(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittex.a
+@@ -6630,7 +6620,7 @@ luatexdir/tex/libluajittexspecific_a-printing.$(OBJEXT
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
++libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluajittexspecific.a
+ $(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluajittexspecific.a
+@@ -6659,7 +6649,7 @@ luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT):
+ luatexdir/slnunicode/$(am__dirstamp) \
+ luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+
+-libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
++libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluamisc.a
+ $(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluamisc.a
+@@ -6712,7 +6702,7 @@ luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT):
+ luatexdir/luasocket/src/$(am__dirstamp) \
+ luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+
+-libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
++libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluasocket.a
+ $(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluasocket.a
+@@ -7058,7 +7048,7 @@ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$
+ synctexdir/libluatex_a-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
++libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatex.a
+ $(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatex.a
+@@ -7075,7 +7065,7 @@ luatexdir/tex/libluatexspecific_a-printing.$(OBJEXT):
+ luatexdir/tex/$(am__dirstamp) \
+ luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+
+-libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
++libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluatexspecific.a
+ $(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluatexspecific.a
+@@ -7088,12 +7078,12 @@ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
++libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmd5.a
+ $(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmd5.a
+
+-libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
++libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmf.a
+ $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmf.a
+@@ -7109,7 +7099,7 @@ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__d
+ mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
++libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflua.a
+ $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflua.a
+@@ -7119,7 +7109,7 @@ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am
+ mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
++libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajit.a
+ $(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajit.a
+@@ -7133,7 +7123,7 @@ mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
++libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluajitlpeg.a
+ $(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+@@ -7141,7 +7131,7 @@ mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
+ mfluadir/luapeg/$(am__dirstamp) \
+ mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+
+-libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
++libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmflualpeg.a
+ $(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmflualpeg.a
+@@ -7662,7 +7652,7 @@ mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT
+ mfluadir/otfcc/lib/table/$(am__dirstamp) \
+ mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
++libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluaotfcc.a
+ $(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+@@ -7676,22 +7666,22 @@ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT):
+ mfluadir/potrace/$(am__dirstamp) \
+ mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+
+-libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
++libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmfluapotrace.a
+ $(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmfluapotrace.a
+
+-libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
++libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibbackends.a
+ $(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibbackends.a
+
+-libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
++libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibcore.a
+ $(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibcore.a
+
+-libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
++libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmplibextramath.a
+ $(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmplibextramath.a
+@@ -7708,7 +7698,7 @@ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(
+ mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
++libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libmputil.a
+ $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmputil.a
+@@ -7779,7 +7769,7 @@ pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+-libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
++libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+@@ -7790,7 +7780,7 @@ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
++libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+@@ -7805,7 +7795,7 @@ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
++libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
+@@ -7846,7 +7836,7 @@ luatexdir/unilib/libunilib_a-utype.$(OBJEXT): \
+ luatexdir/unilib/$(am__dirstamp) \
+ luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+
+-libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
++libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libunilib.a
+ $(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libunilib.a
+@@ -7904,7 +7894,7 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
++libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+@@ -7915,7 +7905,7 @@ synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
++libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+@@ -7930,87 +7920,87 @@ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__di
+ alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+-aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
++aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
+
+-bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
++bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
+ @rm -f bibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+
+-call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
++call_luahbtex$(EXEEXT): $(call_luahbtex_OBJECTS) $(call_luahbtex_DEPENDENCIES) $(EXTRA_call_luahbtex_DEPENDENCIES)
+ @rm -f call_luahbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luahbtex_OBJECTS) $(call_luahbtex_LDADD) $(LIBS)
+
+-call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
++call_luajithbtex$(EXEEXT): $(call_luajithbtex_OBJECTS) $(call_luajithbtex_DEPENDENCIES) $(EXTRA_call_luajithbtex_DEPENDENCIES)
+ @rm -f call_luajithbtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajithbtex_OBJECTS) $(call_luajithbtex_LDADD) $(LIBS)
+
+-call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
++call_luajittex$(EXEEXT): $(call_luajittex_OBJECTS) $(call_luajittex_DEPENDENCIES) $(EXTRA_call_luajittex_DEPENDENCIES)
+ @rm -f call_luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luajittex_OBJECTS) $(call_luajittex_LDADD) $(LIBS)
+
+-call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
++call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) $(EXTRA_call_luatex_DEPENDENCIES)
+ @rm -f call_luatex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+
+-call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
++call_mf$(EXEEXT): $(call_mf_OBJECTS) $(call_mf_DEPENDENCIES) $(EXTRA_call_mf_DEPENDENCIES)
+ @rm -f call_mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mf_OBJECTS) $(call_mf_LDADD) $(LIBS)
+
+-call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
++call_mflua$(EXEEXT): $(call_mflua_OBJECTS) $(call_mflua_DEPENDENCIES) $(EXTRA_call_mflua_DEPENDENCIES)
+ @rm -f call_mflua$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mflua_OBJECTS) $(call_mflua_LDADD) $(LIBS)
+
+-call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
++call_mfluajit$(EXEEXT): $(call_mfluajit_OBJECTS) $(call_mfluajit_DEPENDENCIES) $(EXTRA_call_mfluajit_DEPENDENCIES)
+ @rm -f call_mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mfluajit_OBJECTS) $(call_mfluajit_LDADD) $(LIBS)
+
+-call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
++call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_call_mpost_DEPENDENCIES)
+ @rm -f call_mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+
+-call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
++call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+-call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
++call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
+-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
++ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
+ @rm -f ctangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+
+-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
++ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) $(EXTRA_ctangleboot_DEPENDENCIES)
+ @rm -f ctangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+
+-ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
++ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) $(EXTRA_ctie_DEPENDENCIES)
+ @rm -f ctie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
+
+-ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
++ctwill$(EXEEXT): $(ctwill_OBJECTS) $(ctwill_DEPENDENCIES) $(EXTRA_ctwill_DEPENDENCIES)
+ @rm -f ctwill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_OBJECTS) $(ctwill_LDADD) $(LIBS)
+
+-ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
++ctwill-refsort$(EXEEXT): $(ctwill_refsort_OBJECTS) $(ctwill_refsort_DEPENDENCIES) $(EXTRA_ctwill_refsort_DEPENDENCIES)
+ @rm -f ctwill-refsort$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_refsort_OBJECTS) $(ctwill_refsort_LDADD) $(LIBS)
+
+-ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
++ctwill-twinx$(EXEEXT): $(ctwill_twinx_OBJECTS) $(ctwill_twinx_DEPENDENCIES) $(EXTRA_ctwill_twinx_DEPENDENCIES)
+ @rm -f ctwill-twinx$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ctwill_twinx_OBJECTS) $(ctwill_twinx_LDADD) $(LIBS)
+
+-cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
++cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES) $(EXTRA_cweave_DEPENDENCIES)
+ @rm -f cweave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cweave_OBJECTS) $(cweave_LDADD) $(LIBS)
+
+-dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
++dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEPENDENCIES)
+ @rm -f dvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+
+-dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
++dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
+ @rm -f dvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+ eptexdir/$(am__dirstamp):
+@@ -8024,7 +8014,7 @@ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
++eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+ etexdir/$(am__dirstamp):
+@@ -8038,7 +8028,7 @@ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__di
+ synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
++etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+ euptexdir/$(am__dirstamp):
+@@ -8052,23 +8042,23 @@ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
++euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
+
+-gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
++gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
+ @rm -f gftodvi$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
+
+-gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
++gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) $(EXTRA_gftopk_DEPENDENCIES)
+ @rm -f gftopk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftopk_OBJECTS) $(gftopk_LDADD) $(LIBS)
+
+-gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
++gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) $(EXTRA_gftype_DEPENDENCIES)
+ @rm -f gftype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
+
+-himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
++himktables$(EXEEXT): $(himktables_OBJECTS) $(himktables_DEPENDENCIES) $(EXTRA_himktables_DEPENDENCIES)
+ @rm -f himktables$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
+ hitexdir/$(am__dirstamp):
+@@ -8082,19 +8072,19 @@ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__d
+ hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
+ hitexdir/$(DEPDIR)/$(am__dirstamp)
+
+-hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
++hishrink$(EXEEXT): $(hishrink_OBJECTS) $(hishrink_DEPENDENCIES) $(EXTRA_hishrink_DEPENDENCIES)
+ @rm -f hishrink$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hishrink_OBJECTS) $(hishrink_LDADD) $(LIBS)
+
+-histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
++histretch$(EXEEXT): $(histretch_OBJECTS) $(histretch_DEPENDENCIES) $(EXTRA_histretch_DEPENDENCIES)
+ @rm -f histretch$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(histretch_OBJECTS) $(histretch_LDADD) $(LIBS)
+
+-hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
++hitex$(EXEEXT): $(hitex_OBJECTS) $(hitex_DEPENDENCIES) $(EXTRA_hitex_DEPENDENCIES)
+ @rm -f hitex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hitex_OBJECTS) $(hitex_LDADD) $(LIBS)
+
+-initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
++initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES)
+ @rm -f initex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
+ luatexdir/$(am__dirstamp):
+@@ -8108,7 +8098,7 @@ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dir
+ mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
++luahbtex$(EXEEXT): $(luahbtex_OBJECTS) $(luahbtex_DEPENDENCIES) $(EXTRA_luahbtex_DEPENDENCIES)
+ @rm -f luahbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luahbtex_LINK) $(luahbtex_OBJECTS) $(luahbtex_LDADD) $(LIBS)
+ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8116,7 +8106,7 @@ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__
+ mplibdir/luajithbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
++luajithbtex$(EXEEXT): $(luajithbtex_OBJECTS) $(luajithbtex_DEPENDENCIES) $(EXTRA_luajithbtex_DEPENDENCIES)
+ @rm -f luajithbtex$(EXEEXT)
+ $(AM_V_CXXLD)$(luajithbtex_LINK) $(luajithbtex_OBJECTS) $(luajithbtex_LDADD) $(LIBS)
+ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8124,7 +8114,7 @@ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__di
+ mplibdir/luajittex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
++luajittex$(EXEEXT): $(luajittex_OBJECTS) $(luajittex_DEPENDENCIES) $(EXTRA_luajittex_DEPENDENCIES)
+ @rm -f luajittex$(EXEEXT)
+ $(AM_V_CCLD)$(luajittex_LINK) $(luajittex_OBJECTS) $(luajittex_LDADD) $(LIBS)
+ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
+@@ -8132,33 +8122,33 @@ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirst
+ mplibdir/luatex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
+ mplibdir/$(DEPDIR)/$(am__dirstamp)
+
+-luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
++luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) $(EXTRA_luatex_DEPENDENCIES)
+ @rm -f luatex$(EXEEXT)
+ $(AM_V_CCLD)$(luatex_LINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
+ libmd5/md5main-md5main.$(OBJEXT): libmd5/$(am__dirstamp) \
+ libmd5/$(DEPDIR)/$(am__dirstamp)
+
+-md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
++md5main$(EXEEXT): $(md5main_OBJECTS) $(md5main_DEPENDENCIES) $(EXTRA_md5main_DEPENDENCIES)
+ @rm -f md5main$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(md5main_OBJECTS) $(md5main_LDADD) $(LIBS)
+
+-mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
++mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
+ @rm -f mf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_OBJECTS) $(mf_LDADD) $(LIBS)
+
+-mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
++mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES)
+ @rm -f mf-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+ mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
++mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES)
+ @rm -f mflua$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+ mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+ mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+-mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
++mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES)
+ @rm -f mflua-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+ mfluajitdir/$(am__dirstamp):
+@@ -8171,38 +8161,38 @@ mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
++mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES)
+ @rm -f mfluajit$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+ mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT): \
+ mfluajitdir/$(am__dirstamp) \
+ mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+-mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
++mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES)
+ @rm -f mfluajit-nowin$(EXEEXT)
+ $(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
+
+-mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
++mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES)
+ @rm -f mft$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mft_OBJECTS) $(mft_LDADD) $(LIBS)
+
+-mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
++mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIES)
+ @rm -f mpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+
+-odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
++odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+-odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
++odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
++otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
+-patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
++patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
+ @rm -f patgen$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8210,67 +8200,67 @@ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__
+ synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
++pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+ pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
++pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+-pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
++pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
+ @rm -f pktogf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
+
+-pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
++pktype$(EXEEXT): $(pktype_OBJECTS) $(pktype_DEPENDENCIES) $(EXTRA_pktype_DEPENDENCIES)
+ @rm -f pktype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pktype_OBJECTS) $(pktype_LDADD) $(LIBS)
+
+-pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
++pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDENCIES)
+ @rm -f pltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+
+-pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
++pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
+-pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
++pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
+ @rm -f pooltype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
++ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+ synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
++synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
+-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
++tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
+ @rm -f tangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+
+-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
++tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
+ @rm -f tangleboot$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+ synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
++tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
+ @rm -f tex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
+
+-tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
++tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDENCIES)
+ @rm -f tftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tftopl_OBJECTS) $(tftopl_LDADD) $(LIBS)
+
+-tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
++tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
+ @rm -f tie$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+ pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+@@ -8278,65 +8268,65 @@ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__
+ pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+-ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
++ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
+
+-twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
++twill$(EXEEXT): $(twill_OBJECTS) $(twill_DEPENDENCIES) $(EXTRA_twill_DEPENDENCIES)
+ @rm -f twill$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(twill_OBJECTS) $(twill_LDADD) $(LIBS)
+
+-upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
++upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+-updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
++updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+-upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
++upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+-uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
++uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+ uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+-uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
++uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+-uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
++uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
+-vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
++vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
+ @rm -f vftovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
+
+-vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
++vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES) $(EXTRA_vptovf_DEPENDENCIES)
+ @rm -f vptovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vptovf_OBJECTS) $(vptovf_LDADD) $(LIBS)
+
+-weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
++weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIES)
+ @rm -f weave$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+
+-wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
++wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+-wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
++wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+-wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
++wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+-wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
++wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+@@ -8344,7 +8334,7 @@ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__d
+ synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+-xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
++xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
+@@ -19275,7 +19265,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)
+@@ -19285,7 +19275,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 \
+@@ -19546,7 +19536,7 @@ install-am: all-am
uninstall: uninstall-recursive
install-am: all-am
@@ -57,7 +1260,7 @@
installcheck: installcheck-recursive
install-strip:
-@@ -20184,7 +20186,6 @@ install-dvi-am:
+@@ -20475,7 +20465,6 @@ install-exec-am: install-binPROGRAMS install-libLIBRAR
install-exec-am: install-binPROGRAMS install-libLIBRARIES \
install-libLTLIBRARIES
@$(NORMAL_INSTALL)
@@ -65,3 +1268,87 @@
install-html: install-html-recursive
install-html-am:
+@@ -21636,7 +21625,7 @@ $(libmfluaotfcc_a_OBJECTS): $(LUA_DEPEND)
+
+ #EXTRA_DIST +=
+
+-#EXTRA_DIST +=
++#EXTRA_DIST +=
+
+ $(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
+
+@@ -21801,7 +21790,7 @@ tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+
+ # Creating several files: need stamp file and two rules with identical recipes
+-$(mp_c_h): mp-tangle
++$(mp_c_h): mp-tangle
+ $(mp_ctangle_sh) mp
+ mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
+ $(mp_ctangle_sh) mp
+@@ -21848,7 +21837,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h)
+
+ $(nodist_libmplibcore_a_SOURCES): $(mpmathbinary_c_h) $(svgout_c_h) $(pngout_c_h)
+
+-$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
++$(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)
+ $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND) $(MPFR_DEPEND)
+ $(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+@@ -22099,7 +22088,7 @@ hitables.c: himktables$(EXEEXT)
+ hitables.c: himktables$(EXEEXT)
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+
+-# hitex, histretch, and hishrink all need (at least) some
++# hitex, histretch, and hishrink all need (at least) some
+ # of the sources generated from hiformat.w.
+ #
+ $(hitex_OBJECTS): hiformat-tangle
+@@ -22166,36 +22155,36 @@ $(libff_a_OBJECTS): libunilib.a
+
+ $(libff_a_OBJECTS): libunilib.a
+
+-$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluatexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajittexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+-$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
+-$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
++$(libluahbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluamisc.a
++$(libluajithbtexspecific_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a
+
+ utils-hb.c: luatexdir/utils/utils.c
+ $(LN_S) $(srcdir)/luatexdir/utils/utils.c utils-hb.c
+
+-luatex-api-hb.h: luatexdir/lua/luatex-api.h
++luatex-api-hb.h: luatexdir/lua/luatex-api.h
+ $(LN_S) $(srcdir)/luatexdir/lua/luatex-api.h luatex-api-hb.h
+
+ luastuff-hb.c: luatexdir/lua/luastuff.c
+- $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
++ $(LN_S) $(srcdir)/luatexdir/lua/luastuff.c luastuff-hb.c
+
+ luainit-hb.c: luatexdir/lua/luainit.c
+ $(LN_S) $(srcdir)/luatexdir/lua/luainit.c luainit-hb.c
+
+-printing-hb.c: luatexdir/tex/printing.c
+- $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
++printing-hb.c: luatexdir/tex/printing.c
++ $(LN_S) $(srcdir)/luatexdir/tex/printing.c printing-hb.c
+
+ #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+ $(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+ #liblua53ffi_sources = $(libluaffi_sources)
+-#EXTRA_DIST
++#EXTRA_DIST
+
+ $(luatex_OBJECTS): libluatex.a
+ $(luajittex_OBJECTS): libluajittex.a
diff --git a/print/tex-xetex/files/patch-configure b/print/tex-xetex/files/patch-configure
index d6e0ac4e9c3c..bbcbc2496147 100644
--- 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
+-
+-
diff --git a/print/tex-xmltex/Makefile b/print/tex-xmltex/Makefile
index a3f9d881e701..08ca87e9670f 100644
--- 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} \
diff --git a/print/tex-xmltex/distinfo b/print/tex-xmltex/distinfo
index 2c340d9d5c73..ae0d84122d37 100644
--- 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
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index c58292d67f7e..4164f50ded04 100644
--- 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 \
diff --git a/print/texlive-base/distinfo b/print/texlive-base/distinfo
index b5b786ecd8e3..74a97b8d94bf 100644
--- 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
diff --git a/print/texlive-base/files/patch-Makefile.in b/print/texlive-base/files/patch-Makefile.in
index afa01b77291d..3b01373c109e 100644
--- 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
diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure
index 81e2ba30ba31..2266b3531ce0 100644
--- 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
diff --git a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
deleted file mode 100644
index 2cf63ada83a0..000000000000
--- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
+++ /dev/null
@@ -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
-
diff --git a/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in b/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in
new file mode 100644
index 000000000000..70340b49e611
--- /dev/null
+++ 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
+
diff --git a/print/texlive-base/files/patch-texk-chktex-Makefile.in b/print/texlive-base/files/patch-texk_chktex_Makefile.in
index 71b07c6bec8a..761322c68375 100644
--- 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:
diff --git a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in b/print/texlive-base/files/patch-texk_cjkutils_Makefile.in
index 7c226289afb0..7ec93d8dcf45 100644
--- 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:
diff --git a/print/texlive-base/files/patch-texk_dvipng_configure b/print/texlive-base/files/patch-texk_dvipng_configure
index fe223d058f2c..dd8412d2463d 100644
--- 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
diff --git a/print/texlive-base/files/patch-texk_dvisvgm_configure b/print/texlive-base/files/patch-texk_dvisvgm_configure
index cd9af51ac9c4..67177b979034 100644
--- 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
diff --git 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
index f9fb73e219b8..1f4e8b514a09 100644
--- 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
diff --git 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
index ff99cd7c47cd..3f474beb127e 100644
--- 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>
diff --git a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in b/print/texlive-base/files/patch-texk_gsftopk_Makefile.in
index 28b5d9ec8316..1d85b648f41b 100644
--- 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:
diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf b/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
index a5905278ef3c..4f7003be5038 100644
--- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-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:
@@ -11,16 +38,6 @@
-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
-pdfcslatex pdftex - -etex cslatex.ini
@@ -43,6 +60,12 @@
-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
-pdfjadetex pdftex language.dat *pdfjadetex.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
diff --git a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in b/print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in
index 590e5701fd96..f00ab1fcd89d 100644
--- 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:
diff --git a/print/texlive-base/pkg-plist b/print/texlive-base/pkg-plist
index 57e02f048fc3..a5e5b05f1132 100644
--- 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
diff --git a/print/texlive-docs/Makefile b/print/texlive-docs/Makefile
index 80dfc4d40ec8..739e6f2ffa22 100644
--- 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/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/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/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/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/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/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/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} | \
diff --git a/print/texlive-docs/distinfo b/print/texlive-docs/distinfo
index 10d479b32a3e..7e83018ec3ea 100644
--- 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
diff --git a/print/texlive-texmf-source/Makefile b/print/texlive-texmf-source/Makefile
index 23966d841ca5..46b6199d753c 100644
--- 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} | \
diff --git a/print/texlive-texmf-source/distinfo b/print/texlive-texmf-source/distinfo
index c95cfe16a70f..de3c24632f20 100644
--- 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
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index effaebcb9425..55bf3fa97276 100644
--- 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 \
+NO_WRKSUBDIR= yes
+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>
diff --git a/print/texlive-texmf/distinfo b/print/texlive-texmf/distinfo
index bfd191c3a5ee..e20dee50105b 100644
--- 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
diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile
index e313be560d5c..bdda383582e8 100644
--- 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
diff --git a/print/texlive-tlmgr/distinfo b/print/texlive-tlmgr/distinfo
index 65c8cde3c578..6a8ed4058078 100644
--- 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
diff --git 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
deleted file mode 100644
index 65e56d97f05e..000000000000
--- a/print/texlive-tlmgr/files/patch-texlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm
+++ /dev/null
@@ -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_;
- }
diff --git 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
deleted file mode 100644
index 6e192aa1c3a5..000000000000
--- a/print/texlive-tlmgr/files/patch-texlive-20210325-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
+++ /dev/null
@@ -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`) ) ;
diff --git 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
new file mode 100644
index 000000000000..52e5db4a9117
--- /dev/null
+++ b/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
@@ -0,0 +1,1294 @@
+--- texlive-20230313-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2023-04-02 15:07:53 UTC
++++ texlive-20230313-source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+@@ -3,7 +3,7 @@
+ # Copyright 2008-2023 Norbert Preining
+ # This file is licensed under the GNU General Public License version 2
+ # or any later version.
+-#
++#
+ # TeX Live Manager.
+
+ use strict; use warnings;
+@@ -125,7 +125,7 @@ our $FLAG_REINSTALL = "I";
+ our $FLAG_REINSTALL = "I";
+
+ # keep in sync with install-tl.
+-our $common_fmtutil_args =
++our $common_fmtutil_args =
+ "--no-error-if-no-engine=$TeXLive::TLConfig::PartialEngineSupport";
+
+ # option variables
+@@ -137,7 +137,7 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_include_tlpobj
+ },
+- "backup" => {
++ "backup" => {
+ "options" => {
+ "all" => 1,
+ "backupdir" => "=s",
+@@ -151,25 +151,25 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_candidates
+ },
+- "check" => {
++ "check" => {
+ "options" => { "use-svn" => 1 },
+ "run-post" => 1,
+ "function" => \&action_check
+ },
+ "conf" => {
+- "options" => {
++ "options" => {
+ "conffile" => "=s",
+ "delete" => 1,
+ },
+ "run-post" => 0,
+ "function" => \&action_conf
+ },
+- "dump-tlpdb" => {
++ "dump-tlpdb" => {
+ "options" => { local => 1, remote => 1 },
+ "run-post" => 0,
+ "function" => \&action_dumptlpdb
+ },
+- "generate" => {
++ "generate" => {
+ "options" => {
+ "dest" => "=s",
+ "localcfg" => "=s",
+@@ -182,7 +182,7 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_get_mirror
+ },
+- "gui" => {
++ "gui" => {
+ "options" => {
+ "load" => 1,
+ # Tk::CmdLine options
+@@ -203,11 +203,11 @@ my %action_specification = (
+ "run-post" => 1,
+ "function" => \&action_gui
+ },
+- "info" => {
+- "options" => {
++ "info" => {
++ "options" => {
+ "data" => "=s",
+ "all" => 1,
+- "list" => 1,
++ "list" => 1,
+ "only-installed" => 1,
+ "only-remote" => 1
+ },
+@@ -236,11 +236,11 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_key
+ },
+- "option" => {
++ "option" => {
+ "run-post" => 1,
+ "function" => \&action_option
+ },
+- "paper" => {
++ "paper" => {
+ "options" => { "list" => 1 },
+ "run-post" => 1,
+ "function" => \&action_paper
+@@ -250,12 +250,12 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_path
+ },
+- "pinning" => {
++ "pinning" => {
+ "options" => { "all" => 1 },
+ "run-post" => 1,
+ "function" => \&action_pinning
+ },
+- "platform" => {
++ "platform" => {
+ "options" => { "dry-run|n" => 1 },
+ "run-post" => 1,
+ "function" => \&action_platform
+@@ -269,12 +269,12 @@ my %action_specification = (
+ "run-post" => 0,
+ "function" => \&action_postaction
+ },
+- "recreate-tlpdb" => {
++ "recreate-tlpdb" => {
+ "options" => { "platform|arch" => "=s" },
+ "run-post" => 0,
+ "function" => \&action_recreate_tlpdb
+ },
+- "remove" => {
++ "remove" => {
+ "options" => {
+ "all" => 1,
+ "backup" => 1,
+@@ -471,7 +471,7 @@ sub main {
+
+ # unify arguments so that the $action contains paper in all cases
+ # and push the first arg back to @ARGV for action_paper processing
+- if (defined $action
++ if (defined $action
+ && $action =~ /^(paper|xdvi|psutils|pdftex|dvips|dvipdfmx?|context)$/) {
+ unshift(@ARGV, $action);
+ $action = "paper";
+@@ -542,7 +542,7 @@ sub main {
+ # less can break control characters and thus the output of pod2usage
+ # is broken. We add/set LESS=-R in the environment and unset
+ # LESSPIPE and LESSOPEN to try to help.
+- #
++ #
+ if (defined($ENV{'LESS'})) {
+ $ENV{'LESS'} .= " -R";
+ } else {
+@@ -582,7 +582,7 @@ for the full story.\n";
+ }
+
+ # --machine-readable is only supported by update.
+- if ($::machinereadable &&
++ if ($::machinereadable &&
+ $action ne "update" && $action ne "install" && $action ne "option" && $action ne "shell" && $action ne "remove") {
+ tlwarn("$prg: --machine-readable output not supported for $action\n");
+ }
+@@ -638,6 +638,9 @@ 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
+ $commandslogged = 0;
+ chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`);
+@@ -646,7 +649,7 @@ for the full story.\n";
+ if ($opts{"usermode"}) {
+ $packagelogfile ||= "$texmfvar/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
+@@ -719,13 +722,13 @@ for the full story.\n";
+ # being run (e.g., untar fails). F_WARNING continues on, including
+ # postactions (e.g., user tries to install 10 packages and the
+ # checksum fails for one, but the others are ok), but still ends the
+- # program by exiting unsuccessfully. So call them both "errors"
++ # program by exiting unsuccessfully. So call them both "errors"
+ # as far as the user is concerned.
+ if ($ret & ($F_ERROR | $F_WARNING)) {
+ tlwarn("$prg: An error has occurred. See above messages. Exiting.\n");
+ }
+
+- # end of main program, returns also error codes
++ # end of main program, returns also error codes
+ exit ($ret);
+
+ } # end main
+@@ -736,9 +739,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;
+@@ -831,7 +834,7 @@ sub execute_action {
+
+ # run CMD with notice to the user and if exit status is nonzero, complain.
+ # return exit status.
+-#
++#
+ sub do_cmd_and_check {
+ my $cmd = shift;
+ # we output the pre-running notice on a separate line so that
+@@ -920,7 +923,7 @@ sub handle_execute_actions {
+ for my $m (keys %{$::execute_actions{'disable'}{'maps'}}) {
+ $updmap_run_needed = 1;
+ }
+- my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg"
++ my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg"
+ : "$TEXMFDIST/web2c/updmap.cfg";
+ if ($updmap_run_needed) {
+ TeXLive::TLUtils::create_updmap($localtlpdb, $dest);
+@@ -929,7 +932,7 @@ sub handle_execute_actions {
+ }
+
+ # format relevant things
+- # we first have to check if the config files, that is fmtutil.cnf
++ # we first have to check if the config files, that is fmtutil.cnf
+ # or one of the language* files have changed, regenerate them
+ # if necessary, and then run the necessary fmtutil calls.
+ {
+@@ -990,7 +993,7 @@ sub handle_execute_actions {
+ "$TEXMFDIST/web2c/fmtutil.cnf");
+ }
+ if (!$::regenerate_all_formats) {
+- # first regenerate all formats --byengine
++ # first regenerate all formats --byengine
+ for my $e (keys %updated_engines) {
+ debug ("updating formats based on $e\n");
+ $errors += do_cmd_and_check
+@@ -1098,7 +1101,7 @@ sub action_get_mirror {
+ #
+ # just return a mirror
+ sub action_get_mirror {
+- my $loc = give_ctan_mirror();
++ my $loc = give_ctan_mirror();
+ print "$loc\n";
+ return ($F_OK | $F_NOPOSTACTION);
+ }
+@@ -1188,7 +1191,7 @@ sub backup_and_remove_package {
+ }
+ if ($opts{"backup"}) {
+ $tlp->make_container($::progs{'compressor'}, $localtlpdb->root,
+- destdir => $opts{"backupdir"},
++ destdir => $opts{"backupdir"},
+ relative => $tlp->relocated,
+ user => 1);
+ if ($autobackup) {
+@@ -1253,7 +1256,7 @@ sub action_remove {
+ #
+ # remove all .ARCH dependencies, too, unless $opts{"no-depends-at-all"}
+ @packs = $localtlpdb->expand_dependencies("-only-arch", $localtlpdb, @packs)
+- unless $opts{"no-depends-at-all"};
++ unless $opts{"no-depends-at-all"};
+ # remove deps unless $opts{"no-depends"}
+ @packs = $localtlpdb->expand_dependencies("-no-collections", $localtlpdb, @packs) unless $opts{"no-depends"};
+ my %allpacks;
+@@ -1293,7 +1296,7 @@ sub action_remove {
+ my $currnr = 1;
+ my $starttime = time();
+ my $donesize = 0;
+-
++
+ print "total-bytes\t$sizes{'__TOTAL__'}\n" if $::machinereadable;
+ print "end-of-header\n" if $::machinereadable;
+
+@@ -1382,7 +1385,7 @@ sub action_remove {
+
+
+ # PAPER
+-#
++#
+ # ARGV can look like:
+ # paper a4
+ # paper letter
+@@ -1612,11 +1615,11 @@ sub action_dumptlpdb {
+ #
+ sub action_dumptlpdb {
+ init_local_db();
+-
++
+ # we are basically doing machine-readable output.
+ my $savemr = $::machinereadable;
+ $::machinereadable = 1;
+-
++
+ if ($opts{"local"} && !$opts{"remote"}) {
+ if ($opts{"json"}) {
+ print $localtlpdb->as_json;
+@@ -1639,11 +1642,11 @@ sub action_dumptlpdb {
+ tlwarn("$prg dump-tlpdb: need exactly one of --local and --remote.\n");
+ return ($F_ERROR);
+ }
+-
++
+ $::machinereadable = $savemr;
+ return ($F_OK | $F_NOPOSTACTION);
+ }
+-
++
+ # INFO
+ #
+ sub action_info {
+@@ -1711,7 +1714,7 @@ sub action_info {
+ # tlmgr info
+ # tlmgr info collection
+ # tlmgr info scheme
+- # these commands just list the packages/collections/schemes installed with
++ # these commands just list the packages/collections/schemes installed with
+ # a short list
+ my @whattolist;
+ $what = ($what || "-all");
+@@ -1790,11 +1793,11 @@ sub action_search {
+ $tlpdb = $localtlpdb;
+ }
+
+- my ($foundfile, $founddesc) = search_tlpdb($tlpdb, $r,
+- $opts{'file'} || $opts{'all'},
+- (!$opts{'file'} || $opts{'all'}),
++ my ($foundfile, $founddesc) = search_tlpdb($tlpdb, $r,
++ $opts{'file'} || $opts{'all'},
++ (!$opts{'file'} || $opts{'all'}),
+ $opts{'word'});
+-
++
+ print $founddesc;
+ print $foundfile;
+
+@@ -1807,7 +1810,7 @@ sub search_tlpdb {
+ my $retdesc = '';
+ foreach my $pkg ($tlpdb->list_packages) {
+ my $tlp = $tlpdb->get_package($pkg);
+-
++
+ # --file or --all -> search (full) file names
+ if ($dofile) {
+ my @ret = search_pkg_files($tlp, $what);
+@@ -1902,7 +1905,7 @@ sub get_available_backups {
+ # for more on that please see man perlport
+ my $usedt = $ctime;
+ if (!$usedt) {
+- # can happen on
++ # can happen on
+ $usedt = $mtime;
+ }
+ if (!$usedt) {
+@@ -1923,8 +1926,8 @@ sub restore_one_package {
+ # first remove the package, then reinstall it
+ # this way we get rid of useless files
+ my $restore_file;
+- for my $ext (map {$Compressors{$_}{'extension'}}
+- sort {$Compressors{$a}{'priority'} <=> $Compressors{$a}{'priority'}}
++ for my $ext (map {$Compressors{$_}{'extension'}}
++ sort {$Compressors{$a}{'priority'} <=> $Compressors{$a}{'priority'}}
+ keys %Compressors) {
+ if (-r "$bd/${pkg}.r${rev}.tar.$ext") {
+ $restore_file = "$bd/${pkg}.r${rev}.tar.$ext";
+@@ -1996,7 +1999,7 @@ sub setup_backup_directory {
+ my $saving_verb = $opts{"dry-run"} || $opts{"list"} ? "would save" :"saving";
+ info("$prg: $saving_verb backups to $opts{'backupdir'}\n")
+ if $opts{"backup"} && !$::machinereadable;
+-
++
+ return ($ret, $autobackup);
+ }
+
+@@ -2103,7 +2106,7 @@ sub action_restore {
+ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+ localtime($revs{$rs});
+ # localtime returns dates starting from 1900, and the month is 0..11
+- $dstr = sprintf "%04d-%02d-%02d %02d:%02d",
++ $dstr = sprintf "%04d-%02d-%02d %02d:%02d",
+ $year+1900, $mon+1, $mday, $hour, $min;
+ }
+ if ($mode eq "json") {
+@@ -2233,7 +2236,7 @@ sub action_backup {
+ }
+
+ # if we do --clean --all we also want to remove packages that
+- # are not present anymore in the tlpdb, so use the readdir mode
++ # are not present anymore in the tlpdb, so use the readdir mode
+ # to determine backups
+ if ($opts{"all"} && $clean_mode) {
+ # initialize the hash(packages) of hash(revisions)
+@@ -2304,15 +2307,15 @@ sub action_backup {
+ # * write_w32_updater subroutine in tlmgr.pl prepares the update
+ # and writes the updater script. Packages in .xz archives are
+ # downloaded/copied and uncompressed to .tar files. Also .tar
+-# backups of the current packages are made. If everything is
+-# successful, the update script is created from the template.
++# backups of the current packages are made. If everything is
++# successful, the update script is created from the template.
+ # Otherwise the update is aborted.
+-# * updater-w32[.bat] batch script, triggers and executes the actual
+-# update. It first restarts itself in a separate instance of cmd.exe
+-# (and in a new console window in gui mode) and runs the update
+-# from there. The update is run with echo on and all output is
+-# logged to a file (or stderr in verbose mode). After successful
+-# infrastructure update, tlmgr is optionally restarted if update
++# * updater-w32[.bat] batch script, triggers and executes the actual
++# update. It first restarts itself in a separate instance of cmd.exe
++# (and in a new console window in gui mode) and runs the update
++# from there. The update is run with echo on and all output is
++# logged to a file (or stderr in verbose mode). After successful
++# infrastructure update, tlmgr is optionally restarted if update
+ # of other packages is asked for.
+ # The infrastructure update itself proceeds as follows:
+ # (1) untar all package archives
+@@ -2323,9 +2326,9 @@ sub action_backup {
+ # (2) untar all package backups
+ # (3) include .tlpobj files (from backup) into tlpdb
+ # (4) print restore info to console
+-# Any error during (2) or (3) and we go into panic state. At this
+-# point there is no guarantee that the installation is still working.
+-# There is not much we can do but to print failed restore info and
++# Any error during (2) or (3) and we go into panic state. At this
++# point there is no guarantee that the installation is still working.
++# There is not much we can do but to print failed restore info and
+ # give instructions to download and run 'update-tlmgr-latest.exe'
+ # to repair the installation.
+ # =====================================================================
+@@ -2343,7 +2346,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') {
+@@ -2360,7 +2363,7 @@ sub write_w32_updater {
+ $media = $remotetlpdb->media;
+ if ($media eq "virtual") {
+ my $maxtlpdb;
+- (undef, undef, $mediatlp, $maxtlpdb) =
++ (undef, undef, $mediatlp, $maxtlpdb) =
+ $remotetlpdb->virtual_candidate($pkg);
+ $repo = $maxtlpdb->root . "/$Archive";
+ # update the media type of the used tlpdb
+@@ -2422,7 +2425,7 @@ sub write_w32_updater {
+ unlink($dlcontainer); # we don't need that archive anymore
+ }
+ }
+-
++
+ # prepare updater script
+ my $respawn_cmd = "cmd.exe /e:on/v:off/d/c";
+ $respawn_cmd = "start /wait $respawn_cmd" if ($::gui_mode);
+@@ -2440,8 +2443,8 @@ sub write_w32_updater {
+ }
+ my $batch_script = <<"EOF";
+ :: This file is part of an automated update process of
+-:: infrastructure files and should not be run standalone.
+-:: For more details about the update process see comments
++:: infrastructure files and should not be run standalone.
++:: For more details about the update process see comments
+ :: in tlmgr.pl (subroutine write_w32_updater).
+
+ if [%1]==[:doit] goto :doit
+@@ -2466,10 +2469,10 @@ sub write_w32_updater {
+ if not errorlevel 1 goto :update
+ >con echo Could not change working directory to "%~dp0.."
+ >con echo Aborting infrastructure update, no changes have been made.
+- >con $gui_pause
++ >con $gui_pause
+ popd
+ exit /b 1
+-
++
+ :update
+ for %%I in (@upd_tar) do (
+ temp\\tar.exe -xmf temp\\%%I
+@@ -2479,10 +2482,10 @@ sub write_w32_updater {
+ if errorlevel 1 goto :rollback
+ >>$pkg_log echo [%date% %time%] self update: @upd_info
+ >con echo self update: @upd_info
+- del "%~dp0*.tar" "%~dp0tar.exe"
++ del "%~dp0*.tar" "%~dp0tar.exe"
+ >con echo Infrastructure update finished successfully.
+ >con echo $post_update_msg
+- >con $gui_pause
++ >con $gui_pause
+ popd
+ exit /b 0
+
+@@ -2499,7 +2502,7 @@ sub write_w32_updater {
+ >>$pkg_log echo [%date% %time%] self restore: @rst_info
+ >con echo self restore: @rst_info
+ >con echo Infrastructure update failed. Previous version has been restored.
+- >con $gui_pause
++ >con $gui_pause
+ popd
+ exit /b 1
+
+@@ -2510,7 +2513,7 @@ sub write_w32_updater {
+ >con echo Infrastructure update failed and backup recovery failed too.
+ >con echo To repair your TeX Live installation download and run:
+ >con echo $TeXLive::TLConfig::TeXLiveURL/update-tlmgr-latest.exe
+- >con $gui_pause
++ >con $gui_pause
+ popd
+ exit /b 666
+ EOF
+@@ -2537,7 +2540,7 @@ EOF
+
+ # UPDATE
+
+-# compute the list of auto-install, auto-remove, forcibly-removed
++# compute the list of auto-install, auto-remove, forcibly-removed
+ # packages from the list of packages to be installed
+ # the list of packages passed in is already expanded
+ sub auto_remove_install_force_packages {
+@@ -2582,7 +2585,7 @@ sub auto_remove_install_force_packages {
+ delete($removals_full{$p});
+ }
+ # in a first round we check only for forcibly removed collections
+- # this is necessary to NOT declare a package that is contained
++ # this is necessary to NOT declare a package that is contained
+ # in a forcibly removed collections as auto-install since it appears
+ # in the @remoteexpansion_full, but not in @localexpansion_full.
+ for my $p (@localexpansion_full) {
+@@ -2608,9 +2611,9 @@ sub auto_remove_install_force_packages {
+ # now we have in %forcermpkgs_full only collections that have been
+ # forcibly removed. Again, expand those against the remote tlpdb
+ # and remove the expanded packages from the list of localexpansion.
+- my @pkgs_from_forcerm_colls =
++ my @pkgs_from_forcerm_colls =
+ $remotetlpdb->expand_dependencies($localtlpdb, keys %forcermpkgs_full);
+- #
++ #
+ # the package in @pkgs_from_forcerm_colls would be auto-installed, so
+ # check for that:
+ for my $p (keys %newpkgs_full) {
+@@ -2735,9 +2738,9 @@ sub action_update {
+ $opts{"no-depends"} = 1 if $opts{"no-depends-at-all"};
+
+ # make a quick check on command line arguments to avoid loading
+- # the remote db uselessly.
++ # the remote db uselessly.
+ # we require:
+- # if no --list is given: either --self or --all or <pkgs>
++ # if no --list is given: either --self or --all or <pkgs>
+ # if --list is given: nothing
+ # other options just change the behavior
+ if (!($opts{"list"} || @ARGV || $opts{"all"} || $opts{"self"})) {
+@@ -2837,8 +2840,8 @@ sub action_update {
+ @todo = grep (!m/$CriticalPackagesRegexp/, @todo)
+ unless $opts{"list"};
+ }
+-
+- my ($remref, $newref, $forref, $new_due_to_forcerm_coll_ref) =
++
++ my ($remref, $newref, $forref, $new_due_to_forcerm_coll_ref) =
+ auto_remove_install_force_packages(@todo);
+ my %removals = %$remref;
+ my %forcermpkgs = %$forref;
+@@ -2888,7 +2891,7 @@ sub action_update {
+ tlwarn("$prg: Please resolve these conflicts!\n");
+ return ($F_ERROR);
+ }
+-
++
+ #
+ # we first collect the list of packages to be actually updated or installed
+ my %updated;
+@@ -3075,7 +3078,7 @@ sub action_update {
+ }
+ #
+ # the idea of suppressing warnings is simply that if a file is present
+- # in more than one package either in the beginning or after a full
++ # in more than one package either in the beginning or after a full
+ # update then this should give a warning. In all other cases
+ # the warning should be suppressed.
+ for my $f (keys %old_files_to_pkgs) {
+@@ -3097,7 +3100,7 @@ sub action_update {
+ # 2. updates
+ # 3. auto-install
+ # that way if a file has been moved from one to another package it
+- # removing the old version after the new package has been installed
++ # removing the old version after the new package has been installed
+ # will not give a warning about files being included somewhere else
+ #
+
+@@ -3166,7 +3169,7 @@ sub action_update {
+ my $totalsize = $sizes{'__TOTAL__'};
+
+
+- #
++ #
+ # UPDATES AND NEW PACKAGES
+ #
+ # order:
+@@ -3178,10 +3181,10 @@ sub action_update {
+ # - install new schemes (? will not happen?)
+ #
+ # this makes sure that only if all depending packages are installed
+- # the collection is updated, which in turn makes sure that
++ # the collection is updated, which in turn makes sure that
+ # if the installation of a new package does break it will not be
+ # counted as forcibly removed later on.
+- #
++ #
+ my @inst_packs;
+ my @inst_colls;
+ my @inst_schemes;
+@@ -3215,7 +3218,7 @@ sub action_update {
+ for my $pkg (@new_packs, @new_colls, @new_schemes) {
+ $is_new{$pkg} = 1;
+ }
+-
++
+ #
+ # TODO idea
+ # currently this big loop contains a long if then for new packages
+@@ -3225,7 +3228,7 @@ sub action_update {
+ # and following it after the change would make it much harder
+ #
+ foreach my $pkg (@inst_packs, @new_packs, @inst_colls, @new_colls, @inst_schemes, @new_schemes) {
+-
++
+ if (!$is_new{$pkg}) {
+ # skip this loop if infra update on w32
+ next if ($pkg =~ m/^00texlive/);
+@@ -3304,9 +3307,9 @@ sub action_update {
+ $updated{$pkg} = 1;
+ next;
+ }
+-
++
+ # older tlmgr forgot to clear the relocated bit when saving a tlpobj
+- # into the local tlpdb, although the paths were rewritten.
++ # into the local tlpdb, although the paths were rewritten.
+ # We have to clear this bit otherwise the make_container calls below
+ # for creating an unwind container will create some rubbish
+ # TODO for user mode we should NOT clear this bit!
+@@ -3323,19 +3326,19 @@ sub action_update {
+ user => 1);
+ $unwind_package =
+ "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.$compressorextension";
+-
++
+ if ($autobackup) {
+ # in case we do auto backups we remove older backups
+ clear_old_backups($pkg, $opts{"backupdir"}, $autobackup);
+ }
+ }
+-
++
+ my ($estrem, $esttot);
+ if (!$opts{"list"}) {
+ ($estrem, $esttot) = TeXLive::TLUtils::time_estimate($totalsize,
+ $donesize, $starttime);
+ }
+-
++
+ if ($::machinereadable) {
+ machine_line($pkg, $FLAG_UPDATE, $rev, $mediarev, $sizes{$pkg}, $estrem, $esttot, @addargs);
+ } else {
+@@ -3345,7 +3348,7 @@ sub action_update {
+ }
+ $donesize += $sizes{$pkg};
+ $currnr++;
+-
++
+ if ($opts{"dry-run"}) {
+ info("\n") unless $::machinereadable;
+ $updated{$pkg} = 1;
+@@ -3353,7 +3356,7 @@ sub action_update {
+ } else {
+ info(" ... ") unless $::machinereadable; # more to come
+ }
+-
++
+ if (!$unwind_package) {
+ # no backup was made, so let us create a temporary .tar file
+ # of the package
+@@ -3382,7 +3385,7 @@ sub action_update {
+ if ($pkg =~ m/$CriticalPackagesRegexp/) {
+ debug("Not removing critical package $pkg\n");
+ } else {
+- $localtlpdb->remove_package($pkg,
++ $localtlpdb->remove_package($pkg,
+ "remove-warn-files" => \%do_warn_on_move);
+ }
+ if ($remotetlpdb->install_package($pkg, $localtlpdb)) {
+@@ -3457,7 +3460,7 @@ sub action_update {
+ }
+ info("done\n") unless $::machinereadable;
+ } else { # $is_new{$pkg} is true!!!
+- #
++ #
+ # NEW PACKAGES
+ #
+ if ($opts{"no-auto-install"}) {
+@@ -3571,7 +3574,7 @@ sub action_update {
+ if ($#found_pkgs == 0 && $found_pkgs[0] =~ m/^$pkg:/) {
+ # only one package has been returned and it
+ # matches the current package followed by a colon
+- # remember the TLPDB->find_file returns
++ # remember the TLPDB->find_file returns
+ # $pkg:$file
+ # in this case we can ignore it
+ $bad_file = 0;
+@@ -3596,7 +3599,7 @@ sub action_update {
+ #unlink("$Master/$f");
+ debug("removing disappearing file $f\n");
+ }
+- }
++ }
+ } # end of if ($opts{"list"}) ... else part
+
+ # check if any additional updates are asked for
+@@ -3626,7 +3629,7 @@ sub action_update {
+ for my $f (@infra_files_to_be_removed) {
+ debug("file scheduled for removal $f\n");
+ }
+- my $ret = write_w32_updater($restart_tlmgr,
++ my $ret = write_w32_updater($restart_tlmgr,
+ \@infra_files_to_be_removed, @critical);
+ if ($ret) {
+ tlwarn ("$prg: Aborting infrastructure update.\n");
+@@ -3647,8 +3650,8 @@ sub action_update {
+ return($F_ERROR);
+ }
+
+- # for --dry-run we cannot restart tlmgr (no way to fake successful
+- # infra update) instead we call action_update() again and signal this
++ # for --dry-run we cannot restart tlmgr (no way to fake successful
++ # infra update) instead we call action_update() again and signal this
+ # by $opts{"dry-run"} = -1
+ if ($opts{"dry-run"} && !$opts{"list"} && $restart_tlmgr) {
+ $opts{"self"} = 0;
+@@ -3659,7 +3662,7 @@ sub action_update {
+ $ret |= action_update();
+ return ($ret);
+ }
+-
++
+ # if a real update from default disk location didn't find anything,
+ # warn if nothing is updated. Unless they said --self, in which case
+ # we've already reported it.
+@@ -3691,7 +3694,7 @@ sub check_announce_format_triggers {
+
+
+ sub check_announce_format_triggers {
+- # we treat new and updated packages the same as updated
++ # we treat new and updated packages the same as updated
+ # when it comes to triggers
+ my %updpacks = map { $_ => 1 } @_;
+
+@@ -3875,7 +3878,7 @@ sub action_install {
+ defined($sizes{'__TOTAL__'}) || ($sizes{'__TOTAL__'} = 0);
+ my $totalsize = $sizes{'__TOTAL__'};
+ my $donesize = 0;
+-
++
+ print "total-bytes\t$sizes{'__TOTAL__'}\n" if $::machinereadable;
+ print "end-of-header\n" if $::machinereadable;
+
+@@ -3986,7 +3989,7 @@ sub show_one_package_json {
+ my $tlp = ($is_installed ? $loctlp : $remtlp);
+ #my $tlp = ($is_available ? $remtlp : $loctlp);
+ # add available, installed, lrev, rrev fields and remove revision field
+- my $str = $tlp->as_json(available => ($is_available ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()),
++ my $str = $tlp->as_json(available => ($is_available ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()),
+ installed => ($is_installed ? TeXLive::TLUtils::True() : TeXLive::TLUtils::False()),
+ lrev => ($is_installed ? $loctlp->revision : 0),
+ rrev => ($is_available ? $remtlp->revision : 0),
+@@ -4288,14 +4291,14 @@ sub show_one_package_detail {
+ my $sizestr = "";
+ if ($tlp->category ne "Collection" && $tlp->category ne "Scheme") {
+ my $srcsize = $tlp->srcsize * $TeXLive::TLConfig::BlockSize;
+- $sizestr = sprintf("%ssrc: %dk", $sizestr, int($srcsize / 1024) + 1)
++ $sizestr = sprintf("%ssrc: %dk", $sizestr, int($srcsize / 1024) + 1)
+ if ($srcsize > 0);
+ my $docsize = $tlp->docsize * $TeXLive::TLConfig::BlockSize;
+- $sizestr .= sprintf("%sdoc: %dk",
++ $sizestr .= sprintf("%sdoc: %dk",
+ ($sizestr ? ", " : ""), int($docsize / 1024) + 1)
+ if ($docsize > 0);
+ my $runsize = $tlp->runsize * $TeXLive::TLConfig::BlockSize;
+- $sizestr .= sprintf("%srun: %dk",
++ $sizestr .= sprintf("%srun: %dk",
+ ($sizestr ? ", " : ""), int($runsize / 1024) + 1)
+ if ($runsize > 0);
+ # check for .ARCH expansions
+@@ -4624,7 +4627,7 @@ sub action_repository {
+ return ($F_ERROR);
+ }
+ # check if it is either url or absolute path
+- if (($p !~ m!^(https?|ftp)://!i) && ($p !~ m!$TeXLive::TLUtils::SshURIRegex!) &&
++ if (($p !~ m!^(https?|ftp)://!i) && ($p !~ m!$TeXLive::TLUtils::SshURIRegex!) &&
+ !File::Spec->file_name_is_absolute($p)) {
+ tlwarn("$prg: neither https?/ftp/ssh/scp/file URI nor absolute path, no action: $p\n");
+ return ($F_ERROR);
+@@ -4697,7 +4700,7 @@ sub action_repository {
+ }
+ if (!$remotetlpdb->is_virtual) {
+ my $verstat = $remotetlpdb->verification_status;
+- print "main ", $remotetlpdb->location, " ",
++ print "main ", $remotetlpdb->location, " ",
+ ($::machinereadable ? "$verstat " : ""),
+ $VerificationStatusDescription{$verstat}, "\n";
+ return ($F_OK);
+@@ -5179,7 +5182,7 @@ sub action_generate {
+ ("fmtutil-sys $common_fmtutil_args --byhyphen \"$dest\"");
+ } else {
+ info("To make the newly-generated language.dat.lua take effect,"
+- . " run fmtutil-sys --byhyphen $dest.\n");
++ . " run fmtutil-sys --byhyphen $dest.\n");
+ }
+ }
+ if ($what =~ m/^language(\.dat)?$/i) {
+@@ -5195,7 +5198,7 @@ sub action_generate {
+ ("fmtutil-sys $common_fmtutil_args --byhyphen \"$dest\"");
+ } else {
+ info("To make the newly-generated language.dat take effect,"
+- . " run fmtutil-sys --byhyphen $dest.\n");
++ . " run fmtutil-sys --byhyphen $dest.\n");
+ }
+ }
+ if ($what =~ m/^language(\.def)?$/i) {
+@@ -5230,7 +5233,7 @@ sub action_generate {
+ do_cmd_and_check("fmtutil-sys $common_fmtutil_args --all");
+ } else {
+ info("To make the newly-generated fmtutil.cnf take effect,"
+- . " run fmtutil-sys --all.\n");
++ . " run fmtutil-sys --all.\n");
+ }
+
+ } elsif ($what =~ m/^updmap$/i) {
+@@ -5320,7 +5323,7 @@ Error message from creating MainWindow:
+
+ # UNINSTALL
+ # Return zero if successful, nonzero if failure.
+-#
++#
+ sub uninstall_texlive {
+ if (wndws()) {
+ printf STDERR "Please use \"Add/Remove Programs\" from the Control Panel "
+@@ -5348,7 +5351,7 @@ sub uninstall_texlive {
+ }
+ }
+ print "Ok, removing the whole TL installation under: $tlroot\n";
+-
++
+ # Must use kpsewhich before removing it.
+ chomp (my $texmfsysconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`);
+ chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`);
+@@ -5372,24 +5375,23 @@ sub uninstall_texlive {
+ system("rm", "-rf", "$Master/bin");
+
+ # In case SYS{VAR,CONFIG} were configured with different values.
+- # Above we remove the hardwired $Master/texmf-{config,var}
++ # Above we remove the hardwired $Master/texmf-{config,var}
+ # if present, assuming the user did not pathologically configure things.
+ system("rm", "-rf", "$texmfsysconfig");
+ system("rm", "-rf", "$texmfsysvar");
+
+ print "misc... ";
+- 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 install-tl.log
+ 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");
+ }
+- finddepth(sub { rmdir; }, $Master);
+ rmdir($Master);
+ print "done.\n";
+-
++
+ # don't remove user dirs, which may have been abused.
+ if (-d $texmfconfig || -d $texmfvar) {
+ print <<NOT_REMOVED;
+@@ -5405,7 +5407,7 @@ NOT_REMOVED
+ print "\nSorry, something did not get removed under: $Master\n";
+ $remnants = 1;
+ } else {
+- $remnants = 0;
++ $remnants = 0;
+ }
+ return $remnants;
+ }
+@@ -5504,7 +5506,7 @@ sub init_tltree {
+ sub init_tltree {
+ my ($svn) = @_;
+
+- # if we are on W32, die (no find).
++ # if we are on W32, die (no find).
+ my $arch = $localtlpdb->platform();
+ if ($arch eq "windows") {
+ tldie("$prg: sorry, cannot check this on Windows.\n");
+@@ -5656,7 +5658,7 @@ sub check_files {
+ }
+
+ # Check for runtime files with the same name but different contents.
+-#
++#
+ sub check_runfiles {
+ my $Master = $localtlpdb->root;
+
+@@ -5673,7 +5675,7 @@ sub check_runfiles {
+ my $tlp = $localtlpdb->get_package($tlpn);
+ my @files = $tlp->runfiles;
+ if ($tlp->relocated) {
+- for (@files) {
++ for (@files) {
+ s!^$TeXLive::TLConfig::RelocPrefix/!$TeXLive::TLConfig::RelocTree/!;
+ }
+ }
+@@ -5909,7 +5911,7 @@ sub check_executes {
+ if (",$TeXLive::TLConfig::PartialEngineSupport," =~ /,$engine,/) {
+ # luajit[hb]tex is special since it is not available on all architectures
+ # due to inherent reasons (machine code);
+- #
++ #
+ # We do not want to have error messages here, so we do the following:
+ # * if tlpkg/tlpsrc/luajittex.tlpsrc is available, then load it
+ # and filter away those archs that are excluded with f/!...
+@@ -6146,10 +6148,10 @@ sub check_texmfdbs {
+ }
+
+ # POSTACTION
+-#
++#
+ # explicitly run the various post actions, e.g.,
+ # on a client system or overriding global settings.
+-#
++#
+ # tlmgr postaction [--windowsmode=user|admin] [--fileassocmode=1|2] [--all]
+ # [install|remove] [shortcut|fileassoc|script] [<pkg>...]
+
+@@ -6256,7 +6258,7 @@ sub action_postaction {
+
+
+ # INIT-USERTREE
+-#
++#
+ # sets up the user tree for tlmgr in user mode
+ sub action_init_usertree {
+ # init_local_db but do not die if localtlpdb is not found!
+@@ -6300,7 +6302,7 @@ sub action_init_usertree {
+
+
+ # CONF
+-#
++#
+ # tries to mimic texconfig conf but can also set values for both tlmgr
+ # and texmf conf files.
+ #
+@@ -6325,7 +6327,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`) ) ;
+@@ -6437,7 +6439,7 @@ sub action_conf {
+ if (defined($opts{'delete'})) {
+ if (defined($cf->value($key))) {
+ info("$prg: removing setting $arg $key value: " . $cf->value($key)
+- . "from $fn\n");
++ . "from $fn\n");
+ $cf->delete_key($key);
+ } else {
+ info("$prg: $arg $key not defined, cannot remove ($fn)\n");
+@@ -6535,7 +6537,7 @@ sub texconfig_conf_mimic {
+ # tlmgr key list
+ # tlmgr key add <filename>
+ # tlmgr key remove <keyid>
+-#
++#
+ sub action_key {
+ my $arg = shift @ARGV;
+
+@@ -6569,7 +6571,7 @@ sub action_key {
+ return $F_ERROR;
+ }
+ debug("running: $::gpg --primary-keyring repository-keys.gpg --delete-key $what\n");
+- my ($out, $ret) =
++ my ($out, $ret) =
+ TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --delete-key \"$what\" 2>&1");
+ if ($ret == 0) {
+ info("$prg: key successfully removed\n");
+@@ -6578,7 +6580,7 @@ sub action_key {
+ tlwarn("$prg: key removal failed, output:\n$out\n");
+ return $F_ERROR;
+ }
+-
++
+ } elsif ($arg eq 'add') {
+ my $what = shift @ARGV;
+ if (!$what) {
+@@ -6591,7 +6593,7 @@ sub action_key {
+ close(FOO);
+ }
+ debug("running: $::gpg --primary-keyring repository-keys.gpg --import $what\n");
+- my ($out, $ret) =
++ my ($out, $ret) =
+ TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --import \"$what\" 2>&1");
+ if ($ret == 0) {
+ info("$prg: key successfully imported\n");
+@@ -6603,7 +6605,7 @@ sub action_key {
+ } else {
+ tldie("$prg: should not be reached: tlmgr key $arg\n");
+ }
+-
++
+ } else {
+ tlwarn("$prg: unknown directive `$arg' to action `key'\n");
+ return $F_ERROR;
+@@ -6614,14 +6616,14 @@ sub action_key {
+
+ # SHELL
+ # interactive shell.
+-#
++#
+ sub action_shell {
+ my $protocol = 1;
+ my $default_prompt = "tlmgr>";
+ # keys which can be set/get and are also settable via global cmdline opts
+ my @valid_bool_keys
+ = qw/debug-translation machine-readable no-execute-actions
+- verify-repo json/;
++ verify-repo json/;
+ my @valid_string_keys = qw/repository prompt/;
+ my @valid_keys = (@valid_bool_keys, @valid_string_keys);
+ # set auto flush unconditionally in action shell
+@@ -6931,7 +6933,7 @@ sub init_local_db {
+ # we normalize the path only if it is
+ # - a url starting with neither http or ftp
+ # - if we are on Windows, it does not start with Drive:[\/]
+- if (! ( $location =~ m!^(https?|ftp)://!i ||
++ if (! ( $location =~ m!^(https?|ftp)://!i ||
+ $location =~ m!$TeXLive::TLUtils::SshURIRegex!i ||
+ (wndws() && (!(-e $location) || ($location =~ m!^.:[\\/]!) ) ) ) ) {
+ # seems to be a local path, try to normalize it
+@@ -7102,7 +7104,7 @@ END_NO_CHECKSUMS
+ $verstat = ": ";
+ $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb('main')->verification_status};
+ }
+- info("\tmain = " . $repos{'main'} . " (" .
++ info("\tmain = " . $repos{'main'} . " (" .
+ ($remotetlpdb->virtual_get_tlpdb('main')->is_verified ? "" : "not ") .
+ "verified$verstat)\n");
+ for my $t (@tags) {
+@@ -7132,7 +7134,7 @@ sub _init_tlmedia {
+ my $silent = shift;
+ # if we are already initialized to the same location, nothing
+ # needs to be done.
+- # if we are initialized to a virtual tlpdb, then we have to
++ # if we are initialized to a virtual tlpdb, then we have to
+ # do in any case an initialization
+ if (defined($remotetlpdb) && !$remotetlpdb->is_virtual &&
+ ($remotetlpdb->root eq $location)) {
+@@ -7167,7 +7169,7 @@ sub _init_tlmedia {
+ $verstat = ": ";
+ $verstat .= $VerificationStatusDescription{$remotetlpdb->verification_status};
+ }
+- info("$prg: package repository $location (" .
++ info("$prg: package repository $location (" .
+ ($remotetlpdb->is_verified ? "" : "not ") . "verified$verstat)\n");
+ }
+ return 1;
+@@ -7204,7 +7206,7 @@ sub setup_one_remotetlpdb {
+ # first check that the saved tlpdb is present at all
+ my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
+ my $loc_copy_of_remote_tlpdb =
+- ($is_main ?
++ ($is_main ?
+ "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" :
+ "$Master/$InfraLocation/texlive.tlpdb.$loc_digest");
+ ddebug("loc_digest = $loc_digest\n");
+@@ -7369,7 +7371,7 @@ FROZEN
+ if (!$local_copy_tlpdb_used && $location =~ m;^(https?|ftp)://;) {
+ my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
+ my $loc_copy_of_remote_tlpdb =
+- ($is_main ?
++ ($is_main ?
+ "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" :
+ "$Master/$InfraLocation/texlive.tlpdb.$loc_digest");
+ my $tlfh;
+@@ -7439,7 +7441,7 @@ sub load_config_file {
+ chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
+ my $fnsys = "$TEXMFSYSCONFIG/tlmgr/config";
+ my $tlmgr_sys_config_file = TeXLive::TLConfFile->new($fnsys, "#", "=");
+- load_options_from_config($tlmgr_sys_config_file, 'sys')
++ load_options_from_config($tlmgr_sys_config_file, 'sys')
+ if $tlmgr_sys_config_file;
+
+ chomp (my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
+@@ -7652,12 +7654,12 @@ sub logcommand {
+ }
+
+
+-# resolve relative paths from tlpdb wrt tlroot
++# resolve relative paths from tlpdb wrt tlroot
+ sub norm_tlpdb_path {
+ my ($path) = @_;
+ return if (!defined($path));
+ $path =~ s!\\!/!;
+- # just return if absolute path
++ # just return if absolute path
+ return $path if ($path =~ m!^/|:!);
+ init_local_db() unless defined($localtlpdb);
+ return $localtlpdb->root . "/$path";
+@@ -7960,7 +7962,7 @@ If the repository is on the network, trailing C</> cha
+ =back
+
+ If the repository is on the network, trailing C</> characters and/or
+-trailing C</tlpkg> and/or C</archive> components are ignored.
++trailing C</tlpkg> and/or C</archive> components are ignored.
+
+ =item B<--gui> [I<action>]
+
+@@ -7979,7 +7981,7 @@ TeX Live's Perl distribution for Windows. You may find
+
+ However, the native GUI requires Perl/TK, which is no longer included in
+ TeX Live's Perl distribution for Windows. You may find C<tlshell> or
+-C<tlcockpit> easier to work with.
++C<tlcockpit> easier to work with.
+
+
+ =for comment Keep language list in sync with install-tl.
+@@ -8246,7 +8248,7 @@ out).
+ the given configuration file is entirely removed (not just commented
+ out).
+
+-If I<value> is given in addition, I<key> is set to I<value> in the
++If I<value> is given in addition, I<key> is set to I<value> in the
+ respective file. I<No error checking is done!>
+
+ The C<PATH> value shown by C<conf> is as used by C<tlmgr>. The
+@@ -8256,7 +8258,7 @@ enabled during installation, you can disable it afterw
+ Here is a practical example of changing configuration values. If the
+ execution of (some or all) system commands via C<\write18> was left
+ enabled during installation, you can disable it afterwards:
+-
++
+ tlmgr conf texmf shell_escape 0
+
+ The subcommand C<auxtrees> allows adding and removing arbitrary
+@@ -8371,7 +8373,7 @@ one of these:
+ %!NAME
+ --!NAME
+
+-where C<language.dat> and C<language.def> use C<%>,
++where C<language.dat> and C<language.def> use C<%>,
+ and C<language.dat.lua> use C<-->. In all cases, the I<name> is
+ the respective format name or hyphenation pattern identifier.
+ Examples:
+@@ -8502,7 +8504,7 @@ C<--only-installed> and C<--only-remote> cannot both b
+
+ =item B<--data C<item1,item2,...>>
+
+-If the option C<--data> is given, its argument must be a comma or colon
++If the option C<--data> is given, its argument must be a comma or colon
+ separated list of field names from: C<name>, C<category>, C<localrev>,
+ C<remoterev>, C<shortdesc>, C<longdesc>, C<installed>, C<size>,
+ C<relocatable>, C<depends>, C<cat-version>, C<cat-date>, C<cat-license>,
+@@ -8827,7 +8829,7 @@ is issued that the caller does not have enough privile
+
+ =back
+
+-=head2 pinning
++=head2 pinning
+
+ The C<pinning> action manages the pinning file, see L</Pinning> below.
+
+@@ -8870,8 +8872,8 @@ I<platform> to the installation from the repository.
+ C<platform add> I<platform>... adds the executables for each given platform
+ I<platform> to the installation from the repository.
+
+-C<platform remove> I<platform>... removes the executables for each given
+-platform I<platform> from the installation, but keeps the currently
++C<platform remove> I<platform>... removes the executables for each given
++platform I<platform> from the installation, but keeps the currently
+ running platform in any case.
+
+ C<platform set> I<platform> switches TeX Live to always use the given
+@@ -8879,7 +8881,7 @@ C<platform set auto> switches TeX Live to auto detecti
+
+ C<platform set auto> switches TeX Live to auto detection mode for platform.
+
+-Platform detection is needed to select the proper C<xz> and
++Platform detection is needed to select the proper C<xz> and
+ C<wget> binaries that are shipped with TeX Live.
+
+ C<arch> is a synonym for C<platform>.
+@@ -9061,7 +9063,7 @@ extending to the end of line.
+ = a textual description of the verification status, as the last field
+ extending to the end of line.
+
+-=back
++=back
+
+ That is, in normal (not machine-readable) output, the third field
+ (numeric verification status) is not present.
+@@ -9081,7 +9083,7 @@ Restore a package from a previously-made backup.
+
+ Restore a package from a previously-made backup.
+
+-If C<--all> is given, try to restore the latest revision of all
++If C<--all> is given, try to restore the latest revision of all
+ package backups found in the backup directory.
+
+ Otherwise, if neither I<pkg> nor I<rev> are given, list the available
+@@ -9314,7 +9316,7 @@ Concisely list the packages which would be updated, ne
+ =item B<--list> [I<pkg>]
+
+ Concisely list the packages which would be updated, newly installed, or
+-removed, without actually changing anything.
++removed, without actually changing anything.
+ If C<--all> is also given, all available updates are listed.
+ If C<--self> is given, but not C<--all>, only updates to the
+ critical packages (tlmgr, texlive infrastructure, perl on Windows, etc.)
+@@ -9343,7 +9345,7 @@ supported in these circumstances.
+ removed package, C<tlmgr> quits with an error message. Excludes are not
+ supported in these circumstances.
+
+-This option can also be set permanently in the tlmgr config file with
++This option can also be set permanently in the tlmgr config file with
+ the key C<update-exclude>.
+
+ =item B<--no-auto-remove> [I<pkg>...]
+@@ -9426,7 +9428,7 @@ See above under L<install|/install [I<option>...] I<pk
+
+ =item B<--force>
+
+-Force update of normal packages, without updating C<tlmgr> itself
++Force update of normal packages, without updating C<tlmgr> itself
+ (unless the C<--self> option is also given). Not recommended.
+
+ Also, C<update --list> is still performed regardless of this option.
+@@ -9658,7 +9660,7 @@ just as in normal mode.
+ In user mode, these actions check that all packages to be acted on are
+ installed in the user tree before proceeding; otherwise, they behave
+ just as in normal mode.
+-
++
+ =head2 User mode generate, option, paper
+
+ In user mode, these actions operate only on the user tree's
+@@ -9666,7 +9668,7 @@ configuration files and/or C<texlive.tlpdb>.
+
+ =head2 User mode logs
+
+-In user mode, C<tlmgr.log> and <tlmgr-commands.log> are written in the
++In user mode, C<tlmgr.log> and <tlmgr-commands.log> are written in the
+ C<TEXMFVAR/web2c/> directlry instead of C<TEXMFSYSVAR/web2c/>.
+
+ =head1 MULTIPLE REPOSITORIES
+@@ -10006,7 +10008,7 @@ information it needs by reading stdout.
+ written to stdout). The idea is that a program can get all the
+ information it needs by reading stdout.
+
+-Currently this option only applies to the
++Currently this option only applies to the
+ L<update|/update [I<option>...] [I<pkg>...]>,
+ L<install|/install [I<option>...] I<pkg>...>, and
+ L</option> actions.
+@@ -10031,7 +10033,7 @@ downloaded, i.e., the size of the compressed tar file
+ revision numbers in the local installation and server repository,
+ respectively. The I<size> field is the number of bytes to be
+ downloaded, i.e., the size of the compressed tar file for a network
+-installation, not the unpacked size. The runtime and esttot fields
++installation, not the unpacked size. The runtime and esttot fields
+ are only present for updated and auto-install packages, and contain
+ the currently passed time since start of installation/updates
+ and the estimated total time.
+@@ -10179,7 +10181,7 @@ If xz is available (either from the system or TL) and
+ =item 4.
+
+ If xz is available (either from the system or TL) and working, use that.
+-
++
+ =back
+
+ lz4 and gzip are faster in creating tlmgr's local backups, hence they
diff --git a/print/texlive-tlmgr/pkg-plist b/print/texlive-tlmgr/pkg-plist
index 09c8ce55a58a..d0dc27101037 100644
--- 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