aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-05-11 16:19:37 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-05-29 18:34:04 +0000
commit7a740b7c908f95b55bf765364c1234b3f6750196 (patch)
tree7feae3dbce73e6e7e18b5b8433c521f70e124f09
parent36dd1bcd0cb0c18d9474433aed2ae90381ea9036 (diff)
downloadports-7a740b7c908f95b55bf765364c1234b3f6750196.tar.gz
ports-7a740b7c908f95b55bf765364c1234b3f6750196.zip
*/tex*: Update version 20230313=>20240312
- devel/tex-kpathsea: Update version 6.3.5=>6.4.0 - devel/tex-libtexlua: Update distinfo - devel/tex-synctex: Update distinfo - devel/tex-web2c: Update version 20230313=>20240312 - japanese/tex-ptex: Update distinfo - print/tex-basic-engines: Update version 20230313=>20240312 - print/tex-dvipdfmx: Update version 20230313=>20240312 - print/tex-dvipsk: Update version 20230313=>20240312 - print/tex-jadetex: Update version 20230313=>20240312 - print/tex-luatex: Update version 20230313=>20240312 - print/tex-ptexenc: Update version 1.4.3=>1.4.6 - print/tex-xdvik: Bump REVISION - print/tex-xetex: Update verison 0.99993=>20240312 - print/tex-xmltex: Update verison 1.9=>20240312 - print/texlive-base: Update version 20230313=>20240312 - print/texlive-docs: Update version 20230313=>20240312 - print/texlive-texmf-source: Update version 20230313=>20240312 - print/texlive-texmf: Update version 20230313=>20240312 - print/texlive-tlmgr: Update version 20230313=>20240312 - print/xpdfopen: Update version 0.86=>20240312 Sponsored by: Nepustil
-rw-r--r--Mk/Uses/tex.mk4
-rw-r--r--UPDATING14
-rw-r--r--devel/tex-kpathsea/Makefile4
-rw-r--r--devel/tex-kpathsea/distinfo6
-rw-r--r--devel/tex-kpathsea/files/patch-Makefile.in4
-rw-r--r--devel/tex-kpathsea/files/patch-texmf.cnf128
-rw-r--r--devel/tex-libtexlua/Makefile4
-rw-r--r--devel/tex-libtexlua/distinfo6
-rw-r--r--devel/tex-libtexluajit/Makefile4
-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.in1312
-rw-r--r--devel/tex-synctex/files/patch-man_Makefile.in (renamed from devel/tex-synctex/files/patch-man-Makefile.in)26
-rw-r--r--devel/tex-web2c/Makefile8
-rw-r--r--devel/tex-web2c/distinfo6
-rw-r--r--devel/tex-web2c/files/patch-Makefile.in1304
-rw-r--r--devel/tex-web2c/files/patch-man_Makefile.in (renamed from devel/tex-web2c/files/patch-man-Makefile.in)4
-rw-r--r--japanese/tex-ptex/Makefile12
-rw-r--r--japanese/tex-ptex/distinfo10
-rw-r--r--japanese/tex-ptex/files/patch-Makefile.in1337
-rw-r--r--japanese/tex-ptex/files/patch-configure97
-rw-r--r--print/tex-basic-engines/Makefile3
-rw-r--r--print/tex-basic-engines/distinfo6
-rw-r--r--print/tex-basic-engines/files/patch-Makefile.in1311
-rw-r--r--print/tex-basic-engines/files/patch-man_Makefile.in (renamed from print/tex-basic-engines/files/patch-man-Makefile.in)36
-rw-r--r--print/tex-dvipdfmx/Makefile3
-rw-r--r--print/tex-dvipdfmx/distinfo10
-rw-r--r--print/tex-dvipsk/Makefile18
-rw-r--r--print/tex-dvipsk/distinfo10
-rw-r--r--print/tex-dvipsk/files/patch-configure19
-rw-r--r--print/tex-jadetex/Makefile3
-rw-r--r--print/tex-jadetex/distinfo6
-rw-r--r--print/tex-luatex/Makefile5
-rw-r--r--print/tex-luatex/distinfo10
-rw-r--r--print/tex-luatex/files/patch-Makefile.in1346
-rw-r--r--print/tex-ptexenc/Makefile2
-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-configure26
-rw-r--r--print/tex-xdvik/Makefile12
-rw-r--r--print/tex-xetex/Makefile5
-rw-r--r--print/tex-xetex/distinfo10
-rw-r--r--print/tex-xetex/files/patch-Makefile.in1312
-rw-r--r--print/tex-xetex/files/patch-configure36
-rw-r--r--print/tex-xmltex/Makefile3
-rw-r--r--print/tex-xmltex/distinfo6
-rw-r--r--print/tex-xmltex/pkg-plist2
-rw-r--r--print/texlive-base/Makefile4
-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.in14
-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_lcdf-typetools_lcdf-typetools-src_Makefile.in4
-rw-r--r--print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in14
-rw-r--r--print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl8
-rw-r--r--print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam26
-rw-r--r--print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in6
-rw-r--r--print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf52
-rw-r--r--print/texlive-base/files/patch-texk_ttf2pk2_configure4
-rw-r--r--print/texlive-base/pkg-plist2
-rw-r--r--print/texlive-docs/Makefile2
-rw-r--r--print/texlive-docs/distinfo6
-rw-r--r--print/texlive-texmf-source/Makefile13
-rw-r--r--print/texlive-texmf-source/distinfo6
-rw-r--r--print/texlive-texmf/Makefile10
-rw-r--r--print/texlive-texmf/distinfo6
-rw-r--r--print/texlive-tlmgr/Makefile30
-rw-r--r--print/texlive-tlmgr/distinfo12
-rw-r--r--print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl1294
-rw-r--r--print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl71
-rw-r--r--print/xpdfopen/Makefile4
-rw-r--r--print/xpdfopen/distinfo6
75 files changed, 488 insertions, 9648 deletions
diff --git a/Mk/Uses/tex.mk b/Mk/Uses/tex.mk
index c62df38e53ec..a9658b7d6500 100644
--- a/Mk/Uses/tex.mk
+++ b/Mk/Uses/tex.mk
@@ -91,8 +91,8 @@ TEXMFVARDIR?= share/texmf-var
TEXMFCONFIGDIR?=share/texmf-config
FMTUTIL_CNF?= ${TEXMFCONFIGDIR}/web2c/fmtutil.cnf
TEXHASHDIRS?= ${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXMFCONFIGDIR}
-TEXLIVE_YEAR?= 2023
-TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0313
+TEXLIVE_YEAR?= 2024
+TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0312
DISTNAME_TEXMF= texlive-${TEXLIVE_VERSION}-texmf
.for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF
diff --git a/UPDATING b/UPDATING
index f0077905cb2d..fb8804a9bc68 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,20 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20240529:
+ AFFECTS: users of TeX*
+ AUTHOR: bofh@FreeBSD.org
+
+ TeX system has been updated to 2024 from 2023. Normal pkg upgrade or
+ portmaster -a should handle all the upgrade properly. In case not please
+ create a ticket or send a mail to tex@FreeBSD.org
+
+ Previously users have reported to delete texlive-texmf prior to
+ starting update, or pkg-static will indicate there is a conflict
+ during the upgrade of texlive-base :
+
+ # pkg remove texlive-texmf
+
+20240529:
AFFECTS: users of python
AUTHOR: rm@FreeBSD.org
diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
index cf03c00fc387..b3e816e349d3 100644
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@@ -1,6 +1,5 @@
PORTNAME= kpathsea
-PORTVERSION= 6.3.5
-PORTREVISION= 1
+DISTVERSION= 6.4.0
CATEGORIES= devel
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
@@ -16,7 +15,6 @@ USES= libtool pathfix tar:xz tex
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
INSTALL_TARGET= install-strip
diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo
index 01e363d09aaf..868ccf1bb864 100644
--- a/devel/tex-kpathsea/distinfo
+++ b/devel/tex-kpathsea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680449457
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715395808
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in
index ccaf8dc65e6a..720660f15034 100644
--- a/devel/tex-kpathsea/files/patch-Makefile.in
+++ b/devel/tex-kpathsea/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig 2023-04-02 15:35:03 UTC
+--- Makefile.in.orig 2024-05-11 23:34:39 UTC
+++ Makefile.in
@@ -364,7 +364,7 @@ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
*) (install-info --version) >/dev/null 2>&1;; \
@@ -9,7 +9,7 @@
$(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -2103,7 +2103,7 @@ installdirs-am:
+@@ -2104,7 +2104,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 d66797fc00a9..cb7f2f056fbc 100644
--- a/devel/tex-kpathsea/files/patch-texmf.cnf
+++ b/devel/tex-kpathsea/files/patch-texmf.cnf
@@ -1,36 +1,15 @@
---- texmf.cnf.orig 2023-02-25 22:59:04 UTC
+--- texmf.cnf.orig 2024-02-23 16:44:23 UTC
+++ texmf.cnf
-@@ -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),
+@@ -59,7 +59,7 @@
% SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
% SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
% Sorry for the off-by-one-generation names.
-TEXMFROOT = $SELFAUTOPARENT
+TEXMFROOT = $SELFAUTODIR/share
- % The main tree of distributed packages and programs:
- TEXMFDIST = $TEXMFROOT/texmf-dist
-@@ -69,7 +69,7 @@ TEXMFMAIN = $TEXMFDIST
+ % The various texmf trees used by TeX Live, follow.
+ % They must must all have the TDS directory structure (https://tug.org/tds).
+@@ -72,7 +72,7 @@ TEXMFMAIN = $TEXMFDIST
TEXMFMAIN = $TEXMFDIST
% Local additions to the distribution trees.
@@ -39,79 +18,7 @@
% TEXMFSYSVAR, where *-sys store cached runtime data.
TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -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,\
+@@ -583,6 +583,7 @@ $SELFAUTOLOC/texmf/web2c,\
$SELFAUTOLOC/texmf-dist/web2c,\
$SELFAUTOLOC/texmf/web2c,\
\
@@ -119,24 +26,7 @@
$SELFAUTODIR,\
$SELFAUTODIR/share/texmf-local/web2c,\
$SELFAUTODIR/share/texmf-dist/web2c,\
-@@ -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
+@@ -832,7 +833,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.
@@ -145,7 +35,7 @@
% Maximum number of strings.
max_strings = 500000
% Min pool space left after loading .fmt.
-@@ -825,7 +826,7 @@ strings_free = 100
+@@ -844,7 +845,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.
@@ -154,7 +44,7 @@
% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in
% the sources), but we don't need that much. The value here suffices
-@@ -837,8 +838,8 @@ hyph_size = 8191 % prime number of hyphenation
+@@ -856,8 +857,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.
diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile
index d585124d12a4..84984da0107f 100644
--- a/devel/tex-libtexlua/Makefile
+++ b/devel/tex-libtexlua/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libtexlua
-PORTVERSION= 5.3.6
-PORTREVISION= 1
+DISTVERSION= 5.3.6
+PORTREVISION= 2
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 3e66aa4907af..cbb0b7d2b6b8 100644
--- a/devel/tex-libtexlua/distinfo
+++ b/devel/tex-libtexlua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680473625
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715392237
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
index c8e5e01c67db..d3b28d3abd3f 100644
--- a/devel/tex-libtexluajit/Makefile
+++ b/devel/tex-libtexluajit/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libtexluajit
-PORTVERSION= 2.1.0
-PORTREVISION= 2
+DISTVERSION= 2.1.0
+PORTREVISION= 3
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 959e16ad385d..b890827824f2 100644
--- a/devel/tex-libtexluajit/distinfo
+++ b/devel/tex-libtexluajit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680474121
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715470181
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile
index 0108802c033a..9af97f07f317 100644
--- a/devel/tex-synctex/Makefile
+++ b/devel/tex-synctex/Makefile
@@ -1,6 +1,6 @@
PORTNAME= synctex
-PORTVERSION= 2.0.0
-PORTREVISION= 3
+DISTVERSION= 2.0.0
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
diff --git a/devel/tex-synctex/distinfo b/devel/tex-synctex/distinfo
index a00c4263f5e7..9b7eb22af8f6 100644
--- a/devel/tex-synctex/distinfo
+++ b/devel/tex-synctex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680563845
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715471845
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in
index 6bf9346c3b06..76462cf87b25 100644
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-04-03 23:25:20 UTC
+--- Makefile.in.orig 2024-05-11 23:58:42 UTC
+++ Makefile.in
-@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -102,9 +102,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)
@@ -11,7 +11,7 @@
$(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__
+@@ -114,7 +112,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)
@@ -20,92 +20,7 @@
$(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)
+@@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -114,1223 +29,12 @@
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
+@@ -3655,8 +3653,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
+ $(am__append_78) $(am__append_79) $(am__append_80) \
+ $(am__append_94) $(am__append_99) $(am__append_104) \
+ $(am__append_109)
diff --git a/devel/tex-synctex/files/patch-man-Makefile.in b/devel/tex-synctex/files/patch-man_Makefile.in
index d5ba9febe698..1650d55a5f10 100644
--- a/devel/tex-synctex/files/patch-man-Makefile.in
+++ b/devel/tex-synctex/files/patch-man_Makefile.in
@@ -1,6 +1,6 @@
---- man/Makefile.in.orig 2023-04-03 23:22:42 UTC
+--- man/Makefile.in.orig 2024-05-12 00:07:34 UTC
+++ man/Makefile.in
-@@ -171,11 +171,11 @@ am__v_GEN_0 = @echo " GEN " $@;
+@@ -173,11 +173,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 " $@;
@@ -14,7 +14,7 @@
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
-@@ -461,16 +461,12 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
+@@ -466,16 +466,13 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
ppltotf.man ptftopl.man pbibtex.man luatex.man xetex.man \
$(otangle_man_sources) aleph.man $(misc_man_sources) spell.add
@@ -22,19 +22,19 @@
+bootstrap_man_sources =
# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
--man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
-- ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
-+man1_links = $(am__append_3) $(am__append_5) \
- $(am__append_6) $(am__append_10) $(am__append_12) \
-- $(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)
+-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-proofsort \
+- ctwill:ctwill-refsort ctwill:ctwill-twinx $(am__append_2) \
++man1_links = $(am__append_2) \
+ $(am__append_4) $(am__append_6) $(am__append_7) \
+ $(am__append_11) $(am__append_13) $(am__append_15) \
+- $(am__append_18) 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_18)
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 twill.man \
-@@ -478,11 +474,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.
+@@ -483,11 +480,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 18ee3e7a937a..0e68ce615fb3 100644
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@@ -1,6 +1,5 @@
PORTNAME= web2c
-PORTVERSION= ${TEXLIVE_VERSION}
-PORTREVISION= 1
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= devel
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
PKGNAMEPREFIX= tex-
@@ -13,19 +12,19 @@ COMMENT= TeX implementation translating WEB to C
LICENSE= LGPL21+
LIB_DEPENDS= libgmp.so:math/gmp \
+ libmpfi.so:math/mpfi \
libmpfr.so:math/mpfr \
libopenjp2.so:graphics/openjpeg \
libpng.so:graphics/png \
libzzip.so:devel/zziplib
-USES= gnome libtool localbase pathfix pkgconfig tar:xz tex xorg
+USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz tex xorg
USE_GNOME= cairo
USE_LDCONFIG= yes
USE_TEX= kpathsea ptexenc
USE_XORG= pixman
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --disable-aleph \
--disable-eptex \
--disable-euptex \
@@ -43,6 +42,7 @@ CONFIGURE_ARGS= --disable-aleph \
--disable-tex \
--disable-uptex \
--disable-xetex \
+ --with-system-mpfi \
--with-system-zlib \
--with-system-zziplib \
--with-x=no \
diff --git a/devel/tex-web2c/distinfo b/devel/tex-web2c/distinfo
index 85bbbc168250..c97bb4227fd9 100644
--- a/devel/tex-web2c/distinfo
+++ b/devel/tex-web2c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680479556
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715473290
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/devel/tex-web2c/files/patch-Makefile.in b/devel/tex-web2c/files/patch-Makefile.in
index 66997ea418d5..c0801f707710 100644
--- a/devel/tex-web2c/files/patch-Makefile.in
+++ b/devel/tex-web2c/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-04-06 19:09:14 UTC
+--- Makefile.in.orig 2024-05-13 11:24:13 UTC
+++ Makefile.in
-@@ -96,7 +96,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -97,7 +97,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) \
@@ -9,7 +9,7 @@
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__
+@@ -110,7 +110,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) \
@@ -18,1306 +18,16 @@
$(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
+@@ -3143,10 +3143,10 @@ 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_126)
- lib_LTLIBRARIES = $(am__append_125)
+ lib_LIBRARIES = $(am__append_128)
+ lib_LTLIBRARIES = $(am__append_127)
-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
#
- # 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 4d18d6082340..b2fed6e25432 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 2023-04-06 19:09:14 UTC
+--- man/Makefile.in.orig 2024-05-13 11:29:09 UTC
+++ man/Makefile.in
-@@ -478,11 +478,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.
+@@ -483,11 +483,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/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile
index 417e3c9859fe..ae03b0325bac 100644
--- a/japanese/tex-ptex/Makefile
+++ b/japanese/tex-ptex/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ptex
-PORTVERSION= 3.6
-PORTREVISION= 4
+DISTVERSION= 3.6
+PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/:source \
LOCAL/tex:texmf
@@ -43,9 +43,6 @@ _DISTNAME_SOURCE= texlive-${TEXLIVE_VERSION}-source
TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR}
TEX_FORMATS= ptex uptex
-#post-extract:
-# @${FIND} ${WRKSRC} -name '*.orig' -delete
-
pre-configure:
cd ${WRKDIR}/${_DISTNAME_SOURCE}/libs/xpdf && \
${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
@@ -68,7 +65,7 @@ _EXTRACT_TARGETDIR= texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd
EXTRACT_FILES_TEXMF= doc/ptex doc/platex doc/uptex doc/uplatex \
doc/fonts/japanese-otf fonts/vf/public/japanese-otf \
fonts/tfm/public/japanese-otf source/uplatex tex/ptex \
- fonts/ofm/public/japanese-otf source/platex \
+ source/platex \
tex/uplatex source/fonts/japanese-otf tex/uptex \
tex/platex tex/generic/hyph-utf8/patterns/ptex \
fonts/map/dvipdfmx/updmap/kanjix.map
@@ -80,6 +77,7 @@ _maintainer-extract:
-C ${WRKDIR}/${_EXTRACT_TARGETDIR} \
--strip-components 1 --no-same-permission --no-same-owner \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/texmf-dist/,}
+ @${FIND} ${WRKDIR} -name '*.orig' -delete
_maintainer-patch: _maintainer-extract
${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
@@ -100,6 +98,8 @@ _maintainer-dist: _maintainer-patch
${TAR} --options xz:compression-level=9 -Jcvf \
${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \
-C ${WRKDIR} ${_EXTRACT_TARGETDIR}
+ scp ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \
+ bofh@freefall.freebsd.org://home/tex/public_distfiles/
.endif
diff --git a/japanese/tex-ptex/distinfo b/japanese/tex-ptex/distinfo
index 90691924fdd0..646b4aac0b3a 100644
--- a/japanese/tex-ptex/distinfo
+++ b/japanese/tex-ptex/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698325900
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
-SHA256 (TeX/texlive-20230313-texmf-japanese_tex-ptex-freebsd.tar.xz) = b02128975b6653060bd656b7733439e1a10f2e51e6e89e8eb52d0373e4ddc652
-SIZE (TeX/texlive-20230313-texmf-japanese_tex-ptex-freebsd.tar.xz) = 9401208
+TIMESTAMP = 1716939066
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
+SHA256 (TeX/texlive-20240312-texmf-japanese_tex-ptex-freebsd.tar.xz) = fc298354a27d80a96d3894d32183bde6a344d5616dacddbe1465ab883c5b9be9
+SIZE (TeX/texlive-20240312-texmf-japanese_tex-ptex-freebsd.tar.xz) = 9518364
diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in
index df80777cdb98..94d1916e834f 100644
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-03-08 17:05:16 UTC
+--- Makefile.in.orig 2024-02-28 04:19:31 UTC
+++ Makefile.in
-@@ -101,18 +101,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -102,18 +102,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)
@@ -21,92 +21,7 @@
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)
+@@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -115,1238 +30,38 @@
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 +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 =
+@@ -3146,7 +3136,7 @@ lib_LTLIBRARIES = $(am__append_127)
+ EXTRA_LTLIBRARIES = libsynctex.la
+ lib_LIBRARIES = $(am__append_128)
+ lib_LTLIBRARIES = $(am__append_127)
+-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
++dist_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
+@@ -3652,14 +3642,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
$(am__append_35) $(am__append_43) $(am__append_59) \
$(am__append_63) $(am__append_69) $(am__append_74) \
- $(am__append_80)
+ $(am__append_82)
-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)
+- $(am__append_78) $(am__append_79) $(am__append_80) \
+- $(am__append_94) $(am__append_99) $(am__append_104) \
+- $(am__append_109)
+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_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
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-
- 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
+ $(am__append_92) $(am__append_97) $(am__append_102) \
+@@ -4622,8 +4605,7 @@ euptex_tests = \
+ # At the moment, these are the only man pages handled in the
+ # conglomerated web2c/Makefile[.am]. (All the others are in man/.)
+ # If that changes, have to set at top level and use +=.
+-@HITEX_TRUE@man1_MANS = hitexdir/man/hishrink.man hitexdir/man/histretch.man \
+-@HITEX_TRUE@ hitexdir/man/hitex.man
++@HITEX_TRUE@man1_MANS =
+
+ hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
+ -DINIT -DSTAT -DWEB2CVERSION="\"${WEB2CVERSION}\""
diff --git a/japanese/tex-ptex/files/patch-configure b/japanese/tex-ptex/files/patch-configure
index 5ff153617eff..c937c9cbe20b 100644
--- a/japanese/tex-ptex/files/patch-configure
+++ b/japanese/tex-ptex/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2023-04-06 16:57:57 UTC
+--- configure.orig 2024-05-29 12:01:58 UTC
+++ configure
-@@ -27067,428 +27067,6 @@ esac
+@@ -27496,434 +27496,6 @@ esac
;;
esac
@@ -67,8 +67,8 @@
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
--else $as_nop
--
+-else case e in #(
+- e)
- jitlibs="-lc++abi -lpthread"
- save_LIBS=$LIBS
- LIBS="$LIBS $jitlibs"
@@ -94,18 +94,20 @@
-printf "%s\n" "\"$jitlibs\"" >&6; }
- LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
-
--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;}
+-else case e in #(
+- e) { { 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; }
--
+-See 'config.log' for more details" "$LINENO" 5; }
+- ;;
+-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$save_LIBS
-
--
+- ;;
+-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
@@ -158,8 +160,8 @@
-if test ${ac_cv_prog_FT2_CONFIG+y}
-then :
- printf %s "(cached) " >&6
--else $as_nop
-- if test -n "$FT2_CONFIG"; then
+-else case e in #(
+- e) if test -n "$FT2_CONFIG"; then
- ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -181,7 +183,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
-if test -n "$FT2_CONFIG"; then
@@ -203,8 +206,8 @@
-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
+-else case e in #(
+- e) if test -n "$ac_ct_FT2_CONFIG"; then
- ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -226,7 +229,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
-if test -n "$ac_ct_FT2_CONFIG"; then
@@ -259,8 +263,8 @@
-if test ${ac_cv_prog_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
--else $as_nop
-- if test -n "$PKG_CONFIG"; then
+-else case e in #(
+- e) if test -n "$PKG_CONFIG"; then
- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -282,7 +286,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
@@ -304,8 +309,8 @@
-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
+-else case e in #(
+- e) if test -n "$ac_ct_PKG_CONFIG"; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -327,7 +332,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
@@ -429,7 +435,7 @@
##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
+@@ -27965,88 +27537,6 @@ fi
cd ${top_builddir}/../../libs/potrace && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
@@ -515,6 +521,14 @@
- cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
+ ##tldbg _KPSE_LIB_FLAGS: Setup mpfi (-lmpfi) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfi, libname=mpfi, options=, tlincl=-IBLD/libs/mpfi/include, tllib=BLD/libs/mpfi/libmpfi.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfi/include/mpfi.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: mpfi (mpfi) .
+@@ -28087,413 +27577,6 @@ fi
+ ${top_builddir}/../../libs/mpfi/include/mpfi.h:
+ cd ${top_builddir}/../../libs/mpfi && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ fi
+-
-##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) .
@@ -669,8 +683,8 @@
-if test ${ac_cv_prog_ICU_CONFIG+y}
-then :
- printf %s "(cached) " >&6
--else $as_nop
-- if test -n "$ICU_CONFIG"; then
+-else case e in #(
+- e) if test -n "$ICU_CONFIG"; then
- ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -692,7 +706,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-ICU_CONFIG=$ac_cv_prog_ICU_CONFIG
-if test -n "$ICU_CONFIG"; then
@@ -714,8 +729,8 @@
-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
+-else case e in #(
+- e) if test -n "$ac_ct_ICU_CONFIG"; then
- ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -737,7 +752,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG
-if test -n "$ac_ct_ICU_CONFIG"; then
@@ -770,8 +786,8 @@
-if test ${ac_cv_prog_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
--else $as_nop
-- if test -n "$PKG_CONFIG"; then
+-else case e in #(
+- e) if test -n "$PKG_CONFIG"; then
- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -793,7 +809,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
@@ -815,8 +832,8 @@
-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
+-else case e in #(
+- e) if test -n "$ac_ct_PKG_CONFIG"; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -838,7 +855,8 @@
- done
-IFS=$as_save_IFS
-
--fi
+-fi ;;
+-esac
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
@@ -917,13 +935,6 @@
-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 +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/print/tex-basic-engines/Makefile b/print/tex-basic-engines/Makefile
index 408d9d46f523..094fe4b1f620 100644
--- a/print/tex-basic-engines/Makefile
+++ b/print/tex-basic-engines/Makefile
@@ -1,6 +1,5 @@
PORTNAME= basic-engines
-PORTVERSION= ${TEXLIVE_VERSION}
-PORTREVISION= 1
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
PKGNAMEPREFIX= tex-
diff --git a/print/tex-basic-engines/distinfo b/print/tex-basic-engines/distinfo
index 6847675b4134..10ad481af928 100644
--- a/print/tex-basic-engines/distinfo
+++ b/print/tex-basic-engines/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680574061
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715600831
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in
index 07afcca8731c..03363b0e01d8 100644
--- a/print/tex-basic-engines/files/patch-Makefile.in
+++ b/print/tex-basic-engines/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-03-08 17:05:16 UTC
+--- Makefile.in.orig 2024-02-28 04:19:31 UTC
+++ Makefile.in
-@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -102,9 +102,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)
@@ -11,92 +11,7 @@
$(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)
+@@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -105,1225 +20,21 @@
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 \
-@@ -3127,8 +3125,8 @@ lib_LTLIBRARIES = $(am__append_125)
+@@ -3146,7 +3144,7 @@ lib_LTLIBRARIES = $(am__append_127)
EXTRA_LTLIBRARIES = libsynctex.la
- lib_LIBRARIES = $(am__append_126)
- lib_LTLIBRARIES = $(am__append_125)
+ lib_LIBRARIES = $(am__append_128)
+ lib_LTLIBRARIES = $(am__append_127)
-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
#
- # 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
+@@ -3655,8 +3653,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
+ $(am__append_78) $(am__append_79) $(am__append_80) \
+ $(am__append_94) $(am__append_99) $(am__append_104) \
+ $(am__append_109)
diff --git a/print/tex-basic-engines/files/patch-man-Makefile.in b/print/tex-basic-engines/files/patch-man_Makefile.in
index f54bd8c5e720..f5ce95730286 100644
--- a/print/tex-basic-engines/files/patch-man-Makefile.in
+++ b/print/tex-basic-engines/files/patch-man_Makefile.in
@@ -1,20 +1,6 @@
---- man/Makefile.in.orig 2023-03-08 17:05:16 UTC
+--- man/Makefile.in.orig 2024-02-25 17:08:15 UTC
+++ man/Makefile.in
-@@ -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
+@@ -466,28 +466,18 @@ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_source
mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \
ppltotf.man ptftopl.man pbibtex.man luatex.man xetex.man \
$(otangle_man_sources) aleph.man $(misc_man_sources) spell.add
@@ -22,19 +8,19 @@
+bootstrap_man_sources =
# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
--man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \
-- ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \
-+man1_links = $(am__append_3) $(am__append_5) \
- $(am__append_6) $(am__append_10) $(am__append_12) \
-- $(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
+-man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-proofsort \
+- ctwill:ctwill-refsort ctwill:ctwill-twinx $(am__append_2) \
++man1_links = $(am__append_2) \
+ $(am__append_4) $(am__append_6) $(am__append_7) \
+ $(am__append_11) $(am__append_13) $(am__append_15) \
+- $(am__append_18) 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 twill.man \
- vftovp.man vptovf.man weave.man
-+ $(am__append_14) $(am__append_17)
++ $(am__append_18)
+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 d8a33f164e1c..600cc1fe7110 100644
--- a/print/tex-dvipdfmx/Makefile
+++ b/print/tex-dvipdfmx/Makefile
@@ -1,6 +1,5 @@
PORTNAME= dvipdfmx
-PORTVERSION= ${TEXLIVE_VERSION}
-PORTREVISION= 1
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
diff --git a/print/tex-dvipdfmx/distinfo b/print/tex-dvipdfmx/distinfo
index 77ebcd18ba9f..5475fd10fc03 100644
--- a/print/tex-dvipdfmx/distinfo
+++ b/print/tex-dvipdfmx/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1716922521
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
+SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7
+SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732
diff --git a/print/tex-dvipsk/Makefile b/print/tex-dvipsk/Makefile
index c70dd41ee952..9bdf1ff6bc0a 100644
--- a/print/tex-dvipsk/Makefile
+++ b/print/tex-dvipsk/Makefile
@@ -1,6 +1,5 @@
PORTNAME= dvipsk
-PORTVERSION= ${TEXLIVE_YEAR}.1
-PORTREVISION= 1
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/:source \
LOCAL/tex:texmf
@@ -22,7 +21,6 @@ USES= gmake localbase:ldflags pkgconfig tar:xz tex
USE_TEX= kpathsea texhash web2c
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --with-kpathsea-includes=${LOCALBASE}/include \
--with-kpathsea-libdir=${LOCALBASE}/lib \
--with-paper \
@@ -31,8 +29,8 @@ CONFIGURE_ARGS= --with-kpathsea-includes=${LOCALBASE}/include \
--with-system-zlib
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES= am m4 build-aux texk/dvipsk texk/lcdf-typetools
-WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipsk
+EXTRACT_FILES= am m4 build-aux texk/dvipsk texk/lcdf-typetools
+WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipsk
INFO= dvips
PLIST_FILES= bin/afm2tfm \
@@ -52,11 +50,11 @@ post-install:
${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
.if defined(MAINTAINER_MODE)
-_EXTRACT_FILES= texmf-dist/doc/dvips/ texmf-dist/dvips/ \
- texmf-dist/fonts/map/dvips/ \
- texmf-dist/fonts/enc/dvips/ \
- texmf-dist/tex/generic/dvips/
-_EXCLUDE_FILES= texmf-dist/dvips/xdvi
+_EXTRACT_FILES= texmf-dist/doc/dvips/ texmf-dist/dvips/ \
+ texmf-dist/fonts/map/dvips/ \
+ texmf-dist/fonts/enc/dvips/ \
+ texmf-dist/tex/generic/dvips/
+_EXCLUDE_FILES= texmf-dist/dvips/xdvi
_WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${TEXLIVE_VERSION}
_maintainer-extract:
diff --git a/print/tex-dvipsk/distinfo b/print/tex-dvipsk/distinfo
index b92e36a9e759..a57af7ed2a36 100644
--- a/print/tex-dvipsk/distinfo
+++ b/print/tex-dvipsk/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698419926
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
-SHA256 (TeX/tex-dvipsk-20230313-freebsd.tar.xz) = 8356e2ebcd561de3afdc778bcdbd0f0f5cfaa9249a9415988aebb764fe3f107e
-SIZE (TeX/tex-dvipsk-20230313-freebsd.tar.xz) = 2728208
+TIMESTAMP = 1716888992
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
+SHA256 (TeX/tex-dvipsk-20240312-freebsd.tar.xz) = 847e70fcb2614969632522125c770a32418af00cba64b1d76edd285d7848c918
+SIZE (TeX/tex-dvipsk-20240312-freebsd.tar.xz) = 2833992
diff --git a/print/tex-dvipsk/files/patch-configure b/print/tex-dvipsk/files/patch-configure
index cf0a71e99ef7..f3047874378a 100644
--- a/print/tex-dvipsk/files/patch-configure
+++ b/print/tex-dvipsk/files/patch-configure
@@ -1,14 +1,14 @@
---- configure.orig 2015-03-15 17:54:49 UTC
+--- configure.orig 2024-02-05 17:23:27 UTC
+++ configure
-@@ -778,6 +778,7 @@ with_sysroot
+@@ -804,6 +804,7 @@ with_system_kpathsea
enable_libtool_lock
enable_largefile
with_system_kpathsea
+with_paper
+ enable_year2038
'
ac_precious_vars='build_alias
- host_alias
-@@ -1440,6 +1441,7 @@ Optional Packages:
+@@ -1476,6 +1477,7 @@ Optional Packages:
compiler's sysroot if not specified).
--with-system-kpathsea use installed kpathsea headers and library (requires
pkg-config)
@@ -16,10 +16,12 @@
Some influential environment variables:
CC C compiler command
-@@ -15151,6 +15153,102 @@ fi
- ac_config_files="$ac_config_files Makefile"
-
+@@ -14940,6 +14942,102 @@ fi
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ fi
++
++
+eval CPPFLAGS=\"$LIBPAPER_INCLUDES \$CPPFLAGS\"
+eval LIBS=\"$LIBPAPER_LIBS \$LIBS\"
+
@@ -114,8 +116,5 @@
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
- subdirs="$subdirs squeeze"
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 1167e5ddc4b7..3972229ff2da 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,6 +1,5 @@
PORTNAME= jadetex
-PORTVERSION= 3.13
-PORTREVISION= 5
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= LOCAL/tex
PKGNAMEPREFIX= tex-
diff --git a/print/tex-jadetex/distinfo b/print/tex-jadetex/distinfo
index fe4150612a85..e43227e16672 100644
--- a/print/tex-jadetex/distinfo
+++ b/print/tex-jadetex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698415087
-SHA256 (TeX/tex-jadetex-20230313-freebsd.tar.xz) = 5f030ba979e46131818cc2c21cfac856712de1dc0bee22361f8b1753bbc2366e
-SIZE (TeX/tex-jadetex-20230313-freebsd.tar.xz) = 55920
+TIMESTAMP = 1716917463
+SHA256 (TeX/tex-jadetex-20240312-freebsd.tar.xz) = 1e53e1143a6b244655cb0d8ad9ce6d8fec954f19d5cf3626c60b9c957aebc923
+SIZE (TeX/tex-jadetex-20240312-freebsd.tar.xz) = 55972
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index f5e215626440..287fe6391ded 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -1,6 +1,5 @@
PORTNAME= luatex
-PORTVERSION= 1.16.0
-PORTREVISION= 1
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
@@ -60,9 +59,7 @@ EXTRACT_FILES_TEXMF= texmf-dist/doc/lualatex texmf-dist/doc/luatex \
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
diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo
index 8e206b821b6d..e6f4f284c4db 100644
--- a/print/tex-luatex/distinfo
+++ b/print/tex-luatex/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1716918225
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
+SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7
+SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732
diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in
index 6951d7ddf0c9..8b32438e6f29 100644
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-03-08 17:05:16 UTC
+--- Makefile.in.orig 2024-02-28 04:19:31 UTC
+++ Makefile.in
-@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -102,18 +102,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)
@@ -20,92 +20,7 @@
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 @@ ARFLAGS = cru
- 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 @@ libsynctex_la_OBJECTS = $(am_libsynctex_la_OBJECTS)
- 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_P_1 = :
- 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 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOO
- 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 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
- 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 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LI
- 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 @@ LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFL
- 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 @@ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS)
- 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 @@ LUA52_DEPEND = @LUA52_DEPEND@
+@@ -2975,14 +2964,16 @@ LUA53_DEFINES = @LUA53_DEFINES@
LUA52_INCLUDES = @LUA52_INCLUDES@
LUA52_LIBS = @LUA52_LIBS@
LUA53_DEFINES = @LUA53_DEFINES@
@@ -114,31 +29,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@
-@@ -3000,7 +2991,8 @@ POTRACE_DEPEND = @POTRACE_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
+@@ -3022,7 +3013,8 @@ PTEXENC_DEPEND = @PTEXENC_DEPEND@
+ PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
PTEXENC_DEPEND = @PTEXENC_DEPEND@
- PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
-@@ -3105,14 +3097,14 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+-PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
++PTEXENC_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
++ -I@top_srcdir@/../../libs/pplib/pplib-src/src
+ PTEXENC_LIBS = @PTEXENC_LIBS@
+ RANLIB = @RANLIB@
+ SED = @SED@
+@@ -3124,7 +3116,7 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -147,1158 +62,23 @@
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 +3120,7 @@ EXTRA_LTLIBRARIES = libsynctex.la
- 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
+@@ -3652,14 +3644,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
$(am__append_35) $(am__append_43) $(am__append_59) \
$(am__append_63) $(am__append_69) $(am__append_74) \
- $(am__append_80)
+ $(am__append_82)
-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)
+- $(am__append_78) $(am__append_79) $(am__append_80) \
+- $(am__append_94) $(am__append_99) $(am__append_104) \
+- $(am__append_109)
+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_90) $(am__append_95) $(am__append_100) \
-@@ -3711,19 +3697,19 @@ tangleboot = $(tangle_silent)WEBINPUTS=.:$(srcdir) $(b
- 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 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P)
-
- # 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 @@ dumpenv = TEXMFCNF=../kpathsea
- 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_tie_SOURCES = tie.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 @@ tex_ch_srcs = \
- 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 @@ mf_ch_src = \
- 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_CFLAGS = # $(WARNING_CFLAGS)
- #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_CPPFLAGS = \
- 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_CPPFLAGS = \
- 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 @@ mpost_LDADD = libmplibcore.a libmplibextramath.a libmp
-
- 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 @@ mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
- 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 @@ libmplibbackends_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_I
- $(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 @@ libff_a_SOURCES = \
- 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 @@ libluajithbtexspecific_a_CPPFLAGS = -DLUATEX_HARFBUZZ_
- 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_libluajittex_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_libluajittexspecific_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 @@ luatex_sources = \
-
- 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/c-auto.h: w2c/stamp-h1
- 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.$(OBJEXT): ptexdir/$(am__dirs
- 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 @@ luatexdir/utils/libluatex_a-unistring.$(OBJEXT): \
- 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/$(DEPDIR)/$(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/$(DEPDIR)/$(am__dirstamp):
- 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 @@ luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT): \
- 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-decNumber.$(OBJEXT): mplibdir/$(a
- 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.$(OBJEXT): uptexdir/$(am__d
- 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-XeTeX_mac.$(OBJEXT): xetexdir/$(am
- 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-alephbis.$(OBJEXT): alephdir/$(am__dirs
- 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 @@ eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__di
- 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 @@ etexdir/etex-etexextra.$(OBJEXT): etexdir/$(am__dirsta
- 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 @@ euptexdir/euptex-euptexextra.$(OBJEXT): euptexdir/$(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-hilexer.$(OBJEXT): hitexdir/$(am__di
- 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 @@ luatexdir/luahbtex-luatex.$(OBJEXT): luatexdir/$(am__d
- 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 @@ luatexdir/luajithbtex-luatex.$(OBJEXT): luatexdir/$(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 @@ luatexdir/luajittex-luatex.$(OBJEXT): luatexdir/$(am__
- 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 @@ luatexdir/luatex-luatex.$(OBJEXT): luatexdir/$(am__dir
- 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 @@ pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(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-ttf2afm.$(OBJEXT): pdftexdir/$(am__d
- 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 @@ xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__di
- 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-data: install-data-recursive
- uninstall: uninstall-recursive
-
- install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-
- installcheck: installcheck-recursive
- install-strip:
-@@ -21302,9 +21288,6 @@ $(proglib): $(proglib_sources)
+ $(am__append_92) $(am__append_97) $(am__append_102) \
+@@ -21452,9 +21437,6 @@ $(proglib): $(proglib_sources)
@KPATHSEA_RULE@
@PTEXENC_RULE@
@ZLIB_RULE@
@@ -1308,87 +88,3 @@
@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 @@ svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tang
-
- $(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 @@ hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle
- 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 @@ $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDEN
-
- $(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-ptexenc/Makefile b/print/tex-ptexenc/Makefile
index 794cc64cf839..b214e9e1684b 100644
--- a/print/tex-ptexenc/Makefile
+++ b/print/tex-ptexenc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ptexenc
-PORTVERSION= 1.4.3
+DISTVERSION= 1.4.6
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/Source/${TEXLIVE_YEAR}
PKGNAMEPREFIX= tex-
diff --git a/print/tex-ptexenc/distinfo b/print/tex-ptexenc/distinfo
index 7529ce9d886e..71891df8f5bc 100644
--- a/print/tex-ptexenc/distinfo
+++ b/print/tex-ptexenc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680474710
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715472906
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/print/tex-ptexenc/files/patch-Makefile.in b/print/tex-ptexenc/files/patch-Makefile.in
index 3c7682343701..1409fcb8b11a 100644
--- a/print/tex-ptexenc/files/patch-Makefile.in
+++ b/print/tex-ptexenc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-04-02 22:35:25 UTC
+--- Makefile.in.orig 2024-05-12 00:15:23 UTC
+++ Makefile.in
-@@ -404,7 +404,8 @@ nobase_include_HEADERS = \
+@@ -591,7 +591,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 c9be2825b406..0014cccd8055 100644
--- a/print/tex-ptexenc/files/patch-configure
+++ b/print/tex-ptexenc/files/patch-configure
@@ -1,33 +1,33 @@
---- configure.orig 2023-04-02 22:35:55 UTC
+--- configure.orig 2024-02-11 08:19:52 UTC
+++ configure
-@@ -15940,7 +15940,7 @@ else $as_nop
+@@ -16100,7 +16100,7 @@ else case e in #(
printf %s "(cached) " >&6
- else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+ else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="$LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -15972,7 +15972,7 @@ then :
+@@ -16140,7 +16140,7 @@ then :
then :
printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
- LIBS="-liconv $LIBS"
+ LIBS="$LIBS"
- 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
+ else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
+@@ -16150,7 +16150,7 @@ else case e in #(
printf %s "(cached) " >&6
- else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+ else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="$LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -16014,7 +16014,7 @@ then :
+@@ -16190,7 +16190,7 @@ then :
then :
printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
@@ -35,8 +35,8 @@
+ LIBS="$LIBS"
fi
-
-@@ -18360,5 +18360,3 @@ fi
+ ;;
+@@ -18551,5 +18551,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-xdvik/Makefile b/print/tex-xdvik/Makefile
index 6c95f841c973..2a4e77297e71 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xdvik
-PORTVERSION= 22.87.06
-PORTREVISION= 3
+DISTVERSION= 22.87.06
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= tex-
@@ -21,10 +21,7 @@ USES= autoreconf iconv libtool:build motif pkgconfig tex xorg
USE_TEX= kpathsea texhash web2c
USE_XORG= ice sm x11 xext xi xmu xpm xt
-PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
-WRKSRC= ${WRKDIR}/${DISTNAME}/texk/xdvik
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --datarootdir=${LOCALBASE}/share \
--enable-shared \
--enable-xi2-scrolling \
@@ -45,7 +42,12 @@ CONFIGURE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}"
CFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBPAPER -g -O0
+
BINARY_ALIAS= freetype-config=true
+
+PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
+WRKSRC= ${WRKDIR}/${DISTNAME}/texk/xdvik
+
PLIST_SUB= TEXMFDISTDIR=${TEXMFDISTDIR}
PORTDOCS= BUGS CHANGES ChangeLog INSTALL README* TODO
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 4cedb6abe51e..f926c97df2da 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -1,8 +1,7 @@
PORTNAME= xetex
-PORTVERSION= 0.99993
-PORTREVISION= 5
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${TEXLIVE_VERSION}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/print/tex-xetex/distinfo b/print/tex-xetex/distinfo
index 2efa46e0a39a..0070f5115bbe 100644
--- a/print/tex-xetex/distinfo
+++ b/print/tex-xetex/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1716937886
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
+SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7
+SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732
diff --git a/print/tex-xetex/files/patch-Makefile.in b/print/tex-xetex/files/patch-Makefile.in
index 274935e147ac..81f59109b014 100644
--- a/print/tex-xetex/files/patch-Makefile.in
+++ b/print/tex-xetex/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-04-08 00:33:55 UTC
+--- Makefile.in.orig 2024-02-28 04:19:31 UTC
+++ Makefile.in
-@@ -101,18 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+@@ -102,18 +102,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)
@@ -20,92 +20,7 @@
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@
+@@ -3019,7 +3008,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@
POTRACE_INCLUDES = @POTRACE_INCLUDES@
POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
@@ -115,7 +30,7 @@
PPLIB_LIBS = @PPLIB_LIBS@
PTEXENC_DEPEND = @PTEXENC_DEPEND@
PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
-@@ -3105,14 +3095,14 @@ version = $(WEB2CVERSION)
+@@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
@@ -124,1134 +39,7 @@
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 +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
+@@ -19689,7 +19679,7 @@ install-am: all-am
uninstall: uninstall-recursive
install-am: all-am
@@ -1260,95 +48,11 @@
installcheck: installcheck-recursive
install-strip:
-@@ -20475,7 +20465,6 @@ install-exec-am: install-binPROGRAMS install-libLIBRAR
- install-exec-am: install-binPROGRAMS install-libLIBRARIES \
- install-libLTLIBRARIES
+@@ -20621,7 +20611,6 @@ install-exec-am: install-binPROGRAMS install-dist_binS
+ install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \
+ install-libLIBRARIES install-libLTLIBRARIES
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
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 bbcbc2496147..117c710f222d 100644
--- a/print/tex-xetex/files/patch-configure
+++ b/print/tex-xetex/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig 2023-03-08 17:05:16 UTC
+--- configure.orig 2024-02-01 22:56:12 UTC
+++ configure
-@@ -1105,6 +1105,8 @@ with_system_teckit
- with_mpfr_libdir
+@@ -1098,6 +1098,8 @@ with_system_teckit
+ with_mpfi_libdir
with_system_zziplib
with_system_teckit
+with_teckit_includes
@@ -9,7 +9,7 @@
with_system_graphite2
with_system_harfbuzz
with_system_icu
-@@ -26977,11 +26979,6 @@ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pplib, libn
+@@ -27404,11 +27406,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
-@@ -27067,115 +27064,6 @@ esac
+@@ -27496,117 +27493,6 @@ esac
;;
esac
@@ -88,8 +88,8 @@
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
--else $as_nop
--
+-else case e in #(
+- e)
- jitlibs="-lc++abi -lpthread"
- save_LIBS=$LIBS
- LIBS="$LIBS $jitlibs"
@@ -115,18 +115,20 @@
-printf "%s\n" "\"$jitlibs\"" >&6; }
- LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs"
-
--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;}
+-else case e in #(
+- e) { { 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; }
--
+-See 'config.log' for more details" "$LINENO" 5; }
+- ;;
+-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$save_LIBS
-
--
+- ;;
+-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
@@ -137,7 +139,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) .
-@@ -27630,49 +27518,38 @@ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_
+@@ -28106,49 +27992,38 @@ test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_
fi
test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
@@ -210,9 +212,3 @@
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 ce6957975453..158eed186a09 100644
--- a/print/tex-xmltex/Makefile
+++ b/print/tex-xmltex/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xmltex
-PORTVERSION= 1.9
-PORTREVISION= 4
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= LOCAL/tex
PKGNAMEPREFIX= tex-
diff --git a/print/tex-xmltex/distinfo b/print/tex-xmltex/distinfo
index d302d70fb1cb..6f0eea032253 100644
--- a/print/tex-xmltex/distinfo
+++ b/print/tex-xmltex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698416956
-SHA256 (TeX/tex-xmltex-20230313-freebsd.tar.xz) = fb8e6ce06d88b18743a3e22617454caf5a23559ea4aff2843adde0311a955b4f
-SIZE (TeX/tex-xmltex-20230313-freebsd.tar.xz) = 75824
+TIMESTAMP = 1716912788
+SHA256 (TeX/tex-xmltex-20240312-freebsd.tar.xz) = 517995171ffcf169cb371bf6ec6fe1a475daf69fba4eae540a81982ef449781f
+SIZE (TeX/tex-xmltex-20240312-freebsd.tar.xz) = 75848
diff --git a/print/tex-xmltex/pkg-plist b/print/tex-xmltex/pkg-plist
index 8ec61954ac58..6a8f2e500699 100644
--- a/print/tex-xmltex/pkg-plist
+++ b/print/tex-xmltex/pkg-plist
@@ -8,8 +8,6 @@
%%TEXMFDISTDIR%%/tex/xmltex/base/mathml2.xmt
%%TEXMFDISTDIR%%/tex/xmltex/base/sec.xmt
%%TEXMFDISTDIR%%/tex/xmltex/base/windows-1250.xmt
-%%TEXMFDISTDIR%%/tex/xmltex/xmltexconfig/pdfxmltex.ini
-%%TEXMFDISTDIR%%/tex/xmltex/xmltexconfig/xmltex.ini
%%TEXMFDISTDIR%%/tex/xmltex/passivetex/mlnames.sty
%%TEXMFDISTDIR%%/tex/xmltex/passivetex/teislides.xmt
%%TEXMFDISTDIR%%/tex/xmltex/passivetex/fotex.xmt
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 20c2d830512a..3f4e36f8e886 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -1,6 +1,5 @@
PORTNAME= texlive
-PORTVERSION= ${TEXLIVE_VERSION}
-PORTREVISION= 8
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
PKGNAMESUFFIX= -base
@@ -84,7 +83,6 @@ SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \
# during build phase gnu configure is run a lot
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --disable-native-texlive-build \
--disable-web-progs \
--disable-psutils \
diff --git a/print/texlive-base/distinfo b/print/texlive-base/distinfo
index 74a97b8d94bf..e3b76a45c7e2 100644
--- a/print/texlive-base/distinfo
+++ b/print/texlive-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680575442
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715601909
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
diff --git a/print/texlive-base/files/patch-Makefile.in b/print/texlive-base/files/patch-Makefile.in
index 3b01373c109e..68ab63563674 100644
--- a/print/texlive-base/files/patch-Makefile.in
+++ b/print/texlive-base/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2023-03-01 22:59:32 UTC
+--- Makefile.in.orig 2024-02-01 22:56:12 UTC
+++ Makefile.in
-@@ -494,7 +494,7 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+@@ -497,7 +497,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 2266b3531ce0..2fb5efe129e9 100644
--- a/print/texlive-base/files/patch-configure
+++ b/print/texlive-base/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2023-03-09 23:07:06 UTC
+--- configure.orig 2024-03-10 21:37:05 UTC
+++ configure
-@@ -6840,7 +6840,16 @@ fi
+@@ -6926,7 +6926,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
}
-@@ -23067,8 +23076,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+@@ -23616,8 +23625,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`
-@@ -23133,11 +23142,12 @@ fi
+@@ -23691,11 +23700,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
index 70340b49e611..da5e1a99f1a2 100644
--- a/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in
+++ b/print/texlive-base/files/patch-texk_bibtex-x_Makefile.in
@@ -1,4 +1,4 @@
---- texk/bibtex-x/Makefile.in.orig 2023-03-01 22:59:32 UTC
+--- texk/bibtex-x/Makefile.in.orig 2023-12-16 06:51:56 UTC
+++ texk/bibtex-x/Makefile.in
@@ -123,9 +123,7 @@ CONFIG_CLEAN_VPATH_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -69,7 +69,7 @@
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
+@@ -775,7 +773,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
@@ -78,7 +78,7 @@
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
-@@ -831,11 +829,11 @@ clean-binPROGRAMS:
+@@ -832,11 +830,11 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
@@ -92,7 +92,7 @@
@rm -f bibtexu$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(bibtexu_OBJECTS) $(bibtexu_LDADD) $(LIBS)
-@@ -1408,7 +1406,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+@@ -1409,7 +1407,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
$$success || exit 1
@@ -101,7 +101,7 @@
@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:
+@@ -1419,7 +1417,7 @@ check-TESTS:
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
@@ -110,7 +110,7 @@
@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:
+@@ -1621,7 +1619,7 @@ installdirs:
check: check-am
all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
installdirs:
@@ -119,7 +119,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -1692,8 +1690,7 @@ info-am:
+@@ -1693,8 +1691,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 dd8412d2463d..1a5700c36189 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 2023-03-08 17:05:16 UTC
+--- texk/dvipng/configure.orig 2023-12-23 16:57:39 UTC
+++ texk/dvipng/configure
-@@ -17556,8 +17556,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+@@ -17725,8 +17725,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 67177b979034..560a930eff35 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 2023-03-01 22:59:32 UTC
+--- texk/dvisvgm/configure.orig 2024-03-07 22:55:09 UTC
+++ texk/dvisvgm/configure
-@@ -23282,8 +23282,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+@@ -23288,8 +23288,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_lcdf-typetools_lcdf-typetools-src_Makefile.in b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in
index b07c6ae0af76..55d7c9d20ee5 100644
--- a/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in
+++ b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in
@@ -1,4 +1,4 @@
---- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in.orig 2020-11-19 18:31:09 UTC
+--- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in.orig 2023-08-31 23:02:37 UTC
+++ texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
@@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
@@ -11,7 +11,7 @@
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
-@@ -717,7 +717,7 @@ info: info-recursive
+@@ -721,7 +721,7 @@ info-am:
info-am:
diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in
index 6ddfca35edc9..d107819d3406 100644
--- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in
+++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in
@@ -1,6 +1,6 @@
---- texk/texlive/linked_scripts/Makefile.in.orig 2022-02-14 21:00:19 UTC
+--- texk/texlive/linked_scripts/Makefile.in.orig 2024-02-10 23:22:21 UTC
+++ texk/texlive/linked_scripts/Makefile.in
-@@ -290,8 +290,6 @@ texmf_shell_scripts = \
+@@ -296,8 +296,6 @@ texmf_shell_scripts = \
texlive-extra/dvi2fax.sh \
texlive-extra/dvired.sh \
texlive-extra/fontinst.sh \
@@ -9,7 +9,15 @@
texlive-extra/ps2frag.sh \
texlive-extra/pslatex.sh \
texlive-extra/rubibtex.sh \
-@@ -471,8 +469,6 @@ bin_links = \
+@@ -459,7 +457,6 @@ texmf_other_scripts = \
+ texlive/mktexpk \
+ texlive/mktextfm \
+ texlive/rungs.lua \
+- texlive/tlmgr.pl \
+ texlive/updmap-sys.sh \
+ texlive/updmap-user.sh \
+ texlive/updmap.pl \
+@@ -489,8 +486,6 @@ bin_links = \
cluttex:cllualatex \
epstopdf:repstopdf \
fmtutil:mktexfmt \
diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl
index c850adce6115..ec28d398f713 100644
--- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl
+++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl
@@ -1,6 +1,6 @@
---- texk/texlive/linked_scripts/latexmk/latexmk.pl.orig 2023-03-20 14:47:33 UTC
+--- texk/texlive/linked_scripts/latexmk/latexmk.pl.orig 2024-02-01 21:05:56 UTC
+++ texk/texlive/linked_scripts/latexmk/latexmk.pl
-@@ -1107,17 +1107,17 @@ else {
+@@ -1156,17 +1156,17 @@ else {
#
# The following works on Solaris, LINUX, HP-UX, IRIX
# Use -f to get full listing, including command line arguments.
@@ -21,7 +21,7 @@
}
else {
$pscmd = "ps -f";
-@@ -1134,7 +1134,7 @@ else {
+@@ -1183,7 +1183,7 @@ else {
# But (19 Aug 2010), the truncation doesn't happen on RHEL4 and 5,
# unless the output is written to a terminal. So the --width
# option is now unnecessary
@@ -30,7 +30,7 @@
}
elsif ( $^O eq "darwin" ) {
# OS-X on Macintosh
-@@ -1155,7 +1155,7 @@ else {
+@@ -1206,7 +1206,7 @@ else {
$ps_previewer = $ps_previewer_landscape = 'NONE';
# Others
$lpr_pdf = 'lpr %O %S';
diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam
deleted file mode 100644
index 66293932d296..000000000000
--- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam
+++ /dev/null
@@ -1,26 +0,0 @@
---- texk/texlive/linked_scripts/pdfjam/pdfjam.orig 2019-11-19 00:11:53 UTC
-+++ texk/texlive/linked_scripts/pdfjam/pdfjam
-@@ -1189,19 +1189,19 @@ EndTemplate
- ) > "$texFile"
- if test "$hyperref" = false; then ## we don't need hyperref
- cp "$texFile" "$tempFile"
-- sed '/\\\usepackage{hyperref}/d' "$tempFile" | \
-- sed '/\\\hypersetup.*/d' > "${texFile}"
-+ sed '/\\usepackage{hyperref}/d' "$tempFile" | \
-+ sed '/\\hypersetup.*/d' > "${texFile}"
- rm "$tempFile"
- fi
- if test -z "$geometry" ; then geometry=false ; fi
- if test "$geometry" = false; then ## geometry package is not to be used
- cp "$texFile" "$tempFile"
-- sed '/\\\usepackage.*{geometry}/d' "$tempFile" > "$texFile"
-+ sed '/\\usepackage.*{geometry}/d' "$tempFile" > "$texFile"
- rm "$tempFile"
- fi
- if test -z "$pagecolor"; then ## color package is not needed
- cp "$texFile" "$tempFile"
-- sed '/\\\usepackage.*{color}/d' "$tempFile" > "$texFile"
-+ sed '/\\usepackage.*{color}/d' "$tempFile" > "$texFile"
- rm "$tempFile"
- fi
- (cat <<EndTemplate
diff --git a/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in b/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in
index 6e8b91ee0be2..530e84d72852 100644
--- a/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in
+++ b/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in
@@ -1,6 +1,6 @@
---- texk/texlive/tl_support/Makefile.in.orig 2020-01-31 18:59:27 UTC
+--- texk/texlive/tl_support/Makefile.in.orig 2021-10-04 15:13:00 UTC
+++ texk/texlive/tl_support/Makefile.in
-@@ -255,8 +255,6 @@ dist_man_MANS = \
+@@ -259,8 +259,6 @@ dist_man_MANS = \
fmtutil.1 \
fmtutil.cnf.5 \
fontinst.1 \
@@ -9,7 +9,7 @@
mktexlsr.1 \
mktexmf.1 \
mktexpk.1 \
-@@ -272,8 +270,6 @@ dist_man_MANS = \
+@@ -276,8 +274,6 @@ man1_links = \
man1_links = \
fmtutil:fmtutil-sys \
diff --git a/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf b/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
index 4f7003be5038..07d19824ec14 100644
--- a/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
+++ b/print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf
@@ -1,33 +1,6 @@
---- texk/texlive/tl_support/fmtutil.cnf.orig 2023-02-28 22:55:44 UTC
+--- texk/texlive/tl_support/fmtutil.cnf.orig 2024-02-15 01:36:29 UTC
+++ texk/texlive/tl_support/fmtutil.cnf
-@@ -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 @@
+@@ -41,10 +41,10 @@
# AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here.
#
# from aleph:
@@ -38,11 +11,10 @@
-amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+#amstex pdftex - -translate-file=cp227.tcx *amstex.ini
#
- # from cslatex:
--cslatex pdftex - -etex cslatex.ini
--pdfcslatex pdftex - -etex cslatex.ini
-+#cslatex pdftex - -etex cslatex.ini
-+#pdfcslatex pdftex - -etex cslatex.ini
+ # from context-legacy:
+ cont-en pdftex - -8bit *cont-en.mkii
+@@ -55,104 +55,104 @@ cont-en xetex - -8bit *cont-en.mkii
+ #! pdfcslatex pdftex - -etex cslatex.ini
#
# from csplain:
-csplain pdftex - -etex -enc csplain-utf8.ini
@@ -150,16 +122,16 @@
+#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
#
# from platex:
--platex eptex language.dat *platex.ini
+-platex euptex language.dat *platex.ini
-platex-dev euptex language.dat *platex.ini
-+#platex eptex language.dat *platex.ini
++#platex euptex language.dat *platex.ini
+#platex-dev euptex language.dat *platex.ini
#
# from ptex:
--eptex eptex language.def *eptex.ini
--ptex eptex - ptex.ini
-+#eptex eptex language.def *eptex.ini
-+#ptex eptex - ptex.ini
+-eptex euptex language.def *eptex.ini
+-ptex euptex - ptex.ini
++#eptex euptex language.def *eptex.ini
++#ptex euptex - ptex.ini
#
# from tex:
-tex tex - tex.ini
diff --git a/print/texlive-base/files/patch-texk_ttf2pk2_configure b/print/texlive-base/files/patch-texk_ttf2pk2_configure
index c4ac27f563ce..186ffc2d57ee 100644
--- a/print/texlive-base/files/patch-texk_ttf2pk2_configure
+++ b/print/texlive-base/files/patch-texk_ttf2pk2_configure
@@ -1,6 +1,6 @@
---- texk/ttf2pk2/configure.orig 2019-03-25 17:27:50 UTC
+--- texk/ttf2pk2/configure.orig 2023-12-23 16:57:39 UTC
+++ texk/ttf2pk2/configure
-@@ -15266,8 +15266,8 @@ else
+@@ -16465,8 +16465,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/pkg-plist b/print/texlive-base/pkg-plist
index b129a125d84c..49134349047a 100644
--- a/print/texlive-base/pkg-plist
+++ b/print/texlive-base/pkg-plist
@@ -113,7 +113,6 @@ bin/gregorio
bin/gsftopk
bin/hbf2gf
bin/ht
-bin/htcontext
bin/htlatex
bin/htmex
bin/httex
@@ -541,7 +540,6 @@ share/man/man5/updmap.cfg.5.gz
%%TEXMFDISTDIR%%/scripts/svn-multi/svn-multi.pl
%%TEXMFDISTDIR%%/scripts/tex4ebook/tex4ebook
%%TEXMFDISTDIR%%/scripts/tex4ht/ht.sh
-%%TEXMFDISTDIR%%/scripts/tex4ht/htcontext.sh
%%TEXMFDISTDIR%%/scripts/tex4ht/htlatex.sh
%%TEXMFDISTDIR%%/scripts/tex4ht/htmex.sh
%%TEXMFDISTDIR%%/scripts/tex4ht/httex.sh
diff --git a/print/texlive-docs/Makefile b/print/texlive-docs/Makefile
index 739e6f2ffa22..f02cab4662f4 100644
--- a/print/texlive-docs/Makefile
+++ b/print/texlive-docs/Makefile
@@ -1,5 +1,5 @@
PORTNAME= texlive
-PORTVERSION= ${TEXLIVE_VERSION}
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMESUFFIX= -docs
diff --git a/print/texlive-docs/distinfo b/print/texlive-docs/distinfo
index 7e83018ec3ea..b229bd3501e4 100644
--- a/print/texlive-docs/distinfo
+++ b/print/texlive-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680719111
-SHA256 (TeX/texlive-20230313-texmf.tar.xz) = 4c4dc77a025acaad90fb6140db2802cdb7ca7a9a2332b5e3d66aa77c43a81253
-SIZE (TeX/texlive-20230313-texmf.tar.xz) = 3866405744
+TIMESTAMP = 1715387737
+SHA256 (TeX/texlive-20240312-texmf.tar.xz) = c8eae2deaaf51e86d93baa6bbcc4e94c12aa06a0d92893df474cc7d2a012c7a7
+SIZE (TeX/texlive-20240312-texmf.tar.xz) = 4270954732
diff --git a/print/texlive-texmf-source/Makefile b/print/texlive-texmf-source/Makefile
index f5fc96aa9aa6..6e36a56218cd 100644
--- a/print/texlive-texmf-source/Makefile
+++ b/print/texlive-texmf-source/Makefile
@@ -1,9 +1,9 @@
PORTNAME= texlive
-PORTVERSION= ${TEXLIVE_VERSION}
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= LOCAL/tex
PKGNAMESUFFIX= -texmf-source
-DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}-freebsd
+DISTNAME= ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}-freebsd
DIST_SUBDIR= TeX
MAINTAINER= tex@FreeBSD.org
@@ -32,14 +32,13 @@ do-install:
${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
-
.if defined(MAINTAINER_MODE)
_INCLUDE_FILES= source
_EXCLUDE_FILES= source/fonts/japanese-otf source/luatex source/platex \
source/fonts/japanese-otf-uptex source/xmltex \
source/fonts/uptex source/jadetex \
source/lambda source/lualatex source/uplatex source/xelatex
-_WRKSRC= ${WRKDIR}/texlive-20230313-texmf-source
+_WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}
_maintainer-extract:
${MAKE} clean
@@ -75,9 +74,9 @@ _maintainer-patch: _maintainer-extract
_maintainer-dist: _maintainer-patch
${TAR} --options xz:compression-level=9 -Jcvf \
- ${WRKDIR}/texlive-20230313-texmf-source-freebsd.tar.xz \
- -C ${WRKDIR} ${PORTNAME}-${TEXLIVE_VERSION}${PKGNAMESUFFIX}
- scp ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \
+ ${WRKDIR}/${DISTFILES} \
+ -C ${WRKDIR} ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}
+ scp ${WRKDIR}/${DISTFILES} \
bofh@freefall.freebsd.org://home/tex/public_distfiles/
.endif
diff --git a/print/texlive-texmf-source/distinfo b/print/texlive-texmf-source/distinfo
index 6fb03d4a2257..aceee83f7222 100644
--- a/print/texlive-texmf-source/distinfo
+++ b/print/texlive-texmf-source/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698350280
-SHA256 (TeX/texlive-20230313-texmf-source-freebsd.tar.xz) = 35449f930ad7213021b3fa1dcf04a2c88d56da12b2c94e24ae8c26ebd41dc78a
-SIZE (TeX/texlive-20230313-texmf-source-freebsd.tar.xz) = 66013568
+TIMESTAMP = 1715404475
+SHA256 (TeX/texlive-20240312-texmf-source-freebsd.tar.xz) = 2fd450d4c951d8bce31064b96ee8cd601d915b439132075ebb980d1d51ac113e
+SIZE (TeX/texlive-20240312-texmf-source-freebsd.tar.xz) = 71434480
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index a4f00b0f8d3e..01e9be77278e 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -1,9 +1,9 @@
PORTNAME= texlive
-PORTVERSION= ${TEXLIVE_VERSION}
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= LOCAL/tex
PKGNAMESUFFIX= -texmf
-DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}-freebsd
+DISTNAME= ${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}-freebsd
DIST_SUBDIR= TeX
EXTRACT_ONLY=
@@ -12,10 +12,8 @@ COMMENT= TeX Live Typesetting System, texmf Tree
WWW= https://tug.org/texlive/
# Reduce DEPENDS temporarily
-#USES= cpe python:run tar:xz tex
USES= cpe tar:xz tex
CPE_VENDOR= tug
-#USE_TEX= base basic:extract texhash tlmgr:run
USE_TEX= texhash tlmgr:run
NO_ARCH= yes
@@ -128,9 +126,9 @@ _maintainer-patch: _maintainer-extract
_maintainer-dist: _maintainer-patch
${TAR} --options xz:compression-level=9 -Jcvf \
- ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \
+ ${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \
-C ${WRKDIR} ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
- scp ${WRKDIR}/texlive-20230313-texmf-freebsd.tar.xz \
+ scp ${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \
bofh@freefall.freebsd.org://home/tex/public_distfiles/
.endif
diff --git a/print/texlive-texmf/distinfo b/print/texlive-texmf/distinfo
index 69250f9fa894..5cfe80cc7487 100644
--- a/print/texlive-texmf/distinfo
+++ b/print/texlive-texmf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698318970
-SHA256 (TeX/texlive-20230313-texmf-freebsd.tar.xz) = e6f08943da37b8626aae296fc6f2829283b72a9af043c10f8b65607ac953c4b1
-SIZE (TeX/texlive-20230313-texmf-freebsd.tar.xz) = 1168123096
+TIMESTAMP = 1716892949
+SHA256 (TeX/texlive-20240312-texmf-freebsd.tar.xz) = 5fa47a49c92800a57bb1f71e14eadfc058b10601c7cd5db438fd1b3a67f9eb97
+SIZE (TeX/texlive-20240312-texmf-freebsd.tar.xz) = 1301584808
diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile
index bdda383582e8..b8fa65a677ad 100644
--- a/print/texlive-tlmgr/Makefile
+++ b/print/texlive-tlmgr/Makefile
@@ -1,13 +1,12 @@
PORTNAME= texlive
-PORTVERSION= ${TEXLIVE_VERSION}
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print perl5
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMESUFFIX= -tlmgr
-DISTFILES= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX} \
- ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \
- ${TLPKG_FILE}.tar.gz
+DISTFILES= ${PORTNAME}-${DISTVERSION}-extra${EXTRACT_SUFX} \
+ ${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX}
DIST_SUBDIR= TeX
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}
+EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-extra${EXTRACT_SUFX}
MAINTAINER= tex@FreeBSD.org
COMMENT= TeXLive manager modules
@@ -22,40 +21,37 @@ USE_TEX= kpathsea
NO_ARCH= yes
NO_BUILD= yes
-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/build-aux/config.guess
+ ${PORTNAME}-${DISTVERSION}-source/texk/texlive/linked_scripts/texlive \
+ ${PORTNAME}-${DISTVERSION}-source/build-aux/config.guess
PATCH_WRKSRC= ${WRKDIR}
post-extract:
- ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \
+ ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-source${EXTRACT_SUFX} \
${EXTRACT_AFTER_ARGS_SOURCE}
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive
${INSTALL_SCRIPT} \
- ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \
+ ${WRKDIR}/${PORTNAME}-${DISTVERSION}-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \
${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 \
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/TeXLive/*.pm \
${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}-extra/tlpkg/TeXLive/trans.pl \
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/TeXLive/trans.pl \
${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
@${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}
${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/.texlive-tlmgr
${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_DATA} ${WRKDIR}/${PORTNAME}-${DISTVERSION}-extra/tlpkg/texlive.tlpdb \
+ ${STAGEDIR}/var/db/tlpkg
${INSTALL_SCRIPT} \
- ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/build-aux/config.guess \
+ ${WRKDIR}/${PORTNAME}-${DISTVERSION}-source/build-aux/config.guess \
${STAGEDIR}/var/db/tlpkg/installer/
${INSTALL_DATA} ${LOCALBASE}/share/texmf-dist/web2c/texmf.cnf \
${STAGEDIR}/var/db/tlpkg
diff --git a/print/texlive-tlmgr/distinfo b/print/texlive-tlmgr/distinfo
index 6a8ed4058078..8acec07d6903 100644
--- a/print/texlive-tlmgr/distinfo
+++ b/print/texlive-tlmgr/distinfo
@@ -1,7 +1,5 @@
-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
+TIMESTAMP = 1715388073
+SHA256 (TeX/texlive-20240312-extra.tar.xz) = 770f1946cdcd1b5ddada2ea328bb37294174f70a2be28b33f38ce14717bc5496
+SIZE (TeX/texlive-20240312-extra.tar.xz) = 1990624
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588
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
deleted file mode 100644
index 52e5db4a9117..000000000000
--- a/print/texlive-tlmgr/files/patch-texlive-20230313-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
+++ /dev/null
@@ -1,1294 +0,0 @@
---- 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/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl b/print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
new file mode 100644
index 000000000000..fe9a0f42d4d4
--- /dev/null
+++ b/print/texlive-tlmgr/files/patch-texlive-20240312-source_texk_texlive_linked__scripts_texlive_tlmgr.pl
@@ -0,0 +1,71 @@
+--- texlive-20240312-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2024-05-11 00:46:18 UTC
++++ texlive-20240312-source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+@@ -644,6 +644,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`);
+@@ -652,7 +655,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
+@@ -744,9 +747,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;
+@@ -2409,7 +2412,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: warning: backup option not implemented for infrastructure "
+ . " update on Windows; continuing anyway.\n")
+@@ -5449,15 +5452,14 @@ sub uninstall_texlive {
+ 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";
+
+@@ -6397,7 +6399,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/xpdfopen/Makefile b/print/xpdfopen/Makefile
index 02fef94a8296..7f924a718c21 100644
--- a/print/xpdfopen/Makefile
+++ b/print/xpdfopen/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xpdfopen
-PORTVERSION= 0.86
-PORTREVISION= 3
+DISTVERSION= ${TEXLIVE_VERSION}
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
DISTNAME= texlive-${TEXLIVE_VERSION}-source
@@ -14,7 +13,6 @@ USE_XORG= x11 xmu
EXTRACT_FILES= build-aux utils/xpdfopen
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
diff --git a/print/xpdfopen/distinfo b/print/xpdfopen/distinfo
index 634257780f8b..dcb4706821c7 100644
--- a/print/xpdfopen/distinfo
+++ b/print/xpdfopen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681270572
-SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9
-SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148
+TIMESTAMP = 1715455436
+SHA256 (TeX/texlive-20240312-source.tar.xz) = 7b6d87cf01661670fac45c93126bed97b9843139ed510f975d047ea938b6fe96
+SIZE (TeX/texlive-20240312-source.tar.xz) = 70140588