3 files changed, 14 insertions, 21 deletions
diff --git a/system/htop/htop.SlackBuild b/system/htop/htop.SlackBuild
index 3ee99b48c2a56..475e13191efe7 100644
--- a/system/htop/htop.SlackBuild
+++ b/system/htop/htop.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for htop
-# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2010  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,16 +24,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=htop
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -76,8 +74,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man/ \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -87,13 +85,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-# remove empty directories
-rmdir $PKG/usr/{include,lib$LIBDIRSUFFIX}
-
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
diff --git a/system/htop/htop.info b/system/htop/htop.info
index e1cd1a8e910bc..3e3618536ae7f 100644
--- a/system/htop/htop.info
+++ b/system/htop/htop.info
@@ -1,10 +1,10 @@
 PRGNAM="htop"
-VERSION="0.8.3"
+VERSION="0.9"
 HOMEPAGE="http://htop.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.8.3.tar.gz"
-MD5SUM="5c9f093f9eaddf6e77aa6d54c2116d0c"
+DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.9.tar.gz"
+MD5SUM="7c5507f35f363f3f40183a2ba3c561f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="chess"
+APPROVED="Erik Hanson"
diff --git a/system/htop/slack-desc b/system/htop/slack-desc
index 00977e1a5a395..6f5fe502239fa 100644
--- a/system/htop/slack-desc
+++ b/system/htop/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-htop: Htop (Process Viewer)
-htop: 
+htop: htop (Interactive process viewer)
+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: