[pkgsrc/trunk]: pkgsrc/sysutils/xentools41 Fix build failure reported by Davi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f52b8fe896f
branches:  trunk
changeset: 604403:4f52b8fe896f
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Wed May 30 08:29:43 2012 +0000

description:
Fix build failure reported by David Holland. I don't know why gmake didn't
stop for me on this error.
Bump PKGREVISION, as despite the error the package did build fine for me.

diffstat:

 sysutils/xentools41/Makefile                                    |   4 +-
 sysutils/xentools41/distinfo                                    |   3 +-
 sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c |  17 ++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r d9832613dbc7 -r 4f52b8fe896f sysutils/xentools41/Makefile
--- a/sysutils/xentools41/Makefile      Wed May 30 08:21:56 2012 +0000
+++ b/sysutils/xentools41/Makefile      Wed May 30 08:29:43 2012 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2012/05/29 15:01:34 bouyer Exp $
+# $NetBSD: Makefile,v 1.19 2012/05/30 08:29:43 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include               "version.mk"
 
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools41-${VERSION}
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            sysutils
 MASTER_SITES=  http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff -r d9832613dbc7 -r 4f52b8fe896f sysutils/xentools41/distinfo
--- a/sysutils/xentools41/distinfo      Wed May 30 08:21:56 2012 +0000
+++ b/sysutils/xentools41/distinfo      Wed May 30 08:29:43 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2012/05/30 03:27:05 taca Exp $
+$NetBSD: distinfo,v 1.21 2012/05/30 08:29:43 bouyer Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -38,6 +38,7 @@
 SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886
+SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c
 SHA1 (patch-ioemu-qemu-xen_hw_pt-graphics.c) = 3c03404f1d711c667559a1332e717a5f1b5ceda8
 SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.c) = 2dcebc65f591988bb95dea74c3b21f7066154a9f
 SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3b0
diff -r d9832613dbc7 -r 4f52b8fe896f sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools41/patches/patch-ioemu-qemu-xen_hw_piix4acpi.c   Wed May 30 08:29:43 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ioemu-qemu-xen_hw_piix4acpi.c,v 1.1 2012/05/30 08:29:44 bouyer Exp $
+
+--- ioemu-qemu-xen/hw/piix4acpi.c.orig 2012-05-30 10:21:32.000000000 +0200
++++ ioemu-qemu-xen/hw/piix4acpi.c      2012-05-30 10:23:11.000000000 +0200
+@@ -41,8 +41,12 @@
+ #define PIIX4ACPI_LOG(level, fmt, ...) do { if (level <= PIIX4ACPI_LOGLEVEL) qemu_log(fmt, ## __VA_ARGS__); } while (0)
+ 
+ #ifdef CONFIG_PASSTHROUGH
++#ifdef __NetBSD__
++#include <pciutils/header.h>
++#else
+ #include <pci/header.h>
+ #endif
++#endif
+ 
+ /* PM1a_CNT bits, as defined in the ACPI specification. */
+ #define SCI_EN            (1 <<  0)