Page MenuHomeFreeBSD

D28227.id82876.diff
No OneTemporary

D28227.id82876.diff

Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -1112,12 +1112,8 @@
.if !defined(IGNORE_MASTER_SITE_TEX_CTAN)
MASTER_SITE_TEX_CTAN+= \
- http://ctan.unsw.edu.au/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
- ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
- ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
- ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ \
- ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/
+ http://ftp.math.utah.edu/pub/tex/historic/%SUBDIR%/ \
+ https://pi.kwarc.info/historic/%SUBDIR%/
.endif
# Derived from: https://www.torproject.org/getinvolved/mirrors.html.en
Index: Mk/bsd.tex.mk
===================================================================
--- Mk/bsd.tex.mk
+++ Mk/bsd.tex.mk
@@ -156,7 +156,7 @@
_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 @@
_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) || \
Index: devel/tex-kpathsea/Makefile
===================================================================
--- devel/tex-kpathsea/Makefile
+++ devel/tex-kpathsea/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= kpathsea
-PORTVERSION= 6.2.1
-PORTREVISION= 2
+PORTVERSION= 6.3.2
CATEGORIES= devel
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-20200406-source
DIST_SUBDIR= TeX
MAINTAINER= hrs@FreeBSD.org
@@ -20,7 +19,8 @@
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux \
texk/kpathsea \
- texk/texlive/tl_scripts
+ texk/texlive/linked_scripts/texlive-extra \
+ texk/texlive/tl_support
WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
@@ -28,12 +28,11 @@
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 \
- ${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \
- done; \
+ done;
+ cd ${WRKDIR}/${DISTNAME}/texk/texlive/tl_support && \
for l in kpsexpand kpsepath; do \
${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \
${LN} -sf kpsetool.1 ${STAGEDIR}${MANPREFIX}/man/man1/$${l}.1; \
Index: devel/tex-kpathsea/distinfo
===================================================================
--- 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 = 1611148808
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: devel/tex-kpathsea/files/patch-Makefile.in
===================================================================
--- devel/tex-kpathsea/files/patch-Makefile.in
+++ devel/tex-kpathsea/files/patch-Makefile.in
@@ -1,84 +1,48 @@
---- Makefile.in.orig 2015-03-16 07:52:01 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)" \
+--- Makefile.in 2021-01-25 21:08:00.017585000 +0100
++++ ../../../texlive-20200406-source/texk/kpathsea/Makefile.in 2021-01-25 21:46:10.405322000 +0100
+@@ -141,8 +141,8 @@
+ CONFIG_CLEAN_FILES = kpathsea.pc
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
-+ "$(DESTDIR)$(web2cdir)" \
+- "$(DESTDIR)$(kpseincludedir)"
+ "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
-@@ -306,7 +306,7 @@ am__can_run_installinfo = \
++ "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -364,8 +364,8 @@
*) (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) \
+- $(noinst_HEADERS)
+HEADERS = $(kpseinclude_HEADERS) \
- $(nodist_kpselib_HEADERS) $(noinst_HEADERS)
++ $(nodist_kpseinclude_HEADERS) $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -717,12 +717,12 @@ libkpathsea_la_SOURCES = tex-file.c abso
+ am__recursive_targets = \
+@@ -776,10 +776,10 @@
+ xstrdup.c $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_7)
kpseincludedir = ${includedir}/kpathsea
- nodist_kpseinclude_HEADERS = \
- kpathsea.h \
+-nodist_kpseinclude_HEADERS = \
+- c-auto.h \
+- kpathsea.h \
- paths.h
-+ paths.h \
-+ c-auto.h
++#nodist_kpseinclude_HEADERS = \
++# c-auto.h \
++# kpathsea.h \
++# paths.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 @@
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\A0-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\A0-f '$(DESTDIR)$(web2cdir)/$$f'"; \
-+ echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
- rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
- else :; fi; \
- done
Index: devel/tex-kpathsea/files/patch-texmf.cnf
===================================================================
--- 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 2020-01-16 23:02:50.000000000 +0100
++++ texmf.cnf 2021-01-24 01:44:13.501842000 +0100
+@@ -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 @@
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-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 @@
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 @@
% 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 @@
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
Index: devel/tex-kpathsea/pkg-plist
===================================================================
--- devel/tex-kpathsea/pkg-plist
+++ devel/tex-kpathsea/pkg-plist
@@ -73,6 +73,6 @@
lib/libkpathsea.a
lib/libkpathsea.so
lib/libkpathsea.so.6
-lib/libkpathsea.so.6.2.1
+lib/libkpathsea.so.6.3.2
libdata/pkgconfig/kpathsea.pc
%%TEXMFDISTDIR%%/web2c/texmf.cnf
Index: devel/tex-libtexlua/Makefile
===================================================================
--- devel/tex-libtexlua/Makefile
+++ devel/tex-libtexlua/Makefile
@@ -3,9 +3,9 @@
PORTNAME= libtexlua
PORTVERSION= 5.2.4
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-20200406-source
DIST_SUBDIR= TeX
MAINTAINER= hrs@FreeBSD.org
Index: devel/tex-libtexlua/distinfo
===================================================================
--- devel/tex-libtexlua/distinfo
+++ devel/tex-libtexlua/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1611148809
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: devel/tex-libtexluajit/Makefile
===================================================================
--- devel/tex-libtexluajit/Makefile
+++ devel/tex-libtexluajit/Makefile
@@ -3,9 +3,9 @@
PORTNAME= libtexluajit
PORTVERSION= 2.0.3
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-20200406-source
DIST_SUBDIR= TeX
MAINTAINER= hrs@FreeBSD.org
Index: devel/tex-libtexluajit/distinfo
===================================================================
--- devel/tex-libtexluajit/distinfo
+++ devel/tex-libtexluajit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1611148810
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: devel/tex-synctex/Makefile
===================================================================
--- devel/tex-synctex/Makefile
+++ devel/tex-synctex/Makefile
@@ -4,9 +4,9 @@
PORTVERSION= 1.17.0
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-20200406-source
DIST_SUBDIR= TeX
MAINTAINER= hrs@FreeBSD.org
Index: devel/tex-synctex/distinfo
===================================================================
--- devel/tex-synctex/distinfo
+++ devel/tex-synctex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1611148811
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: devel/tex-web2c/Makefile
===================================================================
--- devel/tex-web2c/Makefile
+++ devel/tex-web2c/Makefile
@@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= web2c
-PORTVERSION= 20150521
-PORTREVISION= 3
+PORTVERSION= 20200406
CATEGORIES= devel
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${PORTVERSION}-source
DIST_SUBDIR= TeX
Index: devel/tex-web2c/distinfo
===================================================================
--- 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 = 1611148812
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: japanese/tex-ptex/Makefile
===================================================================
--- japanese/tex-ptex/Makefile
+++ japanese/tex-ptex/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 3.6
PORTREVISION= 1
CATEGORIES= japanese print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= ja-tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -26,8 +26,8 @@
| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
--strip-components 1 --no-same-permission --no-same-owner \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE= 20150521
-DISTVERSION_TEXLIVE_TEXMF= 20150523
+DISTVERSION_TEXLIVE_SOURCE= 20200406
+DISTVERSION_TEXLIVE_TEXMF= 20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/doc/ptex \
Index: japanese/tex-ptex/distinfo
===================================================================
--- japanese/tex-ptex/distinfo
+++ japanese/tex-ptex/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148838
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-aleph/Makefile
===================================================================
--- print/tex-aleph/Makefile
+++ print/tex-aleph/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 1.15.2.1.r.4
PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -30,8 +30,8 @@
EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
--strip-components 1 --no-same-permission --no-same-owner \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE= 20150521
-DISTVERSION_TEXLIVE_TEXMF= 20150523
+DISTVERSION_TEXLIVE_SOURCE= 20200406
+DISTVERSION_TEXLIVE_TEXMF= 20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/tex/plain/config/aleph.ini \
Index: print/tex-aleph/distinfo
===================================================================
--- print/tex-aleph/distinfo
+++ print/tex-aleph/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148864
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-basic-engines/Makefile
===================================================================
--- print/tex-basic-engines/Makefile
+++ print/tex-basic-engines/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= basic-engines
-PORTVERSION= 20150521
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DIST_SUBDIR= TeX
+DISTVERSION_TEXLIVE_SOURCE= 20200406
MAINTAINER= hrs@FreeBSD.org
COMMENT= Basic TeX Engines
@@ -14,7 +15,7 @@
LIB_DEPENDS= libpng.so:graphics/png
USES= pkgconfig libtool tar:xz
-USE_TEX= kpathsea web2c>=20150521_1
+USE_TEX= kpathsea web2c>=20200406
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux \
libs/xpdf \
Index: print/tex-basic-engines/distinfo
===================================================================
--- print/tex-basic-engines/distinfo
+++ print/tex-basic-engines/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+TIMESTAMP = 1611148865
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: print/tex-dvipdfmx/Makefile
===================================================================
--- print/tex-dvipdfmx/Makefile
+++ print/tex-dvipdfmx/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= dvipdfmx
-PORTVERSION= 20150315
-PORTREVISION= 1
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -35,8 +34,8 @@
--strip-components 1 --no-same-permission --no-same-owner \
${EXCLUDE_FILES_TEXMF:S,^,--exclude ${DISTNAME_TEXMF}/,} \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE= 20150521
-DISTVERSION_TEXLIVE_TEXMF= 20150523
+DISTVERSION_TEXLIVE_SOURCE= 20200406
+DISTVERSION_TEXLIVE_TEXMF= 20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXCLUDE_FILES_TEXMF= \
texmf-dist/fonts/map/dvipdfmx/jfontmaps \
Index: print/tex-dvipdfmx/distinfo
===================================================================
--- print/tex-dvipdfmx/distinfo
+++ print/tex-dvipdfmx/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148890
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-dvipsk/Makefile
===================================================================
--- print/tex-dvipsk/Makefile
+++ print/tex-dvipsk/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 5.995
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -33,8 +33,8 @@
--strip-components 1 --no-same-permission --no-same-owner \
${EXCLUDE_FILES:S,^,--exclude ,} \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE= 20150521
-DISTVERSION_TEXLIVE_TEXMF= 20150523
+DISTVERSION_TEXLIVE_SOURCE= 20200406
+DISTVERSION_TEXLIVE_TEXMF= 20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/doc/dvips/ \
Index: print/tex-dvipsk/distinfo
===================================================================
--- print/tex-dvipsk/distinfo
+++ print/tex-dvipsk/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148915
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-jadetex/Makefile
===================================================================
--- print/tex-jadetex/Makefile
+++ print/tex-jadetex/Makefile
@@ -4,15 +4,17 @@
PORTVERSION= 3.13
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150523-texmf
+DISTNAME= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
DIST_SUBDIR= TeX
EXTRACT_ONLY=
MAINTAINER= hrs@FreeBSD.org
COMMENT= TeX backend for Jade, DSSSL processor for SGML/XML documents
+DISTVERSION_TEXLIVE_TEXMF= 20200406
+
USES= tar:xz
USE_TEX= texmf pdftex xmltex fmtutil
TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR}
Index: print/tex-jadetex/distinfo
===================================================================
--- print/tex-jadetex/distinfo
+++ print/tex-jadetex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148941
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-luatex/Makefile
===================================================================
--- print/tex-luatex/Makefile
+++ print/tex-luatex/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 0.80.0
PORTREVISION= 23
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -35,8 +35,8 @@
EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
--strip-components 1 --no-same-permission --no-same-owner \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE= 20150521
-DISTVERSION_TEXLIVE_TEXMF= 20150523
+DISTVERSION_TEXLIVE_SOURCE= 20200406
+DISTVERSION_TEXLIVE_TEXMF= 20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/doc/lualatex \
Index: print/tex-luatex/distinfo
===================================================================
--- print/tex-luatex/distinfo
+++ print/tex-luatex/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148968
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-ptexenc/Makefile
===================================================================
--- print/tex-ptexenc/Makefile
+++ print/tex-ptexenc/Makefile
@@ -4,9 +4,9 @@
PORTVERSION= 1.3.3
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150521-source
+DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DIST_SUBDIR= TeX
MAINTAINER= hrs@FreeBSD.org
@@ -15,6 +15,8 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+DISTVERSION_TEXLIVE_TEXMF= 20200406
+
USES= iconv libtool pathfix pkgconfig tar:xz
USE_TEX= kpathsea
USE_LDCONFIG= yes
Index: print/tex-ptexenc/distinfo
===================================================================
--- 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 = 1611148969
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: print/tex-xetex/Makefile
===================================================================
--- print/tex-xetex/Makefile
+++ print/tex-xetex/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 0.99992
PORTREVISION= 40
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -38,8 +38,8 @@
| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
--strip-components 1 --no-same-permission --no-same-owner \
${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXLIVE_SOURCE=20150521
-DISTVERSION_TEXLIVE_TEXMF=20150523
+DISTVERSION_TEXLIVE_SOURCE=20200406
+DISTVERSION_TEXLIVE_TEXMF=20200406
DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/doc/xelatex \
Index: print/tex-xetex/distinfo
===================================================================
--- print/tex-xetex/distinfo
+++ print/tex-xetex/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611148999
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/tex-xmltex/Makefile
===================================================================
--- print/tex-xmltex/Makefile
+++ print/tex-xmltex/Makefile
@@ -4,15 +4,17 @@
PORTVERSION= 1.9
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMEPREFIX= tex-
-DISTNAME= texlive-20150523-texmf
+DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
DIST_SUBDIR= TeX
EXTRACT_ONLY=
MAINTAINER= hrs@FreeBSD.org
COMMENT= Non-validating XML parser, written in TeX
+DISTVERSION_TEXLIVE_TEXMF= 20200406
+
USES= tar:xz
USE_TEX= texmf pdftex fmtutil
TEXHASHDIRS= ${TEXMFDISTDIR}
Index: print/tex-xmltex/distinfo
===================================================================
--- print/tex-xmltex/distinfo
+++ print/tex-xmltex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611150474
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/texlive-base/Makefile
===================================================================
--- print/texlive-base/Makefile
+++ print/texlive-base/Makefile
@@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= texlive
-PORTVERSION= 20150521
-PORTREVISION= 61
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= TEX_CTAN/systems/texlive/Source/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMESUFFIX= -base
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
DIST_SUBDIR= TeX
@@ -51,7 +50,6 @@
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 \
@@ -102,7 +100,7 @@
MAKE_ENV= CONFIG_SITE=${CONFIG_SITE}
INSTALL_TARGET= install-strip
-CONFLICTS_INSTALL= ps2eps texlive-texmf-201[234]*
+CONFLICTS_INSTALL= ps2eps texlive-texmf-201[2345]*
EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,}
INFO= dvipng tlbuild
PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}"
@@ -126,7 +124,7 @@
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 \
Index: print/texlive-base/distinfo
===================================================================
--- 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 = 1611149001
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
Index: print/texlive-base/files/patch-Makefile.in
===================================================================
--- print/texlive-base/files/patch-Makefile.in
+++ print/texlive-base/files/patch-Makefile.in
@@ -1,5 +1,6 @@
---- Makefile.in.orig 2015-07-23 10:46:25.620611000 +0900
-+++ Makefile.in 2015-07-23 10:46:40.645948000 +0900
+diff -urN texlive-20200406-source.orig/Makefile.in texlive-20200406-source/Makefile.in
+--- Makefile.in 2021-01-17 15:39:35.619785000 +0100
++++ Makefile.in 2021-01-18 14:52:59.765184000 +0100
@@ -487,7 +487,7 @@
NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
Index: print/texlive-base/files/patch-configure
===================================================================
--- print/texlive-base/files/patch-configure
+++ print/texlive-base/files/patch-configure
@@ -1,6 +1,7 @@
---- configure.orig 2015-04-12 11:22:39 UTC
-+++ configure
-@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib
+diff -urN texlive-20200406-source.orig/configure texlive-20200406-source/configure
+--- configure 2021-01-17 15:39:35.627822000 +0100
++++ configure 2021-01-18 15:16:58.316970000 +0100
+@@ -5901,7 +5901,16 @@
as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
fi
fi
@@ -8,15 +9,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 @@
as_fn_error $? "did not find graphite2" "$LINENO" 5
fi
@@ -33,4 +35,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
Index: print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
+++ print/texlive-base/files/patch-texk-bibtex-x-Makefile.in
@@ -1,30 +1,32 @@
---- texk/bibtex-x/Makefile.in.orig 2015-03-12 14:42:02 UTC
-+++ texk/bibtex-x/Makefile.in
-@@ -121,8 +121,7 @@ CONFIG_CLEAN_FILES =
+diff -urN texlive-20200406-source.orig/texk/bibtex-x/Makefile.in texlive-20200406-source/texk/bibtex-x/Makefile.in
+--- texk/bibtex-x/Makefile.in 2021-01-17 15:39:29.738130000 +0100
++++ texk/bibtex-x/Makefile.in 2021-01-18 01:11:49.028277000 +0100
+@@ -121,8 +121,7 @@
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: 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-am:
--install-data-am: install-dist_btdocDATA install-dist_csfDATA
-+install-data-am: install-dist_csfDATA
+-install-data-am: install-dist_btdocDATA install-dist_csfDATA \
+- install-man
++install-data-am: install-dist_csfDATA install-man
install-dvi: install-dvi-am
Index: print/texlive-base/files/patch-texk-chktex-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-chktex-Makefile.in
+++ print/texlive-base/files/patch-texk-chktex-Makefile.in
@@ -1,6 +1,7 @@
---- texk/chktex/Makefile.in.orig 2015-04-13 09:45:32 UTC
-+++ texk/chktex/Makefile.in
-@@ -119,10 +119,8 @@ mkinstalldirs = $(install_sh) -d
+diff -urN texlive-20200406-source.orig/texk/chktex/Makefile.in texlive-20200406-source/texk/chktex/Makefile.in
+--- texk/chktex/Makefile.in 2021-01-17 15:39:32.931332000 +0100
++++ texk/chktex/Makefile.in 2021-01-18 15:24:11.493668000 +0100
+@@ -125,10 +125,8 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = ChkTeX.t deweb.pl
CONFIG_CLEAN_VPATH_FILES =
@@ -13,7 +14,7 @@
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: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
installdirs:
@@ -22,7 +23,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -1469,9 +1467,7 @@ info: info-am
+@@ -1495,9 +1493,7 @@
info-am:
Index: print/texlive-base/files/patch-texk-cjkutils-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-cjkutils-Makefile.in
+++ print/texlive-base/files/patch-texk-cjkutils-Makefile.in
@@ -1,6 +1,7 @@
---- texk/cjkutils/Makefile.in.orig 2015-03-12 14:42:02 UTC
-+++ texk/cjkutils/Makefile.in
-@@ -121,7 +121,7 @@ CONFIG_CLEAN_FILES =
+diff -urN texlive-20200406-source.orig/texk/cjkutils/Makefile.in texlive-20200406-source/texk/cjkutils/Makefile.in
+--- texk/cjkutils/Makefile.in 2021-01-17 15:39:31.754046000 +0100
++++ texk/cjkutils/Makefile.in 2021-01-18 15:26:58.876074000 +0100
+@@ -121,7 +121,7 @@
CONFIG_CLEAN_VPATH_FILES =
@WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
@@ -9,7 +10,7 @@
PROGRAMS = $(bin_PROGRAMS)
bg5conv_SOURCES = bg5conv.c
bg5conv_OBJECTS = bg5conv.$(OBJEXT)
-@@ -1412,7 +1412,7 @@ check: check-am
+@@ -1427,7 +1427,7 @@
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \
all-local
installdirs:
@@ -18,7 +19,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -1477,7 +1477,7 @@ info: info-am
+@@ -1501,7 +1501,7 @@
info-am:
Index: 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
+++ /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>
Index: 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
+++ /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>
Index: 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
+++ /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"
Index: 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
+++ /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>
Index: print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-FileFinder.cpp
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-FileFinder.cpp
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp texlive-20200406-source/texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp
+--- texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp 2021-01-17 15:39:34.501570000 +0100
++++ texk/dvisvgm/dvisvgm-src/src/FileFinder.cpp 2021-01-18 15:37:25.661604000 +0100
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+
+ #include <config.h>
++#include <sys/time.h>
+ #ifdef MIKTEX
+ #include "MiKTeXCom.hpp"
+ #include "utility.hpp"
Index: print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-Font.cpp
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-Font.cpp
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/dvisvgm/dvisvgm-src/src/Font.cpp texlive-20200406-source/texk/dvisvgm/dvisvgm-src/src/Font.cpp
+--- texk/dvisvgm/dvisvgm-src/src/Font.cpp 2021-01-17 15:39:34.585271000 +0100
++++ texk/dvisvgm/dvisvgm-src/src/Font.cpp 2021-01-18 15:38:44.347522000 +0100
+@@ -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>
Index: print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-FontEncoding.cpp
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-FontEncoding.cpp
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp texlive-20200406-source/texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp
+--- texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp 2021-01-17 15:39:34.586504000 +0100
++++ texk/dvisvgm/dvisvgm-src/src/FontEncoding.cpp 2021-01-18 15:39:33.429220000 +0100
+@@ -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"
Index: print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-Message.cpp
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-dvisvgm-dvisvgm-2.9.1-src-Message.cpp
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/dvisvgm/dvisvgm-src/src/Message.cpp texlive-20200406-source/texk/dvisvgm/dvisvgm-src/src/Message.cpp
+--- texk/dvisvgm/dvisvgm-src/src/Message.cpp 2021-01-17 15:39:34.491743000 +0100
++++ texk/dvisvgm/dvisvgm-src/src/Message.cpp 2021-01-18 15:40:15.355332000 +0100
+@@ -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>
Index: print/texlive-base/files/patch-texk-gsftopk-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-gsftopk-Makefile.in
+++ print/texlive-base/files/patch-texk-gsftopk-Makefile.in
@@ -1,6 +1,7 @@
---- texk/gsftopk/Makefile.in.orig 2015-03-12 14:42:02 UTC
-+++ texk/gsftopk/Makefile.in
-@@ -112,8 +112,7 @@ mkinstalldirs = $(install_sh) -d
+diff -urN texlive-20200406-source.orig/texk/gsftopk/Makefile.in texlive-20200406-source/texk/gsftopk/Makefile.in
+--- texk/gsftopk/Makefile.in 2021-01-17 15:39:33.748772000 +0100
++++ texk/gsftopk/Makefile.in 2021-01-18 15:43:06.863492000 +0100
+@@ -112,8 +112,7 @@
CONFIG_HEADER = c-auto.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -10,7 +11,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: check-am
all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
installdirs:
@@ -19,7 +20,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -875,7 +874,7 @@ info: info-am
+@@ -885,7 +884,7 @@
info-am:
Index: 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-2.104-libefont-cff.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-@@ -27,6 +27,7 @@
- #include <ctype.h>
- #include <efont/t1unparser.hh>
-
-+#undef static_assert
- #ifndef static_assert
- #define static_assert(c, msg) switch ((int) (c)) case 0: case (c):
- #endif
Index: 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
+++ /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
Index: print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-Makefile.in
+++ print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-Makefile.in
@@ -1,6 +1,7 @@
---- 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
-@@ -163,8 +163,8 @@ am__uninstall_files_from_dir = { \
+diff -urN texlive-20200406-source.orig/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in texlive-20200406-source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
+--- texk/lcdf-typetools/lcdf-typetools-src/Makefile.in 2021-01-17 15:39:29.988584000 +0100
++++ texk/lcdf-typetools/lcdf-typetools-src/Makefile.in 2021-01-18 15:49:26.122123000 +0100
+@@ -163,8 +163,8 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
@@ -11,7 +12,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-am:
Index: print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-libefont-cff.cc
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-libefont-cff.cc
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc texlive-20200406-source/texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc
+--- texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc 2021-01-17 15:39:29.980045000 +0100
++++ texk/lcdf-typetools/lcdf-typetools-src/libefont/cff.cc 2021-01-18 15:49:59.892253000 +0100
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <efont/t1unparser.hh>
+
++#undef static_assert
+ #ifndef static_assert
+ #define static_assert(c, msg) switch ((int) (c)) case 0: case (c):
+ #endif
Index: print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-libefont-t1interp.cc
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-lcdf-typetools-lcdf-typetools-2.108-libefont-t1interp.cc
@@ -0,0 +1,10 @@
+--- texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc 2021-01-17 15:39:29.978070000 +0100
++++ texk/lcdf-typetools/lcdf-typetools-src/libefont/t1interp.cc 2021-01-18 15:50:24.727303000 +0100
+@@ -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
Index: print/texlive-base/files/patch-texk-texlive-linked_scripts-Makefile.in
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-texlive-linked_scripts-Makefile.in
@@ -0,0 +1,11 @@
+diff -urN texlive-20200406-source.orig/texk/texlive/linked_scripts/Makefile.in texlive-20200406-source/texk/texlive/linked_scripts/Makefile.in
+--- texk/texlive/linked_scripts/Makefile.in 2021-01-17 15:39:30.273172000 +0100
++++ texk/texlive/linked_scripts/Makefile.in 2021-01-18 15:52:30.208893000 +0100
+@@ -428,7 +428,6 @@
+ texlive/mktexpk \
+ texlive/mktextfm \
+ texlive/rungs.tlu \
+- texlive/tlmgr.pl \
+ texlive/updmap-sys.sh \
+ texlive/updmap-user.sh \
+ texlive/updmap.pl \
Index: print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-extra-texconfig-sys.sh
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-extra-texconfig-sys.sh
@@ -0,0 +1,9 @@
+diff -urN texlive-20200406-source.orig/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh texlive-20200406-source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh
+--- texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh 2021-01-17 15:39:30.437556000 +0100
++++ texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh 2021-01-18 16:06:43.691667000 +0100
+@@ -30,4 +30,4 @@
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+
+-exec texconfig ${1+"$@"}
++exec %%PREFIX%%/bin/texconfig ${1+"$@"}
Index: 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
+++ print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-fmtutil-sys.sh
@@ -1,6 +1,7 @@
---- 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
+diff -urN texlive-20200406-source.orig/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh texlive-20200406-source/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2021-01-17 15:39:30.366679000 +0100
++++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2021-01-18 15:53:36.332122000 +0100
+@@ -22,4 +22,4 @@
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
Index: 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
+++ print/texlive-base/files/patch-texk-texlive-linked_scripts-texlive-updmap-sys.sh
@@ -1,6 +1,7 @@
---- 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
+diff -urN texlive-20200406-source.orig/texk/texlive/linked_scripts/texlive/updmap-sys.sh texlive-20200406-source/texk/texlive/linked_scripts/texlive/updmap-sys.sh
+--- texk/texlive/linked_scripts/texlive/updmap-sys.sh 2021-01-17 15:39:30.366144000 +0100
++++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2021-01-18 15:53:59.474417000 +0100
+@@ -22,4 +22,4 @@
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
Index: print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
+++ print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in
@@ -1,69 +1,50 @@
---- 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 = { \
+diff -urN texlive-20200406-source.orig/texk/texlive/tl_support/Makefile.in texlive-20200406-source/texk/texlive/tl_support/Makefile.in
+--- texk/texlive/tl_support/Makefile.in 2021-01-17 15:39:30.529691000 +0100
++++ texk/texlive/tl_support/Makefile.in 2021-01-18 16:01:35.572074000 +0100
+@@ -126,7 +126,7 @@
|| { 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 = \
+-am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" \
++am__installdirs = "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \
+ "$(DESTDIR)$(web2cdir)"
+ SCRIPTS = $(dist_texconfig_SCRIPTS)
+@@ -255,8 +255,6 @@
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
+ mktexlsr.1 \
+ mktexmf.1 \
+ mktexpk.1 \
+@@ -272,8 +270,6 @@
man1_links = \
fmtutil:fmtutil-sys \
- kpsetool:kpsexpand \
- kpsetool:kpsepath \
fmtutil:mktexfmt \
+ mktexlsr:texhash \
texconfig:texconfig-sys \
- updmap:updmap-sys
-@@ -638,7 +629,7 @@ check-am: all-am
+@@ -534,7 +530,7 @@
check: check-am
- all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local
+ all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
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 \
+- for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
++ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -692,8 +683,8 @@ info: info-am
+@@ -587,8 +583,8 @@
info-am:
-install-data-am: install-dist_texconfigDATA \
-- install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
+- install-dist_texconfigSCRIPTS install-dist_web2cDATA \
+install-data-am: \
-+ install-dist_texmfSCRIPTS \
- install-dist_web2cDATA install-man
++ install-dist_web2cDATA \
+ install-man
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
Index: print/texlive-base/files/patch-texk-texlive-tl_support-fmtutil.cnf
===================================================================
--- /dev/null
+++ print/texlive-base/files/patch-texk-texlive-tl_support-fmtutil.cnf
@@ -0,0 +1,178 @@
+diff -urN texlive-20200406-source.orig/texk/texlive/tl_support/fmtutil.cnf texlive-20200406-source/texk/texlive/tl_support/fmtutil.cnf
+--- texk/texlive/tl_support/fmtutil.cnf 2021-01-17 15:39:30.527304000 +0100
++++ texk/texlive/tl_support/fmtutil.cnf 2021-01-18 16:04:55.544745000 +0100
+@@ -41,119 +41,119 @@
+ # 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
++#amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+ #
+ # from context:
+-cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
+-cont-en xetex cont-usr.tex -8bit *cont-en.mkii
++#cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
++#cont-en xetex cont-usr.tex -8bit *cont-en.mkii
+ #! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
+ #! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
+ #! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
+ #! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
+ #
+ # from cslatex:
+-cslatex pdftex - -etex cslatex.ini
+-pdfcslatex pdftex - -etex cslatex.ini
++#cslatex pdftex - -etex cslatex.ini
++#pdfcslatex pdftex - -etex cslatex.ini
+ #
+ # 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
+ #
+ # from eplain:
+-eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
++#eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
+ #
+ # from jadetex:
+-jadetex pdftex language.dat *jadetex.ini
+-pdfjadetex pdftex language.dat *pdfjadetex.ini
++#jadetex pdftex language.dat *jadetex.ini
++#pdfjadetex pdftex language.dat *pdfjadetex.ini
+ #
+ # from latex-bin:
+-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 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 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 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
++#luatex luatex language.def,language.dat.lua luatex.ini
++#dviluatex luatex language.def,language.dat.lua dviluatex.ini
+ #
+ # from metafont:
+-mf mf-nowin - -translate-file=cp227.tcx mf.ini
++#mf mf-nowin - -translate-file=cp227.tcx mf.ini
+ #
+ # from mex:
+-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
++#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
+-mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
++#mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini
++#mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
+ #
+ # 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
+-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
++#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
++#ptex ptex - ptex.ini
++#eptex eptex language.def *eptex.ini
+ #
+ # from tex:
+-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
+ #
+ # 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
++#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
+ #
+ # 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
Index: print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
===================================================================
--- print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
+++ print/texlive-base/files/patch-texk-ttf2pk2-Makefile.in
@@ -1,6 +1,7 @@
---- texk/ttf2pk2/Makefile.in.orig 2015-03-12 14:42:02 UTC
-+++ texk/ttf2pk2/Makefile.in
-@@ -115,9 +115,7 @@ mkinstalldirs = $(install_sh) -d
+diff -urN texlive-20200406-source.orig/texk/ttf2pk2/Makefile.in texlive-20200406-source/texk/ttf2pk2/Makefile.in
+--- texlive-texk/ttf2pk2/Makefile.in 2021-01-17 15:39:32.914161000 +0100
++++ texk/ttf2pk2/Makefile.in 2021-01-18 16:56:27.677314000 +0100
+@@ -115,9 +115,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -11,7 +12,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: check-am
all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
installdirs:
@@ -20,7 +21,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -1381,8 +1379,7 @@ info: info-am
+@@ -1416,8 +1414,7 @@
info-am:
Index: print/texlive-base/pkg-plist
===================================================================
--- print/texlive-base/pkg-plist
+++ print/texlive-base/pkg-plist
@@ -122,7 +122,6 @@
bin/ltx2crossrefxml
bin/ltxfileinfo
bin/ltximg
-bin/lua2dox_filter
bin/luaotfload-tool
bin/luatools
bin/m-tx
@@ -402,7 +401,6 @@
%%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/m-tx/m-tx.lua
%%TEXMFDISTDIR%%/scripts/match_parens/match_parens
@@ -466,6 +464,7 @@
%%TEXMFDISTDIR%%/scripts/texdoc/texdoc.tlu
%%TEXMFDISTDIR%%/scripts/texdoctk/texdoctk.pl
%%TEXMFDISTDIR%%/scripts/texfot/texfot.pl
+%%TEXMFDISTDIR%%/scripts/texlive-extra/texconfig-sys.sh
%%TEXMFDISTDIR%%/scripts/texlive/allcm.sh
%%TEXMFDISTDIR%%/scripts/texlive/allneeded.sh
%%TEXMFDISTDIR%%/scripts/texlive/dvi2fax.sh
@@ -480,7 +479,6 @@
%%TEXMFDISTDIR%%/scripts/texlive/rumakeindex.sh
%%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
Index: print/texlive-docs/Makefile
===================================================================
--- print/texlive-docs/Makefile
+++ print/texlive-docs/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= texlive
-PORTVERSION= 20150523
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= ftp://ftp.tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMESUFFIX= -docs
DISTNAME= ${PORTNAME}-${PORTVERSION}-texmf
DIST_SUBDIR= TeX
Index: print/texlive-docs/distinfo
===================================================================
--- print/texlive-docs/distinfo
+++ print/texlive-docs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611149027
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/texlive-texmf-source/Makefile
===================================================================
--- print/texlive-texmf-source/Makefile
+++ print/texlive-texmf-source/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= texlive
-PORTVERSION= 20150523
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= ftp://ftp.tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
PKGNAMESUFFIX= -texmf-source
DISTNAME= ${PORTNAME}-${PORTVERSION}-texmf
DIST_SUBDIR= TeX
@@ -11,10 +11,10 @@
MAINTAINER= hrs@FreeBSD.org
COMMENT= TeX Live Typesetting System, texmf Tree (source)
-CONFLICTS_INSTALL= texlive-base-201[234]*
+CONFLICTS_INSTALL= texlive-base-201[2345]*
USES= tar:xz
-USE_TEX= texmf>=20150523
+USE_TEX= texmf>=20200406
TEXHASHDIRS= ${TEXMFDISTDIR}
NO_BUILD= yes
Index: print/texlive-texmf-source/distinfo
===================================================================
--- print/texlive-texmf-source/distinfo
+++ print/texlive-texmf-source/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611149052
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
Index: print/texlive-texmf/Makefile
===================================================================
--- print/texlive-texmf/Makefile
+++ print/texlive-texmf/Makefile
@@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= texlive
-PORTVERSION= 20150523
-PORTREVISION= 4
+PORTVERSION= 20200406
CATEGORIES= print
-MASTER_SITES= ftp://ftp.tug.org/historic/systems/texlive/2015/:texmf \
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/:texmf \
LOCAL/hrs:latex
PKGNAMESUFFIX= -texmf
DISTFILES= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}${EXTRACT_SUFX}:texmf \
@@ -15,8 +14,8 @@
MAINTAINER= hrs@FreeBSD.org
COMMENT= TeX Live Typesetting System, texmf Tree
-CONFLICTS_INSTALL= texlive-base-201[234]* \
- texlive-texmf-201[234]*
+CONFLICTS_INSTALL= texlive-base-201[2345]* \
+ texlive-texmf-201[2345]*
USES= python:run shebangfix tar:xz
USE_TEX= basic:extract base tlmgr:run texhash
Index: print/texlive-texmf/distinfo
===================================================================
--- print/texlive-texmf/distinfo
+++ print/texlive-texmf/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611149077
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416
SHA256 (TeX/latex-base-20150101.2.tar.xz) = f253bb6be5e2ca678f11f0c816d25445259cd48dfda799b65cbd1822f601ad9e
SIZE (TeX/latex-base-20150101.2.tar.xz) = 10553905
Index: print/texlive-tlmgr/Makefile
===================================================================
--- print/texlive-tlmgr/Makefile
+++ print/texlive-tlmgr/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= texlive
-PORTVERSION= 20150523
-PORTREVISION= 2
+PORTVERSION= 20200406
CATEGORIES= print perl5
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/:tlmgr \
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/:tlmgr \
LOCAL/hrs:tlpkg
PKGNAMESUFFIX= -tlmgr
DISTFILES= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}:tlmgr \
- ${PORTNAME}-20150521-source${EXTRACT_SUFX}:tlmgr \
+ ${PORTNAME}-20200406-source${EXTRACT_SUFX}:tlmgr \
${TLPKG_FILE}.xz:tlpkg
DIST_SUBDIR= TeX
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-extra${EXTRACT_SUFX}
@@ -16,7 +15,7 @@
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:devel/tex-kpathsea
CONFLICTS= texlive-infra-[0-9]* texlive-base-20150521_[12345]
@@ -30,16 +29,16 @@
EXTRACT_AFTER_ARGS_SOURCE= \
| ${TAR} -xf - -C ${WRKDIR} \
--no-same-permission --no-same-owner \
- ${PORTNAME}-20150521-source/texk/texlive/linked_scripts/texlive
+ ${PORTNAME}-20200406-source/texk/texlive/linked_scripts/texlive
post-extract:
- ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-20150521-source${EXTRACT_SUFX} \
+ ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-20200406-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}-20200406-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
Index: print/texlive-tlmgr/distinfo
===================================================================
--- 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
+TIMESTAMP = 1611149078
+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-20150924.tlpdb.xz) = 827e4a9446c5657d6714ef5b9be81fad5731b47d9b1b58df7eacc922aca9fb30
SIZE (TeX/texlive-20150924.tlpdb.xz) = 1112660
Index: print/texlive-tlmgr/files/patch-texlive-20200406-extra-tlpkg-TeXLive-TLUtils.pm
===================================================================
--- print/texlive-tlmgr/files/patch-texlive-20200406-extra-tlpkg-TeXLive-TLUtils.pm
+++ print/texlive-tlmgr/files/patch-texlive-20200406-extra-tlpkg-TeXLive-TLUtils.pm
@@ -1,6 +1,7 @@
---- 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.
+diff -urN texlive-20200406-extra.dist/tlpkg/TeXLive/TLUtils.pm texlive-20200406-extra/tlpkg/TeXLive/TLUtils.pm
+--- texlive-20200406-extra.dist/tlpkg/TeXLive/TLUtils.pm 2020-04-06 12:40:48.000000000 +0200
++++ texlive-20200406-extra/tlpkg/TeXLive/TLUtils.pm 2021-01-23 22:31:44.762335000 +0100
+@@ -251,22 +251,15 @@
sub platform {
unless (defined $::_platform_) {
@@ -8,7 +9,14 @@
- $::_platform_ = "win32";
- } else {
- my $config_guess = "$::installerdir/tlpkg/installer/config.guess";
--
++ chomp(my $uname_m = `uname -m`);
++ chomp(my $uname_r = `uname -r`);
++ chomp(my $uname_s = `uname -s`);
++ $uname_r =~ s/-.*$//;
++ $uname_s = lc($uname_s);
++ $guessed_platform = sprintf("%s-unknown-%s%s", $uname_m,
++ $uname_s, $uname_r);
+
- # We cannot rely on #! in config.guess but have to call /bin/sh
- # explicitly because sometimes the 'noexec' flag is set in
- # /etc/fstab for ISO9660 file systems.
@@ -18,13 +26,6 @@
- die "$0: could not run $config_guess, cannot proceed, sorry"
- if ! $guessed_platform;
-
-+ chomp(my $uname_m = `uname -m`);
-+ chomp(my $uname_r = `uname -r`);
-+ chomp(my $uname_s = `uname -s`);
-+ $uname_r =~ s/-.*$//;
-+ $uname_s = lc($uname_s);
-+ $guessed_platform = sprintf("%s-unknown-%s%s", $uname_m,
-+ $uname_s, $uname_r);
$::_platform_ = platform_name($guessed_platform);
- }
}
Index: print/texlive-tlmgr/files/patch-texlive-20200406-source-texk-texlive-linked_scripts-texlive-tlmgr.pl
===================================================================
--- print/texlive-tlmgr/files/patch-texlive-20200406-source-texk-texlive-linked_scripts-texlive-tlmgr.pl
+++ print/texlive-tlmgr/files/patch-texlive-20200406-source-texk-texlive-linked_scripts-texlive-tlmgr.pl
@@ -1,19 +1,19 @@
---- 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.dist/texk/texlive/linked_scripts/texlive/tlmgr.pl 2020-03-24 21:54:02.000000000 +0100
++++ texlive-20200406-source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2021-01-23 22:20:45.145180000 +0100
+@@ -74,7 +74,7 @@
}
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 @@
# 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
-+ #
++ #
+ # *** FreeBSD specific: FreeBSD port uses /var/db/tlpkg/tlmgr.log.
+ #
$packagelogged = 0; # how many msgs we logged
@@ -27,27 +27,37 @@
}
#
# 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 @@
+ $::mrversion = "";
+ $::version_string .= "tlmgr revision $tlmgrversion\n";
+ $::mrversion .= "revision $tlmgrrevision\n";
- $::version_string .= "tlmgr using installation: $Master\n";
++ $::version_string .= "tlmgr using installation: $Master/tlpkpkg";
+ $::mrversion .= "installation $Master\n";
- if (open (REL_TL, "$Master/release-texlive.txt")) {
-+ $::version_string .= "tlmgr using 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 = <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 = <REL_TL>;
+ $::version_string .= $rel_tl;
+@@ -2252,7 +2255,7 @@
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 {
+@@ -2479,7 +2482,7 @@
+ my @remoteexpansion_full =
+ $remotetlpdb->expand_dependencies($localtlpdb, @all_schmscolls);
+
+- # compute new/remove/forcerm based on the full expansions
++ # compute new/remove/forceem based on the full expansions
+ for my $p (@remoteexpansion_full) {
+ $newpkgs_full{$p} = 1;
+ }
+@@ -5235,21 +5238,21 @@
system("rm", "-rf", "$Master/texmf-var");
system("rm", "-rf", "$Master/tlpkg");
system("rm", "-rf", "$Master/bin");
@@ -55,30 +65,32 @@
- 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");
}
- if (-d "$Master/temp") {
- system("rmdir", "--ignore-fail-on-non-empty", "$Master/temp");
+ if (-d "$Master/tlpkg/temp") {
-+ system("rmdir", "--ignore-fail-on-non-empty", "$Master/tlpkg/temp");
++ system("rmdir", "--ignore-fail-on-non-empty", "$Master/tlpkgetemp");
}
- 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");
-+ # system("rmdir", "--ignore-fail-on-non-empty", "$Master");
++ # system("rm", "-rf", "$Master/texmf-config");
++ # system("rmdir", "--ignore-fail-on-non-empty", "$Master");
}
-@@ -5466,7 +5469,7 @@ sub action_conf {
+@@ -6150,7 +6153,7 @@
$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, "[%#]", "=");
Index: print/xpdfopen/Makefile
===================================================================
--- print/xpdfopen/Makefile
+++ print/xpdfopen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xpdfopen
PORTVERSION= 0.86
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
+MASTER_SITES= TEX_CTAN/systems/texlive/2020/
DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
DIST_SUBDIR= TeX
@@ -17,7 +17,7 @@
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux \
utils/xpdfopen
-DISTVERSION_TEXLIVE_SOURCE= 20150521
+DISTVERSION_TEXLIVE_SOURCE= 20200406
WRKSRC= ${WRKDIR}/${DISTNAME}/utils/xpdfopen
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
Index: print/xpdfopen/distinfo
===================================================================
--- print/xpdfopen/distinfo
+++ print/xpdfopen/distinfo
@@ -1,4 +1,5 @@
-SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
-SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
-SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
-SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+TIMESTAMP = 1611149079
+SHA256 (TeX/texlive-20200406-source.tar.xz) = e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
+SIZE (TeX/texlive-20200406-source.tar.xz) = 55383320
+SHA256 (TeX/texlive-20200406-texmf.tar.xz) = 0aa97e583ecfd488e1dc60ff049fec073c1e22dfe7de30a3e4e8c851bb875a95
+SIZE (TeX/texlive-20200406-texmf.tar.xz) = 3165595416

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 12, 7:49 AM (9 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26891876
Default Alt Text
D28227.id82876.diff (82 KB)

Event Timeline