system/dstat: Updated for version 0.7.0

3 files changed, 34 insertions, 29 deletions

diff --git a/system/dstat/README b/system/dstat/README
index 985feaa6cabfd..5acfbc9f36c80 100644
--- a/system/dstat/README
+++ b/system/dstat/README
@@ -2,23 +2,3 @@ Dstat is a versatile replacement for vmstat, iostat, netstat, nfsstat and
 ifstat. Dstat overcomes some of their limitations and adds some extra features,
 more counters and flexibility. Dstat is handy for monitoring systems during
 performance tuning tests, benchmarks or troubleshooting.
-
-Dstat allows you to view all of your system resources instantly, you can eg.
-compare disk usage in combination with interrupts from your IDE controller, or
-compare the network bandwidth numbers directly with the disk throughput (in
-the same interval).
-
-Dstat gives you detailed selective information in columns and clearly indicates
-in what magnitude and unit the output is displayed. Less confusion, less
-mistakes.
-
-Dstat is unique in letting you aggregate block device throughput for a certain
-diskset or networkset, ie. you can see the throughput for all the block devices
-that make up a single filesystem or storage system.
-
-You can write your own dstat plugins to monitor whatever you like in just a few
-minutes based on provided examples and a little bit of Python knowledge.
-
-Dstat's output by default is designed for being interpreted by humans in
-real-time, however the new CSV output allows you to store CSV output in detail
-to a file to be imported later into Gnumeric or Excel to generate graphs.
diff --git a/system/dstat/dstat.SlackBuild b/system/dstat/dstat.SlackBuild
index abd01154eeb19..d7793849bdc3b 100644
--- a/system/dstat/dstat.SlackBuild
+++ b/system/dstat/dstat.SlackBuild
@@ -1,10 +1,29 @@
-#!/bin/sh -eu
-
+#!/bin/sh
+#
 # Slackware build script for dstat
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dstat
-VERSION=0.6.9
+VERSION=0.7.0
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -14,6 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -33,11 +54,13 @@ install -Dp -m0644 docs/dstat.1 $PKG/usr/man/man1/dstat.1
 gzip -9 $PKG/usr/man/man1/dstat.1
 rm -rf $PKG/usr/share/man
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog LINKS README TODO WISHLIST \
   docs/*.html docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 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/system/dstat/dstat.info b/system/dstat/dstat.info
index 2d7e8cfac29fb..3bab749c1496f 100644
--- a/system/dstat/dstat.info
+++ b/system/dstat/dstat.info
@@ -1,8 +1,10 @@
 PRGNAM="dstat"
-VERSION="0.6.9"
+VERSION="0.7.0"
 HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-DOWNLOAD="http://dag.wieers.com/home-made/dstat/dstat-0.6.9.tar.bz2"
-MD5SUM="f0a3cb77d647462f161c44c7071230ec"
+DOWNLOAD="http://dag.wieers.com/home-made/dstat/dstat-0.7.0.tar.bz2"
+MD5SUM="824c0675b514e4d5f3bbb88d0f654b3a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"