texlive: 20170524 -> 20180414

texlive/.signature

@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Tw8T4iAGdZBWxCG8dyX6x/99fdNsME5dTqZtqSwl7SHEV4F+vh83lE7WHzQgwg0+/9ibqcSPsG/guYQaPPjFgQ=
-SHA256 (Pkgfile) = a70d12a8453bf825e5e6bdd1cea2a842b4894443a77f2c2a1507ccff6fe2e66c
-SHA256 (.footprint) = 70e222484dc823f187d29a79ff94578b0fa4b21f84bd75b38f0b4802db7a55ef
-SHA256 (texlive-20170524-texmf.tar.xz) = 3f63708b77f8615ec6f2f7c93259c5f584d1b89dd335a28f2362aef9e6f0c9ec
-SHA256 (texlive-20170524-source.tar.xz) = 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa
+RWSE3ohX2g5d/cqLS32/8IhIq/3OAS9Sxc/D8JSpcdfQkzuboaU0U2gjxZHSXdMvMf7bbwBokLqhu7Jprr3ksrqgWNZLYbJa6g8=
+SHA256 (Pkgfile) = eee0cfa6fe55185dfb944680feb5cb00a082bd482d69477cf99d799a7806e49c
+SHA256 (.footprint) = 54ed936b06ad1b347e41ef28c41b95e133178c7f04ad5ab1adb76f8bcf93185b
+SHA256 (texlive-20180414-texmf.tar.xz) = bae2fa05ea1858b489f8138bea855c6d65829cf595c1fb219c5d65f4fe8b1fad
+SHA256 (texlive-20180414-source.tar.xz) = fe0036d5f66708ad973cdc4e413c0bb9ee2385224481f7b0fb229700a0891e4e
 SHA256 (texi2html-5.0.tar.bz2) = e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa
-SHA256 (texlive-poppler-0.59.patch) = 82703c2d8698e15ee9a8bed6eee1a7140dc48ea2f65a497ddf81f187df6e6832
+SHA256 (texlive-poppler-0.64.patch) = 8f42a828ac7d607fce59c1360e78bf8e2996979ffb902e81ecc41f13a4871b39

texlive/Pkgfile

@@ -4,12 +4,12 @@
 # Depends on:  clisp icu libgd poppler t1lib util-linux xorg-libxi
 
 name=texlive
-version=20170524
+version=20180414
 release=1
 source=(ftp://tug.org/historic/systems/texlive/${version:0:4}/$name-$version-texmf.tar.xz
         ftp://tug.org/historic/systems/texlive/${version:0:4}/$name-$version-source.tar.xz
         http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2
-	texlive-poppler-0.59.patch)
+        texlive-poppler-0.64.patch)
 
 build() {
   cd $name-$version-source
@@ -22,8 +22,13 @@ build() {
     \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
     -exec chmod 644 {} \;
 
-  # Fix build with poppler 0.59.0 (thanks to Archlinux)
-  patch -Np1 < $SRC/texlive-poppler-0.59.patch
+  # Fix build with poppler 0.64 (thanks to BLFS)
+  patch -Np1 < $SRC/texlive-poppler-0.64.patch
+  (
+    cd texk/web2c/pdftexdir \
+    && mv -v pdftoepdf{-newpoppler,}.cc \
+    && mv -v pdftosrc{-newpoppler,}.cc
+  )
 
   # Fix some paths
   sed -i 's|TEXMFROOT = .*|TEXMFROOT = $SELFAUTODIR/share|g' texk/kpathsea/texmf.cnf
@@ -35,20 +40,22 @@ build() {
   mkdir build
   cd build
 
+  CONFIG_SHELL=/bin/bash \
   ../configure \
     --prefix=/usr \
     --with-banner-add=" $(crux)" \
     --disable-native-texlive-build \
-    --enable-largefile \
+    --disable-multiplatform \
+    --disable-debug \
     --disable-missing \
-    --with-xdvi-x-toolkit=xaw \
-    --enable-shared \
     --disable-static \
+    --enable-shared \
+    --enable-largefile \
     --with-x \
-    --without-etex \
+    --with-xdvi-x-toolkit=xaw \
     --disable-xindy \
-    --disable-luatex \
-    --disable-luajittex \
+    --disable-xindy-docs \
+    --disable-xindy-rules \
     --with-clisp-runtime=system \
     --with-system-poppler \
     --with-system-cairo \
@@ -64,16 +71,17 @@ build() {
     --with-system-mpfr \
     --with-system-icu
 
-  make -j4
+  make
   make DESTDIR=$PKG install
 
   cd ..
 
-  install -d $PKG/usr/lib/perl5/site_perl/5.24/TeXLive
-  install texk/tests/TeXLive/TL{Config,Utils}.pm $PKG/usr/lib/perl5/site_perl/5.24/TeXLive
+  PERLVER="$(perl -v |sed -nre '2{s/^.*\(v(5\.[0-9]+).*\).*$/\1/;p}')"
+  install -d $PKG/usr/lib/perl5/site_perl/${PERLVER}/TeXLive
+  install texk/tests/TeXLive/TL{Config,Utils}.pm $PKG/usr/lib/perl5/site_perl/${PERLVER}/TeXLive
 
   # Create symlinks
-  PATH="$PKG/usr/bin:$PATH" LD_LIBRARY_PATH+=$PKG/usr/lib \
+  PATH="$PKG/usr/bin:$PATH" LD_LIBRARY_PATH="$PKG/usr/lib:$LD_LIBRARY_PATH" \
     texlinks -f $PKG/usr/share/texmf-dist/web2c/fmtutil.cnf $PKG/usr/bin
 
   cd $SRC/$name-$version-texmf
@@ -94,7 +102,7 @@ build() {
   ./configure --prefix=/usr
 
   make
-  make install DESTDIR=$PKG
+  make DESTDIR=$PKG install
 
   rm -r $PKG/usr/share/{info,locale}
   rm -r $PKG/usr/share/texmf-dist/doc