Update xen 3.0 packages to 3.0.4.

pksgrc changes: install man pages for xm, xend-config.sxp and xmdomain.cfg.
Should fix pkg/36190.

Main changes:
This is largely an opportunistic stabilising release for HVM guests, due to
the large amount of work in that area of the code since 3.0.3. These
enhancements have in particular improved support for SMP and ACPI Linux and
Windows operating systems.

9 files changed, 89 insertions, 90 deletions

diff --git a/sysutils/xentools30-hvm/Makefile b/sysutils/xentools30-hvm/Makefile
index da9c1f998d4..a239d483a0d 100644
--- a/sysutils/xentools30-hvm/Makefile
+++ b/sysutils/xentools30-hvm/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/28 17:14:53 bouyer Exp $
 #
 
-DISTNAME=		xen-3.0.3_0-src
-PKGNAME=		xentools30-hvm-3.0.3
+DISTNAME=		xen-3.0.4_1-src
+PKGNAME=		xentools30-hvm-3.0.4
 PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
-			http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/
+			http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		bouyer@NetBSD.org
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386
 CONFLICTS+=		libxen-[0-9]*
 CONFLICTS+=		xentools20-[0-9]*
 
-WRKSRC=			${WRKDIR}/xen-3.0.3_0-src/tools
+WRKSRC=			${WRKDIR}/xen-3.0.4_1-src/tools
 CHECK_PORTABILITY_SKIP+=	examples/*
 
 EGDIR=			${PREFIX}/share/examples/xen
@@ -33,9 +33,7 @@ USE_TOOLS+=		gmake
 MAKE_ENV+=		EGDIR=${EGDIR:Q}
 MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
 MAKE_ENV+=		XEN_TARGET_ARCH="x86_32"
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-PY_PATCHPLIST=		yes
-PYTHON_PATCH_SCRIPTS=	ioemu/keymaps/convert-map
+PYTHON_VERSIONS_ACCEPTED= 24 23
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
@@ -67,6 +65,7 @@ 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
+	${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/
 
 .if ${OPSYS} == "NetBSD"
 post-build:
diff --git a/sysutils/xentools30-hvm/distinfo b/sysutils/xentools30-hvm/distinfo
index 89001db07d1..8dcadfe921c 100644
--- a/sysutils/xentools30-hvm/distinfo
+++ b/sysutils/xentools30-hvm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/10/21 12:43:06 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2007/04/28 17:14:53 bouyer Exp $
 
-SHA1 (xen-3.0.3_0-src.tgz) = 9505ae3a5a42bc969836de81f501341409291f78
-RMD160 (xen-3.0.3_0-src.tgz) = 528020035ee32144b52bcdfccc8c44708b0196ea
-Size (xen-3.0.3_0-src.tgz) = 5465968 bytes
-SHA1 (patch-aa) = 1da529f00c897ef39bad7d3816cd5df0a468c280
-SHA1 (patch-an) = eab8d3a62da0b13b89fa575d5c950b6d12a27758
+SHA1 (xen-3.0.4_1-src.tgz) = 7ca5af70996215229e143c7563e69b3719284a95
+RMD160 (xen-3.0.4_1-src.tgz) = f869eec35f6afe0bc9824ce2eb4a600f789d423b
+Size (xen-3.0.4_1-src.tgz) = 6473636 bytes
+SHA1 (patch-aa) = 6f953f5033860e4e14f73f72b28f59e0e29f3bb5
+SHA1 (patch-an) = ab9fa15be2a4caf84d78ca72463d02f1d2939a3f
 SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c45d8e7c34268f95f5dff0164adf093e52aa2950
@@ -14,7 +14,8 @@ SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b
 SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
 SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
 SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
-SHA1 (patch-ay) = 59d1f89972bfabeb27cb80b92710dafefe9e448e
+SHA1 (patch-ay) = cdfaa8d4a1720711261b476e5c046a778eaf27f2
 SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
-SHA1 (patch-bb) = 4bfe5b1dad33244b3be3359d37ad1054cd876e7c
-SHA1 (patch-bv) = 4f3e34d75a073e55711ebbf6ddd805d5db097e42
+SHA1 (patch-bb) = 19e3d323efab335a50f0410d1197ecbee5b7798b
+SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
+SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
diff --git a/sysutils/xentools30-hvm/files/NetBSD.mk b/sysutils/xentools30-hvm/files/NetBSD.mk
new file mode 100644
index 00000000000..03b3360db79
--- /dev/null
+++ b/sysutils/xentools30-hvm/files/NetBSD.mk
@@ -0,0 +1,2 @@
+# $NetBSD: NetBSD.mk,v 1.1 2007/04/28 17:14:54 bouyer Exp $
+include $(XEN_ROOT)/config/StdGNU.mk
diff --git a/sysutils/xentools30-hvm/patches/patch-aa b/sysutils/xentools30-hvm/patches/patch-aa
index dc8374ba781..1e5561f5bd4 100644
--- a/sysutils/xentools30-hvm/patches/patch-aa
+++ b/sysutils/xentools30-hvm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- Makefile.orig	2006-10-04 04:27:58.000000000 +0200
-+++ Makefile	2006-10-18 17:33:39.000000000 +0200
-@@ -2,31 +2,11 @@
+--- Makefile.orig	2007-01-08 16:00:46.000000000 +0100
++++ Makefile	2007-04-26 21:56:16.000000000 +0200
+@@ -2,34 +2,11 @@
  include $(XEN_ROOT)/tools/Rules.mk
  
  SUBDIRS-y :=
@@ -22,6 +22,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
 -SUBDIRS-y += xenstat
 -SUBDIRS-y += libaio
 -SUBDIRS-y += blktap
+-SUBDIRS-y += libfsimage
+-SUBDIRS-$(XENFB_TOOLS) += xenfb
+-SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 -
 -# These don't cross-compile
 -ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
@@ -36,7 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
  	@set -e; for subdir in $(SUBDIRS-y); do \
  		$(MAKE) -C $$subdir $@; \
  	done
-@@ -53,18 +33,16 @@
+@@ -56,18 +33,16 @@
  
  .PHONY: check
  check:
@@ -47,7 +50,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
 -	$(MAKE) -C check clean
  
  .PHONY: ioemu ioemuinstall ioemuclean
- ifdef CONFIG_IOEMU
+ ifeq ($(CONFIG_IOEMU),y)
  export IOEMU_DIR ?= ioemu
  ioemu ioemuinstall:
  	[ -f $(IOEMU_DIR)/config-host.mak ] || \
diff --git a/sysutils/xentools30-hvm/patches/patch-an b/sysutils/xentools30-hvm/patches/patch-an
index de561ff64e6..38458e3fdf3 100644
--- a/sysutils/xentools30-hvm/patches/patch-an
+++ b/sysutils/xentools30-hvm/patches/patch-an
@@ -1,24 +1,24 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-an,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- firmware/Makefile.orig	2006-10-04 04:28:02.000000000 +0200
-+++ firmware/Makefile	2006-10-18 17:34:43.000000000 +0200
+--- firmware/Makefile.orig	2007-01-08 16:00:48.000000000 +0100
++++ firmware/Makefile	2007-04-26 21:34:58.000000000 +0200
 @@ -4,7 +4,7 @@
  # hvmloader is a 32-bit protected mode binary.
  # It belongs in /usr/lib, not /usr/lib64.
  TARGET      := hvmloader/hvmloader
--INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
-+INSTALL_DIR := $(PREFIX)/lib/xen/boot
+-INST_DIR := $(DESTDIR)/usr/lib/xen/boot
++INST_DIR := $(PREFIX)/lib/xen/boot
  
  SUBDIRS :=
  SUBDIRS += rombios
-@@ -29,8 +29,8 @@
+@@ -28,8 +28,8 @@
  
  .PHONY: install
  install: all
--	[ -d $(INSTALL_DIR) ] || install -d -m0755 $(INSTALL_DIR)
--	[ ! -e $(TARGET) ] || install -m0644 $(TARGET) $(INSTALL_DIR)
-+	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)
-+	$(BSD_INSTALL_DATA) $(TARGET) $(INSTALL_DIR)
+-	[ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
+-	[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(INST_DIR)
++	$(BSD_INSTALL_DATA) $(TARGET) $(INST_DIR)
  
  .PHONY: clean
  clean: 
diff --git a/sysutils/xentools30-hvm/patches/patch-ay b/sysutils/xentools30-hvm/patches/patch-ay
index b37ae4c5835..fa22fadf2a0 100644
--- a/sysutils/xentools30-hvm/patches/patch-ay
+++ b/sysutils/xentools30-hvm/patches/patch-ay
@@ -1,28 +1,25 @@
-$NetBSD: patch-ay,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-ay,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- ioemu/patches/xen-build.orig	2006-10-04 04:28:11.000000000 +0200
-+++ ioemu/patches/xen-build	2006-10-18 17:57:53.000000000 +0200
-@@ -139,7 +139,7 @@
-  ifeq ($(ARCH),alpha)
-  # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
-  # the address space (31 bit so sign extending doesn't matter)
--@@ -528,10 +541,16 @@
-+@@ -528,10 +541,14 @@
-  clean:
-  	rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o slirp/*.o fpu/*.o
-  
-@@ -147,12 +147,10 @@
- +	rm -rf config.mak config.h
- +
-  install: all 
--+	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
-++	$(BSD_INSTALL_PROGRAM_DIR) $(INSTALL_DIR)
-  ifneq ($(PROGS),)
-- 	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-+ 	$(BSD_INSTALL_PROGRAM) $(PROGS) $(INSTALL_DIR)
-  endif
--+	install -m 755 $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
--+	install -m 755 $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
-  
-  ifneq ($(wildcard .depend),)
-  include .depend
+--- ioemu/Makefile.orig	2007-04-26 21:45:35.000000000 +0200
++++ ioemu/Makefile	2007-04-26 21:49:09.000000000 +0200
+@@ -72,7 +72,7 @@
+ endif
+ 
+ install: all $(if $(BUILD_DOCS),install-doc)
+-	mkdir -p "$(DESTDIR)$(bindir)"
++	$(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
+ #	$(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 @@
+ #		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+ #	done
+ ifndef CONFIG_WIN32
+-	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
++	$(BSD_INSTALL_DATA_DIR) "$(datadir)/keymaps"
+ 	for x in $(KEYMAPS); do \
+-		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
++		$(BSD_INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(datadir)/keymaps"; \
+ 	done
+ endif
+ 	for d in $(TARGET_DIRS); do \
diff --git a/sysutils/xentools30-hvm/patches/patch-bb b/sysutils/xentools30-hvm/patches/patch-bb
index 1972658f419..bd18e7cda85 100644
--- a/sysutils/xentools30-hvm/patches/patch-bb
+++ b/sysutils/xentools30-hvm/patches/patch-bb
@@ -1,17 +1,17 @@
-$NetBSD: patch-bb,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-bb,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- ioemu/Makefile.target.orig	2006-10-18 18:30:56.000000000 +0200
-+++ ioemu/Makefile.target	2006-10-18 18:32:08.000000000 +0200
-@@ -553,12 +553,8 @@
+--- ioemu/Makefile.target.orig	2007-01-08 16:00:48.000000000 +0100
++++ ioemu/Makefile.target	2007-04-26 21:38:21.000000000 +0200
+@@ -567,12 +567,8 @@
  	rm -rf config.mak config.h
  
  install: all 
 -	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
 -ifneq ($(PROGS),)
--	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+-	$(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
 -endif
--	install -m 755 $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
--	install -m 755 $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
+-	$(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
+-	$(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
 +	$(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
 +	$(BSD_INSTALL_PROGRAM) $(PROGS) "$(DESTDIR)$(bindir)"
  
diff --git a/sysutils/xentools30-hvm/patches/patch-bv b/sysutils/xentools30-hvm/patches/patch-bv
index 2706b5c7e41..be24a9aee9f 100644
--- a/sysutils/xentools30-hvm/patches/patch-bv
+++ b/sysutils/xentools30-hvm/patches/patch-bv
@@ -1,33 +1,14 @@
-$NetBSD: patch-bv,v 1.1.1.1 2006/10/19 22:58:21 bouyer Exp $
+$NetBSD: patch-bv,v 1.2 2007/04/28 17:14:54 bouyer Exp $
 
---- libxc/xenctrl.h.orig	2006-10-04 04:28:16.000000000 +0200
-+++ libxc/xenctrl.h	2006-10-16 23:54:46.000000000 +0200
-@@ -16,7 +16,12 @@
+--- libxc/xenctrl.h.orig	2007-01-08 16:00:49.000000000 +0100
++++ libxc/xenctrl.h	2007-04-26 21:40:23.000000000 +0200
+@@ -16,6 +16,9 @@
  
  #include <stddef.h>
  #include <stdint.h>
-+#ifndef __NetBSD__
- #include <sys/ptrace.h>
-+#endif
 +#undef uint8_t
 +#undef uint16_t
 +#undef uint32_t
  #include <xen/xen.h>
  #include <xen/domctl.h>
  #include <xen/sysctl.h>
-@@ -106,6 +111,7 @@
- 
- #define XC_CORE_MAGIC 0xF00FEBED
- 
-+#ifndef __NetBSD__
- long xc_ptrace_core(
-     int xc_handle,
-     enum __ptrace_request request,
-@@ -113,6 +119,7 @@
-     long addr,
-     long data,
-     vcpu_guest_context_t *ctxt);
-+#endif
- void * map_domain_va_core(
-     unsigned long domfd,
-     int cpu,
diff --git a/sysutils/xentools30-hvm/patches/patch-ci b/sysutils/xentools30-hvm/patches/patch-ci
new file mode 100644
index 00000000000..b6480b98abb
--- /dev/null
+++ b/sysutils/xentools30-hvm/patches/patch-ci
@@ -0,0 +1,16 @@
+$NetBSD: patch-ci,v 1.1 2007/04/28 17:14:54 bouyer Exp $
+
+--- ../xen/include/public/arch-x86/xen.h.orig	2007-04-25 19:25:41.000000000 +0200
++++ ../xen/include/public/arch-x86/xen.h	2007-04-25 19:25:43.000000000 +0200
+@@ -35,9 +35,10 @@
+ #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+     typedef type * __guest_handle_ ## name
+ #endif
++#define __XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
+ 
+ #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
+-#define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
++#define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)
+ #define set_xen_guest_handle(hnd, val)  do { (hnd).p = val; } while (0)
+ #ifdef __XEN_TOOLS__
+ #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)