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

[Eric Bélanger]

    Date: Wednesday, February 25, 2009 @ 17:53:49
  Author: eric
Revision: 27781

fixed svn conflict

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

----------+
 PKGBUILD |   33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-25 22:52:09 UTC (rev 27780)
+++ extra-x86_64/PKGBUILD	2009-02-25 22:53:49 UTC (rev 27781)
@@ -1,30 +1,31 @@
 # $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: aurelien <aurelien at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
 pkgname=windowmaker
 pkgver=0.92.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64)
-license=('GPL2')
-depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'libungif')
-source=(ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2)
-url="http://www.windowmaker.info"
+url="http://www.windowmaker.info/"
+license=('GPL' 'custom')
+depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
+options=('!libtool')
+source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2)
 md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320')
 
 build() {
-  cd $startdir/src/WindowMaker-$pkgver
-  patch -Np1 -i ../windowmaker-gcc4.patch
-  aclocal
-  autoconf
-  automake
+  cd $srcdir/WindowMaker-$pkgver
+  patch -Np1 -i ../windowmaker-gcc4.patch || return 1
+  libtoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake || return 1
   [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-gnustepdir=/usr/share/GNUstep --with-nlsdir=/usr/share/locale \
-    --enable-xinerama 
+    --enable-xinerama  || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  # libtoolslay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
 }