[arch-commits] Commit in prboom/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Monday, November 17, 2008 @ 22:34:44
  Author: eric
Revision: 19268

fixed svn conflict

Modified:
  prboom/repos/extra-x86_64/	(properties)
  prboom/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)


Property changes on: prboom/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /prboom/trunk:1
   + /prboom/trunk:1-19267

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-18 03:22:15 UTC (rev 19267)
+++ extra-x86_64/PKGBUILD	2008-11-18 03:34:44 UTC (rev 19268)
@@ -1,21 +1,23 @@
 # $Id$
-# Maintainer: dale <dale at archlinux.org>
+# Contributor: dale <dale at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=prboom
-pkgver=2.4.7
-pkgrel=1
+pkgver=2.5.0
+pkgrel=2
 pkgdesc="A game engine which provides a program to play Doom levels"
-arch=(i686 x86_64)
-depends=('sdl_mixer' 'sdl_net' 'libpng')
 url="http://prboom.sourceforge.net/"
-source=(http://heanet.dl.sourceforge.net/prboom/$pkgname-$pkgver.tar.gz)
-md5sums=('9942f521764d7f89df2218a456da4f02')
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net')
+source=(http://downloads.sourceforge.net/prboom/$pkgname-$pkgver.tar.gz)
+md5sums=('a8a15f61fa2626ab98051ab2703378c4')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	sed -i "s|/games|/bin|g" $startdir/src/$pkgname-$pkgver/src/Makefile
+	cd $srcdir/$pkgname-$pkgver
+	./configure --prefix=/usr || return 1
+	sed -i "s|/games|/bin|g" $srcdir/$pkgname-$pkgver/src/Makefile || return 1
 	make || return 1
-	make DESTDIR=$startdir/pkg install
+	make DESTDIR=$pkgdir install || return 1
 }