texlive: update to 2018 release

Closes: https://trac.macports.org/ticket/56386
macports · Jun 18, 2018 · 419c16d · 419c16d
1 parent 6cf7072
commit 419c16d
Show file tree

Hide file tree

Showing 46 changed files with 595 additions and 455 deletions.
diff --git a/tex/biblatex-biber/Portfile b/tex/biblatex-biber/Portfile
@@ -12,9 +12,8 @@ epoch           2
 
 perl5.branches  5.26
 
-perl5.setup     Biber 2.7
+perl5.setup     Biber 2.11
 version         ${perl5.moduleversion}
-revision        3
 
 categories      tex
 license         {Artistic-2 GPL}
@@ -36,10 +35,10 @@ master_sites    https://github.com/plk/biber/archive/
 distname        v${version}
 worksrcdir      biber-${version}
 
-checksums       rmd160  50f689a15bde19959ed261cea1c105fa815ab5a7 \
-                sha256  a0afc4cd97d56f4f433e476de1d4bd9bf9740eb29191bf616b1ea3f424408d9f
+checksums       rmd160  38505d7ab6e3776acae69f6b4293ec931a37d20e \
+                sha256  4839cc5b73cf4d960ef751636f2d29df7212c722ddb5073885df404b785f0cd2
 
-patchfiles      patch-use-encode.pm
+#patchfiles      patch-use-encode.pm
 
 depends_build-append    port:p${perl5.major}-config-autoconf \
                         port:p${perl5.major}-extutils-libbuilder \
@@ -59,7 +58,7 @@ depends_lib-append      port:p${perl5.major}-autovivification \
                         port:p${perl5.major}-encode-eucjpascii \
                         port:p${perl5.major}-encode-hanextra \
                         port:p${perl5.major}-encode-jis2k \
-                        port:p${perl5.major}-file-slurp \
+                        port:p${perl5.major}-file-slurper \
                         port:p${perl5.major}-file-which \
                         port:p${perl5.major}-ipc-cmd \
                         port:p${perl5.major}-ipc-run3 \
@@ -69,6 +68,7 @@ depends_lib-append      port:p${perl5.major}-autovivification \
                         port:p${perl5.major}-list-moreutils \
                         port:p${perl5.major}-log-log4perl \
                         port:p${perl5.major}-mozilla-ca \
+                        port:p${perl5.major}-perlio-utf8_strict \
                         port:p${perl5.major}-readonly \
                         port:p${perl5.major}-readonly-xs \
                         port:p${perl5.major}-regexp-common \

diff --git a/tex/latexmk/Portfile b/tex/latexmk/Portfile
@@ -3,9 +3,9 @@
 PortSystem          1.0
 
 name                latexmk
-version             4.52c
-checksums           rmd160  760a912d1d8627c8263e8678f1ce75db86922a00 \
-                    sha256  7a8fd50e0bd46c8705aa4e0fcbc36d01d528cc92a96d71e1c00e1fb2e6484db2
+version             4.55
+checksums           rmd160  c4370e8f75c7745ad9f79ee7029b8140b73a3568 \
+                    sha256  aa400d3c5860fffc925efe5d832c575f3bee1d3770e4c6db96e2add518c38d2b
 
 categories          tex print
 platforms           darwin

diff --git a/tex/texlive-basic/Portfile b/tex/texlive-basic/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           texlive 1.0
 
 name                texlive-basic
-version             44435
+version             47434
 revision            0
 
 categories          tex
@@ -13,15 +13,15 @@ license             Copyleft Permissive
 description         TeX Live: Essential programs and files
 long_description    These files are regarded as basic for any TeX system, covering plain TeX macros, Computer Modern fonts, and configuration for common drivers\; no LaTeX.
 
