pciutils 3.1.10

1 files changed, 19 insertions, 21 deletions

diff --git a/abs/core/pciutils/PKGBUILD b/abs/core/pciutils/PKGBUILD
index 2529e07..3046289 100644
--- a/abs/core/pciutils/PKGBUILD
+++ b/abs/core/pciutils/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 69314 2010-02-20 10:20:37Z tpowa $
+# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
-pkgver=3.1.7
+pkgver=3.1.10
 pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL2')
 groups=('base')
-url="http://mj.ucw.cz/pciutils.html"
-optdepends=('sh: required by update-pciids') 
-makedepends=('wget')
-depends=('glibc')
-source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('35222edb86b50a6641352c66fe829b2e')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  CFLAGS="${CFLAGS} -fPIC -DPIC"
-  sed -i -e 's/^OPT=.*/OPT=-O2 -pipe -fPIC -DPIC/g' Makefile
-  ./update-pciids.sh
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
 }
+
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make ZLIB=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all || return 1
-  make PREFIX=${pkgdir}/usr SHAREDIR=${pkgdir}/usr/share/hwdata MANDIR=${pkgdir}/usr/share/man install
-  install -d ${pkgdir}/usr/lib
-  install -m644 lib/libpci.a ${pkgdir}/usr/lib
-  for i in config.h header.h pci.h types.h; do
-    install -D -m 644 lib/${i} ${pkgdir}/usr/include/pci/${i}
-  done
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+  # this is now supplied by the hwids package
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
 }