5 files changed, 15 insertions, 11 deletions
diff --git a/office/texlive-extra/README b/office/texlive-extra/README
index a67e5d7ad0..081fb60fde 100644
--- a/office/texlive-extra/README
+++ b/office/texlive-extra/README
@@ -1,4 +1,4 @@
 texlive-extra (extra texmf files for TeXLive)
 
-This package contains texmf files which don't fit in the texlive or
-texlive-fonts packages. Appropriate docs are included as well.
+This package contains texmf files which don't fit in the
+texlive base package. Appropriate docs are included as well.
diff --git a/office/texlive-extra/doinst.sh b/office/texlive-extra/doinst.sh
index 0d6b389cdf..6bd3d2a58e 100644
--- a/office/texlive-extra/doinst.sh
+++ b/office/texlive-extra/doinst.sh
@@ -1,3 +1,3 @@
 chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
 printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null
-chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
+chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
diff --git a/office/texlive-extra/slack-desc b/office/texlive-extra/slack-desc
index f21a904c9c..aaafe2ace0 100644
--- a/office/texlive-extra/slack-desc
+++ b/office/texlive-extra/slack-desc
@@ -8,8 +8,8 @@
              |-----handy-ruler------------------------------------------------------|
 texlive-extra: texlive-extra (extra texmf files for TeXLive)
 texlive-extra:
-texlive-extra: This package contains texmf files which don't fit in the texlive or
-texlive-extra: texlive-fonts packages. Appropriate docs are included as well.
+texlive-extra: This package contains texmf files which don't fit in the
+texlive-extra: texlive base package. Appropriate docs are included as well.
 texlive-extra:
 texlive-extra:
 texlive-extra:
diff --git a/office/texlive-extra/texlive-extra.SlackBuild b/office/texlive-extra/texlive-extra.SlackBuild
index 81c72d7bd2..49a5669b3d 100644
--- a/office/texlive-extra/texlive-extra.SlackBuild
+++ b/office/texlive-extra/texlive-extra.SlackBuild
@@ -3,8 +3,8 @@
 # texlive-extra build script for Slackware
 
 # Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2009-2014  Robby Workman, Northport, AL, USA
-# Copyright 2016-2017  Johannes Schoepfer, Germany
+# Copyright 2009 - 2014  Robby Workman, Northport, AL, USA
+# Copyright 2016 - 2018  Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texlive-extra
-VERSION=${VERSION:-2017.171108}
+VERSION=${VERSION:-2018.180630}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,6 +50,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/share
 chown -R root:root $PKG
 chmod -R u+w,go-w,a+rX-st $PKG
 
+# Put symlinks/scripts from tlnet in place
+mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin
+rmdir $PKG/usr/share/texmf-dist/linked_scripts
+
 # Move biber binary to $PATH
 case $ARCH in
 	"x86_64") mv $PKG/usr/share/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;;
diff --git a/office/texlive-extra/texlive-extra.info b/office/texlive-extra/texlive-extra.info
index 0d07a33135..5c221470ce 100644
--- a/office/texlive-extra/texlive-extra.info
+++ b/office/texlive-extra/texlive-extra.info
@@ -1,8 +1,8 @@
 PRGNAM="texlive-extra"
-VERSION="2017.171108"
+VERSION="2018.180630"
 HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2017/texlive-extra/texlive-extra-2017.171108.tar.xz"
-MD5SUM="34093692c1790a2adf3653ddc788ac04"
+DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2018/texlive-extra/texlive-extra-2018.180630.tar.xz"
+MD5SUM="224e0cebecad1a4394e148a13e5ad2f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="texlive"