[arch-commits] Commit in liquidwar/trunk (PKGBUILD liquidwar-5.6.4-underlink.patch)

[Eric Bélanger]

    Date: Wednesday, March 19, 2014 @ 04:52:25
  Author: eric
Revision: 208211

upgpkg: liquidwar 5.6.4-7

Fix build issue (close FS#39127)

Added:
  liquidwar/trunk/liquidwar-5.6.4-underlink.patch
Modified:
  liquidwar/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   25 ++++++++++++++++---------
 liquidwar-5.6.4-underlink.patch |   11 +++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 02:32:28 UTC (rev 208210)
+++ PKGBUILD	2014-03-19 03:52:25 UTC (rev 208211)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
+# Maintainer:
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64')
 url="http://www.ufoot.org/liquidwar/"
@@ -12,21 +12,28 @@
 makedepends=('python2')
 install=liquidwar.install
 source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
-        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
+        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig
+	liquidwar-5.6.4-ovflfix.patch liquidwar-5.6.4-underlink.patch)
 sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
-          'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
-          'e2102792c54a01b7cd14adb6d72404044175ec7e')
+          'SKIP'
+          'e2102792c54a01b7cd14adb6d72404044175ec7e'
+          '442097d99402890ed27ea1de6b7ae984baa2676a')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
   patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
+  patch -p0 -i "$srcdir/liquidwar-5.6.4-underlink.patch"
   sed -i 's/python/python2/' doc/Makefile.in
+}
+
+build() {
+  cd $pkgname-$pkgver
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
-  LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+  PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
   make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
 }

Added: liquidwar-5.6.4-underlink.patch
===================================================================
--- liquidwar-5.6.4-underlink.patch	                        (rev 0)
+++ liquidwar-5.6.4-underlink.patch	2014-03-19 03:52:25 UTC (rev 208211)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
++++ src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+     EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+     LINK_OPTIONS = 
+-    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+ 
+ CONFIG_OPTIONS = \