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

[Eric Bélanger]

    Date: Wednesday, April 29, 2009 @ 02:44:04
  Author: eric
Revision: 36979

Fixed svn conflict

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

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-29 06:43:01 UTC (rev 36978)
+++ extra-x86_64/PKGBUILD	2009-04-29 06:44:04 UTC (rev 36979)
@@ -1,22 +1,21 @@
 # $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 
 pkgname=docker
 pkgver=1.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2."
 arch=(i686 x86_64)
+url="http://icculus.org/openbox/2/docker/"
 license=('GPL')
 depends=('glibc' 'glib2' 'libx11')
 source=(http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('349320bebd43babb8b43e11c7aae0293')
-url="http://icculus.org/openbox/2/docker/"
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /bin/mkdir -p $startdir/pkg/usr/bin
-  /usr/bin/make || return 1
-  /usr/bin/make PREFIX=$startdir/pkg/usr install
+  cd $srcdir/$pkgname-$pkgver
+  install -d $pkgdir/usr/bin || return 1
+  make || return 1
+  make PREFIX=$pkgdir/usr install || return 1
 }
 # vim: ts=2 sw=2 et ft=sh