diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in
index 76462cf87b25..e97da37b1fe0 100644
--- a/devel/tex-synctex/files/patch-Makefile.in
+++ b/devel/tex-synctex/files/patch-Makefile.in
@@ -1,40 +1,49 @@
---- Makefile.in.orig	2024-05-11 23:58:42 UTC
+--- Makefile.in.orig	2024-05-31 12:03:03 UTC
 +++ Makefile.in
 @@ -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)
 -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_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) \
 @@ -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)
 -noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
 +noinst_PROGRAMS = \
  	$(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) \
 @@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = lib man .
  proglib = lib/lib.a
  
  #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
 @@ -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_79) $(am__append_80) \
-	$(am__append_94) $(am__append_99) $(am__append_104) \
-	$(am__append_109)
+ 	$(am__append_78) $(am__append_79) $(am__append_80) \
+ 	$(am__append_94) $(am__append_99) $(am__append_104) \
+ 	$(am__append_109)
+@@ -3833,7 +3829,7 @@ nodist_twill_SOURCES = twill.c twill.h
+ nodist_vptovf_SOURCES = vptovf.c vptovf.h
+ nodist_weave_SOURCES = weave.c weave.h
+ nodist_twill_SOURCES = twill.c twill.h
+-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort
++dist_bin_SCRIPTS =
+ nodist_ctie_SOURCES = ctie.c
+ nodist_cweave_SOURCES = cweave.c cweb.c
+ nodist_ctwill_SOURCES = ctwill.c cweb.c
diff --git a/devel/tex-synctex/files/patch-man_Makefile.in b/devel/tex-synctex/files/patch-man_Makefile.in
index 1650d55a5f10..902099525a2f 100644
--- a/devel/tex-synctex/files/patch-man_Makefile.in
+++ b/devel/tex-synctex/files/patch-man_Makefile.in
@@ -1,49 +1,49 @@
---- man/Makefile.in.orig	2024-05-12 00:07:34 UTC
+--- man/Makefile.in.orig	2024-05-31 12:03:03 UTC
 +++ man/Makefile.in
 @@ -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     " $@;
 -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 = \
 @@ -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
 -bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man
 +bootstrap_man_sources =
  
  # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 -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_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 \
 @@ -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
 -misc_man_sources = \
 -	amstex.man \
 -	latex.man \
 -	latex-dev.man \
 -	pdfetex.man
 +misc_man_sources =
  
  SUFFIXES = .1 .man .ps .dvi
  man_files = $(man_sources:.man=.1)
diff --git a/devel/tex-web2c/pkg-plist b/devel/tex-web2c/pkg-plist
index d1ea66e3f3be..1be9a606afc8 100644
--- a/devel/tex-web2c/pkg-plist
+++ b/devel/tex-web2c/pkg-plist
@@ -1,79 +1,83 @@
 bin/bibtex
 bin/ctangle
 bin/ctie
 bin/ctwill
+bin/ctwill-proofsort
 bin/ctwill-refsort
 bin/ctwill-twinx
 bin/cweave
 bin/dvicopy
 bin/dvitomp
 bin/dvitype
 bin/gftodvi
 bin/gftopk
 bin/gftype
 bin/inimf
 bin/mf
 bin/mf-nowin
 bin/mfplain
 bin/mft
 bin/mpost
 bin/patgen
 bin/pbibtex
 bin/pdvitomp
 bin/pdvitype
 bin/pktogf
 bin/pktype
 bin/pltotf
 bin/pmpost
 bin/pooltype
 bin/ppltotf
 bin/ptftopl
 bin/r-mpost
 bin/r-pmpost
 bin/r-upmpost
 bin/tangle
 bin/tftopl
 bin/tie
 bin/twill
+bin/twill-refsort
 bin/updvitomp
 bin/upmpost
 bin/vftovp
 bin/vptovf
 bin/weave
 share/man/man1/bibtex.1.gz
 share/man/man1/ctangle.1.gz
 share/man/man1/ctie.1.gz
+share/man/man1/ctwill-proofsort.1.gz
 share/man/man1/ctwill-refsort.1.gz
 share/man/man1/ctwill-twinx.1.gz
 share/man/man1/ctwill.1.gz
 share/man/man1/cweave.1.gz
 share/man/man1/cweb.1.gz
 share/man/man1/dvicopy.1.gz
 share/man/man1/dvilualatex-dev.1.gz
 share/man/man1/dvitomp.1.gz
 share/man/man1/dvitype.1.gz
 share/man/man1/gftodvi.1.gz
 share/man/man1/gftopk.1.gz
 share/man/man1/gftype.1.gz
 share/man/man1/inimf.1.gz
 share/man/man1/lualatex-dev.1.gz
 share/man/man1/mf-nowin.1.gz
 share/man/man1/mf.1.gz
 share/man/man1/mft.1.gz
 share/man/man1/mpost.1.gz
 share/man/man1/patgen.1.gz
 share/man/man1/pdflatex-dev.1.gz
 share/man/man1/pktogf.1.gz
 share/man/man1/pktype.1.gz
 share/man/man1/platex-dev.1.gz
 share/man/man1/pltotf.1.gz
 share/man/man1/pooltype.1.gz
 share/man/man1/tangle.1.gz
 share/man/man1/tftopl.1.gz
 share/man/man1/tie.1.gz
 share/man/man1/twill.1.gz
+share/man/man1/twill-refsort.1.gz
 share/man/man1/uplatex-dev.1.gz
 share/man/man1/vftovp.1.gz
 share/man/man1/vptovf.1.gz
 share/man/man1/weave.1.gz
 share/man/man1/xelatex-dev.1.gz
