office/texlive: Updated for version 2016.161031.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 197 insertions, 195 deletions

diff --git a/office/texlive/README b/office/texlive/README
index 672f8fd4b1..1498b10711 100644
--- a/office/texlive/README
+++ b/office/texlive/README
@@ -1,17 +1,15 @@
 TeXLive (TeXLive binaries, support files, TeX formats)
 
-This package contains binaries (including xindy and biber) and many 
-support files, TeX formats and packages, and other files included
-in the TeXLive TeX distribution.  This should be adequate for the 
-needs of most TeX users.
+This package contains binaries (including xindy and biber)
+and many support files, TeX formats and packages, and other files included
+in the TeXLive TeX distribution.  This should be adequate for the needs of
+most TeX users.
 
-The remaining stuff can be found in texlive-extra, texlive-fonts, and 
+The remaining stuff can be found in texlive-extra, texlive-fonts, and
 texlive-docs, all of which are also available at SlackBuilds.org.
 
-ConTeXt is currently not supported.
-
 Have a look at the scripts in the prep/ directory  to see how the texmf
 archives were created from the original Texlive netarchives.
 
-Note that this package conflicts with the tetex packages in Slackware, 
+Note that this package conflicts with the tetex packages in Slackware,
 so you'll need to remove tetex and tetex-doc before installing TeXLive.
diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh
index f005b9711f..5f3e042b17 100644
--- a/office/texlive/prep/texmf_get.sh
+++ b/office/texlive/prep/texmf_get.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# texmf_get.sh (c) 2016 Johannes Schoepfer, slackbuilds@schoepfer.info
+# texmf_get.sh (c) 2016 Johannes Schoepfer, slackbuilds[at]schoepfer[dot]info
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,20 +20,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#  V 0.5
+#  V 0.6
 #
 #  Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb
 #  This script takes care of dependencies(as far as these are present in texlive.tlpdb) of collections and packages,
 #  and that every texlive-package is included only once.
+#
+#  Policy from texlive-netarchive: Every package is included as dependency in exactly one collection. A package may have dependecies on other packages from any collection.
 
-# available packages http://mirror.ctan.org/systems/texlive/tlnet/archive/
+# packages source: http://mirror.ctan.org/systems/texlive/tlnet/archive/
 
 #set -e
+MAJORVERSION=2016
 # release mirror
 mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
 # pre-test mirror 2016
 # mirror="http://ftp.cstug.cz/pub/tex/local/tlpretest/"
-LANG=C 
+LANG=C
 TMP=$PWD/tmp
 output=$TMP/texlive.packages
 output_doc=$TMP/texlive.doc.packages
