SOURCES: pciutils-pci_h.patch, pciutils-pcimodules.patch - updated

[arekm]

Author: arekm                        Date: Wed Sep 21 20:14:50 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   pciutils-pci_h.patch (1.2 -> 1.3) , pciutils-pcimodules.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/pciutils-pci_h.patch
diff -u SOURCES/pciutils-pci_h.patch:1.2 SOURCES/pciutils-pci_h.patch:1.3
--- SOURCES/pciutils-pci_h.patch:1.2	Thu Jan 16 21:42:52 2003
+++ SOURCES/pciutils-pci_h.patch	Wed Sep 21 22:14:44 2005
@@ -1,30 +1,35 @@
 --- pciutils/pciutils.h.orig	Sat Mar 30 16:39:24 2002
 +++ pciutils/pciutils.h	Sun Aug 18 21:51:27 2002
-@@ -8,7 +8,7 @@
+@@ -6,8 +6,8 @@
   *	Can be freely distributed and used under the terms of the GNU GPL.
   */
  
 -#include "lib/pci.h"
+-#include "lib/sysdep.h"
 +#include "pci/pci.h"
++#include "pci/sysdep.h"
  
- #define PCIUTILS_VERSION PCILIB_VERSION
- 
---- pciutils-2.1.11/Makefile.orig	Sun Aug 18 21:53:49 2002
-+++ pciutils-2.1.11/Makefile	Sun Aug 18 21:55:46 2002
-@@ -35,12 +35,15 @@
- 
- all: lib lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
- 
--lib: lib/config.h
-+lib: lib/config.h pci/config.h
- 	$(MAKE) -C lib all
- 
+ #ifdef PCI_OS_WINDOWS
+ #include "compat/getopt.h"
+--- pciutils/Makefile.org	2005-09-21 21:52:22.329188000 +0200
++++ pciutils/Makefile	2005-09-21 21:53:09.760152250 +0200
+@@ -15,7 +15,7 @@
+ INSTALL=install
+ DIRINSTALL=install -d
+ PCILIB=lib/libpci.a
+-PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
++PCIINC=pci/config.h lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
+ 
+ ifeq ($(shell uname),NetBSD)
+ PCILIB=libpciutils.a
+@@ -43,6 +43,9 @@
  lib/config.h:
- 	cd lib && ./configure $(SHAREDIR) $(VERSION)
+ 	cd lib && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
  
 +pci/config.h:
-+	cd pci && ./configure $(SHAREDIR) $(VERSION)
++	cd pci && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
 +
- lspci: lspci.o common.o lib/$(PCILIB)
- setpci: setpci.o common.o lib/$(PCILIB)
+ lspci: lspci.o common.o $(PCILIB)
+ setpci: setpci.o common.o $(PCILIB)
  
+

================================================================
Index: SOURCES/pciutils-pcimodules.patch
diff -u SOURCES/pciutils-pcimodules.patch:1.1 SOURCES/pciutils-pcimodules.patch:1.2
--- SOURCES/pciutils-pcimodules.patch:1.1	Sun Jul 13 00:54:25 2003
+++ SOURCES/pciutils-pcimodules.patch	Wed Sep 21 22:14:44 2005
@@ -1,21 +1,21 @@
 --- pciutils-2.1.11/Makefile.pix	2003-01-04 13:53:01.000000000 +0100
 +++ pciutils-2.1.11/Makefile	2003-01-04 23:06:36.000000000 +0100
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
  
  export
  
--all: lib lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
-+all: lib lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
+-all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
++all: $(PCILIB) lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
  
- lib: lib/config.h
+ $(PCILIB): $(PCIINC) force
  	$(MAKE) -C lib all
-@@ -39,6 +39,7 @@
+@@ -43,6 +43,7 @@
  lib/config.h:
- 	cd lib && ./configure $(SHAREDIR) $(VERSION)
+ 	cd lib && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
  
-+pcimodules: pcimodules.o common.o lib/$(PCILIB)
- lspci: lspci.o common.o lib/$(PCILIB)
- setpci: setpci.o common.o lib/$(PCILIB)
++pcimodules: pcimodules.o common.o $(PCILIB)
+ lspci: lspci.o common.o $(PCILIB)
+ setpci: setpci.o common.o $(PCILIB)
  
 --- pciutils-2.1.11/pcimodules.c.pix	2003-01-04 23:06:00.000000000 +0100
 +++ pciutils-2.1.11/pcimodules.c	2003-01-04 23:06:00.000000000 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pciutils-pci_h.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/pciutils-pcimodules.patch?r1=1.1&r2=1.2&f=u