2 files changed, 23 insertions, 15 deletions
diff --git a/libraries/cpufrequtils/cpufrequtils.SlackBuild b/libraries/cpufrequtils/cpufrequtils.SlackBuild
index f03226bd29f4e..913d1885cf254 100644
--- a/libraries/cpufrequtils/cpufrequtils.SlackBuild
+++ b/libraries/cpufrequtils/cpufrequtils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cpufrequtils
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=cpufrequtils
-VERSION=002
+VERSION=005
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,28 +35,37 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" make || exit 1
-make install DESTDIR=$PKG || exit 1
+make libdir=/usr/lib${LIBDIRSUFFIX}
+make install libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
diff --git a/libraries/cpufrequtils/cpufrequtils.info b/libraries/cpufrequtils/cpufrequtils.info
index 6c30a145d8c8c..6ac7b7633a984 100644
--- a/libraries/cpufrequtils/cpufrequtils.info
+++ b/libraries/cpufrequtils/cpufrequtils.info
@@ -1,8 +1,8 @@
 PRGNAM="cpufrequtils"
-VERSION="002"
+VERSION="005"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-DOWNLOAD="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-002.tar.bz2"
-MD5SUM="93291a0d705ee2e19a6d7491b223c9f2"
+DOWNLOAD="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-005.tar.bz2"
+MD5SUM="73a41589fe74b73fc530f4179f2c6142"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Erik Hanson"