system/powertop: Updated for version 1.10

4 files changed, 28 insertions, 24 deletions

diff --git a/system/powertop/Makefile.patch b/system/powertop/Makefile.patch
index 848963c71782c..cb81b871bfe14 100644
--- a/system/powertop/Makefile.patch
+++ b/system/powertop/Makefile.patch
@@ -1,13 +1,13 @@
---- Makefile~	2007-06-17 10:59:11.000000000 -0500
-+++ Makefile	2007-07-07 14:56:44.000000000 -0500
+--- Makefile~	2008-06-18 22:11:05.000000000 -0500
++++ Makefile	2008-06-18 22:11:31.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?=-O1 -g ${WARNFLAGS}
++CFLAGS?=-O1 -g
 +CFLAGS+=${WARNFLAGS}
  CC?=gcc
  
diff --git a/system/powertop/powertop.SlackBuild b/system/powertop/powertop.SlackBuild
index 3a5f9dbd25820..0cec42aa822e1 100644
--- a/system/powertop/powertop.SlackBuild
+++ b/system/powertop/powertop.SlackBuild
@@ -2,34 +2,38 @@
 
 # Slackware build script for powertop
 # Written by Kyle Guinn <elyk03@gmail.com>
-# Modified by the SlackBuilds.org project
 
-set -e
+PRGNAM="powertop"
+VERSION="1.10"
+ARCH=${ARCH:-"i486"}
+BUILD=${BUILD:-"1"}
+TAG=${TAG:-"_SBo"}
 
-PRGNAM=powertop
-VERSION=1.7
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+TMP=${TMP:-"/tmp/SBo"}
+PKG="$TMP/package-$PRGNAM-$VERSION"
+OUTPUT=${OUTPUT:-"/tmp"}
+
+DOCS="COPYING Changelog README"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
+ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 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 .
+chmod -R u+w,go+r-w,a-st .
 
 # Patch the Makefile to:
 #   Put the man page in the correct location
@@ -43,7 +47,7 @@ make install DESTDIR=$PKG
 strip --strip-unneeded $PKG/usr/bin/powertop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changelog README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/powertop/powertop.info b/system/powertop/powertop.info
index ad4dc6367c4a6..22dd24c3d17ee 100644
--- a/system/powertop/powertop.info
+++ b/system/powertop/powertop.info
@@ -1,8 +1,8 @@
 PRGNAM="powertop"
-VERSION="1.7"
-HOMEPAGE="http://www.linuxpowertop.org"
-DOWNLOAD="http://www.linuxpowertop.org/download/powertop-1.7.tar.gz"
-MD5SUM="84c012fe5e866b5deb588606a6b9822b"
+VERSION="1.10"
+HOMEPAGE="http://www.lesswatts.org/projects/powertop/"
+DOWNLOAD="http://www.lesswatts.org/projects/powertop/download/powertop-1.10.tar.gz"
+MD5SUM="e09f631f60d50299d8885193e6fd3756"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="rworkman,alien"
+APPROVED="rworkman"
diff --git a/system/powertop/slack-desc b/system/powertop/slack-desc
index 80152f75f4e5d..86b9b9c4f0f87 100644
--- a/system/powertop/slack-desc
+++ b/system/powertop/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler------------------------------------------------------|
+        |-----handy-ruler----------------------------------------------------|
 powertop: PowerTOP (power usage monitor)
 powertop:
 powertop: PowerTOP is a Linux tool that finds the software component(s)