[arch-commits] Commit in liquidwar/trunk (PKGBUILD liquidwar.install)

[Eric Bélanger]

    Date: Monday, October 17, 2011 @ 21:13:41
  Author: eric
Revision: 140669

upgpkg: liquidwar 5.6.4-5

Update depends to allegro4 (allegro rebuild), Add fix to build with python2, Clean up PKGBUILD

Modified:
  liquidwar/trunk/PKGBUILD
  liquidwar/trunk/liquidwar.install

-------------------+
 PKGBUILD          |   29 +++++++++++++++--------------
 liquidwar.install |    2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-18 00:42:56 UTC (rev 140668)
+++ PKGBUILD	2011-10-18 01:13:41 UTC (rev 140669)
@@ -1,29 +1,30 @@
 # $Id$
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Maintainer: Jason Chu <jason at archlinux.org>
 # Maintainer: Jeff Mickey <jeff at archlinux.org>
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64')
 url="http://www.ufoot.org/liquidwar/"
 license=('GPL')
-depends=('allegro>=4.4.0.1')
-makedepends=('python')
+depends=('allegro4')
+makedepends=('python2')
 install=liquidwar.install
-source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('6917dd1026e6685404ffbd086f8ba374')
-sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6')
+source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
+        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig)
+sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
+          'a262967d60e0f04ac5b99693144ef6b0038bb6c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's/python/python2/' doc/Makefile.in
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
-  ./configure --prefix=/usr --disable-doc-ps --disable-doc-pdf --disable-doc-php3 $EXTRAOPTS || return 1
-  sed -i 's|$(EXTERN_LIBS)|$(EXTERN_LIBS) -lm|' src/Makefile || return 1
-  make GAMEDIR=/usr/bin DATADIR=/usr/share/$pkgname || return 1
-  make DESTDIR="$pkgdir" DATADIR=/usr/share/$pkgname install || return 1
-  mv "$pkgdir"/usr/games/* "$pkgdir/usr/bin/"
-  rmdir "${pkgdir}/usr/games"
+  LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+  make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
+}

Modified: liquidwar.install
===================================================================
--- liquidwar.install	2011-10-18 00:42:56 UTC (rev 140668)
+++ liquidwar.install	2011-10-18 01:13:41 UTC (rev 140669)
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 file=(liquidwar.info.gz)
 
 post_install() {