From 456abf8065358fbb3900340d5488e97a23a62e1d Mon Sep 17 00:00:00 2001
From: Andre Barboza <bmg.andre@gmail.com>
Date: Thu, 13 May 2010 00:40:23 +0200
Subject: system/fxload: Updated for version 2008_10_13

---
 system/fxload/Makefile.patch    | 11 -----------
 system/fxload/fxload.SlackBuild | 15 +++++++--------
 system/fxload/fxload.info       |  4 +++-
 3 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 system/fxload/Makefile.patch

(limited to 'system/fxload')

diff --git a/system/fxload/Makefile.patch b/system/fxload/Makefile.patch
deleted file mode 100644
index 71f7e99870..0000000000
--- a/system/fxload/Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2008-10-13 18:44:04.000000000 -0300
-+++ Makefile.diff	2009-04-06 14:41:17.000000000 -0300
-@@ -13,7 +13,7 @@
- 
- PROG = 			fxload
- 
--CFLAGS =		-O -Wall $(RPM_OPT_FLAGS)
-+CFLAGS +=		-Wall $(RPM_OPT_FLAGS)
- 
- FILES_SRC_C =		ezusb.c main.c
- FILES_SRC_H =		ezusb.h
diff --git a/system/fxload/fxload.SlackBuild b/system/fxload/fxload.SlackBuild
index 22a085a8d0..0a3db22479 100644
--- a/system/fxload/fxload.SlackBuild
+++ b/system/fxload/fxload.SlackBuild
@@ -2,9 +2,8 @@
 
 # Slackware build script for fxload
 
-# Copyright 2009 Andre Barboza
-# All rights reserved.
-#
+# Written by Andre Barboza <bmg.andre at gmail.com>
+
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,7 +21,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Andre Barboza <bmg.andre at gmail.com>
 
 PRGNAM=fxload
 VERSION=${VERSION:-2008_10_13}
@@ -37,10 +35,13 @@ 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 
@@ -58,9 +59,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch Makefile $CWD/Makefile.patch
-
-CFLAGS="$SLKCFLAGS" make
+RPM_OPT_FLAGS="$SLKCFLAGS" make
 make install prefix=$PKG 
 
 ( cd $PKG
@@ -84,4 +83,4 @@ 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/fxload/fxload.info b/system/fxload/fxload.info
index 9e8177b18b..7a9cb5b206 100644
--- a/system/fxload/fxload.info
+++ b/system/fxload/fxload.info
@@ -3,6 +3,8 @@ VERSION="2008_10_13"
 HOMEPAGE="http://linux-hotplug.sourceforge.net"
 DOWNLOAD="http://downloads.sourceforge.net/linux-hotplug/fxload-2008_10_13.tar.gz"
 MD5SUM="4477a2457f064228bef4a93ba2f21692"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
-- 
cgit v1.2.3