ports/116827: sysutils/pciutils: update to 2.2.6 and unbreak for FreeBSD >= 700053

Marius Strobl marius at FreeBSD.org
Tue Oct 2 13:40:04 UTC 2007 

>Number:         116827
>Category:       ports
>Synopsis:       sysutils/pciutils: update to 2.2.6 and unbreak for FreeBSD >= 700053
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 02 13:40:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Marius Strobl
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD alchemy.franken.de 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Sep 20 00:06:13 CEST 2007 root at alchemy.franken.de:/tmp/obj/usr/src/sys/alchemy i386


>Description:
	- Update to 2.2.6.
	- Teach about support for PCI domains in FreeBSD >= 700053.
	- Stop including pcivar.h from the kernel source on FreeBSD => 430000,
	  if this was ever necessary it no longer is since the introduction
	  of pciio.h.
>How-To-Repeat:
>Fix:

--- pciutils.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/sysutils/pciutils/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	7 Mar 2007 05:40:28 -0000	1.9
+++ Makefile	2 Oct 2007 11:20:48 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pciutils
-PORTVERSION=	2.2.3
+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/ \
@@ -20,18 +20,6 @@
 
 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
Index: distinfo
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/sysutils/pciutils/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	10 Dec 2006 22:47:14 -0000	1.4
+++ distinfo	2 Oct 2007 10:52:20 -0000
@@ -1,3 +1,3 @@
-MD5 (pciutils-2.2.3.tar.gz) = 39747279aad46e7a6a3e1ea636d055b4
-SHA256 (pciutils-2.2.3.tar.gz) = e501df7734738d0625a3765498e1c4625a2fbaf408c86599eca2070c57bc4d4b
-SIZE (pciutils-2.2.3.tar.gz) = 1121334
+MD5 (pciutils-2.2.6.tar.gz) = e26593ab38ef9ae4457826be9e35aff8
+SHA256 (pciutils-2.2.6.tar.gz) = 30019fa23996429d3bedaa1b30e32b9ddcd2eaa4fe39ec015d533af6afc0ee6b
+SIZE (pciutils-2.2.6.tar.gz) = 226049
Index: files/patch-Makefile
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/sysutils/pciutils/files/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- files/patch-Makefile	10 Dec 2006 22:47:15 -0000	1.3
+++ files/patch-Makefile	2 Oct 2007 12:45:34 -0000
@@ -1,24 +1,17 @@
 --- Makefile.orig	Fri May  5 21:46:32 2006
 +++ Makefile	Mon Nov 27 22:12:24 2006
-@@ -1,19 +1,16 @@
+@@ -1,13 +1,11 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2006 Martin Mares <mj at ucw.cz>
+ # (c) 1998--2007 Martin Mares <mj at 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
+-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS+=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=2.2.3
- DATE=2006-05-05
+ 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
- 
Index: files/patch-lib::fbsd-device.c
===================================================================
RCS file: files/patch-lib::fbsd-device.c
diff -N files/patch-lib::fbsd-device.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-lib::fbsd-device.c	2 Oct 2007 12:43:53 -0000
@@ -0,0 +1,37 @@
+--- 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;
Index: files/patch-lspci.c
===================================================================
RCS file: files/patch-lspci.c
diff -N files/patch-lspci.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-lspci.c	2 Oct 2007 11:25:09 -0000
@@ -0,0 +1,14 @@
+--- 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
--- pciutils.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list