Add support for compressed pci.ids file via zlib.

4 files changed, 29 insertions, 13 deletions

diff --git a/sysutils/libpciaccess/Makefile b/sysutils/libpciaccess/Makefile
index 5917de4fb24..eeb0153ad56 100644
--- a/sysutils/libpciaccess/Makefile
+++ b/sysutils/libpciaccess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/30 21:06:32 bjs Exp $
 #
 
 DISTNAME=	libpciaccess-0.10.4
@@ -28,9 +28,12 @@ USE_TOOLS+=	pkg-config
 ###
 USE_TOOLS+=	autoconf automake autoreconf
 
+CONFIGURE_ARGS+=	--with-zlib
+
 PKGCONFIG_OVERRIDE+=	pciaccess.pc.in
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -v -i -f
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libpciaccess/distinfo b/sysutils/libpciaccess/distinfo
index e9afbbb7cea..377daad9953 100644
--- a/sysutils/libpciaccess/distinfo
+++ b/sysutils/libpciaccess/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/10/30 21:00:37 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/10/30 21:06:32 bjs Exp $
 
 SHA1 (libpciaccess-0.10.4.tar.bz2) = e5dbfca1d0a767ad9d0278c7e8ba551c90d9c980
 RMD160 (libpciaccess-0.10.4.tar.bz2) = fe398273b491e6ba06dcdaf506721e02ed295f0c
 Size (libpciaccess-0.10.4.tar.bz2) = 256407 bytes
-SHA1 (patch-aa) = 6b8be37409cda8068e214b137d944a09a107ed8a
+SHA1 (patch-aa) = 5c656acc68a1a223e31492bb0ec2a0221f85d86a
 SHA1 (patch-ab) = 3ff43112679d8e66e2f00fe706c332a401335ff5
-SHA1 (patch-ac) = a1da654ce4aeea30ff4579cd3cb9009dacba49cc
+SHA1 (patch-ac) = 65a82eff540aaaa454bda004372ee2a72e6a3c54
 SHA1 (patch-ad) = 241890e819177262d9207cdb26f23aafd614e1da
diff --git a/sysutils/libpciaccess/patches/patch-aa b/sysutils/libpciaccess/patches/patch-aa
index 8c5307906ab..ae60ffa8293 100644
--- a/sysutils/libpciaccess/patches/patch-aa
+++ b/sysutils/libpciaccess/patches/patch-aa
@@ -1,7 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/10/30 21:06:32 bjs Exp $
 
 --- configure.ac.orig	2008-10-17 16:59:42.000000000 -0400
 +++ configure.ac
+@@ -93,10 +93,10 @@ case $host_os in
+ 	*netbsd*)
+ 		case $host in
+ 		*i386*)
+-			PCIACCESS_LIBS="-li386"
++			PCIACCESS_LIBS="-li386 $PCIACCESS_LIBS"
+ 			;;
+ 		*x86_64*|*amd64*)
+-			PCIACCESS_LIBS="-lx86_64"
++			PCIACCESS_LIBS="-lx86_64 $PCIACCESS_LIBS"
+ 			;;
+ 		esac
+ 		netbsd=yes
 @@ -116,7 +116,21 @@ AM_CONDITIONAL(NETBSD, [test "x$netbsd" 
  AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
  AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
diff --git a/sysutils/libpciaccess/patches/patch-ac b/sysutils/libpciaccess/patches/patch-ac
index 568e57c9699..ffc186e348d 100644
--- a/sysutils/libpciaccess/patches/patch-ac
+++ b/sysutils/libpciaccess/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
+$NetBSD: patch-ac,v 1.3 2008/10/30 21:06:32 bjs Exp $
 
 --- src/netbsd_pci.c.orig	2008-10-15 18:35:53.000000000 -0400
 +++ src/netbsd_pci.c
-@@ -20,12 +19,15 @@
+@@ -20,12 +20,15 @@
  #include <sys/mman.h>
  #include <sys/types.h>
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  
  #include <errno.h>
  #include <fcntl.h>
-@@ -35,6 +37,8 @@
+@@ -35,6 +38,8 @@
  #include <unistd.h>
  
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  #include "pciaccess.h"
  #include "pciaccess_private.h"
  
-@@ -43,20 +47,12 @@ static int pcifd;
+@@ -43,20 +48,12 @@ static int pcifd;
  static int
  pci_read(int bus, int dev, int func, uint32_t reg, uint32_t *val)
  {
@@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  
  	return 0;
  }
-@@ -64,16 +60,7 @@ pci_read(int bus, int dev, int func, uin
+@@ -64,16 +61,7 @@ pci_read(int bus, int dev, int func, uin
  static int
  pci_write(int bus, int dev, int func, uint32_t reg, uint32_t val)
  {
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  }
  
  static int
-@@ -91,70 +78,68 @@ static int
+@@ -91,70 +79,68 @@ static int
  pci_device_netbsd_map_range(struct pci_device *dev,
      struct pci_device_mapping *map)
  {
@@ -178,7 +178,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  
  	return pci_device_generic_unmap_range(dev, map);
  }
-@@ -163,25 +148,22 @@ static int
+@@ -163,25 +149,22 @@ static int
  pci_device_netbsd_read(struct pci_device *dev, void *data,
      pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_read)
  {
@@ -211,7 +211,7 @@ $NetBSD: patch-ac,v 1.2 2008/10/30 21:00:37 bjs Exp $
  
  		offset += toread;
  		data = (char *)data + toread;
-@@ -196,21 +178,18 @@ static int
+@@ -196,21 +179,18 @@ static int
  pci_device_netbsd_write(struct pci_device *dev, const void *data,
      pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_written)
  {