[arch-commits] Commit in glob2/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, February 28, 2013 @ 13:06:06
  Author: arodseth
Revision: 85279

upgpkg: glob2 0.9.4.4-16

Modified:
  glob2/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-28 11:55:43 UTC (rev 85278)
+++ PKGBUILD	2013-02-28 12:06:06 UTC (rev 85279)
@@ -5,37 +5,34 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=15
+pkgrel=16
 pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'
 license=('GPL3')
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
-         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('scons' 'boost' 'mesa')
-install=glob2.install
-source=("http://dl.sv.nongnu.org/releases/$pkgname/0.9.4/$pkgname-$pkgver.tar.gz"
-	'glob2-0.9.4.1-gcc44.patch')
+         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libgl')
+makedepends=('scons' 'boost' 'mesa-libgl')
+install="$pkgname.install"
+source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
+        "$pkgname-${pkgver%.*}.1-gcc44.patch")
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
             '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-  scons \
-    LINKFLAGS="-lboost_system"
+  patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch"
+  scons LINKFLAGS="-lboost_system"
 }
 
 package () {
   cd "$srcdir/$pkgname-$pkgver"
 
-  scons install \
-    BINDIR="$pkgdir/usr/bin" \
-    INSTALLDIR="$pkgdir/usr/share"
+  scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share"
   find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png \
-    "$pkgdir/usr/share/pixmaps/glob2-icon-48x48.png"
+  install -Dm644 "data/icons/$pkgname-icon-48x48.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png"
 }
 
 # vim:set ts=2 sw=2 et: