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

[Eric Bélanger]

    Date: Wednesday, February 25, 2009 @ 17:56:21
  Author: eric
Revision: 27783

fixed svn conflict

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

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


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-25 22:55:23 UTC (rev 27782)
+++ extra-x86_64/PKGBUILD	2009-02-25 22:56:21 UTC (rev 27783)
@@ -1,23 +1,23 @@
 # $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
 # Contributor: orelien <orelien at chez.com>
+#
 
 pkgname=windowmaker-extra
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Extra WindowMaker icons and themes."
 arch=(i686 x86_64)
+url="http://www.windowmaker.info"
 license=('GPL2')
 depends=('windowmaker')
-source=(http://www.windowmaker.info/pub/source/release/WindowMaker-extra-$pkgver.tar.gz)
-url="http://www.windowmaker.info"
-md5sums=('07c7700daaaf232bc490f5abaabef085')
+source=(http://www.sgiweb.org/freeware/source/windowmaker-extra/windowmaker-extra-$pkgver.tar.gz)
+md5sums=('3ef850cfe0fb6660a55ccc8a2e408f74')
 
 build() {
-  cd $startdir/src/WindowMaker-extra-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/WindowMaker-extra-$pkgver
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm -f $startdir/pkg/usr/share/WindowMaker/Icons/xv.xpm
+  make DESTDIR=$pkgdir install || return 1
+  rm -f $pkgdir/usr/share/WindowMaker/Icons/xv.xpm
 }
 # vim: ts=2 sw=2 et ft=sh