4 files changed, 34 insertions, 10 deletions
diff --git a/libraries/qwt/README b/libraries/qwt/README
index 10cf3fbece..918e77a205 100644
--- a/libraries/qwt/README
+++ b/libraries/qwt/README
@@ -3,7 +3,3 @@ The Qwt library contains widgets and components which are
 primarily useful for technical and scientifical purposes.
 It includes a 2-D plotting widget, different kinds of sliders, 
 and much more.
-
-NOTE: when building with qt3, using TMP=/tmp/SBo is strongly recommended.
-Using symlinks or a TMP in /usr/* will lead to the application installing 
-files directly onto the system as opposed to the package DESTDIR.
diff --git a/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch b/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch
new file mode 100644
index 0000000000..54cbb2ec2f
--- /dev/null
+++ b/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch
@@ -0,0 +1,20 @@
+diff -Nur qwt-5.1.1.orig/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.orig/qwtconfig.pri	2008-05-24 11:47:36.000000000 -0500
++++ qwt-5.1.1/qwtconfig.pri	2009-06-25 02:06:19.375460237 -0500
+@@ -8,14 +8,14 @@
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
+ 
+ unix {
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
++    INSTALLBASE    = /usr
+ }
+ 
+ win32 {
+     INSTALLBASE    = C:/Qwt-5.1.1
+ }
+ 
+-target.path    = $$INSTALLBASE/lib
++target.path    = $$INSTALLBASE/@BASELIBDIR@
+ headers.path   = $$INSTALLBASE/include
+ doc.path       = $$INSTALLBASE/doc
+ 
diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild
index fb75b7372c..6454f8d46d 100644
--- a/libraries/qwt/qwt.SlackBuild
+++ b/libraries/qwt/qwt.SlackBuild
@@ -10,7 +10,7 @@
 PRGNAM=qwt
 VERSION=${VERSION:-5.1.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -18,14 +18,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-QMAKE=${QMAKE:-$(which qmake)}
-
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
+    BASELIBDIR="lib${LIBDIRSUFFIX}"
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
+    BASELIBDIR="lib${LIBDIRSUFFIX}"
 elif [ "$ARCH" = "x86_64" ]; then
     SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
+    BASELIBDIR="lib${LIBDIRSUFFIX}"
 fi
 
 set -e # Exit on most errors
@@ -43,8 +47,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-sed -i "s%/usr/local/qwt-5.1.1%/usr%" qwtconfig.pri
-$QMAKE INSTALLBASE=/usr CONFIG+=QwtExamples
+patch -p1 < $CWD/qwt-5.1.1-qwtconfig.pri.patch
+sed -i "s%@BASELIBDIR@%$BASELIBDIR%" qwtconfig.pri
+
+qmake INSTALLBASE=/usr CONFIG+=QwtExamples
 make \
   CFLAGS+="$SLKCFLAGS" \
   CXXFLAGS+="$SLKCFLAGS"
@@ -73,4 +79,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/libraries/qwt/qwt.info b/libraries/qwt/qwt.info
index 81a7c01311..ee5fd265d2 100644
--- a/libraries/qwt/qwt.info
+++ b/libraries/qwt/qwt.info
@@ -2,7 +2,9 @@ PRGNAM="qwt"
 VERSION="5.1.1"
 HOMEPAGE="http://qwt.sourceforge.net"
 DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-5.1.1.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="218cef1a39ebda6cfa440a0727464275"
+MD5SUM_x86_64=""
 MAINTAINER="Zordrak"
 EMAIL="slackbuilds@tpa.me.uk" 
 APPROVED="rworkman,michiel"