-checksums           texlive-basic-44435-run.tar.xz \
-                    rmd160  d559ff32322d346375078a953124e3500d30d8d3 \
-                    sha256  47ec78ffc398ab98728a224218457c41f44482dcbd99d00d2a87a16f650c8a17 \
-                    texlive-basic-44435-doc.tar.xz \
-                    rmd160  28a376169c8999e332eca0d42e083e2c5d36bb48 \
-                    sha256  497fd18272015da1002e2833fffa989e9bb4d494cc7675e6e2f8c927fb27f816 \
-                    texlive-basic-44435-src.tar.xz \
-                    rmd160  dcd0ae5fe4c861ab2e6a4fd536ab272e36d745c2 \
-                    sha256  bb8e6c4dfb03497865c542201372243d323fc811b452e248aac94d0e8da4ad4d
+checksums           texlive-basic-47434-run.tar.xz \
+                    rmd160  db9269a12e1efcf9606b92cedb1eb675bc3c2017 \
+                    sha256  24e7db599421c175f31526370e3c98886d422eeb305d774b3ab221783d95e6e4 \
+                    texlive-basic-47434-doc.tar.xz \
+                    rmd160  432242993facb78e2286f7eef10e70855d69f382 \
+                    sha256  c860614acadbe0409d9a7000de6d7604d30cb098a09112b070feb23370583cab \
+                    texlive-basic-47434-src.tar.xz \
+                    rmd160  908d10d2a0e750eff9e02b917be85c9d8d055259 \
+                    sha256  6ec3d03346618eca9e50ce078108ae65380eedb5f7270064804823cb0da50791
 
 texlive.formats      \
     {1 luatex luatex language.def,language.dat.lua {luatex.ini}} \
@@ -44,7 +44,7 @@ texlive.maps      \
     {Map dummy-space.map} \
     {Map mathpple.map}
 
-texlive.binaries    afm2tfm allcm allec allneeded bibtex dvi2fax dviluatex dvipdfm dvipdfmx dvipdft dvips dvired ebb etex extractbb fmtutil fmtutil-sys fmtutil-user gftodvi gftopk gftype gsftopk inimf initex kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luajittex luatex makeindex mf mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdfetex pdftex pktogf pktype simpdftex tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texluac texluajit texluajitc updmap updmap-sys updmap-user xdvi
+texlive.binaries    afm2tfm allcm allec allneeded bibtex dvi2fax dviluatex dvipdfm dvipdfmx dvipdft dvips dvired ebb etex extractbb fmtutil fmtutil-sys fmtutil-user gftodvi gftopk gftype gsftopk inimf initex kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luajittex luatex luatex53 makeindex mf mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdfetex pdftex pktogf pktype simpdftex tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texlua53 texluac texluajit texluajitc updmap updmap-sys updmap-user xdvi
 
 texlive.exclude     texmf-dist/web2c/fmtutil.cnf \
                     texmf-dist/web2c/texmf.cnf \

diff --git a/tex/texlive-bibtex-extra/Portfile b/tex/texlive-bibtex-extra/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           texlive 1.0
 
 name                texlive-bibtex-extra
-version             44385
+version             47418
 revision            0
 
 categories          tex
@@ -13,19 +13,19 @@ license             Copyleft Permissive
 description         TeX Live: BibTeX additional styles
 long_description    Additional BibTeX styles and bibliography data(bases), notably including BibLaTeX.
 
