Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

1 files changed, 11 insertions, 6 deletions

diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
index b497c66aa..d4268ee38 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 41384 2011-03-05 15:36:57Z lcarlier $
+# $Id: PKGBUILD 45573 2011-04-24 16:51:07Z lcarlier $
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: pukyxd 
 # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 
 pkgname=warmux
-pkgver=11.01
-pkgrel=1
+pkgver=11.04
+pkgrel=2
 pkgdesc="A clone of the worms game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.wormux.org/"
 license=('GPL')
-depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-makedepends=('pkgconfig')
+makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
 replaces=('wormux')
 source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ecf98ff1a91899d35d0ba8266ace9787')
+md5sums=('668cd4c22afde352c566454e65fc4144')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  #gcc 4.6.0 fix
+  sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
+  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver}")
+
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  rm -r ${pkgdir}/usr/share/warmux
 }