From 97ac5aed72a62fd8d5cb284af57c88ecfb4d53db Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 6 Nov 2011 08:51:28 +0100
Subject: [PATCH] pciutils: update to 3.1.8.

---
 srcpkgs/pciutils/pciutils-devel.template | 13 +++-----
 srcpkgs/pciutils/template                | 42 ++++++++++--------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/pciutils/pciutils-devel.template b/srcpkgs/pciutils/pciutils-devel.template
index c9dc73d700..14ef9e7014 100644
--- a/srcpkgs/pciutils/pciutils-devel.template
+++ b/srcpkgs/pciutils/pciutils-devel.template
@@ -1,20 +1,17 @@
 # Template file for 'pciutils-devel'.
 #
-short_desc="${sourcepkg} development files"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run pciutils
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man7 ${DESTDIR}/usr/share/man
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man7 usr/share/man
 }
diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index e8d9070e6d..ffd2ec2681 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -1,12 +1,12 @@
 # Template file for 'pciutils'
 pkgname=pciutils
-version=3.1.7
-revision=1
-#distfiles="http://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$version.tar.gz"
-distfiles="http://www.ibiblio.org/pub/linux/hardware/$pkgname-$version.tar.gz"
+version=3.1.8
+homepage="http://mj.ucw.cz/pciutils.html"
+distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
 short_desc="PCI bus related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2
+license="GPL-2"
+checksum=15a7de19f23f95eeda2487bedc6b4c11eddea9c30bba35573775b4d46b7a46ca
 long_desc="
  The $pkgname package contains various utilities for inspecting and
  setting devices connected to the PCI bus."
@@ -14,27 +14,19 @@ long_desc="
 subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency build wget
-Add_dependency build which
 
-do_install()
-{
-	cd $wrksrc
-	sed -i -e 's/^OPT=.*/OPT=-O2 -pipe -fPIC -DPIC/g' Makefile
+do_build() {
 	./update-pciids.sh
-
-	make ZLIB=no DNS=no PREFIX=/usr SHAREDIR=/usr/share/hwdata \
-		MANDIR=/usr/share/man DESTDIR=${DESTDIR} \
-		all install-lib || exit 1
+	make OPT="${XBPS_CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr \
+		SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+	cp lib/libpci.a ${XBPS_MASTERDIR}/tmp
 	make clean
-	make ZLIB=no SHARED=yes DNS=no PREFIX=/usr SHAREDIR=/usr/share/hwdata \
-		MANDIR=/usr/share/man DESTDIR=${DESTDIR} \
-		all install-lib || exit 1
-	make PREFIX=/usr DESTDIR=${DESTDIR} SHAREDIR=/usr/share/hwdata \
-		MANDIR=/usr/share/man install || exit 1
-	for i in config.h header.h pci.h types.h; do
-		install -D -m 644 lib/${i} ${DESTDIR}/usr/include/pci/${i}
-	done
-	cd ${DESTDIR}/usr/lib && \
-		ln -sf libpci.so.${version} libpci.so.3 && \
-		ln -sf libpci.so.${version} libpci.so
+	make OPT="${XBPS_CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=yes PREFIX=/usr \
+		SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+do_install() {
+	make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata \
+		MANDIR=/usr/share/man DESTDIR=${DESTDIR} install install-lib
+	vinstall ${XBPS_MASTERDIR}/tmp/libpci.a 644 usr/lib
 }