ports/150236: devel/libpci lacks suitable pci.ids file

[Sten Spans]

>Number:         150236
>Category:       ports
>Synopsis:       devel/libpci lacks suitable pci.ids file
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 03 08:10:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sten Spans
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD towel.blinkenlights.nl 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	The libpci port looks for a compressed pci.ids in /usr/local/share.
	The two available versions are /usr/local/share/pciids/pci.ids (from
	misc/pciids) and /usr/local/share/pciutils/pci.ids.gz (from
	sysutils/pciutils if update-pciids has been run). So by default
	no suitable pci.ids is available in the expected location.

>How-To-Repeat:
	Install devel/libpci
>Fix:
	The supplied diff disables zlib, adds a misc/pciids dependency and
	changes the pci.ids path to /usr/local/share/pciids.

diff -Nru libpci.orig/Makefile libpci/Makefile
--- libpci.orig/Makefile	2010-08-02 14:12:13.000000000 +0200
+++ libpci/Makefile	2010-09-03 09:51:28.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	libpci
 PORTVERSION=	3.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 		${MASTER_SITE_KERNEL_ORG} \
@@ -17,6 +17,7 @@
 
 MAINTAINER=	sunpoet at sunpoet.net
 COMMENT=	PCI configuration space I/O made easy
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
 ALL_TARGET=	lib/libpci.a
 MAKE_ENV=	LANG=C
diff -Nru libpci.orig/files/patch-Makefile libpci/files/patch-Makefile
--- libpci.orig/files/patch-Makefile	2007-11-11 16:53:03.000000000 +0100
+++ libpci/files/patch-Makefile	2010-09-03 09:51:10.000000000 +0200
@@ -10,3 +10,21 @@
  
  VERSION=2.2.8
  DATE=2007-10-19
+@@ -13,7 +12,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=
+@@ -28,7 +27,7 @@
+ PREFIX=/usr/local
+ SBINDIR=$(PREFIX)/sbin
+ SHAREDIR=$(PREFIX)/share
+-IDSDIR=$(SHAREDIR)
++IDSDIR=$(SHAREDIR)/pciids
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib
>Release-Note:
>Audit-Trail:
>Unformatted: