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

[Eric Bélanger]

    Date: Monday, March 16, 2009 @ 23:18:01
  Author: eric
Revision: 30178

Fixed svn conflict

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

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


Property changes on: beep/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /beep/trunk:1
   + /beep/trunk:1-30177

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-17 03:17:02 UTC (rev 30177)
+++ extra-x86_64/PKGBUILD	2009-03-17 03:18:01 UTC (rev 30178)
@@ -1,22 +1,22 @@
 # $Id$
 # Maintainer: damir <damir at archlinux.org>
-# Committer: Manolis Tzanidakis <manolis at archlinux.org>
+# Contributor: Manolis Tzanidakis <manolis at archlinux.org>
 
 pkgname=beep
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced PC speaker beeping program."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.johnath.com/beep"
+license=('GPL2')
 depends=('glibc')
-source=($url/$pkgname-$pkgver.tar.gz)
+source=(http://www.johnath.com/beep/$pkgname-$pkgver.tar.gz)
 md5sums=('d541419fd7e5642952d7b48cbb40c712')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i "s:-Wall:${CFLAGS}:" Makefile
+  cd $srcdir/$pkgname-$pkgver
+  sed -i "s:-Wall:${CFLAGS}:" Makefile || return 1
   make || return 1
-  install -D -m755 beep $startdir/pkg/usr/bin/beep
-  install -D -m644 beep.1.gz \
-    $startdir/pkg/usr/man/man1/beep.1.gz
+  install -D -m755 beep $pkgdir/usr/bin/beep || return 1
+  install -D -m644 beep.1.gz $pkgdir/usr/share/man/man1/beep.1.gz || return 1
 }