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

[Andrea Scarpino]

    Date: Monday, May 16, 2011 @ 11:11:39
  Author: andrea
Revision: 124090

upgpkg: arj 3.10.22-6
rebuild old package; fix build with automake 1.11.1

Modified:
  arj/trunk/PKGBUILD

----------+
 PKGBUILD |   43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-16 15:01:59 UTC (rev 124089)
+++ PKGBUILD	2011-05-16 15:11:39 UTC (rev 124090)
@@ -1,18 +1,18 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca>
+# Maintainer:
+# Contributor: Travis Willard <travisw at wmpub.ca>
 # Contributor: Gergely Tamas <dice at mfa.kfki.hu>
 
 pkgname=arj
 pkgver=3.10.22
-pkgrel=5
+pkgrel=6
 pkgdesc="Free and portable clone of the ARJ archiver"
 url="http://arj.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
+options=('!makeflags')
 depends=('glibc')
-makedepends=('autoconf')
-options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
         001_arches_align.patch
         002_no_remove_static_const.patch
         003_64_bit_clean.patch
@@ -22,33 +22,28 @@
          '395dfa8cc500ffae648777f8f241be88'
          '56b3cf96ec485b0d824761457417fcc0'
          '4630a7254dfc6c8d8c7e696aa4a58f4a')
-sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b'
-          '7f8904f8c89bacbbeec8c431d627efbb8da2f259'
-          '919a3c02a1e039803502c21175d69f7703d13026'
-          'd506338e34b40ef5cac6ec14c858fd651a354aaf'
-          '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Add gentoo patches
-  patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1
-  patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1
-  patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1
-  patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1
+  patch -p1 -i "${srcdir}/001_arches_align.patch"
+  patch -p1 -i "${srcdir}/002_no_remove_static_const.patch"
+  patch -p1 -i "${srcdir}/003_64_bit_clean.patch"
+  patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch"
 
-  # Build!
   cd gnu
-  aclocal || return 1
-  autoconf || return 1
+  aclocal
+  autoconf
   rm -f config.{guess,sub}
-  _autover=$(automake --version | head -n1 | awk '{ print $4 }')
-  cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1
-  ./configure --prefix=/usr || return 1
+  cp /usr/share/automake-1.11/config.{guess,sub} .
+  ./configure --prefix=/usr
   cd ..
-  make prepare || return 1
-  make || return 1
+  make prepare
+  make
+}
 
-  # Install!
-  make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }