Update to 2.0.6 (latest stable distribution).

Lots of changes, notably now it uses Linux-2.6.11.x, a NetBSD
bug was fixed.

pkgsrc changes:

* Honor PKG_SYSCONFDIR and SUPPORT_FILES for configuration files.
* xend.sh: no more python warning messages when the script is used
  on non NetBSD/Xen systems.

14 files changed, 352 insertions, 328 deletions

diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 3e78c57e54e..fddeec8da74 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2005/05/23 22:02:04 bouyer Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/24 16:02:08 xtraeme Exp $
 #
 
-DISTNAME=		xen-2.0.3-src
-PKGNAME=		xentools20-2.0.3
-PKGREVISION=		5
+DISTNAME=		xen-2.0.6-src
+PKGNAME=		xentools20-2.0.6
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/
 EXTRACT_SUFX=		.tgz
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.netbsd.org/Ports/xen/
@@ -16,12 +14,13 @@ COMMENT=		Userland Tools for Xen
 DEPENDS+=		${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 USE_PKGINSTALL=		yes
+PKG_SYSCONFSUBDIR=	xen
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 WRKSRC=			${WRKDIR}/xen-2.0/tools
 
-EGDIR=			${PREFIX}/share/examples/${PKGNAME_NOREV}
+EGDIR=			${PREFIX}/share/examples/xen
 
 USE_TOOLS+=		gmake
 MAKE_ENV+=		EGDIR="${EGDIR}"
@@ -41,21 +40,47 @@ PYTHON_PATCH_SCRIPTS+=	misc/netfix
 PYTHON_PATCH_SCRIPTS+=	misc/xend
 PYTHON_PATCH_SCRIPTS+=	xentrace/xentrace_format
 
-SUBST_CLASSES=          paths
+SUBST_CLASSES=          paths py conf
 SUBST_STAGE.paths=      pre-configure
 SUBST_FILES.paths=      python/xen/xend/server/SrvDaemon.py
 SUBST_FILES.paths+=	python/xen/xend/XendDomainInfo.py
 SUBST_FILES.paths+=	python/xen/sv/Daemon.py
 SUBST_SED.paths=        -e "s|/usr/sbin|${PREFIX}/sbin|g"
 SUBST_MESSAGE.paths=    "Fixing hardcoded paths."
+SUBST_STAGE.py=		pre-configure
+SUBST_FILES.py=		python/Makefile
+SUBST_SED.py=		-e "s,python,${PYTHONBIN},g"
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	python/xen/xend/XendRoot.py
+SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
 
 RCD_SCRIPTS=		xend
 FILES_SUBST+=		RCD_INTERPRETER=${PYTHONBIN}
 
+INSTALLATION_DIRS=	share/examples/xen
+
+XEND_SCRIPTS=		network vif-bridge block-enbd block-file	\
+			xmexample1 xmexample2 xmexample3
+
+SUPPORT_FILES=		${EGDIR}/xend-config.sxp \
+			${PKG_SYSCONFDIR}/xend-config.sxp
+.for f in ${XEND_SCRIPTS}
+SUPPORT_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+
+SUPPORT_FILES_MODE=	0755
+
 pre-build:
 	${MKDIR} ${WRKSRC}/libxc/xen/NetBSD
 	${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/examples/xend-config.sxp \
+		${EGDIR}/xend-config.sxp
+.for s in ${XEND_SCRIPTS}
+	${INSTALL_DATA} ${WRKSRC}/examples/${s} ${EGDIR}/${s}
+.endfor
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/sysutils/xentools20/PLIST b/sysutils/xentools20/PLIST
index e9f7905ce97..d91850b36d2 100644
--- a/sysutils/xentools20/PLIST
+++ b/sysutils/xentools20/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/03 15:59:55 wiz Exp $
-bin/miniterm
+@comment $NetBSD: PLIST,v 1.6 2005/05/24 16:02:08 xtraeme Exp $
 bin/xencons
 bin/xenperf
 include/xc.h
+lib/libxc.a
 lib/libxc.so
 lib/libxc.so.2.0
 lib/libxc.so.2.0.0
@@ -10,181 +10,189 @@ lib/libxutil.a
 lib/libxutil.so
 lib/libxutil.so.2.0
 lib/libxutil.so.2.0.0
-sbin/netfix
-sbin/xend
-sbin/xenperf
-sbin/xensv
-sbin/xfrd
-sbin/xm
 ${PYSITELIB}/xen/__init__.py
+${PYSITELIB}/xen/__init__.pyc
 ${PYSITELIB}/xen/lowlevel/__init__.py
+${PYSITELIB}/xen/lowlevel/__init__.pyc
 ${PYSITELIB}/xen/lowlevel/xc.so
 ${PYSITELIB}/xen/lowlevel/xu.so
-${PYSITELIB}/xen/lowlevel/__init__.pyc
-${PYSITELIB}/xen/util/__init__.py
-${PYSITELIB}/xen/util/Brctl.py
-${PYSITELIB}/xen/util/tempfile.py
-${PYSITELIB}/xen/util/ip.py
-${PYSITELIB}/xen/util/console_client.py
-${PYSITELIB}/xen/util/__init__.pyc
+${PYSITELIB}/xen/sv/CreateDomain.py
+${PYSITELIB}/xen/sv/DomInfo.py
+${PYSITELIB}/xen/sv/DomList.py
+${PYSITELIB}/xen/sv/GenTabbed.py
+${PYSITELIB}/xen/sv/HTMLBase.py
+${PYSITELIB}/xen/sv/Main.py
+${PYSITELIB}/xen/sv/MigrateDomain.py
+${PYSITELIB}/xen/sv/NodeInfo.py
+${PYSITELIB}/xen/sv/RestoreDomain.py
+${PYSITELIB}/xen/sv/SaveDomain.py
+${PYSITELIB}/xen/sv/TabView.py
+${PYSITELIB}/xen/sv/Wizard.py
+${PYSITELIB}/xen/sv/__init__.py
+${PYSITELIB}/xen/sv/params.py
+${PYSITELIB}/xen/sv/util.py
+${PYSITELIB}/xen/sv/CreateDomain.pyc
+${PYSITELIB}/xen/sv/Daemon.py
+${PYSITELIB}/xen/sv/Daemon.pyc
+${PYSITELIB}/xen/sv/DomInfo.pyc
+${PYSITELIB}/xen/sv/DomList.pyc
+${PYSITELIB}/xen/sv/GenTabbed.pyc
+${PYSITELIB}/xen/sv/HTMLBase.pyc
+${PYSITELIB}/xen/sv/Main.pyc
+${PYSITELIB}/xen/sv/MigrateDomain.pyc
+${PYSITELIB}/xen/sv/NodeInfo.pyc
+${PYSITELIB}/xen/sv/RestoreDomain.pyc
+${PYSITELIB}/xen/sv/SaveDomain.pyc
+${PYSITELIB}/xen/sv/TabView.pyc
+${PYSITELIB}/xen/sv/Wizard.pyc
+${PYSITELIB}/xen/sv/__init__.pyc
+${PYSITELIB}/xen/sv/params.pyc
+${PYSITELIB}/xen/sv/util.pyc
 ${PYSITELIB}/xen/util/Brctl.pyc
-${PYSITELIB}/xen/util/tempfile.pyc
-${PYSITELIB}/xen/util/ip.pyc
+${PYSITELIB}/xen/util/__init__.pyc
+${PYSITELIB}/xen/util/console_client.py
 ${PYSITELIB}/xen/util/console_client.pyc
-${PYSITELIB}/xen/xend/util.py
-${PYSITELIB}/xen/xend/XendClient.py
-${PYSITELIB}/xen/xend/XendProtocol.py
-${PYSITELIB}/xen/xend/XendVnet.py
-${PYSITELIB}/xen/xend/XendError.py
-${PYSITELIB}/xen/xend/XendDomainInfo.py
-${PYSITELIB}/xen/xend/XendDomain.py
-${PYSITELIB}/xen/xend/XendLogging.py
-${PYSITELIB}/xen/xend/XendRoot.py
-${PYSITELIB}/xen/xend/XendDomainConfig.py
-${PYSITELIB}/xen/xend/XendMigrate.py
-${PYSITELIB}/xen/xend/PrettyPrint.py
-${PYSITELIB}/xen/xend/XendConsole.py
-${PYSITELIB}/xen/xend/sxp.py
+${PYSITELIB}/xen/util/ip.pyc
+${PYSITELIB}/xen/util/tempfile.pyc
+${PYSITELIB}/xen/util/Brctl.py
+${PYSITELIB}/xen/util/__init__.py
+${PYSITELIB}/xen/util/ip.py
+${PYSITELIB}/xen/util/tempfile.py
+${PYSITELIB}/xen/xend/Args.py
 ${PYSITELIB}/xen/xend/Blkctl.py
-${PYSITELIB}/xen/xend/XendNode.py
-${PYSITELIB}/xen/xend/Vifctl.py
 ${PYSITELIB}/xen/xend/EventServer.py
 ${PYSITELIB}/xen/xend/EventTypes.py
-${PYSITELIB}/xen/xend/XendDmesg.py
-${PYSITELIB}/xen/xend/Args.py
-${PYSITELIB}/xen/xend/__init__.py
+${PYSITELIB}/xen/xend/PrettyPrint.py
+${PYSITELIB}/xen/xend/Vifctl.py
 ${PYSITELIB}/xen/xend/XendAsynchProtocol.py
-${PYSITELIB}/xen/xend/encode.py
+${PYSITELIB}/xen/xend/XendConsole.py
 ${PYSITELIB}/xen/xend/XendDB.py
-${PYSITELIB}/xen/xend/server/controller.py
-${PYSITELIB}/xen/xend/server/SrvServer.py
+${PYSITELIB}/xen/xend/XendDmesg.py
+${PYSITELIB}/xen/xend/XendDomain.py
+${PYSITELIB}/xen/xend/XendDomainConfig.py
+${PYSITELIB}/xen/xend/XendError.py
+${PYSITELIB}/xen/xend/XendMigrate.py
+${PYSITELIB}/xen/xend/XendNode.py
+${PYSITELIB}/xen/xend/XendProtocol.py
+${PYSITELIB}/xen/xend/XendRoot.py
+${PYSITELIB}/xen/xend/XendVnet.py
+${PYSITELIB}/xen/xend/encode.py
+${PYSITELIB}/xen/xend/Args.pyc
+${PYSITELIB}/xen/xend/Blkctl.pyc
+${PYSITELIB}/xen/xend/EventServer.pyc
+${PYSITELIB}/xen/xend/EventTypes.pyc
+${PYSITELIB}/xen/xend/PrettyPrint.pyc
+${PYSITELIB}/xen/xend/Vifctl.pyc
+${PYSITELIB}/xen/xend/XendAsynchProtocol.pyc
+${PYSITELIB}/xen/xend/XendClient.py
+${PYSITELIB}/xen/xend/XendClient.pyc
+${PYSITELIB}/xen/xend/XendConsole.pyc
+${PYSITELIB}/xen/xend/XendDB.pyc
+${PYSITELIB}/xen/xend/XendDmesg.pyc
+${PYSITELIB}/xen/xend/XendDomain.pyc
+${PYSITELIB}/xen/xend/XendDomainConfig.pyc
+${PYSITELIB}/xen/xend/XendDomainInfo.py
+${PYSITELIB}/xen/xend/XendDomainInfo.pyc
+${PYSITELIB}/xen/xend/XendError.pyc
+${PYSITELIB}/xen/xend/XendLogging.pyc
+${PYSITELIB}/xen/xend/XendMigrate.pyc
+${PYSITELIB}/xen/xend/XendNode.pyc
+${PYSITELIB}/xen/xend/XendProtocol.pyc
+${PYSITELIB}/xen/xend/XendRoot.pyc
+${PYSITELIB}/xen/xend/XendVnet.pyc
+${PYSITELIB}/xen/xend/__init__.pyc
+${PYSITELIB}/xen/xend/XendLogging.py
+${PYSITELIB}/xen/xend/__init__.py
+${PYSITELIB}/xen/xend/util.py
+${PYSITELIB}/xen/xend/encode.pyc
+${PYSITELIB}/xen/xend/server/SrvBase.py
+${PYSITELIB}/xen/xend/server/SrvConsole.py
 ${PYSITELIB}/xen/xend/server/SrvConsoleDir.py
+${PYSITELIB}/xen/xend/server/SrvDaemon.py
 ${PYSITELIB}/xen/xend/server/SrvDeviceDir.py
-${PYSITELIB}/xen/xend/server/__init__.py
-${PYSITELIB}/xen/xend/server/messages.py
-${PYSITELIB}/xen/xend/server/SrvBase.py
-${PYSITELIB}/xen/xend/server/domain.py
 ${PYSITELIB}/xen/xend/server/SrvDir.py
-${PYSITELIB}/xen/xend/server/netif.py
-${PYSITELIB}/xen/xend/server/params.py
 ${PYSITELIB}/xen/xend/server/SrvDmesg.py
-${PYSITELIB}/xen/xend/server/channel.py
-${PYSITELIB}/xen/xend/server/console.py
-${PYSITELIB}/xen/xend/server/SrvConsole.py
-${PYSITELIB}/xen/xend/server/SrvRoot.py
-${PYSITELIB}/xen/xend/server/SrvEventDir.py
-${PYSITELIB}/xen/xend/server/SrvNode.py
-${PYSITELIB}/xen/xend/server/SrvDaemon.py
 ${PYSITELIB}/xen/xend/server/SrvDomain.py
-${PYSITELIB}/xen/xend/server/blkif.py
 ${PYSITELIB}/xen/xend/server/SrvDomainDir.py
-${PYSITELIB}/xen/xend/server/SrvXendLog.py
+${PYSITELIB}/xen/xend/server/SrvEventDir.py
+${PYSITELIB}/xen/xend/server/SrvNode.py
+${PYSITELIB}/xen/xend/server/SrvRoot.py
+${PYSITELIB}/xen/xend/server/SrvServer.py
 ${PYSITELIB}/xen/xend/server/SrvVnetDir.py
-${PYSITELIB}/xen/xend/server/controller.pyc
-${PYSITELIB}/xen/xend/server/SrvServer.pyc
+${PYSITELIB}/xen/xend/server/SrvXendLog.py
+${PYSITELIB}/xen/xend/server/blkif.py
+${PYSITELIB}/xen/xend/server/channel.py
+${PYSITELIB}/xen/xend/server/console.py
+${PYSITELIB}/xen/xend/server/controller.py
+${PYSITELIB}/xen/xend/server/domain.py
+${PYSITELIB}/xen/xend/server/messages.py
+${PYSITELIB}/xen/xend/server/netif.py
+${PYSITELIB}/xen/xend/server/params.py
+${PYSITELIB}/xen/xend/server/SrvBase.pyc
+${PYSITELIB}/xen/xend/server/SrvConsole.pyc
 ${PYSITELIB}/xen/xend/server/SrvConsoleDir.pyc
+${PYSITELIB}/xen/xend/server/SrvDaemon.pyc
 ${PYSITELIB}/xen/xend/server/SrvDeviceDir.pyc
-${PYSITELIB}/xen/xend/server/__init__.pyc
-${PYSITELIB}/xen/xend/server/messages.pyc
-${PYSITELIB}/xen/xend/server/SrvBase.pyc
-${PYSITELIB}/xen/xend/server/domain.pyc
 ${PYSITELIB}/xen/xend/server/SrvDir.pyc
-${PYSITELIB}/xen/xend/server/netif.pyc
-${PYSITELIB}/xen/xend/server/params.pyc
 ${PYSITELIB}/xen/xend/server/SrvDmesg.pyc
-${PYSITELIB}/xen/xend/server/channel.pyc
-${PYSITELIB}/xen/xend/server/console.pyc
-${PYSITELIB}/xen/xend/server/SrvConsole.pyc
-${PYSITELIB}/xen/xend/server/SrvRoot.pyc
-${PYSITELIB}/xen/xend/server/SrvEventDir.pyc
-${PYSITELIB}/xen/xend/server/SrvNode.pyc
-${PYSITELIB}/xen/xend/server/SrvDaemon.pyc
 ${PYSITELIB}/xen/xend/server/SrvDomain.pyc
-${PYSITELIB}/xen/xend/server/blkif.pyc
 ${PYSITELIB}/xen/xend/server/SrvDomainDir.pyc
-${PYSITELIB}/xen/xend/server/SrvXendLog.pyc
+${PYSITELIB}/xen/xend/server/SrvEventDir.pyc
+${PYSITELIB}/xen/xend/server/SrvNode.pyc
+${PYSITELIB}/xen/xend/server/SrvRoot.pyc
+${PYSITELIB}/xen/xend/server/SrvServer.pyc
 ${PYSITELIB}/xen/xend/server/SrvVnetDir.pyc
-${PYSITELIB}/xen/xend/util.pyc
-${PYSITELIB}/xen/xend/XendClient.pyc
-${PYSITELIB}/xen/xend/XendProtocol.pyc
-${PYSITELIB}/xen/xend/XendVnet.pyc
-${PYSITELIB}/xen/xend/XendError.pyc
-${PYSITELIB}/xen/xend/XendDomainInfo.pyc
-${PYSITELIB}/xen/xend/XendDomain.pyc
-${PYSITELIB}/xen/xend/XendLogging.pyc
-${PYSITELIB}/xen/xend/XendRoot.pyc
-${PYSITELIB}/xen/xend/XendDomainConfig.pyc
-${PYSITELIB}/xen/xend/XendMigrate.pyc
-${PYSITELIB}/xen/xend/PrettyPrint.pyc
-${PYSITELIB}/xen/xend/XendConsole.pyc
+${PYSITELIB}/xen/xend/server/SrvXendLog.pyc
+${PYSITELIB}/xen/xend/server/__init__.py
+${PYSITELIB}/xen/xend/server/__init__.pyc
+${PYSITELIB}/xen/xend/server/blkif.pyc
+${PYSITELIB}/xen/xend/server/channel.pyc
+${PYSITELIB}/xen/xend/server/console.pyc
+${PYSITELIB}/xen/xend/server/controller.pyc
+${PYSITELIB}/xen/xend/server/domain.pyc
+${PYSITELIB}/xen/xend/server/messages.pyc
+${PYSITELIB}/xen/xend/server/netif.pyc
+${PYSITELIB}/xen/xend/server/params.pyc
+${PYSITELIB}/xen/xend/sxp.py
 ${PYSITELIB}/xen/xend/sxp.pyc
-${PYSITELIB}/xen/xend/Blkctl.pyc
-${PYSITELIB}/xen/xend/XendNode.pyc
-${PYSITELIB}/xen/xend/Vifctl.pyc
-${PYSITELIB}/xen/xend/Args.pyc
-${PYSITELIB}/xen/xend/EventServer.pyc
-${PYSITELIB}/xen/xend/EventTypes.pyc
-${PYSITELIB}/xen/xend/XendDmesg.pyc
-${PYSITELIB}/xen/xend/__init__.pyc
-${PYSITELIB}/xen/xend/XendAsynchProtocol.pyc
-${PYSITELIB}/xen/xend/encode.pyc
-${PYSITELIB}/xen/xend/XendDB.pyc
-${PYSITELIB}/xen/sv/MigrateDomain.py
-${PYSITELIB}/xen/sv/GenTabbed.py
-${PYSITELIB}/xen/sv/HTMLBase.py
-${PYSITELIB}/xen/sv/CreateDomain.py
-${PYSITELIB}/xen/sv/Wizard.py
-${PYSITELIB}/xen/sv/Main.py
-${PYSITELIB}/xen/sv/TabView.py
-${PYSITELIB}/xen/sv/DomInfo.py
-${PYSITELIB}/xen/sv/util.py
-${PYSITELIB}/xen/sv/SaveDomain.py
-${PYSITELIB}/xen/sv/Daemon.py
-${PYSITELIB}/xen/sv/NodeInfo.py
-${PYSITELIB}/xen/sv/__init__.py
-${PYSITELIB}/xen/sv/RestoreDomain.py
-${PYSITELIB}/xen/sv/DomList.py
-${PYSITELIB}/xen/sv/params.py
-${PYSITELIB}/xen/sv/MigrateDomain.pyc
-${PYSITELIB}/xen/sv/GenTabbed.pyc
-${PYSITELIB}/xen/sv/HTMLBase.pyc
-${PYSITELIB}/xen/sv/CreateDomain.pyc
-${PYSITELIB}/xen/sv/Wizard.pyc
-${PYSITELIB}/xen/sv/Main.pyc
-${PYSITELIB}/xen/sv/TabView.pyc
-${PYSITELIB}/xen/sv/DomInfo.pyc
-${PYSITELIB}/xen/sv/util.pyc
-${PYSITELIB}/xen/sv/SaveDomain.pyc
-${PYSITELIB}/xen/sv/Daemon.pyc
-${PYSITELIB}/xen/sv/NodeInfo.pyc
-${PYSITELIB}/xen/sv/__init__.pyc
-${PYSITELIB}/xen/sv/RestoreDomain.pyc
-${PYSITELIB}/xen/sv/DomList.pyc
-${PYSITELIB}/xen/sv/params.pyc
-${PYSITELIB}/xen/xm/migrate.py
+${PYSITELIB}/xen/xend/util.pyc
+${PYSITELIB}/xen/xm/__init__.py
 ${PYSITELIB}/xen/xm/create.py
-${PYSITELIB}/xen/xm/sysrq.py
+${PYSITELIB}/xen/xm/destroy.py
 ${PYSITELIB}/xen/xm/help.py
+${PYSITELIB}/xen/xm/main.py
+${PYSITELIB}/xen/xm/migrate.py
 ${PYSITELIB}/xen/xm/opts.py
-${PYSITELIB}/xen/xm/destroy.py
-${PYSITELIB}/xen/xm/__init__.py
 ${PYSITELIB}/xen/xm/shutdown.py
-${PYSITELIB}/xen/xm/main.py
-${PYSITELIB}/xen/xm/migrate.pyc
+${PYSITELIB}/xen/xm/sysrq.py
+${PYSITELIB}/xen/xm/__init__.pyc
 ${PYSITELIB}/xen/xm/create.pyc
-${PYSITELIB}/xen/xm/sysrq.pyc
+${PYSITELIB}/xen/xm/destroy.pyc
 ${PYSITELIB}/xen/xm/help.pyc
+${PYSITELIB}/xen/xm/main.pyc
+${PYSITELIB}/xen/xm/migrate.pyc
 ${PYSITELIB}/xen/xm/opts.pyc
-${PYSITELIB}/xen/xm/destroy.pyc
-${PYSITELIB}/xen/xm/__init__.pyc
 ${PYSITELIB}/xen/xm/shutdown.pyc
-${PYSITELIB}/xen/xm/main.pyc
-${PYSITELIB}/xen/__init__.pyc
-share/examples/rc.d/xend
-@dirrm ${PYSITELIB}/xen/lowlevel
-@dirrm ${PYSITELIB}/xen/util
+${PYSITELIB}/xen/xm/sysrq.pyc
+sbin/netfix
+sbin/xend
+sbin/xenperf
+sbin/xensv
+sbin/xfrd
+sbin/xm
+share/examples/xen/block-enbd
+share/examples/xen/block-file
+share/examples/xen/network
+share/examples/xen/vif-bridge
+share/examples/xen/xend-config.sxp
+share/examples/xen/xmexample1
+share/examples/xen/xmexample2
+share/examples/xen/xmexample3
+@dirrm share/examples/xen
+@dirrm ${PYSITELIB}/xen/xm
 @dirrm ${PYSITELIB}/xen/xend/server
 @dirrm ${PYSITELIB}/xen/xend
+@dirrm ${PYSITELIB}/xen/util
 @dirrm ${PYSITELIB}/xen/sv
-@dirrm ${PYSITELIB}/xen/xm
+@dirrm ${PYSITELIB}/xen/lowlevel
 @dirrm ${PYSITELIB}/xen
diff --git a/sysutils/xentools20/distinfo b/sysutils/xentools20/distinfo
index 5753cad171f..117fe78828a 100644
--- a/sysutils/xentools20/distinfo
+++ b/sysutils/xentools20/distinfo
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.5 2005/05/23 22:02:04 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2005/05/24 16:02:08 xtraeme Exp $
 
-SHA1 (xen-2.0.3-src.tgz) = eb71d43abd014c87062f5b93932947b71e32be54
-RMD160 (xen-2.0.3-src.tgz) = 13cd844dbdeccbb9a97ee0d49f5b187a5f2590e7
-Size (xen-2.0.3-src.tgz) = 2158860 bytes
-SHA1 (patch-aa) = 1c8850e9b480a2001c67228fa9e6699b3a890875
+SHA1 (xen-2.0.6-src.tgz) = 3808b8ff57decc3dea0c65c5a80665516a000487
+RMD160 (xen-2.0.6-src.tgz) = ebcdd95e3c74fb71bf732ff04694abe4fe3b6876
+Size (xen-2.0.6-src.tgz) = 2456215 bytes
+SHA1 (patch-aa) = 2c3ca679003895f19f11dcd5038dbfa2de241a74
 SHA1 (patch-ab) = 876bcc0723ff7e12e096ca1bff749f8a2ff23b16
 SHA1 (patch-ac) = a07e37a56a6d0cb8cd51b24e82a48a7bef91d233
-SHA1 (patch-ad) = cab8686b928aaf33e0a4c4ffec4190aa48955398
+SHA1 (patch-ad) = 6f242d6ad89b4c019cd291313ba8eaa28ae3bfbb
 SHA1 (patch-ae) = b5a6521b14dd24cb52713bd83ec91422ef63161e
 SHA1 (patch-af) = 5467e64fbd49d6ca35718d42864ed7b44fe76df3
-SHA1 (patch-ag) = 06d0c5a5dc85bdf0245f4ee00ba49fc98f9ee39e
-SHA1 (patch-ah) = 5be50f707fa8ba2a7ace2a7828522bb1d97d214b
-SHA1 (patch-ai) = 2cee0445d036f5618b7dac256a1a4ce5b32356d7
-SHA1 (patch-aj) = 487c46a0db1231c548f43db7d8b2465a8686c3f6
-SHA1 (patch-ak) = 42f1018bb415f1d361d58b86640a58fd119de8ec
-SHA1 (patch-al) = 3811e3fc932c2db158d77585beab4a39b3f7ebf8
+SHA1 (patch-ag) = 6a19a5cf75894e0d5ba91e4d4214b6bd59de60df
+SHA1 (patch-ah) = 610be8e20e2ef27ce838519144b7b0678b7d6830
+SHA1 (patch-aj) = 8712a2641e9aad2468d46d0f554cefca2259b230
+SHA1 (patch-ak) = 2d38643ac8308cbd79876c150a42d463b1c2bfbd
+SHA1 (patch-al) = 6394c54681af520fa21a6839cf32b84a51a146d5
 SHA1 (patch-am) = 7392057d2da107e935775627afe2498a81903f71
 SHA1 (patch-an) = 6540433dd5e3527ea635a585a1094606fd22cc1a
 SHA1 (patch-ao) = 2f3fb89cf3209e19d3f5e2e13017981f7c98b8b3
 SHA1 (patch-ap) = da9d70ec8c61e8524b0b268113d178ec1d0d176c
 SHA1 (patch-aq) = 96ac4caaa268069ee02962a917f85753515747be
-SHA1 (patch-ar) = 4f4b47a47698720042fe8c30a7ac74304295740d
 SHA1 (patch-as) = 333da168af43dae9a4e8695409cbd006e7fcf097
+SHA1 (patch-at) = 0964bc7dd23ff6fcd596d6a8564d9e3033f34563
diff --git a/sysutils/xentools20/files/xend.sh b/sysutils/xentools20/files/xend.sh
index f36bfc2f832..27be32ff7a0 100644
--- a/sysutils/xentools20/files/xend.sh
+++ b/sysutils/xentools20/files/xend.sh
@@ -1,12 +1,11 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: xend.sh,v 1.2 2005/04/01 19:06:12 bouyer Exp $
+# $NetBSD: xend.sh,v 1.3 2005/05/24 16:02:08 xtraeme Exp $
 #
 # PROVIDE: xend
 # REQUIRE: disks network
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
@@ -14,7 +13,16 @@ name="xend"
 rcvar=$name
 command="@PREFIX@/sbin/xend"
 command_interpreter="@RCD_INTERPRETER@"
-start_cmd="echo starting ${name}. && ${command} start"
+start_cmd="@ECHO@ Starting ${name}. && ${command} start"
+start_precmd="test_kern_privcmd"
+
+test_kern_privcmd()
+{
+	if [ ! -f /kern/xen/privcmd ]; then
+		@ECHO@ "${name}: Cannot find /kern/xen/privcmd!"
+		exit 1
+	fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/sysutils/xentools20/patches/patch-aa b/sysutils/xentools20/patches/patch-aa
index 04648c83ef3..79671ffa2ee 100644
--- a/sysutils/xentools20/patches/patch-aa
+++ b/sysutils/xentools20/patches/patch-aa
@@ -1,28 +1,32 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- Makefile.orig	2005-01-12 13:22:26.000000000 +0100
-+++ Makefile	2005-01-22 01:09:07.000000000 +0100
-@@ -1,23 +1,16 @@
+--- Makefile.orig	2005-05-24 01:59:08.000000000 +0000
++++ Makefile	2005-05-24 01:59:28.000000000 +0000
+@@ -5,24 +5,22 @@
+ SUBDIRS += libxutil
+ SUBDIRS += libxc
+ SUBDIRS += misc
+-SUBDIRS += examples
+-SUBDIRS += xentrace
+ SUBDIRS += python
+ SUBDIRS += xfrd
  
- all:	
--	$(MAKE) -C check
- 	$(MAKE) -C libxutil
- 	$(MAKE) -C libxc
- 	$(MAKE) -C misc
-	$(MAKE) -C examples
--	$(MAKE) -C xentrace
- 	$(MAKE) -C python
- 	$(MAKE) -C xfrd
+ .PHONY: all install clean check check_clean
  
- install: 
--ifneq ($(dist),yes)
--	$(MAKE) -C check install
--endif
- 	$(MAKE) -C libxutil install
- 	$(MAKE) -C libxc install
- 	$(MAKE) -C misc install
--	$(MAKE) -C examples install
--	$(MAKE) -C xentrace install
- 	$(MAKE) -C python install
- 	$(MAKE) -C xfrd install
- 	$(MAKE) -C sv install
+-all: check
++all:
+ 	@set -e; for subdir in $(SUBDIRS); do \
+ 		$(MAKE) -C $$subdir $@; \
+ 	done
+ 
+-install: check
++install:
+ 	@set -e; for subdir in $(SUBDIRS); do \
+ 		$(MAKE) -C $$subdir $@; \
+ 	done
+ 
+-clean: check_clean
++clean:
+ 	@set -e; for subdir in $(SUBDIRS); do \
+ 		$(MAKE) -C $$subdir $@; \
+ 	done
diff --git a/sysutils/xentools20/patches/patch-ad b/sysutils/xentools20/patches/patch-ad
index 50419193899..b191869aa91 100644
--- a/sysutils/xentools20/patches/patch-ad
+++ b/sysutils/xentools20/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-ad,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- xfrd/Makefile.orig	2005-01-12 13:22:27.000000000 +0100
-+++ xfrd/Makefile	2005-01-22 18:44:53.000000000 +0100
-@@ -7,7 +7,7 @@
+--- xfrd/Makefile.orig	2005-05-24 00:25:29.000000000 +0000
++++ xfrd/Makefile	2005-05-24 00:26:27.000000000 +0000
+@@ -11,7 +11,7 @@
  XEN_ROOT  = ../..
- include $(XEN_ROOT)/tools/Make.defs
+ include $(XEN_ROOT)/tools/Rules.mk
  
 -XFRD_INSTALL_DIR = /usr/sbin
-+XFRD_INSTALL_DIR = ${PREFIX}/sbin
++XFRD_INSTALL_DIR = $(PREFIX)/sbin
  
  vpath %.h      $(XEN_LIBXC)
  INCLUDES += -I $(XEN_LIBXC)
-@@ -48,7 +48,7 @@
+@@ -50,7 +50,7 @@
  XFRD_LIBS :=
  
  XFRD_LIBS += -L $(XEN_LIBXC) -lxc
diff --git a/sysutils/xentools20/patches/patch-ag b/sysutils/xentools20/patches/patch-ag
index 0cf03a7eee8..9180b7c5de3 100644
--- a/sysutils/xentools20/patches/patch-ag
+++ b/sysutils/xentools20/patches/patch-ag
@@ -1,25 +1,25 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-ag,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- misc/Makefile.orig	2005-01-12 13:22:25.000000000 +0100
-+++ misc/Makefile	2005-01-22 18:44:36.000000000 +0100
-@@ -20,10 +20,10 @@
+--- misc/Makefile.orig	2005-05-24 00:28:15.000000000 +0000
++++ misc/Makefile	2005-05-24 00:30:05.000000000 +0000
+@@ -24,10 +24,10 @@
  	$(MAKE) -C miniterm
  
- install: all
--	mkdir -p $(prefix)/usr/bin
--	mkdir -p $(prefix)/usr/sbin
--	install -m0755 $(INSTALL_BIN) $(prefix)/usr/bin
--	install -m0755 $(INSTALL_SBIN) $(prefix)/usr/sbin
-+	mkdir -p $(prefix)/${PREFIX}/bin
-+	mkdir -p $(prefix)/${PREFIX}/sbin
-+	install -m0755 $(INSTALL_BIN) $(prefix)/${PREFIX}/bin
-+	install -m0755 $(INSTALL_SBIN) $(prefix)/${PREFIX}/sbin
- 	$(MAKE) -C miniterm install
+ install: build
+-	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
+-	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+-	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
+-	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
++	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin
++	$(BSD_INSTALL_SCRIPT) $(INSTALL_BIN) $(PREFIX)/bin
++	$(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN) $(PREFIX)/sbin
+ #       No sense in installing miniterm on the Xen box.
+ #	$(MAKE) -C miniterm install
  
- clean:
-@@ -31,4 +31,4 @@
- 	$(MAKE) -C miniterm clean
+@@ -39,4 +39,4 @@
+ 	$(CC) -c $(CFLAGS) -o $@ $<
  
- %: %.c $(HDRS) Makefile
+ $(TARGETS): %: %.o Makefile
 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc -L$(XEN_LIBXUTIL) -lxutil
 +	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc -L$(XEN_LIBXUTIL) $(LDFLAGS) -lxutil
diff --git a/sysutils/xentools20/patches/patch-ah b/sysutils/xentools20/patches/patch-ah
index 43d3ce7d966..a6c05d7477c 100644
--- a/sysutils/xentools20/patches/patch-ah
+++ b/sysutils/xentools20/patches/patch-ah
@@ -1,27 +1,33 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-ah,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- xentrace/Makefile.orig	2005-01-12 13:22:22.000000000 +0100
-+++ xentrace/Makefile	2005-01-22 18:44:45.000000000 +0100
-@@ -20,15 +20,15 @@
- all: $(BIN)
+--- libxc/Makefile.orig	2005-05-24 00:31:07.000000000 +0000
++++ libxc/Makefile	2005-05-24 00:34:06.000000000 +0000
+@@ -68,13 +68,13 @@
+ 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
  
- install: all
--	mkdir -p $(prefix)/usr/bin
--	mkdir -p $(prefix)/usr/man/man1
--	mkdir -p $(prefix)/usr/man/man8
--	install -m0755 $(BIN) $(SCRIPTS) $(prefix)/usr/bin
--	install -m0644 $(MAN1) $(prefix)/usr/man/man1
--	install -m0644 $(MAN8) $(prefix)/usr/man/man8
-+	mkdir -p $(prefix)/${PREFIX}/bin
-+	mkdir -p $(prefix)/${PREFIX}/man/man1
-+	mkdir -p $(prefix)/${PREFIX}/man/man8
-+	install -m0755 $(BIN) $(SCRIPTS) $(prefix)/${PREFIX}/bin
-+	install -m0644 $(MAN1) $(prefix)/${PREFIX}/man/man1
-+	install -m0644 $(MAN8) $(prefix)/${PREFIX}/man/man8
+ install: build
+-	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
+-	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+-	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+-	$(INSTALL_DATA) libxc.a $(DESTDIR)/usr/lib
+-	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
+-	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
+-	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
++	$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/include
++	$(BSD_INSTALL_LIB) libxc.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxc.a $(PREFIX)/lib
++	ln -sf libxc.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxc.so.$(MAJOR)
++	ln -sf libxc.so.$(MAJOR) $(PREFIX)/lib/libxc.so
++	$(BSD_INSTALL_DATA) xc.h $(PREFIX)/include
  
  clean:
- 	$(RM) *.a *.so *.o *.rpm $(BIN)
+ 	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
+@@ -97,6 +97,6 @@
+ 	ln -sf $< $@
  
- %: %.c $(HDRS) Makefile
--	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil
-+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc $(LDFLAGS) -lxutil
+ libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
++	$(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil $(LDFLAGS) -lxutil -lz
+ 
+ -include $(DEPS)
diff --git a/sysutils/xentools20/patches/patch-ai b/sysutils/xentools20/patches/patch-ai
deleted file mode 100644
index 39be47b490c..00000000000
--- a/sysutils/xentools20/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
-
---- libxc/Makefile.orig	2005-01-22 18:44:30.000000000 +0100
-+++ libxc/Makefile	2005-01-22 18:44:15.000000000 +0100
-@@ -62,12 +62,12 @@
- 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
- 
- install: all
--	mkdir -p $(prefix)/usr/lib
--	mkdir -p $(prefix)/usr/include
--	install -m0755 $(LIB) $(prefix)/usr/lib
--	ln -sf libxc.so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/libxc.so.$(MAJOR)
--	ln -sf libxc.so.$(MAJOR) $(prefix)/usr/lib/libxc.so
--	install -m0644 xc.h $(prefix)/usr/include
-+	mkdir -p $(prefix)/${PREFIX}/lib
-+	mkdir -p $(prefix)/${PREFIX}/include
-+	install -m0755 $(LIB) $(prefix)/${PREFIX}/lib
-+	ln -sf libxc.so.$(MAJOR).$(MINOR) $(prefix)/${PREFIX}/lib/libxc.so.$(MAJOR)
-+	ln -sf libxc.so.$(MAJOR) $(prefix)/${PREFIX}/lib/libxc.so
-+	install -m0644 xc.h $(prefix)/${PREFIX}/include
- 
- clean:
- 	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
-@@ -86,6 +86,6 @@
- libxc.so.$(MAJOR):
- 	ln -sf libxc.so.$(MAJOR).$(MINOR) $@
- libxc.so.$(MAJOR).$(MINOR): $(OBJS)
--	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil -lxutil -lz
-+	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil $(LDFLAGS) -lxutil -lz
- 
- -include $(DEPS)
diff --git a/sysutils/xentools20/patches/patch-aj b/sysutils/xentools20/patches/patch-aj
index 5bf95910f8c..ac077190adf 100644
--- a/sysutils/xentools20/patches/patch-aj
+++ b/sysutils/xentools20/patches/patch-aj
@@ -1,19 +1,21 @@
-$NetBSD: patch-aj,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-aj,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- libxutil/Makefile.orig	2005-01-22 01:45:45.000000000 +0100
-+++ libxutil/Makefile	2005-01-22 01:45:50.000000000 +0100
-@@ -62,10 +62,10 @@
+--- libxutil/Makefile.orig	2005-05-24 00:36:28.000000000 +0000
++++ libxutil/Makefile	2005-05-24 00:38:14.000000000 +0000
+@@ -65,11 +65,11 @@
  	fi
  
- install: all
--	mkdir -p $(prefix)/usr/lib
--	install -m0755 $(LIB) $(prefix)/usr/lib
--	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/$(LIB_NAME).so.$(MAJOR)
--	ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/usr/lib/$(LIB_NAME).so
-+	mkdir -p $(prefix)/${PREFIX}/lib
-+	install -m0755 $(LIB) $(prefix)/${PREFIX}/lib
-+	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/${PREFIX}/lib/$(LIB_NAME).so.$(MAJOR)
-+	ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/${PREFIX}/lib/$(LIB_NAME).so
+ install: build
+-	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
+-	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+-	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
+-	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxutil.so.$(MAJOR)
+-	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/lib/libxutil.so
++	$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxutil.a $(PREFIX)/lib
++	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxutil.so.$(MAJOR)
++	ln -sf libxutil.so.$(MAJOR) $(PREFIX)/lib/libxutil.so
  
  clean:
- 	$(RM) *.a *.so *.so.* *.o *.rpm 
+ 	$(RM) *.a *.so* *.o *.opic *.rpm 
diff --git a/sysutils/xentools20/patches/patch-ak b/sysutils/xentools20/patches/patch-ak
index 08b028184a1..e2f3d85fbb6 100644
--- a/sysutils/xentools20/patches/patch-ak
+++ b/sysutils/xentools20/patches/patch-ak
@@ -1,15 +1,15 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-ak,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- misc/miniterm/Makefile.orig	2005-01-22 01:47:40.000000000 +0100
-+++ misc/miniterm/Makefile	2005-01-22 01:48:00.000000000 +0100
-@@ -6,8 +6,8 @@
+--- misc/miniterm/Makefile.orig	2005-05-24 00:38:57.000000000 +0000
++++ misc/miniterm/Makefile	2005-05-24 00:39:42.000000000 +0000
+@@ -9,8 +9,8 @@
  all: $(TARGET)
  
  install: all
--	mkdir -p $(prefix)/usr/bin
--	install -m0755 $(TARGET) $(prefix)/usr/bin
-+	mkdir -p $(prefix)/${PREFIX}/bin
-+	install -m0755 $(TARGET) $(prefix)/${PREFIX}/bin
+-	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
+-	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
++	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/bin
  
  clean:
  	$(RM) *.o $(TARGET) *~
diff --git a/sysutils/xentools20/patches/patch-al b/sysutils/xentools20/patches/patch-al
index e4508e0a950..163b6dceee7 100644
--- a/sysutils/xentools20/patches/patch-al
+++ b/sysutils/xentools20/patches/patch-al
@@ -1,23 +1,22 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $
+$NetBSD: patch-al,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 
---- python/Makefile.orig	2005-01-22 01:21:14.000000000 +0100
-+++ python/Makefile	2005-01-22 01:51:09.000000000 +0100
-@@ -1,14 +1,14 @@
+--- python/Makefile.orig	2005-05-22 10:56:26.000000000 +0000
++++ python/Makefile	2005-05-24 01:26:40.000000000 +0000
+@@ -4,14 +4,14 @@
  
- all:
--	python setup.py build
-+	$(PYTHON) setup.py build
+ all: build
+ build:
+-	CFLAGS="$(CFLAGS)" python setup.py build
++	python setup.py build
  
+ ifndef XEN_PYTHON_NATIVE_INSTALL
  install: all
- 	if [ "$(prefix)" = "" ]; then                   \
--	    python setup.py install;                    \
-+	    $(PYTHON) setup.py install;                    \
- 	elif [ "$(dist)" = "yes" ]; then                \
--	    python setup.py install --home="$(prefix)"; \
-+	    $(PYTHON) setup.py install --home="$(prefix)"; \
- 	else                                            \
--	    python setup.py install --root="$(prefix)"; \
-+	    $(PYTHON) setup.py install --root="$(prefix)"; \
- 	fi
+-	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"
++	python setup.py install
+ else
+ install: all
+-	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
++	python setup.py install
+ endif
  
  clean:
diff --git a/sysutils/xentools20/patches/patch-ar b/sysutils/xentools20/patches/patch-ar
deleted file mode 100644
index aae6a5183c2..00000000000
--- a/sysutils/xentools20/patches/patch-ar
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/03/10 19:43:25 bouyer Exp $
---- ../xen/include/public/io/domain_controller.h.orig	2005-03-10 20:16:32.000000000 +0100
-+++ ../xen/include/public/io/domain_controller.h	2005-01-12 13:22:28.000000000 +0100
-@@ -81,7 +81,7 @@
- 
- /* These are used by both front-end and back-end drivers. */
- #define blkif_vdev_t   u16
--#define blkif_pdev_t   u16
-+#define blkif_pdev_t   u32
- #define blkif_sector_t u64
- 
- /*
-@@ -183,7 +183,6 @@
-     blkif_sector_t sector_start;   /*  0 */
-     blkif_sector_t sector_length;  /*  8 */
-     blkif_pdev_t   device;         /* 16 */
--    u16            __pad;          /* 18 */
- } PACKED blkif_extent_t; /* 20 bytes */
- 
- /* Non-specific 'okay' return. */
diff --git a/sysutils/xentools20/patches/patch-at b/sysutils/xentools20/patches/patch-at
new file mode 100644
index 00000000000..9b2202614dd
--- /dev/null
+++ b/sysutils/xentools20/patches/patch-at
@@ -0,0 +1,24 @@
+$NetBSD: patch-at,v 1.1 2005/05/24 16:02:08 xtraeme Exp $
+
+--- python/xen/xend/XendRoot.py.orig	2005-05-24 06:36:02.000000000 +0200
++++ python/xen/xend/XendRoot.py	2005-05-24 06:36:47.000000000 +0200
+@@ -28,16 +28,16 @@
+     dbroot_default = "/var/lib/xen/xend-db"
+ 
+     """Default path to the config file."""
+-    config_default = "/etc/xen/xend-config.sxp"
++    config_default = "@XENDCONFDIR@/xend-config.sxp"
+ 
+     """Environment variable used to override config_default."""
+     config_var     = "XEND_CONFIG"
+ 
+     """Where network control scripts live."""
+-    network_script_dir = "/etc/xen/scripts"
++    network_script_dir = "@XENDCONFDIR@"
+ 
+     """Where block control scripts live."""
+-    block_script_dir = "/etc/xen/scripts"
++    block_script_dir = "@XENDCONFDIR@"
+ 
+     """Default path to the log file. """
+     logfile_default = "/var/log/xend.log"