aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/htop/htop.SlackBuild13
-rw-r--r--system/htop/htop.info6
-rw-r--r--system/htop/slack-desc14
3 files changed, 19 insertions, 14 deletions
diff --git a/system/htop/htop.SlackBuild b/system/htop/htop.SlackBuild
index ea275db1136d0..308d3f8483d67 100644
--- a/system/htop/htop.SlackBuild
+++ b/system/htop/htop.SlackBuild
@@ -5,13 +5,12 @@
# Modified by the SlackBuilds.org project
-set -e
-
PRGNAM=htop
-VERSION=0.6.6
+VERSION=0.7
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -25,11 +24,13 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -55,10 +56,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Rewrite the desktop file so the icon will properly display in kde
-sed -i 's#Icon=htop.png#Icon=/usr/share/pixmaps/htop.png#' \
- $PKG/usr/share/applications/$PRGNAM.desktop
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/htop/htop.info b/system/htop/htop.info
index f318834b7e41d..f4f8120e0575e 100644
--- a/system/htop/htop.info
+++ b/system/htop/htop.info
@@ -1,8 +1,8 @@
PRGNAM="htop"
-VERSION="0.6.6"
+VERSION="0.7"
HOMEPAGE="http://htop.sourceforge.net"
-DOWNLOAD="http://dl.sourceforge.net/htop/htop-0.6.6.tar.gz"
-MD5SUM="12c8e6e97bd50a4e0a4730d23675fc7b"
+DOWNLOAD="http://downloads.sourceforge.net/htop/htop-0.7.tar.gz"
+MD5SUM="4afc961fa709167e1b434682897991f9"
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
APPROVED="rworkman"
diff --git a/system/htop/slack-desc b/system/htop/slack-desc
index 524a02a3345f0..00977e1a5a395 100644
--- a/system/htop/slack-desc
+++ b/system/htop/slack-desc
@@ -1,8 +1,16 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
htop: Htop (Process Viewer)
htop:
-htop: This is htop, an interactive process viewer for Linux. It is a text-mode
-htop: application (for console or X terminals) and requires ncurses. htop has
-htop: been ested with Linux 2.4 and 2.6 kernels.
+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: Homepage: http://htop.sourceforge.net/
htop: