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

[Allan McRae]

    Date: Saturday, March 14, 2009 @ 21:15:56
  Author: allan
Revision: 29962

fix svn conflict

Modified:
  tuxracer/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-15 00:57:15 UTC (rev 29961)
+++ PKGBUILD	2009-03-15 01:15:56 UTC (rev 29962)
@@ -1,31 +1,46 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca> and patched by orelien <aurelien.foret at wanadoo.fr>
 
 pkgname=tuxracer
 pkgver=0.61
-pkgrel=7
-pkgdesc="Tux Racer lets you take on the role of Tux the Linux Penguin as he races down steep, snow-covered mountains."
-arch=(i686 x86_64)
+pkgrel=8
+pkgdesc="Take on the role of Tux as he races down steep, snow-covered mountains."
+arch=('i686' 'x86_64')
+url="http://tuxracer.sourceforge.net/"
 license=('GPL')
-depends=('sdl' 'sdl_mixer' 'tcl>=8.5.0' 'glibc' 'audiofile' 'gcc-libs' 'libogg' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'libgl')
-install=
-source=(http://downloads.sourceforge.net/tuxracer/$pkgname-$pkgver.tar.gz http://downloads.sourceforge.net/tuxracer/tuxracer-data-0.61.tar.gz $pkgname-$pkgver.patch.bz2 $pkgname-pasting.patch)
-md5sums=('206e8197ceaf0f00b25d4e2b4156e563' 'aef877fee9e1a56483ff01fbdfb1e4b3'\
-         '785d5ec7b8353a8f6d03152b610c8dd8' '9cab49d96fb17aff1ab67d755885242f')
-url="http://tuxracer.sourceforge.net/"
+depends=('sdl' 'sdl_mixer' 'tcl>=8.5.0' 'glibc' 'audiofile' 'libogg' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'libgl')
+source=(http://downloads.sourceforge.net/tuxracer/$pkgname-$pkgver.tar.gz
+        http://downloads.sourceforge.net/tuxracer/tuxracer-data-0.61.tar.gz 
+        $pkgname-datadir.patch
+        $pkgname-pasting.patch
+        $pkgname.desktop
+        $pkgname.png)
+md5sums=('206e8197ceaf0f00b25d4e2b4156e563'
+         'aef877fee9e1a56483ff01fbdfb1e4b3'
+         'a96a26d6e22b91b5f3f3b0fb29cef589'
+         '9cab49d96fb17aff1ab67d755885242f'
+         'c23baf2f2bad6286b1d3c6e4b9bd457d'
+         'd62cbbea6264826ad10ee1991e05f62f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  bzip2 -d ../$pkgname-$pkgver.patch.bz2
-  patch -Np1 -i ../$pkgname-$pkgver.patch
-  patch -Np1 -i ../$pkgname-pasting.patch
-  CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY" ./configure --prefix=/usr --with-tcl-lib-name=tcl8.5 --with-tcl-header=tcl.h
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/$pkgname-datadir.patch
+  patch -Np1 -i $srcdir/$pkgname-pasting.patch
+  
+  CFLAGS="$CFLAGS -DGLX_GLXEXT_LEGACY" \
+    ./configure --prefix=/usr --with-tcl-lib-name=tcl8.5 --with-tcl-header=tcl.h
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  mkdir -p $startdir/pkg/usr/share/tuxracer
-  mv $startdir/src/$pkgname-data-$pkgver/* $startdir/pkg/usr/share/tuxracer
-  chown -R root:root $startdir/pkg/usr/share
-  find $startdir/pkg/usr/share -type f -exec chmod 644 {} \;
-  find $startdir/pkg/usr/share -type d -exec chmod 755 {} \;
+  make prefix=$pkgdir/usr install
+  
+  # install data
+  install -dm755 $pkgdir/usr/share/tuxracer
+  mv $srcdir/$pkgname-data-$pkgver/* $pkgdir/usr/share/tuxracer
+  find $pkgdir/usr/share/tuxracer -type f -exec chmod 644 {} \;
+  find $pkgdir/usr/share/tuxracer -type d -exec chmod 755 {} \;
+
+  # install .desktop file and icon
+  install -dm755 $pkgdir/usr/share/{applications,pixmaps}
+  install -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications
+  install -m644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps
 }