Use /usr/include/xen/xenio*.h if present, falling back to the ones

from files/ (which have the old IOCTL_PRIVCMD_HYPERCALL to be compatible
with NetBSD 4.0).
Properly handle the new IOCTL_PRIVCMD_HYPERCALL ioctl if present.

4 files changed, 16 insertions, 13 deletions

diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 20798b85a07..770de3d9013 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/02/15 20:34:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/17 16:29:03 bouyer Exp $
 #
 
 VERSION=		3.1.3
 DISTNAME=		xen-${VERSION}-src
 PKGNAME=		xentools3-hvm-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tgz
@@ -77,11 +78,13 @@ CONF_FILES_PERMS+=	${EGDIR}/qemu-ifup ${PKG_SYSCONFDIR}/scripts/qemu-ifup \
 OWN_DIRS=		${PKG_SYSCONFDIR}/scripts
 
 pre-build:
-	${MKDIR} ${WRKSRC}/libxc/xen/NetBSD
-	${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio.h || \
-	    ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD
-	${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio3.h || \
-	    ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen/NetBSD
+.if !exists(/usr/include/xen/xenio.h)
+	${MKDIR} ${WRKSRC}/libxc/xen
+	${TEST} -f ${WRKSRC}/libxc/xen/xenio.h || \
+		${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen
+	${TEST} -f ${WRKSRC}/libxc/xen/xenio3.h || \
+		${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen
+.endif
 	${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/
 .if ${MACHINE_ARCH} == "x86_64"
 	${MKDIR} ${WRKSRC}/libxc/machine
diff --git a/sysutils/xentools3-hvm/distinfo b/sysutils/xentools3-hvm/distinfo
index dfd96b72ce0..493560d4063 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/02/15 20:34:35 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2008/02/17 16:29:03 bouyer Exp $
 
 SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
 RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
@@ -10,7 +10,7 @@ SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
 SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
 SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1
-SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b
+SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
 SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
 SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
 SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
diff --git a/sysutils/xentools3-hvm/files/xenio.h b/sysutils/xentools3-hvm/files/xenio.h
index d670b414759..dfbb03187c5 100644
--- a/sysutils/xentools3-hvm/files/xenio.h
+++ b/sysutils/xentools3-hvm/files/xenio.h
@@ -27,8 +27,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __NetBSD_PRIVCMD_H__
-#define __NetBSD_PRIVCMD_H__
+#ifndef __PKGSRC_PRIVCMD_H__
+#define __PKGSRC_PRIVCMD_H__
 
 /* Interface to /proc/xen/privcmd */
 
@@ -102,4 +102,4 @@ typedef struct privcmd_blkmsg
 /* EVTCHN_UNBIND: Unbind from the specified event-channel port. */
 #define EVTCHN_UNBIND _IOW('E', 3, unsigned long)
 
-#endif /* __NetBSD_PRIVCMD_H__ */
+#endif /* __PKGSRC_PRIVCMD_H__ */
diff --git a/sysutils/xentools3-hvm/patches/patch-au b/sysutils/xentools3-hvm/patches/patch-au
index f479e601274..72acfa62e8b 100644
--- a/sysutils/xentools3-hvm/patches/patch-au
+++ b/sysutils/xentools3-hvm/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-au,v 1.2 2008/02/17 16:29:03 bouyer Exp $
 
 --- libxc/xc_private.h.orig	2006-10-16 22:15:35.000000000 +0200
 +++ libxc/xc_private.h	2006-10-16 22:16:09.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-au,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  #include "xenctrl.h"
  
 +#ifdef __NetBSD__
-+#include <xen/NetBSD/xenio.h>
++#include <xen/xenio.h>
 +#else
  #include <xen/sys/privcmd.h>
 +#endif