-checksums           texlive-bibtex-extra-44385-run.tar.xz \
-                    rmd160  a217eede0d8377f61009c100fbabf8e606655273 \
-                    sha256  8ce8a88bed7da520cc87bd7fa537c439989efa4b002e0825b6706be4b0ab57f1 \
-                    texlive-bibtex-extra-44385-doc.tar.xz \
-                    rmd160  097b8559b9224d873f424a8d52d6eaad2aec52d7 \
-                    sha256  e00b4856f983db3e14b93c46b4c73ab92eaefb02927d1209ab26938f0649bdb2 \
-                    texlive-bibtex-extra-44385-src.tar.xz \
-                    rmd160  0e1b18e768548c2e4bba5888ba1bca963d97c51c \
-                    sha256  1441db7b639316b7f09b9c21ed557416e031b42ab37774c75c0276dbcb63eb4f
+checksums           texlive-bibtex-extra-47418-run.tar.xz \
+                    rmd160  f1632190d3d24455a1ed5d5a6affd11d381fe537 \
+                    sha256  9c8fc7eb20cfe8364ab3ab247c3323e485c3fb980e3846fe502a9e8606ff9c78 \
+                    texlive-bibtex-extra-47418-doc.tar.xz \
+                    rmd160  d79593200fb6b62f7053a91825b45babdf37eda0 \
+                    sha256  828afc56354f76e0aea6e89143fe9ff13fc906a8d12097e412e06addf6e3b920 \
+                    texlive-bibtex-extra-47418-src.tar.xz \
+                    rmd160  d95aa3642457a501aa2d7ad1791fb3610ba1d93a \
+                    sha256  4ce079e79ae7c660bb7e3e374a4f03da038176b055dc410cdefa0798ea5f2c81
 
 depends_lib         port:texlive-latex
 
-texlive.binaries    bbl2bib bibdoiadd bibexport bibmradd bibzbladd listbib ltx2crossrefxml multibibliography urlbst
+texlive.binaries    bbl2bib bib2gls bibdoiadd bibexport bibmradd biburl2doi bibzbladd convertgls2bib listbib ltx2crossrefxml multibibliography urlbst
 
 
 texlive.texmfport
diff --git a/tex/texlive-bin-extra/Portfile b/tex/texlive-bin-extra/Portfile
@@ -4,40 +4,36 @@ PortSystem          1.0
 PortGroup           texlive 1.0
 
 name                texlive-bin-extra
-version             44432
-revision            1
+version             47446
+revision            0
 
 categories          tex
 maintainers         {dports @drkp}
 license             Copyleft Permissive
 description         TeX Live: TeX auxiliary programs
 long_description    Various useful, but non-essential, support programs. Includes programs and macros for DVI file manipulation, literate programming, patgen, and the TeX Works Editor.
 
-checksums           texlive-bin-extra-44432-run.tar.xz \
-                    rmd160  65af35dd9c8273fd30b2363e3a754d6783f68809 \
-                    sha256  5a1b31ba13bb52b9fc298d62711afc32133ac09af8a88a6bd2099e9e057310d7 \
-                    texlive-bin-extra-44432-doc.tar.xz \
-                    rmd160  c0580c7ff09cc509c74e9c05dbaec6924faa5dbd \
-                    sha256  2f0c0cf572a09bfdc5fb21f3aded330a8a33b1129e20ac9f936bca755e593304 \
-                    texlive-bin-extra-44432-src.tar.xz \
-                    rmd160  0fc7d00f4244b20191b40f72a1024cccd6db31e4 \
-                    sha256  0efa7f9a101f63c4780cbb92dfd600973b0fd48cadaf0be1e8ef82c6d929c627
+checksums           texlive-bin-extra-47446-run.tar.xz \
+                    rmd160  465d16566d0bb2545117d761e419cd72c9591767 \
+                    sha256  5834c7734dc4985b3c821757af02b8a6a0cd7e487ed1a303f217a434d0070866 \
+                    texlive-bin-extra-47446-doc.tar.xz \
+                    rmd160  0a9cd67461e8b3fea14467f22a7ae44518d3f16f \
+                    sha256  c1b813f6dfab8fd9700ca3f97949d1221226c30d1ba282917080732ea2955a40 \
+                    texlive-bin-extra-47446-src.tar.xz \
+                    rmd160  d1fdf8dc75551a3e9c4ca9e74eaaa94692fe213a \
+                    sha256  872036e0009c46de9d1c24da73d0eba42dd6f1f35e1aee29bd4afbf7f063f8df
 
 depends_lib         port:texlive-basic
 
 texlive.formats      \
     {0 mflua mflua-nowin - {mf.ini}}
 
