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

Conflicts:
	community-testing/hostapd/PKGBUILD
	community-testing/hostapd/config.bz2
	community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
	community-testing/hostapd/hostapd
	community-testing/hostapd/hostapd.conf.d
	community-testing/hostapd/hostapd.install
	community-testing/ipvsadm/PKGBUILD
	community-testing/ipvsadm/ipvsadm.conf
	community-testing/ipvsadm/ipvsadm.rc
	community-testing/ipvsadm/ipvsadm.rules
	community-testing/keepalived/PKGBUILD
	community-testing/keepalived/ip_vs_moved.patch
	community-testing/keepalived/keepalived.conf
	community-testing/keepalived/keepalived.rc
	community-testing/knemo/PKGBUILD
	community-testing/knemo/knemo.install
	community-testing/simh/LICENSE
	community-testing/simh/PKGBUILD
	community-testing/simh/simh.install
	community/fityk/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/sage-mathematics/PKGBUILD
	community/xylib/PKGBUILD
	core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
	extra/kradio/PKGBUILD
	extra/phonon-gstreamer/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	testing/bluez/PKGBUILD
	testing/bluez/bluetooth.conf.d
	testing/bluez/fix-a2dp.patch
	testing/bluez/rc.bluetooth
	testing/crda/PKGBUILD
	testing/crda/crda.install
	testing/crda/crda.rc
	testing/crda/libnl32.patch
	testing/iw/PKGBUILD
	testing/kismet/PKGBUILD
	testing/kismet/kismet.changelog
	testing/kismet/kismet.install
	testing/libnl/PKGBUILD
	testing/libnl1/PKGBUILD
	testing/libnl1/fix-compilation.patch
	testing/libpcap/PKGBUILD
	testing/libpcap/libnl32.patch
	testing/net-snmp/PKGBUILD
	testing/net-snmp/libnl32.patch
	testing/net-snmp/snmpd.confd
	testing/net-snmp/snmpd.rc
	testing/networkmanager/NetworkManager.conf
	testing/networkmanager/PKGBUILD
	testing/networkmanager/disable_set_hostname.patch
	testing/networkmanager/networkmanager.install
	testing/ntrack/PKGBUILD
	testing/ntrack/libnl3.patch
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/wpa_supplicant/dbus.patch
	testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch

1 files changed, 24 insertions, 14 deletions

diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index dcb29d348..8d4c066b6 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,32 +1,41 @@
-# $Id: PKGBUILD 35517 2010-12-21 13:39:10Z svenstaro $
+# $Id: PKGBUILD 64571 2012-02-16 20:13:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: rabyte <rabyte__gmail>
 
 pkgname=supertuxkart
-pkgver=0.7
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="A kart racing game featuring Tux and his friends"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://supertuxkart.sourceforge.net/"
 license=('GPL2')
-depends=('irrlicht' 'openal' 'libvorbis')
-makedepends=()
-source=(http://downloads.sourceforge.net/project/$pkgname/SuperTuxKart/0.7/$pkgname-$pkgver-src.tar.bz2)
-md5sums=('2806f271e4d37fee5ad8ca166e1ad489')
+depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl')
+makedepends=('cmake' 'subversion' 'mesa')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2)
+md5sums=('502664b2ec9ad5ab88b1882fef4c074d')
 
 build() {
+  cd "$srcdir"
+
+  svn co -r 3900 https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk irrlicht
+
+  cd irrlicht/source/Irrlicht
+  NDEBUG=1 make
+
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr --datadir=/usr/share
+  sed -i "s|share/games|share|g" CMakeLists.txt
 
-  # Fix compilation failure: http://bugs.gentoo.org/283490
-  #sed -i 's/-lGL/-lGL -lGLU/' config.status
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
 
-  # those configure flags really mean nothing...
-  sed -i "s#/usr/local#/usr#" src/io/file_manager.cpp
-  sed -i "s#/games##" $(grep -Rl "/games" *)
+  cmake \
+    -DIRRLICHT_DIR="$srcdir/irrlicht" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS="-lpthread -lm -ldl" \
+    ..
 
   make
 }
@@ -34,11 +43,12 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  cd build
   make DESTDIR=${pkgdir} install
 
   # fix executable location...
-  install -dm755 ${pkgdir}/usr/bin
-  mv ${pkgdir}/usr/supertuxkart ${pkgdir}/usr/bin/supertuxkart
+  install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart
+  rm -r ${pkgdir}/usr/games
 
   sed -i "s#usr/supertuxkart#usr/bin/supertuxkart#" \
     ${pkgdir}/usr/share/applications/supertuxkart.desktop