From bf6e11449a1f5e25536396d26f3c0d2d2fecf7aa Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Wed, 24 Nov 2010 02:47:39 +0000
Subject: popt: upgrade

---
 abs/core/popt/PKGBUILD | 53 +++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/abs/core/popt/PKGBUILD b/abs/core/popt/PKGBUILD
index a8cdec7..5905959 100644
--- a/abs/core/popt/PKGBUILD
+++ b/abs/core/popt/PKGBUILD
@@ -1,33 +1,42 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 80029 2010-05-10 17:03:30Z andrea $
+# Maintainer: 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.10.6
-pkgrel=12
-_rpmver=4.4.6
+pkgver=1.16
+pkgrel=2
 pkgdesc="A commandline option parser"
-arch=(i686 x86_64) 
-url="http://rpm.net.in/mirror/rpm-4.4.x/"
-license=('GPL' 'MIT')
-groups=('base')
+arch=('i686' 'x86_64') 
+url="http://rpm5.org"
+license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://wraptastic.org/pub/rpm-4.4.x/rpm-${_rpmver}.tar.gz)
-md5sums=('baa6f371446c65b4080d1cd1f194a7ae')
+source=(http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('3743beefa3dd6247a73f8f7a32c14c33')
 
 build() {
-  cd $startdir/src/rpm-${_rpmver}/popt
-  if [ "$CARCH" = "x86_64" ]; then
-   sed -i -e "s/@MARK64@//" Makefile.am
-   sed -i -e "s/@MARK64@//" Makefile.in
-  fi
+  cd $srcdir/$pkgname-$pkgver
 
-  # fix from BLFS
-  sed -i -e "/*origOptString ==/c 0)" popt.c
-
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install || return 1
+
+  # 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
 }
-- 
cgit v0.12

