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

[Eric Bélanger]

    Date: Monday, November 17, 2008 @ 22:22:15
  Author: eric
Revision: 19267

fixed svn conflict

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

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


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-18 03:18:12 UTC (rev 19266)
+++ extra-x86_64/PKGBUILD	2008-11-18 03:22:15 UTC (rev 19267)
@@ -1,30 +1,28 @@
 # $Id$
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
 # Contributor: Christian Storm <Christian.Storm at gmx.DE>
+# Contributor: James Rayner <james at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=vbetool
-pkgver=1.0
-pkgrel=2
+pkgver=1.1
+pkgrel=1
 pkgdesc="vbetool uses lrmi in order to run code from the video BIOS"
-arch=('i686' 'x86_64')
 url="http://www.srcf.ucam.org/~mjg59/vbetool/"
 license=('GPL2')
+arch=('i686' 'x86_64')
 depends=('zlib' 'libx86')
 makedepends=('pciutils')
 source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz)
+md5sums=('ffb03b118867a02296d7449019ad8846')
 
-
 build() {
-  cd $startdir/src/vbetool-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --without-x86emu
+    ./configure --prefix=/usr --without-x86emu || return 1
   else
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr || return 1
   fi
   make LIBS=-lpci || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install || return 1
 }
 
-
-
-
-md5sums=('e57b5475b8200e3c44df7f53f0fbdc72')