3 files changed, 43 insertions, 20 deletions
diff --git a/office/texlive/README b/office/texlive/README
index 35ea5a0949..8bcb47b959 100644
--- a/office/texlive/README
+++ b/office/texlive/README
@@ -1,20 +1,17 @@
 TeXLive (TeXLive binaries, support files, TeX formats)
 
 This package contains the binaries, support files, TeX formats and packages,
-and other files required for the TeXLive TeX distribution.  Included are 
-input files for TeX, runtime configuration files, hyphenation tables, 
+and other files required for the TeXLive TeX distribution.  Included are
+input files for TeX, runtime configuration files, hyphenation tables,
 manpages, and the computer modern fonts.
 
 The resulting package is very large, and a lot of space is required during
-the build process, so you might want to consider defining an alternate 
+the build process, so you might want to consider defining an alternate
 location for TMP and OUTPUT if you have small /tmp partition.
 
 Note that this package is intended to completely replace (and then some) the
 tetex packages in Slackware, so you'll need to remove tetex and tetex-doc
-before installing TeXLive (but NOT before BUILDING it).  For the sake of
-clarity, this means that you must have the tetex package installed when
-you build texlive the first time; after that, the texlive package that's
-already installed is sufficient.
+before installing TeXLive.
 
 Have a look at the texscythe package to see how the texmf tarball was
 created from the original download from upstream.
diff --git a/office/texlive/README.tlpkg b/office/texlive/README.tlpkg
index 1e15428942..35c25dd256 100644
--- a/office/texlive/README.tlpkg
+++ b/office/texlive/README.tlpkg
@@ -1,11 +1,11 @@
-The TeXLive Package Manager, i.e. tlmgr(1), is not shipped with this 
-TeXLive package, as it's not expected to work properly (if at all).  
-The general consensus from the TeXLive users mailing list is that 
+The TeXLive Package Manager, i.e. tlmgr(1), is not shipped with this
+TeXLive package, as it's not expected to work properly (if at all).
+The general consensus from the TeXLive users mailing list is that
 distributions should not be shipping tlpkg.
 
-The *proper* way to upgrade the TeXLive Slackware package (or any 
-part of it) is through your Slackware's package manager.  If you 
-elect to try tlmgr(1), and it doesn't work at all, or worse, it messes 
+The *proper* way to upgrade the TeXLive Slackware package (or any
+part of it) is through your Slackware's package manager.  If you
+elect to try tlmgr(1), and it doesn't work at all, or worse, it messes
 up part of your TeXLive installation, too bad.  On the other hand,
 if you are able to document exactly what we need to do in order to
 make it:
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index 04d8a4e983..69d2109f9b 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=texlive
 VERSION=20130530
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
@@ -99,7 +99,7 @@ mkdir build ; cd build
     --libdir=/usr/lib${LIBDIRSUFFIX} \
     --mandir=/usr/man \
     --infodir=/usr/info \
-    --with-banner-add='TeX Live 2013/Slackware (SlackBuilds.org)' \
+    --with-banner-add=' on Slackware (SlackBuilds.org)' \
     --disable-native-texlive-build \
     --enable-largefile \
     --with-xdvi-x-toolkit=xaw3d \
@@ -108,7 +108,7 @@ mkdir build ; cd build
     --disable-missing \
     --with-x \
     --without-etex \
-    --enable-xindy \
+    --disable-xindy \
     --with-clisp-runtime=system \
     --with-system-poppler \
     --with-system-xpdf \
@@ -135,7 +135,7 @@ PATH="$PATH:$PKG/usr/bin" LD_LIBRARY_PATH+=$PKG/usr/lib${LIBDIRSUFFIX} \
 mkdir -p $PKG/usr/doc/texlive-$VERSION
 cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
 
-# We won't make tlmgr easily available; it's still there, but 
+# 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
@@ -166,7 +166,7 @@ patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.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 
+# 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.
 mv $PKG/usr/share/texmf-dist/doc/man/man1/*.1 $PKG/usr/man/man1
@@ -174,10 +174,36 @@ mv $PKG/usr/share/texmf-dist/doc/man/man1/*.1 $PKG/usr/man/man1
 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
-rmdir $PKG/usr/share/texmf-dist/doc/
+mv $PKG/usr/share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/
 ln -s ../../doc/$PRGNAM-$VERSION/doc $PKG/usr/share/texmf-dist/doc
 
+# Now that we have everything in place, build xindy
+cd $TMP/texlive-$SOURCE_VERS-source/utils/xindy
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LATEX="$PKG/usr/bin/latex" \
+PDFLATEX="$PKG/usr/bin/pdflatex" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --with-clisp-runtime=system \
+  --with-banner-add=' on Slackware (SlackBuilds.org)' \
+  --build=$ARCH-slackware-linux
+
+export PATH="$PATH:$PKG/usr/bin"
+export LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX"
+$PKG/usr/bin/texhash
+
+make
+make install DESTDIR=$PKG
+
+# Not really sure if this is necessary, but we changed the contents of
+# /usr/share/texmf-dist so let's just do it for good measure.
+$PKG/usr/bin/texhash
+
 # 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