git: 8374a33c804a - main - tex* : Update version 20150521=>20210325
Date: Sat, 19 Feb 2022 02:25:52 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8374a33c804a728bf435da801571ae9905244f50
commit 8374a33c804a728bf435da801571ae9905244f50
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-02-19 02:19:20 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-02-19 02:25:00 +0000
tex* : Update version 20150521=>20210325
- Update MASTER_SITES_TEX_CTAN from https://tug.org/historic/
- Update texlua to use texlua53 library
- Deprecate CSLaTeX format
- Remove aleph as per Upstream
- Add common variables TEXLIVE_YEAR and TEXLIVE_VERSION to be used in
all ports related to tex*
- Fix dependency of print/texlive-texmf-source [1]
- devel/tex-kpathsea: Update version 6.2.1=>6.3.3
- devel/tex-libtexlua: Update version 5.2.4=>5.3.6
- devel/tex-libtexluajit: Update version 2.0.3=>2.1.0
- devel/tex-synctex: Update version 1.17.0=>2.0.0
- devel/tex-web2c: Update version 20150521=>20210325
- editors/texworks: Fix build with newer tex version
- print/tex-basic-engines: Update version 20150521=>20210325
- print/tex-dvipdfmax: Update version 20150521=>20210325
- print/tex-dvipsk: Update version 5.995=>20210325.1
- print/tex-formats: Update version 20150521=>20210325
- print/tex-jadetex:
- print/tex-luatex: Update version 0.80.0=>1.12.0
* Convert to dynamic pkg-plist
- print/tex-ptexenc: Update version 1.3.3=>1.3.9
- print/tex-xetex: Update version 0.99992=>0.99993
* Convert to dynamic pkg-plist
- print/texlive-base: Update version 20150521=>20210325
- print/texlive-docs: Update version 20150521=>20210325
* Convert to dynamic pkg-plist
- print/texlive-full: Update version 20150521=>20210325
- print/texlive-texmf-source: Update version 20150521=>20210325
- print/texlive-texmf: Update version 20150521=>20210325
* Convert to dynamic pkg-plist
- print/texlive-tlmgr: Update version 20150521=>20210325
- print/xpdfopen: Transfer MAINTAINER to tex@ as xpdfopen is an
integral part of tex after poppler support has been deprecated from
tex [2]
- textproc/dblatex: Update version 0.3.11=>0.3.12
* Take MAINTAINERship
- textproc/gastex: Fix build
- textproc/metauml: Fix build
PR: 226983 [1]
Reported by: Trond.Endrestol@ximalas.info [1]
Reviewed by: tcberner (private repo)
Approved by: hrs (maintainer-timeout) [2]
Relnotes: https://tug.org/texlive/doc/texlive-en/texlive-en.html#news
Sponsored by: Nepustil.net
---
MOVED | 1 +
Mk/bsd.sites.mk | 11 +-
Mk/bsd.tex.mk | 74 +-
UPDATING | 13 +
devel/tex-kpathsea/Makefile | 27 +-
devel/tex-kpathsea/distinfo | 5 +-
devel/tex-kpathsea/files/patch-Makefile.in | 78 +-
devel/tex-kpathsea/files/patch-texmf.cnf | 28 +-
devel/tex-kpathsea/pkg-plist | 30 +-
devel/tex-libtexlua/Makefile | 20 +-
devel/tex-libtexlua/distinfo | 5 +-
devel/tex-libtexlua/pkg-plist | 20 +-
devel/tex-libtexluajit/Makefile | 30 +-
devel/tex-libtexluajit/distinfo | 5 +-
devel/tex-libtexluajit/pkg-plist | 2 +-
devel/tex-synctex/Makefile | 42 +-
devel/tex-synctex/distinfo | 5 +-
devel/tex-synctex/files/patch-Makefile.in | 42 +-
devel/tex-synctex/files/patch-configure | 518 +-
devel/tex-synctex/files/patch-man-Makefile.in | 29 +-
devel/tex-synctex/pkg-plist | 5 +-
devel/tex-web2c/Makefile | 77 +-
devel/tex-web2c/distinfo | 5 +-
devel/tex-web2c/files/patch-Makefile.in | 20 +-
devel/tex-web2c/files/patch-man-Makefile.in | 7 +-
devel/tex-web2c/pkg-plist | 38 +-
editors/texworks/Makefile | 5 +-
japanese/tex-ptex/Makefile | 57 +-
japanese/tex-ptex/distinfo | 9 +-
japanese/tex-ptex/files/patch-Makefile.in | 53 +-
japanese/tex-ptex/files/patch-configure | 500 +-
japanese/tex-ptex/pkg-plist | 4159 -
print/Makefile | 1 -
print/tex-aleph/Makefile | 82 -
print/tex-aleph/distinfo | 4 -
print/tex-aleph/files/patch-Makefile.in | 60 -
print/tex-aleph/files/patch-configure | 429 -
print/tex-aleph/files/patch-man-Makefile.in | 24 -
print/tex-aleph/pkg-descr | 4 -
print/tex-aleph/pkg-plist | 92 -
print/tex-basic-engines/Makefile | 58 +-
print/tex-basic-engines/distinfo | 5 +-
print/tex-basic-engines/files/patch-Makefile.in | 36 +-
.../tex-basic-engines/files/patch-man-Makefile.in | 44 +-
print/tex-basic-engines/pkg-plist | 4 +-
print/tex-dvipdfmx/Makefile | 17 +-
print/tex-dvipdfmx/distinfo | 9 +-
print/tex-dvipdfmx/files/patch-Makefile.in | 18 +-
print/tex-dvipdfmx/pkg-plist | 219 +
print/tex-dvipsk/Makefile | 75 +-
print/tex-dvipsk/distinfo | 9 +-
print/tex-dvipsk/pkg-plist | 2407 -
print/tex-formats/Makefile | 10 +-
print/tex-jadetex/Makefile | 6 +-
print/tex-jadetex/distinfo | 5 +-
print/tex-luatex/Makefile | 42 +-
print/tex-luatex/distinfo | 9 +-
print/tex-luatex/files/patch-Makefile.in | 90 +-
print/tex-luatex/files/patch-configure | 369 +-
.../files/patch-luatexdir_font_luatexfont.h | 10 +-
.../files/patch-luatexdir_image_writeimg.h | 11 -
.../files/patch-luatexdir_image_writeimg.w | 11 -
.../files/patch-luatexdir_pdf_pdftables.h | 11 -
.../files/patch-luatexdir_tex_textoken.w | 11 -
print/tex-luatex/files/patch-pdftoepdf.w | 19 -
print/tex-luatex/pkg-plist | 994 -
print/tex-ptexenc/Makefile | 7 +-
print/tex-ptexenc/distinfo | 5 +-
print/tex-ptexenc/files/patch-Makefile.in | 4 +-
print/tex-ptexenc/files/patch-configure | 10 +-
print/tex-ptexenc/files/patch-ptexenc.c | 60 +-
print/tex-ptexenc/pkg-plist | 4 +-
print/tex-xetex/Makefile | 53 +-
print/tex-xetex/distinfo | 9 +-
print/tex-xetex/files/patch-Makefile.in | 42 +-
print/tex-xetex/files/patch-configure | 144 +-
print/tex-xetex/pkg-plist | 704 -
print/tex-xmltex/Makefile | 6 +-
print/tex-xmltex/distinfo | 5 +-
print/texlive-base/Makefile | 51 +-
print/texlive-base/distinfo | 5 +-
print/texlive-base/files/patch-Makefile.in | 6 +-
print/texlive-base/files/patch-configure | 18 +-
.../files/patch-texk-bibtex-x-Makefile.in | 19 +-
.../files/patch-texk-chktex-Makefile.in | 10 +-
.../files/patch-texk-cjkutils-Makefile.in | 8 +-
...h-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp | 10 -
.../patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp | 10 -
...texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp | 10 -
...atch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp | 10 -
.../files/patch-texk-gsftopk-Makefile.in | 6 +-
...tools-lcdf-typetools-2.104-libefont-t1interp.cc | 10 -
.../patch-texk-texlive-linked_scripts-Makfile.in | 10 -
...k-texlive-linked_scripts-texlive-fmtutil-sys.sh | 8 -
...xk-texlive-linked_scripts-texlive-updmap-sys.sh | 8 -
.../patch-texk-texlive-tl_scripts-Makefile.in | 69 -
.../patch-texk-texlive-tl_scripts-fmtutil.cnf | 123 +-
.../patch-texk-texlive-tl_scripts-texconfig-sys.sh | 8 -
.../files/patch-texk-ttf2pk2-Makefile.in | 6 +-
.../texlive-base/files/patch-texk_dvipng_configure | 12 +-
.../files/patch-texk_dvisvgm_configure | 12 +-
...tch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp | 10 +
.../patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp | 10 +
...h-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp | 10 +
.../patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp | 10 +
..._lcdf-typetools_lcdf-typetools-src_Makefile.in} | 6 +-
...f-typetools_lcdf-typetools-src_libefont_cff.cc} | 4 +-
...petools_lcdf-typetools-src_libefont_t1interp.cc | 10 +
.../patch-texk_texlive_linked__scripts_Makefile.in | 20 +
...atch-texk_texlive_linked__scripts_pdfjam_pdfjam | 32 +-
.../patch-texk_texlive_tl__support_Makefile.in | 20 +
.../files/patch-texk_ttf2pk2_configure | 12 +-
.../texlive-base/files/patch-texk_ttf2pk2_pklib.c | 12 -
print/texlive-base/pkg-plist | 203 +-
print/texlive-docs/Makefile | 108 +-
print/texlive-docs/distinfo | 5 +-
print/texlive-docs/pkg-plist | 31442 -------
print/texlive-full/Makefile | 2 +-
print/texlive-texmf-source/Makefile | 57 +-
print/texlive-texmf-source/distinfo | 5 +-
print/texlive-texmf-source/pkg-plist | 5226 --
print/texlive-texmf/Makefile | 552 +-
print/texlive-texmf/distinfo | 7 +-
print/texlive-texmf/pkg-plist | 85680 -------------------
print/texlive-tlmgr/Makefile | 39 +-
print/texlive-tlmgr/distinfo | 13 +-
...exlive-20210325-extra_tlpkg_TeXLive_TLUtils.pm} | 23 +-
..._texk_texlive_linked__scripts_texlive_tlmgr.pl} | 57 +-
print/texlive-tlmgr/pkg-plist | 3 +-
print/xpdfopen/Makefile | 23 +-
print/xpdfopen/distinfo | 7 +-
textproc/dblatex/Makefile | 22 +-
textproc/dblatex/distinfo | 6 +-
textproc/gastex/pkg-plist | 4 +-
textproc/metauml/pkg-plist | 4 +-
135 files changed, 3118 insertions(+), 133123 deletions(-)
diff --git a/MOVED b/MOVED
index 5d2f5853bd89..2223e2b2794f 100644
--- a/MOVED
+++ b/MOVED
@@ -16893,3 +16893,4 @@ security/php80-openssl||2022-02-12|php80-openssl module is a default module for
security/php81-openssl||2022-02-12|php81-openssl module is a default module for lang/php81 from now on
math/qhull|math/qhull7|2022-02-19|qhull as version 8 is the default from now on.
math/qhull8|math/qhull|2022-02-19|qhull as version 8 is the default from now on.
+print/tex-aleph||2022-02-18|tex-aleph has been removed from texlive-2021 system
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index c55282e88815..1ec0300fd5c0 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1116,12 +1116,11 @@ MASTER_SITE_TCLTK+= \
.if !defined(IGNORE_MASTER_SITE_TEX_CTAN)
MASTER_SITE_TEX_CTAN+= \
- http://ctan.unsw.edu.au/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
- ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
- ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
- ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ \
- ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/
+ https://ftp.math.utah.edu/pub/tex/historic/%SUBDIR%/ \
+ https://ftp.tu-chemnitz.de/pub/tug/historic/%SUBDIR%/ \
+ https://pi.kwarc.info/historic/%SUBDIR%/ \
+ https://mirrors.tuna.tsinghua.edu.cn/tex-historic-archive/%SUBDIR%/ \
+ https://mirror.nju.edu.cn/tex-historic/%SUBDIR%/
.endif
# Derived from: https://www.torproject.org/getinvolved/mirrors.html.en
diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index dfb36193656b..3a7725958ede 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -22,7 +22,7 @@ TEX_MAINTAINER= freebsd-tex@FreeBSD.org
# ptexenc: character code conversion library for pTeX
# basic: basic TeX engines including tex and pdftex
# tlmgr: tlmgr dependency (Perl modules)
-# texlua: texlua52 library
+# texlua: texlua53 library
# texluajit: texluajit library
# synctex: synctex library
# xpdfopen: pdfopen/pdfclose utility
@@ -32,12 +32,11 @@ TEX_MAINTAINER= freebsd-tex@FreeBSD.org
# xdvik: XDvi
# gbklatex: gbklatex
#
-# formats: TeX, LaTeX, AMSTeX, ConTeXT, CSLaTeX, EplainTeX,
+# formats: TeX, LaTeX, AMSTeX, ConTeXT, EplainTeX,
# CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis
# tex: TeX
# latex: LaTeX
# pdftex: PDFTeX
-# aleph: Aleph
# jadetex: JadeTeX
# luatex: LuaTeX
# ptex: pTeX
@@ -67,6 +66,8 @@ TEXMFVARDIR?= share/texmf-var
TEXMFCONFIGDIR?=share/texmf-config
FMTUTIL_CNF?= ${TEXMFCONFIGDIR}/web2c/fmtutil.cnf
TEXHASHDIRS?= ${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXMFCONFIGDIR}
+TEXLIVE_YEAR?= 2021
+TEXLIVE_VERSION?= ${TEXLIVE_YEAR}0325
.for V in TEXMFDIR TEXMFDISTDIR TEXMFLOCALDIR TEXMFVARDIR TEXMFCONFIGDIR FMTUTIL_CNF
PLIST_SUB+= $V="${$V}"
@@ -85,7 +86,7 @@ _USE_TEX_BASE_PKGNAME= texlive-base
_USE_TEX_GBKLATEX_DEP= gbklatex
_USE_TEX_GBKLATEX_PORT= ${_USE_TEX_BASE_PORT}
_USE_TEX_GBKLATEX_PKGNAME=${_USE_TEX_BASE_PKGNAME}
-_USE_TEX_SOURCE_DEP= ${LOCALBASE}/${TEXMFDISTDIR}/source/.keep_me
+_USE_TEX_SOURCE_DEP= ${_USE_TEX_SOURCE_PKGNAME}>=${TEXLIVE_VERSION}
_USE_TEX_SOURCE_PORT= print/${_USE_TEX_SOURCE_PKGNAME}
_USE_TEX_SOURCE_PKGNAME=texlive-texmf-source
_USE_TEX_DOCS_DEP= ${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README
@@ -129,7 +130,7 @@ _USE_TEX_KPATHSEA_PKGNAME=tex-kpathsea
_USE_TEX_PTEXENC_DEP= libptexenc.so
_USE_TEX_PTEXENC_PORT= print/${_USE_TEX_PTEXENC_PKGNAME}
_USE_TEX_PTEXENC_PKGNAME=tex-ptexenc
-_USE_TEX_TEXLUA_DEP= libtexlua52.so
+_USE_TEX_TEXLUA_DEP= libtexlua53.so
_USE_TEX_TEXLUA_PORT= devel/${_USE_TEX_TEXLUA_PKGNAME}
_USE_TEX_TEXLUA_PKGNAME=tex-libtexlua
_USE_TEX_TEXLUAJIT_DEP= libtexluajit.so
@@ -144,9 +145,6 @@ _USE_TEX_SYNCTEX_PKGNAME=tex-synctex
_USE_TEX_XPDFOPEN_DEP= pdfopen
_USE_TEX_XPDFOPEN_PORT= print/${_USE_TEX_XPDFOPEN_PKGNAME}
_USE_TEX_XPDFOPEN_PKGNAME= xpdfopen
-_USE_TEX_ALEPH_DEP= aleph
-_USE_TEX_ALEPH_PORT= print/${_USE_TEX_ALEPH_PKGNAME}
-_USE_TEX_ALEPH_PKGNAME= tex-aleph
_USE_TEX_LUATEX_DEP= luatex
_USE_TEX_LUATEX_PORT= print/${_USE_TEX_LUATEX_PKGNAME}
_USE_TEX_LUATEX_PKGNAME=tex-luatex
@@ -154,9 +152,9 @@ _USE_TEX_XETEX_DEP= xetex
_USE_TEX_XETEX_PORT= print/${_USE_TEX_XETEX_PKGNAME}
_USE_TEX_XETEX_PKGNAME= tex-xetex
-_USE_TEX_FULLLIST= texmf>=20150523_3 base>=20150521_5 \
+_USE_TEX_FULLLIST= texmf>=${TEXLIVE_VERSION} base>=${TEXLIVE_VERSION} \
web2c tlmgr:run \
- basic formats aleph xetex jadetex luatex xmltex ptex \
+ basic formats xetex jadetex luatex xmltex ptex \
dvipsk dvipdfmx xdvik xpdfopen:run \
kpathsea:lib ptexenc:lib texlua:lib texluajit:lib synctex:lib
@@ -168,10 +166,10 @@ USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
_U:= ${_UU} # ugly but necessary in for loop
_VOP:=
. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
-_U:= ${_U}>=20150523_3
+_U:= ${_U}>=${TEXLIVE_VERSION}
. endif
. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
-_U:= ${_U}>=20150521_5
+_U:= ${_U}>=${TEXLIVE_VERSION}
. endif
. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \
!empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \
@@ -290,21 +288,6 @@ do-updmap:
post-install-script: do-updmap
.endif
-TEX_FORMAT_ALEPH?= \
- "aleph aleph - *aleph.ini" \
- "lamed aleph language.dat *lambda.ini"
-TEX_FORMAT_ALEPH_FILES= \
- ${TEXMFVARDIR}/web2c/aleph/aleph.log \
- ${TEXMFVARDIR}/web2c/aleph/aleph.fmt \
- ${TEXMFVARDIR}/web2c/aleph/lamed.log \
- ${TEXMFVARDIR}/web2c/aleph/lamed.fmt
-TEX_FORMAT_ALEPH_BIN= \
- bin/lamed
-TEX_FORMAT_ALEPH_DIRS= \
- ${TEXMFVARDIR}/web2c/aleph
-post-install-aleph:
- ${LN} -sf aleph ${STAGEDIR}${PREFIX}/bin/lamed
-
TEX_FORMAT_AMSTEX?= \
"amstex pdftex - -translate-file=cp227.tcx *amstex.ini"
TEX_FORMAT_AMSTEX_FILES= \
@@ -331,23 +314,6 @@ post-install-context:
@${DO_NADA}
# ${LN} -sf mpost ${PREFIX}/bin/metafun
-TEX_FORMAT_CSLATEX?= \
- "cslatex pdftex - -etex cslatex.ini" \
- "pdfcslatex pdftex - -etex cslatex.ini"
-TEX_FORMAT_CSLATEX_FILES= \
- ${TEXMFVARDIR}/web2c/pdftex/cslatex.log \
- ${TEXMFVARDIR}/web2c/pdftex/cslatex.fmt \
- ${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.log \
- ${TEXMFVARDIR}/web2c/pdftex/pdfcslatex.fmt
-TEX_FORMAT_CSLATEX_BIN= \
- bin/cslatex \
- bin/pdfcslatex
-TEX_FORMAT_CSLATEX_DIRS= \
- ${TEXMFVARDIR}/web2c/pdftex
-post-install-cslatex:
- ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/cslatex
- ${LN} -sf pdftex ${STAGEDIR}${PREFIX}/bin/pdfcslatex
-
TEX_FORMAT_CSPLAIN?= \
"csplain pdftex - -etex -enc csplain-utf8.ini" \
"pdfcsplain pdftex - -etex -enc csplain-utf8.ini"
@@ -416,7 +382,7 @@ TEX_FORMAT_LUATEX?= \
"lualatex luatex language.dat,language.dat.lua lualatex.ini" \
"luajittex luajittex language.def,language.dat.lua luatex.ini" \
"pdfcsplain luatex - -etex csplain.ini" \
- "lualollipop luatex - lualollipop.in"
+ "lollipop luatex - lollipop.ini"
TEX_FORMAT_LUATEX_FILES= \
${TEXMFVARDIR}/web2c/luatex/dviluatex.log \
${TEXMFVARDIR}/web2c/luatex/dviluatex.fmt \
@@ -558,8 +524,16 @@ TEX_FORMAT_PTEX_FILES= \
${TEXMFVARDIR}/web2c/eptex/platex.fmt
TEX_FORMAT_PTEX_BIN= \
bin/eptex \
+ bin/pbibtex \
+ bin/pdvitype \
bin/ptex \
- bin/platex
+ bin/platex \
+ bin/ppltotf \
+ bin/ptftopl \
+ bin/upbibtex \
+ bin/updvitype \
+ bin/uppltotf \
+ bin/uptftopl
TEX_FORMAT_PTEX_DIRS= \
${TEXMFVARDIR}/web2c/ptex \
${TEXMFVARDIR}/web2c/eptex
@@ -614,8 +588,10 @@ TEX_FORMAT_XETEX?= \
"xelatex xetex language.dat -etex xelatex.ini" \
"pdfcsplain xetex - -etex csplain.ini" \
"cont-en xetex cont-usr.tex -8bit *cont-en.mkii" \
- "xelollipop xetex - -etex xelollipop.ini"
+ "lollipop xetex - -etex lollipop.ini"
TEX_FORMAT_XETEX_FILES= \
+ ${TEXMFVARDIR}/web2c/xetex/lollipop.fmt \
+ ${TEXMFVARDIR}/web2c/xetex/lollipop.log \
${TEXMFVARDIR}/web2c/xetex/cont-en.log \
${TEXMFVARDIR}/web2c/xetex/cont-en.fmt \
${TEXMFVARDIR}/web2c/xetex/pdfcsplain.log \
@@ -623,9 +599,7 @@ TEX_FORMAT_XETEX_FILES= \
${TEXMFVARDIR}/web2c/xetex/xetex.log \
${TEXMFVARDIR}/web2c/xetex/xetex.fmt \
${TEXMFVARDIR}/web2c/xetex/xelatex.log \
- ${TEXMFVARDIR}/web2c/xetex/xelatex.fmt \
- ${TEXMFVARDIR}/web2c/xetex/xelollipop.log \
- ${TEXMFVARDIR}/web2c/xetex/xelollipop.fmt
+ ${TEXMFVARDIR}/web2c/xetex/xelatex.fmt
TEX_FORMAT_XETEX_BIN= \
bin/xetex \
bin/xelatex \
diff --git a/UPDATING b/UPDATING
index 419654e733ae..713384a0f63b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -13,6 +13,19 @@ you update your ports collection, before attempting any port upgrades.
It is recommended that you delete qhull and ports depending upon it, and
then reinstalling all the dependent ports.
+20220218:
+ AFFECTS: users of TeX*
+ AUTHOR: bofh@FreeBSD.org
+
+ TeX system has been updated to 2021 from 2015. Normal pkg upgrade or
+ portmaster -a should handle all the upgrade properly. In case not please
+ create a ticket or send a mail to tex@FreeBSD.org
+
+ print/tex-aleph has been removed as per upstream. This package should be
+ removed manually:
+
+ # pkg remove tex-aleph
+
20220218:
AFFECTS: users of net-mgmt/librenms
AUTHOR: dvl@FreeBSD.org
diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
index 41e0e7bf15fe..1c89ae9a8040 100644
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@@ -1,10 +1,9 @@
PORTNAME= kpathsea
-PORTVERSION= 6.2.1
-PORTREVISION= 2
+PORTVERSION= 6.3.3
CATEGORIES= devel
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${TEXLIVE_VERSION}-source
DIST_SUBDIR= TeX
MAINTAINER= tex@FreeBSD.org
@@ -15,26 +14,30 @@ LICENSE= LGPL21+
USES= libtool pathfix tar:xz
USE_LDCONFIG= yes
USE_TEX= yes
-EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES= build-aux \
- texk/kpathsea \
- texk/texlive/tl_scripts
-WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea
+
GNU_CONFIGURE= yes
+
INSTALL_TARGET= install-strip
+EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES= build-aux texk/kpathsea texk/texlive/tl_support \
+ texk/texlive/linked_scripts/texlive-extra \
+ texk/texlive/linked_scripts/texlive
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea
+
INFO= kpathsea
post-install:
- cd ${WRKDIR}/${DISTNAME}/texk/texlive/tl_scripts && \
+ (cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \
for f in kpsetool kpsewhere; do \
${INSTALL_SCRIPT} $${f}.sh ${STAGEDIR}${PREFIX}/bin/$$f; \
- ${INSTALL_MAN} $${f}.1 \
+ ${INSTALL_MAN} ../../tl_support/$${f}.1 \
${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \
done; \
for l in kpsexpand kpsepath; do \
${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \
${LN} -sf kpsetool.1 ${STAGEDIR}${MANPREFIX}/man/man1/$${l}.1; \
- done
+ done)
.include <bsd.port.mk>
diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo
index 5e60be0fc6e1..f55c23e66138 100644
--- a/devel/tex-kpathsea/distinfo
+++ b/devel/tex-kpathsea/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643521077
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in
index 22f302062632..4b6bd7e58501 100644
--- a/devel/tex-kpathsea/files/patch-Makefile.in
+++ b/devel/tex-kpathsea/files/patch-Makefile.in
@@ -1,84 +1,20 @@
---- Makefile.in.orig 2015-03-16 07:52:01 UTC
+--- Makefile.in.orig 2022-01-30 05:38:17 UTC
+++ Makefile.in
-@@ -170,8 +170,8 @@ am__uninstall_files_from_dir = { \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
-- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
-+ "$(DESTDIR)$(web2cdir)" \
-+ "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
-@@ -306,7 +306,7 @@ am__can_run_installinfo = \
+@@ -364,7 +364,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
- DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA)
+ DATA = $(dist_noinst_DATA) $(pkgconfig_DATA)
-HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \
-+HEADERS = $(kpseinclude_HEADERS) \
- $(nodist_kpselib_HEADERS) $(noinst_HEADERS)
++HEADERS = $(nodist_kpseinclude_HEADERS) \
+ $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -717,12 +717,12 @@ libkpathsea_la_SOURCES = tex-file.c abso
- kpseincludedir = ${includedir}/kpathsea
- nodist_kpseinclude_HEADERS = \
- kpathsea.h \
-- paths.h
-+ paths.h \
-+ c-auto.h
-
- kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
- kpselibdir = ${libdir}/kpathsea
--nodist_kpselib_HEADERS = \
-- c-auto.h
-+nodist_kpselib_HEADERS =
-
-
- # Headers included directly into kpathsea.h
-@@ -785,7 +785,7 @@ noinst_HEADERS = \
- xopendir.h \
- xstat.h
-
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = kpathsea.pc
- DISTCLEANFILES = paths.h stamp-paths kpathsea.h
- kpseaccess_SOURCES = access.c
-@@ -2103,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRAR
+@@ -2101,7 +2101,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
-- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"; do \
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -2167,10 +2167,9 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-data-local install-dist_web2cDATA \
-- install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
-+install-data-am: install-data-local install-kpseincludeHEADERS \
- install-nodist_kpseincludeHEADERS \
-- install-nodist_kpselibHEADERS install-pkgconfigDATA
-+ install-pkgconfigDATA
-
- install-dvi: install-dvi-recursive
-
-@@ -2319,13 +2318,13 @@ install-data-local: installdirs-am
- uninstall-local:
- @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
- @WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
--@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- @WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
- @WIN32_FALSE@ else :; fi; \
- @WIN32_FALSE@ done
- @for f in $(dist_noinst_DATA); do \
- if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
-- echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
-+ echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
- rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
- else :; fi; \
- done
diff --git a/devel/tex-kpathsea/files/patch-texmf.cnf b/devel/tex-kpathsea/files/patch-texmf.cnf
index 88dee70ebf9a..479f30bfd775 100644
--- a/devel/tex-kpathsea/files/patch-texmf.cnf
+++ b/devel/tex-kpathsea/files/patch-texmf.cnf
@@ -1,15 +1,15 @@
---- texmf.cnf.orig 2015-04-13 00:20:30.000000000 +0900
-+++ texmf.cnf 2015-09-26 04:35:35.579765000 +0900
-@@ -51,7 +51,7 @@
- % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
- % Kpathsea sets SELFAUTOLOC (the directory with the binary),
- % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
+--- texmf.cnf.orig 2021-03-23 18:18:30 UTC
++++ texmf.cnf
+@@ -59,7 +59,7 @@
+ % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
+ % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
+ % Sorry for the off-by-one-generation names.
-TEXMFROOT = $SELFAUTOPARENT
+TEXMFROOT = $SELFAUTODIR/share
% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
-@@ -61,7 +61,7 @@
+@@ -69,7 +69,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
TEXMFMAIN = $TEXMFDIST
% Local additions to the distribution trees.
@@ -18,7 +18,7 @@
% TEXMFSYSVAR, where *-sys store cached runtime data.
TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -495,6 +495,7 @@
+@@ -566,6 +566,7 @@ $SELFAUTOLOC/texmf-local/web2c,\
$SELFAUTOLOC/texmf-dist/web2c,\
$SELFAUTOLOC/texmf/web2c,\
\
@@ -26,7 +26,7 @@
$SELFAUTODIR,\
$SELFAUTODIR/share/texmf-local/web2c,\
$SELFAUTODIR/share/texmf-dist/web2c,\
-@@ -722,7 +723,7 @@
+@@ -804,7 +805,7 @@ hash_extra = 600000
pool_size = 6250000
% Minimum pool space after TeX's own strings; must be at least
% 25000 less than pool_size, but doesn't need to be nearly that large.
@@ -34,8 +34,8 @@
+string_vacancies = 150000
% Maximum number of strings.
max_strings = 500000
- % min pool space left after loading .fmt
-@@ -732,7 +733,7 @@
+ % Min pool space left after loading .fmt.
+@@ -816,7 +817,7 @@ strings_free = 100
% expansion works by writing material into the buffer and reparsing the
% line. As a consequence, certain constructs require the buffer to be
% very large, even though most documents can be handled with a small value.
@@ -44,10 +44,10 @@
% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in
% the sources), but we don't need that much. The value here suffices
-@@ -743,7 +744,7 @@
-
- hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767.
+@@ -828,7 +829,7 @@ trie_size = 1100000
+ hyph_size = 8191 % prime number of hyphenation exceptions, >610, <65535
% http://primes.utm.edu/curios/page.php/8191.html
+ % dynamically increased as necessary, so not important.
-nest_size = 500 % simultaneous semantic levels (e.g., groups)
+nest_size = 2500 % simultaneous semantic levels (e.g., groups)
max_in_open = 15 % simultaneous input files and error insertions,
diff --git a/devel/tex-kpathsea/pkg-plist b/devel/tex-kpathsea/pkg-plist
index b9699051feb1..29d754fbf112 100644
--- a/devel/tex-kpathsea/pkg-plist
+++ b/devel/tex-kpathsea/pkg-plist
@@ -1,16 +1,11 @@
bin/kpseaccess
+bin/kpsepath
bin/kpsereadlink
bin/kpsestat
-bin/kpsewhich
-bin/mktexlsr
-bin/mktexmf
-bin/mktexpk
-bin/mktextfm
-bin/texhash
-bin/kpsewhere
bin/kpsetool
+bin/kpsewhere
+bin/kpsewhich
bin/kpsexpand
-bin/kpsepath
include/kpathsea/absolute.h
include/kpathsea/c-auto.h
include/kpathsea/c-ctype.h
@@ -57,22 +52,17 @@ include/kpathsea/types.h
include/kpathsea/variable.h
include/kpathsea/version.h
include/kpathsea/win32lib.h
+lib/libkpathsea.a
+lib/libkpathsea.so
+lib/libkpathsea.so.6
+lib/libkpathsea.so.6.3.3
+libdata/pkgconfig/kpathsea.pc
man/man1/kpseaccess.1.gz
+man/man1/kpsepath.1.gz
man/man1/kpsereadlink.1.gz
man/man1/kpsestat.1.gz
-man/man1/kpsewhich.1.gz
-man/man1/kpsepath.1.gz
man/man1/kpsetool.1.gz
man/man1/kpsewhere.1.gz
+man/man1/kpsewhich.1.gz
man/man1/kpsexpand.1.gz
-man/man1/mktexlsr.1.gz
-man/man1/mktexmf.1.gz
-man/man1/mktexpk.1.gz
-man/man1/mktextfm.1.gz
-man/man1/texhash.1.gz
-lib/libkpathsea.a
-lib/libkpathsea.so
-lib/libkpathsea.so.6
-lib/libkpathsea.so.6.2.1
-libdata/pkgconfig/kpathsea.pc
%%TEXMFDISTDIR%%/web2c/texmf.cnf
diff --git a/devel/tex-libtexlua/Makefile b/devel/tex-libtexlua/Makefile
index c38438ab77b9..9c80ae72aeea 100644
--- a/devel/tex-libtexlua/Makefile
+++ b/devel/tex-libtexlua/Makefile
@@ -1,9 +1,9 @@
PORTNAME= libtexlua
-PORTVERSION= 5.2.4
+PORTVERSION= 5.3.6
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${TEXLIVE_VERSION}-source
DIST_SUBDIR= TeX
MAINTAINER= tex@FreeBSD.org
@@ -12,16 +12,20 @@ COMMENT= Lua library for TeXLive
LICENSE= MIT
LICENSE_FILE= ${WRKDIR}/LICENSE.MIT
-USES= tar:xz libtool pathfix pkgconfig
+USES= libtool pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES= build-aux libs/lua52
-WRKSRC= ${WRKDIR}/${DISTNAME}/libs/lua52
+USE_TEX= yes
+
GNU_CONFIGURE= yes
+
INSTALL_TARGET= install-strip
+EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES= build-aux libs/lua53
+WRKSRC= ${WRKDIR}/${DISTNAME}/libs/lua53
+
post-extract:
${SED} -e '/\*\ Copyright/,/\*\//!d;s/^\*//;/^\*\*/d' \
- ${WRKSRC}/lua-5.2.4/src/lua.h > ${WRKDIR}/LICENSE.MIT
+ ${WRKSRC}/lua53-src/src/lua.h > ${WRKDIR}/LICENSE.MIT
.include <bsd.port.mk>
diff --git a/devel/tex-libtexlua/distinfo b/devel/tex-libtexlua/distinfo
index 5e60be0fc6e1..ad76eb98848f 100644
--- a/devel/tex-libtexlua/distinfo
+++ b/devel/tex-libtexlua/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643545410
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
diff --git a/devel/tex-libtexlua/pkg-plist b/devel/tex-libtexlua/pkg-plist
index 8e71a98a162b..9c13eb876456 100644
--- a/devel/tex-libtexlua/pkg-plist
+++ b/devel/tex-libtexlua/pkg-plist
@@ -1,10 +1,10 @@
-include/texlua52/lauxlib.h
-include/texlua52/lua.h
-include/texlua52/lua.hpp
-include/texlua52/luaconf.h
-include/texlua52/lualib.h
-lib/libtexlua52.a
-lib/libtexlua52.so
-lib/libtexlua52.so.5
-lib/libtexlua52.so.5.2.4
-libdata/pkgconfig/texlua52.pc
+include/texlua53/lauxlib.h
+include/texlua53/lua.h
+include/texlua53/lua.hpp
+include/texlua53/luaconf.h
+include/texlua53/lualib.h
+lib/libtexlua53.a
+lib/libtexlua53.so
+lib/libtexlua53.so.5
+lib/libtexlua53.so.5.3.6
+libdata/pkgconfig/texlua53.pc
diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
index 63f7f1ea4f38..958b42e4635f 100644
--- a/devel/tex-libtexluajit/Makefile
+++ b/devel/tex-libtexluajit/Makefile
@@ -1,32 +1,36 @@
PORTNAME= libtexluajit
-PORTVERSION= 2.0.3
+PORTVERSION= 2.1.0
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${TEXLIVE_VERSION}-source
DIST_SUBDIR= TeX
MAINTAINER= tex@FreeBSD.org
COMMENT= LuaJIT library for TeXLive
LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/LuaJIT-2.0.3/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/LuaJIT-src/COPYRIGHT
-BROKEN_aarch64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_mips= Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_mips64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_aarch64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_mips= Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_mips64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
BROKEN_powerpc64= Does not build: uninitialized constant Config (NameError)
-BROKEN_riscv64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
-BROKEN_sparc64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_riscv64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
+BROKEN_sparc64= Does not configure: error: Sorry, cannot preprocess lj_arch.h
-USES= tar:xz libtool pathfix pkgconfig
+USES= libtool pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES= build-aux libs/luajit
-WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit
+USE_TEX= yes
+
GNU_CONFIGURE= yes
+
INSTALL_TARGET= install-strip
+EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES= build-aux libs/luajit
+WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit
+
.include <bsd.port.options.mk>
.if ${ARCH} == powerpc
diff --git a/devel/tex-libtexluajit/distinfo b/devel/tex-libtexluajit/distinfo
index 5e60be0fc6e1..9f03f2a837a5 100644
--- a/devel/tex-libtexluajit/distinfo
+++ b/devel/tex-libtexluajit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643545774
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
diff --git a/devel/tex-libtexluajit/pkg-plist b/devel/tex-libtexluajit/pkg-plist
index 38673d513249..01eb137ea552 100644
--- a/devel/tex-libtexluajit/pkg-plist
+++ b/devel/tex-libtexluajit/pkg-plist
@@ -7,5 +7,5 @@ include/texluajit/lualib.h
lib/libtexluajit.a
lib/libtexluajit.so
lib/libtexluajit.so.2
-lib/libtexluajit.so.2.0.3
+lib/libtexluajit.so.2.1.0
libdata/pkgconfig/texluajit.pc
diff --git a/devel/tex-synctex/Makefile b/devel/tex-synctex/Makefile
index cdc406304644..b722e307d10b 100644
--- a/devel/tex-synctex/Makefile
+++ b/devel/tex-synctex/Makefile
@@ -1,10 +1,9 @@
PORTNAME= synctex
-PORTVERSION= 1.17.0
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${TEXLIVE_VERSION}-source
DIST_SUBDIR= TeX
MAINTAINER= tex@FreeBSD.org
@@ -13,23 +12,32 @@ COMMENT= Synchronization TeXnology parser library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/synctexdir/README.txt
-CONFLICTS= tex-web2c-20150521
-USES= libtool pathfix pkgconfig tar:xz
-USE_TEX= kpathsea
+USES= libtool localbase pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES= build-aux texk/web2c
-WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
+USE_TEX= kpathsea
+
GNU_CONFIGURE= yes
-EXCLUDE_ENGINES=etex aleph luatex luajittex pdftex mf mf-nowin ptex \
- eptex uptex euptex xetex tex otangle mp pmp upmp web2c \
- web-progs
CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \
- --with-x=no \
- --without-mf-x-toolkit \
+ --with-system-kpathsea \
--with-system-zlib \
- --with-system-kpathsea
-CFLAGS+= -I${LOCALBASE}/include
+ --with-x=no \
+ --without-mf-x-toolkit
+
INSTALL_TARGET= install-strip
+CONFLICTS= tex-web2c-${TEXLIVE_VERSION}
+
+EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c
+
+EXTRACT_FILES= build-aux texk/web2c
+EXCLUDE_ENGINES= etex aleph luatex luajittex pdftex mf mf-nowin ptex \
+ eptex uptex euptex xetex tex otangle mp pmp upmp web2c \
+ web-progs luahbtex luajithbtex mflua mfluajit latex \
+ pdftex
+
+post-extract:
+ @${FIND} ${WRKSRC} -name '*.orig' -delete
+
.include <bsd.port.mk>
diff --git a/devel/tex-synctex/distinfo b/devel/tex-synctex/distinfo
index 5e60be0fc6e1..9a206f6bfd5e 100644
--- a/devel/tex-synctex/distinfo
+++ b/devel/tex-synctex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1643546426
+SHA256 (TeX/texlive-20210325-source.tar.xz) = 7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b
+SIZE (TeX/texlive-20210325-source.tar.xz) = 54837368
diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in
index fd92892f1fd3..e4b70dc02869 100644
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
@@ -1,31 +1,31 @@
---- Makefile.in.orig 2015-04-17 04:53:45.000000000 +0900
-+++ Makefile.in 2015-07-25 22:52:31.390521000 +0900
-@@ -99,8 +99,8 @@
- pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+--- Makefile.in.orig 2022-01-30 12:41:33 UTC
++++ Makefile.in
+@@ -117,9 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ md5main$(EXEEXT)
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
-- ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+- ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+- ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+bin_PROGRAMS = $(am__EXEEXT_5) \
-+ $(am__EXEEXT_6) \
- $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
- $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
- $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
-@@ -108,7 +108,7 @@
- $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \
- $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
- $(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27)
+ $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
+ $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
+ $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
+@@ -129,7 +127,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__
+ $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
+ $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
+ $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32)
-noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
*** 138390 LINES SKIPPED ***