Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=dd69c1e8681c3a17dfcc31c9cb3d67e9a70b1a5c
commit dd69c1e8681c3a17dfcc31c9cb3d67e9a70b1a5c Author: James Buren <[email protected]> Date: Sun Aug 19 21:07:34 2012 -0500 pciutils-3.1.10-2-x86_64 * remove old patch * convert to use hwdata PCI ids diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild index b3ff5ad..ac9ded0 100644 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@ -4,16 +4,16 @@ pkgname=pciutils pkgver=3.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"; -depends=('zlib>=1.2.3-6') +depends=('glibc' 'hwdata') groups=('base' 'core') archs=('i686' 'x86_64' 'arm') up2date="Flasttar ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/"; source=(ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$pkgname-$pkgver.tar.gz \ pciutils-2.2.1-scan.patch \ - pciutils-2.2.1-fix-pciids-path.patch) + makefile.patch) signatures=($source.sign '' '') build() @@ -23,16 +23,14 @@ build() export CFLAGS="$CFLAGS -fPIC -DPIC" fi Fsed '^OPT=.*' "OPT=$CFLAGS" Makefile - make OPT="${CFLAGS} -D_GNU_SOURCE=1" PREFIX=/usr SHARED=yes || Fdie - rm -f pci.ids - wget http://pciids.sourceforge.net/pci.ids + make OPT="${CFLAGS} -D_GNU_SOURCE=1" SHARED=yes || Fdie make PREFIX=$Fdestdir/usr install install-lib || Fdie make clean || Fdie - make OPT="${CFLAGS} -D_GNU_SOURCE=1" PREFIX=/usr SHARED=no || Fdie - gunzip $Fdestdir/usr/share/misc/pci.ids.gz + make OPT="${CFLAGS} -D_GNU_SOURCE=1" SHARED=no || Fdie Ffilerel lib/libpci.a /usr/lib/ Ffileschmod usr/lib/libpci.so.$pkgver 0755 Fln libpci.so.$pkgver /usr/lib/libpci.so + Frm /usr/share/hwdata /usr/sbin/update-pciids /usr/share/man/man8/update-pciids.8 } # optimization OK diff --git a/source/base/pciutils/makefile.patch b/source/base/pciutils/makefile.patch new file mode 100644 index 0000000..51a3ebc --- /dev/null +++ b/source/base/pciutils/makefile.patch @@ -0,0 +1,27 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2012-08-19 20:58:07.262612478 -0500 ++++ b/Makefile 2012-08-19 21:03:46.712239866 -0500 +@@ -13,7 +13,7 @@ + CROSS_COMPILE= + + # Support for compressed pci.ids (yes/no, default: detect) +-ZLIB= ++ZLIB=no + + # Support for resolving ID's by DNS (yes/no, default: detect) + DNS= +@@ -25,11 +25,11 @@ + ABI_VERSION=.3 + + # Installation directories +-PREFIX=/usr/local ++PREFIX=/usr + SBINDIR=$(PREFIX)/sbin +-SHAREDIR=$(PREFIX)/share ++SHAREDIR=$(PREFIX)/share/hwdata + IDSDIR=$(SHAREDIR) +-MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) ++MANDIR:=$(PREFIX)/share/man + INCDIR=$(PREFIX)/include + LIBDIR=$(PREFIX)/lib + PKGCFDIR=$(LIBDIR)/pkgconfig diff --git a/source/base/pciutils/pciutils-2.2.1-fix-pciids-path.patch b/source/base/pciutils/pciutils-2.2.1-fix-pciids-path.patch deleted file mode 100644 index e124d73..0000000 --- a/source/base/pciutils/pciutils-2.2.1-fix-pciids-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pciutils-2.2.1.orig/Makefile pciutils-2.2.1/Makefile ---- pciutils-2.2.1.orig/Makefile 2005-11-26 16:59:24.963713000 +0100 -+++ pciutils-2.2.1/Makefile 2005-11-26 17:00:09.758512500 +0100 -@@ -10,7 +10,7 @@ - PREFIX=/usr/local - SBINDIR=$(PREFIX)/sbin - SHAREDIR=$(PREFIX)/share --IDSDIR=$(SHAREDIR) -+IDSDIR=$(SHAREDIR)/misc - MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) - INSTALL=install - DIRINSTALL=install -d _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
