1 files changed, 33 insertions, 7 deletions
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