diff options
| author | markd <markd@pkgsrc.org> | 2020-05-10 03:56:37 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2020-05-10 03:56:37 +0000 |
| commit | d57d0dbaccdef953a6a139080ec23848b416334e (patch) | |
| tree | a332112cdb8e069aa7dc3a35a319de178a0c280f /print | |
| parent | 0509d107baa7419f116723205ff69d6f38ed6ccf (diff) | |
| download | pkgsrc-d57d0dbaccdef953a6a139080ec23848b416334e.tar.gz | |
texlive: update to 2020
General:
* The \input primitive in all TeX engines, including tex, now also accepts a
group-delimited filename argument, as a system-dependent extension. The usage
with a standard space/token-delimited filename is completely unchanged. The
group-delimited argument was previously implemented in LuaTeX; now it is available
in all engines. ASCII double quote characters (") are removed from the filename,
but it is otherwise left unchanged after tokenization. This does not currently
affect LaTeX’s \input command, as that is a macro redefinition of the standard
\input primitive.
* New option –cnf-line for kpsewhich, tex, mf, and all other engines, to support
arbitrary configuration settings on the command line.
* The addition of various primitives to various engines in this and previous years
is intended to result in a common set of functionality available across
all engines.
epTeX, eupTeX: New primitives \Uchar, \Ucharcat, \current(x)spacingmode, \ifincsname;
revise \fontchar?? and \iffontchar. For eupTeX only: \currentcjktoken.
LuaTeX: Integration with HarfBuzz library, available as new engines luahbtex
(used for lualatex) and luajithbtex. New primitives: \eTeXgluestretchorder,
\eTeXglueshrinkorder.
pdfTeX: New primitive \pdfmajorversion; this merely changes the version number
in the PDF output; it has no effect on any PDF content. \pdfximage and similar
now search for image files in the same way as \openin.
pTeX: New primitives \ifjfont, \iftfont. Also in epTeX, upTeX, eupTeX.
XeTeX: Fixes for \Umathchardef, \XeTeXinterchartoks, \pdfsavepos.
Dvips: Output encodings for bitmap fonts, for better copy/paste capabilities.
Diffstat (limited to 'print')
161 files changed, 976 insertions, 1010 deletions
diff --git a/print/cjkutils/Makefile b/print/cjkutils/Makefile index a6dc5985e7d..e85b0b8c9ee 100644 --- a/print/cjkutils/Makefile +++ b/print/cjkutils/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: Makefile,v 1.12 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= cjkutils-4.8.4 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= print MAINTAINER= rxg@NetBSD.org,hubertf@NetBSD.org diff --git a/print/cjkutils/distinfo b/print/cjkutils/distinfo index dcfe44a7d8a..4464bceeca0 100644 --- a/print/cjkutils/distinfo +++ b/print/cjkutils/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.10 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/dvidvi/Makefile b/print/dvidvi/Makefile index 676ad9bdf73..1ce4f8d250d 100644 --- a/print/dvidvi/Makefile +++ b/print/dvidvi/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: Makefile,v 1.17 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= dvidvi-1.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/dvidvi/distinfo b/print/dvidvi/distinfo index 0d31b615131..68eadc8ba17 100644 --- a/print/dvidvi/distinfo +++ b/print/dvidvi/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.8 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/dviljk/Makefile b/print/dviljk/Makefile index 023ce4553b3..2379e0dd885 100644 --- a/print/dviljk/Makefile +++ b/print/dviljk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2020/01/18 23:33:27 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= dviljk-2.6.5 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= print HOMEPAGE= https://www.tug.org/texlive/ diff --git a/print/dviljk/distinfo b/print/dviljk/distinfo index 5982596cdd3..9f247d84afb 100644 --- a/print/dviljk/distinfo +++ b/print/dviljk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.13 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile index 886fac2ba38..7547c8aadc7 100644 --- a/print/dvipdfmx/Makefile +++ b/print/dvipdfmx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: Makefile,v 1.52 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= dvipdfmx-20190225 +PKGNAME= dvipdfmx-20200315 CATEGORIES= print converters HOMEPAGE= http://project.ktug.or.kr/dvipdfmx/ diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo index ebb553e27a4..00de7201e97 100644 --- a/print/dvipdfmx/distinfo +++ b/print/dvipdfmx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.18 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.19 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-Makefile.in) = 526a2eab50395bcc9c0f2aa11a0d20034f93a02b SHA1 (patch-ac) = 2bbaa28a6cf16c8a14b0f190387d6443c6b260d9 -SHA1 (patch-ad) = a9d724566920535e28204cf8014467297f3f7bcb +SHA1 (patch-ad) = 83c490341314ca98ae5915f868dc2d1f3d4a4d5b diff --git a/print/dvipdfmx/patches/patch-ad b/print/dvipdfmx/patches/patch-ad index 7fe95c5b7e7..80726216cee 100644 --- a/print/dvipdfmx/patches/patch-ad +++ b/print/dvipdfmx/patches/patch-ad @@ -1,13 +1,15 @@ -$NetBSD: patch-ad,v 1.4 2016/06/16 04:06:19 markd Exp $ +$NetBSD: patch-ad,v 1.5 2020/05/10 03:56:38 markd Exp $ ---- data/dvipdfmx.cfg.orig 2015-11-05 00:08:29.000000000 +0000 +use explicit path + +--- data/dvipdfmx.cfg.orig 2019-11-12 23:50:35.000000000 +0000 +++ data/dvipdfmx.cfg @@ -156,7 +156,7 @@ P 0x003C %% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg %% and control which one is found by setting DVIPDFMXINPUTS. %% --D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit" -+D "@RUNGS@ -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit" +-D "rungs -q -dDELAYSAFER -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit" ++D "@RUNGS@ -q -dDELAYSAFER -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit" % other random ps converters people have experimented with. %D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'" diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile index ca80cc563eb..9b1f36a9f64 100644 --- a/print/dvipsk/Makefile +++ b/print/dvipsk/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.23 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: Makefile,v 1.24 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= dvipsk-5.999 +PKGNAME= dvipsk-2020.1 CATEGORIES= print HOMEPAGE= http://www.radicaleye.com/dvips.html COMMENT= DVI-to-PostScript translator -BUILD_DEPENDS+= tex-tetex-[0-9]*:../../print/tex-tetex +BUILD_DEPENDS+= tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts DEPENDS+= tex-dvips>=2013:../../print/tex-dvips EXTRACT_ELEMENTS+= ${DISTNAME}/texk/dvipsk diff --git a/print/dvipsk/PLIST b/print/dvipsk/PLIST index eee8142d733..7d06bfa3551 100644 --- a/print/dvipsk/PLIST +++ b/print/dvipsk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/11/17 16:54:41 minskim Exp $ +@comment $NetBSD: PLIST,v 1.4 2020/05/10 03:56:38 markd Exp $ bin/afm2tfm bin/dvips info/dvips.info @@ -13,3 +13,4 @@ share/texmf-dist/dvips/base/special.pro share/texmf-dist/dvips/base/tex.pro share/texmf-dist/dvips/base/texc.pro share/texmf-dist/dvips/base/texps.pro +share/texmf-dist/fonts/enc/dvips/base/dvips-all.enc diff --git a/print/dvipsk/distinfo b/print/dvipsk/distinfo index b620b040c5e..67ca10cdc56 100644 --- a/print/dvipsk/distinfo +++ b/print/dvipsk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.19 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile index 579700767d8..6c5256fca13 100644 --- a/print/kpathsea/Makefile +++ b/print/kpathsea/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2020/01/18 23:33:29 rillig Exp $ +# $NetBSD: Makefile,v 1.33 2020/05/10 03:56:38 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= kpathsea-6.3.1 +PKGNAME= kpathsea-6.3.2 CATEGORIES= print HOMEPAGE= https://ctan.org/pkg/kpathsea @@ -19,6 +19,8 @@ INFO_FILES= yes MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} +DEPENDS+= mktexlsr-[0-9]*:../../print/mktexlsr + # A double-slash (//) in the kpathsea paths has a special # interpretation, it will cause kpathsea to consider all # subdirectories recursively at that point in the path. Normally @@ -36,14 +38,6 @@ SUBST_SED.texmfdir+= -e 's,@TEXMFLOCAL@,${TEXMFLOCAL:C;///*;/;g:C;/$;;},' SUBST_SED.texmfdir+= -e 's,@VARBASE@,${VARBASE:C;///*;/;g:C;/$;;},' SUBST_SED.texmfdir+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:C;///*;/;g:C;/$;;},' -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Setting paths to commands. -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= mktex.opt mktexdir mktexlsr mktexmf \ - mktexnam mktexnam.opt mktexpk mktextfm mktexupd -SUBST_SED.paths= -e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' -SUBST_SED.paths+= -e 's,@MKTEXMF@,${PREFIX}/bin/mktexmf,g' - PKG_SYSCONFSUBDIR= texmf BUILD_DEFS+= VARBASE diff --git a/print/kpathsea/PLIST b/print/kpathsea/PLIST index b3df2d126e4..db7fb727258 100644 --- a/print/kpathsea/PLIST +++ b/print/kpathsea/PLIST @@ -1,13 +1,8 @@ -@comment $NetBSD: PLIST,v 1.13 2017/06/20 20:50:50 markd Exp $ +@comment $NetBSD: PLIST,v 1.14 2020/05/10 03:56:38 markd Exp $ bin/kpseaccess bin/kpsereadlink bin/kpsestat bin/kpsewhich -bin/mktexlsr -bin/mktexmf -bin/mktexpk -bin/mktextfm -bin/texhash include/kpathsea/absolute.h include/kpathsea/c-auto.h include/kpathsea/c-ctype.h @@ -61,15 +56,4 @@ man/man1/kpseaccess.1 man/man1/kpsereadlink.1 man/man1/kpsestat.1 man/man1/kpsewhich.1 -man/man1/mktexlsr.1 -man/man1/mktexmf.1 -man/man1/mktexpk.1 -man/man1/mktextfm.1 -man/man1/texhash.1 -share/texmf-dist/web2c/mktex.opt -share/texmf-dist/web2c/mktexdir -share/texmf-dist/web2c/mktexdir.opt -share/texmf-dist/web2c/mktexnam -share/texmf-dist/web2c/mktexnam.opt -share/texmf-dist/web2c/mktexupd share/texmf-dist/web2c/texmf.cnf diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo index 0ea6f1917c2..f522d72a68b 100644 --- a/print/kpathsea/distinfo +++ b/print/kpathsea/distinfo @@ -1,17 +1,8 @@ -$NetBSD: distinfo,v 1.24 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.25 2020/05/10 03:56:38 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-aa) = 049aa9e8655c749ba168316fe6a4af453c3c9194 -SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 -SHA1 (patch-ad) = 3c2629948dca3157c64078220537e96f66956289 -SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf -SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 -SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe -SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e -SHA1 (patch-ai) = 094412f43212c4b5a6c3349b5d147bc41b9edc0d -SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 -SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c SHA1 (patch-xputenv.c) = 75edfd8abdf2f0373a084095cfdd37865e628590 diff --git a/print/kpathsea/patches/patch-ak b/print/kpathsea/patches/patch-ak deleted file mode 100644 index 8f4fa50b114..00000000000 --- a/print/kpathsea/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2011/07/28 04:25:06 minskim Exp $ - ---- mktexlsr.orig 2011-06-27 22:27:02.000000000 +0000 -+++ mktexlsr -@@ -78,7 +78,7 @@ while test $# -gt 0; do - exit 0 - elif test "x$1" = x--version || test "x$1" = x-version; then - echo "`basename $0` $version" -- kpsewhich --version -+ @KPSEWHICH@ --version - exit 0 - elif test "x$1" = x--verbose || test "x$1" = x-verbose; then - verbose=true -@@ -127,7 +127,7 @@ old_ls_R_magic='% ls-R -- maintained by - if test -s "$treefile"; then - set x `sort "$treefile" | uniq` - else -- set x `kpsewhich --show-path=ls-R | tr : ' -+ set x `@KPSEWHICH@ --show-path=ls-R | tr : ' - ' | sort | uniq` - fi - IFS=$saveIFS diff --git a/print/kpathsea/texmf.mk b/print/kpathsea/texmf.mk index 34978ed0887..f08bdca8bc6 100644 --- a/print/kpathsea/texmf.mk +++ b/print/kpathsea/texmf.mk @@ -1,4 +1,4 @@ -# $NetBSD: texmf.mk,v 1.10 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: texmf.mk,v 1.11 2020/05/10 03:56:38 markd Exp $ # # This Makefile fragment is intended to be included by packages that # install TeX packages. It rebuilds the ls-R databases at @@ -41,14 +41,14 @@ DEINSTALL_TEMPLATES+= ../../print/kpathsea/files/config-deinstall.tmpl .endif .if !empty(TEX_FORMATS) -. include "../../print/tex-tetex/format.mk" +. include "../../print/tex-texlive-scripts/format.mk" .endif .if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF) -. include "../../print/tex-tetex/hyphen.mk" +. include "../../print/tex-texlive-scripts/hyphen.mk" .endif .if !empty(TEX_KANJIMAP_FILES) || !empty(TEX_MAP_FILES) \ || !empty(TEX_MIXEDMAP_FILES) -. include "../../print/tex-tetex/map.mk" +. include "../../print/tex-texlive-scripts/map.mk" .endif .endif # TEX_TEXMF_MK diff --git a/print/lacheck/Makefile b/print/lacheck/Makefile index 586f5356545..2c5548ddf5a 100644 --- a/print/lacheck/Makefile +++ b/print/lacheck/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2019/05/09 09:47:35 adam Exp $ +# $NetBSD: Makefile,v 1.7 2020/05/10 03:56:39 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= lacheck-1.28 -PKGREVISION= 4 +PKGNAME= lacheck-1.29 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/lacheck/distinfo b/print/lacheck/distinfo index 0d31b615131..f18595c857a 100644 --- a/print/lacheck/distinfo +++ b/print/lacheck/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2019/05/09 09:47:35 adam Exp $ +$NetBSD: distinfo,v 1.8 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/luatex/Makefile b/print/luatex/Makefile index 226adf6f844..03e4de080b7 100644 --- a/print/luatex/Makefile +++ b/print/luatex/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2020/04/03 10:30:34 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2020/05/10 03:56:39 markd Exp $ -PKGREVISION= 7 .include "../../print/texlive/Makefile.common" -PKGNAME= luatex-1.10.0 +PKGNAME= luatex-1.12.0 CATEGORIES= print HOMEPAGE= https://www.tug.org/web2c/ @@ -24,6 +23,7 @@ CONFIGURE_ARGS+= --disable-euptex CONFIGURE_ARGS+= --disable-mf CONFIGURE_ARGS+= --disable-mf-nowin CONFIGURE_ARGS+= --disable-luajittex +CONFIGURE_ARGS+= --disable-luajithbtex CONFIGURE_ARGS+= --disable-mfluajit CONFIGURE_ARGS+= --disable-mp CONFIGURE_ARGS+= --disable-pdftex @@ -43,6 +43,8 @@ CONFIGURE_ARGS+= --with-system-zlib CONFIGURE_ARGS+= --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib CONFIGURE_ARGS+= --with-system-cairo +CONFIGURE_ARGS+= --with-system-graphite2 +CONFIGURE_ARGS+= --with-system-harfbuzz CONFIGURE_ARGS+= --with-system-pixman CONFIGURE_ARGS+= --with-system-libpng CONFIGURE_ARGS+= --with-system-freetype2 @@ -56,6 +58,7 @@ CONFIGURE_ARGS+= --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib CONFIGURE_ARGS+= --without-x CONFIGURE_DIRS= libs/lua53 +CONFIGURE_DIRS+= libs/luajit CONFIGURE_DIRS+= texk/web2c INSTALLATION_DIRS+= bin lib @@ -79,9 +82,12 @@ do-install: ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texlua ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texluac + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luahbtex ${DESTDIR}${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/mflua ${DESTDIR}${PREFIX}/bin .include "../../archivers/zziplib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../fonts/harfbuzz/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../math/mpfr/buildlink3.mk" diff --git a/print/luatex/PLIST b/print/luatex/PLIST index 55d262cb8a6..aa5bffabc98 100644 --- a/print/luatex/PLIST +++ b/print/luatex/PLIST @@ -1,5 +1,7 @@ -@comment $NetBSD: PLIST,v 1.5 2019/05/09 09:47:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/05/10 03:56:39 markd Exp $ +bin/luahbtex bin/luatex +bin/mflua bin/texlua bin/texluac lib/libtexlua53.la diff --git a/print/luatex/distinfo b/print/luatex/distinfo index e8018bdc4f8..701c3cd0b19 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.36 2020/03/12 17:18:30 wiz Exp $ +$NetBSD: distinfo,v 1.37 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3 SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69 SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f diff --git a/print/mktexlsr/DESCR b/print/mktexlsr/DESCR new file mode 100644 index 00000000000..cc18b4f9a57 --- /dev/null +++ b/print/mktexlsr/DESCR @@ -0,0 +1,4 @@ +Rebuild ls-R filename databases used by TeX. If one or more arguments +DIRS are given, these are used as the directories in which to build +ls-R. Else all directories in the search path for ls-R files +(\$TEXMFDBS) are used. diff --git a/print/mktexlsr/Makefile b/print/mktexlsr/Makefile new file mode 100644 index 00000000000..ed9c7153ae3 --- /dev/null +++ b/print/mktexlsr/Makefile @@ -0,0 +1,33 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:37 markd Exp $ + +DISTNAME= texlive.infra +PKGNAME= mktexlsr-2020 +CATEGORIES= print +MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/tlnet/archive/} +DISTFILES= ${DISTNAME}.r${TEXLIVE_REV}${EXTRACT_SUFX} ${DISTNAME}.doc.r${TEXLIVE_REV}${EXTRACT_SUFX} +EXTRACT_SUFX= .tar.xz +TEXLIVE_REV= 54630 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://www.tug.org/texlive/ +COMMENT= Create or rebuild ls-R +LICENSE= public-domain + +NO_BUILD= yes +WRKSRC= ${WRKDIR}/texmf-dist/scripts/texlive + +INSTALLATION_DIRS+= bin man/man1 + +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Setting paths to commands. +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= mktexlsr +SUBST_SED.paths= -e 's,kpsewhich,${PREFIX}/bin/kpsewhich,' + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/mktexlsr \ + ${DESTDIR}${PREFIX}/bin/mktexlsr + ${INSTALL_MAN} ${WRKSRC}/../../doc/man/man1/mktexlsr.1 \ + ${DESTDIR}${PREFIX}/man/man1/mktexlsr.1 + +.include "../../mk/bsd.pkg.mk" diff --git a/print/mktexlsr/PLIST b/print/mktexlsr/PLIST new file mode 100644 index 00000000000..e32930ab022 --- /dev/null +++ b/print/mktexlsr/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:37 markd Exp $ +bin/mktexlsr +man/man1/mktexlsr.1 diff --git a/print/mktexlsr/distinfo b/print/mktexlsr/distinfo new file mode 100644 index 00000000000..18df95315c4 --- /dev/null +++ b/print/mktexlsr/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:37 markd Exp $ + +SHA1 (texlive.infra.doc.r54630.tar.xz) = 1ff0a6f388ade11b536aa064f4f23b8980ba7f19 +RMD160 (texlive.infra.doc.r54630.tar.xz) = ea9fdddbb000bed2c452cb83a5f1fafd37189d4c +SHA512 (texlive.infra.doc.r54630.tar.xz) = d0f387986cdc8c89388e0b2aa6bd5ab4c6fbd94d57e0969b425856c3538ff18c6e17924eca5ace59272d6a875aa3b63fbf97d3d2d31f6a9a69c21e6d0f199801 +Size (texlive.infra.doc.r54630.tar.xz) = 203768 bytes +SHA1 (texlive.infra.r54630.tar.xz) = adf47b821d0bc70dfd8171d251e6fcf34c15b4ff +RMD160 (texlive.infra.r54630.tar.xz) = 465af835fe9eb94d8658c4dd6b64ac803f100baa +SHA512 (texlive.infra.r54630.tar.xz) = a1a6611b48a3a2cc7bae0455a6f8fb7c12112136951ca017e3ddcaca3f16f0198a628a5ccf2f6a43095dc3f97f639e0f4d2407901923bea1656fc4877dd764ee +Size (texlive.infra.r54630.tar.xz) = 226244 bytes diff --git a/print/ptexenc/Makefile b/print/ptexenc/Makefile index 679d66e44a2..871d65bb8be 100644 --- a/print/ptexenc/Makefile +++ b/print/ptexenc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2020/01/18 23:33:30 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2020/05/10 03:56:39 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= ptexenc-1.3.7 +PKGNAME= ptexenc-1.3.8 CATEGORIES= print HOMEPAGE= https://www.tug.org/texlive/ diff --git a/print/ptexenc/distinfo b/print/ptexenc/distinfo index 091e8f844b8..4a2f1bb823d 100644 --- a/print/ptexenc/distinfo +++ b/print/ptexenc/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.13 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-texk_ptexenc_Makefile.in) = 2d110e53d604c405140abf05646a79aecb393ede diff --git a/print/seetexk/Makefile b/print/seetexk/Makefile index 60de7baeda8..8775c4b2bf5 100644 --- a/print/seetexk/Makefile +++ b/print/seetexk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2020/01/18 23:33:30 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2020/05/10 03:56:39 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= seetexk-1.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/seetexk/distinfo b/print/seetexk/distinfo index 5ceb052898c..f18595c857a 100644 --- a/print/seetexk/distinfo +++ b/print/seetexk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.8 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/tex-koma-script/Makefile b/print/tex-koma-script/Makefile index a5b58b270bd..1cd740edeba 100644 --- a/print/tex-koma-script/Makefile +++ b/print/tex-koma-script/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2020/01/18 23:34:19 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2020/05/10 03:56:41 markd Exp $ DISTNAME= koma-script -PKGNAME= tex-${DISTNAME}-3.26b -TEXLIVE_REV= 49929 +PKGNAME= tex-${DISTNAME}-3.30 +TEXLIVE_REV= 54825 MAINTAINER= minskim@NetBSD.org HOMEPAGE= https://ctan.org/pkg/koma-script @@ -11,6 +11,5 @@ LICENSE= lppl-1.3c DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-koma-script/PLIST b/print/tex-koma-script/PLIST index 5cdbed0659b..82d0134dc32 100644 --- a/print/tex-koma-script/PLIST +++ b/print/tex-koma-script/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2019/01/29 09:58:32 markd Exp $ +@comment $NetBSD: PLIST,v 1.12 2020/05/10 03:56:41 markd Exp $ share/texmf-dist/doc/latex/koma-script/INSTALL.txt share/texmf-dist/doc/latex/koma-script/INSTALLD.txt share/texmf-dist/doc/latex/koma-script/README @@ -27,15 +27,12 @@ share/texmf-dist/doc/latex/koma-script/scrlayer.html share/texmf-dist/doc/latex/koma-script/scrletter.html share/texmf-dist/doc/latex/koma-script/scrlfile.html share/texmf-dist/doc/latex/koma-script/scrlttr2.html -share/texmf-dist/doc/latex/koma-script/scrpage2.pdf share/texmf-dist/doc/latex/koma-script/scrreprt.html share/texmf-dist/doc/latex/koma-script/scrtime.html share/texmf-dist/doc/latex/koma-script/scrwfile.html share/texmf-dist/doc/latex/koma-script/tocbasic.html share/texmf-dist/doc/latex/koma-script/tocstyle.pdf share/texmf-dist/doc/latex/koma-script/typearea.html -share/texmf-dist/source/latex/koma-script/ChangeLog -share/texmf-dist/source/latex/koma-script/ChangeLog.2 share/texmf-dist/source/latex/koma-script/Makefile share/texmf-dist/source/latex/koma-script/Makefile.baseinit share/texmf-dist/source/latex/koma-script/Makefile.baserules @@ -168,7 +165,6 @@ share/texmf-dist/source/latex/koma-script/doc/scrlayer.html share/texmf-dist/source/latex/koma-script/doc/scrletter.html share/texmf-dist/source/latex/koma-script/doc/scrlfile.html share/texmf-dist/source/latex/koma-script/doc/scrlttr2.html -share/texmf-dist/source/latex/koma-script/doc/scrpage2.tex share/texmf-dist/source/latex/koma-script/doc/scrreprt.html share/texmf-dist/source/latex/koma-script/doc/scrtime.html share/texmf-dist/source/latex/koma-script/doc/scrwfile.html @@ -211,7 +207,6 @@ share/texmf-dist/source/latex/koma-script/scrlayer.dtx share/texmf-dist/source/latex/koma-script/scrlfile.dtx share/texmf-dist/source/latex/koma-script/scrlogo.dtx share/texmf-dist/source/latex/koma-script/scrmain.ins -share/texmf-dist/source/latex/koma-script/scrpage.dtx share/texmf-dist/source/latex/koma-script/scrsource.tex share/texmf-dist/source/latex/koma-script/scrstrip.inc share/texmf-dist/source/latex/koma-script/scrstrop.inc @@ -220,6 +215,8 @@ share/texmf-dist/source/latex/koma-script/scrwfile.dtx share/texmf-dist/source/latex/koma-script/tocbasic.dtx share/texmf-dist/source/latex/koma-script/tocstyle.dtx share/texmf-dist/tex/latex/koma-script/DIN.lco +share/texmf-dist/tex/latex/koma-script/DIN5008A.lco +share/texmf-dist/tex/latex/koma-script/DIN5008B.lco share/texmf-dist/tex/latex/koma-script/DINmtext.lco share/texmf-dist/tex/latex/koma-script/KOMAold.lco share/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -241,6 +238,7 @@ share/texmf-dist/tex/latex/koma-script/lscape.hak share/texmf-dist/tex/latex/koma-script/nomencl.hak share/texmf-dist/tex/latex/koma-script/scraddr.sty share/texmf-dist/tex/latex/koma-script/scrartcl.cls +share/texmf-dist/tex/latex/koma-script/scrarticle.cls share/texmf-dist/tex/latex/koma-script/scrbase.sty share/texmf-dist/tex/latex/koma-script/scrbook.cls share/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -254,10 +252,11 @@ share/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty share/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty share/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty share/texmf-dist/tex/latex/koma-script/scrlayer.sty +share/texmf-dist/tex/latex/koma-script/scrletter.cls share/texmf-dist/tex/latex/koma-script/scrletter.sty share/texmf-dist/tex/latex/koma-script/scrlfile.sty share/texmf-dist/tex/latex/koma-script/scrlttr2.cls -share/texmf-dist/tex/latex/koma-script/scrpage2.sty +share/texmf-dist/tex/latex/koma-script/scrreport.cls share/texmf-dist/tex/latex/koma-script/scrreprt.cls share/texmf-dist/tex/latex/koma-script/scrsize10pt.clo share/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -265,6 +264,7 @@ share/texmf-dist/tex/latex/koma-script/scrsize12pt.clo share/texmf-dist/tex/latex/koma-script/scrtime.sty share/texmf-dist/tex/latex/koma-script/scrwfile.sty share/texmf-dist/tex/latex/koma-script/setspace.hak +share/texmf-dist/tex/latex/koma-script/standardsections.hak share/texmf-dist/tex/latex/koma-script/tocbasic.sty share/texmf-dist/tex/latex/koma-script/tocstyle.sty share/texmf-dist/tex/latex/koma-script/typearea.sty diff --git a/print/tex-koma-script/distinfo b/print/tex-koma-script/distinfo index 0dcd8ab8760..a2cc189d3d2 100644 --- a/print/tex-koma-script/distinfo +++ b/print/tex-koma-script/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2019/05/06 21:23:30 markd Exp $ +$NetBSD: distinfo,v 1.19 2020/05/10 03:56:41 markd Exp $ -SHA1 (tex-koma-script-49929/koma-script.tar.xz) = d723c56a2215a1a79527a24ddf0c31b2c35b690f -RMD160 (tex-koma-script-49929/koma-script.tar.xz) = 0e3c7e1657a79fc68cbd39f689f7bd65cce25732 -SHA512 (tex-koma-script-49929/koma-script.tar.xz) = d12003954f079dccf1e3aa3bd1968cda2c03eb9eb4ac84115583120463ec2732389cab414b7d8214983f0f484c483852fd665dc254b924ac15b190f4bdf207e7 -Size (tex-koma-script-49929/koma-script.tar.xz) = 13756660 bytes +SHA1 (koma-script.r54825.tar.xz) = d06f866e7197d378ef01723b8cdd548d1cfaa454 +RMD160 (koma-script.r54825.tar.xz) = 35fe298989b672659a264bd80280fa3566bf7e90 +SHA512 (koma-script.r54825.tar.xz) = 94f66cf85d9ea536007048dc99dd1996965e6f2fe1daffc7c1212ee09483e8b70451acb088a6ef8683092fcc260abecac4108b7c9ee1cc64234dbccbd58e59ea +Size (koma-script.r54825.tar.xz) = 13334972 bytes diff --git a/print/tex-kpathsea-doc/Makefile b/print/tex-kpathsea-doc/Makefile index 82d9a82b8bf..f8e3e105aa3 100644 --- a/print/tex-kpathsea-doc/Makefile +++ b/print/tex-kpathsea-doc/Makefile @@ -1,24 +1,20 @@ -# $NetBSD: Makefile,v 1.20 2020/01/18 23:34:20 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2020/05/10 03:56:41 markd Exp $ DISTNAME= kpathsea.doc -PKGNAME= tex-${DISTNAME:S/./-/}-2019 -TEXLIVE_REV= 51016 +PKGNAME= tex-${DISTNAME:S/./-/}-2020 +TEXLIVE_REV= 54764 MAINTAINER= minskim@NetBSD.org HOMEPAGE= https://ctan.org/pkg/kpathsea COMMENT= Documentation for tex-kpathsea -LICENSE= gnu-lgpl-v2 +LICENSE= gnu-lgpl-v2.1 CONFLICTS+= texlive-tetex<=2011nb1 INFO_FILES= yes TEXLIVE_IGNORE_PATTERNS= texmf-dist/doc/info/[kw]* \ - texmf-dist/doc/man/man1/k* \ - texmf-dist/doc/man/man1/mko* \ - texmf-dist/doc/man/man1/mktex[l-z]* \ - texmf-dist/doc/man/man1/t* + texmf-dist/doc/man -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-kpathsea-doc/PLIST b/print/tex-kpathsea-doc/PLIST index b66cc5965f3..2f19c9816a4 100644 --- a/print/tex-kpathsea-doc/PLIST +++ b/print/tex-kpathsea-doc/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2013/11/17 17:12:19 minskim Exp $ +@comment $NetBSD: PLIST,v 1.4 2020/05/10 03:56:41 markd Exp $ info/tds.info -man/man1/mktexfmt.1 share/texmf-dist/doc/kpathsea/kpathsea.html share/texmf-dist/doc/kpathsea/kpathsea.pdf share/texmf-dist/doc/web2c/web2c.html diff --git a/print/tex-kpathsea-doc/distinfo b/print/tex-kpathsea-doc/distinfo index 45df41290c0..2702f1d7ad9 100644 --- a/print/tex-kpathsea-doc/distinfo +++ b/print/tex-kpathsea-doc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2019/05/14 12:37:40 markd Exp $ +$NetBSD: distinfo,v 1.19 2020/05/10 03:56:41 markd Exp $ -SHA1 (tex-kpathsea-51016/kpathsea.doc.tar.xz) = d3efa746d0471040998edc997cd1294d7f3e45fa -RMD160 (tex-kpathsea-51016/kpathsea.doc.tar.xz) = a017a74e22da0cb1df3754f435b840d84863b0ab -SHA512 (tex-kpathsea-51016/kpathsea.doc.tar.xz) = bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c -Size (tex-kpathsea-51016/kpathsea.doc.tar.xz) = 1068236 bytes +SHA1 (kpathsea.doc.r54764.tar.xz) = 935e6b567e3d2f7938d17421f2053c0a03e40b78 +RMD160 (kpathsea.doc.r54764.tar.xz) = ee8ce81753a78eb9dbc75ffef7d3b4e5e55ea8fb +SHA512 (kpathsea.doc.r54764.tar.xz) = e5fe31bf22af5ef40e03a7b88e43cab1c1a45ce4c55e93d634d89ddbfb87bd0c7d25901dc1e8756695f75bd28181c7e39690ea67511bac3a0f8c906bcd44f0fb +Size (kpathsea.doc.r54764.tar.xz) = 1066612 bytes diff --git a/print/tex-kpathsea/Makefile b/print/tex-kpathsea/Makefile index 3a5995a6f90..71dd598142e 100644 --- a/print/tex-kpathsea/Makefile +++ b/print/tex-kpathsea/Makefile @@ -1,18 +1,26 @@ -# $NetBSD: Makefile,v 1.22 2020/01/18 23:34:20 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2020/05/10 03:56:41 markd Exp $ DISTNAME= kpathsea -PKGNAME= tex-${DISTNAME}-2019 -TEXLIVE_REV= 51016 +PKGNAME= tex-${DISTNAME}-2020 +TEXLIVE_REV= 54764 MAINTAINER= minskim@NetBSD.org HOMEPAGE= https://ctan.org/pkg/kpathsea COMMENT= Translation tables for TeX -LICENSE= gnu-lgpl-v2 +LICENSE= gnu-lgpl-v2.1 CONFLICTS+= tex-bin-kpathsea-[0-9]* CONFLICTS+= texlive-tetex<=2011nb2 SUPERSEDES= tex-bin-kpathsea<=2008.12897 +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Setting paths to commands. +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= texmf-dist/web2c/mktex.opt texmf-dist/web2c/mktexdir \ + texmf-dist/web2c/mktexnam texmf-dist/web2c/mktexnam.opt \ + texmf-dist/web2c/mktexupd +SUBST_SED.paths= -e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' + PKG_SYSCONFSUBDIR= texmf MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c @@ -21,10 +29,7 @@ CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/fmtutil.cnf \ TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist -TEXLIVE_IGNORE_PATTERNS= texmf-dist/web2c/mktex.opt \ - texmf-dist/web2c/mktex[a-z]* \ - texmf-dist/web2c/texmf.cnf +TEXLIVE_IGNORE_PATTERNS= texmf-dist/web2c/texmf.cnf -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-kpathsea/PLIST b/print/tex-kpathsea/PLIST index a6e4e87c389..4580f3db4d1 100644 --- a/print/tex-kpathsea/PLIST +++ b/print/tex-kpathsea/PLIST @@ -1,24 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2013/11/17 17:12:19 minskim Exp $ -share/texmf-dist/web2c/amiga-pl.tcx -share/texmf-dist/web2c/cp1250cs.tcx -share/texmf-dist/web2c/cp1250pl.tcx -share/texmf-dist/web2c/cp1250t1.tcx -share/texmf-dist/web2c/cp227.tcx -share/texmf-dist/web2c/cp852-cs.tcx -share/texmf-dist/web2c/cp852-pl.tcx -share/texmf-dist/web2c/cp8bit.tcx -share/texmf-dist/web2c/empty.tcx -share/texmf-dist/web2c/fmtutil.cnf -share/texmf-dist/web2c/il1-t1.tcx -share/texmf-dist/web2c/il2-cs.tcx -share/texmf-dist/web2c/il2-pl.tcx -share/texmf-dist/web2c/il2-t1.tcx -share/texmf-dist/web2c/kam-cs.tcx -share/texmf-dist/web2c/kam-t1.tcx -share/texmf-dist/web2c/macce-pl.tcx -share/texmf-dist/web2c/macce-t1.tcx -share/texmf-dist/web2c/maz-pl.tcx -share/texmf-dist/web2c/mktex.cnf -share/texmf-dist/web2c/natural.tcx -share/texmf-dist/web2c/tcvn-t5.tcx -share/texmf-dist/web2c/viscii-t5.tcx +Kpathsea is a library and utility programs which provide path +searching facilities for TeX file types, including the +self-locating feature required for movable installations, +layered on top of a general search mechanism. It is not +distributed separately, but rather is released and maintained +as part of the TeX live sources. diff --git a/print/tex-kpathsea/distinfo b/print/tex-kpathsea/distinfo index d1a5c99e441..c2f4490fd3a 100644 --- a/print/tex-kpathsea/distinfo +++ b/print/tex-kpathsea/distinfo @@ -1,7 +1,12 @@ -$NetBSD: distinfo,v 1.19 2019/05/14 12:37:40 markd Exp $ +$NetBSD: distinfo,v 1.20 2020/05/10 03:56:41 markd Exp $ -SHA1 (tex-kpathsea-51016/kpathsea.tar.xz) = dc071ba35f1c4af5e1896807ec2c612b8c55eaaf -RMD160 (tex-kpathsea-51016/kpathsea.tar.xz) = 4d0b5d343152d075bab16deb3fc3ce6e59b68521 -SHA512 (tex-kpathsea-51016/kpathsea.tar.xz) = 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d -Size (tex-kpathsea-51016/kpathsea.tar.xz) = 31480 bytes -SHA1 (patch-texmf-dist_web2c_fmtutil.cnf) = 5b6692f7dc793ea853337f33dde5cf6da5175213 +SHA1 (kpathsea.r54764.tar.xz) = 8dfe8d70f68068a72874f269806b84ca8d78357e +RMD160 (kpathsea.r54764.tar.xz) = 460b263b695678fb7ed9e2d94a78603a02d41bbd +SHA512 (kpathsea.r54764.tar.xz) = 8fb0bb4dac85e1b4ecc273cb7430c86726896728e2b157dccc727289df95668d78f8604b4d04c168cd35ab44be617a317edfdd1d5ccd726bf2956b9e47da7b90 +Size (kpathsea.r54764.tar.xz) = 32300 bytes +SHA1 (patch-texmf-dist_web2c_fmtutil.cnf) = 3d89bb0073a8e8f1120932d584199e57df67b5e4 +SHA1 (patch-texmf-dist_web2c_mktex.opt) = 1b74cf2cd00d1831d9eacf272913ccc9a5c10539 +SHA1 (patch-texmf-dist_web2c_mktexdir) = a09f91ed257c4f8ffdabc5fcfac6f82458b73e76 +SHA1 (patch-texmf-dist_web2c_mktexnam) = 350d837d18199b23336d7437a3172675e87b83f0 +SHA1 (patch-texmf-dist_web2c_mktexnam.opt) = 13c3bcf6c251fdea32402af7b905d3ac3c37f72b +SHA1 (patch-texmf-dist_web2c_mktexupd) = b4159ee7f407366f9d5a6a2ed206d26cd4dcb469 diff --git a/print/tex-kpathsea/patches/patch-texmf-dist_web2c_fmtutil.cnf b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_fmtutil.cnf index 1f6a033138b..08917139687 100644 --- a/print/tex-kpathsea/patches/patch-texmf-dist_web2c_fmtutil.cnf +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_fmtutil.cnf @@ -1,13 +1,13 @@ -$NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.4 2019/05/14 12:37:40 markd Exp $ +$NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.5 2020/05/10 03:56:41 markd Exp $ ---- texmf-dist/web2c/fmtutil.cnf.orig 2019-03-23 01:25:33.000000000 +0000 +start with nothing set. populated by TEX_FORMATS + +--- texmf-dist/web2c/fmtutil.cnf.orig 2020-04-15 23:56:36.000000000 +0000 +++ texmf-dist/web2c/fmtutil.cnf -@@ -35,103 +35,3 @@ - # - # 4) usual comments start with "# ", whereas disabled configurations - # start with "#! " in this file. -- --# +@@ -41,120 +41,3 @@ + # 5) The entries in the main TeX Live fmtutil.cnf are created from the + # AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here. + # -# from aleph: -aleph aleph - *aleph.ini -lamed aleph language.dat *lambda.ini @@ -29,10 +29,10 @@ $NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.4 2019/05/14 12:37:40 markd Exp -# -# 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 +-pdfcsplain pdftex - -etex -enc csplain-utf8.ini +-pdfcsplain xetex - -etex csplain.ini -# -# from eplain: -eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini @@ -42,19 +42,30 @@ $NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.4 2019/05/14 12:37:40 markd Exp -pdfjadetex pdftex language.dat *pdfjadetex.ini -# -# from latex-bin: +-dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini -latex pdftex language.dat -translate-file=cp227.tcx *latex.ini +-lualatex luahbtex language.dat,language.dat.lua lualatex.ini -pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini --dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini --lualatex luatex language.dat,language.dat.lua lualatex.ini --#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini +-# +-# from latex-bin-dev: +-dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini +-latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini +-lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini +-pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini -# -# from lollipop: -lollipop tex - lollipop.ini -# +-# from luahbtex: +-luahbtex luahbtex language.def,language.dat.lua luatex.ini +-# +-# from luajittex: +-luajithbtex luajithbtex language.def,language.dat.lua luatex.ini +-luajittex luajittex language.def,language.dat.lua luatex.ini +-# -# from luatex: --luatex luatex language.def,language.dat.lua luatex.ini -dviluatex luatex language.def,language.dat.lua dviluatex.ini --luajittex luajittex language.def,language.dat.lua luatex.ini +-luatex luatex language.def,language.dat.lua luatex.ini -# -# from metafont: -mf mf-nowin - -translate-file=cp227.tcx mf.ini @@ -74,17 +85,21 @@ $NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.4 2019/05/14 12:37:40 markd Exp -# from mptopdf: -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex -# +-# from optex: +-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 -# -# from platex: -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 -# -# from tex: -tex tex - tex.ini @@ -94,15 +109,19 @@ $NetBSD: patch-texmf-dist_web2c_fmtutil.cnf,v 1.4 2019/05/14 12:37:40 markd Exp -# -# from uplatex: -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 +-# +-# from xelatex-dev: +-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 -# -# from xmltex: --xmltex pdftex language.dat *xmltex.ini -pdfxmltex pdftex language.dat *pdfxmltex.ini +-xmltex pdftex language.dat *xmltex.ini diff --git a/print/kpathsea/patches/patch-ad b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktex.opt index d6db51cfe48..7665c1df0b2 100644 --- a/print/kpathsea/patches/patch-ad +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktex.opt @@ -1,7 +1,9 @@ -$NetBSD: patch-ad,v 1.2 2015/06/14 11:12:37 markd Exp $ +$NetBSD: patch-texmf-dist_web2c_mktex.opt,v 1.1 2020/05/10 03:56:41 markd Exp $ ---- mktex.opt.orig 2014-07-18 23:38:50.000000000 +0000 -+++ mktex.opt +use full path for commands + +--- texmf-dist/web2c/mktex.opt.orig 2014-07-18 23:38:50.000000000 +0000 ++++ texmf-dist/web2c/mktex.opt @@ -10,7 +10,7 @@ if test "x$1" = x--help || test "x$1" = exit 0 elif test "x$1" = x--version || test "x$1" = x-version; then diff --git a/print/kpathsea/patches/patch-ag b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexdir index 316ee6ba674..7598a1e8ec8 100644 --- a/print/kpathsea/patches/patch-ag +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexdir @@ -1,7 +1,9 @@ -$NetBSD: patch-ag,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-texmf-dist_web2c_mktexdir,v 1.1 2020/05/10 03:56:41 markd Exp $ ---- mktexdir.orig 2009-06-03 06:07:17.000000000 -0700 -+++ mktexdir +use full path for commands + +--- texmf-dist/web2c/mktexdir.orig 2009-06-03 06:07:17.000000000 -0700 ++++ texmf-dist/web2c/mktexdir @@ -12,8 +12,8 @@ usage="Usage: $0 DIRS... mt_max_args=$# diff --git a/print/kpathsea/patches/patch-ae b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexnam index ea7760270a4..77a80218b27 100644 --- a/print/kpathsea/patches/patch-ae +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexnam @@ -1,7 +1,9 @@ -$NetBSD: patch-ae,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-texmf-dist_web2c_mktexnam,v 1.1 2020/05/10 03:56:41 markd Exp $ ---- mktexnam.orig 2009-06-03 06:07:23.000000000 -0700 -+++ mktexnam +use full path for commands + +--- texmf-dist/web2c/mktexnam.orig 2009-06-03 06:07:23.000000000 -0700 ++++ texmf-dist/web2c/mktexnam @@ -9,8 +9,8 @@ usage="Usage: $0 NAME [DPI MODE] [DESTDI mt_max_args=4 diff --git a/print/kpathsea/patches/patch-af b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexnam.opt index 44daa25c4fe..098121ce850 100644 --- a/print/kpathsea/patches/patch-af +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexnam.opt @@ -1,7 +1,9 @@ -$NetBSD: patch-af,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-texmf-dist_web2c_mktexnam.opt,v 1.1 2020/05/10 03:56:41 markd Exp $ ---- mktexnam.opt.orig 2009-06-03 06:07:23.000000000 -0700 -+++ mktexnam.opt +use full path for commands + +--- texmf-dist/web2c/mktexnam.opt.orig 2009-06-03 06:07:23.000000000 -0700 ++++ texmf-dist/web2c/mktexnam.opt @@ -24,9 +24,9 @@ case "$MT_FEATURES" in MT_PKDESTREL='pk/$MT_MODE/$MT_NAMEPART' MT_TFMDESTREL='tfm/$MT_NAMEPART' diff --git a/print/kpathsea/patches/patch-ac b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexupd index 4c5191cbe1f..03694c703cc 100644 --- a/print/kpathsea/patches/patch-ac +++ b/print/tex-kpathsea/patches/patch-texmf-dist_web2c_mktexupd @@ -1,7 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-texmf-dist_web2c_mktexupd,v 1.1 2020/05/10 03:56:41 markd Exp $ ---- mktexupd.orig 2009-06-03 06:07:18.000000000 -0700 -+++ mktexupd +use full path for commands + +--- texmf-dist/web2c/mktexupd.orig 2009-06-03 06:07:18.000000000 -0700 ++++ texmf-dist/web2c/mktexupd @@ -10,8 +10,8 @@ mt_min_args=2 mt_max_args=2 diff --git a/print/tex-latex-doc/Makefile b/print/tex-latex-doc/Makefile index 779200fa81c..8c238160428 100644 --- a/print/tex-latex-doc/Makefile +++ b/print/tex-latex-doc/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.16 2020/01/18 23:34:22 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2020/05/10 03:56:42 markd Exp $ DISTNAME= latex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-20181201 -TEXLIVE_REV= 49390 +PKGNAME= tex-${DISTNAME:S/./-/}-20200202.5 +TEXLIVE_REV= 53958 MAINTAINER= minskim@NetBSD.org HOMEPAGE= https://ctan.org/pkg/latex COMMENT= Documentation for tex-latex LICENSE= lppl-1.3c -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-latex-doc/PLIST b/print/tex-latex-doc/PLIST index e4c0e7d002a..b3992ffbe15 100644 --- a/print/tex-latex-doc/PLIST +++ b/print/tex-latex-doc/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2019/01/28 10:58:05 markd Exp $ -share/texmf-dist/doc/latex/base/README.txt -share/texmf-dist/doc/latex/base/TEMPLATE-IncludeInRelease.txt +@comment $NetBSD: PLIST,v 1.8 2020/05/10 03:56:42 markd Exp $ +share/texmf-dist/doc/latex/base/README.md share/texmf-dist/doc/latex/base/alltt.pdf share/texmf-dist/doc/latex/base/bugs.txt share/texmf-dist/doc/latex/base/cfgguide.pdf share/texmf-dist/doc/latex/base/cfgguide.tex -share/texmf-dist/doc/latex/base/changes-doc.txt share/texmf-dist/doc/latex/base/changes.old.txt share/texmf-dist/doc/latex/base/changes.txt share/texmf-dist/doc/latex/base/classes.pdf @@ -22,10 +20,6 @@ share/texmf-dist/doc/latex/base/exscale.pdf share/texmf-dist/doc/latex/base/fix-cm.pdf share/texmf-dist/doc/latex/base/fntguide.pdf share/texmf-dist/doc/latex/base/fntguide.tex -share/texmf-dist/doc/latex/base/fontdef.pdf -share/texmf-dist/doc/latex/base/github-0049.pdf -share/texmf-dist/doc/latex/base/github-0081.pdf -share/texmf-dist/doc/latex/base/github-0081b.pdf share/texmf-dist/doc/latex/base/graphpap.pdf share/texmf-dist/doc/latex/base/ifthen.pdf share/texmf-dist/doc/latex/base/inputenc.pdf @@ -42,13 +36,72 @@ share/texmf-dist/doc/latex/base/lgc2.pdf share/texmf-dist/doc/latex/base/lppl-1-0.txt share/texmf-dist/doc/latex/base/lppl-1-1.txt share/texmf-dist/doc/latex/base/lppl-1-2.txt -share/texmf-dist/doc/latex/base/lppl.pdf -share/texmf-dist/doc/latex/base/lppl.tex share/texmf-dist/doc/latex/base/lppl.txt -share/texmf-dist/doc/latex/base/ltclass.pdf share/texmf-dist/doc/latex/base/ltluatex.pdf share/texmf-dist/doc/latex/base/ltnews.pdf share/texmf-dist/doc/latex/base/ltnews.tex +share/texmf-dist/doc/latex/base/ltnews01.pdf +share/texmf-dist/doc/latex/base/ltnews01.tex +share/texmf-dist/doc/latex/base/ltnews02.pdf +share/texmf-dist/doc/latex/base/ltnews02.tex +share/texmf-dist/doc/latex/base/ltnews03.pdf +share/texmf-dist/doc/latex/base/ltnews03.tex +share/texmf-dist/doc/latex/base/ltnews04.pdf +share/texmf-dist/doc/latex/base/ltnews04.tex +share/texmf-dist/doc/latex/base/ltnews05.pdf +share/texmf-dist/doc/latex/base/ltnews05.tex +share/texmf-dist/doc/latex/base/ltnews06.pdf +share/texmf-dist/doc/latex/base/ltnews06.tex +share/texmf-dist/doc/latex/base/ltnews07.pdf +share/texmf-dist/doc/latex/base/ltnews07.tex +share/texmf-dist/doc/latex/base/ltnews08.pdf +share/texmf-dist/doc/latex/base/ltnews08.tex +share/texmf-dist/doc/latex/base/ltnews09.pdf +share/texmf-dist/doc/latex/base/ltnews09.tex +share/texmf-dist/doc/latex/base/ltnews10.pdf +share/texmf-dist/doc/latex/base/ltnews10.tex +share/texmf-dist/doc/latex/base/ltnews11.pdf +share/texmf-dist/doc/latex/base/ltnews11.tex +share/texmf-dist/doc/latex/base/ltnews12.pdf +share/texmf-dist/doc/latex/base/ltnews12.tex +share/texmf-dist/doc/latex/base/ltnews13.pdf +share/texmf-dist/doc/latex/base/ltnews13.tex +share/texmf-dist/doc/latex/base/ltnews14.pdf +share/texmf-dist/doc/latex/base/ltnews14.tex +share/texmf-dist/doc/latex/base/ltnews15.pdf +share/texmf-dist/doc/latex/base/ltnews15.tex +share/texmf-dist/doc/latex/base/ltnews16.pdf +share/texmf-dist/doc/latex/base/ltnews16.tex +share/texmf-dist/doc/latex/base/ltnews17.pdf +share/texmf-dist/doc/latex/base/ltnews17.tex +share/texmf-dist/doc/latex/base/ltnews18.pdf +share/texmf-dist/doc/latex/base/ltnews18.tex +share/texmf-dist/doc/latex/base/ltnews19.pdf +share/texmf-dist/doc/latex/base/ltnews19.tex +share/texmf-dist/doc/latex/base/ltnews20.pdf +share/texmf-dist/doc/latex/base/ltnews20.tex +share/texmf-dist/doc/latex/base/ltnews21.pdf +share/texmf-dist/doc/latex/base/ltnews21.tex +share/texmf-dist/doc/latex/base/ltnews22.pdf +share/texmf-dist/doc/latex/base/ltnews22.tex +share/texmf-dist/doc/latex/base/ltnews23.pdf +share/texmf-dist/doc/latex/base/ltnews23.tex +share/texmf-dist/doc/latex/base/ltnews24.pdf +share/texmf-dist/doc/latex/base/ltnews24.tex +share/texmf-dist/doc/latex/base/ltnews25.pdf +share/texmf-dist/doc/latex/base/ltnews25.tex +share/texmf-dist/doc/latex/base/ltnews26.pdf +share/texmf-dist/doc/latex/base/ltnews26.tex +share/texmf-dist/doc/latex/base/ltnews27.pdf +share/texmf-dist/doc/latex/base/ltnews27.tex +share/texmf-dist/doc/latex/base/ltnews28.pdf +share/texmf-dist/doc/latex/base/ltnews28.tex +share/texmf-dist/doc/latex/base/ltnews29.pdf +share/texmf-dist/doc/latex/base/ltnews29.tex +share/texmf-dist/doc/latex/base/ltnews30.pdf +share/texmf-dist/doc/latex/base/ltnews30.tex +share/texmf-dist/doc/latex/base/ltnews31.pdf +share/texmf-dist/doc/latex/base/ltnews31.tex share/texmf-dist/doc/latex/base/ltx3info.pdf share/texmf-dist/doc/latex/base/ltx3info.tex share/texmf-dist/doc/latex/base/ltxdoc.pdf @@ -67,7 +120,6 @@ share/texmf-dist/doc/latex/base/source2e.tex share/texmf-dist/doc/latex/base/syntonly.pdf share/texmf-dist/doc/latex/base/tex2.txt share/texmf-dist/doc/latex/base/texpert.txt -share/texmf-dist/doc/latex/base/tlb1144.pdf share/texmf-dist/doc/latex/base/tlc2.err share/texmf-dist/doc/latex/base/tlc2.pdf share/texmf-dist/doc/latex/base/tulm.pdf diff --git a/print/tex-latex-doc/distinfo b/print/tex-latex-doc/distinfo index 108fd59fb93..bcd1e61a964 100644 --- a/print/tex-latex-doc/distinfo +++ b/print/tex-latex-doc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2019/01/28 10:58:05 markd Exp $ +$NetBSD: distinfo,v 1.15 2020/05/10 03:56:42 markd Exp $ -SHA1 (tex-latex-49390/latex.doc.tar.xz) = f409c23a7aaa7a3d7de3b029ed20743f9ee8d2bd -RMD160 (tex-latex-49390/latex.doc.tar.xz) = c76d2bf9ca8e404fbe6a03521f850c7e0da21d82 -SHA512 (tex-latex-49390/latex.doc.tar.xz) = 3b1fdbd4951ace07edf8c43c8cac1ae657c7853d3cc232bc35c75be4a19a9883148374025d661101e4d4a87d7c163f78f4d2fb4670b2581f0a9a49f59a947cf2 -Size (tex-latex-49390/latex.doc.tar.xz) = 13653776 bytes +SHA1 (latex.doc.r53958.tar.xz) = 1ef547264091cdd40788a34a3b07f72531e4eeff +RMD160 (latex.doc.r53958.tar.xz) = d6c366caa9200ba1988c4929874f1c834d761f6d +SHA512 (latex.doc.r53958.tar.xz) = 043858d0c636c83f1e641b72b330475383e0ae04de43bf80437fc51130519c8ab5985a60a2ac5a1bc77a1ce0072ca7367994728e8d83a6cf7796ef50caffc23b +Size (latex.doc.r53958.tar.xz) = 17592484 bytes diff --git a/print/tex-latex/Makefile b/print/tex-latex/Makefile index 91ce62fe4be..512b80601d1 100644 --- a/print/tex-latex/Makefile +++ b/print/tex-latex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2020/01/18 23:34:21 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2020/05/10 03:56:41 markd Exp $ DISTNAME= latex -PKGNAME= tex-${DISTNAME}-20181201 -TEXLIVE_REV= 49390 +PKGNAME= tex-${DISTNAME}-20200202.5 +TEXLIVE_REV= 53958 MAINTAINER= minskim@NetBSD.org HOMEPAGE= https://ctan.org/pkg/latex @@ -14,6 +14,5 @@ DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts DEPENDS+= tex-luatex-[0-9]*:../../print/tex-luatex DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-latex/PLIST b/print/tex-latex/PLIST index 85510a5524b..b2c1273eaa1 100644 --- a/print/tex-latex/PLIST +++ b/print/tex-latex/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2018/05/12 03:21:30 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2020/05/10 03:56:41 markd Exp $ share/texmf-dist/makeindex/latex/gglo.ist share/texmf-dist/makeindex/latex/gind.ist share/texmf-dist/tex/latex/base/alltt.sty @@ -59,6 +59,7 @@ share/texmf-dist/tex/latex/base/leqno.clo share/texmf-dist/tex/latex/base/leqno.sty share/texmf-dist/tex/latex/base/letter.cls share/texmf-dist/tex/latex/base/letter.sty +share/texmf-dist/tex/latex/base/ltexpl.ltx share/texmf-dist/tex/latex/base/ltluatex.lua share/texmf-dist/tex/latex/base/ltluatex.tex share/texmf-dist/tex/latex/base/ltnews.cls @@ -133,6 +134,7 @@ share/texmf-dist/tex/latex/base/t2benc.dfu share/texmf-dist/tex/latex/base/t2cenc.dfu share/texmf-dist/tex/latex/base/testpage.tex share/texmf-dist/tex/latex/base/texsys.cfg +share/texmf-dist/tex/latex/base/textcomp-2018-08-11.sty share/texmf-dist/tex/latex/base/textcomp.sty share/texmf-dist/tex/latex/base/tracefnt.sty share/texmf-dist/tex/latex/base/ts1cmr.fd @@ -153,6 +155,7 @@ share/texmf-dist/tex/latex/base/ucmss.fd share/texmf-dist/tex/latex/base/ucmtt.fd share/texmf-dist/tex/latex/base/ulasy.fd share/texmf-dist/tex/latex/base/ullasy.fd +share/texmf-dist/tex/latex/base/utf8-2018.def share/texmf-dist/tex/latex/base/utf8.def share/texmf-dist/tex/latex/base/utf8enc.dfu share/texmf-dist/tex/latex/base/x2enc.dfu diff --git a/print/tex-latex/distinfo b/print/tex-latex/distinfo index d7471cd6023..70f2113f6e5 100644 --- a/print/tex-latex/distinfo +++ b/print/tex-latex/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2019/01/28 10:58:05 markd Exp $ +$NetBSD: distinfo,v 1.16 2020/05/10 03:56:41 markd Exp $ -SHA1 (tex-latex-49390/latex.tar.xz) = a89e426642a33760d8d85c85bd1b1ee5039d214e -RMD160 (tex-latex-49390/latex.tar.xz) = 7708875e337053899229d2d5c33ac9d786b8b159 -SHA512 (tex-latex-49390/latex.tar.xz) = 6d520e2164d259a62872b21af5b416c66eceec8ab490e1b8379158988e3be3ccbf613cba6f3dead9dca685e6108db91e9da71e8c032865b4a9c687005fa2ca15 -Size (tex-latex-49390/latex.tar.xz) = 157692 bytes +SHA1 (latex.r53958.tar.xz) = e5ac46f41d314681742ae6717f7a32e21f70f026 +RMD160 (latex.r53958.tar.xz) = d65586fa29b84013a34ff9375795dc4f2d69d583 +SHA512 (latex.r53958.tar.xz) = cf8f91ef3dbfe100597a779a369adc5ebb18c298408d60f6c4453abdbf40315e32bc7b9a943ccaf03dbfe6cf0a43cb0bc942c6ec04ca07cd7bd23c7cf239a7be +Size (latex.r53958.tar.xz) = 168896 bytes diff --git a/print/tex-luahbtex-doc/DESCR b/print/tex-luahbtex-doc/DESCR new file mode 100644 index 00000000000..60086f4d981 --- /dev/null +++ b/print/tex-luahbtex-doc/DESCR @@ -0,0 +1 @@ +Documentation for tex-luahbtex. diff --git a/print/tex-luahbtex-doc/Makefile b/print/tex-luahbtex-doc/Makefile new file mode 100644 index 00000000000..6ebe04ae35e --- /dev/null +++ b/print/tex-luahbtex-doc/Makefile @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:42 markd Exp $ + +DISTNAME= luahbtex.doc +PKGNAME= tex-${DISTNAME:S/./-/}-1.12.0 +TEXLIVE_REV= 54498 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://ctan.org/pkg/luahbtex +COMMENT= Documentation for tex-luahbtex +LICENSE= gnu-gpl-v2 + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-luahbtex-doc/PLIST b/print/tex-luahbtex-doc/PLIST new file mode 100644 index 00000000000..be440133207 --- /dev/null +++ b/print/tex-luahbtex-doc/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:42 markd Exp $ +man/man1/luahbtex.1 diff --git a/print/tex-luahbtex-doc/distinfo b/print/tex-luahbtex-doc/distinfo new file mode 100644 index 00000000000..4b8fcd81f6b --- /dev/null +++ b/print/tex-luahbtex-doc/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:42 markd Exp $ + +SHA1 (luahbtex.doc.r54498.tar.xz) = eb6b59c610bb33dd9c6b8afcb112ab8ec13410b2 +RMD160 (luahbtex.doc.r54498.tar.xz) = 21aacec5ce183eaad9237ee05ecc2671f39ec0ef +SHA512 (luahbtex.doc.r54498.tar.xz) = 044c7db9ca4ff5d212552f49bdfa36da682b498453fa5b2df40dd85cb33df9aca55ee95b997d6bc747578f0918cf7b992ef4e1394d66733865be1f814c320d20 +Size (luahbtex.doc.r54498.tar.xz) = 30240 bytes diff --git a/print/tex-luahbtex/DESCR b/print/tex-luahbtex/DESCR new file mode 100644 index 00000000000..ea03972602e --- /dev/null +++ b/print/tex-luahbtex/DESCR @@ -0,0 +1 @@ +LuaTeX with HarfBuzz library for glyph shaping diff --git a/print/tex-luahbtex/Makefile b/print/tex-luahbtex/Makefile new file mode 100644 index 00000000000..bd595cc0e8c --- /dev/null +++ b/print/tex-luahbtex/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:42 markd Exp $ + +DISTNAME= luahbtex +PKGNAME= tex-${DISTNAME}-1.12.0 +TEXLIVE_REV= 54498 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://ctan.org/pkg/luatex +COMMENT= LuaTeX with HarfBuzz library for glyph shaping +LICENSE= gnu-gpl-v2 + +DEPENDS+= tex-luatex-[0-9]*:../../print/tex-luatex +DEPENDS+= tex-cm-[0-9]*:../../fonts/tex-cm +DEPENDS+= tex-etex-[0-9]*:../../print/tex-etex +DEPENDS+= tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base +DEPENDS+= tex-knuth-lib-[0-9]*:../../fonts/tex-knuth-lib +DEPENDS+= tex-plain-[0-9]*:../../print/tex-plain +DEPENDS+= tex-tex-ini-files-[0-9]*:../../print/tex-tex-ini-files +DEPENDS+= tex-unicode-data-[0-9]*:../../print/tex-unicode-data +DEPENDS+= tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8 + +TEX_FORMATS+= "luahbtex luahbtex language.def,language.dat.lua luatex.ini\\n" + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-luahbtex/PLIST b/print/tex-luahbtex/PLIST new file mode 100644 index 00000000000..ca00cad5c3e --- /dev/null +++ b/print/tex-luahbtex/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:42 markd Exp $ diff --git a/print/tex-luahbtex/distinfo b/print/tex-luahbtex/distinfo new file mode 100644 index 00000000000..99401016722 --- /dev/null +++ b/print/tex-luahbtex/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:42 markd Exp $ + +SHA1 (luahbtex.r54498.tar.xz) = 0debdfe76144539641345ba1778f320f2a235a83 +RMD160 (luahbtex.r54498.tar.xz) = cccb0ac36668ee29efa4d154da2916f04e45b294 +SHA512 (luahbtex.r54498.tar.xz) = bffea9c260475928b1e40bda867d2dd2198f96aa08923cc63c5ba512d2490fcf1e8db686729cc04b0e62cae1dfededd13d4eeeae5ad321b42a9bf1219c0248aa +Size (luahbtex.r54498.tar.xz) = 460 bytes diff --git a/print/tex-luatex-doc/Makefile b/print/tex-luatex-doc/Makefile index b05cd57682e..07d1c79dc9f 100644 --- a/print/tex-luatex-doc/Makefile +++ b/print/tex-luatex-doc/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.17 2019/12/06 20:21:56 markd Exp $ +# $NetBSD: Makefile,v 1.18 2020/05/10 03:56:42 markd Exp $ DISTNAME= luatex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-1.10.0 -TEXLIVE_REV= 50602 +PKGNAME= tex-${DISTNAME:S/./-/}-1.12.0 +TEXLIVE_REV= 54610 MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.luatex.org/ COMMENT= Documentation for tex-luatex LICENSE= gnu-gpl-v2 -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-luatex-doc/distinfo b/print/tex-luatex-doc/distinfo index e9a77b2c9b0..2ad95ff58d5 100644 --- a/print/tex-luatex-doc/distinfo +++ b/print/tex-luatex-doc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.16 2019/05/14 12:25:36 markd Exp $ +$NetBSD: distinfo,v 1.17 2020/05/10 03:56:42 markd Exp $ -SHA1 (tex-luatex-50602/luatex.doc.tar.xz) = 63c60b617673052b4fedbce1f722ca17d282b4da -RMD160 (tex-luatex-50602/luatex.doc.tar.xz) = b6ef0d7b6bb9ff5332924b5110c936ce97ea854d -SHA512 (tex-luatex-50602/luatex.doc.tar.xz) = 5084702c17f70541fb6def483908cdf9f60cde4c142501aad47498547acba117580284f00c502f7feba0d27dc8e5939d9d8c92e11f498ee03ad654b4be9d8ae0 -Size (tex-luatex-50602/luatex.doc.tar.xz) = 1681640 bytes +SHA1 (luatex.doc.r54610.tar.xz) = 8f1a74a5e7a069afce6a64f1574ee5764e6c4f41 +RMD160 (luatex.doc.r54610.tar.xz) = e65dc93eedefd2bc70f530db298f6d1b71431ccc +SHA512 (luatex.doc.r54610.tar.xz) = 29628b252dc464c1095be066f959e15ebbd1d553d751a0670eb3e0aaa1c68ca4af79b41b9d4073a28279ed85c33c51c259c79bf87c3224838dd7c786b4d609ff +Size (luatex.doc.r54610.tar.xz) = 1898588 bytes diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index cd003011015..523a2d7d897 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2019/12/06 20:21:56 markd Exp $ +# $NetBSD: Makefile,v 1.24 2020/05/10 03:56:42 markd Exp $ DISTNAME= luatex -PKGNAME= tex-${DISTNAME}-1.10.0 -TEXLIVE_REV= 50602 +PKGNAME= tex-${DISTNAME}-1.12.0 +TEXLIVE_REV= 54610 MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.luatex.org/ @@ -11,6 +11,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= luatex>=0.60.1:../../print/luatex DEPENDS+= tex-etex-[0-9]*:../../print/tex-etex +DEPENDS+= tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8 DEPENDS+= tex-tex-ini-files-[0-9]*:../../print/tex-tex-ini-files DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex DEPENDS+= tex-plain>=3.14159265.12854:../../print/tex-plain @@ -42,7 +43,6 @@ INSTALLATION_DIRS+= bin TEX_FORMATS+= "luatex luatex language.def,language.dat.lua luatex.ini\\ndviluatex luatex language.def,language.dat.lua dviluatex.ini\\n" -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" post-install: diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo index 293cf5ddfc9..3cd083adc41 100644 --- a/print/tex-luatex/distinfo +++ b/print/tex-luatex/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.20 2019/05/14 12:25:36 markd Exp $ +$NetBSD: distinfo,v 1.21 2020/05/10 03:56:42 markd Exp $ -SHA1 (tex-luatex-50602/luatex.tar.xz) = 1bc55ee7634756e8aaf2e369b83d5dc13935a39a -RMD160 (tex-luatex-50602/luatex.tar.xz) = 8fb9800fbdef7326349b8e82e71f66771fcb50ac -SHA512 (tex-luatex-50602/luatex.tar.xz) = 4706ab295a8cc72b6fbafa92132bbef82be4241f2b6b04a20230f763ae52e1a3be112b951d0537ef1c0fd64acb81be6726e71151b45332e90d70b05f3f8c2ccd -Size (tex-luatex-50602/luatex.tar.xz) = 12932 bytes -SHA1 (patch-texmf-dist_web2c_texmfcnf.lua) = c0b2d2d4fa801abd69af721b35f526e4f22bedfb +SHA1 (luatex.r54610.tar.xz) = e1a7a3fe88dff97c1024fdd276f6ea45bdc432b4 +RMD160 (luatex.r54610.tar.xz) = d9ad6a3d82915af5e17a2782145d73c3c70d78ca +SHA512 (luatex.r54610.tar.xz) = 0db087a6c28019439e8da70dddbc4e2976368b12fee766aabd7bd9e3276c9d4369e4487182fa4e296691de4a9b3975ccdf575e136f1f554fa2245e0903557ad0 +Size (luatex.r54610.tar.xz) = 12904 bytes +SHA1 (patch-texmf-dist_web2c_texmfcnf.lua) = c8dc0c060801bc3ae442425847ca2ff7c3036baf diff --git a/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua b/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua index 1f950c16a44..79ab5518157 100644 --- a/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua +++ b/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua @@ -1,4 +1,4 @@ -$NetBSD: patch-texmf-dist_web2c_texmfcnf.lua,v 1.4 2019/05/14 12:25:36 markd Exp $ +$NetBSD: patch-texmf-dist_web2c_texmfcnf.lua,v 1.5 2020/05/10 03:56:42 markd Exp $ Set paths to texmf trees for pkgsrc. @@ -14,7 +14,7 @@ Set paths to texmf trees for pkgsrc. - TEXMFSYSVAR = "selfautoparent:texmf-var", + TEXMFSYSVAR = "@VARBASE@/lib/texmf", - TEXMFVAR = "home:.texlive2019/texmf-var", + TEXMFVAR = "home:.texlive2020/texmf-var", -- We have only one cache path but there can be more. The first writable one @@ -62,10 +64,10 @@ return { diff --git a/print/tex-newfloat-doc/DESCR b/print/tex-newfloat-doc/DESCR new file mode 100644 index 00000000000..498769a7eaa --- /dev/null +++ b/print/tex-newfloat-doc/DESCR @@ -0,0 +1 @@ +Documentation for tex-newfloat. diff --git a/print/tex-newfloat-doc/Makefile b/print/tex-newfloat-doc/Makefile new file mode 100644 index 00000000000..4928e176c07 --- /dev/null +++ b/print/tex-newfloat-doc/Makefile @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:42 markd Exp $ + +DISTNAME= newfloat.doc +PKGNAME= tex-${DISTNAME:S/./-/}-1.1l +TEXLIVE_REV= 52906 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://ctan.org/pkg/newfloat +COMMENT= Documentation for tex-newfloat +LICENSE= lppl-1.3c + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-newfloat-doc/PLIST b/print/tex-newfloat-doc/PLIST new file mode 100644 index 00000000000..ebb89d40796 --- /dev/null +++ b/print/tex-newfloat-doc/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:42 markd Exp $ +share/texmf-dist/doc/latex/newfloat/CHANGELOG +share/texmf-dist/doc/latex/newfloat/README +share/texmf-dist/doc/latex/newfloat/SUMMARY +share/texmf-dist/doc/latex/newfloat/newfloat.pdf diff --git a/print/tex-newfloat-doc/distinfo b/print/tex-newfloat-doc/distinfo new file mode 100644 index 00000000000..e39bb87c89b --- /dev/null +++ b/print/tex-newfloat-doc/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:42 markd Exp $ + +SHA1 (newfloat.doc.r52906.tar.xz) = c593452616fac827dda1727cc932b1cc33103e65 +RMD160 (newfloat.doc.r52906.tar.xz) = 35aa596147fe8c1f7e47e954b16b19628a9fd8c1 +SHA512 (newfloat.doc.r52906.tar.xz) = 4a9b942a072ac5da1e92f6ecd63ff16cda41195403794c8a111140d4d6af43947875828d497f7824bdcfd41ca03ece22469ed5e0fbec0cdd84c56471678cd469 +Size (newfloat.doc.r52906.tar.xz) = 100188 bytes diff --git a/print/tex-newfloat/DESCR b/print/tex-newfloat/DESCR new file mode 100644 index 00000000000..f5326b57948 --- /dev/null +++ b/print/tex-newfloat/DESCR @@ -0,0 +1,4 @@ +The package offers the command \DeclareFloatingEnvironment, +which the user may use to define new floating environments +which behave like the LaTeX standard foating environments +figure and table. diff --git a/print/tex-newfloat/Makefile b/print/tex-newfloat/Makefile new file mode 100644 index 00000000000..29315ede29a --- /dev/null +++ b/print/tex-newfloat/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:42 markd Exp $ + +DISTNAME= newfloat +PKGNAME= tex-${DISTNAME}-1.1l +TEXLIVE_REV= 52906 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://ctan.org/pkg/newfloat +COMMENT= Define new floating environments +LICENSE= lppl-1.3c + +DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-newfloat/PLIST b/print/tex-newfloat/PLIST new file mode 100644 index 00000000000..58ea5fbc71b --- /dev/null +++ b/print/tex-newfloat/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:42 markd Exp $ +share/texmf-dist/tex/latex/newfloat/newfloat.sty diff --git a/print/tex-newfloat/distinfo b/print/tex-newfloat/distinfo new file mode 100644 index 00000000000..f0ec46dfd57 --- /dev/null +++ b/print/tex-newfloat/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:42 markd Exp $ + +SHA1 (newfloat.r52906.tar.xz) = a50822dc35010e5fc5901255c63fce63cad9ff55 +RMD160 (newfloat.r52906.tar.xz) = e14f9dd9f685b4d7ce83ed74d9e0aec80a3d4784 +SHA512 (newfloat.r52906.tar.xz) = 2cd4d1e5097bd6b9abd25621fe64590e67f8933a5292f83277dd546cb949c6193af04e16a72e61c3023293f6471ed41e9b46c23dd4c6c19428c7875cf0279aa8 +Size (newfloat.r52906.tar.xz) = 5592 bytes diff --git a/print/tex-pdftools-doc/DESCR b/print/tex-pdftools-doc/DESCR deleted file mode 100644 index 6e287b7fd8d..00000000000 --- a/print/tex-pdftools-doc/DESCR +++ /dev/null @@ -1 +0,0 @@ -This is documentation for tex-pdftools. diff --git a/print/tex-pdftools-doc/Makefile b/print/tex-pdftools-doc/Makefile deleted file mode 100644 index b1977bfb693..00000000000 --- a/print/tex-pdftools-doc/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2019/12/06 20:23:02 markd Exp $ - -DISTNAME= pdftools.doc -PKGNAME= tex-${DISTNAME:S/./-/}-0.86 -TEXLIVE_REV= 37078 - -MAINTAINER= minskim@NetBSD.org -COMMENT= Documentation for tex-pdftools -LICENSE= public-domain - -TEXLIVE_IGNORE_PATTERNS+= texmf-dist/doc/man/man1/pdf* - -TEXLIVE_UNVERSIONED= yes -.include "../../print/texlive/package.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-pdftools-doc/PLIST b/print/tex-pdftools-doc/PLIST deleted file mode 100644 index b51abf3a2f4..00000000000 --- a/print/tex-pdftools-doc/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/27 19:03:37 minskim Exp $ -man/man1/e2pall.1 diff --git a/print/tex-pdftools-doc/distinfo b/print/tex-pdftools-doc/distinfo deleted file mode 100644 index 8931ef33425..00000000000 --- a/print/tex-pdftools-doc/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 01:02:35 agc Exp $ - -SHA1 (tex-pdftools-37078/pdftools.doc.tar.xz) = 097b894aac3bfe7c54af6e6057574cbd02a4cd1c -RMD160 (tex-pdftools-37078/pdftools.doc.tar.xz) = bca67c36afed76a4b93397456992c6b4900f04dc -SHA512 (tex-pdftools-37078/pdftools.doc.tar.xz) = e4e212d9df0293b0f8f38cff221a671a04c81537c08ef68d203114d138f38d14713aa2abba33d7e68368e032fafedef8a3923fcb8f4fc52343f3d49b43d07b26 -Size (tex-pdftools-37078/pdftools.doc.tar.xz) = 21032 bytes diff --git a/print/tex-pdftools/DESCR b/print/tex-pdftools/DESCR deleted file mode 100644 index 2add24aee08..00000000000 --- a/print/tex-pdftools/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package provides PDF-related utilities for TeX Live. diff --git a/print/tex-pdftools/Makefile b/print/tex-pdftools/Makefile deleted file mode 100644 index 7ead9cd4b27..00000000000 --- a/print/tex-pdftools/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2019/12/06 20:23:01 markd Exp $ - -DISTNAME= pdftools -PKGNAME= tex-${DISTNAME}-0.86 -PKGREVISION= 3 -TEXLIVE_REV= 37078 - -MAINTAINER= minskim@NetBSD.org -COMMENT= PDF-related utilities, including PostScript-to-PDF conversion -LICENSE= public-domain - -CONFLICTS= texlive-pdftools<2011 -DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf -DEPENDS+= tex-oberdiek>=2011:../../print/tex-oberdiek -DEPENDS+= tex-pst-pdf-[0-9]*:../../graphics/tex-pst-pdf -DEPENDS+= web2c-[0-9]*:../../print/web2c - -USE_TOOLS+= perl:run - -REPLACE_PERL+= bin/e2pall - -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Setting paths to commands. -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= bin/e2pall -SUBST_SED.paths+= -e 's,@EPSTOPDF@,${LOCALBASE}/bin/epstopdf,g' - -INSTALLATION_DIRS+= bin -TEX_TEXMF_DIRS= # empty - -TEXLIVE_UNVERSIONED= yes -.include "../../print/texlive/package.mk" -.include "options.mk" - -post-extract: - ${MKDIR} ${WRKSRC}/bin - ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/e2pall.pl \ - ${WRKSRC}/bin/e2pall - -.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-pdftools/PLIST b/print/tex-pdftools/PLIST deleted file mode 100644 index 8a93e601b5d..00000000000 --- a/print/tex-pdftools/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/27 19:03:24 minskim Exp $ -bin/e2pall diff --git a/print/tex-pdftools/distinfo b/print/tex-pdftools/distinfo deleted file mode 100644 index bc8aea13ba2..00000000000 --- a/print/tex-pdftools/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 01:02:35 agc Exp $ - -SHA1 (tex-pdftools-37078/pdftools.tar.xz) = f05bcb0eb0eae317b513e863b77cfd96431ec685 -RMD160 (tex-pdftools-37078/pdftools.tar.xz) = 8250cd3743fc73d27dff58593727943dd569365a -SHA512 (tex-pdftools-37078/pdftools.tar.xz) = 2614ae836c4b4aa07baa0a1e9b9b949c0a6b6c1821cfe45ce8642dc9b2d393638d8176a37b264eeabb83ef7a13a4eff439c2b0b56d80f6dddf1fbc494de6ee48 -Size (tex-pdftools-37078/pdftools.tar.xz) = 1856 bytes -SHA1 (patch-bin_e2pall) = 48ffe6471de86f09b45f9aa8a2d1b58400a2ecee diff --git a/print/tex-pdftools/options.mk b/print/tex-pdftools/options.mk deleted file mode 100644 index f02a61d965e..00000000000 --- a/print/tex-pdftools/options.mk +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: options.mk,v 1.2 2019/11/04 19:58:07 rillig Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.tex-pdftools -PKG_SUPPORTED_OPTIONS+= x11 -PKG_SUGGESTED_OPTIONS+= x11 - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mx11) -DEPENDS+= xpdfopen-[0-9]*:../../print/xpdfopen -.endif diff --git a/print/tex-tetex-doc/DESCR b/print/tex-tetex-doc/DESCR deleted file mode 100644 index 23c00f89f50..00000000000 --- a/print/tex-tetex-doc/DESCR +++ /dev/null @@ -1 +0,0 @@ -This is documentation for tex-tetex. diff --git a/print/tex-tetex-doc/Makefile b/print/tex-tetex-doc/Makefile deleted file mode 100644 index 23686fb6275..00000000000 --- a/print/tex-tetex-doc/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: Makefile,v 1.23 2019/12/06 20:23:26 markd Exp $ - -DISTNAME= tetex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-3.0.50602 -TEXLIVE_REV= 50602 - -MAINTAINER= minskim@NetBSD.org -COMMENT= Documentation for tex-tetex - -TEXLIVE_UNVERSIONED= yes -.include "../../print/texlive/package.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-tetex-doc/PLIST b/print/tex-tetex-doc/PLIST deleted file mode 100644 index c1e91066e73..00000000000 --- a/print/tex-tetex-doc/PLIST +++ /dev/null @@ -1,23 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2018/05/13 10:41:47 markd Exp $ -man/man1/allcm.1 -man/man1/allec.1 -man/man1/allneeded.1 -man/man1/dvi2fax.1 -man/man1/dvired.1 -man/man1/fmtutil-sys.1 -man/man1/fmtutil-user.1 -man/man1/fmtutil.1 -man/man1/kpsepath.1 -man/man1/kpsetool.1 -man/man1/kpsewhere.1 -man/man1/kpsexpand.1 -man/man1/texconfig-sys.1 -man/man1/texconfig.1 -man/man1/texlinks.1 -man/man1/updmap-sys.1 -man/man1/updmap-user.1 -man/man1/updmap.1 -man/man5/fmtutil.cnf.5 -man/man5/updmap.cfg.5 -share/texmf-dist/doc/tetex/TETEXDOC.pdf -share/texmf-dist/doc/tetex/teTeX-FAQ diff --git a/print/tex-tetex-doc/distinfo b/print/tex-tetex-doc/distinfo deleted file mode 100644 index 0355fcd0a3b..00000000000 --- a/print/tex-tetex-doc/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.22 2019/05/14 12:30:20 markd Exp $ - -SHA1 (tex-tetex-50602/tetex.doc.tar.xz) = ec1b85ab1fbeedc7fe944d3510750700894479ff -RMD160 (tex-tetex-50602/tetex.doc.tar.xz) = 485ec051cf74424d5a6879a9a19bf5619fd00cb9 -SHA512 (tex-tetex-50602/tetex.doc.tar.xz) = c7e93facf796e2b4b5ab15fc9ad902f9078e9b032704de429410ae1f74fa4e9ccdf417ff24655d44d4c79574426d084c3a8fccda95ac4b180609debcc5e0d04c -Size (tex-tetex-50602/tetex.doc.tar.xz) = 525316 bytes diff --git a/print/tex-tetex/DESCR b/print/tex-tetex/DESCR deleted file mode 100644 index 906af6f83a6..00000000000 --- a/print/tex-tetex/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package provides encoding and map files for dvips and dvipdfm -used by updmap. diff --git a/print/tex-tetex/INSTALL b/print/tex-tetex/INSTALL deleted file mode 100644 index 5111b5c3972..00000000000 --- a/print/tex-tetex/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: INSTALL,v 1.1 2011/11/06 08:43:28 minskim Exp $ - -case "${STAGE}" in -POST-INSTALL) - @UPDMAP_SYS@ - ;; -esac diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile deleted file mode 100644 index a2fbd0e09e1..00000000000 --- a/print/tex-tetex/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# $NetBSD: Makefile,v 1.34 2019/12/06 20:23:26 markd Exp $ - -DISTNAME= tetex -PKGNAME= tex-${DISTNAME}-3.0.50602 -PKGREVISION= 1 -TEXLIVE_REV= 50602 - -MAINTAINER= minskim@NetBSD.org -COMMENT= Supplementary files for updmap - -CONFLICTS= texlive-tetex<=2011nb1 -DEPENDS+= dialog>=1.0:../../misc/dialog -DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea -DEPENDS+= tex-kpathsea>=2012nb1:../../print/tex-kpathsea -DEPENDS+= tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra - -USE_TOOLS+= perl:run sh:run - -FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys - -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Setting paths to commands. -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= bin/fmtutil bin/fmtutil-sys bin/kpsetool bin/kpsewhere \ - bin/texconfig bin/texconfig-dialog bin/texconfig-sys \ - bin/texlinks bin/updmap bin/updmap-sys \ - texmf-dist/texconfig/tcfmgr -SUBST_SED.paths+= -e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g' -SUBST_SED.paths+= -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' -SUBST_SED.paths+= -e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' -SUBST_SED.paths+= -e 's,@MKTEXLSR@,${LOCALBASE}/bin/mktexlsr,g' -SUBST_SED.paths+= -e 's,@TEXCONF_DIALOG@,${LOCALBASE}/bin/texconfig-dialog,g' -SUBST_SED.paths+= -e 's,@TEXLINKS@,${LOCALBASE}/bin/texlnks,g' -SUBST_SED.paths+= -e 's,@TEXCONFIG@,${LOCALBASE}/bin/texconfig,g' -SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g' - -REPLACE_PERL= bin/updmap bin/fmtutil texmf-dist/scripts/texlive/mktexlsr.pl -REPLACE_SH= bin/allcm bin/allneeded bin/dvi2fax bin/dvired \ - bin/fmtutil-sys bin/fmtutil-user bin/kpsetool bin/kpsewhere \ - bin/texconfig bin/texconfig-dialog bin/texconfig-sys bin/texlinks \ - bin/updmap-sys bin/updmap-user \ - texmf-dist/texconfig/tcfmgr - -PKG_SYSCONFSUBDIR= texmf - -MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c -CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \ - ${PKG_SYSCONFDIR}/web2c/updmap.cfg - -TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist - -TEXLIVE_UNVERSIONED= yes -.include "../../print/texlive/package.mk" - -post-extract: - ${MKDIR} ${WRKSRC}/bin -.for script in fmtutil-sys.sh fmtutil-user.sh texconfig-dialog.sh \ - texconfig-sys.sh texconfig.sh texlinks.sh - ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ - ${WRKSRC}/bin/${script:S/.sh//} -.endfor -.for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh kpsetool.sh \ - kpsewhere.sh updmap-sys.sh updmap-user.sh updmap.pl fmtutil.pl - ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ - ${WRKSRC}/bin/${script:S/.pl//:S/.sh//} -.endfor - ${CHMOD} +x ${WRKSRC}/texmf-dist/texconfig/tcfmgr -# ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/mktexlsr.pl ${WRKSRC}/bin -# ${RMDIR} -p ${WRKSRC}/texmf-dist/scripts/texlive 2>/dev/null || ${TRUE} - -post-install: - ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec - ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath - ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand - ${LN} -sf fmtutil ${DESTDIR}${PREFIX}/bin/mktexfmt - -.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-tetex/PLIST b/print/tex-tetex/PLIST deleted file mode 100644 index 1a830bf218b..00000000000 --- a/print/tex-tetex/PLIST +++ /dev/null @@ -1,60 +0,0 @@ -@comment $NetBSD: PLIST,v 1.12 2018/05/13 10:41:47 markd Exp $ -bin/allcm -bin/allec -bin/allneeded -bin/dvi2fax -bin/dvired -bin/fmtutil -bin/fmtutil-sys -bin/fmtutil-user -bin/kpsepath -bin/kpsetool -bin/kpsewhere -bin/kpsexpand -bin/mktexfmt -bin/texconfig -bin/texconfig-dialog -bin/texconfig-sys -bin/texlinks -bin/updmap -bin/updmap-sys -bin/updmap-user -share/texmf-dist/dvips/tetex/config.builtin35 -share/texmf-dist/dvips/tetex/config.dfaxhigh -share/texmf-dist/dvips/tetex/config.dfaxlo -share/texmf-dist/dvips/tetex/config.download35 -share/texmf-dist/dvips/tetex/config.gsftopk -share/texmf-dist/dvips/tetex/config.maxmem -share/texmf-dist/dvips/tetex/config.outline -share/texmf-dist/dvips/tetex/config.pdf -share/texmf-dist/dvips/tetex/config.pk -share/texmf-dist/dvips/tetex/config.www -share/texmf-dist/fonts/enc/dvips/tetex/09fbbfac.enc -share/texmf-dist/fonts/enc/dvips/tetex/0ef0afca.enc -share/texmf-dist/fonts/enc/dvips/tetex/10037936.enc -share/texmf-dist/fonts/enc/dvips/tetex/1b6d048e.enc -share/texmf-dist/fonts/enc/dvips/tetex/71414f53.enc -share/texmf-dist/fonts/enc/dvips/tetex/74afc74c.enc -share/texmf-dist/fonts/enc/dvips/tetex/aae443f0.enc -share/texmf-dist/fonts/enc/dvips/tetex/b6a4d7c7.enc -share/texmf-dist/fonts/enc/dvips/tetex/bbad153f.enc -share/texmf-dist/fonts/enc/dvips/tetex/d9b29452.enc -share/texmf-dist/fonts/enc/dvips/tetex/f7b6d320.enc -share/texmf-dist/fonts/enc/dvips/tetex/mtex.enc -share/texmf-dist/fonts/map/dvips/tetex/Makefile -share/texmf-dist/fonts/map/dvips/tetex/README -share/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx -share/texmf-dist/fonts/map/dvips/tetex/base14flags.tex -share/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map -share/texmf-dist/fonts/map/dvips/tetex/dvips35.map -share/texmf-dist/fonts/map/dvips/tetex/mathpple.map -share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map -share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map -share/texmf-dist/scripts/texlive/mktexlsr.pl -share/texmf-dist/texconfig/README -share/texmf-dist/texconfig/g/generic -share/texmf-dist/texconfig/tcfmgr -share/texmf-dist/texconfig/tcfmgr.map -share/texmf-dist/texconfig/v/vt100 -share/texmf-dist/texconfig/x/xterm -share/texmf-dist/web2c/updmap.cfg diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo deleted file mode 100644 index bbcfe55745f..00000000000 --- a/print/tex-tetex/distinfo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: distinfo,v 1.23 2019/05/14 12:30:20 markd Exp $ - -SHA1 (tex-tetex-50602/tetex.tar.xz) = f90a7a8bb838022c6415c4b1e7b5ddeeb2b48c56 -RMD160 (tex-tetex-50602/tetex.tar.xz) = fc1c83c30865658e742f666fe7d781b8e42523f7 -SHA512 (tex-tetex-50602/tetex.tar.xz) = 03a91e91b2d6382c7eb1e15ea79280ff5fbb4b93572b10156b684a44fc5f13a02ac90588bd9b8098a3601c0239d7ed641e779d61c6cee1f082cafe488deb312e -Size (tex-tetex-50602/tetex.tar.xz) = 71620 bytes -SHA1 (patch-bin_fmtutil) = 8f9ba0248ef7a1b56e73ef3a0ab062e2358e76ae -SHA1 (patch-bin_fmtutil-sys) = 41720ed218bbf9980772dc61ead757a3f0633d6b -SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb -SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e -SHA1 (patch-bin_texconfig) = a856c9467e6a54477621f59016de290137afe2e2 -SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa -SHA1 (patch-bin_texconfig-sys) = 8d17ef9242da8d3f541501938aa5cb1f20828343 -SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b -SHA1 (patch-bin_updmap) = 43553a8f887aec7b83cb746a913f0a5fd94b22da -SHA1 (patch-bin_updmap-sys) = e8b7248482f1e59ad9be556e5bc222fd41bd514c -SHA1 (patch-texmf-dist_texconfig_tcfmgr) = f530f1f57a7bec42fcc4ee06dbf6c655f631d635 -SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 31792e4182969f44dc29097f4d0c7d7c65f16482 diff --git a/print/tex-texlive-docindex-doc/Makefile b/print/tex-texlive-docindex-doc/Makefile index 5064df4e11b..dcb1dc84e80 100644 --- a/print/tex-texlive-docindex-doc/Makefile +++ b/print/tex-texlive-docindex-doc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2019/12/06 20:23:28 markd Exp $ +# $NetBSD: Makefile,v 1.6 2020/05/10 03:56:44 markd Exp $ DISTNAME= texlive-docindex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-2014 -TEXLIVE_REV= 36749 +PKGNAME= tex-${DISTNAME:S/./-/}-2020 +TEXLIVE_REV= 55037 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Documentation for tex-texlive-docindex @@ -15,7 +15,6 @@ SUBST_SED.paths= -e 's,<a href="texmf,<a href="../../texmf,g' INSTALLATION_DIRS+= share/doc/texlive -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" do-install: diff --git a/print/tex-texlive-docindex-doc/distinfo b/print/tex-texlive-docindex-doc/distinfo index f867d6e54d4..2bfdd571225 100644 --- a/print/tex-texlive-docindex-doc/distinfo +++ b/print/tex-texlive-docindex-doc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:02:50 agc Exp $ +$NetBSD: distinfo,v 1.6 2020/05/10 03:56:44 markd Exp $ -SHA1 (tex-texlive-docindex-36749/texlive-docindex.doc.tar.xz) = d277545a83f2f7dbab0b3f370100fe5cc43d14b7 -RMD160 (tex-texlive-docindex-36749/texlive-docindex.doc.tar.xz) = 52adfbeb3ad84485e58973127733f03d733d289f -SHA512 (tex-texlive-docindex-36749/texlive-docindex.doc.tar.xz) = 01f22d40556f28f8da748316272d51a5f6fa2e339cfb838542ec6d1682a8a1dbc35098a348963746612779ecd416e659cabfa5e2480752f286f3e28f9e5c0ab7 -Size (tex-texlive-docindex-36749/texlive-docindex.doc.tar.xz) = 105852 bytes +SHA1 (texlive-docindex.doc.r55037.tar.xz) = 192b0e2ef18e89fece6d80b6782eaf0f815441cb +RMD160 (texlive-docindex.doc.r55037.tar.xz) = 8a28ee04891d93ab7674370fd1842f78449b319d +SHA512 (texlive-docindex.doc.r55037.tar.xz) = ee5c58dd739f90f6dd1a721d70109d2735a1d27f3585213f3e78172116996f6ad7916bc65e52fa4d505a6cc8490f401089f1be2cc21e8a7ec95d85fd470de1ee +Size (texlive-docindex.doc.r55037.tar.xz) = 161672 bytes diff --git a/print/tex-texlive-docindex/DESCR b/print/tex-texlive-docindex/DESCR deleted file mode 100644 index 26d71592615..00000000000 --- a/print/tex-texlive-docindex/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This package provides the top-level TeX Live doc.html and other -support files. diff --git a/print/tex-texlive-docindex/Makefile b/print/tex-texlive-docindex/Makefile deleted file mode 100644 index 326fddf7d5d..00000000000 --- a/print/tex-texlive-docindex/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2019/12/06 20:23:28 markd Exp $ - -DISTNAME= texlive-docindex -PKGNAME= tex-${DISTNAME}-2014 -TEXLIVE_REV= 36749 - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Top-level TeX Live doc.html, etc - -TEXLIVE_UNVERSIONED= yes -.include "../../print/texlive/package.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-texlive-docindex/PLIST b/print/tex-texlive-docindex/PLIST deleted file mode 100644 index 90dce6dbb2e..00000000000 --- a/print/tex-texlive-docindex/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2013/11/13 18:36:14 minskim Exp $ -share/texmf-dist/scripts/texlive/var/texcatalogue.keywords diff --git a/print/tex-texlive-docindex/distinfo b/print/tex-texlive-docindex/distinfo deleted file mode 100644 index 949db728e27..00000000000 --- a/print/tex-texlive-docindex/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:02:50 agc Exp $ - -SHA1 (tex-texlive-docindex-36749/texlive-docindex.tar.xz) = 269f275eaba55e139a044ddfce7b3bd9fa08c625 -RMD160 (tex-texlive-docindex-36749/texlive-docindex.tar.xz) = 4012d50d9b5af3142358d449c5a1f4139983c68b -SHA512 (tex-texlive-docindex-36749/texlive-docindex.tar.xz) = 50271bc219d5dbf561bd9a927188b5a05a3be311ee8041f4195791673b0fb6ac2f83943341b8c6939a750dde6a5993c92ea294f60283c5e6e0099203852d3b80 -Size (tex-texlive-docindex-36749/texlive-docindex.tar.xz) = 109876 bytes diff --git a/print/tex-texlive-scripts-doc/DESCR b/print/tex-texlive-scripts-doc/DESCR new file mode 100644 index 00000000000..1a06e501f3c --- /dev/null +++ b/print/tex-texlive-scripts-doc/DESCR @@ -0,0 +1 @@ +Documentation for tex-texlive-scripts. diff --git a/print/tex-texlive-scripts-doc/Makefile b/print/tex-texlive-scripts-doc/Makefile new file mode 100644 index 00000000000..b3d6cc30800 --- /dev/null +++ b/print/tex-texlive-scripts-doc/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:44 markd Exp $ + +DISTNAME= texlive-scripts.doc +PKGNAME= tex-${DISTNAME:S/./-/}-2020 +TEXLIVE_REV= 55050 + +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Documentation for tex-texlive-scripts +LICENSE= gnu-gpl-v2 AND public-domain + +post-install: + ${RM} ${DESTDIR}${PREFIX}/man/man1/install-tl.1 + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-texlive-scripts-doc/PLIST b/print/tex-texlive-scripts-doc/PLIST new file mode 100644 index 00000000000..dd136151099 --- /dev/null +++ b/print/tex-texlive-scripts-doc/PLIST @@ -0,0 +1,14 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:44 markd Exp $ +man/man1/fmtutil-sys.1 +man/man1/fmtutil-user.1 +man/man1/fmtutil.1 +man/man1/mktexfmt.1 +man/man1/mktexmf.1 +man/man1/mktexpk.1 +man/man1/mktextfm.1 +man/man1/texhash.1 +man/man1/updmap-sys.1 +man/man1/updmap-user.1 +man/man1/updmap.1 +man/man5/fmtutil.cnf.5 +man/man5/updmap.cfg.5 diff --git a/print/tex-texlive-scripts-doc/distinfo b/print/tex-texlive-scripts-doc/distinfo new file mode 100644 index 00000000000..38588956afe --- /dev/null +++ b/print/tex-texlive-scripts-doc/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:44 markd Exp $ + +SHA1 (texlive-scripts.doc.r55050.tar.xz) = 945bc3d5cfb196c008eba0bc2b1a322d756b2275 +RMD160 (texlive-scripts.doc.r55050.tar.xz) = 1d36dd39ebb39bd3a052cb94fc5e447fe3b1067c +SHA512 (texlive-scripts.doc.r55050.tar.xz) = 5c1cbbb49eb812aee2eb1efdf71d561e48e8a670dc88905df5253c805a9e5e84d124893d4e4d2523af1c33f66fbfe4273b4cf70264bda54fe38a6391e4d51ea0 +Size (texlive-scripts.doc.r55050.tar.xz) = 219376 bytes diff --git a/print/tex-texlive-scripts-extra-doc/DESCR b/print/tex-texlive-scripts-extra-doc/DESCR new file mode 100644 index 00000000000..1b77c083c54 --- /dev/null +++ b/print/tex-texlive-scripts-extra-doc/DESCR @@ -0,0 +1 @@ +Documentation for tex-texlive-scripts-extra. diff --git a/print/tex-texlive-scripts-extra-doc/Makefile b/print/tex-texlive-scripts-extra-doc/Makefile new file mode 100644 index 00000000000..7fe176f1107 --- /dev/null +++ b/print/tex-texlive-scripts-extra-doc/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:45 markd Exp $ + +DISTNAME= texlive-scripts-extra.doc +PKGNAME= tex-${DISTNAME:S/./-/}-2020 +TEXLIVE_REV= 54744 + +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Documentation for tex-texlive-scripts-extra +LICENSE= gnu-gpl-v2 AND public-domain + +# remove manual pages installed by web2c +post-install: + ${RM} ${DESTDIR}${PREFIX}/man/man1/mkocp.1 + ${RM} ${DESTDIR}${PREFIX}/man/man1/mkofm.1 + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-texlive-scripts-extra-doc/PLIST b/print/tex-texlive-scripts-extra-doc/PLIST new file mode 100644 index 00000000000..ecaba543128 --- /dev/null +++ b/print/tex-texlive-scripts-extra-doc/PLIST @@ -0,0 +1,16 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:45 markd Exp $ +man/man1/allcm.1 +man/man1/allec.1 +man/man1/allneeded.1 +man/man1/dvi2fax.1 +man/man1/dvired.1 +man/man1/e2pall.1 +man/man1/kpsepath.1 +man/man1/kpsetool.1 +man/man1/kpsewhere.1 +man/man1/kpsexpand.1 +man/man1/ps2frag.1 +man/man1/pslatex.1 +man/man1/texconfig-sys.1 +man/man1/texconfig.1 +man/man1/texlinks.1 diff --git a/print/tex-texlive-scripts-extra-doc/distinfo b/print/tex-texlive-scripts-extra-doc/distinfo new file mode 100644 index 00000000000..4e1bad91684 --- /dev/null +++ b/print/tex-texlive-scripts-extra-doc/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:45 markd Exp $ + +SHA1 (texlive-scripts-extra.doc.r54744.tar.xz) = 8b5b99e755b7ac6cf79772d6beaeb8012517ffa3 +RMD160 (texlive-scripts-extra.doc.r54744.tar.xz) = 70bd8712d261db9342d13d289df56e53f9ceceb6 +SHA512 (texlive-scripts-extra.doc.r54744.tar.xz) = 56f9be73e3318ea684c536b90645b572caf437b16339104bcedfb7517c94745a514a8e185033c2338aeccae868a123a5a137b9b07b20d661fa473bde2c28797b +Size (texlive-scripts-extra.doc.r54744.tar.xz) = 195144 bytes diff --git a/print/tex-texlive-scripts-extra/DESCR b/print/tex-texlive-scripts-extra/DESCR new file mode 100644 index 00000000000..5c428ed170e --- /dev/null +++ b/print/tex-texlive-scripts-extra/DESCR @@ -0,0 +1,3 @@ +Miscellaneous scripts maintained as part of TeX Live, but not +important for the infrastructure. Thus, this is not part of +scheme-infraonly or tlcritical, just a normal package. diff --git a/print/tex-texlive-scripts-extra/Makefile b/print/tex-texlive-scripts-extra/Makefile new file mode 100644 index 00000000000..794beafc552 --- /dev/null +++ b/print/tex-texlive-scripts-extra/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.1 2020/05/10 03:56:44 markd Exp $ + +DISTNAME= texlive-scripts-extra +PKGNAME= tex-${DISTNAME}-2020 +TEXLIVE_REV= 54744 + +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= More TeXLive scripts +LICENSE= gnu-gpl-v2 AND public-domain + +DEPENDS+= dialog>=1.0:../../misc/dialog +DEPENDS+= tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts +DEPENDS+= ps2eps>=1.68:../../graphics/ps2eps +DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin +DEPENDS+= tex-pslatex-[0-9]*:../../print/tex-pslatex +DEPENDS+= tex-epstopdf-[0-9]*:../../graphics/tex-epstopdf +DEPENDS+= tex-pst-pdf-[0-9]*:../../graphics/tex-pst-pdf + +USE_TOOLS+= perl:run sh:run + +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Setting paths to commands. +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= bin/kpsetool bin/kpsewhere \ + bin/texconfig bin/texconfig-dialog bin/texconfig-sys \ + bin/texlinks \ + texmf-dist/texconfig/tcfmgr +SUBST_SED.paths+= -e 's,@DIALOG@,${PREFIX}/bin/dialog,g' +SUBST_SED.paths+= -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' +SUBST_SED.paths+= -e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' +SUBST_SED.paths+= -e 's,@MKTEXLSR@,${PREFIX}/bin/mktexlsr,g' +SUBST_SED.paths+= -e 's,@TEXCONF_DIALOG@,${PREFIX}/bin/texconfig-dialog,g' +SUBST_SED.paths+= -e 's,@TEXLINKS@,${PREFIX}/bin/texlnks,g' +SUBST_SED.paths+= -e 's,@TEXCONFIG@,${PREFIX}/bin/texconfig,g' +SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g' +SUBST_SED.paths+= -e 's,@EPSTOPDF@,${PREFIX}/bin/epstopdf,g' + +REPLACE_PERL= bin/e2pall +REPLACE_SH= bin/allcm bin/allneeded bin/dvi2fax bin/dvired \ + bin/kpsetool bin/kpsewhere bin/ps2frag bin/pslatex \ + bin/texconfig bin/texconfig-dialog bin/texconfig-sys bin/texlinks \ + texmf-dist/texconfig/tcfmgr + +#TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf-dist + +.include "../../print/texlive/package.mk" + +post-extract: + ${MKDIR} ${WRKSRC}/bin +.for script in texconfig-dialog.sh texconfig-sys.sh texconfig.sh texlinks.sh + ${MV} ${WRKSRC}/texmf-dist/scripts/texlive-extra/${script} \ + ${WRKSRC}/bin/${script:S/.sh//} +.endfor +.for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh e2pall.pl \ + kpsetool.sh kpsewhere.sh ps2frag.sh pslatex.sh + ${MV} ${WRKSRC}/texmf-dist/scripts/texlive-extra/${script} \ + ${WRKSRC}/bin/${script:S/.pl//:S/.sh//} +.endfor + ${CHMOD} +x ${WRKSRC}/texmf-dist/texconfig/tcfmgr + +post-install: + ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec + ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath + ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand + +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-texlive-scripts-extra/PLIST b/print/tex-texlive-scripts-extra/PLIST new file mode 100644 index 00000000000..a0a50ba3d5b --- /dev/null +++ b/print/tex-texlive-scripts-extra/PLIST @@ -0,0 +1,23 @@ +@comment $NetBSD: PLIST,v 1.1 2020/05/10 03:56:44 markd Exp $ +bin/allcm +bin/allec +bin/allneeded +bin/dvi2fax +bin/dvired +bin/e2pall +bin/kpsepath +bin/kpsetool +bin/kpsewhere +bin/kpsexpand +bin/ps2frag +bin/pslatex +bin/texconfig-dialog +bin/texconfig-sys +bin/texconfig +bin/texlinks +share/texmf-dist/texconfig/README +share/texmf-dist/texconfig/g/generic +share/texmf-dist/texconfig/tcfmgr +share/texmf-dist/texconfig/tcfmgr.map +share/texmf-dist/texconfig/v/vt100 +share/texmf-dist/texconfig/x/xterm diff --git a/print/tex-texlive-scripts-extra/distinfo b/print/tex-texlive-scripts-extra/distinfo new file mode 100644 index 00000000000..742ef8b502e --- /dev/null +++ b/print/tex-texlive-scripts-extra/distinfo @@ -0,0 +1,14 @@ +$NetBSD: distinfo,v 1.1 2020/05/10 03:56:44 markd Exp $ + +SHA1 (texlive-scripts-extra.r54744.tar.xz) = 61afa58af8fbff76b6012dbe13e6b1df8c4ce162 +RMD160 (texlive-scripts-extra.r54744.tar.xz) = c8c14f8e5ca2522bc816dcbe79162acdfcd56c5f +SHA512 (texlive-scripts-extra.r54744.tar.xz) = e46691aa10b961d2359359fdf00ebc86a1b881b3d1126c52f3863343d21eba00110cd9500fb03a4a9544a3d8fb443bbdc90aa2f6216b8e62a3edb0acc58e4c75 +Size (texlive-scripts-extra.r54744.tar.xz) = 23540 bytes +SHA1 (patch-bin_e2pall) = e8d08dc3082a1cdda05fea5bdfe4996b68d3401b +SHA1 (patch-bin_kpsetool) = 6eb57faed69cd64cbd0bb744bcb0701bba00b6f7 +SHA1 (patch-bin_kpsewhere) = ff0459b542ddd31c7b970ad8fcd65023c66701eb +SHA1 (patch-bin_texconfig) = 09713996bfefd1a94beaf5ebabf5adf6fddbd9c4 +SHA1 (patch-bin_texconfig-dialog) = add288966c170b10cd51b92d4339c178dd0dc5c6 +SHA1 (patch-bin_texconfig-sys) = 7bf4fbf29e5e7584e559494a5a018af4baef0a21 +SHA1 (patch-bin_texlinks) = 9507f62bcc6f5aec12dad126b1464c5427a63a5a +SHA1 (patch-texmf-dist_texconfig_tcfmgr) = fd640c9e2e812074ce343c62635921c5c54fe2e3 diff --git a/print/tex-pdftools/patches/patch-bin_e2pall b/print/tex-texlive-scripts-extra/patches/patch-bin_e2pall index b8a7f3c3263..1c66b1f20ce 100644 --- a/print/tex-pdftools/patches/patch-bin_e2pall +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_e2pall @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_e2pall,v 1.1.1.1 2011/10/27 19:03:24 minskim Exp $ +$NetBSD: patch-bin_e2pall,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/e2pall.orig 2008-03-03 18:51:04.000000000 +0000 +++ bin/e2pall diff --git a/print/tex-tetex/patches/patch-bin_kpsetool b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsetool index ad6c1239c0c..7ba6cd48497 100644 --- a/print/tex-tetex/patches/patch-bin_kpsetool +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsetool @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_kpsetool,v 1.1 2012/10/13 22:38:20 minskim Exp $ +$NetBSD: patch-bin_kpsetool,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/kpsetool.orig 2012-10-09 17:39:16.000000000 +0000 +++ bin/kpsetool diff --git a/print/tex-tetex/patches/patch-bin_kpsewhere b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsewhere index 71f8c66903c..951d19dc3a6 100644 --- a/print/tex-tetex/patches/patch-bin_kpsewhere +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_kpsewhere @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_kpsewhere,v 1.1 2012/10/13 22:38:20 minskim Exp $ +$NetBSD: patch-bin_kpsewhere,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/kpsewhere.orig 2012-10-09 17:39:16.000000000 +0000 +++ bin/kpsewhere diff --git a/print/tex-tetex/patches/patch-bin_texconfig b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig index 3eb0b88981e..2426bdfd5bc 100644 --- a/print/tex-tetex/patches/patch-bin_texconfig +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_texconfig,v 1.1 2018/05/13 10:41:47 markd Exp $ +$NetBSD: patch-bin_texconfig,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/texconfig.orig 2017-12-17 23:26:29.000000000 +0000 +++ bin/texconfig diff --git a/print/tex-tetex/patches/patch-bin_texconfig-dialog b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-dialog index 7471a31dead..cebd2f41037 100644 --- a/print/tex-tetex/patches/patch-bin_texconfig-dialog +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-dialog @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_texconfig-dialog,v 1.1 2012/10/13 22:38:20 minskim Exp $ +$NetBSD: patch-bin_texconfig-dialog,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/texconfig-dialog.orig 2012-10-09 17:39:16.000000000 +0000 +++ bin/texconfig-dialog diff --git a/print/tex-tetex/patches/patch-bin_texconfig-sys b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-sys index af1fb7ff9fb..9b17c53c8c1 100644 --- a/print/tex-tetex/patches/patch-bin_texconfig-sys +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texconfig-sys @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_texconfig-sys,v 1.2 2015/04/25 20:26:37 markd Exp $ +$NetBSD: patch-bin_texconfig-sys,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/texconfig-sys.orig 2014-07-13 00:07:52.000000000 +0000 +++ bin/texconfig-sys diff --git a/print/tex-tetex/patches/patch-bin_texlinks b/print/tex-texlive-scripts-extra/patches/patch-bin_texlinks index 0b68ff18e03..9cb5a904fa5 100644 --- a/print/tex-tetex/patches/patch-bin_texlinks +++ b/print/tex-texlive-scripts-extra/patches/patch-bin_texlinks @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_texlinks,v 1.1 2012/10/13 22:38:20 minskim Exp $ +$NetBSD: patch-bin_texlinks,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/texlinks.orig 2012-10-09 17:39:16.000000000 +0000 +++ bin/texlinks diff --git a/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr b/print/tex-texlive-scripts-extra/patches/patch-texmf-dist_texconfig_tcfmgr index 9ff23c77c42..9f93cd68968 100644 --- a/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr +++ b/print/tex-texlive-scripts-extra/patches/patch-texmf-dist_texconfig_tcfmgr @@ -1,4 +1,6 @@ -$NetBSD: patch-texmf-dist_texconfig_tcfmgr,v 1.1 2018/05/13 10:41:47 markd Exp $ +$NetBSD: patch-texmf-dist_texconfig_tcfmgr,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- texmf-dist/texconfig/tcfmgr.orig 2010-05-20 18:50:17.000000000 +0000 +++ texmf-dist/texconfig/tcfmgr diff --git a/print/tex-tetex/DEINSTALL b/print/tex-texlive-scripts/DEINSTALL index fb300c0808e..176df16ed53 100644 --- a/print/tex-tetex/DEINSTALL +++ b/print/tex-texlive-scripts/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.3 2012/10/14 21:24:04 minskim Exp $ +# $NetBSD: DEINSTALL,v 1.1 2020/05/10 03:56:44 markd Exp $ TEXMFSYSVAR="@VARBASE@/lib/texmf" diff --git a/print/tex-texlive-scripts/INSTALL b/print/tex-texlive-scripts/INSTALL new file mode 100644 index 00000000000..7683a9d9dc6 --- /dev/null +++ b/print/tex-texlive-scripts/INSTALL @@ -0,0 +1,7 @@ +# $NetBSD: INSTALL,v 1.1 2020/05/10 03:56:44 markd Exp $ + +case "${STAGE}" in +POST-INSTALL) + @UPDMAP_SYS@ + ;; +esac diff --git a/print/tex-texlive-scripts/Makefile b/print/tex-texlive-scripts/Makefile index 5ecc7392cda..83389703771 100644 --- a/print/tex-texlive-scripts/Makefile +++ b/print/tex-texlive-scripts/Makefile @@ -1,35 +1,69 @@ -# $NetBSD: Makefile,v 1.18 2019/12/06 20:23:28 markd Exp $ +# $NetBSD: Makefile,v 1.19 2020/05/10 03:56:44 markd Exp $ DISTNAME= texlive-scripts -PKGNAME= tex-${DISTNAME}-2018.49884 -TEXLIVE_REV= 49884 +PKGNAME= tex-${DISTNAME}-2020 +TEXLIVE_REV= 55050 MAINTAINER= minskim@NetBSD.org COMMENT= TeX Live infrastructure programs LICENSE= gnu-gpl-v2 AND public-domain -CONFLICTS+= tex-bin-texlive-[0-9]* +DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea +DEPENDS+= tex-kpathsea>=2012nb1:../../print/tex-kpathsea +DEPENDS+= tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra +# We want the manual pages +DEPENDS+= tex-texlive-scripts-doc-[0-9]*:../../print/tex-texlive-scripts-doc -USE_TOOLS+= gs:run +USE_TOOLS+= gs:run perl:run sh:run -REPLACE_TEXLUA= bin/rungs \ - texmf-dist/scripts/texlive/lua/texlive/getopt.tlu \ - texmf-dist/scripts/texlive/lua/texlive/tlpdb.tlu \ - texmf-dist/scripts/texlive/test-tlpdb.tlu \ - texmf-dist/scripts/texlive/texconf.tlu +REPLACE_PERL= bin/updmap bin/fmtutil texmf-dist/scripts/texlive/mktexlsr.pl +REPLACE_SH= bin/fmtutil-sys bin/fmtutil-user bin/updmap-sys bin/updmap-user +REPLACE_TEXLUA= bin/rungs + +PKG_SYSCONFSUBDIR= texmf + +MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c +CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \ + ${PKG_SYSCONFDIR}/web2c/updmap.cfg + +TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist + +FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Setting paths to commands. SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= bin/rungs +SUBST_FILES.paths= bin/rungs bin/mktexmf bin/mktexpk bin/mktextfm \ + bin/fmtutil bin/fmtutil-sys bin/updmap bin/updmap-sys SUBST_SED.paths+= -e 's,@GS@,${TOOLS_PATH.gs},g' +SUBST_SED.paths+= -e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' +SUBST_SED.paths+= -e 's,@MKTEXMF@,${PREFIX}/bin/mktexmf,g' +SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g' +SUBST_SED.paths+= -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' + +#TEX_MAP_FILES+= mathpple.map -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" post-extract: ${MKDIR} ${WRKSRC}/bin ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/rungs.tlu \ ${WRKSRC}/bin/rungs +.for script in mktexmf mktexpk mktextfm + ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ + ${WRKSRC}/bin/${script} +.endfor +.for script in fmtutil-sys.sh fmtutil-user.sh updmap-sys.sh updmap-user.sh + ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ + ${WRKSRC}/bin/${script:S/.sh//} +.endfor +.for script in fmtutil.pl updmap.pl + ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ + ${WRKSRC}/bin/${script:S/.pl//} +.endfor + +post-install: + ${LN} -sf fmtutil ${DESTDIR}${PREFIX}/bin/mktexfmt + ${LN} -sf mktexlsr ${DESTDIR}${PREFIX}/bin/texhash .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-texlive-scripts/PLIST b/print/tex-texlive-scripts/PLIST index 57f379b37b3..22e6b80cc42 100644 --- a/print/tex-texlive-scripts/PLIST +++ b/print/tex-texlive-scripts/PLIST @@ -1,7 +1,46 @@ -@comment $NetBSD: PLIST,v 1.2 2013/11/17 17:05:10 minskim Exp $ +@comment $NetBSD: PLIST,v 1.3 2020/05/10 03:56:44 markd Exp $ +bin/fmtutil +bin/fmtutil-sys +bin/fmtutil-user +bin/mktexfmt +bin/mktexmf +bin/mktexpk +bin/mktextfm bin/rungs -share/texmf-dist/scripts/texlive/lua/texlive/getopt.tlu -share/texmf-dist/scripts/texlive/lua/texlive/tlpdb.tlu -share/texmf-dist/scripts/texlive/lua/texlive/utils.tlu -share/texmf-dist/scripts/texlive/test-tlpdb.tlu -share/texmf-dist/scripts/texlive/texconf.tlu +bin/texhash +bin/updmap +bin/updmap-sys +bin/updmap-user +share/texmf-dist/dvips/tetex/config.builtin35 +share/texmf-dist/dvips/tetex/config.dfaxhigh +share/texmf-dist/dvips/tetex/config.dfaxlo +share/texmf-dist/dvips/tetex/config.download35 +share/texmf-dist/dvips/tetex/config.gsftopk +share/texmf-dist/dvips/tetex/config.maxmem +share/texmf-dist/dvips/tetex/config.outline +share/texmf-dist/dvips/tetex/config.pdf +share/texmf-dist/dvips/tetex/config.pk +share/texmf-dist/dvips/tetex/config.www +share/texmf-dist/fonts/enc/dvips/tetex/09fbbfac.enc +share/texmf-dist/fonts/enc/dvips/tetex/0ef0afca.enc +share/texmf-dist/fonts/enc/dvips/tetex/10037936.enc +share/texmf-dist/fonts/enc/dvips/tetex/1b6d048e.enc +share/texmf-dist/fonts/enc/dvips/tetex/71414f53.enc +share/texmf-dist/fonts/enc/dvips/tetex/74afc74c.enc +share/texmf-dist/fonts/enc/dvips/tetex/aae443f0.enc +share/texmf-dist/fonts/enc/dvips/tetex/b6a4d7c7.enc +share/texmf-dist/fonts/enc/dvips/tetex/bbad153f.enc +share/texmf-dist/fonts/enc/dvips/tetex/d9b29452.enc +share/texmf-dist/fonts/enc/dvips/tetex/f7b6d320.enc +share/texmf-dist/fonts/enc/dvips/tetex/mtex.enc +share/texmf-dist/fonts/map/dvips/tetex/Makefile +share/texmf-dist/fonts/map/dvips/tetex/README +share/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx +share/texmf-dist/fonts/map/dvips/tetex/base14flags.tex +share/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map +share/texmf-dist/fonts/map/dvips/tetex/dvips35.map +share/texmf-dist/fonts/map/dvips/tetex/mathpple.map +share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map +share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map +share/texmf-dist/scripts/texlive/mktexlsr.pl +share/texmf-dist/web2c/updmap.cfg diff --git a/print/tex-texlive-scripts/distinfo b/print/tex-texlive-scripts/distinfo index 2d723628961..7d7c630bc40 100644 --- a/print/tex-texlive-scripts/distinfo +++ b/print/tex-texlive-scripts/distinfo @@ -1,7 +1,15 @@ -$NetBSD: distinfo,v 1.19 2019/02/02 01:11:17 markd Exp $ +$NetBSD: distinfo,v 1.20 2020/05/10 03:56:44 markd Exp $ -SHA1 (tex-texlive-scripts-49884/texlive-scripts.tar.xz) = 93d1ec3310d027172328fc271c7c223fd8e27aae -RMD160 (tex-texlive-scripts-49884/texlive-scripts.tar.xz) = 6e73267a646319fc6dfdcadaf9c3c38dee7ec563 -SHA512 (tex-texlive-scripts-49884/texlive-scripts.tar.xz) = 6f0f55a2ce1572bf9d16293c92566b5d7ae2aba4e987fcd24b2663a6f5a2aea3da491df23e67fd88d744b303c983b373c3bcbe17b64675970398f048a32e6d2d -Size (tex-texlive-scripts-49884/texlive-scripts.tar.xz) = 4006680 bytes -SHA1 (patch-bin_rungs) = 4ebc7760b5bfda526f137c1fbe9240d3c27799fa +SHA1 (texlive-scripts.r55050.tar.xz) = 8df4825eddf460b8babd944908813a050eb749de +RMD160 (texlive-scripts.r55050.tar.xz) = 9b07e8c9d121dddeece04a57db66fbb83e445a7e +SHA512 (texlive-scripts.r55050.tar.xz) = d31a6cefd98e474f409a699ab5eeccabfb3c11c4c6e90e229a0d2101427e95e3e35c735324435eda6f9095c972b6aa58120ffe512971e92043f6d3b0e862607b +Size (texlive-scripts.r55050.tar.xz) = 132428 bytes +SHA1 (patch-bin_fmtutil) = 0ac14f781b491357080ec899b0005072c0aa7013 +SHA1 (patch-bin_fmtutil-sys) = 85413eb237d1fae9261dddae99e6c347c22db10c +SHA1 (patch-bin_mktexmf) = e58b8e521c65f44c18251621866ee23052f4de1b +SHA1 (patch-bin_mktexpk) = d7a81ae56edfc4823a3cd1aa7bb50c98eac20264 +SHA1 (patch-bin_mktextfm) = a6ca49d59a9b67a1765a14d9e3075086c2cd8912 +SHA1 (patch-bin_rungs) = 198d0e442be6e03424ed1c32fdee391719d4614f +SHA1 (patch-bin_updmap) = e23c00548792ef907e2c51abfb788ef13afa1770 +SHA1 (patch-bin_updmap-sys) = 7825dc2d9ffb10f62ea2e4a3609d6de98785cdbd +SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 8d1cbd8d78903b681adbd10bf5c6c98355c40f07 diff --git a/print/tex-tetex/files/format-deinstall.tmpl b/print/tex-texlive-scripts/files/format-deinstall.tmpl index eb560d6a60b..2b03ea9eb08 100644 --- a/print/tex-tetex/files/format-deinstall.tmpl +++ b/print/tex-texlive-scripts/files/format-deinstall.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: format-deinstall.tmpl,v 1.1 2012/10/14 21:30:33 minskim Exp $ +# $NetBSD: format-deinstall.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Delete format files. # diff --git a/print/tex-tetex/files/format-install.tmpl b/print/tex-texlive-scripts/files/format-install.tmpl index 09b1eeacdca..cd07422e18c 100644 --- a/print/tex-tetex/files/format-install.tmpl +++ b/print/tex-texlive-scripts/files/format-install.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: format-install.tmpl,v 1.1 2012/10/14 21:30:33 minskim Exp $ +# $NetBSD: format-install.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Create format files. # diff --git a/print/tex-tetex/files/hyphen-deinstall.tmpl b/print/tex-texlive-scripts/files/hyphen-deinstall.tmpl index f53e7640f47..bb607e0aab7 100644 --- a/print/tex-tetex/files/hyphen-deinstall.tmpl +++ b/print/tex-texlive-scripts/files/hyphen-deinstall.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: hyphen-deinstall.tmpl,v 1.1 2013/11/15 06:08:51 minskim Exp $ +# $NetBSD: hyphen-deinstall.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Deinstall hyphenation patterns. # diff --git a/print/tex-tetex/files/hyphen-install.tmpl b/print/tex-texlive-scripts/files/hyphen-install.tmpl index 45f2c4f90d2..aea7efc16fe 100644 --- a/print/tex-tetex/files/hyphen-install.tmpl +++ b/print/tex-texlive-scripts/files/hyphen-install.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: hyphen-install.tmpl,v 1.1 2013/11/15 06:08:51 minskim Exp $ +# $NetBSD: hyphen-install.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Install hyphenation patterns. # diff --git a/print/tex-tetex/files/map-deinstall.tmpl b/print/tex-texlive-scripts/files/map-deinstall.tmpl index 5e0b97f47e1..146300ec0c6 100644 --- a/print/tex-tetex/files/map-deinstall.tmpl +++ b/print/tex-texlive-scripts/files/map-deinstall.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: map-deinstall.tmpl,v 1.2 2012/03/04 01:01:43 minskim Exp $ +# $NetBSD: map-deinstall.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Disable font maps and remove entries from updmap.cfg. # diff --git a/print/tex-tetex/files/map-install.tmpl b/print/tex-texlive-scripts/files/map-install.tmpl index 2c42f73effb..6c03dd333aa 100644 --- a/print/tex-tetex/files/map-install.tmpl +++ b/print/tex-texlive-scripts/files/map-install.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: map-install.tmpl,v 1.2 2012/03/04 01:01:43 minskim Exp $ +# $NetBSD: map-install.tmpl,v 1.1 2020/05/10 03:56:44 markd Exp $ # # Enable font maps. # diff --git a/print/tex-tetex/format.mk b/print/tex-texlive-scripts/format.mk index 53b317fbe34..6f7eeae67d2 100644 --- a/print/tex-tetex/format.mk +++ b/print/tex-texlive-scripts/format.mk @@ -1,4 +1,4 @@ -# $NetBSD: format.mk,v 1.2 2015/11/25 12:53:09 jperkin Exp $ +# $NetBSD: format.mk,v 1.1 2020/05/10 03:56:44 markd Exp $ # # This Makefile fragment is intended to be included by packages that # install TeX format files. It creates format files at @@ -12,12 +12,12 @@ .if !defined(TEX_FORMAT_MK) TEX_FORMAT_MK= # defined -DEPENDS+= tex-tetex>=3.0.27774:../../print/tex-tetex +DEPENDS+= tex-texlive-scripts>=2020:../../print/tex-texlive-scripts FILES_SUBST+= FMTUTIL_SYS=${LOCALBASE}/bin/fmtutil-sys FILES_SUBST+= FORMATS=${TEX_FORMATS:Q} FILES_SUBST+= PRINTF=${PRINTF:Q} -INSTALL_TEMPLATES+= ../../print/tex-tetex/files/format-install.tmpl -DEINSTALL_TEMPLATES+= ../../print/tex-tetex/files/format-deinstall.tmpl +INSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/format-install.tmpl +DEINSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/format-deinstall.tmpl .endif # TEX_FORMAT_MK diff --git a/print/tex-tetex/hyphen.mk b/print/tex-texlive-scripts/hyphen.mk index 674fcd61de7..abcd6dbf92c 100644 --- a/print/tex-tetex/hyphen.mk +++ b/print/tex-texlive-scripts/hyphen.mk @@ -1,4 +1,4 @@ -# $NetBSD: hyphen.mk,v 1.2 2015/11/25 12:53:09 jperkin Exp $ +# $NetBSD: hyphen.mk,v 1.1 2020/05/10 03:56:44 markd Exp $ # # This Makefile fragment is intended to be included by packages that # install TeX hyphenation pattens. It updates format files at @@ -15,13 +15,13 @@ TEX_HYPHEN_MK= # defined DEPENDS+= tex-hyphen-base>=2010nb1:../../print/tex-hyphen-base -DEPENDS+= tex-tetex>=3.0.27774nb1:../../print/tex-tetex +DEPENDS+= tex-texlive-scripts>=2020:../../print/tex-texlive-scripts FILES_SUBST+= FMTUTIL_SYS=${LOCALBASE}/bin/fmtutil-sys FILES_SUBST+= HYPHEN_DAT=${TEX_HYPHEN_DAT:Q} FILES_SUBST+= HYPHEN_DEF=${TEX_HYPHEN_DEF:Q} FILES_SUBST+= HYPHEN_LUA=${TEX_HYPHEN_LUA:Q} -INSTALL_TEMPLATES+= ../../print/tex-tetex/files/hyphen-install.tmpl -DEINSTALL_TEMPLATES+= ../../print/tex-tetex/files/hyphen-deinstall.tmpl +INSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/hyphen-install.tmpl +DEINSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/hyphen-deinstall.tmpl .endif # TEX_HYPHEN_MK diff --git a/print/tex-tetex/map.mk b/print/tex-texlive-scripts/map.mk index d571bbf1aca..a471a8e77db 100644 --- a/print/tex-tetex/map.mk +++ b/print/tex-texlive-scripts/map.mk @@ -1,4 +1,4 @@ -# $NetBSD: map.mk,v 1.3 2015/11/25 12:53:09 jperkin Exp $ +# $NetBSD: map.mk,v 1.1 2020/05/10 03:56:44 markd Exp $ # # This Makefile fragment is intended to be included by packages that # install font maps for TeX. It updates font map entries in updmap.cfg @@ -16,13 +16,13 @@ .if !defined(TEX_MAP_MK) TEX_MAP_MK= # defined -DEPENDS+= tex-tetex>=3.0.25424:../../print/tex-tetex +DEPENDS+= tex-texlive-scripts>=2020:../../print/tex-texlive-scripts FILES_SUBST+= UPDMAP_SYS=${LOCALBASE}/bin/updmap-sys FILES_SUBST+= MAP_FILES=${TEX_MAP_FILES:Q} FILES_SUBST+= MIXEDMAP_FILES=${TEX_MIXEDMAP_FILES:Q} FILES_SUBST+= KANJIMAP_FILES=${TEX_KANJIMAP_FILES:Q} -INSTALL_TEMPLATES+= ../../print/tex-tetex/files/map-install.tmpl -DEINSTALL_TEMPLATES+= ../../print/tex-tetex/files/map-deinstall.tmpl +INSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/map-install.tmpl +DEINSTALL_TEMPLATES+= ../../print/tex-texlive-scripts/files/map-deinstall.tmpl .endif # TEX_MAP_MK diff --git a/print/tex-tetex/patches/patch-bin_fmtutil b/print/tex-texlive-scripts/patches/patch-bin_fmtutil index dea0270ed1f..15d874265fe 100644 --- a/print/tex-tetex/patches/patch-bin_fmtutil +++ b/print/tex-texlive-scripts/patches/patch-bin_fmtutil @@ -1,6 +1,8 @@ -$NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $ +$NetBSD: patch-bin_fmtutil,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- bin/fmtutil.orig 2017-11-21 07:07:45.000000000 +0000 +use full path for commands + +--- bin/fmtutil.orig 2020-03-14 22:04:10.000000000 +0000 +++ bin/fmtutil @@ -14,7 +14,7 @@ my $TEXMFROOT; @@ -55,7 +57,7 @@ $NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $ if ($fmthyplong) { $fmthyp = $fmthyplong; } else { -@@ -595,7 +595,7 @@ sub rebuild_one_format { +@@ -597,7 +597,7 @@ sub rebuild_one_format { else { $prgswitch .= $fmt; } # check for existence of ini file before doing anything else @@ -64,16 +66,16 @@ $NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $ # we didn't find the ini file, skip print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n"); # The original script just skipped it but in TeX Live we expect that -@@ -624,7 +624,7 @@ sub rebuild_one_format { +@@ -626,7 +626,7 @@ sub rebuild_one_format { $texargs = $addargs; } if ($pool) { -- chomp ( my $poolfile = `kpsewhich -progname=$eng $pool.poo 2>$nul` ); -+ chomp ( my $poolfile = `@KPSEWHICH@ -progname=$eng $pool.poo 2>$nul` ); +- chomp (my $poolfile = `kpsewhich -progname=$eng $pool.pool 2>$nul`); ++ chomp (my $poolfile = `@KPSEWHICH@ -progname=$eng $pool.pool 2>$nul`); if ($poolfile && -f $poolfile) { print_verbose("attempting to create localized format " . "using pool=$pool and tcx=$tcx.\n"); -@@ -1016,7 +1016,7 @@ sub determine_config_files { +@@ -1060,7 +1060,7 @@ sub determine_config_files { # in the list is the one where changes will be written to. ($changes_config_file) = @{$opts{'cnffile'}}; } else { @@ -82,7 +84,7 @@ $NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $ chomp(@all_files); my @used_files; for my $f (@all_files) { -@@ -1026,10 +1026,10 @@ sub determine_config_files { +@@ -1070,10 +1070,10 @@ sub determine_config_files { my $TEXMFLOCALVAR; my @TEXMFLOCAL; if (win32()) { diff --git a/print/tex-tetex/patches/patch-bin_fmtutil-sys b/print/tex-texlive-scripts/patches/patch-bin_fmtutil-sys index 4192ab9e105..8516c35b255 100644 --- a/print/tex-tetex/patches/patch-bin_fmtutil-sys +++ b/print/tex-texlive-scripts/patches/patch-bin_fmtutil-sys @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_fmtutil-sys,v 1.3 2015/06/14 12:50:05 markd Exp $ +$NetBSD: patch-bin_fmtutil-sys,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/fmtutil-sys.orig 2015-04-20 01:48:35.000000000 +0000 +++ bin/fmtutil-sys diff --git a/print/kpathsea/patches/patch-ai b/print/tex-texlive-scripts/patches/patch-bin_mktexmf index 6cac81f3063..b2833dc3658 100644 --- a/print/kpathsea/patches/patch-ai +++ b/print/tex-texlive-scripts/patches/patch-bin_mktexmf @@ -1,7 +1,9 @@ -$NetBSD: patch-ai,v 1.3 2015/06/14 11:12:37 markd Exp $ +$NetBSD: patch-bin_mktexmf,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- mktexmf.orig 2014-07-18 23:38:50.000000000 +0000 -+++ mktexmf +use full path for commands + +--- bin/mktexmf.orig 2014-07-18 23:38:50.000000000 +0000 ++++ bin/mktexmf @@ -24,8 +24,8 @@ TeX Live home page: <http://tug.org/texl " diff --git a/print/kpathsea/patches/patch-aj b/print/tex-texlive-scripts/patches/patch-bin_mktexpk index 500d84d01ae..7cb7d3d72c3 100644 --- a/print/kpathsea/patches/patch-aj +++ b/print/tex-texlive-scripts/patches/patch-bin_mktexpk @@ -1,7 +1,9 @@ -$NetBSD: patch-aj,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-bin_mktexpk,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- mktexpk.orig 2009-06-03 06:07:21.000000000 -0700 -+++ mktexpk +use full path for commands + +--- bin/mktexpk.orig 2009-06-03 06:07:21.000000000 -0700 ++++ bin/mktexpk @@ -60,8 +60,8 @@ fi mt_max_args=2 diff --git a/print/kpathsea/patches/patch-ah b/print/tex-texlive-scripts/patches/patch-bin_mktextfm index 9990cceca20..4e82f244e11 100644 --- a/print/kpathsea/patches/patch-ah +++ b/print/tex-texlive-scripts/patches/patch-bin_mktextfm @@ -1,7 +1,9 @@ -$NetBSD: patch-ah,v 1.1 2009/09/20 18:50:03 minskim Exp $ +$NetBSD: patch-bin_mktextfm,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- mktextfm.orig 2009-06-03 06:07:27.000000000 -0700 -+++ mktextfm +use full path for commands + +--- bin/mktextfm.orig 2009-06-03 06:07:27.000000000 -0700 ++++ bin/mktextfm @@ -27,8 +27,8 @@ while test $# -gt 0; do done diff --git a/print/tex-texlive-scripts/patches/patch-bin_rungs b/print/tex-texlive-scripts/patches/patch-bin_rungs index 5af356ce24e..5937798e9bb 100644 --- a/print/tex-texlive-scripts/patches/patch-bin_rungs +++ b/print/tex-texlive-scripts/patches/patch-bin_rungs @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_rungs,v 1.1 2013/11/17 17:05:10 minskim Exp $ +$NetBSD: patch-bin_rungs,v 1.2 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/rungs.orig 2013-04-25 17:29:00.000000000 +0000 +++ bin/rungs diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-texlive-scripts/patches/patch-bin_updmap index 886d4d8790a..82e50b388f4 100644 --- a/print/tex-tetex/patches/patch-bin_updmap +++ b/print/tex-texlive-scripts/patches/patch-bin_updmap @@ -1,8 +1,10 @@ -$NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ +$NetBSD: patch-bin_updmap,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- bin/updmap.orig 2015-07-17 19:00:04.000000000 +0000 +use full path for commands + +--- bin/updmap.orig 2019-06-07 16:36:59.000000000 +0000 +++ bin/updmap -@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 37866 2015-0 +@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 51338 2019-0 my $TEXMFROOT; BEGIN { $^W = 1; @@ -30,7 +32,7 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ # make sure that on windows *everything* is in lower case for comparison if (win32()) { -@@ -244,7 +244,7 @@ sub main { +@@ -239,7 +239,7 @@ sub main { # in the list is the one where changes will be written to. ($changes_config_file) = @{$opts{'cnffile'}}; } else { @@ -39,7 +41,7 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ chomp(@all_files); my @used_files; for my $f (@all_files) { -@@ -254,10 +254,10 @@ sub main { +@@ -249,10 +249,10 @@ sub main { my $TEXMFLOCALVAR; my @TEXMFLOCAL; if (win32()) { @@ -52,7 +54,7 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; } # -@@ -1251,7 +1251,7 @@ sub mkMaps { +@@ -1281,7 +1281,7 @@ sub mkMaps { sub check_mismatch { my ($mm, $d, $f, $prog) = @_; @@ -61,7 +63,7 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ if (lc("$d/$f") ne lc($kpsefound)) { $mm->{$f} = $kpsefound; } -@@ -1360,7 +1360,7 @@ listed below). +@@ -1397,7 +1397,7 @@ listed below). sub locateMap { my $map = shift; @@ -70,7 +72,7 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ chomp($ret); return $ret; } -@@ -1998,7 +1998,7 @@ sub read_map_files { +@@ -2072,7 +2072,7 @@ sub read_map_files { $alldata->{'maps'}{$m}{'origin'} = 'builtin'; } @maps = sort_uniq(@maps); @@ -78,4 +80,4 @@ $NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ + my @fullpath = `@KPSEWHICH@ --format=map @maps`; chomp @fullpath; foreach my $map (@maps) { - my ($ff) = grep /\/$map(\.map)?$/, @fullpath; + # in case they give an absolute path (not needed/desired, but ...); diff --git a/print/tex-tetex/patches/patch-bin_updmap-sys b/print/tex-texlive-scripts/patches/patch-bin_updmap-sys index f38dd1bd4e5..0f46ab98ff1 100644 --- a/print/tex-tetex/patches/patch-bin_updmap-sys +++ b/print/tex-texlive-scripts/patches/patch-bin_updmap-sys @@ -1,4 +1,6 @@ -$NetBSD: patch-bin_updmap-sys,v 1.3 2015/04/25 20:26:37 markd Exp $ +$NetBSD: patch-bin_updmap-sys,v 1.1 2020/05/10 03:56:44 markd Exp $ + +use full path for commands --- bin/updmap-sys.orig 2014-11-23 18:10:07.000000000 +0000 +++ bin/updmap-sys diff --git a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg b/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg index 40c9f61f4e3..57fc1cba69e 100644 --- a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg +++ b/print/tex-texlive-scripts/patches/patch-texmf-dist_web2c_updmap.cfg @@ -1,8 +1,10 @@ -$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp $ +$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2020/05/10 03:56:44 markd Exp $ ---- texmf-dist/web2c/updmap.cfg.orig 2019-02-03 01:23:51.000000000 +0000 +Start with no maps defined. Added by TEX_*MAP_FILES + +--- texmf-dist/web2c/updmap.cfg.orig 2020-03-23 00:55:08.000000000 +0000 +++ texmf-dist/web2c/updmap.cfg -@@ -104,337 +104,3 @@ koEmbed baekmuk +@@ -104,356 +104,3 @@ jaVariant -04 # (end of updmap-hdr.cfg) @@ -11,8 +13,9 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map ArrowsADF.map -Map BulletsADF.map -Map Alegreya.map --Map algolrevived.map +-Map AlgolRevived.map -MixedMap allrunes.map +-Map almendra.map -Map euler.map -MixedMap cm.map -MixedMap cmextra.map @@ -35,6 +38,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map gbsnu.map -Map gkaiu.map -Map ascii.map +-Map ascmac.map -Map aspectratio.map -Map augie.map -Map auncial.map @@ -49,6 +53,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map ybd.map -Map beuron.map -Map bguq.map +-Map bitter.map -Map sqrcaps.map -Map ubk.map -Map boondox.map @@ -68,6 +73,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map Chivo.map -Map cinzel.map -Map cjhebrew.map +-Map Clara.map -Map ClearSans.map -MixedMap cmtext-bsr-interpolated.map -Map cm-lgc.map @@ -81,6 +87,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map cmexb.map -MixedMap cmll.map -Map cmsrb.map +-MixedMap cmupint.map -Map Cochineal.map -Map Coelacanth.map -Map comfortaa.map @@ -88,7 +95,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map ComicNeueAngular.map -Map original-context-symbol.map -Map CormorantGaramond.map --Map CountriesofEurope.map +-Map countriesofeurope.map -Map ucr.map -Map crimson.map -Map CrimsonPro.map @@ -100,8 +107,11 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map dante.map -Map dejavu-type1.map -Map dictsym.map +-Map Domitian.map -Map dstroke.map --Map droid.map +-Map droidsans.map +-Map droidsansmono.map +-Map droidserif.map -Map DSSerif.map -Map dutchcal.map -Map EBGaramond.map @@ -114,6 +124,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map esrelation.map -Map ESSTIX.map -Map esvect.map +-Map ETbb.map -MixedMap ethiop.map -MixedMap eurosym.map -Map fbb.map @@ -129,6 +140,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map nf.map -Map sipa.map -Map tlwg.map +-Map forum.map -Map fourier-utopia-expert.map -Map fourier.map -Map frcursive.map @@ -184,6 +196,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -KanjiMap otf-sc-@scEmbed@.map -KanjiMap otf-tc-@tcEmbed@.map -KanjiMap otf-up-@jaEmbed@.map +-Map Junicode.map -Map kerkis.map -Map knitfont.map -Map kpfonts.map @@ -196,13 +209,16 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map LibreBaskerville.map -Map LibreBodoni.map -Map LibreCaslon.map +-Map LibreFranklin.map -Map yly.map -Map linearA.map +-Map LinguisticsPro.map -Map l7x-urwvn.map -Map lm.map -Map LobsterTwo.map -MixedMap lxfonts.map -MixedMap manfnt.map +-Map marcellus.map -Map marvosym.map -Map mathabx.map -Map mdbch.map @@ -220,7 +236,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map mintspirit.map -Map MnSymbol.map -MixedMap mongolian.map --Map montserrat.map +-Map Montserrat.map -KanjiMap morisawa5.map -MixedMap musix.map -Map mxedruli.map @@ -272,6 +288,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map sansmathaccent.map -Map sansmathfonts.map -Map scanpages.map +-Map ScholaX.map -MixedMap semaf.map -Map SkakNew.map -Map SourceCodePro.map @@ -279,6 +296,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map SourceSerifPro.map -Map starfont.map -Map icelandic.map +-Map STEP.map -Map SticksTooText.map -Map stix.map -Map stix2.map @@ -288,7 +306,6 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map usy.map -Map tabvar.map -Map tempora.map --Map mathpple.map -Map qag.map -Map qbk.map -Map qcr.map @@ -297,7 +314,11 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.11 2019/05/14 12:30:20 markd Exp -Map qpl.map -Map qtm.map -Map qzc.map +-Map mathpple.map -Map tfrupee.map +-Map TheanoDidot.map +-Map TheanoModern.map +-Map TheanoOldStyle.map -Map utm.map -Map tinos.map -MixedMap tipa.map diff --git a/print/tex-texlive.infra/Makefile b/print/tex-texlive.infra/Makefile index 35445de7c77..f5ad7dbe2c2 100644 --- a/print/tex-texlive.infra/Makefile +++ b/print/tex-texlive.infra/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.25 2019/12/06 20:23:28 markd Exp $ +# $NetBSD: Makefile,v 1.26 2020/05/10 03:56:44 markd Exp $ DISTNAME= texlive.infra -PKGNAME= tex-${DISTNAME}-2019 -PKGREVISION= 1 -TEXLIVE_REV= 50861 +PKGNAME= tex-${DISTNAME}-2020 +TEXLIVE_REV= 54630 MAINTAINER= minskim@NetBSD.org COMMENT= Basic TeX Live infrastructure +LICENSE= gnu-gpl-v2 USE_TOOLS+= perl:run @@ -21,7 +21,6 @@ SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= tlpkg/TeXLive/TLPaper.pm tlpkg/TeXLive/TLUtils.pm SUBST_SED.paths= -e 's,@KPSEWHICH@,${PREFIX}/bin/kpsewhich,g' -TEXLIVE_UNVERSIONED= yes .include "../../print/texlive/package.mk" do-install: diff --git a/print/tex-texlive.infra/distinfo b/print/tex-texlive.infra/distinfo index e8879bda89c..6876d8bb189 100644 --- a/print/tex-texlive.infra/distinfo +++ b/print/tex-texlive.infra/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2019/05/14 12:34:23 markd Exp $ +$NetBSD: distinfo,v 1.17 2020/05/10 03:56:44 markd Exp $ -SHA1 (tex-texlive.infra-50861/texlive.infra.tar.xz) = 1074a506ef39acb87b0f4640641bc3b79b209cf6 -RMD160 (tex-texlive.infra-50861/texlive.infra.tar.xz) = 388239f3c1a8dae6bca6dd8027dfad748c9f85d1 -SHA512 (tex-texlive.infra-50861/texlive.infra.tar.xz) = 4550aca83dffc9acd90a538671a13f82acfe3270b6f42ab3e3485ce67b45da539521ef075d3212f1dd8a637f2fef597388edb87a2cb1c57c763369b3acae6cba -Size (tex-texlive.infra-50861/texlive.infra.tar.xz) = 220796 bytes +SHA1 (texlive.infra.r54630.tar.xz) = adf47b821d0bc70dfd8171d251e6fcf34c15b4ff +RMD160 (texlive.infra.r54630.tar.xz) = 465af835fe9eb94d8658c4dd6b64ac803f100baa +SHA512 (texlive.infra.r54630.tar.xz) = a1a6611b48a3a2cc7bae0455a6f8fb7c12112136951ca017e3ddcaca3f16f0198a628a5ccf2f6a43095dc3f97f639e0f4d2407901923bea1656fc4877dd764ee +Size (texlive.infra.r54630.tar.xz) = 226244 bytes SHA1 (patch-aa) = fa49e775842a96e0667b35fb9629cd007d043544 SHA1 (patch-ab) = e9a708b1d2df9442a30a45f8937a1560840f7be1 diff --git a/print/tex4ht/Makefile b/print/tex4ht/Makefile index 7ffb370a5ea..614641bf9ce 100644 --- a/print/tex4ht/Makefile +++ b/print/tex4ht/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2020/01/18 23:35:05 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2020/05/10 03:56:39 markd Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../print/texlive/Makefile.common" PKGNAME= tex4ht-20180225 diff --git a/print/tex4ht/distinfo b/print/tex4ht/distinfo index 5ceb052898c..f18595c857a 100644 --- a/print/tex4ht/distinfo +++ b/print/tex4ht/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.8 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/texlive/Makefile.common b/print/texlive/Makefile.common index d784e430b47..a89940a0fcb 100644 --- a/print/texlive/Makefile.common +++ b/print/texlive/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2019/05/14 13:23:10 adam Exp $ +# $NetBSD: Makefile.common,v 1.3 2020/05/10 03:56:37 markd Exp $ # used by converters/dvi2tty/Makefile # used by fonts/afm2pl/Makefile # used by fonts/gsftopkk/Makefile @@ -26,8 +26,8 @@ # used by textproc/mendexk/Makefile # used by textproc/xindy/Makefile -DISTNAME= texlive-20190410-source -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2019/ +DISTNAME= texlive-20200406-source +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2020/ EXTRACT_SUFX= .tar.xz MAINTAINER?= minskim@NetBSD.org diff --git a/print/vlna/Makefile b/print/vlna/Makefile index 78b21f07ecb..09b91c43088 100644 --- a/print/vlna/Makefile +++ b/print/vlna/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2020/01/18 23:35:05 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2020/05/10 03:56:39 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= vlna-1.5 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/vlna/distinfo b/print/vlna/distinfo index 5ceb052898c..f18595c857a 100644 --- a/print/vlna/distinfo +++ b/print/vlna/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.8 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes diff --git a/print/web2c/Makefile b/print/web2c/Makefile index 747806c9284..5e56311ffe4 100644 --- a/print/web2c/Makefile +++ b/print/web2c/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.97 2020/04/03 10:30:34 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2020/05/10 03:56:39 markd Exp $ -PKGREVISION= 6 .include "../../print/texlive/Makefile.common" -PKGNAME= web2c-2019 +PKGNAME= web2c-2020 CATEGORIES= print HOMEPAGE= https://www.tug.org/web2c/ @@ -25,8 +24,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c #CXXFLAGS+= -fpermissive CONFIGURE_ARGS+= --disable-luatex +CONFIGURE_ARGS+= --disable-luahbtex CONFIGURE_ARGS+= --disable-luatex53 CONFIGURE_ARGS+= --disable-luajittex +CONFIGURE_ARGS+= --disable-luajithbtex CONFIGURE_ARGS+= --disable-mflua CONFIGURE_ARGS+= --disable-mfluajit CONFIGURE_ARGS+= --disable-xetex @@ -55,8 +56,8 @@ CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME}/texk/web2c INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/texk/web2c pre-configure: - ${CP} ${WRKSRC}/pdftexdir/pdftoepdf-poppler0.75.0.cc ${WRKSRC}/pdftexdir/pdftoepdf.cc - ${CP} ${WRKSRC}/pdftexdir/pdftosrc-newpoppler.cc ${WRKSRC}/pdftexdir/pdftosrc.cc + ${CP} ${WRKSRC}/pdftexdir/pdftoepdf-poppler0.86.0.cc ${WRKSRC}/pdftexdir/pdftoepdf.cc + ${CP} ${WRKSRC}/pdftexdir/pdftosrc-poppler0.83.0.cc ${WRKSRC}/pdftexdir/pdftosrc.cc .include "../../archivers/zziplib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/print/web2c/PLIST b/print/web2c/PLIST index d816b285f91..1a2c7a43edb 100644 --- a/print/web2c/PLIST +++ b/print/web2c/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2019/05/14 13:23:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2020/05/10 03:56:39 markd Exp $ bin/aleph bin/bibtex bin/ctangle @@ -87,6 +87,7 @@ man/man1/ctwill.1 man/man1/cweave.1 man/man1/cweb.1 man/man1/dvicopy.1 +man/man1/dvilualatex-dev.1 man/man1/dvitomp.1 man/man1/dvitype.1 man/man1/eptex.1 @@ -97,6 +98,7 @@ man/man1/gftype.1 man/man1/inimf.1 man/man1/initex.1 man/man1/lamed.1 +man/man1/lualatex-dev.1 man/man1/mf-nowin.1 man/man1/mf.1 man/man1/mft.1 @@ -113,10 +115,12 @@ man/man1/outocp.1 man/man1/ovf2ovp.1 man/man1/ovp2ovf.1 man/man1/patgen.1 +man/man1/pdflatex-dev.1 man/man1/pdftex.1 man/man1/pdftosrc.1 man/man1/pktogf.1 man/man1/pktype.1 +man/man1/platex-dev.1 man/man1/pltotf.1 man/man1/pooltype.1 man/man1/ppltotf.1 @@ -129,9 +133,11 @@ man/man1/tftopl.1 man/man1/tie.1 man/man1/ttf2afm.1 man/man1/uppltotf.1 +man/man1/uplatex-dev.1 man/man1/uptex.1 man/man1/uptftopl.1 man/man1/vftovp.1 man/man1/vptovf.1 man/man1/weave.1 +man/man1/xelatex-dev.1 man/man5/synctex.5 diff --git a/print/web2c/distinfo b/print/web2c/distinfo index 0bea7f1cfdf..92d08c75328 100644 --- a/print/web2c/distinfo +++ b/print/web2c/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.37 2020/03/29 01:02:57 joerg Exp $ +$NetBSD: distinfo,v 1.38 2020/05/10 03:56:39 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-Makefile.in) = e4446fc146b419ca5f2105d2a78c7789149b40ea -SHA1 (patch-man_Makefile.in) = 8d0cbcd73f113135ea400c0491a4c0cbd0b07c73 -SHA1 (patch-pdftexdir_pdftex-common.h) = 0f82056b5431c0a4718ab8609967f2ec9aeca3a9 -SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = 58bcae1a76696178c3f7a2e4e050306e56bdc0f9 -SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = ff18cc9bcb0dc665f7981bf06fba753e67117269 -SHA1 (patch-pdftexdir_utils.c) = 989dc2fe8097d4d31ee2ba03885f00da0f1ab39b -SHA1 (patch-pdftexdir_writeenc.c) = d2dfedf140c2c2c9143bc701291c09d3a8d3f3a4 +SHA1 (patch-man_Makefile.in) = 97a227313715a1f04861edeee30f28188cb2c1af diff --git a/print/web2c/patches/patch-man_Makefile.in b/print/web2c/patches/patch-man_Makefile.in index 523d3d35983..ad9c04a283c 100644 --- a/print/web2c/patches/patch-man_Makefile.in +++ b/print/web2c/patches/patch-man_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-man_Makefile.in,v 1.1 2019/05/14 13:23:10 adam Exp $ +$NetBSD: patch-man_Makefile.in,v 1.2 2020/05/10 03:56:39 markd Exp $ ---- man/Makefile.in.orig 2019-03-30 10:13:17.000000000 +0000 +--- man/Makefile.in.orig 2019-11-17 17:05:39.000000000 +0000 +++ man/Makefile.in -@@ -443,8 +443,7 @@ x_tool_libs = @x_tool_libs@ +@@ -446,8 +446,7 @@ x_tool_libs = @x_tool_libs@ man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \ $(am__append_4) $(am__append_7) $(am__append_8) \ $(am__append_9) $(am__append_11) $(am__append_13) \ @@ -12,12 +12,12 @@ $NetBSD: patch-man_Makefile.in,v 1.1 2019/05/14 13:23:10 adam Exp $ EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \ mf.man mpost.man etex.man $(pdftex_man_sources) ptex.man \ ppltotf.man ptftopl.man luatex.man xetex.man \ -@@ -454,7 +453,7 @@ bootstrap_man_sources = ctie.man cweb.ma +@@ -457,7 +456,7 @@ bootstrap_man_sources = ctie.man cweb.ma # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \ ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \ - $(am__append_6) $(am__append_10) $(am__append_12) \ + $(am__append_6) $(am__append_12) \ - $(am__append_14) $(am__append_17) $(am__append_19) - web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \ - gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \ + $(am__append_14) $(am__append_17) $(am__append_19) \ + latex-dev:pdflatex-dev latex-dev:xelatex-dev \ + latex-dev:lualatex-dev latex-dev:dvilualatex-dev \ diff --git a/print/web2c/patches/patch-pdftexdir_pdftex-common.h b/print/web2c/patches/patch-pdftexdir_pdftex-common.h deleted file mode 100644 index 7f93e86ee22..00000000000 --- a/print/web2c/patches/patch-pdftexdir_pdftex-common.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-pdftexdir_pdftex-common.h,v 1.2 2019/05/14 13:23:10 adam Exp $ - -Fix buildling. - ---- pdftexdir/pdftex-common.h.orig 2016-11-25 18:24:37.000000000 +0000 -+++ pdftexdir/pdftex-common.h -@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ... - extern void write_epdf(void); - - /* writeenc.c */ --extern void epdf_write_enc(char **, int); -+extern void epdf_write_enc(const char **, int); - - /* writeimg.c */ - extern float epdf_width; diff --git a/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc b/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc deleted file mode 100644 index caa9c03deb6..00000000000 --- a/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc,v 1.3 2020/03/05 06:21:42 wiz Exp $ - -Fix build with poppler 0.86.1. - ---- pdftexdir/pdftoepdf-poppler0.75.0.cc.orig 2019-03-21 06:38:16.000000000 +0000 -+++ pdftexdir/pdftoepdf-poppler0.75.0.cc -@@ -22,7 +22,7 @@ This is based on the patch texlive-poppl - https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk - by Arch Linux. A little modifications are made to avoid a crash for - some kind of pdf images, such as figure_missing.pdf in gnuplot. --The poppler should be 0.75.0 or newer versions. -+The poppler should be 0.83.0 or newer versions. - POPPLER_VERSION should be defined. - */ - -@@ -669,7 +669,7 @@ static void writeEncodings() - else - glyphNames[i] = notdef; - } -- epdf_write_enc(glyphNames, r->enc_objnum); -+ epdf_write_enc(const_cast<const char**>(glyphNames), r->enc_objnum); - } - for (r = encodingList; r != 0; r = n) { - n = r->next; -@@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(P - - int - read_pdf_info(char *image_name, char *page_name, int page_num, -- int pagebox_spec, int minor_pdf_version_wanted, -+ int pagebox_spec, /* int major_pdf_version_wanted, */ int minor_pdf_version_wanted, - int pdf_inclusion_errorlevel) - { - PdfDocument *pdf_doc; -@@ -723,7 +723,7 @@ read_pdf_info(char *image_name, char *pa - #endif - // initialize - if (!isInit) { -- globalParams = new GlobalParams(); -+ globalParams = std::make_unique<GlobalParams>(); - globalParams->setErrQuiet(false); - isInit = true; - } -@@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *pa - #ifdef POPPLER_VERSION - pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); - pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); -- if ((pdf_major_version_found > 1) -+ if ((pdf_major_version_found > /* major_pdf_version_wanted */ 1) - || (pdf_minor_version_found > minor_pdf_version_wanted)) { - const char *msg = -- "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; -+ "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed"; - if (pdf_inclusion_errorlevel > 0) { -- pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); -+ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, /* major_pdf_version_wanted, */ minor_pdf_version_wanted); - } else if (pdf_inclusion_errorlevel < 0) { - ; /* do nothing */ - } else { /* = 0, give warning */ -- pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); -+ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, /* major_pdf_version_wanted, */ minor_pdf_version_wanted); - } - } - #else -@@ -757,15 +757,14 @@ read_pdf_info(char *image_name, char *pa - if (page_name) { - // get page by name - GString name(page_name); -- LinkDest *link = pdf_doc->doc->findDest(&name); -+ std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name); - if (link == 0 || !link->isOk()) - pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); - Ref ref = link->getPageRef(); -- page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen); -+ page_num = pdf_doc->doc->getCatalog()->findPage(ref); - if (page_num == 0) - pdftex_fail("PDF inclusion: destination is not a page <%s>", - page_name); -- delete link; - } else { - // get page by number - if (page_num <= 0 || page_num > epdf_num_pages) -@@ -1107,7 +1106,5 @@ void epdf_check_mem() - n = p->next; - delete_document(p); - } -- // see above for globalParams -- delete globalParams; - } - } diff --git a/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc b/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc deleted file mode 100644 index 308a20ac51a..00000000000 --- a/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.7 2020/01/11 00:31:05 ryoon Exp $ - -Fix building. - ---- pdftexdir/pdftosrc-newpoppler.cc.orig 2018-12-06 23:31:33.000000000 +0000 -+++ pdftexdir/pdftosrc-newpoppler.cc -@@ -20,8 +20,7 @@ with this program. If not, see <http:// - /* - This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at - https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk --by Arch Linux. The poppler should be 0.59.0 or newer versions. --It is tested upto the poppler 0.70.1. -+by Arch Linux. The poppler should be 0.83.0 or newer versions. - POPPLER_VERSION should be defined. - */ - -@@ -80,7 +79,7 @@ int main(int argc, char *argv[]) - exit(1); - } - fileName = new GString(argv[1]); -- globalParams = new GlobalParams(); -+ globalParams = std::make_unique<GlobalParams>(); - doc = new PDFDoc(fileName); - if (!doc->isOk()) { - fprintf(stderr, "Invalid PDF file\n"); -@@ -100,8 +99,8 @@ int main(int argc, char *argv[]) - srcStream = Object(objNull); - if (objnum == 0) { - srcStream = catalogDict.dictLookup("SourceObject"); -- static char const_SourceFile[] = "SourceFile"; -- if (!srcStream.isStream(const_SourceFile)) { -+ static const char *const_SourceFile = "SourceFile"; -+ if (!srcStream.isDict(const_SourceFile)) { - fprintf(stderr, "No SourceObject found\n"); - exit(1); - } -@@ -110,7 +109,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "No SourceName found\n"); - exit(1); - } -- outname = (char *)srcName.getString()->getCString(); -+ outname = (char *)srcName.getString()->c_str(); - // We cannot free srcName, as objname shares its string. - // srcName.free(); - } else if (objnum > 0) { -@@ -119,7 +118,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "Not a Stream object\n"); - exit(1); - } -- sprintf(buf, "%s", fileName->getCString()); -+ sprintf(buf, "%s", fileName->c_str()); - if ((p = strrchr(buf, '.')) == 0) - p = strchr(buf, 0); - if (objgen == 0) -@@ -129,7 +128,7 @@ int main(int argc, char *argv[]) - outname = buf; - } else { // objnum < 0 means we are extracting the XRef table - extract_xref_table = true; -- sprintf(buf, "%s", fileName->getCString()); -+ sprintf(buf, "%s", fileName->c_str()); - if ((p = strrchr(buf, '.')) == 0) - p = strchr(buf, 0); - sprintf(p, ".xref"); -@@ -162,7 +161,7 @@ int main(int argc, char *argv[]) - Object objStr, obj1, obj2; - int nObjects, first, n; - int localOffset = 0; -- Guint firstOffset; -+ unsigned int firstOffset; - - objStr = xref->fetch(e->offset, 0); - assert(objStr.isStream()); -@@ -174,9 +173,8 @@ int main(int argc, char *argv[]) - - // parse the header: object numbers and offsets - objStr.streamReset(); -- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first); -- lexer = new Lexer(xref, str); -- parser = new Parser(xref, lexer, gFalse); -+ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first); -+ parser = new Parser(xref, str, false); - for (n = 0; n < nObjects; ++n) { - obj1 = parser->getObj(); - obj2 = parser->getObj(); -@@ -204,5 +202,4 @@ int main(int argc, char *argv[]) - fprintf(stderr, "Cross-reference table extracted to %s\n", outname); - fclose(outfile); - delete doc; -- delete globalParams; - } diff --git a/print/web2c/patches/patch-pdftexdir_utils.c b/print/web2c/patches/patch-pdftexdir_utils.c deleted file mode 100644 index 01962691023..00000000000 --- a/print/web2c/patches/patch-pdftexdir_utils.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-pdftexdir_utils.c,v 1.1 2020/01/11 00:31:05 ryoon Exp $ - -* Fix a cstdio is not found error. - ---- pdftexdir/utils.c.orig 2017-11-14 23:50:55.000000000 +0000 -+++ pdftexdir/utils.c -@@ -33,7 +33,6 @@ with this program. If not, see <http:// - #include "ptexlib.h" - #include <png.h> - #ifdef POPPLER_VERSION --#include <poppler-config.h> - #define xpdfVersion POPPLER_VERSION - #define xpdfString "poppler" - #else diff --git a/print/web2c/patches/patch-pdftexdir_writeenc.c b/print/web2c/patches/patch-pdftexdir_writeenc.c deleted file mode 100644 index 37510812063..00000000000 --- a/print/web2c/patches/patch-pdftexdir_writeenc.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-pdftexdir_writeenc.c,v 1.2 2019/05/14 13:23:10 adam Exp $ - -Fix building. - ---- pdftexdir/writeenc.c.orig 2016-11-25 18:24:37.000000000 +0000 -+++ pdftexdir/writeenc.c -@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s) - - /**********************************************************************/ - --void epdf_write_enc(char **glyph_names, int fe_objnum) -+void epdf_write_enc(const char **glyph_names, int fe_objnum) - { - int i, i_old; - assert(glyph_names != NULL); diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile index b72a8a34e6b..c671d3f7623 100644 --- a/print/xdvik/Makefile +++ b/print/xdvik/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.29 2020/03/20 11:58:15 nia Exp $ +# $NetBSD: Makefile,v 1.30 2020/05/10 03:56:40 markd Exp $ .include "../../print/texlive/Makefile.common" -PKGNAME= xdvik-22.87.03 -PKGREVISION= 3 +PKGNAME= xdvik-22.87.04 CATEGORIES= print HOMEPAGE= http://xdvi.sourceforge.net/ COMMENT= Previewer for DVI files -BUILD_DEPENDS+= tex-tetex-[0-9]*:../../print/tex-tetex +BUILD_DEPENDS+= tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts BUILD_DEPENDS+= tex-xdvi-[0-9]*:../../print/tex-xdvi DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk DEPENDS+= kpathsea>=6.2.1:../../print/kpathsea diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo index 37b427ae42d..c6fbf036a40 100644 --- a/print/xdvik/distinfo +++ b/print/xdvik/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.17 2020/05/10 03:56:40 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-aa) = 92ab2c63769204f5ee42a10f84a47f636fae82c6 SHA1 (patch-ab) = 09dbadaa8fb4575e4a437f3a3df266ae808e3278 SHA1 (patch-configure) = 10ecd7bd6928d1296bde494ce5173187e2734731 diff --git a/print/xetex/Makefile b/print/xetex/Makefile index bd844d27a50..7559323d045 100644 --- a/print/xetex/Makefile +++ b/print/xetex/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.99 2020/04/12 08:29:09 adam Exp $ +# $NetBSD: Makefile,v 1.100 2020/05/10 03:56:40 markd Exp $ -PKGREVISION= 9 .include "../../print/texlive/Makefile.common" -PKGNAME= xetex-0.999991 +PKGNAME= xetex-0.999992 CATEGORIES= print HOMEPAGE= https://www.tug.org/xetex/ @@ -13,8 +12,6 @@ LICENSE= mit CONFLICTS+= web2c<=7.5.7 DEPENDS+= dvipdfmx>=20140525:../../print/dvipdfmx -EXTRACT_ELEMENTS+= ${DISTNAME}/libs/graphite2 -EXTRACT_ELEMENTS+= ${DISTNAME}/libs/harfbuzz EXTRACT_ELEMENTS+= ${DISTNAME}/libs/xpdf EXTRACT_ELEMENTS+= ${DISTNAME}/texk/web2c @@ -26,6 +23,8 @@ CONFIGURE_ARGS+= --disable-eptex CONFIGURE_ARGS+= --disable-euptex CONFIGURE_ARGS+= --disable-etex CONFIGURE_ARGS+= --disable-luajittex +CONFIGURE_ARGS+= --disable-luajithbtex +CONFIGURE_ARGS+= --disable-luahbtex CONFIGURE_ARGS+= --disable-luatex CONFIGURE_ARGS+= --disable-luatex53 CONFIGURE_ARGS+= --disable-mf @@ -43,6 +42,8 @@ CONFIGURE_ARGS+= --enable-web2c CONFIGURE_ARGS+= --enable-xetex CONFIGURE_ARGS+= --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include CONFIGURE_ARGS+= --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib +CONFIGURE_ARGS+= --with-system-graphite2 +CONFIGURE_ARGS+= --with-system-harfbuzz CONFIGURE_ARGS+= --with-system-kpathsea CONFIGURE_ARGS+= --with-system-poppler CONFIGURE_ARGS+= --with-system-zlib @@ -54,8 +55,6 @@ CONFIGURE_ARGS+= --with-system-teckit CONFIGURE_ARGS+= --with-system-icu CONFIGURE_ARGS+= --without-x -CONFIGURE_DIRS= libs/graphite2 -CONFIGURE_DIRS+= libs/harfbuzz CONFIGURE_DIRS+= libs/xpdf CONFIGURE_DIRS+= texk/web2c @@ -75,6 +74,7 @@ do-install: .include "../../converters/TECkit/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../fonts/harfbuzz/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1 diff --git a/print/xetex/distinfo b/print/xetex/distinfo index 684bf3253f6..cf40e0678a1 100644 --- a/print/xetex/distinfo +++ b/print/xetex/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.23 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.24 2020/05/10 03:56:40 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes SHA1 (patch-texk_web2c_xetexdir_XeTeX__ext.c) = a83e842b567db6acb35cfab5303a7e96845fa953 SHA1 (patch-texk_web2c_xetexdir_pdfimage.cpp) = 80536965759abcf408bd02c326c23a11de697946 diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile index abfc1603bf3..73ab5be7725 100644 --- a/print/xpdfopen/Makefile +++ b/print/xpdfopen/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2020/01/18 23:35:05 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2020/05/10 03:56:40 markd Exp $ .include "../../print/texlive/Makefile.common" PKGNAME= xpdfopen-0.86 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= print HOMEPAGE= https://www.tug.org/texlive/ diff --git a/print/xpdfopen/distinfo b/print/xpdfopen/distinfo index ec96beb1497..7c727bc6e70 100644 --- a/print/xpdfopen/distinfo +++ b/print/xpdfopen/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.9 2019/05/09 09:47:36 adam Exp $ +$NetBSD: distinfo,v 1.10 2020/05/10 03:56:40 markd Exp $ -SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 -RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b -SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e -Size (texlive-20190410-source.tar.xz) = 53783408 bytes -SHA1 (patch-Makefile.in) = 36bd7f20f0aa8901dbc6f6972451cd9b1b748d3d +SHA1 (texlive-20200406-source.tar.xz) = 94b77331474d678ce75d9d6c673965fd7f93295b +RMD160 (texlive-20200406-source.tar.xz) = 7475f64f21c7ba7a2e7c6e9bfe534dd6d53e4bb9 +SHA512 (texlive-20200406-source.tar.xz) = 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 +Size (texlive-20200406-source.tar.xz) = 55383320 bytes |