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

8 files changed, 362 insertions, 170 deletions

diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in
index 9e847e19cc3c..ad2ef6f7ab49 100644
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@@ -1,60 +1,71 @@
---- Makefile.in.orig	2015-04-16 19:53:45 UTC
+--- Makefile.in.orig	2021-02-17 11:40:54 UTC
 +++ Makefile.in
-@@ -99,6 +99,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
- 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
- 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
- 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+@@ -117,6 +117,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE
+ 	luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
+ 	$(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ 	md5main$(EXEEXT)
 +inst_bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
  bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
- 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-@@ -1939,14 +1940,16 @@ LTLIBOBJS = @LTLIBOBJS@
- LTLIBSYNCTEX = @LTLIBSYNCTEX@
- LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
- LUA52_DEFINES = @LUA52_DEFINES@
--LUA52_DEPEND = @LUA52_DEPEND@
--LUA52_INCLUDES = @LUA52_INCLUDES@
--LUA52_LIBS = @LUA52_LIBS@
-+LUA52_DEPEND =
-+LUA52_INCLUDES = -I${LOCALBASE}/include/texlua52 \
-+    -I@top_srcdir@/../../libs/lua52/lua-5.2.4/src
-+LUA52_LIBS = -L${LOCALBASE}/lib -ltexlua52
+ 	ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
+ 	ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
+@@ -2966,14 +2967,16 @@ LUA52_DEPEND = @LUA52_DEPEND@
+ 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-2.0.3/src
++	-I@top_srcdir@/../../libs/luajit/LuaJIT-src/src
  LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
 -LUAJIT_LIBS = @LUAJIT_LIBS@
 +LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
  MANIFEST_TOOL = @MANIFEST_TOOL@
-@@ -2081,7 +2084,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+@@ -3004,7 +3007,8 @@ PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+ PIXMAN_LIBS = @PIXMAN_LIBS@
+ PKG_CONFIG = @PKG_CONFIG@
+ 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@
+@@ -3108,7 +3112,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
  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 = libmf.a libmputil.a libmplib.a libkanji.a \
- 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -2431,9 +2434,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
- TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
- 	$(am__append_42) $(am__append_48) $(am__append_54) \
- 	$(am__append_60) $(am__append_66)
--bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
--	$(am__append_31) $(am__append_36) $(am__append_75) \
--	$(am__append_80)
-+bin_links = $(am__append_75) $(am__append_80)
- install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
- 	$(am__append_73) $(am__append_78)
- uninstall_exe_links = $(am__append_21) $(am__append_30) \
-@@ -4739,9 +4740,9 @@ synctexdir/libsynctex_la-synctex_parser_
  
- libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
- 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a
+@@ -3603,10 +3607,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe
+ 	$(am__append_35) $(am__append_43) $(am__append_59) \
+ 	$(am__append_64) $(am__append_69) $(am__append_74) \
+ 	$(am__append_79)
+-bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
+-	$(am__append_24) $(am__append_33) $(am__append_41) \
+-	$(am__append_49) $(am__append_54) $(am__append_88) \
+-	$(am__append_93) $(am__append_98) $(am__append_103)
++bin_links = $(am__append_75) $(am__append_80)
+ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+ 	$(am__append_39) $(am__append_47) $(am__append_52) \
+ 	$(am__append_86) $(am__append_91) $(am__append_96) \
+@@ -5555,9 +5556,9 @@ silent-sh: $(top_builddir)/config.status $(srcdir)/sil
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
 -install-binPROGRAMS: $(bin_PROGRAMS)
 +install-binPROGRAMS: $(inst_bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
@@ -63,7 +74,7 @@
  	if test -n "$$list"; then \
  	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
  	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4771,7 +4772,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -5587,7 +5588,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
@@ -72,7 +83,7 @@
  	files=`for p in $$list; do echo "$$p"; done | \
  	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
  	      -e 's/$$/$(EXEEXT)/' \
-@@ -14447,7 +14448,7 @@ install-data: install-data-recursive
+@@ -19270,7 +19271,7 @@ install-data: install-data-recursive
  uninstall: uninstall-recursive
  
  install-am: all-am
@@ -81,11 +92,12 @@
  
  installcheck: installcheck-recursive
  install-strip:
-@@ -14668,8 +14669,6 @@ $(proglib): ${srcdir}/lib/*.c
+@@ -21003,9 +21004,6 @@ $(proglib): ${srcdir}/lib/*.c
  @KPATHSEA_RULE@
  @PTEXENC_RULE@
  @ZLIB_RULE@
 -@LUA52_RULE@
+-@LUA53_RULE@
 -@LUAJIT_RULE@
  @LIBPNG_RULE@
  @FREETYPE2_RULE@
diff --git a/print/tex-luatex/files/patch-configure b/print/tex-luatex/files/patch-configure
index 5c072f88f161..e9c37aa92393 100644
--- a/print/tex-luatex/files/patch-configure
+++ b/print/tex-luatex/files/patch-configure
@@ -1,10 +1,12 @@
---- configure.orig	2015-04-12 11:22:39 UTC
+--- configure.orig	2021-02-17 03:03:54 UTC
 +++ configure
-@@ -23756,121 +23756,6 @@ ${top_builddir}/../../libs/libpng/includ
+@@ -25158,243 +25158,6 @@ ${top_builddir}/../../libs/libpng/include/png.h:
  	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
  fi
  
--## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 -
 -# Check whether --with-system-freetype2 was given.
 -if test "${with_system_freetype2+set}" = set; then :
@@ -102,9 +104,103 @@
 -else
 -  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
 -  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
 -  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+-  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
 -  as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 -fi
@@ -119,14 +215,43 @@
 -	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
- ## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
- 
- # Check whether --with-system-pixman was given.
-@@ -24069,218 +23954,6 @@ ${top_builddir}/../../libs/zziplib/inclu
+-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
+-
+-# Check whether --with-system-pixman was given.
+-if test "${with_system_pixman+set}" = set; then :
+-  withval=$with_system_pixman;
+-fi
+-if test "x$with_system_pixman" = xyes; then
+-  if $PKG_CONFIG pixman-1 --atleast-version=0.18; then
+-  PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
+-  PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
+-elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then
+-  as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5
+-fi
+-else
+-  PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
+-  PIXMAN_LIBS="$kpse_BLD/libs/pixman/libpixman.a"
+-  PIXMAN_DEPEND='${top_builddir}/../../libs/pixman/libpixman.a'
+-  PIXMAN_RULE='# Rebuild libpixman
+-$(PIXMAN_DEPEND): ${top_builddir}/../../libs/pixman/include/pixman.h
+-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/pixman/include/pixman.h:
+-	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+ ##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
+ echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
+ ##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
+@@ -25540,339 +25303,6 @@ $(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/
+ ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
  	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
  fi
- 
--## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 -
 -# Check whether --with-system-teckit was given.
 -if test "${with_system_teckit+set}" = set; then :
@@ -150,14 +275,78 @@
 -	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
--## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+-
+-# LuaTeX and XeTeX need harfbuzz.
+-if test "x$enable_xetex" = xyes \
+-   || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
+-
+-# Check whether --with-system-graphite2 was given.
+-if test "${with_system_graphite2+set}" = set; then :
+-  withval=$with_system_graphite2;
+-fi
+-if test "x$with_system_graphite2" = xyes; then
+-  if $PKG_CONFIG graphite2; then
+-  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+-  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+-elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+-  as_fn_error $? "did not find graphite2" "$LINENO" 5
+-fi
+-else
+-  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
+-  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
+-  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
+-  GRAPHITE2_RULE='# Rebuild libgraphite2
+-$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
+-	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
+-
+-# Check whether --with-system-harfbuzz was given.
+-if test "${with_system_harfbuzz+set}" = set; then :
+-  withval=$with_system_harfbuzz;
+-fi
+-if test "x$with_system_harfbuzz" = xyes; then
+-  if $PKG_CONFIG harfbuzz; then
+-  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
+-  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
+-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
+-  as_fn_error $? "did not find harfbuzz" "$LINENO" 5
+-fi
+-else
+-  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
+-  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
+-  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
+-  HARFBUZZ_RULE='# Rebuild libharfbuzz
+-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
+-${top_builddir}/../../libs/harfbuzz/include/hb.h:
+-	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+-fi
+-
+-fi # end xetex/luatex for harfbuzz
+-
+-# XeTeX, but not LuaTeX, needs icu and graphite.
+-if test "x$enable_xetex" = xyes; then
+-  echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 -
 -# Check whether --with-system-icu was given.
 -if test "${with_system_icu+set}" = set; then :
 -  withval=$with_system_icu;
 -fi
 -if test "x$with_system_icu" = xyes; then
--  if test -n "$ac_tool_prefix"; then
+-  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
+-if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}icu-config; ac_word=$2
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -248,11 +437,105 @@
 -else
 -  ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
 -fi
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$PKG_CONFIG"; then
+-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_PKG_CONFIG"; then
+-  ac_ct_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_PKG_CONFIG"; then
+-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+-if test -n "$ac_ct_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_PKG_CONFIG" = x; then
+-    PKG_CONFIG="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_ct_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+-fi
 -if $ICU_CONFIG --version >/dev/null 2>&1; then
 -  ICU_INCLUDES=`$ICU_CONFIG --cppflags`
 -  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+-elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+-  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+-  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
 -elif test "x$need_icu:$with_system_icu" = xyes:yes; then
--  as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+-  as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
 -fi
 -else
 -  ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
@@ -264,56 +547,16 @@
 -${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 -	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
+-# checking for openbsd to add -lpthread for icu.
+-case $build_os in
+-openbsd*)
+-  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+-  ;;
+-esac
 -
--## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
--
--# Check whether --with-system-graphite2 was given.
--if test "${with_system_graphite2+set}" = set; then :
--  withval=$with_system_graphite2;
--fi
--if test "x$with_system_graphite2" = xyes; then
--  if $PKG_CONFIG graphite2; then
--  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
--  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
--elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
--  as_fn_error $? "did not find graphite2" "$LINENO" 5
--fi
--else
--  GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC"
--  GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a"
--  GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a'
--  GRAPHITE2_RULE='# Rebuild libgraphite2
--$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h
--	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
--${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
--	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
--fi
--
--## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
--
--# Check whether --with-system-harfbuzz was given.
--if test "${with_system_harfbuzz+set}" = set; then :
--  withval=$with_system_harfbuzz;
--fi
--if test "x$with_system_harfbuzz" = xyes; then
--  if $PKG_CONFIG harfbuzz-icu; then
--  HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
--  HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
--elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
--  as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
--fi
--else
--  HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
--  HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a"
--  HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a'
--  HARFBUZZ_RULE='# Rebuild libharfbuzz
--$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h
--	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild
--${top_builddir}/../../libs/harfbuzz/include/hb.h:
--	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
--fi
--
--## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+-  ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 -
 -# Check whether --with-system-graphite2 was given.
 -if test "${with_system_graphite2+set}" = set; then :
@@ -337,7 +580,7 @@
 -	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 -fi
 -
--
+-fi # end xetex for icu/graphite
+ 
  # Check size of off_t (using <kpathsea/config.h>)
  eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
- eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
diff --git a/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h b/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
index f3feeb7a31c9..3c54f6cc538c 100644
--- a/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
+++ b/print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
@@ -1,11 +1,11 @@
---- luatexdir/font/luatexfont.h.orig	2015-03-20 07:59:58 UTC
+--- luatexdir/font/luatexfont.h.orig	2020-10-04 19:39:39 UTC
 +++ luatexdir/font/luatexfont.h
-@@ -149,8 +149,6 @@ void replace_packet_fonts(internal_font_number f, int 
-                           int *new_fontid, int count);
+@@ -129,8 +129,6 @@ void glyph_unicode_free(void);
+ void replace_packet_fonts(internal_font_number f, int *old_fontid, int *new_fontid, int count);
  int *packet_local_fonts(internal_font_number f, int *num);
  
--int packet_cur_s;               /* current |do_vf_packet()| recursion level */
--int packet_stack_ptr;           /* pointer into |packet_stack| */
+-extern int packet_cur_s;               /* current |do_vf_packet()| recursion level */
+-extern int packet_stack_ptr;           /* pointer into |packet_stack| */
  vf_struct *new_vfstruct(void);
  
  /* writecff.c */
diff --git a/print/tex-luatex/files/patch-luatexdir_image_writeimg.h b/print/tex-luatex/files/patch-luatexdir_image_writeimg.h
deleted file mode 100644
index 264feada74cf..000000000000
--- a/print/tex-luatex/files/patch-luatexdir_image_writeimg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- luatexdir/image/writeimg.h.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/image/writeimg.h
-@@ -27,7 +27,7 @@
- #  include "pdf/pdfpage.h"
- 
- typedef image_dict *idict_entry;
--idict_entry *idict_array;
-+extern idict_entry *idict_array;
- 
- void new_img_pdfstream_struct(image_dict *);
- image *new_image(void);
diff --git a/print/tex-luatex/files/patch-luatexdir_image_writeimg.w b/print/tex-luatex/files/patch-luatexdir_image_writeimg.w
deleted file mode 100644
index cdbf579e417a..000000000000
--- a/print/tex-luatex/files/patch-luatexdir_image_writeimg.w
+++ /dev/null
@@ -1,11 +0,0 @@
---- luatexdir/image/writeimg.w.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/image/writeimg.w
-@@ -125,6 +125,8 @@
- #define HEADER_PDF "%PDF-1."
- #define MAX_HEADER (sizeof(HEADER_PNG)-1)
- 
-+idict_entry *idict_array;
-+
- static void check_type_by_header(image_dict * idict)
- {
-     int i;
diff --git a/print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h b/print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
deleted file mode 100644
index 1b22db82488a..000000000000
--- a/print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- luatexdir/pdf/pdftables.h.orig	2015-03-20 07:59:58 UTC
-+++ luatexdir/pdf/pdftables.h
-@@ -21,7 +21,7 @@
- #ifndef PDFTABLES_H
- #  define PDFTABLES_H
- 
--const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
-+extern const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
- 
- typedef enum {
-     union_type_int,
diff --git a/print/tex-luatex/files/patch-luatexdir_tex_textoken.w b/print/tex-luatex/files/patch-luatexdir_tex_textoken.w
deleted file mode 100644
index 6beaab5efe4d..000000000000
--- a/print/tex-luatex/files/patch-luatexdir_tex_textoken.w
+++ /dev/null
@@ -1,11 +0,0 @@
---- luatexdir/tex/textoken.w.orig	2015-03-28 00:34:27 UTC
-+++ luatexdir/tex/textoken.w
-@@ -75,7 +75,7 @@ maximum memory usage. When code between the delimiters
- report these statistics when |tracing_stats| is sufficiently large.
- 
- @c
--int var_used, dyn_used;         /* how much memory is in use */
-+int dyn_used;                   /* how much memory is in use */
- 
- halfword avail;                 /* head of the list of available one-word nodes */
- unsigned fix_mem_end;           /* the last one-word node used in |mem| */
diff --git a/print/tex-luatex/files/patch-pdftoepdf.w b/print/tex-luatex/files/patch-pdftoepdf.w
deleted file mode 100644
index 30884f9b4529..000000000000
--- a/print/tex-luatex/files/patch-pdftoepdf.w
+++ /dev/null
@@ -1,19 +0,0 @@
---- luatexdir/image/pdftoepdf.w.orig	2018-01-31 15:17:41 UTC
-+++ luatexdir/image/pdftoepdf.w
-@@ -70,8 +70,14 @@ static char *get_file_checksum(char *a, 
-         if (ck == NULL)
-             luatex_fail("PDF inclusion: out of memory while processing '%s'",
-                         a);
--        snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,
--                 (uint64_t) mtime);
-+       // snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,
-+       //          (uint64_t) mtime);
-+	        snprintf(ck, PDF_CHECKSUM_SIZE, "%"
-+		PRIu64
-+		"_%"
-+		PRIu64,
-+		(uint64_t) size,
-+		(uint64_t) mtime);
-    } else {
-         switch (fe) {
-         case FE_FAIL: