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

[Eric Bélanger]

    Date: Friday, June 24, 2011 @ 00:37:24
  Author: eric
Revision: 128484

upgpkg: fortune-mod 1.99.1-5
Rebuilt against latest toolchain, PKGBUILD cleanup

Modified:
  fortune-mod/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-24 03:52:02 UTC (rev 128483)
+++ PKGBUILD	2011-06-24 04:37:24 UTC (rev 128484)
@@ -4,29 +4,33 @@
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64')
 url="http://www.redellipse.net/code/fortune"
 license=('BSD')
 depends=('recode')
 source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
-md5sums=('f208805b3b712e32997d7667e0ec52d8' '0217481ae93971296cfb7872157cabb7'\
+md5sums=('f208805b3b712e32997d7667e0ec52d8'
+         '0217481ae93971296cfb7872157cabb7'
          'e85b073f16dc6f0e8f0ed90044797aa3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 < ../01_all_fortune_all-fix.patch  || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 < ../01_all_fortune_all-fix.patch
   make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
        COOKIEDIR=/usr/share/fortune  \
-       LOCALDIR=/usr/local/share/fortune || return 1
-  make COOKIEDIR=/usr/share/fortune fortune/fortune.man || return 1
-  make FORTDIR=$pkgdir/usr/bin  \
-       COOKIEDIR=$pkgdir/usr/share/fortune  \
-       BINDIR=$pkgdir/usr/sbin  \
-       BINMANDIR=$pkgdir/usr/share/man/man1  \
-       FORTMANDIR=$pkgdir/usr/share/man/man6 install || return 1
-  rm $pkgdir/usr/share/fortune/*.u8
-  rm $pkgdir/usr/share/fortune/off/*.u8
-  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+       LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make FORTDIR="$pkgdir"/usr/bin \
+       COOKIEDIR="$pkgdir"/usr/share/fortune \
+       BINDIR="$pkgdir"/usr/sbin \
+       BINMANDIR="$pkgdir"/usr/share/man/man1 \
+       FORTMANDIR="$pkgdir"/usr/share/man/man6 install
+  rm "$pkgdir"/usr/share/fortune/*.u8
+  rm "$pkgdir"/usr/share/fortune/off/*.u8
+  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}