Sun Mar 2 03:20:04 UTC 2014

1 files changed, 13 insertions, 12 deletions

diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 6cf4ca5c3..1fe9df007 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178992 2013-03-01 10:24:54Z andrea $
+# $Id: PKGBUILD 206541 2014-03-01 08:19:07Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -17,33 +17,34 @@ sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
           '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
           '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
-build() {
-    . /etc/profile.d/qt4.sh
-
-    cd ${srcdir}/${pkgname}
-    patch -p1 < ../qwtplot3d-gcc44.patch
-    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
+prepare() {
+    cd ${pkgname}
+    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
+    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
+}
 
+build() {
+    cd ${pkgname}
     # build qwt:
     qmake qwtplot3d.pro
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}
+    cd ${pkgname}
 
     # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
+    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
 
     for n in include/* ; do
-     cp -d $n ${pkgdir}/usr/include/qwtplot3d
+     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
     done
 
     for n in lib/libqwtplot3d.so* ; do
-     cp -d $n ${pkgdir}/usr/lib
+     cp -d $n "${pkgdir}"/usr/lib
     done
 
     # install custom license
-    install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
+    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }