popt 1.16

1 files changed, 13 insertions, 23 deletions

diff --git a/abs/core/popt/PKGBUILD b/abs/core/popt/PKGBUILD
index 5905959..96b9026 100644
--- a/abs/core/popt/PKGBUILD
+++ b/abs/core/popt/PKGBUILD
@@ -1,42 +1,32 @@
-# $Id: PKGBUILD 80029 2010-05-10 17:03:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=popt
 pkgver=1.16
-pkgrel=2
+pkgrel=5
 pkgdesc="A commandline option parser"
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64')
 url="http://rpm5.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3743beefa3dd6247a73f8f7a32c14c33')
+source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
-  # move libs in /lib
-  install -Dm755 ${pkgdir}/usr/lib/libpopt.so.0.0.0 \
-    ${pkgdir}/lib/libpopt.so.0.0.0 || return 1
-  
-  rm ${pkgdir}/usr/lib/libpopt.so* || return 1
-  ln -sf /lib/libpopt.so ${pkgdir}/usr/lib/libpopt.so
-  ln -sf libpopt.so.0 ${pkgdir}/lib/libpopt.so
-  ln -sf libpopt.so.0.0.0 ${pkgdir}/lib/libpopt.so.0
-
-  # install license
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-    $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }