Attachment #81587 for bug #116827

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




#

PORTNAME=	pciutils
PORTVERSION=	2.2.6
CATEGORIES=	sysutils
MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
		ftp://ftp.kernel.org/pub/software/utils/pciutils/ \


MAN8=		lspci.8 setpci.8 update-pciids.8

pre-configure:
	@${ECHO_MSG} ""
	@${ECHO_MSG} "              W  A  R  N  I  N  G"
	@${ECHO_MSG} "************************************************"
	@${ECHO_MSG} "* pciutils 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} ""

do-install:
	@${INSTALL_MAN} ${WRKSRC}/lspci.8 ${PREFIX}/man/man8
	@${INSTALL_MAN} ${WRKSRC}/setpci.8 ${PREFIX}/man/man8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (pciutils-2.2.3.tar.gz) = 39747279aad46e7a6a3e1ea636d055b4	1	MD5 (pciutils-2.2.6.tar.gz) = e26593ab38ef9ae4457826be9e35aff8
2	SHA256 (pciutils-2.2.3.tar.gz) = e501df7734738d0625a3765498e1c4625a2fbaf408c86599eca2070c57bc4d4b	2	SHA256 (pciutils-2.2.6.tar.gz) = 30019fa23996429d3bedaa1b30e32b9ddcd2eaa4fe39ec015d533af6afc0ee6b
3	SIZE (pciutils-2.2.3.tar.gz) = 1121334	3	SIZE (pciutils-2.2.6.tar.gz) = 226049




--- Makefile.orig	Fri May  5 21:46:32 2006
+++ Makefile	Mon Nov 27 22:12:24 2006
@@ -1,13 +1,11 @@
 # Makefile for The PCI Utilities
 # (c) 1998--2007 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=2.2.6
 DATE=2007-06-20
 
-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
 




--- lib/fbsd-device.c.orig	Tue Jul 20 07:01:31 1999
+++ lib/fbsd-device.c	Tue Apr 12 10:49:09 2005
@@ -19,13 +19,8 @@
 #  endif
 #endif
 
-#if __FreeBSD_version < 500000
-#  include <pci/pcivar.h>
-#else
-#  include <dev/pci/pcivar.h>
-#endif
-
 #if __FreeBSD_version < 430000
+#  include <pci/pcivar.h>
 #  include <pci/pci_ioctl.h>
 #else
 #  include <sys/pciio.h>
@@ -84,6 +79,9 @@
   if (pos >= 256)
     return 0;
 
+#if __FreeBSD_version >= 700053
+  pi.pi_sel.pc_domain = d->domain;
+#endif
   pi.pi_sel.pc_bus = d->bus;
   pi.pi_sel.pc_dev = d->dev;
   pi.pi_sel.pc_func = d->func;
@@ -122,6 +120,9 @@
   if (pos >= 256)
     return 0;
 
+#if __FreeBSD_version >= 700053
+  pi.pi_sel.pc_domain = d->domain;
+#endif
   pi.pi_sel.pc_bus = d->bus;
   pi.pi_sel.pc_dev = d->dev;
   pi.pi_sel.pc_func = d->func;




--- lspci.c.orig	Fri Mar 30 11:56:35 2007
+++ lspci.c	Tue Oct  2 13:24:51 2007
@@ -58,8 +58,9 @@
  *  This increases our memory footprint, but only slightly since we don't
  *  use alloca() much.
  */
-
-#ifdef __GNUC__
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__)
+/* alloca() is defined in stdlib.h */
+#elif defined(__GNUC__) && !defined(PCI_OS_WINDOWS)
 #include <alloca.h>
 #else
 #undef alloca

Return to bug 116827

Lines 6-12 Link Here

(-)Makefile (-13 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pciutils	8	PORTNAME= pciutils
9	PORTVERSION= 2.2.3	9	PORTVERSION= 2.2.6
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \	11	MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
12	ftp://ftp.kernel.org/pub/software/utils/pciutils/ \	12	ftp://ftp.kernel.org/pub/software/utils/pciutils/ \
Lines 20-37 Link Here
20		20
21	MAN8= lspci.8 setpci.8 update-pciids.8	21	MAN8= lspci.8 setpci.8 update-pciids.8
22		22
23	pre-configure:
24	@${ECHO_MSG} ""
25	@${ECHO_MSG} " W A R N I N G"
26	@${ECHO_MSG} "************************************************"
27	@${ECHO_MSG} "* pciutils requires that you have your kernel *"
28	@${ECHO_MSG} "* sources installed. If your kernel sources *"
29	@${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *"
30	@${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *"
31	@${ECHO_MSG} "* correct path. *"
32	@${ECHO_MSG} "************************************************"
33	@${ECHO_MSG} ""
34
35	do-install:	23	do-install:
36	@${INSTALL_MAN} ${WRKSRC}/lspci.8 ${PREFIX}/man/man8	24	@${INSTALL_MAN} ${WRKSRC}/lspci.8 ${PREFIX}/man/man8
37	@${INSTALL_MAN} ${WRKSRC}/setpci.8 ${PREFIX}/man/man8	25	@${INSTALL_MAN} ${WRKSRC}/setpci.8 ${PREFIX}/man/man8

Lines 1-24 Link Here

(-)files/patch-Makefile (-13 / +6 lines)
1	--- Makefile.orig Fri May 5 21:46:32 2006	1	--- Makefile.orig Fri May 5 21:46:32 2006
2	+++ Makefile Mon Nov 27 22:12:24 2006	2	+++ Makefile Mon Nov 27 22:12:24 2006
3	@@ -1,19 +1,16 @@	3	@@ -1,13 +1,11 @@
4	# Makefile for The PCI Utilities	4	# Makefile for The PCI Utilities
5	# (c) 1998--2006 Martin Mares <mj@ucw.cz>	5	# (c) 1998--2007 Martin Mares <mj@ucw.cz>
6		6
7	-OPT=-O2	7	-OPT=-O2
8	-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline	8	-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
9	+CFLAGS+= -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline	9	+CFLAGS+=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
10		10
11	VERSION=2.2.3	11	VERSION=2.2.6
12	DATE=2006-05-05	12	DATE=2007-06-20
13		13
14	-PREFIX=/usr/local	14	-PREFIX=/usr/local
15	SBINDIR=$(PREFIX)/sbin	15	SBINDIR=$(PREFIX)/sbin
16	SHAREDIR=$(PREFIX)/share	16	SHAREDIR=$(PREFIX)/share
17	IDSDIR=$(SHAREDIR)	17	IDSDIR=$(SHAREDIR)
18	MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
19	-INSTALL=install
20	-DIRINSTALL=install -d
21	+DIRINSTALL=$(INSTALL) -d
22	PCILIB=lib/libpci.a
23	PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
24

Added Link Here

(-)files/patch-lib::fbsd-device.c (+37 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	@@ -19,13 +19,8 @@
4	# endif
5	#endif
6
7	-#if __FreeBSD_version < 500000
8	-# include <pci/pcivar.h>
9	-#else
10	-# include <dev/pci/pcivar.h>
11	-#endif
12	-
13	#if __FreeBSD_version < 430000
14	+# include <pci/pcivar.h>
15	# include <pci/pci_ioctl.h>
16	#else
17	# include <sys/pciio.h>
18	@@ -84,6 +79,9 @@
19	if (pos >= 256)
20	return 0;
21
22	+#if __FreeBSD_version >= 700053
23	+ pi.pi_sel.pc_domain = d->domain;
24	+#endif
25	pi.pi_sel.pc_bus = d->bus;
26	pi.pi_sel.pc_dev = d->dev;
27	pi.pi_sel.pc_func = d->func;
28	@@ -122,6 +120,9 @@
29	if (pos >= 256)
30	return 0;
31
32	+#if __FreeBSD_version >= 700053
33	+ pi.pi_sel.pc_domain = d->domain;
34	+#endif
35	pi.pi_sel.pc_bus = d->bus;
36	pi.pi_sel.pc_dev = d->dev;
37	pi.pi_sel.pc_func = d->func;

Added Link Here

(-)files/patch-lspci.c (+14 lines)
1	--- lspci.c.orig Fri Mar 30 11:56:35 2007
2	+++ lspci.c Tue Oct 2 13:24:51 2007
3	@@ -58,8 +58,9 @@
4	* This increases our memory footprint, but only slightly since we don't
5	* use alloca() much.
6	*/
7	-
8	-#ifdef __GNUC__
9	+#if defined (__FreeBSD__) \|\| defined (__NetBSD__) \|\| defined (__OpenBSD__) \|\| defined (__DragonFly__)
10	+/* alloca() is defined in stdlib.h */
11	+#elif defined(__GNUC__) && !defined(PCI_OS_WINDOWS)
12	#include <alloca.h>
13	#else
14	#undef alloca