network/wifi-radar: Updated SlackBuild.

Removed SLKCFLAGS. Make options improved.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 16 insertions, 27 deletions

diff --git a/network/wifi-radar/README b/network/wifi-radar/README
index 4279c4d723..6609097e64 100644
--- a/network/wifi-radar/README
+++ b/network/wifi-radar/README
@@ -1,17 +1,17 @@
 WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles on GNU/Linux.
 
-It enables you to scan for available networks and create profiles for your 
-preferred networks. You can drag and drop your preferred networks to arrange 
+It enables you to scan for available networks and create profiles for your
+preferred networks. You can drag and drop your preferred networks to arrange
 the profile priority.
 
-WiFi Radar is tested to work with an Intel iwlagn 6300 on Slackware but 
-should work just the same for any iwconfig interface. 
+WiFi Radar is tested to work with an Intel iwlagn 6300 on Slackware but
+should work just the same for any iwconfig interface.
 
-NOTE: wifi-radar needs to run as root. You may need to issue: 
-  xhost +local:root 
+NOTE: wifi-radar needs to run as root. You may need to issue:
+  xhost +local:root
 which you can put in your ~/.bashrc or ~/.zshrc etc.
 
-I've installed the program into /opt/radar-wifi and created a 
+I've installed the program into /opt/radar-wifi and created a
 /usr/bin/wifi-radar script that sets $DISPLAY which defaults to :0.0
 For other $DISPLAY's you can edit the script in the slackbuild
 directory, or pass DISPLAY=:N.n to wifi-radar on the command line.
diff --git a/network/wifi-radar/doinst.sh b/network/wifi-radar/doinst.sh
index 13519bfd13..4a25de5e6f 100644
--- a/network/wifi-radar/doinst.sh
+++ b/network/wifi-radar/doinst.sh
@@ -1,7 +1,7 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
- 
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
diff --git a/network/wifi-radar/wifi-radar.SlackBuild b/network/wifi-radar/wifi-radar.SlackBuild
index c3a9814294..ff0388b9c1 100644
--- a/network/wifi-radar/wifi-radar.SlackBuild
+++ b/network/wifi-radar/wifi-radar.SlackBuild
@@ -24,12 +24,12 @@
 
 PRGNAM=wifi-radar
 VERSION=${VERSION:-2.0.s10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,20 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -72,11 +58,14 @@ find -L . \
 patch --verbose -p1 < $CWD/dhcpcd.diff
 patch --verbose -p1 < $CWD/kdesu.diff
 
+# It's python so no SLKCFLAGS
 make
-make install DESTDIR=$PKG/usr sbindir=$PKG/opt/wifi-radar sysconfdir=$PKG/etc mandir=$PKG/usr/man
+make install \
+	DESTDIR=$PKG/usr \
+	sbindir=$PKG/usr/bin \
+	mandir=$PKG/usr/man
 
-rm -r $PKG/etc
-install -m 755 -D $CWD/wifi-radar $PKG/usr/bin/wifi-radar
+rm -r $PKG/usr/etc
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true