-texlive.binaries    a2ping a5toa4 adhocfilelist arara arlatex bibtex8 bibtexu bundledoc checklistings chktex chkweb ctangle ctanify ctanupload ctie cweave de-macro depythontex deweb dt2dv dtxgen dv2dt dviasm dvibook dviconcat dvicopy dvidvi dvihp dvilj dvilj2p dvilj4 dvilj4l dvilj6 dvipos dviselect dvisvgm dvitodvi dvitype e2pall findhyph fragmaster installfont-tl lacheck latex-git-log latex-papersize latex2man latex2nemeth latexfileversion latexindent latexpand listings-ext.sh ltxfileinfo ltximg make4ht match_parens mflua mflua-nowin mfluajit mfluajit-nowin mkjobtexmf patgen pdfatfi pdfbook2 pdfclose pdfcrop pdflatexpicscale pdfopen pdftosrc pdfxup pfarrei pkfix pkfix-helper pooltype purifyeps pythontex rpdfcrop srcredact sty2dtx synctex tangle tex4ebook texcount texdef texdiff texdirflatten texdoc texdoctk texfot texliveonfly texloganalyser texosquery texosquery-jre5 texosquery-jre8 tie tpic2pdftex typeoutfileinfo weave
+texlive.binaries    a2ping a5toa4 adhocfilelist arara arlatex bibtex8 bibtexu bundledoc checklistings chktex chkweb ctan-o-mat ctangle ctanify ctanupload ctie cweave de-macro depythontex deweb dt2dv dtxgen dv2dt dviasm dvibook dviconcat dvicopy dvidvi dvihp dviinfox dvilj dvilj2p dvilj4 dvilj4l dvilj6 dvipos dviselect dvisvgm dvitodvi dvitype e2pall findhyph fragmaster installfont-tl ketcindy lacheck latex-git-log latex-papersize latex2man latex2nemeth latexdef latexfileversion latexindent latexpand listings-ext.sh ltxfileinfo ltximg make4ht match_parens mflua mflua-nowin mfluajit mfluajit-nowin mkjobtexmf patgen pdfatfi pdfbook2 pdfclose pdfcrop pdflatexpicscale pdfopen pdftosrc pdfxup pfarrei pkfix pkfix-helper pooltype purifyeps pythontex rpdfcrop srcredact sty2dtx synctex tangle tex4ebook texcount texdef texdiff texdirflatten texdoc texdoctk texfot texliveonfly texloganalyser texosquery texosquery-jre5 texosquery-jre8 tie tlcockpit tlshell tpic2pdftex typeoutfileinfo weave
 
 depends_run         port:latexmk \
                     port:detex \
                     port:latexdiff \
                     port:pdfjam \
                     port:dvipng
 
-#   fix FTBFS: Unescaped left brace in regex is illegal here in regex
-#   See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871159
-patchfiles          871159.diff
-
 texlive.texmfport
diff --git a/tex/texlive-bin/Portfile b/tex/texlive-bin/Portfile
@@ -9,10 +9,8 @@ PortGroup       cxx11 1.1
 # scripts) to build universal
 PortGroup       muniversal 1.0
 
-
 name            texlive-bin
-version         2017
-revision        4
+version         2018.47642
 
 categories      tex
 maintainers     {dports @drkp}
@@ -39,20 +37,21 @@ license         Copyleft Permissive LGPL-2.1+ BSD
 master_sites    https://giraffe.cs.washington.edu/texlive/ \
                 https://alpaca.cs.washington.edu/texlive/ \
                 https://www.ambulatoryclam.net/texlive/
-set distversion 20170604
 use_xz          yes
-distname        texlive-source-${distversion}-stripped
+distname        texlive-source-${version}-stripped
 worksrcdir      ${distname}
 
-set tlpkgdistname   tlpkg-TeXLive-${distversion}
+set tlpkgdistname   tlpkg-TeXLive-${version}
 distfiles-append    ${tlpkgdistname}${extract.suffix}
 
