diff options
Diffstat (limited to 'print/texlive-base/files')
32 files changed, 240 insertions, 289 deletions
diff --git a/print/texlive-base/files/patch-Makefile.in b/print/texlive-base/files/patch-Makefile.in index f99a005ca201..afa01b77291d 100644 --- a/print/texlive-base/files/patch-Makefile.in +++ b/print/texlive-base/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-07-23 10:46:25.620611000 +0900 -+++ Makefile.in 2015-07-23 10:46:40.645948000 +0900 -@@ -487,7 +487,7 @@ +--- Makefile.in.orig 2021-02-08 15:49:16 UTC ++++ Makefile.in +@@ -489,7 +489,7 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' # Files not to be distributed diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure index 1b7fc3453ca9..81e2ba30ba31 100644 --- a/print/texlive-base/files/patch-configure +++ b/print/texlive-base/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-04-12 11:22:39 UTC +--- configure.orig 2021-03-24 21:28:22 UTC +++ configure -@@ -5685,7 +5685,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and +@@ -5918,7 +5918,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 fi fi @@ -17,18 +17,18 @@ test "x$need_teckit" = xyes && { need_zlib=yes } -@@ -21198,8 +21207,8 @@ else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +@@ -21447,8 +21456,8 @@ 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` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` - 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 -@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = + elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` +@@ -21513,11 +21522,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = as_fn_error $? "did not find graphite2" "$LINENO" 5 fi @@ -45,4 +45,4 @@ + TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS" fi - if test -n "$ac_tool_prefix"; then + echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5 diff --git a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in index d2e3be4391e0..2cf63ada83a0 100644 --- a/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in +++ b/print/texlive-base/files/patch-texk-bibtex-x-Makefile.in @@ -1,29 +1,30 @@ ---- texk/bibtex-x/Makefile.in.orig 2015-03-12 14:42:02 UTC +--- texk/bibtex-x/Makefile.in.orig 2021-02-08 15:49:16 UTC +++ texk/bibtex-x/Makefile.in -@@ -121,8 +121,7 @@ CONFIG_CLEAN_FILES = +@@ -122,8 +122,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @BIBTEX8_TRUE@am__EXEEXT_1 = bibtex8$(EXEEXT) @BIBTEXU_TRUE@am__EXEEXT_2 = bibtexu$(EXEEXT) --am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" \ -- "$(DESTDIR)$(csfdir)" +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ +- "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)" +am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = bibtex8-bibtex-1.$(OBJEXT) bibtex8-bibtex-2.$(OBJEXT) \ bibtex8-bibtex-3.$(OBJEXT) bibtex8-bibtex-4.$(OBJEXT) \ -@@ -1438,7 +1437,7 @@ check-am: all-am +@@ -1514,7 +1513,7 @@ check-am: all-am check: check-am - all-am: Makefile $(PROGRAMS) $(DATA) config.h + all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h installdirs: -- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"; do \ +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(btdocdir)" "$(DESTDIR)$(csfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1498,7 +1497,7 @@ info: info-am +@@ -1586,8 +1585,7 @@ info: info-am info-am: --install-data-am: install-dist_btdocDATA install-dist_csfDATA +-install-data-am: install-dist_btdocDATA install-dist_csfDATA \ +- install-man +install-data-am: install-dist_csfDATA install-dvi: install-dvi-am diff --git a/print/texlive-base/files/patch-texk-chktex-Makefile.in b/print/texlive-base/files/patch-texk-chktex-Makefile.in index b46867fd1e44..71b07c6bec8a 100644 --- a/print/texlive-base/files/patch-texk-chktex-Makefile.in +++ b/print/texlive-base/files/patch-texk-chktex-Makefile.in @@ -1,6 +1,6 @@ ---- texk/chktex/Makefile.in.orig 2015-04-13 09:45:32 UTC +--- texk/chktex/Makefile.in.orig 2020-11-19 18:31:09 UTC +++ texk/chktex/Makefile.in -@@ -119,10 +119,8 @@ mkinstalldirs = $(install_sh) -d +@@ -125,10 +125,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl CONFIG_CLEAN_VPATH_FILES = @@ -8,12 +8,12 @@ - "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \ - "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(pdfdocdir)" -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \ ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir) \ + "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__chktex_SOURCES_DIST = @CHKTEX_TREE@/ChkTeX.c \ @CHKTEX_TREE@/ChkTeX.h @CHKTEX_TREE@/FindErrs.c \ -@@ -1405,7 +1403,7 @@ check-am: all-am +@@ -1432,7 +1430,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h installdirs: @@ -22,7 +22,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1469,9 +1467,7 @@ info: info-am +@@ -1504,9 +1502,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in index e9f1ff3e8841..7c226289afb0 100644 --- a/print/texlive-base/files/patch-texk-cjkutils-Makefile.in +++ b/print/texlive-base/files/patch-texk-cjkutils-Makefile.in @@ -1,6 +1,6 @@ ---- texk/cjkutils/Makefile.in.orig 2015-03-12 14:42:02 UTC +--- texk/cjkutils/Makefile.in.orig 2020-11-19 18:31:09 UTC +++ texk/cjkutils/Makefile.in -@@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES = +@@ -136,7 +136,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ @@ -9,7 +9,7 @@ PROGRAMS = $(bin_PROGRAMS) bg5conv_SOURCES = bg5conv.c bg5conv_OBJECTS = bg5conv.$(OBJEXT) -@@ -1412,7 +1412,7 @@ check: check-am +@@ -1451,7 +1451,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \ all-local installdirs: @@ -18,7 +18,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1477,7 +1477,7 @@ info: info-am +@@ -1525,7 +1525,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp deleted file mode 100644 index c9f0d5bbedf1..000000000000 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp.orig 2015-03-02 08:48:21 UTC -+++ texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp -@@ -34,6 +34,7 @@ - #endif - #endif - -+#include <sys/time.h> - #include <cstdlib> - #include <fstream> - #include <map> diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp deleted file mode 100644 index 8444cc2e747d..000000000000 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp.orig 2015-03-02 08:48:21 UTC -+++ texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp -@@ -19,6 +19,7 @@ - *************************************************************************/ - - #include <config.h> -+#include <sys/time.h> - #include <cstdlib> - #include <iostream> - #include <fstream> diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp deleted file mode 100644 index 9f03ce0ff1fb..000000000000 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp.orig 2015-03-02 08:48:21 UTC -+++ texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp -@@ -19,6 +19,7 @@ - *************************************************************************/ - - #include <config.h> -+#include <sys/time.h> - #include "CMap.h" - #include "CMapManager.h" - #include "EncFile.h" diff --git a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp b/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp deleted file mode 100644 index 14f28dffe931..000000000000 --- a/print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp.orig 2015-03-02 08:48:21 UTC -+++ texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp -@@ -19,6 +19,7 @@ - *************************************************************************/ - - #include <config.h> -+#include <sys/time.h> - #include <cstdarg> - #include <cstdlib> - #include <cstring> diff --git a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in index 61623e5101e6..28b5d9ec8316 100644 --- a/print/texlive-base/files/patch-texk-gsftopk-Makefile.in +++ b/print/texlive-base/files/patch-texk-gsftopk-Makefile.in @@ -1,4 +1,4 @@ ---- texk/gsftopk/Makefile.in.orig 2015-03-12 14:42:02 UTC +--- texk/gsftopk/Makefile.in.orig 2020-11-19 18:31:09 UTC +++ texk/gsftopk/Makefile.in @@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h @@ -10,7 +10,7 @@ PROGRAMS = $(bin_PROGRAMS) am_gsftopk_OBJECTS = gsftopk.$(OBJEXT) gsftopk_OBJECTS = $(am_gsftopk_OBJECTS) -@@ -818,7 +817,7 @@ check-am: all-am +@@ -836,7 +835,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h installdirs: @@ -19,7 +19,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -875,7 +874,7 @@ info: info-am +@@ -893,7 +892,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc b/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc deleted file mode 100644 index 4c140c56abd3..000000000000 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc.orig 2014-07-08 06:44:39 UTC -+++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/t1interp.cc -@@ -30,6 +30,7 @@ - #define CHECK_PATH_START() do { _state = S_PATH; } while (0) - #define CHECK_PATH_END() do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0) - -+#undef static_assert - #ifndef static_assert - # define static_assert(c, msg) switch ((int) (c)) case 0: case (c): - #endif diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in b/print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in deleted file mode 100644 index 67a144bd09ae..000000000000 --- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/texlive/linked_scripts/Makefile.in.orig 2015-09-25 04:27:05.446437000 +0900 -+++ texk/texlive/linked_scripts/Makefile.in 2015-09-25 04:27:13.904147000 +0900 -@@ -386,7 +386,6 @@ - texlive/fmtutil.pl \ - texlive/fmtutil-sys.sh \ - texlive/rungs.tlu \ -- texlive/tlmgr.pl \ - texlive/updmap.pl \ - texlive/updmap-sys.sh \ - texliveonfly/texliveonfly.py \ diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh deleted file mode 100644 index 40f8c5a48927..000000000000 --- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig 2015-04-20 07:45:42 UTC -+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh -@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH - # hack around a bug in zsh: - test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - --exec fmtutil --sys ${1+"$@"} -+exec %%PREFIX%%/bin/fmtutil --sys ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh b/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh deleted file mode 100644 index 40cdf468a3c7..000000000000 --- a/print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig 2015-04-20 07:45:42 UTC -+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh -@@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH - # hack around a bug in zsh: - test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - --exec updmap --sys ${1+"$@"} -+exec %%PREFIX%%/bin/updmap --sys ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in b/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in deleted file mode 100644 index b72bce2d767c..000000000000 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in +++ /dev/null @@ -1,69 +0,0 @@ ---- texk/texlive/tl_scripts/Makefile.in.orig 2015-04-26 23:57:20 UTC -+++ texk/texlive/tl_scripts/Makefile.in -@@ -128,10 +128,9 @@ am__uninstall_files_from_dir = { \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } --am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" \ -+am__installdirs = "$(DESTDIR)$(texmfdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ -- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \ -- "$(DESTDIR)$(web2cdir)" -+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)" - SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \ - $(nodist_bin_SCRIPTS) - AM_V_P = $(am__v_P_@AM_V@) -@@ -263,8 +262,6 @@ sh_scripts = \ - dvi2fax \ - dvired \ - fontinst \ -- kpsetool \ -- kpsewhere \ - ps2frag \ - pslatex \ - rubibtex \ -@@ -293,8 +290,6 @@ dist_man_MANS = \ - fmtutil.1 \ - fmtutil.cnf.5 \ - fontinst.1 \ -- kpsetool.1 \ -- kpsewhere.1 \ - ps2frag.1 \ - pslatex.1 \ - rubibtex.1 \ -@@ -306,14 +301,10 @@ dist_man_MANS = \ - - bin_links = \ - allcm:allec \ -- fmtutil:mktexfmt \ -- kpsetool:kpsexpand \ -- kpsetool:kpsepath -+ fmtutil:mktexfmt - - man1_links = \ - fmtutil:fmtutil-sys \ -- kpsetool:kpsexpand \ -- kpsetool:kpsepath \ - fmtutil:mktexfmt \ - texconfig:texconfig-sys \ - updmap:updmap-sys -@@ -638,7 +629,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local - installdirs: -- for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \ -+ for dir in "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(web2cdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -692,8 +683,8 @@ info: info-am - - info-am: - --install-data-am: install-dist_texconfigDATA \ -- install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ -+install-data-am: \ -+ install-dist_texmfSCRIPTS \ - install-dist_web2cDATA install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf index e964521bb095..a5905278ef3c 100644 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf +++ b/print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf @@ -1,13 +1,11 @@ ---- texk/texlive/tl_scripts/fmtutil.cnf.orig 2015-05-05 22:32:32 UTC -+++ texk/texlive/tl_scripts/fmtutil.cnf -@@ -37,80 +37,80 @@ - +--- texk/texlive/tl_support/fmtutil.cnf.orig 2020-10-07 21:13:01 UTC ++++ texk/texlive/tl_support/fmtutil.cnf +@@ -41,118 +41,118 @@ + # AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here. # # from aleph: -aleph aleph - *aleph.ini --lamed aleph language.dat *lambda.ini +#aleph aleph - *aleph.ini -+#lamed aleph language.dat *lambda.ini # # from amstex: -amstex pdftex - -translate-file=cp227.tcx *amstex.ini @@ -31,13 +29,15 @@ # # from csplain: -csplain pdftex - -etex -enc csplain-utf8.ini +-luacsplain luatex - -etex csplain.ini +-pdfcsplain luatex - -etex csplain.ini -pdfcsplain pdftex - -etex -enc csplain-utf8.ini -pdfcsplain xetex - -etex csplain.ini --pdfcsplain luatex - -etex csplain.ini +#csplain pdftex - -etex -enc csplain-utf8.ini ++#luacsplain luatex - -etex csplain.ini ++#pdfcsplain luatex - -etex csplain.ini +#pdfcsplain pdftex - -etex -enc csplain-utf8.ini +#pdfcsplain xetex - -etex csplain.ini -+#pdfcsplain luatex - -etex csplain.ini # # from eplain: -eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini @@ -50,33 +50,44 @@ +#pdfjadetex pdftex language.dat *pdfjadetex.ini # # from latex-bin: +-dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini -latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +-lualatex luahbtex language.dat,language.dat.lua lualatex.ini -pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini --dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini --lualatex luatex language.dat,language.dat.lua lualatex.ini ++#dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini +#latex pdftex language.dat -translate-file=cp227.tcx *latex.ini ++#lualatex luahbtex language.dat,language.dat.lua lualatex.ini +#pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini -+#dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini -+#lualatex luatex language.dat,language.dat.lua lualatex.ini - #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini + # + # from latex-bin-dev: +-dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini +-latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini +-lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini +-pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini ++#dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini ++#latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini ++#lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini ++#pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini # # from lollipop: --lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini --lualollipop luatex - lualollipop.ini --xelollipop xetex - -etex xelollipop.ini -+#lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini -+#lualollipop luatex - lualollipop.ini -+#xelollipop xetex - -etex xelollipop.ini - #! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini - #! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini +-lollipop tex - lollipop.ini ++#lollipop tex - lollipop.ini + # + # from luahbtex: +-luahbtex luahbtex language.def,language.dat.lua luatex.ini ++#luahbtex luahbtex language.def,language.dat.lua luatex.ini + # + # from luajittex: +-luajithbtex luajithbtex language.def,language.dat.lua luatex.ini +-luajittex luajittex language.def,language.dat.lua luatex.ini ++#luajithbtex luajithbtex language.def,language.dat.lua luatex.ini ++#luajittex luajittex language.def,language.dat.lua luatex.ini # # from luatex: --luatex luatex language.def,language.dat.lua luatex.ini -dviluatex luatex language.def,language.dat.lua dviluatex.ini --luajittex luajittex language.def,language.dat.lua luatex.ini -+#luatex luatex language.def,language.dat.lua luatex.ini +-luatex luatex language.def,language.dat.lua luatex.ini +#dviluatex luatex language.def,language.dat.lua dviluatex.ini -+#luajittex luajittex language.def,language.dat.lua luatex.ini ++#luatex luatex language.def,language.dat.lua luatex.ini # # from metafont: -mf mf-nowin - -translate-file=cp227.tcx mf.ini @@ -90,6 +101,9 @@ +#pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini +#utf8mex pdftex mexconf.tex -enc *utf8mex.ini # + # from mflua: + #! mflua mflua-nowin - mf.ini + # # from mltex: -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini -mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini @@ -100,51 +114,62 @@ -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex +#mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex # + # from optex: +-optex luatex hyphen-lan.opm optex.ini ++#optex luatex hyphen-lan.opm optex.ini + # # from pdftex: --pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini -etex pdftex language.def -translate-file=cp227.tcx *etex.ini -pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini -+#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini +-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini +#etex pdftex language.def -translate-file=cp227.tcx *etex.ini +#pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini ++#pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini # - # from ptex: --ptex ptex - ptex.ini --eptex eptex language.def *eptex.ini + # from platex: -platex eptex language.dat *platex.ini -+#ptex ptex - ptex.ini -+#eptex eptex language.def *eptex.ini +-platex-dev eptex language.dat *platex.ini +#platex eptex language.dat *platex.ini ++#platex-dev eptex language.dat *platex.ini # - # from t2: - #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini -@@ -118,20 +118,20 @@ platex eptex language.dat *platex.ini - #! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini + # from ptex: +-eptex eptex language.def *eptex.ini +-ptex ptex - ptex.ini ++#eptex eptex language.def *eptex.ini ++#ptex ptex - ptex.ini # # from tex: -tex tex - tex.ini -+# tex tex - tex.ini ++#tex tex - tex.ini # # from texsis: -texsis pdftex - -translate-file=cp227.tcx texsis.ini -+# texsis pdftex - -translate-file=cp227.tcx texsis.ini ++#texsis pdftex - -translate-file=cp227.tcx texsis.ini + # + # from uplatex: +-uplatex euptex language.dat *uplatex.ini +-uplatex-dev euptex language.dat *uplatex.ini ++#uplatex euptex language.dat *uplatex.ini ++#uplatex-dev euptex language.dat *uplatex.ini # # from uptex: --uptex uptex - uptex.ini -euptex euptex language.def *euptex.ini --uplatex euptex language.dat *uplatex.ini -+# uptex uptex - uptex.ini -+# euptex euptex language.def *euptex.ini -+# uplatex euptex language.dat *uplatex.ini +-uptex uptex - uptex.ini ++#euptex euptex language.def *euptex.ini ++#uptex uptex - uptex.ini + # + # from xelatex-dev: +-xelatex-dev xetex language.dat -etex xelatex.ini ++#xelatex-dev xetex language.dat -etex xelatex.ini # # from xetex: --xetex xetex language.def -etex xetex.ini -xelatex xetex language.dat -etex xelatex.ini -+# xetex xetex language.def -etex xetex.ini -+# xelatex xetex language.dat -etex xelatex.ini +-xetex xetex language.def -etex xetex.ini ++#xelatex xetex language.dat -etex xelatex.ini ++#xetex xetex language.def -etex xetex.ini # # from xmltex: --xmltex pdftex language.dat *xmltex.ini -pdfxmltex pdftex language.dat *pdfxmltex.ini -+# xmltex pdftex language.dat *xmltex.ini -+# pdfxmltex pdftex language.dat *pdfxmltex.ini +-xmltex pdftex language.dat *xmltex.ini ++#pdfxmltex pdftex language.dat *pdfxmltex.ini ++#xmltex pdftex language.dat *xmltex.ini diff --git a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh b/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh deleted file mode 100644 index db5746b70c15..000000000000 --- a/print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- texk/texlive/tl_scripts/texconfig-sys.sh.orig 2014-07-13 00:06:11 UTC -+++ texk/texlive/tl_scripts/texconfig-sys.sh -@@ -30,4 +30,4 @@ TEXMFVAR="$v" - TEXMFCONFIG="$c" - export TEXMFVAR TEXMFCONFIG - --exec texconfig ${1+"$@"} -+exec %%PREFIX%%/bin/texconfig ${1+"$@"} diff --git a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in index e3f2f1b063c8..590e5701fd96 100644 --- a/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in +++ b/print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in @@ -1,4 +1,4 @@ ---- texk/ttf2pk2/Makefile.in.orig 2015-03-12 14:42:02 UTC +--- texk/ttf2pk2/Makefile.in.orig 2021-02-08 15:49:16 UTC +++ texk/ttf2pk2/Makefile.in @@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h @@ -11,7 +11,7 @@ PROGRAMS = $(bin_PROGRAMS) am__objects_1 = errormsg.$(OBJEXT) filesrch.$(OBJEXT) ftlib.$(OBJEXT) \ ligkern.$(OBJEXT) newobj.$(OBJEXT) parse.$(OBJEXT) \ -@@ -1321,7 +1319,7 @@ check-am: all-am +@@ -1349,7 +1347,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h installdirs: @@ -20,7 +20,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -1381,8 +1379,7 @@ info: info-am +@@ -1425,8 +1423,7 @@ info: info-am info-am: diff --git a/print/texlive-base/files/patch-texk_dvipng_configure b/print/texlive-base/files/patch-texk_dvipng_configure index a9e76741119d..fe223d058f2c 100644 --- a/print/texlive-base/files/patch-texk_dvipng_configure +++ b/print/texlive-base/files/patch-texk_dvipng_configure @@ -1,13 +1,13 @@ ---- texk/dvipng/configure.orig 2021-08-02 22:16:56 UTC +--- texk/dvipng/configure.orig 2020-11-19 18:31:09 UTC +++ texk/dvipng/configure -@@ -16273,8 +16273,8 @@ else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +@@ -16428,8 +16428,8 @@ 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` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` - 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 + elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/files/patch-texk_dvisvgm_configure b/print/texlive-base/files/patch-texk_dvisvgm_configure index 09c66a5ac782..cd9af51ac9c4 100644 --- a/print/texlive-base/files/patch-texk_dvisvgm_configure +++ b/print/texlive-base/files/patch-texk_dvisvgm_configure @@ -1,13 +1,13 @@ ---- texk/dvisvgm/configure.orig 2021-08-02 22:17:20 UTC +--- texk/dvisvgm/configure.orig 2021-02-19 23:13:01 UTC +++ texk/dvisvgm/configure -@@ -19748,8 +19748,8 @@ else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +@@ -21790,8 +21790,8 @@ 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` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` - 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 + elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp new file mode 100644 index 000000000000..f9fb73e219b8 --- /dev/null +++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp.orig 2022-01-29 15:54:24 UTC ++++ texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp +@@ -32,6 +32,7 @@ + #endif + #endif + ++#include <sys/time.h> + #include <cstdlib> + #include <fstream> + #include <map> diff --git a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp new file mode 100644 index 000000000000..ff99cd7c47cd --- /dev/null +++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/Font.cpp.orig 2022-01-29 15:59:04 UTC ++++ texk/dvisvgm/dvisvgm-src/src/Font.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see <http://www.gnu.org/licenses/>. ** + *************************************************************************/ + ++#include <sys/time.h> + #include <cstdlib> + #include <fstream> + #include <set> diff --git a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp new file mode 100644 index 000000000000..56a257dbefb8 --- /dev/null +++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp.orig 2022-01-29 16:03:07 UTC ++++ texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see <http://www.gnu.org/licenses/>. ** + *************************************************************************/ + ++#include <sys/time.h> + #include "CMap.hpp" + #include "CMapManager.hpp" + #include "EncFile.hpp" diff --git a/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp new file mode 100644 index 000000000000..aa6012a5e216 --- /dev/null +++ b/print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/Message.cpp.orig 2022-01-29 16:06:37 UTC ++++ texk/dvisvgm/dvisvgm-src/src/Message.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see <http://www.gnu.org/licenses/>. ** + *************************************************************************/ + ++#include <sys/time.h> + #include <cstdarg> + #include <cstdlib> + #include <cstring> diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in index 2226742e37a1..b07c6ae0af76 100644 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in +++ b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in @@ -1,5 +1,5 @@ ---- texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in.orig 2015-03-12 14:42:02 UTC -+++ texk/lcdf-typetools/lcdf-typetools-2.104/Makefile.in +--- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in.orig 2020-11-19 18:31:09 UTC ++++ texk/lcdf-typetools/lcdf-typetools-src/Makefile.in @@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ @@ -11,7 +11,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ -@@ -714,7 +714,7 @@ info: info-recursive +@@ -717,7 +717,7 @@ info: info-recursive info-am: diff --git a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_cff.cc index 2ef57a961e05..721c1c88856a 100644 --- a/print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc +++ b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_cff.cc @@ -1,5 +1,5 @@ ---- texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc.orig 2014-07-08 06:44:39 UTC -+++ texk/lcdf-typetools/lcdf-typetools-2.104/libefont/cff.cc +--- texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc.orig 2019-01-28 02:26:31 UTC ++++ texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc @@ -27,6 +27,7 @@ #include <ctype.h> #include <efont/t1unparser.hh> diff --git a/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_t1interp.cc b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_t1interp.cc new file mode 100644 index 000000000000..68b9f7e3c92b --- /dev/null +++ b/print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_t1interp.cc @@ -0,0 +1,10 @@ +--- texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc.orig 2022-01-29 16:26:32 UTC ++++ texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc +@@ -30,6 +30,7 @@ + #define CHECK_PATH_START() do { _state = S_PATH; } while (0) + #define CHECK_PATH_END() do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0) + ++#undef static_assert + #ifndef static_assert + # define static_assert(c, msg) switch ((int) (c)) case 0: case (c): + #endif 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 new file mode 100644 index 000000000000..6ddfca35edc9 --- /dev/null +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in @@ -0,0 +1,20 @@ +--- texk/texlive/linked_scripts/Makefile.in.orig 2022-02-14 21:00:19 UTC ++++ texk/texlive/linked_scripts/Makefile.in +@@ -290,8 +290,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 \ +@@ -471,8 +469,6 @@ bin_links = \ + cluttex:cllualatex \ + epstopdf:repstopdf \ + fmtutil:mktexfmt \ +- kpsetool:kpsexpand \ +- kpsetool:kpsepath \ + mktexlsr:texhash \ + pdfcrop:rpdfcrop \ + texdef:latexdef diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam index 660f3f2daf4e..66293932d296 100644 --- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam @@ -1,26 +1,26 @@ ---- texk/texlive/linked_scripts/pdfjam/pdfjam.orig 2013-03-12 00:01:41 UTC +--- texk/texlive/linked_scripts/pdfjam/pdfjam.orig 2019-11-19 00:11:53 UTC +++ texk/texlive/linked_scripts/pdfjam/pdfjam -@@ -1143,19 +1143,19 @@ EndTemplate - ) > $texFile +@@ -1189,19 +1189,19 @@ EndTemplate + ) > "$texFile" if test "$hyperref" = false; then ## we don't need hyperref - cp $texFile $tempFile -- sed '/\\\usepackage{hyperref}/d' $tempFile | \ + cp "$texFile" "$tempFile" +- sed '/\\\usepackage{hyperref}/d' "$tempFile" | \ - sed '/\\\hypersetup.*/d' > "${texFile}" -+ sed '/\\usepackage{hyperref}/d' $tempFile | \ ++ sed '/\\usepackage{hyperref}/d' "$tempFile" | \ + sed '/\\hypersetup.*/d' > "${texFile}" - rm $tempFile + rm "$tempFile" fi if test -z "$geometry" ; then geometry=false ; fi if test "$geometry" = false; then ## geometry package is not to be used - cp $texFile $tempFile -- cat $tempFile | sed '/\\\usepackage.*{geometry}/d' > $texFile -+ cat $tempFile | sed '/\\usepackage.*{geometry}/d' > $texFile - rm $tempFile + cp "$texFile" "$tempFile" +- sed '/\\\usepackage.*{geometry}/d' "$tempFile" > "$texFile" ++ sed '/\\usepackage.*{geometry}/d' "$tempFile" > "$texFile" + rm "$tempFile" fi if test -z "$pagecolor"; then ## color package is not needed - cp $texFile $tempFile -- cat $tempFile | sed '/\\\usepackage.*{color}/d' > $texFile -+ cat $tempFile | sed '/\\usepackage.*{color}/d' > $texFile - rm $tempFile + cp "$texFile" "$tempFile" +- sed '/\\\usepackage.*{color}/d' "$tempFile" > "$texFile" ++ sed '/\\usepackage.*{color}/d' "$tempFile" > "$texFile" + rm "$tempFile" fi - ## + (cat <<EndTemplate diff --git a/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in b/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in new file mode 100644 index 000000000000..6e8b91ee0be2 --- /dev/null +++ b/print/texlive-base/files/patch-texk_texlive_tl__support_Makefile.in @@ -0,0 +1,20 @@ +--- texk/texlive/tl_support/Makefile.in.orig 2020-01-31 18:59:27 UTC ++++ texk/texlive/tl_support/Makefile.in +@@ -255,8 +255,6 @@ dist_man_MANS = \ + fmtutil.1 \ + fmtutil.cnf.5 \ + fontinst.1 \ +- kpsetool.1 \ +- kpsewhere.1 \ + mktexlsr.1 \ + mktexmf.1 \ + mktexpk.1 \ +@@ -272,8 +270,6 @@ dist_man_MANS = \ + + man1_links = \ + fmtutil:fmtutil-sys \ +- kpsetool:kpsexpand \ +- kpsetool:kpsepath \ + fmtutil:mktexfmt \ + mktexlsr:texhash \ + texconfig:texconfig-sys \ diff --git a/print/texlive-base/files/patch-texk_ttf2pk2_configure b/print/texlive-base/files/patch-texk_ttf2pk2_configure index dd8650b1202c..c4ac27f563ce 100644 --- a/print/texlive-base/files/patch-texk_ttf2pk2_configure +++ b/print/texlive-base/files/patch-texk_ttf2pk2_configure @@ -1,13 +1,13 @@ ---- texk/ttf2pk2/configure.orig 2021-08-02 22:17:04 UTC +--- texk/ttf2pk2/configure.orig 2019-03-25 17:27:50 UTC +++ texk/ttf2pk2/configure -@@ -15108,8 +15108,8 @@ else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +@@ -15266,8 +15266,8 @@ 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` + FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` + FREETYPE2_LIBS=`pkg-config freetype2 --libs` - 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 + elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` diff --git a/print/texlive-base/files/patch-texk_ttf2pk2_pklib.c b/print/texlive-base/files/patch-texk_ttf2pk2_pklib.c deleted file mode 100644 index a6e082492d04..000000000000 --- a/print/texlive-base/files/patch-texk_ttf2pk2_pklib.c +++ /dev/null @@ -1,12 +0,0 @@ ---- texk/ttf2pk2/pklib.c.orig 2013-07-01 08:05:31.000000000 +0000 -+++ texk/ttf2pk2/pklib.c 2020-08-19 13:23:37.764387000 +0000 -@@ -64,8 +64,8 @@ - #define PK_POST (char)245 - #define PK_NOP (char)246 - --int dpi; -+extern int dpi; - - FILE *pk_file; - - |