From 86d5f64533be83130cb1869a6eec7e98d7f76ae0 Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Sun, 23 May 2010 00:15:57 -0500
Subject: office/texlive: More miscellaneous cleanup

---
 office/texlive/texlive.SlackBuild | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'office/texlive')

diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index cd2904e27d..aee62a7650 100755
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -81,9 +81,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Use the libpng14 API in 13.1
-patch -p1 < $CWD/texlive.png14.diff
-
 # etex is something for eclipse
 # Building with --disable-xindy as it requires libffcall
 # "kpsewhich -var-value=SELFAUTOPARENT" strips two trailing directories 
@@ -91,9 +88,7 @@ patch -p1 < $CWD/texlive.png14.diff
 #   things in TeXLive (including tlmgr); therefore, it seems best to just
 #   "go with the flow" and use "--enable-multiplatform" so the symlinks
 #   that are automatically created will be correct...
-# Building with "--without-system-xpdf" because poppler-0.12+ API is not
-#   compatible with <=0.11.x.  This isn't an issue on 13.0, but we'll make 
-#   it easy for those trying to build on -current
+# Building with "--without-system-xpdf" because poppler API changes too often
 TL_BUILD_ENV="CFLAGS=\"$SLKCFLAGS\" CXXFLAGS=\"$SLKCFLAGS\"" \
 TL_CONFIGURE_ARGS="\
   --enable-multiplatform \
@@ -136,12 +131,12 @@ find . \
 
 mkdir -p $PKG/usr/doc/texlive-$VERSION/tlpkg
 cp -a tlpkg $PKG/usr/share/
-( cd $TMP/texlive-$EXTRA_VERS-extra
+cd $TMP/texlive-$EXTRA_VERS-extra
   cp -a \
     readme-txt.dir/* readme-html.dir/* README* LICENSE* doc.html \
     $PKG/usr/doc/texlive-$VERSION/tlpkg
   cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/tlpkg/README.SLACKWARE
-)
+cd -
 
 # and now we'll install the texmf stuff
 cd $TMP
-- 
cgit v1.2.3