-checksums           texlive-source-20170604-stripped.tar.xz \
-                    rmd160  7d52410ec667323dc4681f49cba3667d09dc0607 \
-                    sha256  0d406c581a48fe9227992ceed09f90a7fb75bfe68568e9478a19da8e6e544217 \
-                    tlpkg-TeXLive-20170604.tar.xz \
-                    rmd160  23b7e5841cf94994c87b95bb3adf09ffa53a0087 \
-                    sha256  b574ae43f707a8529f9c5280b63dfbd2445c29da702ae5f4b4acc71684867654
+checksums           texlive-source-2018.47642-stripped.tar.xz \
+                    rmd160  5cacb77580def95071a797c73e620f3f59558fb6 \
+                    sha256  3d96e6993d52c373c78291c70c8d668968bad2e9e0da2249da4f6138434f3118 \
+                    size    18994796 \
+                    tlpkg-TeXLive-2018.47642.tar.xz \
+                    rmd160  c14c04444af0ee2ed739c7c6776b6afac39cf766 \
+                    sha256  54505501198b171af862ca17c2da4388242b1a1b6e724aabb048ce5125517c8f \
+                    size    103320
 
 depends_lib     port:fontconfig \
                 port:freetype \
@@ -77,7 +76,7 @@ depends_run     port:ghostscript
 
 depends_build-append \
                 path:bin/perl:perl5 \
-                port:pkgconfig
+                path:bin/pkg-config:pkgconfig
 
 # patches related to changes in install paths
 patchfiles-append  patch-texk_chktex_Makefile.in.diff \
@@ -92,12 +91,9 @@ patchfiles-append  patch-texk_chktex_Makefile.in.diff \
 patchfiles-append  patch-libs_luajit_configure.diff \
                    patch-texk_web2c_configure.diff
 
-# fix dvips crash; see https://trac.macports.org/ticket/53974
-patchfiles-append  patch-53974.diff
-
-# upstream patch for luatex: see
-# http://tug.org/pipermail/tlbuild/2017q2/003847.html
-patchfiles-append  patch-r44590.diff
+# patches for compatibility with latest poppler 
+patchfiles-append  patch-pdftosrc-const.diff \
+                   patch-r47470.diff
 
 post-patch {
     reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
@@ -120,6 +116,10 @@ post-patch {
     file copy ${filespath}/texk_kpathsea_paths.h ${worksrcpath}/texk/kpathsea/paths.h
     reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/texk/kpathsea/paths.h
     reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/kpathsea/paths.h
+
+    # Required to support poppler >0.59
+    file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftoepdf.cc 
+    file rename -force ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc ${worksrcpath}/texk/web2c/pdftexdir/pdftosrc.cc 
 }
 
 # We use MacPorts-provided libraries instead of the ones included in
@@ -133,6 +133,7 @@ post-patch {
 # Many of the --with-system-* and --disable-* flags are actually
 # redundant because we've removed those components from the distfile,
 # but we leave them here for compatibility with the stock distfile.
+
 configure.args  --bindir=${texlive_bindir} \
                 --mandir=${texlive_bindir} \
                 --infodir=${prefix}/share/info \

diff --git a/tex/texlive-bin/files/patch-pdftosrc-const.diff b/tex/texlive-bin/files/patch-pdftosrc-const.diff
@@ -0,0 +1,12 @@
+reverted:
+--- texk/web2c/pdftexdir/pdftosrc-newpoppler.cc.orig	2018-06-16 15:37:11.000000000 -0700
++++ texk/web2c/pdftexdir/pdftosrc-newpoppler.cc	2018-06-16 15:37:18.000000000 -0700
+@@ -68,7 +68,7 @@
+     Stream *s;
+     Object srcStream, srcName, catalogDict;
+     FILE *outfile;
++    const char *outname;
+-    char *outname;
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;