system/htop: Updated for version 0.8.2

4 files changed, 32 insertions, 26 deletions

diff --git a/system/htop/README b/system/htop/README
index 791a6c4f3f..bf44330740 100644
--- a/system/htop/README
+++ b/system/htop/README
@@ -1,9 +1,9 @@
-htop is an interactive process viewer for Linux. It aims to be a 'better top'
-You can scroll the process list vertically and horizontally, and select a 
-process to be killed with the arrow keys instead of by typing its process 
-id. 
+htop is an interactive process viewer for Linux. It aims to be a 'better
+top' You can scroll the process list vertically and horizontally, and
+select a process to be killed with the arrow keys instead of by typing its
+process id.
 
-This release adds per-process I/O statistics, Unicode support, and new 
-handling of CPU count for threaded processes: it can now show either 
-per-thread stats or a sum of all threads depending whether user threads 
-are shown or hidden. There were also improvements in mouse support.
+This release adds per-process I/O statistics, Unicode support, and new
+handling of CPU count for threaded processes: it can now show either
+per-thread stats or a sum of all threads depending whether user threads are
+shown or hidden. There were also improvements in mouse support.
diff --git a/system/htop/htop.SlackBuild b/system/htop/htop.SlackBuild
index 868c762611..8ae8511d6f 100644
--- a/system/htop/htop.SlackBuild
+++ b/system/htop/htop.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for htop
-# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=htop
-VERSION=0.8.1
+VERSION=${VERSION:-0.8.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,13 +34,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -63,9 +65,12 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man/ \
-  --disable-debug
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-debug \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -76,7 +81,8 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/htop/htop.info b/system/htop/htop.info
index 25fbe4cf0d..0a8b5e5c68 100644
--- a/system/htop/htop.info
+++ b/system/htop/htop.info
@@ -1,8 +1,8 @@
 PRGNAM="htop"
-VERSION="0.8.1"
+VERSION="0.8.2"
 HOMEPAGE="http://htop.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.8.1.tar.gz"
-MD5SUM="f0b259ca29175656de48bf0fa0a2e619"
+DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.8.2.tar.gz"
+MD5SUM="78c2382dc4ff0cf5a29a5c3bc1e556ec"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="Erik Hanson"
+APPROVED="chess"
diff --git a/system/htop/slack-desc b/system/htop/slack-desc
index 00977e1a5a..1484c8b6a2 100644
--- a/system/htop/slack-desc
+++ b/system/htop/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 htop: Htop (Process Viewer)
-htop: 
+htop:
 htop: This is htop, an interactive process viewer for Linux. It is a text-
 htop: mode application (for console or X terminals) and requires ncurses.
 htop: htop has been tested with Linux 2.4 and 2.6 kernels.
-htop: 
+htop:
 htop: Homepage: http://htop.sourceforge.net/
-htop: 
-htop: 
-htop: 
-htop: 
+htop:
+htop:
+htop:
+htop: