diff --git Mk/bsd.tex.mk Mk/bsd.tex.mk index 55bc46e786f9..396a511b3ce0 100644 --- Mk/bsd.tex.mk +++ Mk/bsd.tex.mk @@ -156,7 +156,7 @@ _USE_TEX_XETEX_DEP= xetex _USE_TEX_XETEX_PORT= print/${_USE_TEX_XETEX_PKGNAME} _USE_TEX_XETEX_PKGNAME= tex-xetex -_USE_TEX_FULLLIST= texmf>=20150523_3 base>=20150521_5 \ +_USE_TEX_FULLLIST= texmf>=20200406_1 base>=20200406_1 \ web2c tlmgr:run \ basic formats aleph xetex jadetex luatex xmltex ptex \ dvipsk dvipdfmx xdvik xpdfopen:run \ @@ -170,10 +170,10 @@ USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu} _U:= ${_UU} # ugly but necessary in for loop _VOP:= . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*) -_U:= ${_U}>=20150523_3 +_U:= ${_U}>=20200406_1 . endif . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*) -_U:= ${_U}>=20150521_5 +_U:= ${_U}>=20200406_1 . endif . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \ !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \ diff --git devel/tex-kpathsea/Makefile devel/tex-kpathsea/Makefile index 4484dc2327b9..7a0484f6a33b 100644 --- devel/tex-kpathsea/Makefile +++ devel/tex-kpathsea/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= kpathsea -PORTVERSION= 6.2.1 -PORTREVISION= 2 +PORTVERSION= 6.3.2 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ PKGNAMEPREFIX= tex- -DISTNAME= texlive-20150521-source +DISTNAME= texlive-20200406-source DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org @@ -20,7 +20,9 @@ USE_TEX= yes EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux \ texk/kpathsea \ - texk/texlive/tl_scripts + texk/texlive/tl_support \ + texk/texlive/linked_scripts/texlive-extra \ + texk/texlive/linked_scripts/texlive WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea GNU_CONFIGURE= yes INSTALL_TARGET= install-strip @@ -28,15 +30,23 @@ INSTALL_TARGET= install-strip INFO= kpathsea post-install: - cd ${WRKDIR}/${DISTNAME}/texk/texlive/tl_scripts && \ + (cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive-extra && \ for f in kpsetool kpsewhere; do \ ${INSTALL_SCRIPT} $${f}.sh ${STAGEDIR}${PREFIX}/bin/$$f; \ - ${INSTALL_MAN} $${f}.1 \ + ${INSTALL_MAN} ../../tl_support/$${f}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \ done; \ for l in kpsexpand kpsepath; do \ ${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \ ${LN} -sf kpsetool.1 ${STAGEDIR}${MANPREFIX}/man/man1/$${l}.1; \ - done + done) + (cd ${WRKDIR}/${DISTNAME}/texk/texlive/linked_scripts/texlive && \ + for f in mktexlsr mktexmf mktexpk mktextfm; do \ + ${INSTALL_SCRIPT} $${f} ${STAGEDIR}${PREFIX}/bin/$$f; \ + ${INSTALL_MAN} ../../tl_support/$${f}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \ + done) + (cd ${STAGEDIR}${PREFIX}/bin && \ + ${LN} -sf mktexlsr texhash) .include diff --git devel/tex-kpathsea/distinfo devel/tex-kpathsea/distinfo index 5e60be0fc6e1..ea4dde867534 100644 --- devel/tex-kpathsea/distinfo +++ devel/tex-kpathsea/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 -SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 +TIMESTAMP = 1608767056 +SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320 diff --git devel/tex-kpathsea/files/patch-Makefile.in devel/tex-kpathsea/files/patch-Makefile.in index 22f302062632..436feb9e13e2 100644 --- devel/tex-kpathsea/files/patch-Makefile.in +++ devel/tex-kpathsea/files/patch-Makefile.in @@ -1,84 +1,20 @@ ---- Makefile.in.orig 2015-03-16 07:52:01 UTC +--- Makefile.in.orig 2020-12-23 23:58:35 UTC +++ Makefile.in -@@ -170,8 +170,8 @@ am__uninstall_files_from_dir = { \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ -- "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \ -- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \ -+ "$(DESTDIR)$(web2cdir)" \ -+ "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS) -@@ -306,7 +306,7 @@ am__can_run_installinfo = \ +@@ -364,7 +364,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac - DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA) + DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) -HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ +HEADERS = $(kpseinclude_HEADERS) \ - $(nodist_kpselib_HEADERS) $(noinst_HEADERS) + $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -@@ -717,12 +717,12 @@ libkpathsea_la_SOURCES = tex-file.c abso - kpseincludedir = ${includedir}/kpathsea - nodist_kpseinclude_HEADERS = \ - kpathsea.h \ -- paths.h -+ paths.h \ -+ c-auto.h - - kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) - kpselibdir = ${libdir}/kpathsea --nodist_kpselib_HEADERS = \ -- c-auto.h -+nodist_kpselib_HEADERS = - - - # Headers included directly into kpathsea.h -@@ -785,7 +785,7 @@ noinst_HEADERS = \ - xopendir.h \ - xstat.h - - pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = kpathsea.pc - DISTCLEANFILES = paths.h stamp-paths kpathsea.h - kpseaccess_SOURCES = access.c -@@ -2103,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRAR +@@ -2092,7 +2092,7 @@ install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \ +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -2167,10 +2167,9 @@ info: info-recursive - - info-am: - --install-data-am: install-data-local install-dist_web2cDATA \ -- install-dist_web2cSCRIPTS install-kpseincludeHEADERS \ -+install-data-am: install-data-local install-kpseincludeHEADERS \ - install-nodist_kpseincludeHEADERS \ -- install-nodist_kpselibHEADERS install-pkgconfigDATA -+ install-pkgconfigDATA - - install-dvi: install-dvi-recursive - -@@ -2319,13 +2318,13 @@ install-data-local: installdirs-am - uninstall-local: - @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \ - @WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \ --@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - @WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - @WIN32_FALSE@ else :; fi; \ - @WIN32_FALSE@ done - @for f in $(dist_noinst_DATA); do \ - if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \ -- echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ -+ echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ - rm -f "$(DESTDIR)$(web2cdir)/$$f"; \ - else :; fi; \ - done diff --git devel/tex-kpathsea/files/patch-texmf.cnf devel/tex-kpathsea/files/patch-texmf.cnf index 88dee70ebf9a..236fe727bb63 100644 --- devel/tex-kpathsea/files/patch-texmf.cnf +++ devel/tex-kpathsea/files/patch-texmf.cnf @@ -1,15 +1,15 @@ ---- texmf.cnf.orig 2015-04-13 00:20:30.000000000 +0900 -+++ texmf.cnf 2015-09-26 04:35:35.579765000 +0900 -@@ -51,7 +51,7 @@ - % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. - % Kpathsea sets SELFAUTOLOC (the directory with the binary), - % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). +--- texmf.cnf.orig 2020-12-23 23:55:02 UTC ++++ texmf.cnf +@@ -59,7 +59,7 @@ + % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and + % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). + % Sorry for the off-by-one-generation names. -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = $SELFAUTODIR/share % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist -@@ -61,7 +61,7 @@ +@@ -69,7 +69,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. @@ -18,7 +18,7 @@ % TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $TEXMFROOT/texmf-var -@@ -495,6 +495,7 @@ +@@ -566,6 +566,7 @@ $SELFAUTOLOC/texmf-local/web2c,\ $SELFAUTOLOC/texmf-dist/web2c,\ $SELFAUTOLOC/texmf/web2c,\ \ @@ -26,7 +26,7 @@ $SELFAUTODIR,\ $SELFAUTODIR/share/texmf-local/web2c,\ $SELFAUTODIR/share/texmf-dist/web2c,\ -@@ -722,7 +723,7 @@ +@@ -806,7 +807,7 @@ hash_extra = 600000 pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. @@ -35,7 +35,7 @@ % Maximum number of strings. max_strings = 500000 % min pool space left after loading .fmt -@@ -732,7 +733,7 @@ +@@ -816,7 +817,7 @@ pool_free = 47500 % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large, even though most documents can be handled with a small value. @@ -44,12 +44,12 @@ % Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in % the sources), but we don't need that much. The value here suffices -@@ -743,7 +744,7 @@ +@@ -827,7 +828,7 @@ trie_size = 1000000 hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. % http://primes.utm.edu/curios/page.php/8191.html -nest_size = 500 % simultaneous semantic levels (e.g., groups) -+nest_size = 2500 % simultaneous semantic levels (e.g., groups) ++nest_size = 2500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions, % also applies to MetaPost param_size = 10000 % simultaneous macro parameters, also applies to MP diff --git devel/tex-kpathsea/pkg-plist devel/tex-kpathsea/pkg-plist index b9699051feb1..fc4eacb26bec 100644 --- devel/tex-kpathsea/pkg-plist +++ devel/tex-kpathsea/pkg-plist @@ -1,16 +1,16 @@ bin/kpseaccess +bin/kpsepath bin/kpsereadlink bin/kpsestat +bin/kpsetool +bin/kpsewhere bin/kpsewhich +bin/kpsexpand bin/mktexlsr bin/mktexmf bin/mktexpk bin/mktextfm bin/texhash -bin/kpsewhere -bin/kpsetool -bin/kpsexpand -bin/kpsepath include/kpathsea/absolute.h include/kpathsea/c-auto.h include/kpathsea/c-ctype.h @@ -57,22 +57,21 @@ include/kpathsea/types.h include/kpathsea/variable.h include/kpathsea/version.h include/kpathsea/win32lib.h +lib/libkpathsea.a +lib/libkpathsea.so +lib/libkpathsea.so.6 +lib/libkpathsea.so.6.3.2 +libdata/pkgconfig/kpathsea.pc man/man1/kpseaccess.1.gz +man/man1/kpsepath.1.gz man/man1/kpsereadlink.1.gz man/man1/kpsestat.1.gz -man/man1/kpsewhich.1.gz -man/man1/kpsepath.1.gz man/man1/kpsetool.1.gz man/man1/kpsewhere.1.gz +man/man1/kpsewhich.1.gz man/man1/kpsexpand.1.gz man/man1/mktexlsr.1.gz man/man1/mktexmf.1.gz man/man1/mktexpk.1.gz man/man1/mktextfm.1.gz -man/man1/texhash.1.gz -lib/libkpathsea.a -lib/libkpathsea.so -lib/libkpathsea.so.6 -lib/libkpathsea.so.6.2.1 -libdata/pkgconfig/kpathsea.pc %%TEXMFDISTDIR%%/web2c/texmf.cnf diff --git devel/tex-web2c/Makefile devel/tex-web2c/Makefile index e96d4a183b44..d1d87b16db80 100644 --- devel/tex-web2c/Makefile +++ devel/tex-web2c/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= web2c -PORTVERSION= 20150521 -PORTREVISION= 3 +PORTVERSION= 20200406 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= TEX_CTAN/systems/texlive/Source/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${PORTVERSION}-source DIST_SUBDIR= TeX @@ -12,10 +12,11 @@ DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org COMMENT= TeX implementation translating WEB to C -LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 \ +LIB_DEPENDS= libgmp.so:math/gmp \ + libopenjp2.so:graphics/openjpeg \ libpng.so:graphics/png \ - libzzip.so:devel/zziplib \ - libmpfr.so:math/mpfr + libmpfr.so:math/mpfr \ + libzzip.so:devel/zziplib USES= gnome pathfix pkgconfig libtool tar:xz xorg USE_TEX= kpathsea ptexenc @@ -30,6 +31,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-luatex \ --disable-luajittex \ + --disable-luahbtex \ + --disable-luajithbtex \ + --disable-mflua \ + --disable-mfluajit \ --disable-xetex \ --disable-aleph \ --disable-ptex \ diff --git devel/tex-web2c/distinfo devel/tex-web2c/distinfo index 5e60be0fc6e1..4661c29d727b 100644 --- devel/tex-web2c/distinfo +++ devel/tex-web2c/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 -SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 +TIMESTAMP = 1609453031 +SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320 diff --git devel/tex-web2c/files/patch-Makefile.in devel/tex-web2c/files/patch-Makefile.in index da071e37ce34..99f1f7a5c156 100644 --- devel/tex-web2c/files/patch-Makefile.in +++ devel/tex-web2c/files/patch-Makefile.in @@ -1,17 +1,17 @@ ---- Makefile.in.orig 2015-04-17 04:53:45.000000000 +0900 -+++ Makefile.in 2015-07-26 07:55:27.835477000 +0900 -@@ -2086,11 +2086,11 @@ - EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \ - libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \ - libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \ -- libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a +--- Makefile.in.orig 2020-12-31 22:20:55 UTC ++++ Makefile.in +@@ -2971,11 +2971,11 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a lib + libluajittexspecific.a libluahbtexspecific.a \ + libluajithbtexspecific.a libluaffi.a libluapplib.a \ + libluajitpplib.a libluaharfbuzz.a libluajitharfbuzz.a \ +- libxetex.a libsynctex.a libmd5.a -EXTRA_LTLIBRARIES = libsynctex.la -+ libluatex.a libluajittex.a libxetex.a libmd5.a ++ libxetex.a libmd5.a +EXTRA_LTLIBRARIES = - lib_LIBRARIES = $(am__append_98) - lib_LTLIBRARIES = $(am__append_97) + lib_LIBRARIES = $(am__append_122) + lib_LTLIBRARIES = $(am__append_121) -dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 +dist_man_MANS = nodist_man_MANS = + TEST_EXTENSIONS = .pl .test EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ - triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \ diff --git devel/tex-web2c/files/patch-man-Makefile.in devel/tex-web2c/files/patch-man_Makefile.in similarity index 63% rename from devel/tex-web2c/files/patch-man-Makefile.in rename to devel/tex-web2c/files/patch-man_Makefile.in index ab237597555b..5d2d97c6ea7f 100644 --- devel/tex-web2c/files/patch-man-Makefile.in +++ devel/tex-web2c/files/patch-man_Makefile.in @@ -1,12 +1,13 @@ ---- man/Makefile.in.orig 2015-07-26 05:24:02.711529000 +0900 -+++ man/Makefile.in 2015-07-26 05:24:25.464588000 +0900 -@@ -448,10 +448,7 @@ +--- man/Makefile.in.orig 2020-12-31 22:21:27 UTC ++++ man/Makefile.in +@@ -468,11 +468,7 @@ web_man_sources = bibtex.man dvicopy.man dvitomp.man d 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 = diff --git devel/tex-web2c/pkg-plist devel/tex-web2c/pkg-plist index 3143dd90abc6..95c10937818f 100644 --- devel/tex-web2c/pkg-plist +++ devel/tex-web2c/pkg-plist @@ -1,12 +1,22 @@ -bin/tangle -bin/ctangle bin/bibtex +bin/ctangle +bin/ctie +bin/ctwill +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/pdvitomp bin/pktogf @@ -14,44 +24,50 @@ bin/pktype bin/pltotf bin/pmpost bin/pooltype +bin/r-mpost +bin/r-pmpost +bin/r-upmpost +bin/tangle bin/tftopl +bin/tie bin/updvitomp bin/upmpost bin/vftovp bin/vptovf bin/weave -bin/ctie -bin/cweave -bin/tie -bin/mf -bin/mf-nowin -bin/mpost -bin/dvitomp -bin/inimf -bin/mfplain man/man1/bibtex.1.gz man/man1/ctangle.1.gz man/man1/ctie.1.gz +man/man1/ctwill-refsort.1.gz +man/man1/ctwill-twinx.1.gz +man/man1/ctwill.1.gz man/man1/cweave.1.gz man/man1/cweb.1.gz man/man1/dvicopy.1.gz +man/man1/dvilualatex-dev.1.gz man/man1/dvitomp.1.gz man/man1/dvitype.1.gz man/man1/gftodvi.1.gz man/man1/gftopk.1.gz man/man1/gftype.1.gz +man/man1/inimf.1.gz +man/man1/lualatex-dev.1.gz man/man1/mf-nowin.1.gz man/man1/mf.1.gz man/man1/mft.1.gz man/man1/mpost.1.gz man/man1/patgen.1.gz +man/man1/pdflatex-dev.1.gz man/man1/pktogf.1.gz man/man1/pktype.1.gz +man/man1/platex-dev.1.gz man/man1/pltotf.1.gz man/man1/pooltype.1.gz man/man1/tangle.1.gz man/man1/tftopl.1.gz man/man1/tie.1.gz +man/man1/uplatex-dev.1.gz man/man1/vftovp.1.gz man/man1/vptovf.1.gz man/man1/weave.1.gz +man/man1/xelatex-dev.1.gz diff --git print/tex-ptexenc/Makefile print/tex-ptexenc/Makefile index 06dda75c56fd..5ae691042def 100644 --- print/tex-ptexenc/Makefile +++ print/tex-ptexenc/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= ptexenc -PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTVERSION= 1.3.8 +PORTREVISION= 1 CATEGORIES= print -MASTER_SITES= TEX_CTAN/systems/texlive/Source/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ PKGNAMEPREFIX= tex- -DISTNAME= texlive-20150521-source +DISTNAME= texlive-20200406-source DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org diff --git print/tex-ptexenc/distinfo print/tex-ptexenc/distinfo index 5e60be0fc6e1..2065b4f21880 100644 --- print/tex-ptexenc/distinfo +++ print/tex-ptexenc/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 -SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 +TIMESTAMP = 1609450080 +SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320 diff --git print/tex-ptexenc/files/patch-Makefile.in print/tex-ptexenc/files/patch-Makefile.in index 785533d5419e..e012f1e40d1d 100644 --- print/tex-ptexenc/files/patch-Makefile.in +++ print/tex-ptexenc/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2016-10-04 13:42:08 UTC +--- Makefile.in.orig 2020-12-31 21:51:18 UTC +++ Makefile.in -@@ -396,7 +396,8 @@ libptexenc_la_SOURCES = \ +@@ -400,7 +400,8 @@ libptexenc_la_SOURCES = \ libptexenc_la_LIBADD = $(KPATHSEA_LIBS) nobase_include_HEADERS = \ ptexenc/ptexenc.h \ @@ -8,5 +8,5 @@ + ptexenc/unicode.h \ + ptexenc/unicode-jp.h - pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = ptexenc.pc diff --git print/tex-ptexenc/files/patch-configure print/tex-ptexenc/files/patch-configure index e295021adb53..f9a3cda024c3 100644 --- print/tex-ptexenc/files/patch-configure +++ print/tex-ptexenc/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-07-25 21:31:25 UTC +--- configure.orig 2020-12-31 21:50:30 UTC +++ configure -@@ -14889,7 +14889,7 @@ if ${ac_cv_lib_iconv_iconv_open+:} false +@@ -14951,7 +14951,7 @@ if ${ac_cv_lib_iconv_iconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9,7 +9,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -14924,7 +14924,7 @@ if test "x$ac_cv_lib_iconv_iconv_open" = +@@ -14986,7 +14986,7 @@ if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then : #define HAVE_LIBICONV 1 _ACEOF @@ -18,7 +18,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 -@@ -14933,7 +14933,7 @@ if ${ac_cv_lib_iconv_libiconv_open+:} fa +@@ -14995,7 +14995,7 @@ if ${ac_cv_lib_iconv_libiconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27,7 +27,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -14968,7 +14968,7 @@ if test "x$ac_cv_lib_iconv_libiconv_open +@@ -15030,7 +15030,7 @@ if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then #define HAVE_LIBICONV 1 _ACEOF diff --git print/tex-ptexenc/files/patch-ptexenc.c print/tex-ptexenc/files/patch-ptexenc.c index 8fa961ac162b..b4f071dc43f8 100644 --- print/tex-ptexenc/files/patch-ptexenc.c +++ print/tex-ptexenc/files/patch-ptexenc.c @@ -1,6 +1,6 @@ ---- ptexenc.c.orig 2014-04-28 06:37:18 UTC +--- ptexenc.c.orig 2020-12-31 21:51:59 UTC +++ ptexenc.c -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ #include #include @@ -8,7 +8,7 @@ #define ENC_UNKNOWN 0 #define ENC_JIS 1 -@@ -23,10 +24,46 @@ +@@ -24,10 +25,47 @@ #define ENC_UTF8 4 #define ENC_UPTEX 5 @@ -52,11 +52,12 @@ + } + return (ENC_UTF8); +} ++ + #define ESC '\033' #ifndef NOFILE -@@ -64,7 +101,7 @@ static const_string enc_to_string(int en +@@ -64,7 +102,7 @@ const_string enc_to_string(int enc) static int string_to_enc(const_string str) { if (str == NULL) return ENC_UNKNOWN; @@ -65,7 +66,7 @@ if (strcasecmp(str, "jis") == 0) return ENC_JIS; if (strcasecmp(str, "euc") == 0) return ENC_EUC; if (strcasecmp(str, "sjis") == 0) return ENC_SJIS; -@@ -92,7 +129,7 @@ static int get_default_enc(void) +@@ -92,7 +130,7 @@ static int get_default_enc(void) } else if (enc != ENC_UNKNOWN) { return enc; } @@ -74,7 +75,7 @@ } static void set_file_enc(int enc) -@@ -150,14 +187,14 @@ void enable_UPTEX (boolean enable) +@@ -150,14 +188,14 @@ void enable_UPTEX (boolean enable) { UPTEX_enabled = enable; if (enable) { @@ -83,7 +84,7 @@ internal_enc = ENC_UPTEX; } else { #ifdef WIN32 - default_kanji_enc = ENC_SJIS; + default_kanji_enc = ENC_UTF8; internal_enc = ENC_SJIS; #else - default_kanji_enc = ENC_UTF8; diff --git print/tex-ptexenc/pkg-plist print/tex-ptexenc/pkg-plist index 192db8e7333e..b68b403b2de1 100644 --- print/tex-ptexenc/pkg-plist +++ print/tex-ptexenc/pkg-plist @@ -1,8 +1,8 @@ include/ptexenc/ptexenc.h -include/ptexenc/unicode.h include/ptexenc/unicode-jp.h +include/ptexenc/unicode.h lib/libptexenc.a lib/libptexenc.so lib/libptexenc.so.1 -lib/libptexenc.so.1.3.3 +lib/libptexenc.so.1.3.8 libdata/pkgconfig/ptexenc.pc diff --git print/texlive-base/Makefile print/texlive-base/Makefile index 7d6dec6d96ea..04fdb6e974ff 100644 --- print/texlive-base/Makefile +++ print/texlive-base/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= texlive -PORTVERSION= 20150521 -PORTREVISION= 60 +PORTVERSION= 20200406 +PORTREVISION= 1 CATEGORIES= print -MASTER_SITES= TEX_CTAN/systems/texlive/Source/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ PKGNAMESUFFIX= -base DISTNAME= ${PORTNAME}-${DISTVERSION}-source DIST_SUBDIR= TeX @@ -51,7 +51,6 @@ SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ texk/texlive/linked_scripts/latexpand/latexpand \ texk/texlive/linked_scripts/lilyglyphs/*.py \ texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ - texk/texlive/linked_scripts/lua2dox/lua2dox_filter \ texk/texlive/linked_scripts/mathspic/mathspic.pl \ texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \ texk/texlive/linked_scripts/multibibliography/multibibliography.pl \ @@ -64,7 +63,18 @@ SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ 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/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 @@ -126,7 +136,7 @@ post-patch: cd ${WRKSRC}/texk/texlive && \ ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ linked_scripts/texlive/fmtutil-sys.sh \ - tl_scripts/texconfig-sys.sh \ + linked_scripts/texlive-extra/texconfig-sys.sh \ linked_scripts/texlive/updmap-sys.sh ${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \ ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \ diff --git print/texlive-base/distinfo print/texlive-base/distinfo index 5e60be0fc6e1..cb8f63995d75 100644 --- print/texlive-base/distinfo +++ print/texlive-base/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 -SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 +TIMESTAMP = 1609522456 +SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320 diff --git print/texlive-base/files/patch-Makefile.in print/texlive-base/files/patch-Makefile.in index f99a005ca201..09aaabb69380 100644 --- print/texlive-base/files/patch-Makefile.in +++ 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-01-01 18:22:07 UTC ++++ Makefile.in +@@ -487,7 +487,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 print/texlive-base/files/patch-configure print/texlive-base/files/patch-configure index 429162c7401d..18eec38729f2 100644 --- print/texlive-base/files/patch-configure +++ print/texlive-base/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-04-12 11:22:39 UTC +--- configure.orig 2021-01-01 18:23:08 UTC +++ configure -@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib +@@ -5901,7 +5901,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 fi fi @@ -8,15 +8,16 @@ +if test "${with_teckit_includes+set}" = set; then : + withval=$with_teckit_includes; +fi -+ + +# Check whether --with-teckit-libdir was given. +if test "${with_teckit_libdir+set}" = set; then : + withval=$with_teckit_libdir; +fi - ++ test "x$need_teckit" = xyes && { need_zlib=yes -@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system + } +@@ -21556,11 +21565,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = as_fn_error $? "did not find graphite2" "$LINENO" 5 fi @@ -33,4 +34,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 print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FileFinder.cpp deleted file mode 100644 index c9f0d5bbedf1..000000000000 --- 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 - #include - #include - #include diff --git print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Font.cpp deleted file mode 100644 index 8444cc2e747d..000000000000 --- 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 -+#include - #include - #include - #include diff --git print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-FontEncoding.cpp deleted file mode 100644 index 9f03ce0ff1fb..000000000000 --- 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 -+#include - #include "CMap.h" - #include "CMapManager.h" - #include "EncFile.h" diff --git print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-1.9.2-src-Message.cpp deleted file mode 100644 index 14f28dffe931..000000000000 --- 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 -+#include - #include - #include - #include diff --git print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-t1interp.cc deleted file mode 100644 index 4c140c56abd3..000000000000 --- 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 print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in print/texlive-base/files/patch-texk-texlive-linked_scripts-Makfile.in deleted file mode 100644 index 67a144bd09ae..000000000000 --- 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 print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in deleted file mode 100644 index b72bce2d767c..000000000000 --- 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 print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh print/texlive-base/files/patch-texk-texlive-tl_scripts-texconfig-sys.sh deleted file mode 100644 index db5746b70c15..000000000000 --- 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 print/texlive-base/files/patch-texk-bibtex-x-Makefile.in print/texlive-base/files/patch-texk_bibtex-x_Makefile.in similarity index 55% rename from print/texlive-base/files/patch-texk-bibtex-x-Makefile.in rename to print/texlive-base/files/patch-texk_bibtex-x_Makefile.in index d2e3be4391e0..7d82e3752126 100644 --- print/texlive-base/files/patch-texk-bibtex-x-Makefile.in +++ 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-01-01 18:18:09 UTC +++ texk/bibtex-x/Makefile.in @@ -121,8 +121,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 +@@ -1504,7 +1503,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 +@@ -1576,8 +1575,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 print/texlive-base/files/patch-texk-chktex-Makefile.in print/texlive-base/files/patch-texk_chktex_Makefile.in similarity index 82% rename from print/texlive-base/files/patch-texk-chktex-Makefile.in rename to print/texlive-base/files/patch-texk_chktex_Makefile.in index b46867fd1e44..705bf88b116b 100644 --- print/texlive-base/files/patch-texk-chktex-Makefile.in +++ 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 2021-01-01 18:14:14 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 +@@ -1423,7 +1421,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 +@@ -1495,9 +1493,7 @@ info: info-am info-am: diff --git print/texlive-base/files/patch-texk-cjkutils-Makefile.in print/texlive-base/files/patch-texk_cjkutils_Makefile.in similarity index 87% rename from print/texlive-base/files/patch-texk-cjkutils-Makefile.in rename to print/texlive-base/files/patch-texk_cjkutils_Makefile.in index e9f1ff3e8841..9dd2372de10b 100644 --- print/texlive-base/files/patch-texk-cjkutils-Makefile.in +++ print/texlive-base/files/patch-texk_cjkutils_Makefile.in @@ -1,4 +1,4 @@ ---- texk/cjkutils/Makefile.in.orig 2015-03-12 14:42:02 UTC +--- texk/cjkutils/Makefile.in.orig 2021-01-01 18:12:22 UTC +++ texk/cjkutils/Makefile.in @@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -9,7 +9,7 @@ PROGRAMS = $(bin_PROGRAMS) bg5conv_SOURCES = bg5conv.c bg5conv_OBJECTS = bg5conv.$(OBJEXT) -@@ -1412,7 +1412,7 @@ check: check-am +@@ -1427,7 +1427,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 +@@ -1501,7 +1501,7 @@ info: info-am info-am: diff --git print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp new file mode 100644 index 000000000000..019ba6e4529b --- /dev/null +++ print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FileFinder.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp.orig 2021-01-01 18:11:36 UTC ++++ texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp +@@ -32,6 +32,7 @@ + #endif + #endif + ++#include + #include + #include + #include diff --git print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp new file mode 100644 index 000000000000..6403e88a1a06 --- /dev/null +++ print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Font.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/Font.cpp.orig 2021-01-01 18:10:55 UTC ++++ texk/dvisvgm/dvisvgm-src/src/Font.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see . ** + *************************************************************************/ + ++#include + #include + #include + #include diff --git print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp new file mode 100644 index 000000000000..192a8d92502b --- /dev/null +++ print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_FontEncoding.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp.orig 2021-01-01 18:10:20 UTC ++++ texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see . ** + *************************************************************************/ + ++#include + #include "CMap.hpp" + #include "CMapManager.hpp" + #include "EncFile.hpp" diff --git print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp new file mode 100644 index 000000000000..44d6b076e4d0 --- /dev/null +++ print/texlive-base/files/patch-texk_dvisvgm_dvisvgm-src_src_Message.cpp @@ -0,0 +1,10 @@ +--- texk/dvisvgm/dvisvgm-src/src/Message.cpp.orig 2021-01-01 18:09:18 UTC ++++ texk/dvisvgm/dvisvgm-src/src/Message.cpp +@@ -18,6 +18,7 @@ + ** along with this program; if not, see . ** + *************************************************************************/ + ++#include + #include + #include + #include diff --git print/texlive-base/files/patch-texk-gsftopk-Makefile.in print/texlive-base/files/patch-texk_gsftopk_Makefile.in similarity index 87% rename from print/texlive-base/files/patch-texk-gsftopk-Makefile.in rename to print/texlive-base/files/patch-texk_gsftopk_Makefile.in index 61623e5101e6..7e61e384f4d7 100644 --- print/texlive-base/files/patch-texk-gsftopk-Makefile.in +++ 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 2021-01-01 18:07:20 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 +@@ -828,7 +827,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 +@@ -885,7 +884,7 @@ info: info-am info-am: diff --git print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in similarity index 75% rename from print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in rename to print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_Makefile.in index 2226742e37a1..b9e5d3c14f1b 100644 --- print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-Makefile.in +++ 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 2021-01-01 18:03:13 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 print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_cff.cc similarity index 56% rename from print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc rename to print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_cff.cc index 2ef57a961e05..d08f9a6193b4 100644 --- print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.104-libefont-cff.cc +++ 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 2021-01-01 18:06:38 UTC ++++ texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc @@ -27,6 +27,7 @@ #include #include diff --git print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_t1interp.cc print/texlive-base/files/patch-texk_lcdf-typetools_lcdf-typetools-src_libefont_t1interp.cc new file mode 100644 index 000000000000..536666c1bcf6 --- /dev/null +++ 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 2021-01-01 18:04:38 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 print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in new file mode 100644 index 000000000000..aa72f7c69422 --- /dev/null +++ print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in @@ -0,0 +1,28 @@ +--- texk/texlive/linked_scripts/Makefile.in.orig 2021-01-01 17:42:36 UTC ++++ texk/texlive/linked_scripts/Makefile.in +@@ -289,8 +289,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 \ +@@ -428,7 +426,6 @@ texmf_other_scripts = \ + texlive/mktexpk \ + texlive/mktextfm \ + texlive/rungs.tlu \ +- texlive/tlmgr.pl \ + texlive/updmap-sys.sh \ + texlive/updmap-user.sh \ + texlive/updmap.pl \ +@@ -466,8 +463,6 @@ bin_links = \ + cluttex:cllualatex \ + epstopdf:repstopdf \ + fmtutil:mktexfmt \ +- kpsetool:kpsexpand \ +- kpsetool:kpsepath \ + mktexlsr:texhash \ + pdfcrop:rpdfcrop \ + texdef:latexdef diff --git print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive-extra_texconfig-sys.sh print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive-extra_texconfig-sys.sh new file mode 100644 index 000000000000..9053daf4fcc5 --- /dev/null +++ print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive-extra_texconfig-sys.sh @@ -0,0 +1,8 @@ +--- texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh.orig 2021-01-01 17:41:06 UTC ++++ texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh +@@ -30,4 +30,4 @@ TEXMFVAR="$v" + TEXMFCONFIG="$c" + export TEXMFVAR TEXMFCONFIG + +-exec texconfig ${1+"$@"} ++exec %%PREFIX%%/bin/texconfig ${1+"$@"} diff --git print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_fmtutil-sys.sh similarity index 76% rename from print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh rename to print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_fmtutil-sys.sh index 40f8c5a48927..f3268c46ae0e 100644 --- print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh +++ print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_fmtutil-sys.sh @@ -1,4 +1,4 @@ ---- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig 2015-04-20 07:45:42 UTC +--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh.orig 2021-01-01 17:59:43 UTC +++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh @@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: diff --git print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_updmap-sys.sh similarity index 76% rename from print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh rename to print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_updmap-sys.sh index 40cdf468a3c7..2cda61b6702c 100644 --- print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh +++ print/texlive-base/files/patch-texk_texlive_linked__scripts_texlive_updmap-sys.sh @@ -1,4 +1,4 @@ ---- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig 2015-04-20 07:45:42 UTC +--- texk/texlive/linked_scripts/texlive/updmap-sys.sh.orig 2021-01-01 17:58:43 UTC +++ texk/texlive/linked_scripts/texlive/updmap-sys.sh @@ -22,4 +22,4 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: diff --git print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf similarity index 66% rename from print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf rename to print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf index e964521bb095..f5e5e046739b 100644 --- print/texlive-base/files/patch-texk-texlive-tl_scripts-fmtutil.cnf +++ print/texlive-base/files/patch-texk_texlive_tl__support_fmtutil.cnf @@ -1,7 +1,7 @@ ---- 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 2021-01-01 17:53:24 UTC ++++ texk/texlive/tl_support/fmtutil.cnf +@@ -41,119 +41,119 @@ + # AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here. # # from aleph: -aleph aleph - *aleph.ini @@ -32,10 +32,12 @@ # from csplain: -csplain pdftex - -etex -enc csplain-utf8.ini -pdfcsplain pdftex - -etex -enc csplain-utf8.ini +-luacsplain luatex - -etex csplain.ini -pdfcsplain xetex - -etex csplain.ini -pdfcsplain luatex - -etex csplain.ini +#csplain pdftex - -etex -enc csplain-utf8.ini +#pdfcsplain pdftex - -etex -enc csplain-utf8.ini ++#luacsplain luatex - -etex csplain.ini +#pdfcsplain xetex - -etex csplain.ini +#pdfcsplain luatex - -etex csplain.ini # @@ -53,30 +55,41 @@ -latex pdftex language.dat -translate-file=cp227.tcx *latex.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 +-lualatex luahbtex language.dat,language.dat.lua lualatex.ini +#latex pdftex language.dat -translate-file=cp227.tcx *latex.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 ++#lualatex luahbtex language.dat,language.dat.lua lualatex.ini + # + # from latex-bin-dev: +-latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini +-pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini +-dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini +-lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini ++#latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini ++#pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini ++#dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini ++#lualatex-dev luahbtex language.dat,language.dat.lua lualatex.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: +-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 ++#luajithbtex luajithbtex 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 +#dviluatex luatex language.def,language.dat.lua dviluatex.ini -+#luajittex luajittex language.def,language.dat.lua luatex.ini # # from metafont: -mf mf-nowin - -translate-file=cp227.tcx mf.ini @@ -89,6 +102,9 @@ +#mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini +#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 @@ -99,6 +115,10 @@ # from mptopdf: -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 @@ -107,44 +127,51 @@ +#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 + # + # from platex: +-platex eptex language.dat *platex.ini +-platex-dev eptex language.dat *platex.ini ++#platex eptex language.dat *platex.ini ++#platex-dev eptex language.dat *platex.ini # # from ptex: -ptex ptex - ptex.ini -eptex eptex language.def *eptex.ini --platex eptex language.dat *platex.ini +#ptex ptex - ptex.ini +#eptex eptex language.def *eptex.ini -+#platex 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 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 + # + # 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 # # 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 diff --git print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in similarity index 89% rename from print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in rename to print/texlive-base/files/patch-texk_ttf2pk2_Makefile.in index e3f2f1b063c8..71453bb61c81 100644 --- print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in +++ 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-01-01 17:37:12 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 +@@ -1340,7 +1338,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 +@@ -1416,8 +1414,7 @@ info: info-am info-am: diff --git print/texlive-base/files/patch-texk_ttf2pk2_pklib.c print/texlive-base/files/patch-texk_ttf2pk2_pklib.c deleted file mode 100644 index a6e082492d04..000000000000 --- 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; - - diff --git print/texlive-base/pkg-plist print/texlive-base/pkg-plist index 6a589977ffc1..620c661dec28 100644 --- print/texlive-base/pkg-plist +++ print/texlive-base/pkg-plist @@ -10,16 +10,22 @@ bin/arara bin/arlatex bin/authorindex bin/autoinst +bin/autosp +bin/axohelp +bin/bbl2bib bin/bbox bin/bg5+latex bin/bg5+pdflatex bin/bg5conv bin/bg5latex bin/bg5pdflatex +bin/bib2gls bin/bibdoiadd bin/bibexport +bin/bibmradd bin/bibtex8 bin/bibtexu +bin/biburl2doi bin/bibzbladd bin/bundledoc bin/cachepic @@ -34,12 +40,21 @@ bin/cefslatex bin/cefspdflatex bin/cfftot1 bin/checkcites +bin/checklistings +bin/chkdvifont +bin/chklref bin/chktex bin/chkweb bin/cjk-gs-integrate +bin/cllualatex +bin/cluttex +bin/clxelatex bin/context bin/contextjit bin/convbkmk +bin/convertgls2bib +bin/ctan-o-mat +bin/ctanbib bin/ctanify bin/ctanupload bin/de-macro @@ -47,6 +62,7 @@ bin/depythontex bin/detex bin/devnag bin/deweb +bin/diadia bin/disdvi bin/dosepsbin bin/dt2dv @@ -60,6 +76,7 @@ bin/dviconcat bin/dvidvi bin/dvigif bin/dvihp +bin/dviinfox bin/dvilj bin/dvilj2p bin/dvilj4 @@ -69,6 +86,7 @@ bin/dvipng bin/dvipos bin/dvired bin/dviselect +bin/dvispc bin/dvisvgm bin/dvitodvi bin/e2pall @@ -80,14 +98,15 @@ bin/exceltex bin/extconv bin/fig4latex bin/findhyph -bin/fixmsxpart bin/fmtutil bin/fmtutil-sys +bin/fmtutil-user bin/fontinst bin/fragmaster bin/gbklatex bin/gbkpdflatex bin/getmapdl +bin/gregorio bin/gsftopk bin/hbf2gf bin/ht @@ -100,13 +119,20 @@ bin/htxelatex bin/htxetex bin/installfont-tl bin/jamo-normalize +bin/jfmutil bin/kanji-config-updmap bin/kanji-config-updmap-sys +bin/kanji-config-updmap-user bin/kanji-fontmap-creator +bin/ketcindy bin/komkindex +bin/l3build bin/lacheck bin/latex-git-log +bin/latex-papersize bin/latex2man +bin/latex2nemeth +bin/latexdef bin/latexdiff bin/latexdiff-vc bin/latexfileversion @@ -122,12 +148,15 @@ bin/listings-ext.sh bin/ltx2crossrefxml bin/ltxfileinfo bin/ltximg -bin/lua2dox_filter bin/luaotfload-tool bin/luatools +bin/lwarpmk bin/m-tx bin/mag +bin/make4ht +bin/makedtx bin/makeglossaries +bin/makeglossaries-lite bin/makeindex bin/makejvf bin/match_parens @@ -141,6 +170,10 @@ bin/mkjobtexmf bin/mkpic bin/mkt1font bin/mktexfmt +bin/mktexlsr +bin/mktexmf +bin/mktexpk +bin/mktextfm bin/mmafm bin/mmpfb bin/mptopdf @@ -153,21 +186,15 @@ bin/musixtex bin/ot2kpx bin/otfinfo bin/otftotfm -bin/pdf180 -bin/pdf270 -bin/pdf90 +bin/pamphletangler bin/pdfannotextractor bin/pdfatfi -bin/pdfbook +bin/pdfbook2 bin/pdfcrop -bin/pdfflip bin/pdfjam -bin/pdfjam-pocketmod -bin/pdfjam-slides3up -bin/pdfjam-slides6up -bin/pdfjoin -bin/pdfnup -bin/pdfpun +bin/pdflatexpicscale +bin/pdftex-quiet +bin/pdfxup bin/pedigree bin/perltex bin/pfarrei @@ -175,9 +202,9 @@ bin/pfb2pfa bin/pk2bm bin/pkfix bin/pkfix-helper -bin/pmx2pdf bin/pmxab bin/pmxchords +bin/pn2pdf bin/prepmx bin/ps2eps bin/ps2frag @@ -201,6 +228,7 @@ bin/sjisconv bin/sjislatex bin/sjispdflatex bin/splitindex +bin/srcredact bin/sty2dtx bin/svn-multi bin/t1dotlessj @@ -209,6 +237,8 @@ bin/t1rawafm bin/t1reencode bin/t1testpage bin/t4ht +bin/tex2aspc +bin/tex4ebook bin/tex4ht bin/texconfig bin/texconfig-dialog @@ -221,11 +251,18 @@ bin/texdoc bin/texdoctk bin/texexec bin/texfot +bin/texhash bin/texlinks bin/texliveonfly bin/texloganalyser bin/texmfstart +bin/texosquery +bin/texosquery-jre5 +bin/texosquery-jre8 +bin/texplate bin/thumbpdf +bin/tlcockpit +bin/tlshell bin/tpic2pdftex bin/ttf2kotexfont bin/ttf2pk @@ -236,25 +273,35 @@ bin/typeoutfileinfo bin/ulqda bin/updmap bin/updmap-sys +bin/updmap-user +bin/upmendex bin/urlbst bin/vlna bin/vpe bin/vpl2ovp bin/vpl2vpl +bin/webquiz +bin/wordcount +bin/xhlatex +bin/xindex bin/yplan man/man1/afm2pl.1.gz man/man1/allcm.1.gz man/man1/allec.1.gz man/man1/allneeded.1.gz +man/man1/autosp.1.gz +man/man1/axohelp.1.gz man/man1/bbox.1.gz man/man1/bg5conv.1.gz man/man1/cef5conv.1.gz man/man1/cefconv.1.gz man/man1/cefsconv.1.gz man/man1/cfftot1.1.gz +man/man1/chkdvifont.1.gz man/man1/chktex.1.gz man/man1/chkweb.1.gz man/man1/detex.1.gz +man/man1/devnag.1.gz man/man1/deweb.1.gz man/man1/disdvi.1.gz man/man1/dt2dv.1.gz @@ -275,22 +322,31 @@ man/man1/dvipng.1.gz man/man1/dvipos.1.gz man/man1/dvired.1.gz man/man1/dviselect.1.gz +man/man1/dvispc.1.gz man/man1/dvisvgm.1.gz man/man1/dvitodvi.1.gz man/man1/e2pall.1.gz man/man1/extconv.1.gz -man/man1/fixmsxpart.1.gz man/man1/fmtutil-sys.1.gz man/man1/fmtutil.1.gz man/man1/fontinst.1.gz man/man1/gsftopk.1.gz man/man1/hbf2gf.1.gz +man/man1/kpsepath.1.gz +man/man1/kpsetool.1.gz +man/man1/kpsewhere.1.gz +man/man1/kpsexpand.1.gz man/man1/lacheck.1.gz man/man1/mag.1.gz man/man1/makeindex.1.gz +man/man1/makejvf.1.gz man/man1/mendex.1.gz man/man1/mkindex.1.gz man/man1/mktexfmt.1.gz +man/man1/mktexlsr.1.gz +man/man1/mktexmf.1.gz +man/man1/mktexpk.1.gz +man/man1/mktextfm.1.gz man/man1/mmafm.1.gz man/man1/mmpfb.1.gz man/man1/msxlint.1.gz @@ -313,9 +369,11 @@ man/man1/t1lint.1.gz man/man1/t1rawafm.1.gz man/man1/t1reencode.1.gz man/man1/t1testpage.1.gz +man/man1/tex2aspc.1.gz man/man1/texconfig-sys.1.gz man/man1/texconfig.1.gz man/man1/texdoctk.1.gz +man/man1/texhash.1.gz man/man1/texlinks.1.gz man/man1/tpic2pdftex.1.gz man/man1/ttf2pk.1.gz @@ -327,6 +385,10 @@ man/man1/updmap.1.gz man/man1/vlna.1.gz man/man5/fmtutil.cnf.5.gz man/man5/updmap.cfg.5.gz +%%TEXMFCONFIGDIR%%/.keep_me +%%TEXMFCONFIGDIR%%/web2c/.keep_me +%%FMTUTIL_CNF%% +%%TEXMFDISTDIR%%/.keep_me %%TEXMFDISTDIR%%/bibtex/csf/base/88591lat.csf %%TEXMFDISTDIR%%/bibtex/csf/base/88591sca.csf %%TEXMFDISTDIR%%/bibtex/csf/base/ascii.csf @@ -341,13 +403,20 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/accfonts/vpl2vpl %%TEXMFDISTDIR%%/scripts/adhocfilelist/adhocfilelist.sh %%TEXMFDISTDIR%%/scripts/arara/arara.sh +%%TEXMFDISTDIR%%/scripts/attachfile2/pdfatfi.pl %%TEXMFDISTDIR%%/scripts/authorindex/authorindex +%%TEXMFDISTDIR%%/scripts/bib2gls/bib2gls.sh +%%TEXMFDISTDIR%%/scripts/bib2gls/convertgls2bib.sh %%TEXMFDISTDIR%%/scripts/bibexport/bibexport.sh %%TEXMFDISTDIR%%/scripts/bundledoc/arlatex %%TEXMFDISTDIR%%/scripts/bundledoc/bundledoc %%TEXMFDISTDIR%%/scripts/cachepic/cachepic.tlu %%TEXMFDISTDIR%%/scripts/checkcites/checkcites.lua +%%TEXMFDISTDIR%%/scripts/checklistings/checklistings.sh +%%TEXMFDISTDIR%%/scripts/chklref/chklref.pl %%TEXMFDISTDIR%%/scripts/cjk-gs-integrate/cjk-gs-integrate.pl +%%TEXMFDISTDIR%%/scripts/clojure-pamphlet/pamphletangler +%%TEXMFDISTDIR%%/scripts/cluttex/cluttex.lua %%TEXMFDISTDIR%%/scripts/context/perl/mptopdf.pl %%TEXMFDISTDIR%%/scripts/context/stubs/unix/context %%TEXMFDISTDIR%%/scripts/context/stubs/unix/contextjit @@ -357,15 +426,22 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/context/stubs/unix/texexec %%TEXMFDISTDIR%%/scripts/context/stubs/unix/texmfstart %%TEXMFDISTDIR%%/scripts/convbkmk/convbkmk.rb +%%TEXMFDISTDIR%%/scripts/crossrefware/bbl2bib.pl %%TEXMFDISTDIR%%/scripts/crossrefware/bibdoiadd.pl +%%TEXMFDISTDIR%%/scripts/crossrefware/bibmradd.pl +%%TEXMFDISTDIR%%/scripts/crossrefware/biburl2doi.pl %%TEXMFDISTDIR%%/scripts/crossrefware/bibzbladd.pl %%TEXMFDISTDIR%%/scripts/crossrefware/ltx2crossrefxml.pl +%%TEXMFDISTDIR%%/scripts/ctan-o-mat/ctan-o-mat.pl +%%TEXMFDISTDIR%%/scripts/ctanbib/ctanbib %%TEXMFDISTDIR%%/scripts/ctanify/ctanify %%TEXMFDISTDIR%%/scripts/ctanupload/ctanupload.pl %%TEXMFDISTDIR%%/scripts/de-macro/de-macro +%%TEXMFDISTDIR%%/scripts/diadia/diadia.lua %%TEXMFDISTDIR%%/scripts/dosepsbin/dosepsbin.pl %%TEXMFDISTDIR%%/scripts/dtxgen/dtxgen %%TEXMFDISTDIR%%/scripts/dviasm/dviasm.py +%%TEXMFDISTDIR%%/scripts/dviinfox/dviinfox.pl %%TEXMFDISTDIR%%/scripts/ebong/ebong.py %%TEXMFDISTDIR%%/scripts/epspdf/epspdf.tlu %%TEXMFDISTDIR%%/scripts/epspdf/epspdftk.tcl @@ -379,15 +455,18 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/fragmaster/fragmaster.pl %%TEXMFDISTDIR%%/scripts/getmap/getmapdl.lua %%TEXMFDISTDIR%%/scripts/glossaries/makeglossaries +%%TEXMFDISTDIR%%/scripts/glossaries/makeglossaries-lite.lua %%TEXMFDISTDIR%%/scripts/installfont/installfont-tl -%%TEXMFDISTDIR%%/scripts/jfontmaps/kanji-config-updmap-sys.sh -%%TEXMFDISTDIR%%/scripts/jfontmaps/kanji-config-updmap.pl -%%TEXMFDISTDIR%%/scripts/jfontmaps/kanji-fontmap-creator.pl +%%TEXMFDISTDIR%%/scripts/jfmutil/jfmutil.pl +%%TEXMFDISTDIR%%/scripts/ketcindy/ketcindy.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/jamo-normalize.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/komkindex.pl %%TEXMFDISTDIR%%/scripts/kotex-utils/ttf2kotexfont.pl +%%TEXMFDISTDIR%%/scripts/l3build/l3build.lua %%TEXMFDISTDIR%%/scripts/latex-git-log/latex-git-log +%%TEXMFDISTDIR%%/scripts/latex-papersize/latex-papersize.py %%TEXMFDISTDIR%%/scripts/latex2man/latex2man +%%TEXMFDISTDIR%%/scripts/latex2nemeth/latex2nemeth %%TEXMFDISTDIR%%/scripts/latexdiff/latexdiff-vc.pl %%TEXMFDISTDIR%%/scripts/latexdiff/latexdiff.pl %%TEXMFDISTDIR%%/scripts/latexdiff/latexrevise.pl @@ -402,9 +481,11 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/listings-ext/listings-ext.sh %%TEXMFDISTDIR%%/scripts/ltxfileinfo/ltxfileinfo %%TEXMFDISTDIR%%/scripts/ltximg/ltximg.pl -%%TEXMFDISTDIR%%/scripts/lua2dox/lua2dox_filter %%TEXMFDISTDIR%%/scripts/luaotfload/luaotfload-tool.lua +%%TEXMFDISTDIR%%/scripts/lwarp/lwarpmk.lua %%TEXMFDISTDIR%%/scripts/m-tx/m-tx.lua +%%TEXMFDISTDIR%%/scripts/make4ht/make4ht +%%TEXMFDISTDIR%%/scripts/makedtx/makedtx.pl %%TEXMFDISTDIR%%/scripts/match_parens/match_parens %%TEXMFDISTDIR%%/scripts/mathspic/mathspic.pl %%TEXMFDISTDIR%%/scripts/mf2pt1/mf2pt1.pl @@ -414,32 +495,28 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/multibibliography/multibibliography.pl %%TEXMFDISTDIR%%/scripts/musixtex/musixflx.lua %%TEXMFDISTDIR%%/scripts/musixtex/musixtex.lua -%%TEXMFDISTDIR%%/scripts/oberdiek/pdfatfi.pl %%TEXMFDISTDIR%%/scripts/pax/pdfannotextractor.pl +%%TEXMFDISTDIR%%/scripts/pdfbook2/pdfbook2 %%TEXMFDISTDIR%%/scripts/pdfcrop/pdfcrop.pl -%%TEXMFDISTDIR%%/scripts/pdfjam/pdf180 -%%TEXMFDISTDIR%%/scripts/pdfjam/pdf270 -%%TEXMFDISTDIR%%/scripts/pdfjam/pdf90 -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfbook -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfflip %%TEXMFDISTDIR%%/scripts/pdfjam/pdfjam -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfjam-pocketmod -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfjam-slides3up -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfjam-slides6up -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfjoin -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfnup -%%TEXMFDISTDIR%%/scripts/pdfjam/pdfpun +%%TEXMFDISTDIR%%/scripts/pdflatexpicscale/pdflatexpicscale.pl +%%TEXMFDISTDIR%%/scripts/pdftex-quiet/pdftex-quiet +%%TEXMFDISTDIR%%/scripts/pdfxup/pdfxup %%TEXMFDISTDIR%%/scripts/pedigree-perl/pedigree.pl %%TEXMFDISTDIR%%/scripts/perltex/perltex.pl +%%TEXMFDISTDIR%%/scripts/petri-nets/pn2pdf %%TEXMFDISTDIR%%/scripts/pfarrei/a5toa4.tlu %%TEXMFDISTDIR%%/scripts/pfarrei/pfarrei.tlu %%TEXMFDISTDIR%%/scripts/pkfix-helper/pkfix-helper %%TEXMFDISTDIR%%/scripts/pkfix/pkfix.pl -%%TEXMFDISTDIR%%/scripts/pmx/pmx2pdf.lua %%TEXMFDISTDIR%%/scripts/pmxchords/pmxchords.lua %%TEXMFDISTDIR%%/scripts/ps2eps/ps2eps.pl %%TEXMFDISTDIR%%/scripts/pst-pdf/ps4pdf %%TEXMFDISTDIR%%/scripts/pst2pdf/pst2pdf.pl +%%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap-sys.sh +%%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap-user.sh +%%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-config-updmap.pl +%%TEXMFDISTDIR%%/scripts/ptex-fontmaps/kanji-fontmap-creator.pl %%TEXMFDISTDIR%%/scripts/ptex2pdf/ptex2pdf.lua %%TEXMFDISTDIR%%/scripts/purifyeps/purifyeps %%TEXMFDISTDIR%%/scripts/pygmentex/pygmentex.py @@ -448,8 +525,10 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/rubik/rubikrotation.pl %%TEXMFDISTDIR%%/scripts/simpdftex/simpdftex %%TEXMFDISTDIR%%/scripts/splitindex/splitindex.pl +%%TEXMFDISTDIR%%/scripts/srcredact/srcredact.pl %%TEXMFDISTDIR%%/scripts/sty2dtx/sty2dtx.pl %%TEXMFDISTDIR%%/scripts/svn-multi/svn-multi.pl +%%TEXMFDISTDIR%%/scripts/tex4ebook/tex4ebook %%TEXMFDISTDIR%%/scripts/tex4ht/ht.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htcontext.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htlatex.sh @@ -459,6 +538,7 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/tex4ht/htxelatex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/htxetex.sh %%TEXMFDISTDIR%%/scripts/tex4ht/mk4ht.pl +%%TEXMFDISTDIR%%/scripts/tex4ht/xhlatex.sh %%TEXMFDISTDIR%%/scripts/texcount/texcount.pl %%TEXMFDISTDIR%%/scripts/texdef/texdef.pl %%TEXMFDISTDIR%%/scripts/texdiff/texdiff @@ -466,38 +546,51 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/texdoc/texdoc.tlu %%TEXMFDISTDIR%%/scripts/texdoctk/texdoctk.pl %%TEXMFDISTDIR%%/scripts/texfot/texfot.pl -%%TEXMFDISTDIR%%/scripts/texlive/allcm.sh -%%TEXMFDISTDIR%%/scripts/texlive/allneeded.sh -%%TEXMFDISTDIR%%/scripts/texlive/dvi2fax.sh -%%TEXMFDISTDIR%%/scripts/texlive/dvired.sh -%%TEXMFDISTDIR%%/scripts/texlive/e2pall.pl +%%TEXMFDISTDIR%%/scripts/texlive-extra/allcm.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/allneeded.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/dvi2fax.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/dvired.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/e2pall.pl +%%TEXMFDISTDIR%%/scripts/texlive-extra/fontinst.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/ps2frag.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/pslatex.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/rubibtex.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/rumakeindex.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-dialog.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-sys.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig.sh +%%TEXMFDISTDIR%%/scripts/texlive-extra/texlinks.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-sys.sh +%%TEXMFDISTDIR%%/scripts/texlive/fmtutil-user.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil.pl -%%TEXMFDISTDIR%%/scripts/texlive/fontinst.sh -%%TEXMFDISTDIR%%/scripts/texlive/ps2frag.sh -%%TEXMFDISTDIR%%/scripts/texlive/pslatex.sh -%%TEXMFDISTDIR%%/scripts/texlive/rubibtex.sh -%%TEXMFDISTDIR%%/scripts/texlive/rumakeindex.sh +%%TEXMFDISTDIR%%/scripts/texlive/mktexlsr +%%TEXMFDISTDIR%%/scripts/texlive/mktexmf +%%TEXMFDISTDIR%%/scripts/texlive/mktexpk +%%TEXMFDISTDIR%%/scripts/texlive/mktextfm %%TEXMFDISTDIR%%/scripts/texlive/rungs.tlu -%%TEXMFDISTDIR%%/scripts/texlive/texconfig-dialog.sh -%%TEXMFDISTDIR%%/scripts/texlive/texconfig-sys.sh -%%TEXMFDISTDIR%%/scripts/texlive/texconfig.sh -%%TEXMFDISTDIR%%/scripts/texlive/texlinks.sh %%TEXMFDISTDIR%%/scripts/texlive/updmap-sys.sh +%%TEXMFDISTDIR%%/scripts/texlive/updmap-user.sh %%TEXMFDISTDIR%%/scripts/texlive/updmap.pl %%TEXMFDISTDIR%%/scripts/texliveonfly/texliveonfly.py %%TEXMFDISTDIR%%/scripts/texloganalyser/texloganalyser +%%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre5.sh +%%TEXMFDISTDIR%%/scripts/texosquery/texosquery-jre8.sh +%%TEXMFDISTDIR%%/scripts/texosquery/texosquery.sh +%%TEXMFDISTDIR%%/scripts/texplate/texplate.sh %%TEXMFDISTDIR%%/scripts/thumbpdf/thumbpdf.pl +%%TEXMFDISTDIR%%/scripts/tlcockpit/tlcockpit.sh +%%TEXMFDISTDIR%%/scripts/tlshell/tlshell.tcl %%TEXMFDISTDIR%%/scripts/typeoutfileinfo/typeoutfileinfo.sh %%TEXMFDISTDIR%%/scripts/ulqda/ulqda.pl %%TEXMFDISTDIR%%/scripts/urlbst/urlbst %%TEXMFDISTDIR%%/scripts/vpe/vpe.pl +%%TEXMFDISTDIR%%/scripts/webquiz/webquiz.py +%%TEXMFDISTDIR%%/scripts/wordcount/wordcount.sh +%%TEXMFDISTDIR%%/scripts/xindex/xindex.lua %%TEXMFDISTDIR%%/scripts/yplan/yplan +%%TEXMFDISTDIR%%/texconfig/tcfmgr +%%TEXMFDISTDIR%%/texconfig/tcfmgr.map %%TEXMFDISTDIR%%/web2c/fmtutil.cnf -%%FMTUTIL_CNF%% -%%TEXMFCONFIGDIR%%/.keep_me -%%TEXMFCONFIGDIR%%/web2c/.keep_me -%%TEXMFVARDIR%%/.keep_me %%TEXMFLOCALDIR%%/.keep_me +%%TEXMFVARDIR%%/.keep_me %%TEXMFDIR%%/.keep_me -%%TEXMFDISTDIR%%/.keep_me diff --git print/texlive-tlmgr/Makefile print/texlive-tlmgr/Makefile index f4e6909029bf..dc426401ac8a 100644 --- print/texlive-tlmgr/Makefile +++ print/texlive-tlmgr/Makefile @@ -1,24 +1,23 @@ # $FreeBSD$ PORTNAME= texlive -PORTVERSION= 20150523 -PORTREVISION= 2 +PORTVERSION= 20200406 +PORTREVISION= 1 CATEGORIES= print perl5 -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/:tlmgr \ - LOCAL/hrs:tlpkg +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ PKGNAMESUFFIX= -tlmgr -DISTFILES= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}:tlmgr \ - ${PORTNAME}-20150521-source${EXTRACT_SUFX}:tlmgr \ - ${TLPKG_FILE}.xz:tlpkg +DISTFILES= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX} \ + ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ + ${TLPKG_FILE}.tar.gz DIST_SUBDIR= TeX EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX} MAINTAINER= hrs@FreeBSD.org COMMENT= TeXLive manager modules -RUN_DEPENDS= tex-kpathsea>=6.2.1_1:devel/tex-kpathsea +RUN_DEPENDS= tex-kpathsea>=6.3.2_1:devel/tex-kpathsea -CONFLICTS= texlive-infra-[0-9]* texlive-base-20150521_[12345] +CONFLICTS= texlive-base-20150521_[12345] USES= perl5 tar:xz USE_PERL5= run @@ -26,20 +25,20 @@ USE_TEX= kpathsea PATCH_WRKSRC= ${WRKDIR} NO_BUILD= yes -TLPKG_FILE= ${PORTNAME}-20150924.tlpdb +TLPKG_FILE= ${PORTNAME}-${PORTVERSION}-tlpdb-full EXTRACT_AFTER_ARGS_SOURCE= \ | ${TAR} -xf - -C ${WRKDIR} \ --no-same-permission --no-same-owner \ - ${PORTNAME}-20150521-source/texk/texlive/linked_scripts/texlive + ${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive post-extract: - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-20150521-source${EXTRACT_SUFX} \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_SOURCE} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive ${INSTALL_SCRIPT} \ - ${WRKDIR}/${PORTNAME}-20150521-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \ + ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source/texk/texlive/linked_scripts/texlive/tlmgr.pl \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/scripts/texlive cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -s ../${TEXMFDISTDIR}/scripts/texlive/tlmgr.pl tlmgr @@ -50,8 +49,8 @@ do-install: ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/.texlive-tlmgr ${MKDIR} ${STAGEDIR}/var/db/tlpkg ${TOUCH} ${STAGEDIR}/var/db/tlpkg/tlmgr.log - ${XZCAT} ${DISTDIR}/${DIST_SUBDIR}/${TLPKG_FILE}.xz \ - > ${STAGEDIR}/var/db/tlpkg/texlive.tlpdb + ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${TLPKG_FILE}.tar.gz -C \ + ${STAGEDIR}/var/db/tlpkg/ texlive.tlpdb ${INSTALL_DATA} ${LOCALBASE}/share/texmf-dist/web2c/texmf.cnf \ ${STAGEDIR}/var/db/tlpkg ${MKDIR} ${STAGEDIR}/var/db/tlpkg/backups diff --git print/texlive-tlmgr/distinfo print/texlive-tlmgr/distinfo index 924b8c26cb64..9093dd674a33 100644 --- print/texlive-tlmgr/distinfo +++ print/texlive-tlmgr/distinfo @@ -1,6 +1,7 @@ -SHA256 (TeX/texlive-20150523-extra.tar.xz) = d1282d91943ead1f7c50345c475115aab5459f003cec9eaad80122f5988270b6 -SIZE (TeX/texlive-20150523-extra.tar.xz) = 369436 -SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 -SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552 -SHA256 (TeX/texlive-20150924.tlpdb.xz) = 827e4a9446c5657d6714ef5b9be81fad5731b47d9b1b58df7eacc922aca9fb30 -SIZE (TeX/texlive-20150924.tlpdb.xz) = 1112660 +TIMESTAMP = 1609514458 +SHA256 (TeX/texlive-20200406-extra.tar.xz) = 243dfd2b263b7ffcd8b5c0269a28deecb394f0f5644a288186f562cbacc8a64f +SIZE (TeX/texlive-20200406-extra.tar.xz) = 1668664 +SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320 +SHA256 (TeX/texlive-20200406-tlpdb-full.tar.gz) = 2990a8d275506c297b2239a1b4c5d9a9ec0d18cf12ff9a6a33924cf2e3838ed4 +SIZE (TeX/texlive-20200406-tlpdb-full.tar.gz) = 2947135 diff --git print/texlive-tlmgr/files/patch-texlive-20150523-extra-tlpkg-TeXLive-TLUtils.pm print/texlive-tlmgr/files/patch-texlive-20200406-extra_tlpkg_TeXLive_TLUtils.pm similarity index 80% rename from print/texlive-tlmgr/files/patch-texlive-20150523-extra-tlpkg-TeXLive-TLUtils.pm rename to print/texlive-tlmgr/files/patch-texlive-20200406-extra_tlpkg_TeXLive_TLUtils.pm index be5d2e9bb81f..22a58f7117a6 100644 --- print/texlive-tlmgr/files/patch-texlive-20150523-extra-tlpkg-TeXLive-TLUtils.pm +++ print/texlive-tlmgr/files/patch-texlive-20200406-extra_tlpkg_TeXLive_TLUtils.pm @@ -1,6 +1,6 @@ ---- texlive-20150523-extra/tlpkg/TeXLive/TLUtils.pm.orig 2015-05-06 20:30:33 UTC -+++ texlive-20150523-extra/tlpkg/TeXLive/TLUtils.pm -@@ -228,22 +228,14 @@ subsequent calls just return that value. +--- texlive-20200406-extra/tlpkg/TeXLive/TLUtils.pm.orig 2021-01-01 16:36:04 UTC ++++ texlive-20200406-extra/tlpkg/TeXLive/TLUtils.pm +@@ -251,22 +251,14 @@ subsequent calls just return that value. sub platform { unless (defined $::_platform_) { @@ -24,7 +24,7 @@ + $uname_r =~ s/-.*$//; + $uname_s = lc($uname_s); + $guessed_platform = sprintf("%s-unknown-%s%s", $uname_m, -+ $uname_s, $uname_r); ++ $uname_s, $uname_r); $::_platform_ = platform_name($guessed_platform); - } } diff --git print/texlive-tlmgr/files/patch-texlive-20150521-source-texk-texlive-linked_scripts-texlive-tlmgr.pl print/texlive-tlmgr/files/patch-texlive-20200406-source_texk_texlive_linked__scripts_texlive_tlmgr.pl similarity index 68% rename from print/texlive-tlmgr/files/patch-texlive-20150521-source-texk-texlive-linked_scripts-texlive-tlmgr.pl rename to print/texlive-tlmgr/files/patch-texlive-20200406-source_texk_texlive_linked__scripts_texlive_tlmgr.pl index 0c9aaae4e3a0..08a55fa9d26d 100644 --- print/texlive-tlmgr/files/patch-texlive-20150521-source-texk-texlive-linked_scripts-texlive-tlmgr.pl +++ print/texlive-tlmgr/files/patch-texlive-20200406-source_texk_texlive_linked__scripts_texlive_tlmgr.pl @@ -1,15 +1,15 @@ ---- texlive-20150521-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2015-05-11 21:37:36 UTC -+++ texlive-20150521-source/texk/texlive/linked_scripts/texlive/tlmgr.pl -@@ -72,7 +72,7 @@ BEGIN { +--- texlive-20200406-source/texk/texlive/linked_scripts/texlive/tlmgr.pl.orig 2021-01-01 16:38:37 UTC ++++ texlive-20200406-source/texk/texlive/linked_scripts/texlive/tlmgr.pl +@@ -74,7 +74,7 @@ BEGIN { } if (-r "$bindir/$kpsewhichname") { # if not in bootstrapping mode => kpsewhich exists, so use it to get $Master - chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`); + chomp($Master = `kpsewhich -var-value=TEXMFROOT`); } - $::installerdir = $Master; -@@ -581,13 +581,16 @@ for the full story.\n"; + # if we have no directory in which to find our modules, +@@ -635,13 +635,16 @@ for the full story.\n"; # besides doing normal logging if -logfile is specified, we try to log # package related actions (install, remove, update) to # the package-log file TEXMFSYSVAR/web2c/tlmgr.log @@ -27,27 +27,29 @@ } # # Try to open the packagelog file, but do NOT die when that does not work -@@ -650,8 +653,8 @@ sub give_version { - if (!defined($::version_string)) { - $::version_string = ""; - $::version_string .= "tlmgr revision $tlmgrrevision\n"; +@@ -713,9 +716,9 @@ sub give_version { + $::mrversion = ""; + $::version_string .= "tlmgr revision $tlmgrversion\n"; + $::mrversion .= "revision $tlmgrrevision\n"; - $::version_string .= "tlmgr using installation: $Master\n"; +- $::mrversion .= "installation $Master\n"; - if (open (REL_TL, "$Master/release-texlive.txt")) { + $::version_string .= "tlmgr using installation: $Master/tlpkg\n"; ++ $::mrversion .= "installation $Master/tlpkg\n"; + if (open (REL_TL, "$Master/tlpkg/release-texlive.txt")) { - # print first and last lines, which have the TL version info. - my @rel_tl = ; - $::version_string .= $rel_tl[0]; -@@ -2085,7 +2088,7 @@ sub write_w32_updater { + # print first, which has the TL version info. + my $rel_tl = ; + $::version_string .= $rel_tl; +@@ -2252,7 +2255,7 @@ sub write_w32_updater { my $opt_src = $localtlpdb->option("install_srcfiles"); my $opt_doc = $localtlpdb->option("install_docfiles"); my $root = $localtlpdb->root; - my $temp = "$root/temp"; + my $temp = "$root/tlpkg/temp"; TeXLive::TLUtils::mkdirhier($temp); - tlwarn("Backup option not implemented for infrastructure update.\n") if ($opts{"backup"}); + tlwarn("$prg: Backup option not implemented for infrastructure update.\n") if ($opts{"backup"}); if ($media eq 'local_uncompressed') { -@@ -4663,19 +4666,19 @@ sub action_uninstall { +@@ -5235,21 +5238,21 @@ sub uninstall_texlive { system("rm", "-rf", "$Master/texmf-var"); system("rm", "-rf", "$Master/tlpkg"); system("rm", "-rf", "$Master/bin"); @@ -55,8 +57,9 @@ - system("rm", "-rf", "$Master/readme-txt.dir"); + system("rm", "-rf", "$Master/tlpkg/readme-html.dir"); + system("rm", "-rf", "$Master/tlpkg/readme-txt.dir"); - for my $f (qw/doc.html index.html LICENSE.CTAN LICENSE.TL README - README.usergroups release-texlive.txt texmf.cnf/) { + for my $f (qw/doc.html index.html install-tl + LICENSE.CTAN LICENSE.TL README README.usergroups + release-texlive.txt texmf.cnf texmfcnf.lua/) { - system("rm", "-f", "$Master/$f"); + system("rm", "-f", "$Master/tlpkg/$f"); } @@ -67,7 +70,8 @@ } - unlink("$Master/install-tl.log"); + unlink("$Master/tlpkg/install-tl.log"); - # should we do that???? + # if they want removal, give them removal. Hopefully they know how to + # regenerate any changed config files. - system("rm", "-rf", "$Master/texmf-config"); - system("rmdir", "--ignore-fail-on-non-empty", "$Master"); + # system("rm", "-rf", "$Master/texmf-config"); @@ -75,10 +79,10 @@ } -@@ -5466,7 +5469,7 @@ sub action_conf { +@@ -6150,7 +6153,7 @@ sub action_conf { $fn || ( $fn = "$TEXMFCONFIG/tlmgr/config" ) ; $cf = TeXLive::TLConfFile->new($fn, "#", "="); - } elsif ($arg eq "texmf") { + } elsif ($arg eq "texmf" || $arg eq "auxtrees") { - $fn || ( $fn = "$Master/texmf.cnf" ) ; + $fn || ( $fn = "$Master/tlpkg/texmf.cnf" ) ; $cf = TeXLive::TLConfFile->new($fn, "[%#]", "="); diff --git print/texlive-tlmgr/pkg-plist print/texlive-tlmgr/pkg-plist index 2d6be1845131..05605a1e8a23 100644 --- print/texlive-tlmgr/pkg-plist +++ print/texlive-tlmgr/pkg-plist @@ -1,7 +1,7 @@ bin/tlmgr -share/tlpkg %%SITE_PERL%%/TeXLive/TLConfFile.pm %%SITE_PERL%%/TeXLive/TLConfig.pm +%%SITE_PERL%%/TeXLive/TLCrypto.pm %%SITE_PERL%%/TeXLive/TLDownload.pm %%SITE_PERL%%/TeXLive/TLPDB.pm %%SITE_PERL%%/TeXLive/TLPOBJ.pm @@ -13,6 +13,7 @@ share/tlpkg %%SITE_PERL%%/TeXLive/TeXCatalogue.pm %%TEXMFDISTDIR%%/.texlive-tlmgr %%TEXMFDISTDIR%%/scripts/texlive/tlmgr.pl +share/tlpkg /var/db/tlpkg/texlive.tlpdb /var/db/tlpkg/texmf.cnf /var/db/tlpkg/tlmgr.log