1 files changed, 17 insertions, 13 deletions
diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild
index 5aa299a41b..4d5398b502 100644
--- a/graphics/graphviz/graphviz.SlackBuild
+++ b/graphics/graphviz/graphviz.SlackBuild
@@ -2,17 +2,16 @@
 
 # Slackware build script for graphviz
 
-# Written by Audrius Kažukauskas
-
-# Exit on most errors
-set -e
+# Written by Audrius Kažukauskas <neobug@tornado.ktu.lt>
+# Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=graphviz
-VERSION=2.12
+VERSION=2.16.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -23,12 +22,13 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e	 # Exit on most errors
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG $PKG $OUTPUT
 cd $TMP
-tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -36,26 +36,30 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --with-mylibgd \
+  --mandir=/usr/man \
   --disable-static
 
 make
 make install-strip DESTDIR=$PKG
 
-if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
-fi
 
 # Remove empty directories of language bindings that are absent
 find $PKG/usr/lib/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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL README* $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir $PKG/usr/share/$PRGNAM/doc/
+rmdir $PKG/usr/share/$PRGNAM/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install