@@ -64,10 +67,10 @@ packages () {
 
 # The base
   PACKAGES="
-    collection-basic 
-    collection-latex 
-    collection-genericrecommended 
-    collection-latexrecommended 
+    collection-basic
+    collection-latex
+    collection-genericrecommended
+    collection-latexrecommended
     collection-xetex
     collection-metapost
     collection-plainextra
@@ -77,8 +80,9 @@ packages () {
     collection-htmlxml
     collection-luatex
     collection-fontsrecommended
-    collection-mathextra 
+    collection-mathextra
     collection-humanities
+    collection-context
     lh
     yfonts
     doublestroke
@@ -98,7 +102,17 @@ packages () {
     stmaryrd
     subfigure
     titlesec
+    siunitx
+    combelow
     csplain
+    csquotes
+    etoolbox
+    etextools
+    glossaries
+    imakeidx
+    idxlayout
+    bidi
+    filecontents
     biblatex
     biber.x86_64-linux
     biber.i386-linux
@@ -114,27 +128,27 @@ packages () {
     collection-langafrican
     hyphen-czech
     hyphen-slovak
-    hyphen-indic 
-    hyphen-sanskrit 
-    hyphen-armenian 
+    hyphen-indic
+    hyphen-sanskrit
+    hyphen-armenian
     hyphen-afrikaans
     hyphen-esperanto
-    hyphen-bulgarian 
-    hyphen-churchslavonic 
-    hyphen-mongolian 
-    hyphen-russian 
-    hyphen-serbian 
-    hyphen-ukrainian 
-    hyphen-catalan 
-    hyphen-galician 
-    hyphen-chinese 
-    hyphen-coptic 
-    hyphen-georgian 
-    hyphen-indonesian 
-    hyphen-interlingua 
-    hyphen-thai 
-    hyphen-turkmen 
-    hyphen-arabic 
+    hyphen-bulgarian
+    hyphen-churchslavonic
+    hyphen-mongolian
+    hyphen-russian
+    hyphen-serbian
+    hyphen-ukrainian
+    hyphen-catalan
+    hyphen-galician
+    hyphen-chinese
+    hyphen-coptic
+    hyphen-georgian
+    hyphen-indonesian
+    hyphen-interlingua
+    hyphen-thai
+    hyphen-turkmen
+    hyphen-arabic
     hyphen-farsi" \
   texmfget base
 
@@ -146,12 +160,12 @@ PACKAGES="collection-fontsextra" texmfget fonts
     collection-latexextra
     collection-pictures
     collection-games
-    collection-publishers 
-    collection-bibtexextra 
-    collection-binextra 
-    collection-science 
+    collection-publishers
+    collection-bibtexextra
+    collection-binextra
+    collection-science
     collection-omega
-    collection-music 
+    collection-music
     collection-langother
     collection-pstricks
     collection-langcyrillic
@@ -167,6 +181,16 @@ PACKAGES="collection-fontsextra" texmfget fonts
 # The docs-tarball - very big (about 1300 MB)
   texmfget docs
 
+  if [ "$TARBALL" != docs ]
+  then
+	echo "Packages-list: $output.meta.$TARBALL"
+	while read collection
+	do
+		grep -w "$collection" $collections_done &> /dev/null
+		[ $? != 0 ] && echo "WARNING: $collection was not processed, please edit packages-function."
+	done < $TMP/allcollections
+  fi
+
 # Following aren't supported
 #NAME=context PACKAGES="collection-context" ./texmf_get.sh
 #NAME=texworks PACKAGES="collection-texworks" ./texmf_get.sh
@@ -214,7 +238,7 @@ package_meta () {
 	# collection start linenumer
 	start_n="$(grep -n ^"name ${collection}$" $TMP/$db | cut -d':' -f1)"
 	[ -z "$start_n" ] && echo "$collection was not found in $TMP/$db, bye." && exit 1
-	
+
 	# find end of package/collection
 	for emptyline in $emptylines
 	do
@@ -224,13 +248,10 @@ package_meta () {
 			break
 		fi
 	done
-	
+
 	sed "${start_n},${end_n}!d" $TMP/$db > $tmpfile
 }
 
-
-
-
 package_list () {
 # Only do something if $collection wasn't already done before
 while [ -s $collections_tobedone ]
@@ -239,7 +260,7 @@ do
 	# continue with next collection if collection was already done
 	if [ -s "$collections_done" ]
 	then
-		grep -w "^${collection}$" $collections_done &> /dev/null 
+		grep -w "^${collection}$" $collections_done &> /dev/null
 		if [ $? = 0 ]
 		then
 			sed -i "/^$collection$/d" $collections_tobedone
@@ -251,11 +272,11 @@ do
 	then
 		cp $texmf/$collection.meta $tmpfile
 	else
-		package_meta 
+		package_meta
 	fi
 
 	# ignore dependend collections generally, as this adds far too much and therefore reduces controll over what packages to be added
-	sed -i "/^depend collection/d" $tmpfile 
+	sed -i "/^depend collection/d" $tmpfile
 	# If $collection is a singel package, add it here
 	if [ -n "$(head -n1 $tmpfile | fgrep -v "name collection" )" ]
 	then
@@ -276,7 +297,6 @@ done
 
 }
 
-
 untar () {
 	# download packages, if not already available. Not for all packages a corresponding .doc package exists
 	rm $1.meta
@@ -289,7 +309,9 @@ untar () {
 		else
 			sha512="$(grep ^containerchecksum $texmf/$package.meta | cut -d' ' -f2 )"
 		fi
-		[ ! -s ${package}${flavour}.tar.xz ] && wget ${mirror}archive/${package}${flavour}.tar.xz
+		# try two times if package isn't present, with -t1 to get another mirror the second time
+		[ ! -s ${package}${flavour}.tar.xz ] && wget -t1 -c ${mirror}archive/${package}${flavour}.tar.xz
+		[ ! -s ${package}${flavour}.tar.xz ] && wget -t1 -c ${mirror}archive/${package}${flavour}.tar.xz
 		[ ! -s ${package}${flavour}.tar.xz ] && echo "Downloading ${package}${flavour}.tar.xz did not work, writing to $errorlog" && echo "Error downloading ${package}${flavour}.tar.xz" >> $errorlog && exit 1
 		# check sha512, give three tries for downloading aggain(diffrent mirrors are used automatically)
 		for tillthree in 1 2 3
@@ -297,8 +319,8 @@ untar () {
 			if [ "$(sha512sum ${package}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ]
 			then
 				# Download (hopefully) newer file
-				rm ${package}${flavour}.tar.xz 
-				wget ${mirror}archive/${package}${flavour}.tar.xz
+				rm ${package}${flavour}.tar.xz
+				wget -t1 -c ${mirror}archive/${package}${flavour}.tar.xz
 			else
 				break
 			fi
@@ -315,7 +337,7 @@ untar () {
 
 		# exclude the tlpkg-stuff, TLUtils.pm(needed tu run texlive) comes from source installation
 		grep -w ^"relocated 1" $texmf/$package.meta &>/dev/null
-		if [ $? = 0 ] 
+		if [ $? = 0 ]
 		then
 			tar vxf ${package}${flavour}.tar.xz --exclude tlpkg -C texmf-dist || exit 1
 		else
@@ -335,20 +357,25 @@ untar () {
 	# copy packages-list to texmf-dist, so included packages are known in later installation
 	sort -n $1.meta > TMPFILE
 	mv TMPFILE $1.meta
-	cp $1.meta texmf-dist/ 
+	cp $1.meta texmf-dist/
 
-	# remove uneeded sources
-	rm -rf texmf-dist/scripts/context/stubs/source/
+}
+
+remove_cruft () {
+	# Remove m$-stuff, ConTeXt single-user-system stuff, KOMA-Script sources and pdf-manpages
 	rm -rf texmf-dist/source
-	# Remove m$-stuff
-	find . -type d -name 'win32' -exec rm -rf {} +
-	find . -type d -name 'win64' -exec rm -rf {} +
-	find . -type d -name 'mswin' -exec rm -rf {} + 
-	find . -type d -name 'win'   -exec rm -rf {} + 
-	find . -type f -name '*.bat' -delete 
-	find . -type f -name '*win32*' -delete
-	find . -type f -name 'winansi*' -delete
-	# remove zero-length files, as these appear e.g. in hyph-utf8 tex-package. 
+	rm -rf texmf-dist/scripts/context/stubs/source/
+	find texmf-dist/ -type d -name 'win32'		-exec rm -rf {} +
+	find texmf-dist/ -type d -name 'win64'		-exec rm -rf {} +
+	find texmf-dist/ -type d -name 'mswin'		-exec rm -rf {} +
+	find texmf-dist/ -type d -name 'win'		-exec rm -rf {} +
+	find texmf-dist/ -type d -name 'setup'		-exec rm -rf {} +
+	find texmf-dist/ -type d -name 'install'	-exec rm -rf {} +
+	find texmf-dist/ -type f -name '*.bat'		-delete
+	find texmf-dist/ -type f -name '*win32*'	-delete
+	find texmf-dist/ -type f -name 'winansi*'	-delete
+	find texmf-dist/ -type f -name '*-man.pdf'	-delete
+	# remove zero-length files, as these appear e.g. in hyph-utf8 tex-package.
 	find . -type f -size 0c -delete
 }
 
@@ -363,7 +390,7 @@ if [ $TARBALL != docs ]
 then
 	echo "Preparing list of packages to be added the $NAME-tarball ..."
 	echo "$PACKAGES" | sed "s/[[:space:]]//g;/^$/d" >> $collections_tobedone
-	package_list 
+	package_list
 fi
 
 if [ $NAME = $TARBALL ]
@@ -404,26 +431,26 @@ cd $texmf
 
 # cleanup tar-directory, just in case
 [ -d texmf-dist ] && rm -rf texmf-dist
-#unset flavour ; export flavour 
+#unset flavour ; export flavour
 mkdir texmf-dist &> /dev/null
 
 VERSION=$(cat $TMP/VERSION)
 case $TARBALL in
 	docs)
-		export flavour=".doc" 
+		export flavour=".doc"
 		untar $output_doc
-		#tar Jvcf $TMP/texlive-texmf-docs-$VERSION.tar.xz texmf-dist || exit 1
+		remove_cruft
 		tar vrf $TMP/texlive-$TARBALL-$VERSION.tar texmf-dist || exit 1
 		echo "Packages-list: $output_doc"
 		rm -rf texmf-dist
 	;;
 	base|extra|fonts)
 		untar $output
+		remove_cruft
 		tar vrf $TMP/texlive-$TARBALL-$VERSION.tar texmf-dist || exit 1
 		cat $output.meta >> $output.meta.$TARBALL
-		rm $output.meta 
-		echo "Packages-list: $output.meta.$TARBALL"
-		rm $output 
+		rm $output.meta
+		rm $output
 		rm -rf texmf-dist
 	;;
 esac
@@ -443,16 +470,10 @@ mkdir -p $texmf
 cd $TMP
 
 # create run.tlpkg and doc.tlpkg only if $db.orig isn't there yet/was deleted
-if [ ! -s $TMP/${db}.orig ]
+if [ ! -s $TMP/${db}.orig -o ! -s $TMP/${db} ]
 then
-	# Set date manually upload date from $mirror/tlpkg/texlive.tlpdb. Looking a better way for auto-detect date/get reviosn in some way
-	#echo 20160405 > VERSION
-	date +%Y%m%d > VERSION
-	# get VERSION from texlive.tlpdb upload date. Not the best approach ...
-#	date -d $(curl -L -s ${mirror}/tlpkg/ | grep -w texlive.tlpdb | head -n1 | rev | cut -d':' -f2 | cut -d' ' -f2 | cut -d'>' -f1 | rev ) | date -f - +%Y%m%d > VERSION
-
-	
-	wget -O $TMP/${db}.orig -c ${mirror}tlpkg/$db 
+	echo $MAJORVERSION.$(date +%y%m%d) > VERSION
+	wget -c -O $TMP/${db}.orig -c ${mirror}tlpkg/$db 
 	# shrink db to be faster on later processing
 	sed "/^ \+./d;/^longdesc \+./d;/^cat\+./d;/^rev\+./d;/^exe\+./d;/^bin\+./d;/^src\+./d" $TMP/${db}.orig > $TMP/$db
 
@@ -460,42 +481,45 @@ then
 	rm -rf $texmf/*.meta
 	rm $TMP/run.tlpkg
 	[ -f "$output_doc" ] && rm "$output_doc"
-fi
 
-	
-# Make a list of all packages available, but exclude binary and installer/configuration packages.
-# It turns out that packagenames without '.' are what we want. Packages with '.' are all binarie-packages, which we biuld from source.
-grep ^name $TMP/$db | grep -v ^"name collection-" | grep -v ^"name scheme-" | grep -v '\.' | cut -d' ' -f2 > $TMP/allpackages
+	# Make a list of all packages available, but exclude binary and installer/configuration packages.
+	# It turns out that packagenames without '.' are what we want. Packages with '.' are all binarie-packages, which are build from source.
+	grep ^name $TMP/$db | grep -v ^"name collection-" | grep -v ^"name scheme-" | grep -v '\.' | cut -d' ' -f2 > $TMP/allpackages
 
-# add biber (perl)binaries as special exception.
-cat << EOF >> $TMP/allpackages
-biber.x86_64-linux
-biber.i386-linux
-EOF
-	
-	# further globaly excluded packages, which does not make sense without tlpkg-installer, or are non-linux specific, or are already covered by the sourcebuild.
+	# Make a list of all collections
+	grep ^"name collection-" $TMP/$db | cut -d' ' -f2 > $TMP/allcollections
+
+	# add biber (perl)binaries as special exception.
+	cat <<- EOF >> $TMP/allpackages
+	biber.x86_64-linux
+	biber.i386-linux
+	EOF
+
+fi
+
+# globaly excluded packages, which does not make sense without tlpkg-installer, or are non-linux specific, or are already covered by the sourcebuild,
+# or are covered by an external package(asymptote), or obsolete packages(datetime replaced by datetime2, anysize replaced by geometry)
 
 global_exclude="
-texworks
 "
-# unused variable, to be considered if these are already included by the source-tarball, or strip these of the source-tarball and add them as texlive-package?
+# currently unused variable, to be considered if these are already included by the source-tarball, or strip these of the source-tarball and add them as texlive-package?
 zglobal_exclude="
-bibtex8  
-bibtexu  
-chktex   
-cjkutils 
-detex    
-dtl      
-dvi2tty  
-dvidvi   
-dviljk   
-dvipdfmx 
-dvipng 
+bibtex8
+bibtexu
+chktex
+cjkutils
+detex
+dtl
+dvi2tty
+dvidvi
+dviljk
+dvipdfmx
+dvipng
 dvipos
 dvisvgm
 gsftopk
 pdftools
-synctex  
+synctex
 texconfig
 texlive-docindex
 texlive-msg-translations
@@ -512,9 +536,9 @@ luatex
 
 for i in $global_exclude
 do
-	if [ -z "$(grep -w ^"$i"$ $TMP/allpackages)" ] 
+	if [ -z "$(grep -w ^"$i"$ $TMP/allpackages)" ]
 	then
-		echo "\"$i\" seems not to be a tex-package listet in $db, correct the"
+		echo "\"$i\" seems not to be a tex-package listet in $db, edit the"
 		echo "global_exclude variable in this script, bye."
 		exit 1
 	else
@@ -523,7 +547,7 @@ do
 		[ -s $output_doc ] && sed -i "/^${i}$/d" $output_doc
 	fi
 done
-	
+
 # get linenumbers of empty lines
 [ -z "$emptylines" ] && emptylines="$(grep -n ^$ $TMP/$db | cut -d':' -f1)"
 # sort doc- and run- packages out to avoid binfiles and sourcfile in the texmf-tree
@@ -542,25 +566,25 @@ do
 	fi
 done < $TMP/allpackages
 
-# handle biber binaries to be add-able 
+# handle biber binaries to be add-able
 cat << EOF >> $TMP/run.tlpkg
 biber.x86_64-linux
 biber.i386-linux
 EOF
-		
 
 [ -f "$collections_done" ] && rm "$collections_done"
 [ -f "$collections_tobedone" ] && rm "$collections_tobedone"
 
-packages 
+packages
 
 # As the demanded packages are in the tarball, compress it.
-  echo "Compressing $TMP/texlive-$TARBALL-$VERSION.tar ..."
-  if [ -s $TMP/texlive-$TARBALL-$VERSION.tar ]; then
-    [ -f $TMP/texlive-$TARBALL-$VERSION.tar.xz ] && rm $TMP/texlive-$TARBALL-$VERSION.tar.xz
-    xz -9 -T0 $TMP/texlive-$TARBALL-$VERSION.tar || exit 1
-    ls -lah $TMP/texlive-$TARBALL-$VERSION.tar.xz
-  fi
+echo "Compressing $TMP/texlive-$TARBALL-$VERSION.tar ..."
+if [ -s $TMP/texlive-$TARBALL-$VERSION.tar ]
+then
+	[ -f $TMP/texlive-$TARBALL-$VERSION.tar.xz ] && rm $TMP/texlive-$TARBALL-$VERSION.tar.xz
+	xz -9 -T0 $TMP/texlive-$TARBALL-$VERSION.tar || exit 1
+	ls -lah $TMP/texlive-$TARBALL-$VERSION.tar.xz
+fi
 
 # cleanup
 rm $tmpfile
diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc
index e80c9361a3..0749b95fd1 100644
--- a/office/texlive/slack-desc
+++ b/office/texlive/slack-desc
@@ -8,11 +8,11 @@
        |-----handy-ruler------------------------------------------------------|
 texlive: TeXLive (TeXLive binaries, support files, TeX formats)
 texlive:
-texlive: This package contains binaries (including xindy and biber), support
-texlive: files, TeX formats and packages, and other files included in the
-texlive: TeXLive TeX distribution.  Included are input files for TeX, runtime
-texlive: configuration files, hyphenation tables, manpages, and the computer
-texlive: modern fonts.
+texlive: This package contains binaries (including xindy and
+texlive: biber), support files, TeX formats and packages, and other files
+texlive: included in the TeXLive TeX distribution.  Included are input files
+texlive: for TeX, runtime configuration files, hyphenation tables, manpages,
+texlive: and the computer modern fonts.
 texlive:
 texlive: More texmf files can be found in the texlive-extra and texlive-fonts
 texlive: packages; all of the docs can be found in the texlive-docs package.
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index 6abd007618..e2d8141cc0 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -24,13 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# URL: ftp://tug.org/historic/systems/texlive/2016/
-# Testrelease 2016 ftp://tug.org/texlive/Images/test/
+# URL: ftp://tug.org/historic/systems/texlive/
+# Testrelease: ftp://tug.org/texlive/Images/test/
 
 PRGNAM=texlive
-VERSION=20160523
-TEXMF_VERS=20161023
-BUILD=${BUILD:-3}
+SOURCEVERSION=20160523
+VERSION=${VERSION:-2016.161031}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -62,14 +62,14 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf texlive-$VERSION-source
-tar xvf $CWD/texlive-${VERSION}b-source.tar.xz
-cd texlive-$VERSION-source
+rm -rf texlive-$SOURCEVERSION-source
+tar xvf $CWD/texlive-${SOURCEVERSION}b-source.tar.xz
+cd texlive-$SOURCEVERSION-source
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
 export LANG=C
-export PATH="$PKG/usr/bin:$PATH" 
+export PATH="$PKG/usr/bin:$PATH"
 export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
 
 # set TEXMFROOT and TEXMFLOCAL
@@ -78,13 +78,9 @@ sed -i "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOC
 # Fix a segfault in upmendex, thanks to the lfs-folks.
 patch -Np1 -i $CWD/patches/texlive-20160523b-source-upstream_fixes-1.patch
 
-# allow the tex4ht binary to process the updated xdv id byte in xetex
-# for tl'2016 (i.e., 0.99996).  Without this, htxelatex and the like
-# simply bail out.
-patch -p0 < $CWD/patches/tex4ht.patch
-
 # --with-system-harfbuzz requires graphite2 (and harfbuzz linked to it)
-mkdir build ; cd build
+mkdir build
+pushd build
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ../configure \
@@ -105,6 +101,7 @@ mkdir build ; cd build
     --disable-xindy-docs \
     --disable-xindy-rules \
     --with-clisp-runtime=system \
+    --enable-gc=system \
     --with-system-poppler \
     --with-system-xpdf \
     --with-system-zlib \
@@ -120,63 +117,44 @@ mkdir build ; cd build
     --with-system-mpfr \
     --with-system-fontconfig \
     --with-system-ncurses \
-    --enable-gc=system \
     --build=$ARCH-slackware-linux
-  make 
+  make
   # make check
-  make install-strip DESTDIR=$PKG 
+  make install-strip DESTDIR=$PKG
   # Create symlinks
   make texlinks DESTDIR=$PKG
-cd ..
+popd
 
 # install the texmf stuff, overwrite partly stuff coming from the source build;
 # don't remove/separate koma-script docs as this is the wish of the author
 mkdir -p $PKG/usr/share
-tar vxf $CWD/texlive-base-$TEXMF_VERS.tar.xz -C $PKG/usr/share
+tar vxf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share
 chown -R root:root $PKG
 chmod -R u+w,go-w,a+rX-st $PKG
-(
+
 # Move biber binary to $PATH
-cd $PKG/usr/share/texmf-dist
 case $ARCH in
-	"x86_64") mv bin/x86_64-linux/biber $PKG/usr/bin ;;
-	"i586") mv bin/i386-linux/biber $PKG/usr/bin ;;
+	"x86_64") mv $PKG/usr/share/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;;
+	"i586") mv $PKG/usr/share/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;;
 esac
 rm -rf $PKG/usr/share/texmf-dist/bin
-)
-
 
 # set TEXMFROOT and TEXMFLOCAL
 sed -i \
   "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
   $PKG/usr/share/texmf-dist/web2c/texmf.cnf
 
-# Remove context-stuff
-rm -rf $PKG/usr/share/texmf-dist/scripts/context
-
-## Move context script(mtxrun) to the correct place.
-## Handle the short context-helper scripts, by putting stub-scripts
-## in the texlive-extra package and delete them here, as the needed 
-## context-packages are included in the texlive-extra package.
-#(
-#cd $PKG/usr/share/texmf-dist/scripts/context/stubs/unix/
-#mv mtxrun $PKG/usr/bin/
-#rm context contextjit luatools mtxrunjit texexec texmfstart
-#cd ../../
-#rmdir -p stubs/unix
-#)
-
 # Install the docs while we're still here
 mkdir -p $PKG/usr/doc/texlive-$VERSION
 cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
 
 # Put a symlink to /usr/share/texmf-dist/doc in our Slackware docdir
-ln -s ../../share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/doc
+ln -s ../../share/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc
 
 # We won't make tlmgr easily available; it's still there, but
 # we'll make it harder to void the warranty :-)
 rm -f $PKG/usr/bin/tlmgr
-cat $CWD/README.tlpkg > $PKG/usr/doc/$PRGNAM-$VERSION/README.tlpkg
+cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg
 
 # Create some directories to make it clear that they're owned by this package
 mkdir -p $PKG/usr/share/{texmf-config,texmf-var,texmf-local}
@@ -185,6 +163,29 @@ mkdir -p $PKG/usr/share/{texmf-config,texmf-var,texmf-local}
 mkdir -p $PKG/usr/share/perl5
 mv texk/tests/TeXLive $PKG/usr/share/perl5/
 
+mkdir -p $PKG/etc/profile.d
+cat << 'EOF' > $PKG/etc/profile.d/setuptex.sh
+#!/bin/sh
+
+# set environment for ConTeXt
+
+export TEXMF=/usr/share/texmf-dist
+export TEXMFCACHE=~/.texmf-cache
+export OSFONTDIR=~/.fonts:/usr/share/fonts
+unset TEXINPUTS MPINPUTS MFINPUTS
+EOF
+cat << 'EOF' > $PKG/etc/profile.d/setuptex.csh
+#!/bin/csh
+
+# set environment for ConTeXt
+
+setenv TEXMF /usr/share/texmf-dist
+setenv TEXMFCACHE ~/.texmf-cache
+setenv OSFONTDIR ~/.fonts:/usr/share/fonts
+unsetenv TEXINPUTS MPINPUTS MFINPUTS
+EOF
+chmod 755 $PKG/etc/profile.d/setuptex.*
+
 # Handle the man pages
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
@@ -197,24 +198,5 @@ mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-###### Maybe context is better supportet by a standalone installation,
-## have a look at http://wiki.contextgarden.net/
-#
-## create profile, to make ConTEXt working
-#mkdir -p $PKG/etc/profile.d
-#cat << EOF > $PKG/etc/profile.d/texlive.sh
-##!/bin/sh
-## Add TEXMF and OSFONTDIR for ConTEXt:
-#TEXMF=/usr/share/texmf-dist
-#OSFONTDIR=~/.fonts:/usr/share/fonts
-#EOF
-#cat << EOF > $PKG/etc/profile.d/texlive.csh
-##!/bin/csh
-## Add TEXMF and OSFONTDIR for ConTEXt:
-#setenv TEXMF /usr/share/texmf-dist
-#setenv OSFONTDIR ~/.fonts:/usr/share/fonts
-#EOF
-#chmod 755 $PKG/etc/profile.d/texlive.*
-
 cd $PKG
 /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 6784669f09..9014552857 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,14 +1,12 @@
 PRGNAM="texlive"
-VERSION="20160523"
+VERSION="2016.161031"
 HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz \
-          http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20161023.tar.xz" 
+DOWNLOAD="http://mirrors.ctan.org/systems/texlive/Source/texlive-20160523b-source.tar.xz \
+          http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-2016.161031.tar.xz"
 MD5SUM="1e75db3412b3e2945fa94b0a423a29c7 \
-	1689161fb856c660ca833f02ef3bf0f7"
-DOWNLOAD_x86_64="ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz \
-                 http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20161023.tar.xz" 
-MD5SUM_x86_64="1e75db3412b3e2945fa94b0a423a29c7 \
-               1689161fb856c660ca833f02ef3bf0f7"
+	2314d315b70a5f4dcc03eeb45db0be14"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds[at]schoepfer[dot]info"