[pkgsrc/trunk]: pkgsrc/sysutils/libpciaccess Update to 0.10.6. Fix build on D...

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a82d3541208
branches:  trunk
changeset: 393245:5a82d3541208
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Mon May 18 19:09:01 2009 +0000

description:
Update to 0.10.6. Fix build on DragonFly.

Changes since 0.10.5:

Alan Coopersmith (12):
      Fill in byte swapping routines for big-endian Solaris machines
      Don't open/gzopen pci.ids if we're not going to read it
      Add AC_SYS_LARGEFILE to configure.ac
      Solaris: Use bus-range properties to limit busses scanned on each node
      Add README with pointers to mailing list, bugzilla & git repos
      Fix const mismatch compiler warnings in Solaris backend
      Sun bug 6811468: pci_device_solx_devfs_probe accesses freed memory
      Move included m4 to a subdir so we can more easily update from upstream
      Fix $CWARNFLAGS addition
      Fix unused variable warnings in Solaris code
      Resync COPYING file with code copyright notices
      Version bump: 0.10.6

Darren Smith (1):
      Be more paranoid about reading bridge info (#20786)

Mark Kettenis (1):
      Make libpciaccess on OpenBSD domain-aware.

Matthieu Herrb (3):
      Fix a logic error in pci_device_openbsd_write().
      Sync with OpenBSD code.
      Fix a logic error in pci_device_netbsd_write()

Owain Ainsworth (1):
      openbsd_pci.c: use the correct size when mapping the legacy vga rom.

Paulo Cesar Pereira de Andrade (1):
      Janitor: Correct make distcheck and compiler warnings.

Robert Noland (1):
      FreeBSD: Incorporate several fixes that have accumulated.

edward shu (1):
      Sun bug 6785726: libpciaccess needs to use the correct BAR index on solaris


Changes since 0.10.4:

Julien Cristau (2):
      Make --without-zlib work
      Bump to 0.10.5

Robert Noland (1):
      Fix FreeBSD systems which support pci domains.

diffstat:

 sysutils/libpciaccess/Makefile         |   8 +++++---
 sysutils/libpciaccess/distinfo         |  14 ++++++--------
 sysutils/libpciaccess/patches/patch-aa |  14 +++++++-------
 sysutils/libpciaccess/patches/patch-ab |  12 ------------
 sysutils/libpciaccess/patches/patch-ac |  10 +++++-----
 sysutils/libpciaccess/patches/patch-ad |  12 ------------
 6 files changed, 23 insertions(+), 47 deletions(-)

diffs (143 lines):

diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/Makefile
--- a/sysutils/libpciaccess/Makefile    Mon May 18 18:26:16 2009 +0000
+++ b/sysutils/libpciaccess/Makefile    Mon May 18 19:09:01 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/10/30 21:06:32 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/18 19:09:01 hasso Exp $
 #
 
-DISTNAME=      libpciaccess-0.10.4
+DISTNAME=      libpciaccess-0.10.6
 CATEGORIES=    sysutils x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=  .tar.bz2
@@ -16,7 +16,7 @@
 ###
 ONLY_FOR_PLATFORM=     FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386
 ONLY_FOR_PLATFORM+=    FreeBSD-*-x86_64 NetBSD-*-x86_64 OpenBSD-*-x86_64
-ONLY_FOR_PLATFORM+=    DragonFly-i386-* DragonFly-x86_64-*
+ONLY_FOR_PLATFORM+=    DragonFly-*-i386 DragonFly-*-x86_64
 ONLY_FOR_PLATFORM+=    Linux-*-* SunOS-*-*
 
 GNU_CONFIGURE= yes
@@ -32,6 +32,8 @@
 
 PKGCONFIG_OVERRIDE+=   pciaccess.pc.in
 
+BUILD_DEPENDS+=        xorg-util-macros>=1.2:../../devel/xorg-util-macros
+
 pre-configure:
        cd ${WRKSRC} && autoreconf -v -i -f
 
diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/distinfo
--- a/sysutils/libpciaccess/distinfo    Mon May 18 18:26:16 2009 +0000
+++ b/sysutils/libpciaccess/distinfo    Mon May 18 19:09:01 2009 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/10/30 21:06:32 bjs Exp $
+$NetBSD: distinfo,v 1.4 2009/05/18 19:09:01 hasso 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) = 5c656acc68a1a223e31492bb0ec2a0221f85d86a
-SHA1 (patch-ab) = 3ff43112679d8e66e2f00fe706c332a401335ff5
-SHA1 (patch-ac) = 65a82eff540aaaa454bda004372ee2a72e6a3c54
-SHA1 (patch-ad) = 241890e819177262d9207cdb26f23aafd614e1da
+SHA1 (libpciaccess-0.10.6.tar.bz2) = d8f2fc4d8a7e2934384476f0ae400e021ebc585b
+RMD160 (libpciaccess-0.10.6.tar.bz2) = 336c624dabee97475e75b358c1ff93fa8e26cba4
+Size (libpciaccess-0.10.6.tar.bz2) = 267671 bytes
+SHA1 (patch-aa) = baa96a3b85bb30d818e130c32bf5b295eefeb18f
+SHA1 (patch-ac) = cdb4b000b224432f5064e603926d4a541a73f895
diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/patches/patch-aa
--- a/sysutils/libpciaccess/patches/patch-aa    Mon May 18 18:26:16 2009 +0000
+++ b/sysutils/libpciaccess/patches/patch-aa    Mon May 18 19:09:01 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2008/10/30 21:06:32 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2009/05/18 19:09:01 hasso Exp $
 
