office/texlive: Updated for version 20140525.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

1 files changed, 29 insertions, 27 deletions

diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index de43183baa..2811c1bda1 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -2,7 +2,7 @@
 
 # TeXLive build script for Slackware
 
-# Copyright 2009-2013  Robby Workman, Northport, AL, USA
+# Copyright 2009-2014  Robby Workman, Northport, AL, USA
 # Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23,16 +23,15 @@
 #  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/2013/
+# URL: ftp://tug.org/historic/systems/texlive/2014/
 
 PRGNAM=texlive
-VERSION=20130530
-BUILD=${BUILD:-2}
+VERSION=20140525
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
 TEXMF_VERS=$VERSION
-EXTRA_VERS=$VERSION
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,15 +76,15 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Apply patches from branch2013
-for file in $CWD/branch2013/*.diff ; do patch -p2 < $file ; done
-
-# Apply patches from debian
-for file in $CWD/debian/* ; do patch -p1 < $file ; done
+# Apply patches from branch2014
+#for file in $CWD/branch2014/*.diff ; do patch -p2 < $file ; done
 
 # Fix up some paths
 patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
 
+# http://sourceforge.net/p/xdvi/bugs/391/ 
+patch -p1 < $CWD/patches/fix-xaw3d-linkage-in-xdvik.diff
+
 unset TEXMFCNF ; export TEXMFCNF
 LANG=C ; export LANG
 KPATHSEA_WARNING=0 ; export KPATHSEA_WARNING
@@ -135,23 +134,28 @@ PATH="$PATH:$PKG/usr/bin" LD_LIBRARY_PATH=$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRAR
 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
+
 # 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
 
-# Add some perl modules, at least one of which is required by updmap
-mkdir -p $PKG/usr/share/perl5
-cp -a utils/biber/TeXLive $PKG/usr/share/perl5
-tar xvf $CWD/texlive-$EXTRA_VERS-extra.tar.xz \
-  --strip-components 2 \
-  -C $PKG/usr/share/perl5 \
-  texlive-20130530-extra/tlpkg/TeXLive/
+# Install biber
+if [ "$ARCH" = "x86_64" ]; then
+  tar xf $CWD/biber-linux_x86_64.tar.gz -C $PKG/usr/bin
+elif [ "$ARCH" = "i486" ]; then
+  tar xf $CWD/biber-linux_x86_32.tar.gz -C $PKG/usr/bin
+fi
+
+# Create some directories to make it clear that they're owned by this package
+mkdir -p $PKG/usr/share/texmf-config $PKG/usr/share/texmf-var
 
 # and now we'll install the texmf stuff
 cd $TMP
-rm -rf texlive-texmf-$TEXMF_VERS
-tar xvf $CWD/texlive-texmf-$TEXMF_VERS.tar.xz -C $PKG/usr/share
+rm -rf texlive-texmf-tetexish-$TEXMF_VERS
+tar xvf $CWD/texlive-texmf-tetexish-$TEXMF_VERS.tar.xz -C $PKG/usr/share
 cd $PKG/usr/share
 chown -R root:root .
 chmod -R a-s .
@@ -164,21 +168,19 @@ find -L . \
 # Fix up some paths
 patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
 
-# Thanks to David Woodfall for this patch
-patch -p1 < $CWD/patches/texcount-scalar-fixup.diff
-
 # Move manual pages to the correct place
 # There's some duplicates of stuff that's already present in /usr/man
 # from the texlive source we just compiled above, but I'm going to
-# work from the assumption that they're identical - I just don't have
-# the requisite number of fucks to give in order to ensure that.
+# work from the assumption that they're identical - here's why:
+# http://rlworkman.net/images/barren-field.jpg
 mv $PKG/usr/share/texmf-dist/doc/man/man1/*.1 $PKG/usr/man/man1
 # No, we don't care about the pdf versions of the manual pages
 rm -rf $PKG/usr/share/texmf-dist/doc/man
 
-# We're going to put docs in our standard location (with a compat link)
-mv $PKG/usr/share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/
-ln -s ../../doc/$PRGNAM-$VERSION/doc $PKG/usr/share/texmf-dist/doc
+# Add some perl modules, at least one of which is required by updmap
+mkdir -p $PKG/usr/share/perl5
+mv $PKG/usr/share/tlpkg/TeXLive $PKG/usr/share/perl5
+rmdir $PKG/usr/share/tlpkg
 
 # Now that we have everything in place, build xindy
 cd $TMP/texlive-$SOURCE_VERS-source/utils/xindy