diff --git a/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile
index ae03b0325bac..184fd3216dfa 100644
--- a/japanese/tex-ptex/Makefile
+++ b/japanese/tex-ptex/Makefile
@@ -1,106 +1,98 @@
 PORTNAME=	ptex
 DISTVERSION=	3.6
 PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/:source \
 		LOCAL/tex:texmf
 PKGNAMEPREFIX=	ja-tex-
 DISTFILES=	texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}:source \
 		texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd${EXTRACT_SUFX}:texmf
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	texlive-${TEXLIVE_VERSION}-source${EXTRACT_SUFX}
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX
 WWW=		https://ctan.org/pkg/ptex
 
 USES=				localbase perl5 pkgconfig tar:xz tex
 USE_TEX=			fmtutil formats kpathsea ptexenc web2c
 
 GNU_CONFIGURE=			yes
 CONFIGURE_ARGS=		${EXCLUDE_ENGINES:S/^/--disable-/} \
 			--enable-eptex \
 			--enable-euptex \
 			--enable-ptex \
 			--enable-uptex \
 			--with-system-zlib \
 			--without-x
 .for L in kpathsea ptexenc
 CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
 			--with-$L-libdir=${LOCALBASE}/lib \
 			--with-system-$L
 .endfor
 
 MAKE_JOBS_UNSAFE=	yes
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${_DISTNAME_SOURCE}/,}
 EXTRACT_FILES=			build-aux libs/xpdf texk/web2c
 WRKSRC=				${WRKDIR}/${_DISTNAME_SOURCE}/texk/web2c
 EXCLUDE_ENGINES=		aleph etex pdftex luatex luajittex mf mf-nowin \
 				otangle mp pmp upmp web2c web-progs xetex tex \
 				synctex mflua mfluajit luahbtex luajithbtex
 
 _DISTNAME_SOURCE=	texlive-${TEXLIVE_VERSION}-source
 TEXHASHDIRS=			${TEXMFDISTDIR} ${TEXMFVARDIR}
 TEX_FORMATS=		ptex uptex
 
 pre-configure:
 	cd ${WRKDIR}/${_DISTNAME_SOURCE}/libs/xpdf && \
 	${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 		${CONFIGURE_ARGS}; \
 
 pre-install:
 	${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd${EXTRACT_SUFX} \
 		-C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner
+	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl
 
 post-install:
 	${FIND} -s ${STAGEDIR}${PREFIX}/share -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .if defined(MAINTAINER_MODE)
 _MAINTAINER_DISTNAME=	${DISTNAME_TEXMF}${EXTRACT_SUFX}
 _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 \
 				source/platex \
 				tex/uplatex source/fonts/japanese-otf tex/uptex \
 				tex/platex tex/generic/hyph-utf8/patterns/ptex \
 				fonts/map/dvipdfmx/updmap/kanjix.map
 
 _maintainer-extract:
 	${MAKE} clean
 	${MKDIR} ${WRKDIR}/${_EXTRACT_TARGETDIR}
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 		-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' \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/mkjvf \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkmlcidvf.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl \
-	${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/umkjvf
+	${FIND} ${WRKSRC} -type f | \
+		${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g'
 
 _maintainer-dist: _maintainer-patch
 	${TAR} --options xz:compression-level=9 -Jcvf \
-		${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \
+		${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX}1 \
 		-C ${WRKDIR} ${_EXTRACT_TARGETDIR}
 	scp ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \
 		bofh@freefall.freebsd.org://home/tex/public_distfiles/
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in
index 59be79cc2291..1cfc9430280f 100644
--- a/japanese/tex-ptex/files/patch-Makefile.in
+++ b/japanese/tex-ptex/files/patch-Makefile.in
@@ -1,67 +1,76 @@
 --- Makefile.in.orig	2024-02-28 04:19:31 UTC
 +++ Makefile.in
 @@ -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)
 -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
 -	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
 -	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
 -	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
 -	$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
 -	$(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
 -	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
 -	$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
 -	$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
 -	$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 -	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
 -	$(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
 +bin_PROGRAMS = $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) euptex$(EXEEXT) \
 +	ptex$(EXEEXT)
  noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
  	$(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
  	$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
 @@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
  proglib = lib/lib.a
  
  #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
 @@ -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
  #
 @@ -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_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_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_92) $(am__append_97) $(am__append_102) \
+@@ -3833,7 +3816,7 @@ nodist_twill_SOURCES = twill.c twill.h
+ nodist_vptovf_SOURCES = vptovf.c vptovf.h
+ nodist_weave_SOURCES = weave.c weave.h
+ nodist_twill_SOURCES = twill.c twill.h
+-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort
++dist_bin_SCRIPTS =
+ nodist_ctie_SOURCES = ctie.c
+ nodist_cweave_SOURCES = cweave.c cweb.c
+ nodist_ctwill_SOURCES = ctwill.c cweb.c
 @@ -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/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in
index cf32d8eeeca3..1afcd215ea82 100644
--- a/print/tex-basic-engines/files/patch-Makefile.in
+++ b/print/tex-basic-engines/files/patch-Makefile.in
@@ -1,40 +1,49 @@
 --- Makefile.in.orig	2024-02-28 04:19:31 UTC
 +++ Makefile.in
 @@ -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)
 -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_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) \
 @@ -3124,7 +3122,7 @@ version = $(WEB2CVERSION)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = lib man web2c .
  proglib = lib/lib.a
  
  #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
 @@ -3146,7 +3144,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
  #
 @@ -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_79) $(am__append_80) \
  	$(am__append_94) $(am__append_99) $(am__append_104) \
  	$(am__append_109)
+@@ -3833,7 +3829,7 @@ nodist_twill_SOURCES = twill.c twill.h
+ nodist_vptovf_SOURCES = vptovf.c vptovf.h
+ nodist_weave_SOURCES = weave.c weave.h
+ nodist_twill_SOURCES = twill.c twill.h
+-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort
++dist_bin_SCRIPTS =
+ nodist_ctie_SOURCES = ctie.c
+ nodist_cweave_SOURCES = cweave.c cweb.c
+ nodist_ctwill_SOURCES = ctwill.c cweb.c
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 287fe6391ded..721205133504 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -1,102 +1,105 @@
 PORTNAME=	luatex
 DISTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${TEXLIVE_VERSION}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgmp.so:math/gmp \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libmpfr.so:math/mpfr \
 		libpng.so:graphics/png \
 		libTECkit.so:textproc/teckit \
 		libzzip.so:devel/zziplib
 
-USES=		gnome libtool localbase pkgconfig tar:xz tex xorg
+USES=		gnome libtool localbase pkgconfig python:env tar:xz tex xorg
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
 USE_TEX=	fmtutil formats kpathsea texlua texluajit web2c
 USE_XORG=	pixman
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 			--enable-luajittex \
 			--enable-luatex \
 			--enable-luahbtex \
 			--enable-luajithbtex \
 			--with-system-zlib \
 			--with-system-zziplib \
 			CC="${CC}" \
 			CXX="${CXX}"
 .for L in cairo freetype2 gmp graphite2 harfbuzz kpathsea libpng mpfr pixman ptexenc teckit
 CONFIGURE_ARGS+=	--with-$L-include=${LOCALBASE}/include \
 			--with-$L-libdir=${LOCALBASE}/lib \
 			--with-system-$L
 .endfor
 
 MAKE_JOBS_UNSAFE=	yes
 
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=			build-aux libs/xpdf libs/lua53 libs/luajit \
 				libs/pplib texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF=	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 				--strip-components 1 --no-same-permission \
 				--no-same-owner \
 				${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
 EXTRACT_FILES_TEXMF=		texmf-dist/doc/lualatex texmf-dist/doc/luatex \
 				texmf-dist/scripts/context/lua \
 				texmf-dist/source/luatex \
 				texmf-dist/source/lualatex \
 				texmf-dist/fonts/map/luatex \
 				texmf-dist/tex/luatex \
 				texmf-dist/tex/generic/config/luatex-unicode-letters.tex \
 				texmf-dist/tex/generic/context/luatex \
 				texmf-dist/tex/latex/latexconfig/lualatexiniconfig.tex \
 				texmf-dist/tex/lualatex
 WRKSRC=				${WRKDIR}/${DISTNAME}/texk/web2c
 EXCLUDE_ENGINES=		aleph etex pdftex mf mf-nowin ptex eptex uptex \
 				euptex otangle mp pmp upmp web2c web-progs \
 				xetex tex synctex mflua mfluajit
 TEX_FORMATS=			luatex
 
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 
 # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	cd ${WRKSRC}/.. && \
 	    ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea
 
 pre-configure:
 	for D in libs/xpdf libs/pplib; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
 		    ${CONFIGURE_ARGS}; \
 	done
 	cd ${WRKDIR}/${DISTNAME}/libs/pplib && \
 		${MAKE}
 
 pre-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \
 	    ${EXTRACT_AFTER_ARGS_TEXMF}
 	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/luatex/opbible/examples/make-all
+	${REINPLACE_CMD} -i '' -e 's|/usr/bin/python3|${PYTHON_CMD}|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/luatex/opbible/txs-gen/maketxs.py
 
 post-install:
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.log" >> ${TMPPLIST}
 	${ECHO_CMD} "share/texmf-var/web2c/luatex/lollipop.fmt" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in
index 8b32438e6f29..2e96447ff4d1 100644
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@@ -1,90 +1,118 @@
 --- Makefile.in.orig	2024-02-28 04:19:31 UTC
 +++ Makefile.in
 @@ -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)
 -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
 -	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
 -	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
 -	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
 -	$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
 -	$(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
 -	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
 -	$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
 -	$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
 -	$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 -	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
 -	$(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
 +bin_PROGRAMS = luahbtex$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT)
  noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
  	$(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
  	$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
 @@ -2975,14 +2964,16 @@ LUA53_DEFINES = @LUA53_DEFINES@
  LUA52_INCLUDES = @LUA52_INCLUDES@
  LUA52_LIBS = @LUA52_LIBS@
  LUA53_DEFINES = @LUA53_DEFINES@
 -LUA53_DEPEND = @LUA53_DEPEND@
 -LUA53_INCLUDES = @LUA53_INCLUDES@
 -LUA53_LIBS = @LUA53_LIBS@
 +LUA53_DEPEND =
 +LUA53_INCLUDES = -I${LOCALBASE}/include/texlua53 \
 +	-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
  LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
 -LUAJIT_LIBS = @LUAJIT_LIBS@
 +LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
  MANIFEST_TOOL = @MANIFEST_TOOL@
 @@ -3022,7 +3013,8 @@ PTEXENC_DEPEND = @PTEXENC_DEPEND@
  PPLIB_INCLUDES = @PPLIB_INCLUDES@
  PPLIB_LIBS = @PPLIB_LIBS@
  PTEXENC_DEPEND = @PTEXENC_DEPEND@
 -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)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
  proglib = lib/lib.a
  
  #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3146,7 +3138,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
+ #
 @@ -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_82)
+ 	$(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_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_92) $(am__append_97) $(am__append_102) \
-@@ -21452,9 +21437,6 @@ $(proglib): $(proglib_sources)
+ 	$(am__append_92) $(am__append_97) $(am__append_102) \
+@@ -3833,7 +3818,7 @@ nodist_twill_SOURCES = twill.c twill.h
+ nodist_vptovf_SOURCES = vptovf.c vptovf.h
+ nodist_weave_SOURCES = weave.c weave.h
+ nodist_twill_SOURCES = twill.c twill.h
+-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort
++dist_bin_SCRIPTS =
+ nodist_ctie_SOURCES = ctie.c
+ nodist_cweave_SOURCES = cweave.c cweb.c
+ nodist_ctwill_SOURCES = ctwill.c cweb.c
+@@ -4622,8 +4607,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}\""
+@@ -21452,9 +21436,6 @@ $(proglib): $(proglib_sources)
  @KPATHSEA_RULE@
  @PTEXENC_RULE@
  @ZLIB_RULE@
 -@LUA52_RULE@
 -@LUA53_RULE@
 -@LUAJIT_RULE@
  @LIBPNG_RULE@
  @FREETYPE2_RULE@
  @PIXMAN_RULE@
