4 files changed, 26 insertions, 19 deletions
diff --git a/graphics/graphviz/README b/graphics/graphviz/README
index c5d00fce13..4fefd3e7ec 100644
--- a/graphics/graphviz/README
+++ b/graphics/graphviz/README
@@ -6,5 +6,3 @@ Graph visualization is a way of representing structural information as diagrams
 of abstract graphs and networks.  Automatic graph drawing has many important
 applications in software engineering, database and web design, networking, and
 in visual interfaces for many other domains.
-
-This requires SWIG (available at SlackBuilds.org).
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index c5c6c5053e..18153c395d 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -6,7 +6,7 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=graphviz
-VERSION=2.22.2
+VERSION=2.26.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,17 +18,21 @@ OUTPUT=${OUTPUT:-/tmp}
 
 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	 # Exit on most errors
 
-rm -rf $PKG $TMP/$PRGNAM-$VERSION
-mkdir -p $PKG $PKG $OUTPUT
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -38,8 +42,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --disable-static
+  --disable-static \
+  --enable-ocaml=no \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -50,13 +57,13 @@ make install-strip DESTDIR=$PKG
 )
 
 # Remove empty directories of language bindings that are absent
-find $PKG/usr/lib/graphviz -depth -type d -empty -exec rmdir {} \;
+find $PKG/usr/lib${LIBDIRSUFFIX}/graphviz -depth -type d -empty -exec rmdir {} \;
 
-# Create a "dummy" config file in /usr/lib/graphviz so that it will be removed
-# when the package is uninstalled.  This file is generated by the postinstall
-# script, and contains information about available plugins, so this is (or at
-# least should be) safe.
-touch $PKG/usr/lib/graphviz/config
+# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz so that it
+# will be removed when the package is uninstalled.  This file is generated by
+# the postinstall script and contains information about available plugins, so
+# this is (or at least should be) safe.
+touch $PKG/usr/lib${LIBDIRSUFFIX}/graphviz/config6
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL README* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -69,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/graphviz/graphviz.info b/graphics/graphviz/graphviz.info
index 7aa506b4b6..fd279184e2 100644
--- a/graphics/graphviz/graphviz.info
+++ b/graphics/graphviz/graphviz.info
@@ -1,8 +1,10 @@
 PRGNAM="graphviz"
-VERSION="2.22.2"
+VERSION="2.26.2"
 HOMEPAGE="http://graphviz.org/"
-DOWNLOAD="http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.22.2.tar.gz"
-MD5SUM="34510a76ee176c6e0e64b773174e0fdc"
-MAINTAINER="Audrius Kazukauskas"
+DOWNLOAD="http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.2.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="1d7b2efa9998f70f3874f41b195d66e5"
+MD5SUM_x86_64=""
+MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/graphics/graphviz/slack-desc b/graphics/graphviz/slack-desc
index 98334a1f0e..d8b5592ce0 100644
--- a/graphics/graphviz/slack-desc
+++ b/graphics/graphviz/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 graphviz: Graphviz (Graph Visualization)
 graphviz:
 graphviz: Graphviz is open source graph visualization software.