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

[Eric Bélanger]

    Date: Friday, April 17, 2009 @ 19:38:11
  Author: eric
Revision: 35874

Fixed svn conflict

Modified:
  root-tail/repos/extra-i686/	(properties)
  root-tail/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)


Property changes on: root-tail/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /root-tail/trunk:1
   + /root-tail/trunk:1-35873

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-17 22:49:32 UTC (rev 35873)
+++ extra-i686/PKGBUILD	2009-04-17 23:38:11 UTC (rev 35874)
@@ -1,25 +1,22 @@
 # $Id$
-# Maintainer: eric <eric at archlinux.org>
 # Contributor:  John Sowiak <john at archlinux.org>
 
 pkgname=root-tail
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Displays logfiles in different colours on your root-window"
+arch=('i686' 'x86_64')
 url="http://www.goof.com/pcg/marc/root-tail.html"
+license=('GPL')
 depends=('libxext')
 makedepends=('imake')
 source=(http://www.goof.com/pcg/marc/data/$pkgname-$pkgver.tar.gz)
 md5sums=('5a4b3c4c7ab3bed1f4575e9688aac5de')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/xmkmf -a
-  /usr/bin/make || return 1
-  /bin/sed -i "s|BINDIR = /usr/X11R6/bin|BINDIR = /usr/bin|" Makefile
-  /bin/sed -i "s|MANPATH = /usr/X11R6/man|MANPATH = /usr/man|" Makefile
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install.man || return 1
-  /bin/rm $startdir/pkg/usr/X11R6/ -rfv
+  cd $srcdir/$pkgname-$pkgver
+  xmkmf -a || return 1
+  make || return 1
+  make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man || return 1
 }
 # vim: ts=2 sw=2 et ft=sh