3 files changed, 36 insertions, 23 deletions
diff --git a/graphics/opengtl/README b/graphics/opengtl/README
index b66f183bf6..1c6b4b9f4d 100644
--- a/graphics/opengtl/README
+++ b/graphics/opengtl/README
@@ -5,4 +5,5 @@ The goal is to provide the tools, languages and libraries to create
 generic transformation for graphics. Those transformations could then
 be used by different programs.
 
-opengtl requires llvm, which is also available from Slackbuilds.org
-\ No newline at end of file
+opengtl requires llvm and latex2html, which are also available
+from Slackbuilds.org
diff --git a/graphics/opengtl/opengtl.SlackBuild b/graphics/opengtl/opengtl.SlackBuild
index ccc1e45224..19e250d17d 100644
--- a/graphics/opengtl/opengtl.SlackBuild
+++ b/graphics/opengtl/opengtl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opengtl
 
-# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=OpenGTL
-VERSION=0.9.4
+SRCNAM=OpenGTL
+VERSION=0.9.12
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,14 +33,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PKGNAM=$(echo $PRGNAM | tr [:upper:] [:lower:])
+PRGNAM=$(echo $SRCNAM | tr [:upper:] [:lower:])
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -48,9 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -58,23 +61,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    ..
 
-make
-make install DESTDIR=$PKG
+  make
+  make install DESTDIR=$PKG
+cd -
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a COPYING TODO $PKG/usr/doc/$PKGNAM-$VERSION
-cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/doc/OpenGTL/ $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/opengtl/opengtl.info b/graphics/opengtl/opengtl.info
index e53ba1e09c..6e92280a22 100644
--- a/graphics/opengtl/opengtl.info
+++ b/graphics/opengtl/opengtl.info
@@ -1,8 +1,10 @@
 PRGNAM="opengtl"
-VERSION="0.9.4"
+VERSION="0.9.12"
 HOMEPAGE="http://www.opengtl.org/"
-DOWNLOAD="http://www.opengtl.org/download/OpenGTL-0.9.4.tar.bz2"
-MD5SUM="ecabab04590222749cbd3fedf2d5293e"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://www.opengtl.org/download/OpenGTL-0.9.12.tar.bz2"
+MD5SUM="c45fddf10c922ebcf9cb5b7c5df89220"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="Erik Hanson"