Date: Tue, 11 Apr 2023 15:43:58 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 24e24a19568e - main - */tex*: Update version 20210325=>20230313 Message-ID: <202304111543.33BFhwjG045520@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=24e24a19568e8038e3926d7050e1a6052a8b0df5 commit 24e24a19568e8038e3926d7050e1a6052a8b0df5 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-04-03 00:30:03 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-04-11 15:43:18 +0000 */tex*: Update version 20210325=>20230313 - devel/tex-kpathsea: Update version 6.3.3=>6.3.5 - print/texlive-tlmgr: Update version 20210325=>20230313 * Add LICENSE GPLv2 - devel/tex-libtexlua: Update distinfo from 20230313 dists - devel/tex-libtexluajit: Update distinfo from 20230313 dists - print/tex-ptexenc: Update version 1.3.9=>1.4.3 * Pet portclippy - devel/tex-web2c: Update version 20210325=>20230313 - devel/tex-synctex: Update distinfo from 20230313 dists - print/tex-basic-engines: Update version 20210325=>20230313 - print/texlive-base: Update version 20210325=>20230313 - print/texlive-docs: Update version 20210325=>20230313 - print/texlive-full: Update version 20210325=>20230313 - print/texlive-texmf: Update version 20210325=>20230313 - print/texlive-texmf-source: Update version 20210325=>20230313 - print/latex-biber: Update version 2.16=>2.19 - print/tex-dvipdfmax: Update version 20210325=>20230313 - print/tex-dvipsk: Update version 2021.1=>2023.1 - print/tex-formats: Update version 20210325=>20230313 - print/tex-jadetex: Update distinfo from 20230313 dists - print/tex-luatex: Update version 1.12.0=>1.16.0 - print/tex-xetex: Update distinfo from 20230313 dists - print/tex-xmltex: Update distinfo from 20230313 dists - japanese/tex-ptex: Fix build * Remove ConTeXt format - textproc/foiltex: Update MASTER_SITES * Adopt port - There are multiple ports which uses the macro USE_TEX=texmf that is downloading a big DISTFILE. Unfortunately it is not possible for me to test all the consumers in runtime. So in the following ports I have removed USE_TEX=texmf so that someone who uses those can report the runtime files those are missing. If possible(based on LICENSE permission) I will try to create a smaller distfile out of the texlive-20230313-texmf and change dependency accordingly otherwise will reinstate USE_TEX=texmf. The list of ports that are affected are following: * arabic/arabtex * graphics/epix * math/cadabra2 * math/coq * math/gnuplot-tex-extras * net-mgmt/netmagis-www * print/dvisvg * print/lilypond * print/mftrace * print/tex-xdvik * print/latex-beamer Sponsored by: Nepustil --- Mk/Uses/tex.mk | 28 +- arabic/arabtex/Makefile | 4 +- devel/tex-kpathsea/Makefile | 3 +- devel/tex-kpathsea/distinfo | 6 +- devel/tex-kpathsea/files/patch-Makefile.in | 6 +- devel/tex-kpathsea/files/patch-texmf.cnf | 132 +- devel/tex-kpathsea/pkg-plist | 2 +- devel/tex-libtexlua/Makefile | 1 + devel/tex-libtexlua/distinfo | 6 +- devel/tex-libtexluajit/Makefile | 1 + devel/tex-libtexluajit/distinfo | 6 +- devel/tex-synctex/Makefile | 4 +- devel/tex-synctex/distinfo | 6 +- devel/tex-synctex/files/patch-Makefile.in | 1339 ++++++++++++++++++- devel/tex-synctex/files/patch-man-Makefile.in | 33 +- devel/tex-web2c/Makefile | 4 + devel/tex-web2c/distinfo | 6 +- devel/tex-web2c/files/patch-Makefile.in | 1326 ++++++++++++++++++- devel/tex-web2c/files/patch-man-Makefile.in | 4 +- devel/tex-web2c/pkg-plist | 6 + graphics/epix/Makefile | 3 +- japanese/tex-ptex/Makefile | 107 +- japanese/tex-ptex/distinfo | 10 +- japanese/tex-ptex/files/patch-Makefile.in | 1366 ++++++++++++++++++- japanese/tex-ptex/files/patch-configure | 347 +++-- math/cadabra2/Makefile | 4 +- math/coq/Makefile | 4 +- math/gnuplot-tex-extras/Makefile | 3 +- net-mgmt/netmagis-www/Makefile | 4 +- print/dvisvg/Makefile | 4 +- print/latex-beamer/Makefile | 16 +- print/latex-biber/Makefile | 27 +- print/latex-biber/distinfo | 6 +- print/lilypond/Makefile | 4 +- print/mftrace/Makefile | 4 +- print/tex-basic-engines/Makefile | 2 +- print/tex-basic-engines/distinfo | 6 +- print/tex-basic-engines/files/patch-Makefile.in | 1328 ++++++++++++++++++- .../tex-basic-engines/files/patch-man-Makefile.in | 33 +- print/tex-dvipdfmx/Makefile | 27 +- print/tex-dvipdfmx/distinfo | 10 +- print/tex-dvipsk/Makefile | 3 +- print/tex-dvipsk/distinfo | 10 +- print/tex-formats/Makefile | 3 +- print/tex-jadetex/Makefile | 9 +- print/tex-jadetex/distinfo | 6 +- print/tex-luatex/Makefile | 97 +- print/tex-luatex/distinfo | 10 +- print/tex-luatex/files/patch-Makefile.in | 1382 +++++++++++++++++++- print/tex-luatex/files/patch-configure | 320 +++-- print/tex-ptexenc/Makefile | 21 +- print/tex-ptexenc/distinfo | 6 +- print/tex-ptexenc/files/patch-Makefile.in | 4 +- print/tex-ptexenc/files/patch-configure | 36 +- print/tex-ptexenc/files/patch-ptexenc.c | 13 +- print/tex-ptexenc/pkg-plist | 2 +- print/tex-xdvik/Makefile | 4 +- print/tex-xetex/Makefile | 65 +- print/tex-xetex/distinfo | 10 +- print/tex-xetex/files/patch-Makefile.in | 1357 ++++++++++++++++++- print/tex-xetex/files/patch-configure | 56 +- print/tex-xmltex/Makefile | 8 +- print/tex-xmltex/distinfo | 6 +- print/texlive-base/Makefile | 3 +- print/texlive-base/distinfo | 6 +- print/texlive-base/files/patch-Makefile.in | 4 +- print/texlive-base/files/patch-configure | 8 +- .../files/patch-texk-bibtex-x-Makefile.in | 31 - .../files/patch-texk_bibtex-x_Makefile.in | 131 ++ ...x-Makefile.in => patch-texk_chktex_Makefile.in} | 8 +- ...Makefile.in => patch-texk_cjkutils_Makefile.in} | 8 +- .../texlive-base/files/patch-texk_dvipng_configure | 4 +- .../files/patch-texk_dvisvgm_configure | 4 +- ...tch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp | 4 +- .../patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp | 4 +- ...-Makefile.in => patch-texk_gsftopk_Makefile.in} | 8 +- ... => patch-texk_texlive_tl__support_fmtutil.cnf} | 63 +- ...-Makefile.in => patch-texk_ttf2pk2_Makefile.in} | 8 +- print/texlive-base/pkg-plist | 40 +- print/texlive-docs/Makefile | 41 +- print/texlive-docs/distinfo | 6 +- print/texlive-texmf-source/Makefile | 16 +- print/texlive-texmf-source/distinfo | 6 +- print/texlive-texmf/Makefile | 383 ++---- print/texlive-texmf/distinfo | 6 +- print/texlive-tlmgr/Makefile | 15 +- print/texlive-tlmgr/distinfo | 14 +- ...texlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm | 33 - ...e_texk_texlive_linked__scripts_texlive_tlmgr.pl | 87 -- ...e_texk_texlive_linked__scripts_texlive_tlmgr.pl | 1294 ++++++++++++++++++ print/texlive-tlmgr/pkg-plist | 2 + textproc/foiltex/Makefile | 21 +- textproc/foiltex/distinfo | 1 + 93 files changed, 10584 insertions(+), 1341 deletions(-) diff --git a/Mk/Uses/tex.mk b/Mk/Uses/tex.mk index ec6c56e1d6e1..015f5fffa478 100644 --- a/Mk/Uses/tex.mk +++ b/Mk/Uses/tex.mk @@ -29,7 +29,7 @@ # xdvik: XDvi # gbklatex: gbklatex -# formats: TeX, LaTeX, AMSTeX, ConTeXT, EplainTeX, +# formats: TeX, LaTeX, AMSTeX, EplainTeX, # CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis # tex: TeX # latex: LaTeX @@ -91,8 +91,9 @@ TEXMFVARDIR?= share/texmf-var TEXMFCONFIGDIR?=share/texmf-config FMTUTIL_CNF?= ${TEXMFCONFIGDIR}/web2c/fmtutil.cnf TEXHASHDIRS?= ${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXMFCONFIGDIR} -TEXLIVE_YEAR?= 2021 -TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0325 +TEXLIVE_YEAR?= 2023 +TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0313 +DISTNAME_TEXMF= texlive-${TEXLIVE_VERSION}-texmf .for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF PLIST_SUB+= $V="${$V}" @@ -320,20 +321,6 @@ TEX_FORMAT_AMSTEX_DIRS= \ post-install-amstex: ${LN} -fs pdftex ${STAGEDIR}${PREFIX}/bin/amstex -TEX_FORMAT_CONTEXT?= \ - "cont-en pdftex cont-usr.tex -8bit *cont-en.mkii" -# XXX -# "metafun mpost - metafun.mp" -TEX_FORMAT_CONTEXT_FILES= \ - ${TEXMFVARDIR}/web2c/pdftex/cont-en.log \ - ${TEXMFVARDIR}/web2c/pdftex/cont-en.fmt -# bin/metafun -TEX_FORMAT_CONTEXT_DIRS= \ - ${TEXMFVARDIR}/web2c/pdftex -post-install-context: - @${DO_NADA} -# ${LN} -sf mpost ${PREFIX}/bin/metafun - TEX_FORMAT_CSPLAIN?= \ "csplain pdftex - -etex -enc csplain-utf8.ini" \ "pdfcsplain pdftex - -etex -enc csplain-utf8.ini" @@ -544,12 +531,8 @@ TEX_FORMAT_PTEX_FILES= \ ${TEXMFVARDIR}/web2c/eptex/platex.fmt TEX_FORMAT_PTEX_BIN= \ bin/eptex \ - bin/pbibtex \ - bin/pdvitype \ bin/ptex \ bin/platex \ - bin/ppltotf \ - bin/ptftopl \ bin/upbibtex \ bin/updvitype \ bin/uppltotf \ @@ -607,13 +590,10 @@ TEX_FORMAT_XETEX?= \ "xetex xetex language.def -etex xetex.ini" \ "xelatex xetex language.dat -etex xelatex.ini" \ "pdfcsplain xetex - -etex csplain.ini" \ - "cont-en xetex cont-usr.tex -8bit *cont-en.mkii" \ "lollipop xetex - -etex lollipop.ini" TEX_FORMAT_XETEX_FILES= \ ${TEXMFVARDIR}/web2c/xetex/lollipop.fmt \ ${TEXMFVARDIR}/web2c/xetex/lollipop.log \ - ${TEXMFVARDIR}/web2c/xetex/cont-en.log \ - ${TEXMFVARDIR}/web2c/xetex/cont-en.fmt \ ${TEXMFVARDIR}/web2c/xetex/pdfcsplain.log \ ${TEXMFVARDIR}/web2c/xetex/pdfcsplain.fmt \ ${TEXMFVARDIR}/web2c/xetex/xetex.log \ diff --git a/arabic/arabtex/Makefile b/arabic/arabtex/Makefile index 04ee20ab0336..20451ed47ce6 100644 --- a/arabic/arabtex/Makefile +++ b/arabic/arabtex/Makefile @@ -1,6 +1,6 @@ PORTNAME= arabtex PORTVERSION= 3.11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= arabic print MASTER_SITES= ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/ DISTNAME= arab${PORTVERSION:S/.//} @@ -12,7 +12,7 @@ WWW= http://www2.informatik.uni-stuttgart.de/ivi/bs/research/arab_e.htm LICENSE= LPPL10 USES= tar:tgz tex -USE_TEX= base texmf +USE_TEX= base # texmf NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile index 06dd5d76d70f..6575ad4cdc37 100644 --- a/devel/tex-kpathsea/Makefile +++ b/devel/tex-kpathsea/Makefile @@ -1,5 +1,5 @@ PORTNAME= kpathsea -PORTVERSION= 6.3.3 +PORTVERSION= 6.3.5 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- @@ -26,6 +26,7 @@ EXTRACT_FILES= build-aux texk/kpathsea texk/texlive/tl_support \ WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea INFO= kpathsea +PLIST_SUB= VERSION=${PORTVERSION} post-install: (cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \ diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo index f55c23e66138..01e363d09aaf 100644 --- a/devel/tex-kpathsea/distinfo +++ b/devel/tex-kpathsea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643521077 -SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b -SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368 +TIMESTAMP = 1680449457 +SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 +SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in index 4b6bd7e58501..ccaf8dc65e6a 100644 --- a/devel/tex-kpathsea/files/patch-Makefile.in +++ b/devel/tex-kpathsea/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2022-01-30 05:38:17 UTC +--- Makefile.in.orig 2023-04-02 15:35:03 UTC +++ Makefile.in -@@ -364,7 +364,7 @@ am__can_run_installinfo = \ +@@ -364,7 +364,7 @@ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) @@ -9,7 +9,7 @@ $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -@@ -2101,7 +2101,7 @@ install-binPROGRAMS: install-libLTLIBRARIES +@@ -2103,7 +2103,7 @@ installdirs-am: installdirs: installdirs-recursive installdirs-am: diff --git a/devel/tex-kpathsea/files/patch-texmf.cnf b/devel/tex-kpathsea/files/patch-texmf.cnf index 479f30bfd775..d66797fc00a9 100644 --- a/devel/tex-kpathsea/files/patch-texmf.cnf +++ b/devel/tex-kpathsea/files/patch-texmf.cnf @@ -1,6 +1,27 @@ ---- texmf.cnf.orig 2021-03-23 18:18:30 UTC +--- texmf.cnf.orig 2023-02-25 22:59:04 UTC +++ texmf.cnf -@@ -59,7 +59,7 @@ +@@ -1,13 +1,13 @@ + % original texmf.cnf -- runtime path configuration file for kpathsea. + % Public domain. +-% ++% + % If you modify this original file, YOUR CHANGES WILL BE LOST when it is + % updated. Instead, put your changes -- and only your changes, not an + % entire copy! -- in ../../texmf.cnf. That is, if this file is + % installed in /some/path/to/texlive/2023/texmf-dist/web2c/texmf.cnf, + % put your custom settings in /some/path/to/texlive/2023/texmf.cnf. + % (Below, we use YYYY in place of the specific year.) +-% ++% + % What follows is a super-summary of what this .cnf file can + % contain. Please read the Kpathsea manual for more information. + % +@@ -55,11 +55,11 @@ + % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. + % Kpathsea sets (in kpathsea/progname.c): + % SELFAUTOLOC (directory of the binary=/usr/local/texlive/YYYY/bin/i386-linux), +-% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin), ++% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin), % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). % Sorry for the off-by-one-generation names. @@ -9,7 +30,7 @@ % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist -@@ -69,7 +69,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist +@@ -69,7 +69,7 @@ TEXMFMAIN = $TEXMFDIST TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. @@ -18,7 +39,79 @@ % TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $TEXMFROOT/texmf-var -@@ -566,6 +566,7 @@ $SELFAUTOLOC/texmf-local/web2c,\ +@@ -99,12 +99,12 @@ TEXMFAUXTREES = {} + % + % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named + % explicitly and before other trees. +-% ++% + % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions + % should take precedence over distribution files -- although it is + % generally a source of confusion to have different versions of a + % package installed, whatever the trees, so try to avoid it. +-% ++% + % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is + % ever defined (the 99% common case), no extra elements will be added to + % the search paths. tlmgr takes care to end any value with a trailing comma. +@@ -452,7 +452,7 @@ MAILCAPLIBDIR = $TEXMFROOT/etc + % Default settings for the fontconfig library as used by the Windows + % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. + % ConTeXT MkIV (all platforms) also use these values. +-% ++% + FONTCONFIG_FILE = fonts.conf + FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf + FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache +@@ -499,12 +499,12 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx + DVIPDFMXINPUTS = $TEXMF/dvipdfmx + + % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. +-% ++% + % But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in + % the environment with a colon, say, TEXINPUTS=/some/dir:, the intended + % default expansion of TEXINPUTS will not happen and .lua files under + % the /tex/ tree will not be found. +-% ++% + % So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. + % The default LUAINPUTS suffices for luatex and dviluatex. + % +@@ -542,14 +542,14 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname, + % paradoxical), but the compile-time default in paths.h is built from it. + % The SELFAUTO* variables are set automatically from the location of + % argv[0], in kpse_set_program_name. +-% ++% + % This main texmf.cnf file is installed, for a release YYYY, in a + % directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf. + % Since this file is subject to future updates, the TeX Live installer + % or human administrator may also create a file + % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file + % will take precedence over the distributed one. +-% ++% + % For security reasons, it is best not to include . in this path. + % + % The idea behind this lengthy definition: for each of +@@ -558,13 +558,13 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname, + % then the subdirectories ./texmf-local, texmf-dist, ./texmf. + % At any given installation, most of these directories will not exist, + % but they all turn out to be useful somewhere. +-% ++% + % Special addition -- we want to include one more directory: the + % great-grandparent's texmf-local, because that is how TL is installed + % by default. That is, given a binary + % /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find + % /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +-% ++% + % As a result, we cannot use actual brace expansion in the definition, + % since we don't want to scatter ../'s throughout the value. Hence we + % explicitly list every directory. Arguably more understandable anyway. +@@ -578,6 +578,7 @@ $SELFAUTOLOC/texmf/web2c,\ $SELFAUTOLOC/texmf-dist/web2c,\ $SELFAUTOLOC/texmf/web2c,\ \ @@ -26,7 +119,24 @@ $SELFAUTODIR,\ $SELFAUTODIR/share/texmf-local/web2c,\ $SELFAUTODIR/share/texmf-dist/web2c,\ -@@ -804,7 +805,7 @@ hash_extra = 600000 +@@ -634,14 +635,14 @@ shell_escape = p + shell_escape = p + + % No spaces in this command list. +-% ++% + % The programs listed here are as safe as any we know: they either do + % not write any output files, respect openout_any, or have hard-coded + % restrictions similar to or higher than openout_any=p. They also have + % no features to invoke arbitrary other programs, and no known + % exploitable bugs. All to the best of our knowledge. They also have + % practical use for being called from TeX. +-% ++% + shell_escape_commands = \ + bibtex,bibtex8,\ + extractbb,\ +@@ -813,7 +814,7 @@ pool_size = 6250000 pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. @@ -35,7 +145,7 @@ % Maximum number of strings. max_strings = 500000 % Min pool space left after loading .fmt. -@@ -816,7 +817,7 @@ strings_free = 100 +@@ -825,7 +826,7 @@ strings_free = 100 % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large, even though most documents can be handled with a small value. @@ -44,12 +154,14 @@ % Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in % the sources), but we don't need that much. The value here suffices -@@ -828,7 +829,7 @@ trie_size = 1100000 +@@ -837,8 +838,8 @@ hyph_size = 8191 % prime number of hyphenation hyph_size = 8191 % prime number of hyphenation exceptions, >610, <65535 % http://primes.utm.edu/curios/page.php/8191.html % dynamically increased as necessary, so not important. --nest_size = 500 % simultaneous semantic levels (e.g., groups) +-nest_size = 1000 % simultaneous semantic levels (e.g., groups) +-max_in_open = 15 % simultaneous input files and error insertions, +nest_size = 2500 % simultaneous semantic levels (e.g., groups) - max_in_open = 15 % simultaneous input files and error insertions, ++max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost - param_size = 10000 % simultaneous macro parameters, also applies to MP + param_size = 20000 % simultaneous macro parameters, also applies to MP + save_size = 200000 % for saving values outside current group diff --git a/devel/tex-kpathsea/pkg-plist b/devel/tex-kpathsea/pkg-plist index 29d754fbf112..5a0ed243b302 100644 --- a/devel/tex-kpathsea/pkg-plist +++ b/devel/tex-kpathsea/pkg-plist @@ -55,7 +55,7 @@ include/kpathsea/win32lib.h lib/libkpathsea.a lib/libkpathsea.so lib/libkpathsea.so.6 -lib/libkpathsea.so.6.3.3 +lib/libkpathsea.so.%%VERSION%% libdata/pkgconfig/kpathsea.pc man/man1/kpseaccess.1.gz man/man1/kpsepath.1.gz diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile index b08794aa305e..d585124d12a4 100644 --- a/devel/tex-libtexlua/Makefile +++ b/devel/tex-libtexlua/Makefile @@ -1,5 +1,6 @@ PORTNAME= libtexlua PORTVERSION= 5.3.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- diff --git a/devel/tex-libtexlua/distinfo b/devel/tex-libtexlua/distinfo index ad76eb98848f..3e66aa4907af 100644 --- a/devel/tex-libtexlua/distinfo +++ b/devel/tex-libtexlua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643545410 -SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b -SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368 +TIMESTAMP = 1680473625 +SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 +SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile index d751bae68cc6..755a50d673a9 100644 --- a/devel/tex-libtexluajit/Makefile +++ b/devel/tex-libtexluajit/Makefile @@ -1,5 +1,6 @@ PORTNAME= libtexluajit PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMEPREFIX= tex- diff --git a/devel/tex-libtexluajit/distinfo b/devel/tex-libtexluajit/distinfo index 9f03f2a837a5..959e16ad385d 100644 --- a/devel/tex-libtexluajit/distinfo +++ b/devel/tex-libtexluajit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643545774 -SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b -SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368 +TIMESTAMP = 1680474121 +SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 +SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile index b787334520cc..20156853274c 100644 --- a/devel/tex-synctex/Makefile +++ b/devel/tex-synctex/Makefile @@ -1,6 +1,6 @@ PORTNAME= synctex PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/ PKGNAMEPREFIX= tex- @@ -51,7 +51,7 @@ EXTRACT_FILES= build-aux texk/web2c EXCLUDE_ENGINES= etex aleph luatex luajittex pdftex mf mf-nowin ptex \ eptex uptex euptex xetex tex otangle mp pmp upmp web2c \ web-progs luahbtex luajithbtex mflua mfluajit latex \ - pdftex + pdftex hitex post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/devel/tex-synctex/distinfo b/devel/tex-synctex/distinfo index 9a206f6bfd5e..a00c4263f5e7 100644 --- a/devel/tex-synctex/distinfo +++ b/devel/tex-synctex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643546426 -SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b -SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368 +TIMESTAMP = 1680563845 +SHA256 (TeX/texlive-20230313-source.tar.xz) = 3878aa0e1ed0301c053b0e2ee4e9ad999c441345f4882e79bdd1c8f4ce9e79b9 +SIZE (TeX/texlive-20230313-source.tar.xz) = 68630148 diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in index e4b70dc02869..6bf9346c3b06 100644 --- a/devel/tex-synctex/files/patch-Makefile.in +++ b/devel/tex-synctex/files/patch-Makefile.in @@ -1,26 +1,111 @@ ---- Makefile.in.orig 2022-01-30 12:41:33 UTC +--- Makefile.in.orig 2023-04-03 23:25:20 UTC +++ Makefile.in -@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE - luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \ - $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \ +@@ -101,9 +101,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE + luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ + xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \ md5main$(EXEEXT) --bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ +-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \ - ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \ - ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \ -+bin_PROGRAMS = $(am__EXEEXT_5) \ - $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ - $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \ - $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \ -@@ -129,7 +127,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ - $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ - $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ - $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) ++bin_PROGRAMS = $(am__EXEEXT_4) \ + $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ + $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ + $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ +@@ -113,7 +111,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__ + $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \ + $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ + $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) -noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ +noinst_PROGRAMS = \ - $(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \ - $(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38) \ - $(am__EXEEXT_39) $(am__EXEEXT_40) $(am__EXEEXT_41) \ -@@ -3108,7 +3106,7 @@ AM_CFLAGS = $(WARNING_CFLAGS) + $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ + $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ + $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \ +@@ -488,7 +486,7 @@ am__v_AR_0 = @echo " AR " $@; + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) + am__v_AR_0 = @echo " AR " $@; +-am__v_AR_1 = ++am__v_AR_1 = + libff_a_AR = $(AR) $(ARFLAGS) + libff_a_LIBADD = + am__dirstamp = $(am__leading_dot)dirstamp +@@ -1234,7 +1232,7 @@ am__v_lt_0 = --silent + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +-am__v_lt_1 = ++am__v_lt_1 = + libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@ +@@ -1699,11 +1697,11 @@ am__v_GEN_0 = @echo " GEN " $@; + AM_V_GEN = $(am__v_GEN_@AM_V@) + am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) + am__v_GEN_0 = @echo " GEN " $@; +-am__v_GEN_1 = ++am__v_GEN_1 = + AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ +-am__v_at_1 = ++am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c + depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp + am__maybe_remake_depfiles = depfiles +@@ -2395,7 +2393,7 @@ am__v_CC_0 = @echo " CC " $@; + AM_V_CC = $(am__v_CC_@AM_V@) + am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 = @echo " CC " $@; +-am__v_CC_1 = ++am__v_CC_1 = + CCLD = $(CC) + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -2403,7 +2401,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; +-am__v_CCLD_1 = ++am__v_CCLD_1 = + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ +@@ -2413,14 +2411,14 @@ am__v_CXX_0 = @echo " CXX " $@; + AM_V_CXX = $(am__v_CXX_@AM_V@) + am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) + am__v_CXX_0 = @echo " CXX " $@; +-am__v_CXX_1 = ++am__v_CXX_1 = + CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) + am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) + am__v_CXXLD_0 = @echo " CXXLD " $@; +-am__v_CXXLD_1 = ++am__v_CXXLD_1 = + OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) + LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ +@@ -2430,7 +2428,7 @@ am__v_OBJCXX_0 = @echo " OBJCXX " $@; + AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@) + am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@) + am__v_OBJCXX_0 = @echo " OBJCXX " $@; +-am__v_OBJCXX_1 = ++am__v_OBJCXX_1 = + OBJCXXLD = $(OBJCXX) + OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \ +@@ -2438,7 +2436,7 @@ am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; + AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@) + am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@) + am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@; +-am__v_OBJCXXLD_1 = ++am__v_OBJCXXLD_1 = + SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ + $(nodist_libluaffi_a_SOURCES) $(libluaharfbuzz_a_SOURCES) \ + $(nodist_libluahbtexspecific_a_SOURCES) \ +@@ -3105,14 +3103,14 @@ version = $(WEB2CVERSION) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) version = $(WEB2CVERSION) @@ -29,3 +114,1223 @@ proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a + + #EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a + +-#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a ++#EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a + EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \ + libmflualpeg.a libmfluaotfcc.a libmfluapotrace.a \ + libmflualpeg.a libmfluajit.a libmfluaotfcc.a libmfluapotrace.a \ +@@ -3128,7 +3126,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/m + lib_LIBRARIES = $(am__append_126) + lib_LTLIBRARIES = $(am__append_125) + dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 +-nodist_man_MANS = ++nodist_man_MANS = + TEST_EXTENSIONS = .pl .test + # + # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for +@@ -3634,8 +3632,6 @@ bin_links = $(am__append_5) $(am__append_14) $(am__app + bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ + $(am__append_24) $(am__append_33) $(am__append_41) \ + $(am__append_49) $(am__append_54) $(am__append_67) \ +- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ +- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ + $(am__append_78) $(am__append_92) $(am__append_97) \ + $(am__append_102) $(am__append_107) + install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ +@@ -3711,19 +3707,19 @@ tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./si + tangle_silent = $(tangle_silent_@AM_V@) + tangle_silent_ = $(tangle_silent_@AM_DEFAULT_V@) + tangle_silent_0 = @echo " TANGLE " $@; $(SHELL) ./silent-sh $@ # +-tangle_silent_1 = ++tangle_silent_1 = + # + ctangle = $(buildenv) $(CTANGLE) + ctangle_silent = $(ctangle_silent_@AM_V@) + ctangle_silent_ = $(ctangle_silent_@AM_DEFAULT_V@) + ctangle_silent_0 = @echo " CTANGLE " $@; $(SHELL) ./silent-sh $@ # +-ctangle_silent_1 = ++ctangle_silent_1 = + # + tie = $(tie_silent)WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) + tie_silent = $(tie_silent_@AM_V@) + tie_silent_ = $(tie_silent_@AM_DEFAULT_V@) + tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ # +-tie_silent_1 = ++tie_silent_1 = + tie_c = $(tie) -c $@ + tie_m = $(tie) -m $@ + +@@ -3732,7 +3728,7 @@ DIFF = diff + + # For trip, trap, and other tests + DIFF = diff +-DIFFFLAGS = ++DIFFFLAGS = + AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ + DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ + DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ +@@ -3740,29 +3736,29 @@ AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); expor + + # To run, e.g., just the original trip test, in the build directory: + # make -C $ww TRIPTRAP=trip.diffs triptrap +-# where $ww is the web2c build directory. +-# ++# where $ww is the web2c build directory. ++# + # This will run the triptrap-sh script + # which then runs make TEST=triptest.test check-am, + # which then runs the (srcdir file) triptest.test script; + # its output will be in (builddir file) trip.diffs, +-# and triptest.out if the test failed, ++# and triptest.out if the test failed, + # plus various created files in the tripdir/ subdirectory. + # The triptest.diffs file will have the actual abs_srcdir value replaced + # with the constant string "SRCDIR" to minimize differences, and "../" + # replaced with "./" to match the canonical output. Confusing. For the + # real output, see triptest.log. +-# ++# + # To build only tex, make -C $ww tex (i.e., in builddir) should do it. + # Unfortunately the check-am target depends on all-am, so all engines + # are built before any tests are run. If this is a problem, just have to + # edit the generated Makefile in builddir to remove the dependency. +-# ++# + # Other per-engine invocations (see triptrap-sh for complete list): + # make -C $ww mf && make -C $ww TRIPTRAP=mftrap.diffs triptrap +-# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap +-# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap +-# ++# make -C $ww etex && make -C $ww TRIPTRAP=etrip.diffs triptrap ++# make -C $ww ptex && make -C $ww TRIPTRAP=ptrip.diffs triptrap ++# + triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh + + # The environment for making dumps. +@@ -3773,7 +3769,7 @@ cp_silent_0 = @echo " COPY " $@; + cp_silent = $(cp_silent_@AM_V@) + cp_silent_ = $(cp_silent_@AM_DEFAULT_V@) + cp_silent_0 = @echo " COPY " $@; +-cp_silent_1 = ++cp_silent_1 = + nodist_tangle_SOURCES = tangle.c tangle.h + nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h + tangleboot_DEPENDENCIES = $(default_dependencies) +@@ -3820,7 +3816,7 @@ nodist_initex_SOURCES = callexe.c + tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C + initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" + nodist_initex_SOURCES = callexe.c +-initex_LDADD = ++initex_LDADD = + tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130) + + # With --enable-ipc, TeX may need to link with -lsocket. +@@ -3848,7 +3844,7 @@ nodist_call_mf_SOURCES = callexe.c + tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test + call_mf_CPPFLAGS = -DEXEPROG=\"mf.exe\" + nodist_call_mf_SOURCES = callexe.c +-call_mf_LDADD = ++call_mf_LDADD = + dist_mf_SOURCES = mfextra.c + mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) + mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) +@@ -3880,7 +3876,7 @@ nodist_call_mflua_SOURCES = callexe.c + mf_tests = mftraptest.test + call_mflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\" + nodist_call_mflua_SOURCES = callexe.c +-call_mflua_LDADD = ++call_mflua_LDADD = + dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h + mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) + mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS) +@@ -3912,7 +3908,7 @@ libmfluaotfcc_a_CPPFLAGS = \ + -std=c99 -D_CARYLL_USE_PRE_SERIALIZED -DMAIN_VER=0 -DSECONDARY_VER=10 -DPATCH_VER=4 \ + -I$(top_srcdir)/mfluadir/otfcc/include \ + -I$(top_srcdir)/mfluadir/otfcc/include/dep \ +- -I$(top_srcdir)/mfluadir/otfcc/lib ++ -I$(top_srcdir)/mfluadir/otfcc/lib + + libmfluaotfcc_a_CFLAGS = # $(WARNING_CFLAGS) + +@@ -4174,7 +4170,7 @@ libmfluaotfcc_a_SOURCES = \ + mfluadir/otfcc/lib/table/VDMX.h \ + mfluadir/otfcc/lib/table/SVG.c \ + mfluadir/otfcc/lib/table/head.h \ +- mfluadir/otfcc/lib/table/TSI5.c ++ mfluadir/otfcc/lib/table/TSI5.c + + libmfluapotrace_a_CPPFLAGS = \ + -I$(top_srcdir)/mfluadir/potrace \ +@@ -4185,7 +4181,7 @@ libmfluapotrace_a_SOURCES = \ + #nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources) + libmfluapotrace_a_SOURCES = \ + mfluadir/potrace/luafunc.c \ +- mfluadir/potrace/luafunc.h ++ mfluadir/potrace/luafunc.h + + libmflualpeg_a_CPPFLAGS = \ + -I$(top_srcdir)/mfluadir/luapeg \ +@@ -4194,11 +4190,11 @@ libmflualpeg_a_SOURCES = \ + libmflualpeg_a_CFLAGS = # $(WARNING_CFLAGS) + libmflualpeg_a_SOURCES = \ + mfluadir/luapeg/lpeg.c \ +- mfluadir/luapeg/lpeg.h ++ mfluadir/luapeg/lpeg.h + + call_mfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\" + nodist_call_mfluajit_SOURCES = callexe.c +-call_mfluajit_LDADD = ++call_mfluajit_LDADD = + dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h + mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES) + mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS) +@@ -4234,7 +4230,7 @@ libmfluajitlpeg_a_SOURCES = \ + libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) + libmfluajitlpeg_a_SOURCES = \ + mfluadir/luapeg/lpeg.c \ +- mfluadir/luapeg/lpeg.h ++ mfluadir/luapeg/lpeg.h + + mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir + mpost_LDADD = libmplibcore.a libmplibextramath.a libmplibbackends.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ +@@ -4242,7 +4238,7 @@ nodist_call_mpost_SOURCES = callexe.c + + call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" + nodist_call_mpost_SOURCES = callexe.c +-call_mpost_LDADD = ++call_mpost_LDADD = + + # Creating one file: just one rule + mp_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) +@@ -4254,10 +4250,10 @@ nodist_call_pmpost_SOURCES = callexe.c + mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest.test + call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" + nodist_call_pmpost_SOURCES = callexe.c +-call_pmpost_LDADD = ++call_pmpost_LDADD = + call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" + nodist_call_upmpost_SOURCES = callexe.c +-call_upmpost_LDADD = ++call_upmpost_LDADD = + pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ + $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir + +@@ -4311,7 +4307,7 @@ nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mp + $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir + + nodist_libmplibcore_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \ +- $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) ++ $(mpmathdouble_c_h) $(mpstrings_c_h) $(psout_c_h) + + nodist_libmplibextramath_a_SOURCES = $(mpmathbinary_c_h) + nodist_libmplibbackends_a_SOURCES = $(pngout_c_h) $(svgout_c_h) +@@ -4605,7 +4601,7 @@ hiformat_c_h_l_y = \ + hiskip.c \ + histretch.c + +-hitex_c = hitex.c ++hitex_c = hitex.c + + # hitex + nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c) +@@ -4758,11 +4754,11 @@ libluasocket_sources = \ + luatexdir/luasocket/src/timeout.h \ + luatexdir/luasocket/src/udp.c \ + luatexdir/luasocket/src/udp.h \ +- luatexdir/luasocket/src/usocket.h ++ luatexdir/luasocket/src/usocket.h + +-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a +-#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a +-libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a ++libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a ++#liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a ++libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a + libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) + #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) + libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ +@@ -4892,8 +4888,8 @@ LUA_DEPEND = $(LUA53_DEPEND) + LUA_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) + LUA_LIBS = $(LUA53_LIBS) + LUA_DEPEND = $(LUA53_DEPEND) +-libluatex_a_DEPENDENCIES = libff.a libluamisc.a +-libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a ++libluatex_a_DEPENDENCIES = libff.a libluamisc.a ++libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a + libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ + $(LIBPNG_INCLUDES) $(HARFBUZZ_INCLUDES) $(PPLIB_INCLUDES) \ + -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ +@@ -4914,7 +4910,7 @@ dist_libluatex_a_SOURCES = \ + dist_libluatex_a_SOURCES = \ + luatexdir/lua/lstrlibext.c \ + luatexdir/lua/helpers.c \ +- luatexdir/lua/texluac.c ++ luatexdir/lua/texluac.c + + nodist_libluatex_a_SOURCES = \ + $(dist_libluatex_sources) \ +@@ -4932,7 +4928,7 @@ nodist_libluatexspecific_a_SOURCES = \ + + #dist_libluatexspecific_a_SOURCES = + nodist_libluatexspecific_a_SOURCES = \ +- $(dist_libluatexspecific_sources) ++ $(dist_libluatexspecific_sources) + + #dist_libluajittexspecific_a_SOURCES = + nodist_libluajittexspecific_a_SOURCES = \ +@@ -4940,46 +4936,46 @@ nodist_libluahbtexspecific_a_SOURCES = \ + + #dist_libluahbtexspecific_a_SOURCES = + nodist_libluahbtexspecific_a_SOURCES = \ +- $(dist_libluahbtexspecific_sources) ++ $(dist_libluahbtexspecific_sources) + +-#dist_libluajithbtexspecific_a_SOURCES = ++#dist_libluajithbtexspecific_a_SOURCES = + nodist_libluajithbtexspecific_a_SOURCES = \ +- $(dist_libluajithbtexspecific_sources) ++ $(dist_libluajithbtexspecific_sources) + *** 13602 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304111543.33BFhwjG045520>