Adjust doc & manfiles to not overlap with qemu, and fix PLIST

5 files changed, 38 insertions, 22 deletions

diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 35005618987..f59999c0dc0 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2009/02/09 22:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/03/24 20:04:51 abs Exp $
 #
 
 VERSION=		3.1.4
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools3-hvm-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
-EXTRACT_SUFX=		.tar.gz
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://xen.org/
diff --git a/sysutils/xentools3-hvm/PLIST b/sysutils/xentools3-hvm/PLIST
index c52809359f7..d3cd345733f 100644
--- a/sysutils/xentools3-hvm/PLIST
+++ b/sysutils/xentools3-hvm/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/02 18:55:31 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/24 20:04:51 abs 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
@@ -38,7 +42,8 @@ share/xen/qemu/keymaps/sl
 share/xen/qemu/keymaps/sv
 share/xen/qemu/keymaps/th
 share/xen/qemu/keymaps/tr
-@dirrm lib/xen/boot
-@dirrm lib/xen
 @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 0f6807da9cf..61c04df1399 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/08/07 16:00:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/03/24 20:04:51 abs 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) = d1250258d09cf9b330a4e9d52e85332a0eef7998
+SHA1 (patch-ao) = de72422e9b929f835a7a6ef5bc759d4f23546915
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
 SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
@@ -14,7 +14,7 @@ SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
 SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
 SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
 SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
-SHA1 (patch-ay) = a93f5098f54e16706efe55878c98cc3687d24d64
+SHA1 (patch-ay) = 8828bcf2286da8831f2a7c9652f168f33176c641
 SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
 SHA1 (patch-bb) = c07dfb4783694f827e0268bd780af135a800f980
 SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
diff --git a/sysutils/xentools3-hvm/patches/patch-ao b/sysutils/xentools3-hvm/patches/patch-ao
index a99fa1d2dd5..49b0b53d159 100644
--- a/sysutils/xentools3-hvm/patches/patch-ao
+++ b/sysutils/xentools3-hvm/patches/patch-ao
@@ -1,18 +1,24 @@
-$NetBSD: patch-ao,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-ao,v 1.2 2009/03/24 20:04:51 abs Exp $
 
---- ioemu/configure.orig	2006-10-04 04:28:06.000000000 +0200
-+++ ioemu/configure	2006-10-18 17:37:42.000000000 +0200
-@@ -517,7 +517,7 @@
+--- ioemu/configure.orig	2008-04-25 14:03:12.000000000 +0100
++++ ioemu/configure
+@@ -513,11 +513,11 @@ else
+ if test -z "$prefix" ; then
+     prefix="/usr/local"
+ fi
+-mandir="$prefix/share/man"
++mandir="$prefix/man"
  datadir="$prefix/share/xen/qemu"
- docdir="$prefix/share/doc/qemu"
+-docdir="$prefix/share/doc/qemu"
 -bindir="$prefix/$libdir/xen/bin"
-+bindir="$prefix/libexec"
 -configdir="/etc/xen"
-+configdir="@XENDCONFDIR@"
++docdir="$prefix/share/doc/xen"
++bindir="$prefix/libexec"
++configdir="/usr/pkg/etc/xen"
  fi
  
  echo "Install prefix    $prefix"
-@@ -653,6 +653,8 @@
+@@ -653,6 +653,8 @@ if test "$mingw32" = "yes" ; then
    echo "#define CONFIG_WIN32 1" >> $config_h
  elif test -f "/usr/include/byteswap.h" ; then
    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
diff --git a/sysutils/xentools3-hvm/patches/patch-ay b/sysutils/xentools3-hvm/patches/patch-ay
index 2556174b3b7..ba624e83016 100644
--- a/sysutils/xentools3-hvm/patches/patch-ay
+++ b/sysutils/xentools3-hvm/patches/patch-ay
@@ -1,8 +1,14 @@
-$NetBSD: patch-ay,v 1.2 2008/08/07 16:00:14 joerg Exp $
+$NetBSD: patch-ay,v 1.3 2009/03/24 20:04:51 abs Exp $
 
---- ioemu/Makefile.orig	2007-05-18 16:45:21.000000000 +0200
-+++ ioemu/Makefile	2007-06-12 22:28:21.000000000 +0200
-@@ -72,7 +72,7 @@
+--- ioemu/Makefile.orig	2008-04-25 14:03:12.000000000 +0100
++++ ioemu/Makefile
+@@ -68,11 +68,12 @@ install-doc: $(DOCS)
+ 	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+ 	mkdir -p "$(DESTDIR)$(mandir)/man1"
+-	$(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
++	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1/xen-qemu.1"
++	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1/xen-qemu-img.1"
  endif
  
  install: all $(if $(BUILD_DOCS),install-doc)
@@ -11,7 +17,7 @@ $NetBSD: patch-ay,v 1.2 2008/08/07 16:00:14 joerg Exp $
  #	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
  #	mkdir -p "$(DESTDIR)$(datadir)"
  #	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-@@ -80,9 +80,9 @@
+@@ -80,9 +81,9 @@ install: all $(if $(BUILD_DOCS),install-
  #		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
  #	done
  ifndef CONFIG_WIN32