diff --git a/print/tex-ptexenc/pkg-plist b/print/tex-ptexenc/pkg-plist
index a3ac9c367d35..f71aa1d50fa1 100644
--- a/print/tex-ptexenc/pkg-plist
+++ b/print/tex-ptexenc/pkg-plist
@@ -1,8 +1,10 @@
+bin/ptekf
 include/ptexenc/ptexenc.h
 include/ptexenc/unicode-jp.h
 include/ptexenc/unicode.h
 lib/libptexenc.a
 lib/libptexenc.so
 lib/libptexenc.so.1
 lib/libptexenc.so.%%VERSION%%
 libdata/pkgconfig/ptexenc.pc
+share/man/man1/ptekf.1.gz
diff --git a/print/tex-xetex/files/patch-Makefile.in b/print/tex-xetex/files/patch-Makefile.in
index 81f59109b014..17b60c21c972 100644
--- a/print/tex-xetex/files/patch-Makefile.in
+++ b/print/tex-xetex/files/patch-Makefile.in
@@ -1,58 +1,67 @@
 --- Makefile.in.orig	2024-02-28 04:19:31 UTC
 +++ Makefile.in
 @@ -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)
 -bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
 -	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
 -	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
 -	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
 -	$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
 -	$(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
 -	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
 -	$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
 -	$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
 -	$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 -	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
 -	$(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
 +bin_PROGRAMS = xetex$(EXEEXT)
  noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
  	$(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
  	$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
 @@ -3019,7 +3008,8 @@ PPLIB_DEPEND = @PPLIB_DEPEND@
  POTRACE_INCLUDES = @POTRACE_INCLUDES@
  POTRACE_LIBS = @POTRACE_LIBS@
  PPLIB_DEPEND = @PPLIB_DEPEND@
 -PPLIB_INCLUDES = @PPLIB_INCLUDES@
 +PPLIB_INCLUDES = -I@top_srcdir@/../../libs/pplib/pplib-src/src/util \
 +	-I@top_srcdir@/../../libs/pplib/pplib-src/src
  PPLIB_LIBS = @PPLIB_LIBS@
  PTEXENC_DEPEND = @PTEXENC_DEPEND@
  PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
 @@ -3124,7 +3114,7 @@ version = $(WEB2CVERSION)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
  proglib = lib/lib.a
  
  #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3833,7 +3823,7 @@ nodist_twill_SOURCES = twill.c twill.h
+ nodist_vptovf_SOURCES = vptovf.c vptovf.h
+ nodist_weave_SOURCES = weave.c weave.h
+ nodist_twill_SOURCES = twill.c twill.h
+-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort
++dist_bin_SCRIPTS =
+ nodist_ctie_SOURCES = ctie.c
+ nodist_cweave_SOURCES = cweave.c cweb.c
+ nodist_ctwill_SOURCES = ctwill.c cweb.c
 @@ -19689,7 +19679,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:
 @@ -20621,7 +20611,6 @@ install-exec-am: install-binPROGRAMS install-dist_binS
  install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \
-	install-libLIBRARIES install-libLTLIBRARIES
+ 	install-libLIBRARIES install-libLTLIBRARIES
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  install-html: install-html-recursive
  
  install-html-am:
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 3f4e36f8e886..6c79fbe7e1dd 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -1,164 +1,167 @@
 PORTNAME=	texlive
 DISTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMESUFFIX=	-base
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	TeX
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, base binaries
 WWW=		https://tug.org/texlive/
 
 LIB_DEPENDS=	libicuio.so:devel/icu \
 		libt1.so:devel/t1lib \
 		libTECkit.so:textproc/teckit \
 		libgd.so:graphics/gd \
 		libgraphite2.so:graphics/graphite2 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libzzip.so:devel/zziplib \
 		libpoppler.so:graphics/poppler \
 		libpotrace.so:graphics/libpotrace
 RUN_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
 		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
 		psbook:print/psutils
 
 USES=		compiler:c++11-lib cpe ghostscript gnome localbase pkgconfig perl5 \
 		python:run shebangfix tar:xz tex xorg
 CPE_VENDOR=	tug
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo
 USE_PERL5=	run
 USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
 USE_XORG=x11
 SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 	texk/texlive/linked_scripts/accfonts/vpl2ovp \
 	texk/texlive/linked_scripts/accfonts/vpl2vpl \
 	texk/texlive/linked_scripts/arara/arara.sh \
 	texk/texlive/linked_scripts/bibcop/bibcop.pl \
 	texk/texlive/linked_scripts/bibexport/bibexport.sh \
 	texk/texlive/linked_scripts/convbkmk/convbkmk.rb \
 	texk/texlive/linked_scripts/ctanupload/ctanupload.pl \
 	texk/texlive/linked_scripts/ebong/*.py \
 	texk/texlive/linked_scripts/dtxgen/dtxgen \
 	texk/texlive/linked_scripts/dviasm/*.py \
 	texk/texlive/linked_scripts/exceltex/exceltex \
 	texk/texlive/linked_scripts/findhyph/findhyph \
 	texk/texlive/linked_scripts/fragmaster/fragmaster.pl \
 	texk/texlive/linked_scripts/git-latexdiff/git-latexdiff \
 	texk/texlive/linked_scripts/installfont/installfont-tl \
 	texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \
 	texk/texlive/linked_scripts/latexpand/latexpand \
 	texk/texlive/linked_scripts/lilyglyphs/*.py \
 	texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
 	texk/texlive/linked_scripts/mathspic/mathspic.pl \
 	texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \
 	texk/texlive/linked_scripts/multibibliography/multibibliography.pl \
 	texk/texlive/linked_scripts/optexcount/optexcount \
 	texk/texlive/linked_scripts/pygmentex/*.py \
 	texk/texlive/linked_scripts/pythontex/*.py \
 	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
 	texk/texlive/linked_scripts/spix/spix.py \
 	texk/texlive/linked_scripts/splitindex/splitindex.pl \
 	texk/texlive/linked_scripts/svn-multi/svn-multi.pl \
 	texk/texlive/linked_scripts/texdirflatten/texdirflatten \
 	texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \
 	texk/texlive/linked_scripts/ulqda/ulqda.pl \
 	texk/texlive/linked_scripts/urlbst/urlbst \
 	texk/texlive/linked_scripts/yplan/yplan \
 	texk/texlive/linked_scripts/webquiz/webquiz.py \
 	texk/texlive/linked_scripts/petri-nets/pn2pdf \
 	texk/texlive/linked_scripts/pdflatexpicscale/pdflatexpicscale.pl \
 	texk/texlive/linked_scripts/pdfxup/pdfxup \
 	texk/texlive/linked_scripts/tlcockpit/tlcockpit.sh \
 	texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat.pl \
 	texk/texlive/linked_scripts/pdftex-quiet/pdftex-quiet \
 	texk/texlive/linked_scripts/clojure-pamphlet/pamphletangler \
 	texk/texlive/linked_scripts/latex-papersize/latex-papersize.py \
 	texk/texlive/linked_scripts/makedtx/makedtx.pl \
 	texk/texlive/linked_scripts/pdfbook2/pdfbook2
 
 # during build phase gnu configure is run a lot
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-native-texlive-build \
 		--disable-web-progs \
 		--disable-psutils \
 		--enable-shared \
 		--disable-t1utils \
 		--disable-dvipdfmx \
 		--disable-dvipdfm-x \
 		--disable-xdvipdfmx \
 		--enable-build-in-source-tree \
 		--datarootdir=${LOCALBASE}/share \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
 		--with-system-gd \
 		--with-system-cairo \
 		--with-system-harfbuzz \
 		--with-system-graphite2 \
 		--with-system-pixman \
 		--with-system-t1lib \
 		--without-system-xpdf \
 		--with-system-zziplib \
 		--with-system-zlib
 .for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit
 CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
 MAKE_ENV=	CONFIG_SITE=${CONFIG_SITE}
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	detex dvi2tty ps2eps
 
 BINARY_ALIAS=	freetype-config=true
 EXTRACT_AFTER_ARGS=	${EXCLUDE_FILES:S,^,--exclude ,}
 
 INFO=	dvipng tlbuild
 PLIST_SUB=	INSTALL_DATA="${INSTALL_DATA}"
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=	TEX=xpdfopen:run
 
 EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
 		${DISTNAME}/texk/kpathsea \
 		${DISTNAME}/texk/ptexenc \
 		${DISTNAME}/texk/xdvik \
 		${DISTNAME}/texk/dvipdfm-x \
 		${DISTNAME}/texk/dvipsk \
 		${DISTNAME}/utils/t1utils \
-		${DISTNAME}/utils/xpdfopen
+		${DISTNAME}/utils/xpdfopen \
+		${DISTNAME}/texk/texlive/linked_scripts/eolang/eolang.pl \
+		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.pl \
+		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.py \
+		${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-extract.py \
+		${DISTNAME}/texk/texlive/linked_scripts/runtexshebang/runtexshebang.lua
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \
 		${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro
 	${REINPLACE_CMD} -e 's|exec texconfig|exec ${PREFIX}/bin/texconfig|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
 	${REINPLACE_CMD} -e 's|exec fmtutil|exec ${PREFIX}/bin/fmtutil|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
 	${REINPLACE_CMD} -e 's|exec updmap|exec ${PREFIX}/bin/updmap|' \
 		${WRKSRC}/texk/texlive/linked_scripts/texlive/updmap-sys.sh
-	${REINPLACE_CMD} -e '/tlmgr/d' \
-		${WRKSRC}/texk/texlive/linked_scripts/Makefile.in
 
 post-install-fmtutil:
 	for D in ${TEXHASHDIRS}; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \
 	done
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c
 	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \
 	    ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF}
 
 post-install: post-install-fmtutil
 .ORDER: post-install-fmtutil do-texhash
 
 .include <bsd.port.mk>
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 d107819d3406..a0c617fc5ba6 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,28 +1,77 @@
 --- texk/texlive/linked_scripts/Makefile.in.orig	2024-02-10 23:22:21 UTC
 +++ texk/texlive/linked_scripts/Makefile.in
 @@ -296,8 +296,6 @@ texmf_shell_scripts = \
  	texlive-extra/dvi2fax.sh \
  	texlive-extra/dvired.sh \
  	texlive-extra/fontinst.sh \
 -	texlive-extra/kpsetool.sh \
 -	texlive-extra/kpsewhere.sh \
  	texlive-extra/ps2frag.sh \
  	texlive-extra/pslatex.sh \
  	texlive-extra/rubibtex.sh \
-@@ -459,7 +457,6 @@ texmf_other_scripts = \
-	texlive/mktexpk \
-	texlive/mktextfm \
-	texlive/rungs.lua \
+@@ -329,7 +327,6 @@ texmf_other_scripts = \
+ 	bib2gls/bib2gls.sh \
+ 	bib2gls/convertgls2bib.sh \
+ 	bibcop/bibcop.pl \
+-	bibtexperllibs/ltx2unitxt \
+ 	bundledoc/arlatex \
+ 	bundledoc/bundledoc \
+ 	cachepic/cachepic.tlu \
+@@ -356,9 +353,7 @@ texmf_other_scripts = \
+ 	dosepsbin/dosepsbin.pl \
+ 	dviasm/dviasm.py \
+ 	dviinfox/dviinfox.pl \
+-	easydtx/edtx2dtx.pl \
+ 	ebong/ebong.py \
+-	eolang/eolang.pl \
+ 	epspdf/epspdf.tlu \
+ 	epspdf/epspdftk.tcl \
+ 	epstopdf/epstopdf.pl \
+@@ -402,10 +397,6 @@ texmf_other_scripts = \
+ 	make4ht/make4ht \
+ 	match_parens/match_parens \
+ 	mathspic/mathspic.pl \
+-	memoize/memoize-clean.pl \
+-	memoize/memoize-clean.py \
+-	memoize/memoize-extract.pl \
+-	memoize/memoize-extract.py \
+ 	mf2pt1/mf2pt1.pl \
+ 	mkgrkindex/mkgrkindex \
+ 	mkjobtexmf/mkjobtexmf.pl \
+@@ -436,19 +427,16 @@ texmf_other_scripts = \
+ 	pythontex/depythontex.py \
+ 	pythontex/pythontex.py \
+ 	rubik/rubikrotation.pl \
+-	runtexshebang/runtexshebang.lua \
+ 	spix/spix.py \
+ 	splitindex/splitindex.pl \
+ 	srcredact/srcredact.pl \
+ 	sty2dtx/sty2dtx.pl \
+ 	svn-multi/svn-multi.pl \
+ 	tex4ebook/tex4ebook \
+-	texblend/texblend \
+ 	texcount/texcount.pl \
+ 	texdef/texdef.pl \
+ 	texdiff/texdiff \
+ 	texdirflatten/texdirflatten \
+-	texfindpkg/texfindpkg.lua \
+ 	texdoc/texdoc.tlu \
+ 	texfot/texfot.pl \
+ 	texlive/fmtutil-sys.sh \
+@@ -459,7 +447,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 = \
+ 	texlive/updmap-sys.sh \
+ 	texlive/updmap-user.sh \
+ 	texlive/updmap.pl \
+@@ -489,8 +476,6 @@ bin_links = \
  	cluttex:cllualatex \
  	epstopdf:repstopdf \
  	fmtutil:mktexfmt \
 -	kpsetool:kpsexpand \
 -	kpsetool:kpsepath \
  	mktexlsr:texhash \
  	pdfcrop:rpdfcrop \
  	texdef:latexdef
diff --git a/print/texlive-docs/Makefile b/print/texlive-docs/Makefile
index f02cab4662f4..eb924ecf0a2b 100644
--- a/print/texlive-docs/Makefile
+++ b/print/texlive-docs/Makefile
@@ -1,117 +1,51 @@
 PORTNAME=	texlive
 DISTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}/
 PKGNAMESUFFIX=	-docs
 DISTNAME=	${PORTNAME}-${PORTVERSION}-texmf
 DIST_SUBDIR=	TeX
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, documentation
 WWW=		https://tug.org/texlive/
 
-USES=		perl5 tar:xz tex
+USES=		perl5 python:env tar:xz tex
 
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - \
 			${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,}
 NO_BUILD=	yes
 
 EXCLUDE_FILES=	\*/doc/man texmf-dist/doc/aleph texmf-dist/doc/lualatex \
 		texmf-dist/doc/luatex texmf-dist/doc/xelatex \
 		texmf-dist/doc/xetex texmf-dist/doc/otherformats/jadetex \
 		texmf-dist/doc/otherformats/xmltex texmf-dist/doc/ptex \
 		texmf-dist/doc/platex texmf-dist/doc/uptex \
 		texmf-dist/doc/uplatex texmf-dist/doc/fonts/japanese-otf \
 		texmf-dist/doc/fonts/japanese-otf-uptex \
 		texmf-dist/doc/fonts/jfontmaps texmf-dist/doc/dvips \
 		texmf-dist/doc/dvipdfmx
 
 NO_ARCH=	yes
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 
 do-install:
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 	    ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \
 	    --strip-components 1 --no-same-permission --no-same-owner \
 	    ${DISTNAME}/texmf-dist/doc
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/fontforge|${PREFIX}/bin/fontforge|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/genfonts.pe \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/berenisadf/ff-ybd.pe \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/report/kernclasses.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -w|${PERL}|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/ggen.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/abs2rel.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html1.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html2.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html3.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/txt2qq.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/makeunidef.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/ctan-o-mat/lib/md2ltx.pl
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -T|${PERL}|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/discovermacro.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/latexout.pl
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/dad-to-utf8.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/utf8-to-dad.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/KerningNumerals.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/phaistos/getglyphs \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/pst-mirror/createEPS/scripts/filtre.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gridslides/compile.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/latex-web-companion/ch7/sgmlspl.pl \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/unsupported/u2ps \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/gustprog/porzadki.pl
-	${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/hex_range.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/xcharter/altone.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/aramaic-serto/serto.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/scanpages/replicate.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/songproj/song2tex.py
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHO_CMD}|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/unicode_joining.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/arabic_test.py \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/generate_arabic_shaping.py
-	${REINPLACE_CMD} -i '' -e 's|/usr/bin/texlua|${PREFIX}/bin/texlua|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua
-	${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkfc \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkf \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/drm/allfonts.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/e-french/bin/linux/makefrindex \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/bardiag/example/compile.all \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/beamerappendixnote/build.sh  \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-abnt/test.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-software/mkbiblatexstubs.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/chinesechess/build.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/circledtext/build.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/codebox/build.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ctable/inst \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gamebooklib/gamebooklib_countpagesperseed.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hepnames/mkmacrotables \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runAll.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runEXA.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pascaltriangle/build.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfreview.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfshrink.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/seminar/run.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shdoc/shreformat.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/termsim/build.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/tlc-article/bin/deploy \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/uspace/uspace-ctanify.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/plain/transparent-io/TrIO.org \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/chklref/release.sh \
-		${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap
+	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type f | \
+		${XARGS} ${REINPLACE_CMD} -i '' -E -e \
+		's|/usr/bin/fontforge|${PREFIX}/bin/fontforge|g; \
+		s|/bin/bash|${PREFIX}/bin/bash|g; \
+		s|/usr/bin/perl|${PERL}|g; \
+		s|/usr/bin/texlua|${PREFIX}/bin/texlua|g; \
+		s|/usr/bin/[env |python3?]+[python3?]?|${PYTHON_CMD}|'
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index 01e9be77278e..7a2a3c44c9b1 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -1,136 +1,132 @@
 PORTNAME=	texlive
 DISTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/tex
 PKGNAMESUFFIX=	-texmf
 DISTNAME=	${PORTNAME}-${DISTVERSION}${PKGNAMESUFFIX}-freebsd
 DIST_SUBDIR=	TeX
 EXTRACT_ONLY=
 
 MAINTAINER=	tex@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, texmf Tree
 WWW=		https://tug.org/texlive/
 
 # Reduce DEPENDS temporarily
 USES=		cpe tar:xz tex
 CPE_VENDOR=	tug
 USE_TEX=	texhash tlmgr:run
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 NO_WRKSUBDIR=	yes
 
 PKG_CREATE_VERBOSE=	yes
 TEXHASHDIRS=		${TEXMFDIR} ${TEXMFDISTDIR}
 
 do-install:
 	${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		-C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner
+	@${REINPLACE_CMD} -i '' -E -e '1s|/bin/python3|${python_CMD}|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/tex/latex/prettytok/prettytok-decode-8bit.py
+	${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \
+		${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/eolang/eolang.pl
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 
 .if defined(MAINTAINER_MODE)
 EXCLUDE_FILES=		\*/doc/man ls-R doc dvipdfm dvipdfmx dvips \
 			fonts/cmap/dvipdfmx fonts/cmap/uptex fonts/enc/dvips \
 			fonts/map/dvipdfm fonts/map/dvipdfmx fonts/map/dvips \
 			fonts/map/luatex fonts/misc/xetex fonts/source/ptex \
 			fonts/tfm/ptex fonts/ofm/public/japanese-otf tex/jadetex \
 			tex/lambda fonts/ovp/public/japanese-otf-uptex source \
 			fonts/tfm/public/japanese-otf fonts/vf/ptex xdvi \
 			fonts/tfm/public/japanese-otf-uptex tex/generic/dvips \
 			tex/latex/base fonts/tfm/uptex fonts/type1/ptex \
 			fonts/vf/public/japanese-otf tex/lualatex tex/luatex \
 			fonts/vf/public/japanese-otf-uptex fonts/vf/uptex \
 			tex/generic/config/luatex-unicode-letters.tex \
 			tex/generic/config/luatexiniconfig.tex scripts/xetex \
 			tex/generic/context/luatex tex/generic/xetexconfig \
 			tex/generic/hyph-utf8/patterns/ptex tex/platex tex/ptex \
 			tex/latex/latexconfig/dvilualatex.ini tex/uplatex \
 			tex/uptex tex/latex/latexconfig/lualatex-patch-kernel.tex \
 			tex/latex/latexconfig/lualatex-reset-codes.tex tex/xelatex \
 			tex/xetex tex/latex/latexconfig/lualatex.ini \
 			tex/latex/latexconfig/lualatexiniconfig.tex \
 			tex/latex/latexconfig/lualatexquotejobname.tex \
 			tex/latex/latexconfig/xelatex.ini scripts/context/lua \
 			tex/plain/config/aleph.ini web2c/updmap-hdr.cfg \
 			tex/plain/config/dviluatex.ini web2c/updmap.cfg \
 			tex/plain/config/luatex.ini tex/plain/config/xetex.ini \
 			tex/xmltex web2c/fmtutil-hdr.cnf tex/cslatex \
 			web2c/texmf.cnf scripts/context/stubs/unix/context \
 			scripts/context/stubs/unix/contextjit \
 			scripts/context/stubs/unix/luatools \
 			scripts/context/stubs/unix/mtxrun \
 			scripts/context/stubs/unix/mtxrunjit \
 			scripts/context/stubs/unix/texexec \
 			scripts/context/stubs/unix/texmfstart \
 			scripts/jfontmaps/kanji-config-updmap-sys.sh \
 			scripts/jfontmaps/kanji-config-updmap.pl \
 			scripts/jfontmaps/kanji-fontmap-creator.pl \
 			scripts/lua2dox/lua2dox_filter scripts/pdfjam/pdfflip \
 			scripts/pdfjam/pdf180 scripts/pdfjam/pdf270 \
 			scripts/pdfjam/pdf90 scripts/pdfjam/pdfbook \
 			scripts/pdfjam/pdfjam-pocketmod scripts/pdfjam/pdfjoin \
 			scripts/pdfjam/pdfjam-slides3up scripts/pdfjam/pdfnup \
 			scripts/pdfjam/pdfjam-slides6up scripts/pdfjam/pdfpun \
 			scripts/pmx/pmx2pdf.lua scripts/texlive/allcm.sh \
 			scripts/texlive/allneeded.sh scripts/texlive/dvi2fax.sh \
 			scripts/texlive/dvired.sh scripts/texlive/e2pall.pl \
 			scripts/texlive/fontinst.sh scripts/texlive/kpsetool.sh \
 			scripts/texlive/kpsewhere.sh scripts/texlive/ps2frag.sh \
 			scripts/texlive/pslatex.sh scripts/texlive/rubibtex.sh \
 			scripts/texlive/rumakeindex.sh scripts/texlive/rungs.tlu \
 			scripts/texlive/texconfig-dialog.sh \
 			scripts/texlive/texconfig-sys.sh scripts/texlive/tlmgr.pl \
 			scripts/texlive/texconfig.sh scripts/texlive/texlinks.sh \
 			scripts/texliveonfly/texliveonfly.py \
 			scripts/crossrefware/bbl2bib.pl \
 			scripts/crossrefware/bibmradd.pl \
 			scripts/crossrefware/biburl2doi.pl \
 			${TEXLIVE_BASE_PLIST}
 TEXLIVE_BASE_PLIST!=	grep TEXMFDISTDIR ${.CURDIR}/../texlive-base/pkg-plist | sed 's|%%TEXMFDISTDIR%%/||g'
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - \
 			${EXCLUDE_FILES:S,^,--exclude ${DISTNAME_TEXMF}/texmf-dist/,}
 
 _maintainer-extract:
 	${MAKE} clean
 	${MKDIR} ${WRKSRC}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME_TEXMF}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}$ \
 		--strip-components 1 --no-same-permission --no-same-owner
 
 _maintainer-patch: _maintainer-extract
 	${MKDIR} ${WRKSRC}/texmf-dist/tex/latex/base
 	${REINPLACE_CMD} -i '' \
 		's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' \
 		${WRKSRC}/texmf-dist/tex/generic/babel-hungarian/magyar.ldf
-	${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \
-		${WRKSRC}/texmf-dist/scripts/logicpuzzle/createlpsudoku \
-		${WRKSRC}/texmf-dist/scripts/logicpuzzle/lpsmag
-	${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \
-		${WRKSRC}/texmf-dist/scripts/mycv/mycv_split_contents.pl
-	@${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|; \
-		1s|/usr/bin/python|${python_CMD}|;' \
-		${WRKSRC}/texmf-dist/asymptote/GUI/*.py \
-		${WRKSRC}/texmf-dist/scripts/webquiz/webquiz \
-		${WRKSRC}/texmf-dist/scripts/*/*.py \
-		${WRKSRC}/texmf-dist/tex/latex/wargame/*.py
-	@${REINPLACE_CMD} -i '' -E -e '/ec\.tex/d' \
-		${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex \
-		${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex
-	@${REINPLACE_CMD} -i '' -e '1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|' \
-		${WRKSRC}/texmf-dist/tex/generic/pgfplots/lua/*.lua
+	${FIND} ${WRKSRC} -type f | \
+		${XARGS} ${REINPLACE_CMD} -i '' -E -e '1s|/bin/bash|${bash_CMD}|; \
+		1s|/usr/bin/perl|${perl_CMD}|; \
+		1s|/usr/bin/env python[23]?|${python_CMD}|; \
+		1s|/usr/bin/python|${python_CMD}|; \
+		1s|/bin/python3|${python_CMD}|; \
+		/ec\.tex/d; \
+		1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|'
 
 _maintainer-dist: _maintainer-patch
 	${TAR} --options xz:compression-level=9 -Jcvf \
 		${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \
 		-C ${WRKDIR} ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 	scp ${WRKDIR}/texlive-${TEXLIVE_VERSION}-texmf-freebsd.tar.xz \
 		bofh@freefall.freebsd.org://home/tex/public_distfiles/
 
 .endif
 
 .include <bsd.port.mk>