3 files changed, 61 insertions, 45 deletions
diff --git a/system/filelight/filelight.SlackBuild b/system/filelight/filelight.SlackBuild
index 14020f97bc..27afbd4bf4 100644
--- a/system/filelight/filelight.SlackBuild
+++ b/system/filelight/filelight.SlackBuild
@@ -1,57 +1,71 @@
 #!/bin/sh
-# 
-# SlackBuild script for filelight
-# Written by Michiel van Wessem (BP{k}) <michiel.van.wessem@gmail.com
-
-# Modified by the SlackBuilds.org project
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009 Eric Hameleers <alien@slackware.com>, Eindhoven, Netherlands
+# Slackware build script for filelight
+# Written by Lionel Young <redtricycle@gmail.com>
 
 PRGNAM=filelight
-VERSION=1.0
+VERSION=${VERSION:-1.9rc3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README TODO"
+KDEAPPSPREFIX=99561
 
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP || exit 1
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$KDEAPPSPREFIX-$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-KDEPREF=$(kde-config --prefix)
+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 {} \;
 
+# Configure with cmake
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=$KDEPREF \
-  --enable-final \
-  --disable-debug \
-  --program-prefix="" \
-  --program-suffix="" \
-  || exit 1
+cmake . -DCMAKE_INSTALL_PREFIX=$PKG/usr
+
+make
+make install
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO INSTALL \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir $PKG/install
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/filelight/filelight.info b/system/filelight/filelight.info
index 9db3deca49..60454023a1 100644
--- a/system/filelight/filelight.info
+++ b/system/filelight/filelight.info
@@ -1,8 +1,10 @@
 PRGNAM="filelight"
-VERSION="1.0"
+VERSION="1.9rc3"
 HOMEPAGE="http://www.methylblue.com/filelight/"
-DOWNLOAD="http://methylblue.com/filelight/packages/filelight-1.0.tar.bz2"
-MD5SUM="aa885e53e09f40e7fdd371395140b957"
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel.van.wessem@gmail.com"
-APPROVED="rworkman"
+DOWNLOAD="http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz"
+MD5SUM="a75cb50bc0b7238507952fb7d1b8d8a8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Lionel Young"
+EMAIL="redtricycle@gmail.com"
+APPROVED="dsomero"
diff --git a/system/filelight/slack-desc b/system/filelight/slack-desc
index 6797f3485f..718064b69e 100644
--- a/system/filelight/slack-desc
+++ b/system/filelight/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
-filelight: Filelight (an alternative KDE filemanager)
-filelight: 
-filelight: Filelight is an alternative file manager for KDE.  Filelight creates
-filelight: an interactive map of concentric segmented-rings that helps you to 
-filelight: visualize disk usage on your computer.
-filelight: It is like a pie-chart, but the segments are nested, which allows 
-filelight: you to see not only which directories take up all your space, but 
-filelight: which files and subdirectories are the real culprits.
-filelight: 
-filelight: homepage: http://www.methylblue.com/filelight/
-filelight: 
+         |-----handy-ruler------------------------------------------------------|
+filelight: filelight (an alternative KDE filemanager)
+filelight:
+filelight: Filelight creates an interactive map of concentric, segmented rings
+filelight: that help visualise disk usage on your computer.  Like a pie-chart,
+filelight: but the segments nest, allowing you to easily see which files are
+filelight: taking up all your space.
+filelight:
+filelight: Homepage: http://www.methylblue.com/filelight/
+filelight:
+filelight:
+filelight: