ports/88548: update sysutils/pciutils to 2.2.0
Andrew Pantyukhin
sat at proxy.gubkin.ru
Sun Nov 6 15:00:29 UTC 2005
>Number: 88548
>Category: ports
>Synopsis: update sysutils/pciutils to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 06 15:00:27 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD proxy.gubkin.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Thu Nov 3 19:20:06 MSK 2005 sat at proxy.gubkin.ru:/usr/obj/usr/src/sys/SPG6 i386
>Description:
- Update to 2.2.0
>How-To-Repeat:
>Fix:
--- pciutils.diff begins here ---
diff -urN /usr/ports/sysutils/pciutils/Makefile pciutils/Makefile
--- /usr/ports/sysutils/pciutils/Makefile Sun May 23 13:47:35 2004
+++ pciutils/Makefile Sun Nov 6 17:50:58 2005
@@ -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 at 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 -urN /usr/ports/sysutils/pciutils/distinfo pciutils/distinfo
--- /usr/ports/sysutils/pciutils/distinfo Sun Mar 21 00:03:38 2004
+++ pciutils/distinfo Sun Nov 6 16:51:17 2005
@@ -1,2 +1,2 @@
-MD5 (pciutils-2.1.11.tar.bz2) = 2b3b2147b7bc91f362be55cb49fa1c4e
-SIZE (pciutils-2.1.11.tar.bz2) = 110036
+MD5 (pciutils-2.2.0.tar.gz) = 303fc4bb9669549acf65e4a714527c7e
+SIZE (pciutils-2.2.0.tar.gz) = 194290
diff -urN /usr/ports/sysutils/pciutils/files/patch-Makefile pciutils/files/patch-Makefile
--- /usr/ports/sysutils/pciutils/files/patch-Makefile Fri Jun 13 22:48:01 2003
+++ pciutils/files/patch-Makefile Sun Nov 6 17:34:50 2005
@@ -1,13 +1,25 @@
---- 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 at ucw.cz>
+--- 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 at 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 -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
diff -urN /usr/ports/sysutils/pciutils/files/patch-lib::Makefile pciutils/files/patch-lib::Makefile
--- /usr/ports/sysutils/pciutils/files/patch-lib::Makefile Fri Jun 13 22:48:01 2003
+++ pciutils/files/patch-lib::Makefile Thu Jan 1 03:00:00 1970
@@ -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 -urN /usr/ports/sysutils/pciutils/files/patch-lib::fbsd-device.c pciutils/files/patch-lib::fbsd-device.c
--- /usr/ports/sysutils/pciutils/files/patch-lib::fbsd-device.c Wed Apr 13 23:13:46 2005
+++ pciutils/files/patch-lib::fbsd-device.c Thu Jan 1 03:00:00 1970
@@ -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)
- {
--- pciutils.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list