Update to 3.3.0:

	* Device names exported by BIOS are displayed on Linux.

	* On Linux systems, HWDB is used to look up device names
	  when our ID database gives no match. (More precisely,
	  HWDB is consulted after local pci.ids, but before using
	  network to query online pci.ids.) Thanks to Tom Gundersen
	  for the initial patch.

	* Added experimental back-end for OS X / Darwin. Thanks to
	  Richard Yao for providing it.

	* Filters now support matching by device class. Original
	  patch by Matthew Wilcox, wrappers for ABI compatibility
	  by me.

	* Interrupt Pin and Interrupt Line registers are displayed
	  for bridge devices, too.

	* Several portability bugs have been fixed.

	* Several typos have been fixed. Also, use of questionable
	  constructs in man pages has been reduced.

	* PCIe link capabilities now include the ASPMOptComp bit.

	* The "CRS Software Visibility" bit is now decoded properly.

	* Updated pci.ids to the current snapshot of the database.

5 files changed, 25 insertions, 29 deletions

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index d3c44379417..ec2374c4801 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2014/05/25 07:15:40 msaitoh Exp $
+# $NetBSD: Makefile,v 1.24 2014/11/27 11:45:56 msaitoh Exp $
 
-DISTNAME=	pciutils-3.2.1
+DISTNAME=	pciutils-3.3.0
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 		ftp://ftp.kernel.org/pub/software/utils/pciutils/
diff --git a/sysutils/pciutils/PLIST b/sysutils/pciutils/PLIST
index 2b249356c6f..40a9a8d760f 100644
--- a/sysutils/pciutils/PLIST
+++ b/sysutils/pciutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/11/27 11:45:56 msaitoh Exp $
 include/pciutils/config.h
 include/pciutils/header.h
 include/pciutils/pci.h
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index 333bfaa82cc..bd84640b934 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2014/06/09 04:06:59 rodent Exp $
+$NetBSD: distinfo,v 1.16 2014/11/27 11:45:56 msaitoh Exp $
 
-SHA1 (pciutils-3.2.1.tar.gz) = 06a92123907d717efb703c3e90a0c46e1d0beef4
-RMD160 (pciutils-3.2.1.tar.gz) = d7e6a710e78d2acad54832bcedb3acf50e4902fb
-Size (pciutils-3.2.1.tar.gz) = 367046 bytes
-SHA1 (patch-aa) = f7e5af330d728ed262469349366df507b8b9cfd6
-SHA1 (patch-ab) = 1448bb418cdc908eb6652cc98994d23d0d78cea0
+SHA1 (pciutils-3.3.0.tar.gz) = cb1ad848c3a4384a43b5e516fb72e0aa6eb3d380
+RMD160 (pciutils-3.3.0.tar.gz) = 0a48d5327279a8eb1ba7e85740b6d9da01dc5525
+Size (pciutils-3.3.0.tar.gz) = 419917 bytes
+SHA1 (patch-aa) = 7be11cd0eff91f6fe51d795fa7b9e05fdefb038d
+SHA1 (patch-ab) = 8837e3a6e6c87802614b50ac511d1c1b7375b908
 SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
 SHA1 (patch-ad) = bfe9069e96fd46798afec73c93ad71db3a0e0e37
diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa
index fdbe9dc8a4e..d5cec29aef8 100644
--- a/sysutils/pciutils/patches/patch-aa
+++ b/sysutils/pciutils/patches/patch-aa
@@ -1,17 +1,15 @@
-$Id: patch-aa,v 1.10 2014/06/09 04:05:34 rodent Exp $
-
---- Makefile.orig	2013-11-10 21:22:09.000000000 +0900
-+++ Makefile	2014-05-22 18:50:07.000000000 +0900
+--- Makefile.orig	2014-11-10 22:37:47.000000000 +0900
++++ Makefile	2014-11-26 14:10:21.000000000 +0900
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2013 Martin Mares <mj@ucw.cz>
+ # (c) 1998--2014 Martin Mares <mj@ucw.cz>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.2.1
- DATE=2013-11-10
+ VERSION=3.3.0
+ DATE=2014-11-10
 @@ -13,7 +12,7 @@
  CROSS_COMPILE=
  
@@ -21,7 +19,7 @@ $Id: patch-aa,v 1.10 2014/06/09 04:05:34 rodent Exp $
  
  # Support for resolving ID's by DNS (yes/no, default: detect)
  DNS=
-@@ -26,23 +25,23 @@
+@@ -29,23 +28,23 @@
  
  # ABI version suffix in the name of the shared library
  # (as we use proper symbol versioning, this seldom needs changing)
@@ -54,7 +52,7 @@ $Id: patch-aa,v 1.10 2014/06/09 04:05:34 rodent Exp $
  AR=$(CROSS_COMPILE)ar
  RANLIB=$(CROSS_COMPILE)ranlib
  
-@@ -107,12 +106,18 @@
+@@ -110,12 +109,18 @@
  
  install: all
  # -c is ignored on Linux, but required on FreeBSD
@@ -77,9 +75,9 @@ $Id: patch-aa,v 1.10 2014/06/09 04:05:34 rodent Exp $
 +	done
 +	$(BSD_INSTALL_MAN) pcilib.7 $(DESTDIR)$(MANDIR)/man7
  ifeq ($(SHARED),yes)
- 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
- endif
-@@ -122,13 +127,14 @@
+ ifeq ($(LIBEXT),dylib)
+ 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
+@@ -129,13 +134,14 @@
  endif
  
  install-pcilib: lib/$(PCILIB)
@@ -97,5 +95,5 @@ $Id: patch-aa,v 1.10 2014/06/09 04:05:34 rodent Exp $
 +	$(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR)
 +	$(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
  ifeq ($(SHARED),yes)
- 	ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
- endif
+ ifeq ($(LIBEXT),dylib)
+ 	ln -sf $(LIBNAME)$(ABI_VERSION).$(LIBEXT) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT)
diff --git a/sysutils/pciutils/patches/patch-ab b/sysutils/pciutils/patches/patch-ab
index 3d875460b5d..e2b7cf3a86f 100644
--- a/sysutils/pciutils/patches/patch-ab
+++ b/sysutils/pciutils/patches/patch-ab
@@ -1,9 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2008/11/03 22:01:29 bjs Exp $
-
---- lib/configure.orig	2008-09-19 14:04:37.000000000 -0400
-+++ lib/configure
-@@ -179,7 +179,7 @@ else
- 		echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)'
+--- lib/configure.orig	2014-11-02 19:09:25.000000000 +0900
++++ lib/configure	2014-11-26 14:15:03.000000000 +0900
+@@ -260,7 +260,7 @@
+ 		echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
  	fi
  fi
 -echo >>$m 'PCILIBPC=$(LIBNAME).pc'