[arch-commits] Commit in apricots/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, February 17, 2009 @ 22:07:20
  Author: eric
Revision: 27264

fixed svn conflict

Modified:
  apricots/repos/extra-i686/	(properties)
  apricots/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)


Property changes on: apricots/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /apricots/trunk:1
   + /apricots/trunk:1-27263

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-18 02:51:36 UTC (rev 27263)
+++ extra-i686/PKGBUILD	2009-02-18 03:07:20 UTC (rev 27264)
@@ -1,26 +1,22 @@
 # $Id$
-# Maintainer: eric <eric at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-#
 
 pkgname=apricots
 pkgver=0.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://www.fishies.org.uk/apricots.html"
-depends=('gcc' 'openal>=0.0.8' 'sdl' 'freealut>=1.1.0')
+depends=('gcc-libs' 'openal>=1.6.372' 'sdl' 'freealut>=1.1.0')
 source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" \
 	"apricots-0.2.6-freealut.patch")
+md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch || return 1
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make prefix=$pkgdir/usr install || return 1
 }
-
-md5sums=('910828d717e46d8cbd9c24f702d09fbc'
-         '5f9f74082dfe162ab3ba51f6ec628f99')