system/powertop: Updated for version 1.7

4 files changed, 43 insertions, 11 deletions

diff --git a/system/powertop/Makefile.patch b/system/powertop/Makefile.patch
new file mode 100644
index 0000000000..848963c717
--- /dev/null
+++ b/system/powertop/Makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile~	2007-06-17 10:59:11.000000000 -0500
++++ Makefile	2007-07-07 14:56:44.000000000 -0500
+@@ -1,8 +1,9 @@
+ BINDIR=/usr/bin
+ LOCALESDIR=/usr/share/locale
+-MANDIR=/usr/share/man/man1
++MANDIR=/usr/man/man1
+ WARNFLAGS=-Wall  -W -Wshadow
+-CFLAGS?=-Os -g ${WARNFLAGS}
++CFLAGS?=-Os -g
++CFLAGS+=${WARNFLAGS}
+ CC?=gcc
+ 
+ 
+@@ -24,7 +25,7 @@
+ 	@(cd po/ && $(MAKE))
+ 
+ powertop.1.gz: powertop.1
+-	gzip -c $< > $@
++	gzip -9 -c $< > $@
+ 
+ install: powertop powertop.1.gz
+ 	mkdir -p ${DESTDIR}${BINDIR}
diff --git a/system/powertop/powertop.SlackBuild b/system/powertop/powertop.SlackBuild
index 5a71e4707a..3a5f9dbd25 100644
--- a/system/powertop/powertop.SlackBuild
+++ b/system/powertop/powertop.SlackBuild
@@ -7,7 +7,7 @@
 set -e
 
 PRGNAM=powertop
-VERSION=1.2
+VERSION=1.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -31,16 +31,17 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Patch the Makefile to:
+#   Put the man page in the correct location
+#   Use max compression on the man page
+#   Handle $CFLAGS a bit more nicely
+patch < $CWD/Makefile.patch
+
 CFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 
-# Strip the binary
 strip --strip-unneeded $PKG/usr/bin/powertop
 
-# The makefile does not install the man page.  We do that here.
-mkdir -p $PKG/usr/man/man1
-cat powertop.1 | gzip -9c > $PKG/usr/man/man1/powertop.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING Changelog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/powertop/powertop.info b/system/powertop/powertop.info
index 356bd150d5..ad4dc6367c 100644
--- a/system/powertop/powertop.info
+++ b/system/powertop/powertop.info
@@ -1,8 +1,8 @@
 PRGNAM="powertop"
-VERSION="1.2"
+VERSION="1.7"
 HOMEPAGE="http://www.linuxpowertop.org"
-DOWNLOAD="http://www.linuxpowertop.org/download/powertop-1.2.tar.gz"
-MD5SUM="fa18e6115e75417bf94ca38021f8959d"
+DOWNLOAD="http://www.linuxpowertop.org/download/powertop-1.7.tar.gz"
+MD5SUM="84c012fe5e866b5deb588606a6b9822b"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,alien"
diff --git a/system/powertop/slack-desc b/system/powertop/slack-desc
index 55696cc6b9..80152f75f4 100644
--- a/system/powertop/slack-desc
+++ b/system/powertop/slack-desc
@@ -1,4 +1,12 @@
-powertop: PowerTOP
+# 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------------------------------------------------------|
+powertop: PowerTOP (power usage monitor)
 powertop:
 powertop: PowerTOP is a Linux tool that finds the software component(s)
 powertop: that make your laptop use more power than necessary while it