system/htop: Updated for version 0.8.1

3 files changed, 42 insertions, 14 deletions

diff --git a/system/htop/README b/system/htop/README
index 652295d3858cc..791a6c4f3f080 100644
--- a/system/htop/README
+++ b/system/htop/README
@@ -2,3 +2,8 @@ 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.
diff --git a/system/htop/htop.SlackBuild b/system/htop/htop.SlackBuild
index 308d3f8483d67..868c762611c14 100644
--- a/system/htop/htop.SlackBuild
+++ b/system/htop/htop.SlackBuild
@@ -1,27 +1,46 @@
 #!/bin/sh
 
 # Slackware build script for htop
-# Written by BP{k} <michiel@slackbuilds.org>
-
-# Modified by the SlackBuilds.org project
+# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER OR CONTRIBUTORS 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=htop
-VERSION=0.7
-ARCH=${ARCH:-i486} 
-BUILD=${BUILD:-1} 
+VERSION=0.8.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}
 
-DOCFILES="AUTHORS COPYING INSTALL NEWS README TODO"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -33,7 +52,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -53,7 +76,7 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING 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 f4f8120e0575e..25fbe4cf0d7dd 100644
--- a/system/htop/htop.info
+++ b/system/htop/htop.info
@@ -1,8 +1,8 @@
 PRGNAM="htop"
-VERSION="0.7"
+VERSION="0.8.1"
 HOMEPAGE="http://htop.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.7.tar.gz"
-MD5SUM="4afc961fa709167e1b434682897991f9"
+DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.8.1.tar.gz"
+MD5SUM="f0b259ca29175656de48bf0fa0a2e619"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"