Fix paths in man pages. Ride the package version change from previous commit.

5 files changed, 137 insertions, 7 deletions

diff --git a/sysutils/xentools30/Makefile b/sysutils/xentools30/Makefile
index 651b5f8ad1c..0fa018a7415 100644
--- a/sysutils/xentools30/Makefile
+++ b/sysutils/xentools30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/04/28 17:14:50 bouyer Exp $
+# $NetBSD: Makefile,v 1.10 2007/04/28 17:41:31 bouyer Exp $
 #
 
 DISTNAME=		xen-3.0.4_1-src
@@ -132,11 +132,15 @@ pre-build:
 	${TEST} -f ${WRKSRC}/libxc/xen/NetBSD/xenio3.h || \
 		${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen/NetBSD
 	${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/
-	pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 \
-	    ${WRKDIR}/xend-config.sxp.5
-	pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 \
-	    ${WRKDIR}/xmdomain.cfg.5
-	pod2man ${WRKSRC}/../docs/man/xm.pod.1 ${WRKDIR}/xm.1
+	pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5  |\
+	    sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+	    >${WRKDIR}/xend-config.sxp.5
+	pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\
+	    sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+	    >${WRKDIR}/xmdomain.cfg.5
+	pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\
+	    sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+	    >${WRKDIR}/xm.1
 
 .if ${OPSYS} == "NetBSD"
 post-build:
diff --git a/sysutils/xentools30/distinfo b/sysutils/xentools30/distinfo
index a1799bda768..17081fdb3ae 100644
--- a/sysutils/xentools30/distinfo
+++ b/sysutils/xentools30/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/04/28 17:14:50 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2007/04/28 17:41:31 bouyer Exp $
 
 SHA1 (xen-3.0.4_1-src.tgz) = 7ca5af70996215229e143c7563e69b3719284a95
 RMD160 (xen-3.0.4_1-src.tgz) = f869eec35f6afe0bc9824ce2eb4a600f789d423b
@@ -36,3 +36,6 @@ SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
 SHA1 (patch-cj) = 166e2190a31bba842da1111310ba7b1ad35a5d81
 SHA1 (patch-ck) = 3783d9b4b9344670bae2f35e2ac7f11e2ec9ce7b
 SHA1 (patch-cl) = f7456d0692331a86d31e83b71bcb72d35979e0d1
+SHA1 (patch-cm) = 802d395f1dc391a827487bbc9fcfe2bbd6af07de
+SHA1 (patch-cn) = 40ae04194cca94b112133e962d4cf7487412925a
+SHA1 (patch-co) = 470535c84115dc3d96ec7e30d1e5c2380af27133
diff --git a/sysutils/xentools30/patches/patch-cm b/sysutils/xentools30/patches/patch-cm
new file mode 100644
index 00000000000..ac9acb7a818
--- /dev/null
+++ b/sysutils/xentools30/patches/patch-cm
@@ -0,0 +1,47 @@
+$NetBSD: patch-cm,v 1.1 2007/04/28 17:41:31 bouyer Exp $
+
+--- ../docs/man/xend-config.sxp.pod.5.orig	2007-01-08 16:00:44.000000000 +0100
++++ ../docs/man/xend-config.sxp.pod.5	2007-04-28 19:21:52.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ =head1 SYNOPSIS
+ 
+-/etc/xen/xend-config.sxp
++@XENDCONFDIR@/xend-config.sxp
+ 
+ =head1 DESCRIPTION
+ 
+@@ -12,7 +12,7 @@
+ parameters which determine the behavior of the daemon at runtime.
+ 
+ The parameters are specified in S-expression format.  See the example
+-configuration file in I</etc/xen/xend-config.sxp> for details.
++configuration file in I<@XENDCONFDIR@/xend-config.sxp> for details.
+ 
+ =head1 OPTIONS
+ 
+@@ -82,13 +82,13 @@
+ 
+ =item I<network-script>
+ 
+-The name of the script in I</etc/xen/scripts> that will be run to
++The name of the script in I<@XENDCONFDIR@/scripts> that will be run to
+ setup the networking environment.  This can be any name, but in
+ general is either I<network-bridge> or I<network-route>.
+ 
+ =item I<vif-script>
+ 
+-The name of the script in I</etc/xen/scripts> that will be run to
++The name of the script in I<@XENDCONFDIR@/scripts> that will be run to
+ setup a virtual interface when it is created or destroyed.  This needs
+ to (in general) work in unison with the I<network-script>.
+ 
+@@ -113,7 +113,7 @@
+ 
+ The name of an application or script that can handle external device
+ migration, such as for example virtual TPM migration. An example
+-script is I</etc/xen/scripts/external-device-migrate>.
++script is I<@XENDCONFDIR@/scripts/external-device-migrate>.
+ 
+ =back
+ 
diff --git a/sysutils/xentools30/patches/patch-cn b/sysutils/xentools30/patches/patch-cn
new file mode 100644
index 00000000000..312e42300b6
--- /dev/null
+++ b/sysutils/xentools30/patches/patch-cn
@@ -0,0 +1,36 @@
+$NetBSD: patch-cn,v 1.1 2007/04/28 17:41:31 bouyer Exp $
+
+--- ../docs/man/xmdomain.cfg.pod.5.orig	2007-01-08 16:00:44.000000000 +0100
++++ ../docs/man/xmdomain.cfg.pod.5	2007-04-28 19:21:52.000000000 +0200
+@@ -4,9 +4,9 @@
+ 
+ =head1 SYNOPSIS
+ 
+- /etc/xen/myxendomain
+- /etc/xen/myxendomain2
+- /etc/xen/auto/myxenautostarted
++ @XENDCONFDIR@/myxendomain
++ @XENDCONFDIR@/myxendomain2
++ @XENDCONFDIR@/auto/myxenautostarted
+ 
+ =head1 DESCRIPTION
+ 
+@@ -14,14 +14,14 @@
+ domains to create from scratch.  Each of these config files needs to
+ contain a number of required options, and may specify many more.
+ 
+-Domain configuration files live in /etc/xen by default, if you store
++Domain configuration files live in @XENDCONFDIR@ by default, if you store
+ config files anywhere else the full path to the config file must be
+ specified in the I<xm create> command.
+ 
+-/etc/xen/auto is a special case.  Domain config files in that
++@XENDCONFDIR@/auto is a special case.  Domain config files in that
+ directory will be started automatically at system boot if the
+-xendomain init script is enabled.  The contents of /etc/xen/auto
+-should be symlinks to files in /etc/xen to allow I<xm create> to be
++xendomain init script is enabled.  The contents of @XENDCONFDIR@/auto
++should be symlinks to files in @XENDCONFDIR@ to allow I<xm create> to be
+ used without full paths.
+ 
+ Options are specified by I<name = value> statements in the
diff --git a/sysutils/xentools30/patches/patch-co b/sysutils/xentools30/patches/patch-co
new file mode 100644
index 00000000000..a7505701955
--- /dev/null
+++ b/sysutils/xentools30/patches/patch-co
@@ -0,0 +1,40 @@
+$NetBSD: patch-co,v 1.1 2007/04/28 17:41:31 bouyer Exp $
+
+--- ../docs/man/xm.pod.1.orig	2007-01-08 16:00:44.000000000 +0100
++++ ../docs/man/xm.pod.1	2007-04-28 19:21:52.000000000 +0200
+@@ -72,7 +72,7 @@
+ Name=Value combinations.
+ 
+ Configfile can either be an absolute path to a file, or a relative
+-path to a file located in /etc/xen.
++path to a file located in @XENDCONFDIR@.
+ 
+ Create will return B<as soon> as the domain is started.  This B<does
+ not> mean the guest OS in the domain has actually booted, or is
+@@ -97,7 +97,7 @@
+ 
+   xm create Fedora4
+ 
+-This creates a domain with the file /etc/xen/Fedora4, and returns as
++This creates a domain with the file @XENDCONFDIR@/Fedora4, and returns as
+ soon as it is run.
+ 
+ =item I<without config file>
+@@ -798,7 +798,7 @@
+ name pre-fix for the policy xml file. The preceding name parts are
+ translated into the local path pointing to the policy xml file
+ relative to the global policy root directory
+-(/etc/xen/acm-security/policies). For example,
++(@XENDCONFDIR@/acm-security/policies). For example,
+ example.chwall_ste.client_v1 denotes the policy file
+ example/chwall_ste/client_v1-security_policy.xml relative to the
+ global policy root directory.
+@@ -889,7 +889,7 @@
+ =over 4
+ 
+ This step creates client_v1.map and client_v1.bin files in
+-/etc/xen/acm-security/policies/example/chwall_ste.
++@XENDCONFDIR@/acm-security/policies/example/chwall_ste.
+ 
+     xm makepolicy example.chwall_ste.client_v1
+