Never build qemu documentation (it's the stock qemu documentation and

has not been updated for Xen, so it's not of much use anyway).
Fix PLIST issues because the documentation was built only if texi2html
was installed.
Bump PKGREVISION

4 files changed, 20 insertions, 15 deletions

diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index f59999c0dc0..f62b7b3fc2b 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2009/03/24 20:04:51 abs Exp $
+# $NetBSD: Makefile,v 1.12 2009/03/31 17:37:36 bouyer Exp $
 #
 
 VERSION=		3.1.4
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools3-hvm-${VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools3-hvm/PLIST b/sysutils/xentools3-hvm/PLIST
index d3cd345733f..fd332180cda 100644
--- a/sysutils/xentools3-hvm/PLIST
+++ b/sysutils/xentools3-hvm/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/03/24 20:04:51 abs Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/31 17:37:36 bouyer Exp $
 lib/xen/boot/hvmloader
 libexec/qemu-dm
-man/man1/xen-qemu-img.1
-man/man1/xen-qemu.1
-share/doc/xen/qemu-doc.html
-share/doc/xen/qemu-tech.html
 share/examples/xen/hvm
 share/examples/xen/qemu-ifup
 share/xen/qemu/keymaps/ar
@@ -44,6 +40,5 @@ share/xen/qemu/keymaps/th
 share/xen/qemu/keymaps/tr
 @dirrm share/xen/qemu/keymaps
 @dirrm share/xen/qemu
-@dirrm share/doc/xen
 @dirrm lib/xen/boot
 @dirrm lib/xen
diff --git a/sysutils/xentools3-hvm/distinfo b/sysutils/xentools3-hvm/distinfo
index 61c04df1399..8d8b2e6762a 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2009/03/24 20:04:51 abs Exp $
+$NetBSD: distinfo,v 1.8 2009/03/31 17:37:36 bouyer Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
 Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
 SHA1 (patch-an) = 37650fa861ed8219aa0682e84c5c8ba41a8cdff0
-SHA1 (patch-ao) = de72422e9b929f835a7a6ef5bc759d4f23546915
+SHA1 (patch-ao) = 500f1921a73e3a4b7aa91bbd819a26f2327ac8b5
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
 SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
diff --git a/sysutils/xentools3-hvm/patches/patch-ao b/sysutils/xentools3-hvm/patches/patch-ao
index 49b0b53d159..a55797a831d 100644
--- a/sysutils/xentools3-hvm/patches/patch-ao
+++ b/sysutils/xentools3-hvm/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2009/03/24 20:04:51 abs Exp $
+$NetBSD: patch-ao,v 1.3 2009/03/31 17:37:37 bouyer Exp $
 
---- ioemu/configure.orig	2008-04-25 14:03:12.000000000 +0100
-+++ ioemu/configure
-@@ -513,11 +513,11 @@ else
+--- ioemu/configure.orig	2008-04-25 15:03:12.000000000 +0200
++++ ioemu/configure	2009-03-31 17:41:22.000000000 +0200
+@@ -513,11 +513,11 @@
  if test -z "$prefix" ; then
      prefix="/usr/local"
  fi
@@ -18,7 +18,7 @@ $NetBSD: patch-ao,v 1.2 2009/03/24 20:04:51 abs Exp $
  fi
  
  echo "Install prefix    $prefix"
-@@ -653,6 +653,8 @@ if test "$mingw32" = "yes" ; then
+@@ -653,6 +653,8 @@
    echo "#define CONFIG_WIN32 1" >> $config_h
  elif test -f "/usr/include/byteswap.h" ; then
    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
@@ -27,3 +27,13 @@ $NetBSD: patch-ao,v 1.2 2009/03/24 20:04:51 abs Exp $
  fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
+@@ -716,9 +718,6 @@
+   echo "VPATH=$source_path" >> $config_mak
+ fi
+ echo "TARGET_DIRS=$target_list" >> $config_mak
+-if [ "$build_docs" = "yes" ] ; then
+-  echo "BUILD_DOCS=yes" >> $config_mak
+-fi
+ if [ "$build_acpi_tables" = "yes" ] ; then
+   echo "BUILD_ACPI_TABLES=yes" >> $config_mak
+ fi