Base on pcutils 2.2.8 so it gets the fixes and enhancements originally done

as local patches in pciutils-2.2.6 (see sysutils/pciutils/Makefile 1.10).

Approved by:	maintainer, miwi

7 files changed, 38 insertions, 78 deletions

diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 530f0e03d31c..0a6c8bb2cea1 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -6,44 +6,33 @@
 #
 
 PORTNAME=	libpci
-PORTVERSION=	2.1.11
-PORTREVISION=	2
+PORTVERSION=	2.2.8
 CATEGORIES=	devel
-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/
 DISTNAME=	pciutils-${PORTVERSION}
 
 MAINTAINER=	sbahra@gwu.edu
 COMMENT=	PCI configuration space I/O made easy
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 INSTALLS_SHLIB=	yes
-ALL_TARGET=	lib
 MAKE_ENV=	LANG=C
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "              W  A  R  N  I  N  G"
-	@${ECHO_MSG} "************************************************"
-	@${ECHO_MSG} "* libpci requires that you have your kernel    *"
-	@${ECHO_MSG} "* sources installed. If your kernel sources    *"
-	@${ECHO_MSG} "* are somewhere other than /usr/src/sys, you   *"
-	@${ECHO_MSG} "* may set the FREEBSD_SYS variable to the      *"
-	@${ECHO_MSG} "* correct path.                                *"
-	@${ECHO_MSG} "************************************************"
-	@${ECHO_MSG} ""
+ALL_TARGET=	lib/libpci.a
 
 post-build:
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/pci.h
 
 do-install:
-	@(${CP} ${WRKSRC}/lib/libpci.so ${PREFIX}/lib/libpci.so.2)
-	@(${CP} ${WRKSRC}/lib/libpci.a  ${PREFIX}/lib/libpci.a)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/libpci.so ${PREFIX}/lib/libpci.so.2)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/libpci.a ${PREFIX}/lib/libpci.a)
 	@(${LN} -sf ${PREFIX}/lib/libpci.so.2.1 ${PREFIX}/lib/libpci.so)
 	@(${MKDIR} ${PREFIX}/include/pci)
-	@(${CP} ${WRKSRC}/lib/pci.h ${PREFIX}/include/pci/pci.h)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/config.h ${PREFIX}/include/pci/config.h)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/header.h ${PREFIX}/include/pci/header.h)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/pci.h ${PREFIX}/include/pci/pci.h)
+	@(${INSTALL_DATA} ${WRKSRC}/lib/types.h ${PREFIX}/include/pci/types.h)
 
 .include <bsd.port.mk>
diff --git a/devel/libpci/distinfo b/devel/libpci/distinfo
index a6d44eccd5e4..700d6e67cc90 100644
--- a/devel/libpci/distinfo
+++ b/devel/libpci/distinfo
@@ -1,3 +1,3 @@
-MD5 (pciutils-2.1.11.tar.bz2) = 2b3b2147b7bc91f362be55cb49fa1c4e
-SHA256 (pciutils-2.1.11.tar.bz2) = 8817295a7db11f31837c7c23f49e768131700b2b729d9fc724520d94a8b00f4b
-SIZE (pciutils-2.1.11.tar.bz2) = 110036
+MD5 (pciutils-2.2.8.tar.gz) = c0b742521a13ef624b9a0a237f46c1c8
+SHA256 (pciutils-2.2.8.tar.gz) = 8bdbcac28a80e05799c3e788bbb24417059537aff53b8bf16c7c8e08b3979fa2
+SIZE (pciutils-2.2.8.tar.gz) = 232602
diff --git a/devel/libpci/files/patch-Makefile b/devel/libpci/files/patch-Makefile
index a17952c2b73a..0cd7f29d888a 100644
--- a/devel/libpci/files/patch-Makefile
+++ b/devel/libpci/files/patch-Makefile
@@ -1,13 +1,12 @@
 --- 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>
+@@ -1,8 +1,7 @@
+ # Makefile for The PCI Utilities
+ # (c) 1998--2007 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
+-OPT=-O2
+-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS+=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=2.1.11
- #SUFFIX=-pre2
+ VERSION=2.2.8
+ DATE=2007-10-19
diff --git a/devel/libpci/files/patch-lib::Makefile b/devel/libpci/files/patch-lib::Makefile
index c983317cb17a..bb36c6e22827 100644
--- a/devel/libpci/files/patch-lib::Makefile
+++ b/devel/libpci/files/patch-lib::Makefile
@@ -1,20 +1,10 @@
 --- lib/Makefile.orig	Thu Dec 26 22:28:33 2002
 +++ lib/Makefile	Sat Jun 28 05:39:36 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
-@@ -49,6 +52,7 @@
+@@ -56,6 +56,7 @@
  	rm -f $@
- 	ar rcs $@ $^
- 	ranlib $@
-+	gcc $(CFLAGS) -shared $@ -o libpci.so
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
++	$(CC) $(CFLAGS) -shared $@ -o libpci.so
  
- access.o: access.c $(INCL)
- i386-ports.o: i386-ports.c $(INCL)
+ $(PCILIBPC): $(PCILIBPC).in
+ 	sed <$< >$@ -e 's,@PREFIX@,$(PREFIX),' \
diff --git a/devel/libpci/files/patch-lib::fbsd-device.c b/devel/libpci/files/patch-lib::fbsd-device.c
deleted file mode 100644
index 1f168f55def1..000000000000
--- a/devel/libpci/files/patch-lib::fbsd-device.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- lib/fbsd-device.c.orig	Fri Jun 13 11:11:29 2003
-+++ lib/fbsd-device.c	Fri Jun 13 11:21:52 2003
-@@ -14,9 +14,19 @@
- #include <fcntl.h>
- #include <string.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"
- 
diff --git a/devel/libpci/files/pci.h b/devel/libpci/files/pci.h
index f1d60518aed4..0fe2171edf89 100644
--- a/devel/libpci/files/pci.h
+++ b/devel/libpci/files/pci.h
@@ -1,12 +1,15 @@
 --- lib/pci.h.orig	Thu Oct 30 15:57:58 2003
 +++ lib/pci.h	Thu Oct 30 16:04:23 2003
-@@ -11,8 +11,7 @@
+@@ -9,9 +9,9 @@
  #ifndef _PCI_LIB_H
  #define _PCI_LIB_H
  
 -#include "config.h"
 -#include "header.h"
-+#define OS_FREEBSD
+-#include "types.h"
++#include <pci/config.h>
++#include <pci/header.h>
++#include <pci/types.h>
+ 
+ #define PCI_LIB_VERSION 0x020204
  
- /*
-  *	Types
diff --git a/devel/libpci/pkg-plist b/devel/libpci/pkg-plist
index 9bfb242cdb34..99a57e2205ad 100644
--- a/devel/libpci/pkg-plist
+++ b/devel/libpci/pkg-plist
@@ -1,4 +1,7 @@
+include/pci/config.h
+include/pci/header.h
 include/pci/pci.h
+include/pci/types.h
 lib/libpci.a
 lib/libpci.so
 lib/libpci.so.2