---- configure.ac.orig  2008-10-17 16:59:42.000000000 -0400
-+++ configure.ac
-@@ -93,10 +93,10 @@ case $host_os in
+--- configure.ac.orig  2009-04-25 02:19:43 +0300
++++ configure.ac       2009-05-18 08:34:40 +0300
+@@ -66,10 +66,10 @@ case $host_os in
        *netbsd*)
                case $host in
                *i386*)
@@ -15,9 +15,9 @@
                        ;;
                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])
+@@ -91,7 +91,21 @@ AM_CONDITIONAL(SOLARIS, [test "x$solaris
+ 
+ AC_SYS_LARGEFILE
  
 +if test "x$netbsd" = xyes; then
 +AC_CHECK_LIB([pci], [pcibus_conf_read],
diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/patches/patch-ab
--- a/sysutils/libpciaccess/patches/patch-ab    Mon May 18 18:26:16 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $
-
---- src/freebsd_pci.c.orig     2008-10-15 18:35:53.000000000 -0400
-+++ src/freebsd_pci.c
-@@ -43,6 +43,7 @@
- #include <sys/mman.h>
- #include <sys/memrange.h>
- 
-+#include "config.h"
- #include "pciaccess.h"
- #include "pciaccess_private.h"
- 
diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/patches/patch-ac
--- a/sysutils/libpciaccess/patches/patch-ac    Mon May 18 18:26:16 2009 +0000
+++ b/sysutils/libpciaccess/patches/patch-ac    Mon May 18 19:09:01 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2008/10/30 21:06:32 bjs Exp $
+$NetBSD: patch-ac,v 1.4 2009/05/18 19:09:01 hasso Exp $
 
---- src/netbsd_pci.c.orig      2008-10-15 18:35:53.000000000 -0400
-+++ src/netbsd_pci.c
+--- src/netbsd_pci.c.orig      2008-12-20 05:21:22 +0200
++++ src/netbsd_pci.c   2009-05-18 08:38:14 +0300
 @@ -20,12 +20,15 @@
  #include <sys/mman.h>
  #include <sys/types.h>
@@ -218,7 +218,7 @@
 -      struct pciio_bdf_cfgreg io;
 +      u_int reg, val;
  
-       if ((offset % 4) == 0 || (size % 4) == 0)
+       if ((offset % 4) != 0 || (size % 4) != 0)
                return EINVAL;
  
 -      io.bus = dev->bus;
@@ -234,7 +234,7 @@
  
 -              if (ioctl(pcifd, PCI_IOC_BDF_CFGWRITE, &io) == -1) 
 +              if ((pcibus_conf_write(pcifd, dev->bus, dev->dev, dev->func,
-+                 reg, val)) == -1)
++                  reg, val)) == -1)
                        return errno;
  
                offset += 4;
diff -r 20f6537f500d -r 5a82d3541208 sysutils/libpciaccess/patches/patch-ad
--- a/sysutils/libpciaccess/patches/patch-ad    Mon May 18 18:26:16 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/10/30 20:58:11 bjs Exp $
-
---- src/scanpci.c.orig 2008-10-16 21:36:11.000000000 -0400
-+++ src/scanpci.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <err.h>
-+#include <unistd.h>
- 
- #include "pciaccess.h"
-