Attachment #58803 for bug #88548

View | Details | Raw Unified | Return to bug 88548
Collapse All | Expand All




#

PORTNAME=	pciutils
PORTVERSION=	2.2.0
PORTREVISION=	1
CATEGORIES=	sysutils
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-configure::
	@${ECHO_MSG} ""
	@${ECHO_MSG} "              W  A  R  N  I  N  G"
	@${ECHO_MSG} "************************************************"

Lines 1-2 Link Here

(-)pciutils/distinfo (-2 / +2 lines)
1	MD5 (pciutils-2.1.11.tar.bz2) = 2b3b2147b7bc91f362be55cb49fa1c4e	1	MD5 (pciutils-2.2.0.tar.gz) = 303fc4bb9669549acf65e4a714527c7e
2	SIZE (pciutils-2.1.11.tar.bz2) = 110036	2	SIZE (pciutils-2.2.0.tar.gz) = 194290




--- Makefile.orig	Sun Nov  6 16:53:06 2005
+++ Makefile	Sun Nov  6 17:20:32 2005
@@ -1,19 +1,17 @@
 # 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
+OPT=	-O2
+CFLAGS+= $(OPT) -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
 
 VERSION=2.1.11
 #SUFFIX=-pre2




--- 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




--- 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)
     {

Return to bug 88548

Lines 6-28 Link Here

(-)pciutils/Makefile (-7 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= pciutils	8	PORTNAME= pciutils
9	PORTVERSION= 2.1.11	9	PORTVERSION= 2.2.0
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://www.kerneled.org/files/FreeBSD-ports/ \	11	MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
13	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \	12	ftp://ftp.kernel.org/pub/software/utils/pciutils/ \
14	ftp://ftp.kernel.org/pub/software/utils/pciutils/	13	ftp://metalab.unc.edu/pub/Linux/hardware/
15		14
16	MAINTAINER= samy@kerneled.org	15	MAINTAINER= samy@kerneled.org
17	COMMENT= PCI configuration utilities	16	COMMENT= PCI configuration utilities
18		17
19	USE_BZIP2= yes
20	USE_GMAKE= yes	18	USE_GMAKE= yes
21	MAKE_ENV= LANG=C	19	MAKE_ENV= LANG=C
22		20
23	MAN8= lspci.8 setpci.8 update-pciids.8	21	MAN8= lspci.8 setpci.8 update-pciids.8
24		22
25	pre-everything::	23	pre-configure::
26	@${ECHO_MSG} ""	24	@${ECHO_MSG} ""
27	@${ECHO_MSG} " W A R N I N G"	25	@${ECHO_MSG} " W A R N I N G"
28	@${ECHO_MSG} "************************************************"	26	@${ECHO_MSG} "************************************************"

Lines 1-13 Link Here

(-)pciutils/files/patch-Makefile (-11 / +23 lines)
1	--- Makefile.orig Sat Jan 4 15:53:01 2003	1	--- Makefile.orig Sun Nov 6 16:53:06 2005
2	+++ Makefile Fri Jun 13 21:20:28 2003	2	+++ Makefile Sun Nov 6 17:20:32 2005
3	@@ -2,9 +2,7 @@	3	@@ -1,19 +1,17 @@
4	# Makefile for Linux PCI Utilities	4	# Makefile for The PCI Utilities
5	# (c) 1998--2003 Martin Mares <mj@ucw.cz>	5	# (c) 1998--2005 Martin Mares <mj@ucw.cz>
6		6
7	-OPT=-O2 -fomit-frame-pointer	7	-OPT=-O2
8	-#OPT=-O2 -g	8	-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
9	-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes	9	+OPT= -O2
10	+CFLAGS += -Wall -W -Wno-parentheses -Wstrict-prototypes	10	+CFLAGS+= $(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
		11
		12	VERSION=2.2.0
		13	DATE=2005-09-21
		14
		15	-PREFIX=/usr/local
		16	SBINDIR=$(PREFIX)/sbin
		17	SHAREDIR=$(PREFIX)/share
		18	IDSDIR=$(SHAREDIR)
		19	MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
		20	-INSTALL=install
		21	-DIRINSTALL=install -d
		22	+DIRINSTALL=$(INSTALL) -d
		23	PCILIB=lib/libpci.a
		24	PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
11		25
12	VERSION=2.1.11
13	#SUFFIX=-pre2

Lines 1-12 Link Here

(-)pciutils/files/patch-lib::Makefile (-12 lines)
1	--- lib/Makefile.orig Thu Dec 26 22:28:33 2002
2	+++ lib/Makefile Thu Jun 12 02:46:13 2003
3	@@ -28,6 +28,9 @@
4	ifdef HAVE_PM_FBSD_DEVICE
5	OBJS += fbsd-device.o
6	CFLAGS += -I/usr/src/sys
7	+ifdef FREEBSD_SYS
8	+CFLAGS += -I${FREEBSD_SYS}
9	+endif
10	endif
11
12	ifdef HAVE_PM_AIX_DEVICE

Lines 1-41 Link Here

(-)pciutils/files/patch-lib::fbsd-device.c (-41 lines)
1	--- lib/fbsd-device.c.orig Tue Jul 20 07:01:31 1999
2	+++ lib/fbsd-device.c Tue Apr 12 10:49:09 2005
3	@@ -13,10 +13,21 @@
4
5	#include <fcntl.h>
6	#include <string.h>
7	+#include <errno.h>
8	#include <unistd.h>
9	+#include <osreldate.h>
10
11	-#include <pci/pcivar.h>
12	-#include <pci/pci_ioctl.h>
13	+#if __FreeBSD_version < 500000
14	+# include <pci/pcivar.h>
15	+#else
16	+# include <dev/pci/pcivar.h>
17	+#endif
18	+
19	+#if __FreeBSD_version < 430000
20	+# include <pci/pci_ioctl.h>
21	+#else
22	+# include <sys/pciio.h>
23	+#endif
24
25	#include "internal.h"
26
27	@@ -75,8 +86,12 @@
28	pi.pi_reg = pos;
29	pi.pi_width = len;
30
31	- if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0)
32	- d->access->error("fbsd_read: ioctl(PCIOCREAD) failed");
33	+ if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0) {
34	+ if (errno == ENODEV)
35	+ return 0;
36	+ else
37	+ d->access->error("fbsd_read: ioctl(PCIOCREAD) failed");
38	+ }
39
40	switch (len)
41	{