graphics/plotutils: Updated for version 2.6

3 files changed, 20 insertions, 19 deletions

diff --git a/graphics/plotutils/README b/graphics/plotutils/README
index 975efab8184b..a6d56c5df6a0 100644
--- a/graphics/plotutils/README
+++ b/graphics/plotutils/README
@@ -1,16 +1,11 @@
-The GNU plotutils package contains software for both programmers 
-and technical users. Its centerpiece is libplot, a powerful C/C++ 
-function library for exporting 2-D vector graphics in many file 
-formats, both vector and raster. It can also do vector graphics 
-animations.
+GNU plotutils contains software for both programmers and technical users.  
+Its centerpiece is libplot, a powerful C/C++ function library for exporting 
+2-D vector graphics in many file formats, both vector and raster. It can 
+also do vector graphics animations.  libplot is device-independent in the 
+sense that its API does not depend on the type of graphics file to be exported.
 
-libplot is device-independent in the sense that its API 
-(application programming interface) does not depend on the type of 
-graphics file to be exported.
-
-Besides libplot, the package contains command-line programs for 
-plotting scientific data. Many of them use libplot to export 
-graphics.
+Besides libplot, the package contains command-line programs for plotting 
+scientific data. Many of them use libplot to export graphics.
 
 Other ./configure options that you may want to add (provided you install 
 the required fonts):
diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild
index 51323a394a38..3cd8f371acf7 100644
--- a/graphics/plotutils/plotutils.SlackBuild
+++ b/graphics/plotutils/plotutils.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Luis Henrique <lmello.009@gmail.com>
 
 PRGNAM=plotutils
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,10 +17,13 @@ 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
@@ -44,6 +47,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -51,7 +55,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --enable-shared=yes \
   --enable-libplotter \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux 
 
 make
 make install DESTDIR=$PKG
@@ -60,7 +64,7 @@ make install DESTDIR=$PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( cd $PKG/usr/man
@@ -82,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/plotutils/plotutils.info b/graphics/plotutils/plotutils.info
index 962e72850198..3d4690047635 100644
--- a/graphics/plotutils/plotutils.info
+++ b/graphics/plotutils/plotutils.info
@@ -1,8 +1,10 @@
 PRGNAM="plotutils"
-VERSION="2.5.1"
+VERSION="2.6"
 HOMEPAGE="http://www.gnu.org/software/plotutils"
-DOWNLOAD="ftp://ftp13.freebsd.org/pub/FreeBSD/ports/distfiles/plotutils-2.5.1.tar.gz"
-MD5SUM="fad3bc273de4ca5d74462b908db658ce"
+DOWNLOAD="ftp://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
+MD5SUM="c08a424bd2438c80a786a7f4b5bb6a40"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Luis Henrique"
 EMAIL="lmello.009@gmail.com"
 APPROVED="rworkman"