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

[Eric Bélanger]

    Date: Saturday, May 7, 2011 @ 01:36:47
  Author: eric
Revision: 122895

upgpkg: xbill 2.1-7
Moved libxaw depends to makedepends, Improved description, Fixed install scriptlet

Modified:
  xbill/trunk/PKGBUILD
  xbill/trunk/xbill.install

---------------+
 PKGBUILD      |   38 +++++++++++++++++++++-----------------
 xbill.install |    5 +++--
 2 files changed, 24 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-07 04:27:01 UTC (rev 122894)
+++ PKGBUILD	2011-05-07 05:36:47 UTC (rev 122895)
@@ -1,35 +1,39 @@
 # $Id$
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=6
-pkgdesc="Xbill is a game that tests you reflexes as you seek and destroy all forms of Bill"
+pkgrel=7
+pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
 arch=('i686' 'x86_64')
 url="http://www.xbill.org/"
 license=('GPL')
-depends=('xaw3d>=1.5E' 'libxaw')
+depends=('xaw3d')
+makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/$pkgname-$pkgver.tar.gz)
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('585e4866b15255a24203db9959407b2f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
-  --disable-motif  --enable-athena --disable-gtk || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+    --disable-motif  --enable-athena --disable-gtk
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
 # set appropriate permissions and destinations
-  chown root:games $pkgdir/usr/bin/xbill
-  chmod 2755 $pkgdir/usr/bin/xbill
+  chown root:games "${pkgdir}/usr/bin/xbill"
+  chmod 2755 "${pkgdir}/usr/bin/xbill"
 
-  chown root:games $pkgdir/var/games
-  chmod 775 $pkgdir/var/games
-  chown root:games $pkgdir/var/games/xbill
-  chmod 775 $pkgdir/var/games/xbill
+  chown root:games "${pkgdir}/var/games"
+  chmod 775 "${pkgdir}/var/games"
+  chown root:games "${pkgdir}/var/games/xbill"
+  chmod 775 "${pkgdir}/var/games/xbill"
 
 # Handle the scores file creation in the install script
-  rm $pkgdir/var/games/xbill/scores
+  rm "${pkgdir}/var/games/xbill/scores"
 }

Modified: xbill.install
===================================================================
--- xbill.install	2011-05-07 04:27:01 UTC (rev 122894)
+++ xbill.install	2011-05-07 05:36:47 UTC (rev 122895)
@@ -1,6 +1,7 @@
 pre_install() {
-  if [ ! -e var/games/xbill/scores ]; then
-    [ -e usr/var/xbill/scores ] && mv usr/var/xbill/scores var/games/xbill/scores
+  if [ ! -e var/games/xbill/scores -a -e usr/var/xbill/scores ]; then
+    mkdir -p var/games/xbill
+    mv usr/var/xbill/scores var/games/xbill/scores
   fi
 }