From a2cb9745ae4e90c466ed606334565d793c4d6ab4 Mon Sep 17 00:00:00 2001 From: Edd Barrett Date: Wed, 3 Aug 2022 11:41:56 +0100 Subject: [PATCH] texlive: put back deps, make pregen. --- print/texlive/base/Makefile | 3 +- print/texlive/base/pkg/PLIST-main | 2 +- print/texlive/base/pkg/PLIST-mktexlsr | 4 +- print/texlive/base/pkg/PLIST-synctex | 2 +- print/texlive/texmf/Makefile | 27 ++++---- print/texlive/texmf/distinfo | 2 + print/texlive/texmf/man_symlinks.mk | 4 +- print/texlive/texmf/pkg/PLIST-buildset | 94 ++++++++++++++++++++++++++ 8 files changed, 116 insertions(+), 22 deletions(-) diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile index 00c1446dad..25704124da 100755 --- a/print/texlive/base/Makefile +++ b/print/texlive/base/Makefile @@ -40,9 +40,8 @@ RUN_DEPENDS-main = print/ghostscript/gnu \ print/psutils \ print/t1utils \ devel/desktop-file-utils \ + texlive_texmf-buildset-${V}:print/texlive/texmf,-buildset \ ${BASE_PKGPATH},-synctex -# put back -# texlive_texmf-buildset-${V}:print/texlive/texmf,-buildset \ LIB_DEPENDS-main = converters/libiconv \ graphics/png \ diff --git a/print/texlive/base/pkg/PLIST-main b/print/texlive/base/pkg/PLIST-main index d5bb528091..feffc47eeb 100644 --- a/print/texlive/base/pkg/PLIST-main +++ b/print/texlive/base/pkg/PLIST-main @@ -1,7 +1,7 @@ @conflict teTeX_base-* @conflict pdfjam-* @conflict ht-<2 -@conflict texlive_texmf-buildset-<2021 +@conflict texlive_texmf-buildset-<2022 @pkgpath print/teTeX/base @pkgpath print/pdfjam @pkgpath print/teTeX/base,-fmt diff --git a/print/texlive/base/pkg/PLIST-mktexlsr b/print/texlive/base/pkg/PLIST-mktexlsr index 87d0736ebd..a21aac681e 100644 --- a/print/texlive/base/pkg/PLIST-mktexlsr +++ b/print/texlive/base/pkg/PLIST-mktexlsr @@ -1,8 +1,8 @@ @conflict teTeX_base-* @conflict pdfjam-* @conflict ht-<2 -@conflict texlive_texmf-buildset-<2021 -@conflict texlive_base-<2021 +@conflict texlive_texmf-buildset-<2022 +@conflict texlive_base-<2022 @define-tag mktexlsr at-end %D/bin/mktexlsr >/dev/null 2>&1 @define-tag mktexlsr-local at-end %D/bin/mktexlsr %D/share/texmf-local >/dev/null 2>&1 @define-tag mktexlsr supersedes mktexlsr-local diff --git a/print/texlive/base/pkg/PLIST-synctex b/print/texlive/base/pkg/PLIST-synctex index 29d3825904..0566a269ac 100644 --- a/print/texlive/base/pkg/PLIST-synctex +++ b/print/texlive/base/pkg/PLIST-synctex @@ -1,4 +1,4 @@ -@conflict texlive_base-<2021 +@conflict texlive_base-<2022 @bin bin/synctex include/synctex/ include/synctex/synctex_parser.h diff --git a/print/texlive/texmf/Makefile b/print/texlive/texmf/Makefile index f2eccb7cd9..ba39571530 100644 --- a/print/texlive/texmf/Makefile +++ b/print/texlive/texmf/Makefile @@ -15,9 +15,8 @@ DISTNAME = texlive-${DIST_V}-texmf MASTER_SITES0 = http://theunixzoo.co.uk/distfiles/ DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ texlive-${DIST_V}-extra${EXTRACT_SUFX} \ - texlive-20220325-tlpdb-full.tar.gz -# XXX: do pregen -# texmf-var-pregen-${V}${EXTRACT_SUFX}:0 + texlive-20220325-tlpdb-full.tar.gz \ + texmf-var-pregen-${V}${EXTRACT_SUFX}:0 PKGNAME-main = texlive_texmf-minimal-${V} PKGNAME-full = texlive_texmf-full-${V} @@ -25,8 +24,6 @@ PKGNAME-docs = texlive_texmf-docs-${V} PKGNAME-context = texlive_texmf-context-${V} PKGNAME-buildset = texlive_texmf-buildset-${V} -REVISION-context = 0 - NO_BUILD = Yes NO_TEST = Yes PKG_ARCH = * @@ -45,17 +42,16 @@ MODPY_RUNDEP = No .include "adj.mk" -RUN_DEPENDS-main += texlive_base->=${V}:print/texlive/base,-main -# ${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset -#RUN_DEPENDS-full = ${FULLPKGNAME-main}:print/texlive/texmf,-main +RUN_DEPENDS-main += texlive_base->=${V}:print/texlive/base,-main \ + ${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset RUN_DEPENDS-full = ${FULLPKGNAME-main}:print/texlive/texmf,-main \ ${MODPY_RUN_DEPENDS} \ ${_MODLUA_RUNDEPENDS} -#RUN_DEPENDS-context += ${FULLPKGNAME-full}:print/texlive/texmf,-full -RUN_DEPENDS-context += ${MODRUBY_RUN_DEPENDS} -#RUN_DEPENDS-docs += texlive_base->=${V}:print/texlive/base,-main -RUN_DEPENDS-docs += x11/p5-Tk -#RUN_DEPENDS-buildset += texlive_mktexlsr->=${V}:print/texlive/base,-mktexlsr +RUN_DEPENDS-context += ${FULLPKGNAME-full}:print/texlive/texmf,-full \ + ${MODRUBY_RUN_DEPENDS} +RUN_DEPENDS-docs += texlive_base->=${V}:print/texlive/base,-main \ + x11/p5-Tk +RUN_DEPENDS-buildset += texlive_mktexlsr->=${V}:print/texlive/base,-mktexlsr MULTI_PACKAGES = -context -docs -full -main -buildset @@ -139,8 +135,7 @@ do-install: tl-symlinks-main tl-symlinks-full tl-symlinks-context # # (Don't forget to remove ls-R files, log files and the luatex cache # before making the tarball). - # XXX: put back - #mv ${WRKDIR}/texmf-var ${PREFIX}/share + mv ${WRKDIR}/texmf-var ${PREFIX}/share # Put manuals in the right place. # @@ -180,6 +175,8 @@ post-install: # Generating PLISTs is special for TeX Live. update-plist: plist + @true + plist: fake env WRKINST=${WRKINST} TRUEPREFIX=${TRUEPREFIX} \ python${MODPY_DEFAULT_VERSION_3} \ diff --git a/print/texlive/texmf/distinfo b/print/texlive/texmf/distinfo index e235c61867..6188020e8e 100644 --- a/print/texlive/texmf/distinfo +++ b/print/texlive/texmf/distinfo @@ -1,6 +1,8 @@ SHA256 (texlive-20220321-extra.tar.xz) = AoTPNolHvozHvs1hyBZDKn0wHbPB5oLdwKGAvTttkpY= SHA256 (texlive-20220321-texmf.tar.xz) = NysrB7H30d0Sdmz8f2ZW4iw0paINA8H+gFEBKTYaPxY= SHA256 (texlive-20220325-tlpdb-full.tar.gz) = 0UnQ4nHv9Nk5An6Fshz00aBmvUuyT3ZOZ9f9y62kuMQ= +SHA256 (texmf-var-pregen-2022.tar.xz) = v3GbE320Upiuzv3tyRfdbZWNnhRNuwTumwU5xjAPrMw= SIZE (texlive-20220321-extra.tar.xz) = 1805372 SIZE (texlive-20220321-texmf.tar.xz) = 3646738208 SIZE (texlive-20220325-tlpdb-full.tar.gz) = 3197986 +SIZE (texmf-var-pregen-2022.tar.xz) = 88466672 diff --git a/print/texlive/texmf/man_symlinks.mk b/print/texlive/texmf/man_symlinks.mk index 69777faa45..be10558f27 100644 --- a/print/texlive/texmf/man_symlinks.mk +++ b/print/texlive/texmf/man_symlinks.mk @@ -55,4 +55,6 @@ MAN_SYMLINKS_CMD = \ ln -sf ../man1/ptftopl.1 uptftopl.1 && \ ln -sf ../man1/dvipdfmx.1 xdvipdfmx.1 && \ ln -sf ../man1/latex-dev.1 xelatex-dev.1 && \ - ln -sf ../man1/latex.1 xelatex.1 + ln -sf ../man1/latex.1 xelatex.1 && \ + ln -sf ../man1/xetex-unsafe.1 xelatex-unsafe.1 && \ + ln -sf ../man1/pbibtex.1 upbibtex.1 diff --git a/print/texlive/texmf/pkg/PLIST-buildset b/print/texlive/texmf/pkg/PLIST-buildset index 6f67356e44..2273f87f19 100644 --- a/print/texlive/texmf/pkg/PLIST-buildset +++ b/print/texlive/texmf/pkg/PLIST-buildset @@ -8150,6 +8150,100 @@ share/texmf-dist/xdvi/XDvi share/texmf-dist/xdvi/pixmap/ share/texmf-dist/xdvi/pixmap/toolbar.xpm share/texmf-dist/xdvi/pixmap/toolbar2.xpm +share/texmf-var/ +share/texmf-var/fonts/ +share/texmf-var/fonts/map/ +share/texmf-var/fonts/map/dvipdfmx/ +share/texmf-var/fonts/map/dvipdfmx/updmap/ +share/texmf-var/fonts/map/dvipdfmx/updmap/kanjix.map +share/texmf-var/fonts/map/dvips/ +share/texmf-var/fonts/map/dvips/updmap/ +share/texmf-var/fonts/map/dvips/updmap/builtin35.map +share/texmf-var/fonts/map/dvips/updmap/download35.map +share/texmf-var/fonts/map/dvips/updmap/ps2pk.map +share/texmf-var/fonts/map/dvips/updmap/psfonts.map +share/texmf-var/fonts/map/dvips/updmap/psfonts_pk.map +share/texmf-var/fonts/map/dvips/updmap/psfonts_t1.map +share/texmf-var/fonts/map/pdftex/ +share/texmf-var/fonts/map/pdftex/updmap/ +share/texmf-var/fonts/map/pdftex/updmap/pdftex.map +share/texmf-var/fonts/map/pdftex/updmap/pdftex_dl14.map +share/texmf-var/fonts/map/pdftex/updmap/pdftex_ndl14.map +share/texmf-var/luatex-cache/ +share/texmf-var/luatex-cache/context/ +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/ +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/formats/ +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/formats/luatex/ +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/formats/luatex/cont-en.fmt +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/formats/luatex/cont-en.lui +share/texmf-var/luatex-cache/context/0399a8df3aef8d154781d0a9c2b8e28d/formats/luatex/cont-en.luv +share/texmf-var/web2c/ +share/texmf-var/web2c/aleph/ +share/texmf-var/web2c/aleph/aleph.fmt +share/texmf-var/web2c/eptex/ +share/texmf-var/web2c/eptex/eptex.fmt +share/texmf-var/web2c/eptex/platex-dev.fmt +share/texmf-var/web2c/eptex/platex.fmt +share/texmf-var/web2c/euptex/ +share/texmf-var/web2c/euptex/euptex.fmt +share/texmf-var/web2c/euptex/uplatex-dev.fmt +share/texmf-var/web2c/euptex/uplatex.fmt +share/texmf-var/web2c/hitex/ +share/texmf-var/web2c/hitex/hilatex.fmt +share/texmf-var/web2c/hitex/hitex.fmt +share/texmf-var/web2c/luahbtex/ +share/texmf-var/web2c/luahbtex/luahbtex.fmt +share/texmf-var/web2c/luahbtex/lualatex-dev.fmt +share/texmf-var/web2c/luahbtex/lualatex.fmt +share/texmf-var/web2c/luatex/ +share/texmf-var/web2c/luatex/dvilualatex-dev.fmt +share/texmf-var/web2c/luatex/dvilualatex.fmt +share/texmf-var/web2c/luatex/dviluatex.fmt +share/texmf-var/web2c/luatex/luacsplain.fmt +share/texmf-var/web2c/luatex/luatex.fmt +share/texmf-var/web2c/luatex/optex.fmt +share/texmf-var/web2c/luatex/pdfcsplain.fmt +share/texmf-var/web2c/metafont/ +share/texmf-var/web2c/metafont/mf.base +share/texmf-var/web2c/pdftex/ +share/texmf-var/web2c/pdftex/amstex.fmt +share/texmf-var/web2c/pdftex/cont-en.fmt +share/texmf-var/web2c/pdftex/cslatex.fmt +share/texmf-var/web2c/pdftex/csplain.fmt +share/texmf-var/web2c/pdftex/eplain.fmt +share/texmf-var/web2c/pdftex/etex.fmt +share/texmf-var/web2c/pdftex/jadetex.fmt +share/texmf-var/web2c/pdftex/latex-dev.fmt +share/texmf-var/web2c/pdftex/latex.fmt +share/texmf-var/web2c/pdftex/mex.fmt +share/texmf-var/web2c/pdftex/mllatex.fmt +share/texmf-var/web2c/pdftex/mltex.fmt +share/texmf-var/web2c/pdftex/mptopdf.fmt +share/texmf-var/web2c/pdftex/pdfcslatex.fmt +share/texmf-var/web2c/pdftex/pdfcsplain.fmt +share/texmf-var/web2c/pdftex/pdfetex.fmt +share/texmf-var/web2c/pdftex/pdfjadetex.fmt +share/texmf-var/web2c/pdftex/pdflatex-dev.fmt +share/texmf-var/web2c/pdftex/pdflatex.fmt +share/texmf-var/web2c/pdftex/pdfmex.fmt +share/texmf-var/web2c/pdftex/pdftex.fmt +share/texmf-var/web2c/pdftex/pdfxmltex.fmt +share/texmf-var/web2c/pdftex/texsis.fmt +share/texmf-var/web2c/pdftex/utf8mex.fmt +share/texmf-var/web2c/pdftex/xmltex.fmt +share/texmf-var/web2c/ptex/ +share/texmf-var/web2c/ptex/ptex.fmt +share/texmf-var/web2c/tex/ +share/texmf-var/web2c/tex/lollipop.fmt +share/texmf-var/web2c/tex/tex.fmt +share/texmf-var/web2c/uptex/ +share/texmf-var/web2c/uptex/uptex.fmt +share/texmf-var/web2c/xetex/ +share/texmf-var/web2c/xetex/cont-en.fmt +share/texmf-var/web2c/xetex/pdfcsplain.fmt +share/texmf-var/web2c/xetex/xelatex-dev.fmt +share/texmf-var/web2c/xetex/xelatex.fmt +share/texmf-var/web2c/xetex/xetex.fmt share/tlpkg/ share/tlpkg/texlive.tlpdb @tag mktexlsr