Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dopewars/PKGBUILD
	community/virtualbox/PKGBUILD
	core/lvm2/PKGBUILD
	extra/aspell/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/libproxy/PKGBUILD
	extra/live-media/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/putty/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD

1 files changed, 17 insertions, 17 deletions

diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 197034720..8b1c1c067 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 64675 2010-01-21 21:29:39Z eric $
+# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-origver=0.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
-depends=('qt>=4.3' 'qwt>=5.0.2')
-source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$origver.tgz"
+depends=('qt' 'qwt' 'mesa')
+source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
         qwtplot3d-gcc44.patch)
-md5sums=('2f14660152e2e26bfeaaeec479ed9f2b' '92ad261ed5344bc773cba05b324cfe74')
 sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
 
 build() {
-    cd $startdir/src/$pkgname
-    patch -p1 < ../qwtplot3d-gcc44.patch || return 1
-  #  . /etc/profile.d/qt3.sh
+    cd ${srcdir}/${pkgname}
+    patch -p1 < ../qwtplot3d-gcc44.patch
+
     # build qwt:
     qmake qwtplot3d.pro
-    make || return 1
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}
 
     # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    mkdir -p $startdir/pkg/usr/{include/qwtplot3d,lib}
-    # mkdir -p $startdir/pkg/usr/man/man3 .. no manpages yet
+    install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
 
     for n in include/* ; do
-     cp -d $n $startdir/pkg/usr/include/qwtplot3d || return 1
+     cp -d $n ${pkgdir}/usr/include/qwtplot3d
     done
 
     for n in lib/libqwtplot3d.so* ; do
-     cp -d $n $startdir/pkg/usr/lib || return 1
+     cp -d $n ${pkgdir}/usr/lib
     done
 
-    # for n in doc/man/man3/*.3 ; do
-    #  install -m 644 $n $startdir/pkg/usr/man/man3
-    # done
+    # install custom license
+    install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
 }