5 files changed, 32 insertions, 75 deletions

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index b37d87c620cd..4a44b8cacd07 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	pciutils
-PORTVERSION=	2.1.11
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.kerneled.org/files/FreeBSD-ports/ \
-		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
-		ftp://ftp.kernel.org/pub/software/utils/pciutils/
+MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
+		ftp://ftp.kernel.org/pub/software/utils/pciutils/ \
+		ftp://metalab.unc.edu/pub/Linux/hardware/
 
 MAINTAINER=	samy@kerneled.org
 COMMENT=	PCI configuration utilities
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	LANG=C
 
 MAN8=		lspci.8 setpci.8 update-pciids.8
 
-pre-everything::
+pre-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "              W  A  R  N  I  N  G"
 	@${ECHO_MSG} "************************************************"
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index ecbd5f03d5d0..dd8f0b5cb52d 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,2 +1,3 @@
-MD5 (pciutils-2.1.11.tar.bz2) = 2b3b2147b7bc91f362be55cb49fa1c4e
-SIZE (pciutils-2.1.11.tar.bz2) = 110036
+MD5 (pciutils-2.2.0.tar.gz) = 303fc4bb9669549acf65e4a714527c7e
+SHA256 (pciutils-2.2.0.tar.gz) = 9eab846b46e07080c5eb7a843a8d8f30d493bca22eb0a36d5c5dc39d426cd43e
+SIZE (pciutils-2.2.0.tar.gz) = 194290
diff --git a/sysutils/pciutils/files/patch-Makefile b/sysutils/pciutils/files/patch-Makefile
index a17952c2b73a..37c09f182b26 100644
--- a/sysutils/pciutils/files/patch-Makefile
+++ b/sysutils/pciutils/files/patch-Makefile
@@ -1,13 +1,24 @@
---- Makefile.orig	Sat Jan  4 15:53:01 2003
-+++ Makefile	Fri Jun 13 21:20:28 2003
-@@ -2,9 +2,7 @@
- # Makefile for Linux PCI Utilities
- # (c) 1998--2003 Martin Mares <mj@ucw.cz>
- 
--OPT=-O2 -fomit-frame-pointer
--#OPT=-O2 -g
--CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes
-+CFLAGS += -Wall -W -Wno-parentheses -Wstrict-prototypes
- 
- VERSION=2.1.11
- #SUFFIX=-pre2
+--- Makefile.orig	Wed Sep 21 09:04:54 2005
++++ Makefile	Wed Nov 23 00:11:07 2005
+@@ -1,19 +1,16 @@
+ # Makefile for The PCI Utilities
+ # (c) 1998--2005 Martin Mares <mj@ucw.cz>
+ 
+-OPT=-O2
+-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
++CFLAGS+= -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
+ 
+ VERSION=2.2.0
+ DATE=2005-09-21
+ 
+-PREFIX=/usr/local
+ SBINDIR=$(PREFIX)/sbin
+ SHAREDIR=$(PREFIX)/share
+ IDSDIR=$(SHAREDIR)
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+-INSTALL=install
+-DIRINSTALL=install -d
++DIRINSTALL=$(INSTALL) -d
+ PCILIB=lib/libpci.a
+ PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
+ 
diff --git a/sysutils/pciutils/files/patch-lib::Makefile b/sysutils/pciutils/files/patch-lib::Makefile
deleted file mode 100644
index 31a456ec119b..000000000000
--- a/sysutils/pciutils/files/patch-lib::Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/Makefile.orig	Thu Dec 26 22:28:33 2002
-+++ lib/Makefile	Thu Jun 12 02:46:13 2003
-@@ -28,6 +28,9 @@
- ifdef HAVE_PM_FBSD_DEVICE
- OBJS += fbsd-device.o
- CFLAGS += -I/usr/src/sys
-+ifdef FREEBSD_SYS
-+CFLAGS += -I${FREEBSD_SYS}
-+endif
- endif
- 
- ifdef HAVE_PM_AIX_DEVICE
diff --git a/sysutils/pciutils/files/patch-lib::fbsd-device.c b/sysutils/pciutils/files/patch-lib::fbsd-device.c
deleted file mode 100644
index 5558cdd99578..000000000000
--- a/sysutils/pciutils/files/patch-lib::fbsd-device.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- lib/fbsd-device.c.orig	Tue Jul 20 07:01:31 1999
-+++ lib/fbsd-device.c	Tue Apr 12 10:49:09 2005
-@@ -13,10 +13,21 @@
- 
- #include <fcntl.h>
- #include <string.h>
-+#include <errno.h>
- #include <unistd.h>
-+#include <osreldate.h>
- 
--#include <pci/pcivar.h>
--#include <pci/pci_ioctl.h>
-+#if __FreeBSD_version < 500000
-+#  include <pci/pcivar.h>
-+#else
-+#  include <dev/pci/pcivar.h>
-+#endif
-+
-+#if __FreeBSD_version < 430000
-+#  include <pci/pci_ioctl.h>
-+#else
-+#  include <sys/pciio.h>
-+#endif
- 
- #include "internal.h"
- 
-@@ -75,8 +86,12 @@
-   pi.pi_reg = pos;
-   pi.pi_width = len;
- 	
--  if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0)
--    d->access->error("fbsd_read: ioctl(PCIOCREAD) failed");
-+  if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0) {
-+    if (errno == ENODEV)
-+      return 0;
-+    else
-+      d->access->error("fbsd_read: ioctl(PCIOCREAD) failed");
-+  }
-   
-   switch (len)
-     {