Make it build and run on amd64.

4 files changed, 46 insertions, 11 deletions

diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 9b6b3b9218e..9599f3adbd6 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2007/11/17 16:45:32 bouyer Exp $
 #
 
 VERSION=		3.1.0
@@ -18,7 +18,8 @@ DEPENDS+=		${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 
 PKG_SYSCONFSUBDIR=	xen
 
-ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386
+ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-*-i386 NetBSD-*-x86_64
 
 CONFLICTS+=		libxen-[0-9]*
 CONFLICTS+=		xentools20-[0-9]*
@@ -36,7 +37,13 @@ MAKE_ENV+=		CONFIG_NetBSD=yes
 MAKE_ENV+=		CONFIG_MBOOTPACK=no
 MAKE_ENV+=		EGDIR=${EGDIR:Q}
 MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
-MAKE_ENV+=		XEN_TARGET_ARCH="x86_32"
+.if ${MACHINE_ARCH} == "i386"
+MAKE_ENV+=		XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32"
+.elif  ${MACHINE_ARCH} == "x86_64"
+MAKE_ENV+=		XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
+.else
+MAKE_ENV+=		XEN_TARGET_ARCH="unsupported"
+.endif
 PYTHON_VERSIONS_ACCEPTED= 24 23
 PY_PATCHPLIST=		yes
 PYTHON_PATCH_SCRIPTS+=	misc/xm
@@ -175,6 +182,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${EGDIR}/${s}
 .endfor
 	${RM} -rf ${PREFIX}/lib/xen
+	${INSTALL_DATA_DIR} ${PREFIX}/man/man1 ${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKDIR}/xm.1 ${PREFIX}/man/man1
diff --git a/sysutils/xentools3/distinfo b/sysutils/xentools3/distinfo
index 8dbdcc4df8a..c2abd3f29f5 100644
--- a/sysutils/xentools3/distinfo
+++ b/sysutils/xentools3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2007/11/17 16:45:32 bouyer Exp $
 
 SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
 RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
@@ -29,7 +29,7 @@ SHA1 (patch-cb) = 0bf2513749e28ff955caabd76bf79dd8280b61ed
 SHA1 (patch-cc) = 3e618c7da953115e7b3c7fe07f17b75ef2c2bb34
 SHA1 (patch-cd) = 8fc057e9dc98e356ba46cdf183a8891c59c005b8
 SHA1 (patch-cf) = 05c5e86d33d31a2216c2751a2bf684c8d5d06746
-SHA1 (patch-cg) = 26aa623c34b8b0aebffd93451291264ad7d99c94
+SHA1 (patch-cg) = 36073c7327f187702203108b3e7596178aac3327
 SHA1 (patch-ch) = ebe2aedf1ecd1dce66f4a8a25ef5e83ee1d4c60d
 SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
 SHA1 (patch-cj) = 166e2190a31bba842da1111310ba7b1ad35a5d81
@@ -44,3 +44,4 @@ SHA1 (patch-cs) = f3932e1b49870078532316ccb1dfa64378c3e8e4
 SHA1 (patch-ct) = 14259d4c223b12218a07f2a2860e2706d40157b8
 SHA1 (patch-cu) = 90b4a39a037c6f2aeb694e1df8e7a7165b51cdbc
 SHA1 (patch-cv) = 1fea2a1cd139e2e46655622ad5f02b37e1501e0b
+SHA1 (patch-cw) = 7fad0847bb87beddb9330d067132d1f7fc784222
diff --git a/sysutils/xentools3/patches/patch-cg b/sysutils/xentools3/patches/patch-cg
index d3070124567..beb75034982 100644
--- a/sysutils/xentools3/patches/patch-cg
+++ b/sysutils/xentools3/patches/patch-cg
@@ -1,7 +1,7 @@
-$NetBSD: patch-cg,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
+$NetBSD: patch-cg,v 1.2 2007/11/17 16:45:32 bouyer Exp $
 
---- xenstat/xentop/xentop.c.orig	2006-10-04 04:28:30.000000000 +0200
-+++ xenstat/xentop/xentop.c	2006-10-17 00:16:10.000000000 +0200
+--- xenstat/xentop/xentop.c.orig	2007-05-18 16:45:21.000000000 +0200
++++ xenstat/xentop/xentop.c	2007-11-17 14:50:57.000000000 +0100
 @@ -18,7 +18,8 @@
   *  along with this program; if not, write to the Free Software
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -12,7 +12,7 @@ $NetBSD: patch-cg,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
  #include <ctype.h>
  #include <errno.h>
  #include <stdio.h>
-@@ -27,7 +28,11 @@
+@@ -28,7 +29,11 @@
  #include <sys/time.h>
  #include <time.h>
  #include <unistd.h>
@@ -24,7 +24,21 @@ $NetBSD: patch-cg,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
  
  #include <xenstat.h>
  
-@@ -895,6 +900,7 @@
+@@ -740,10 +745,11 @@
+ 	unsigned i, num_domains = 0;
+ 	unsigned long long used = 0;
+ 	xenstat_domain *domain;
++	time_t curt;
+ 
+ 	/* Print program name, current time, and number of domains */
+-	strftime(time_str, TIME_STR_LEN, TIME_STR_FORMAT,
+-	         localtime(&curtime.tv_sec));
++	curt = curtime.tv_sec;
++	strftime(time_str, TIME_STR_LEN, TIME_STR_FORMAT, localtime(&curt));
+ 	num_domains = xenstat_node_num_domains(cur_node);
+ 	ver_str = xenstat_node_xen_version(cur_node);
+ 	print("xentop - %s   Xen %s\n", time_str, ver_str);
+@@ -909,6 +915,7 @@
  /* Output all VBD information */
  void do_vbd(xenstat_domain *domain)
  {
@@ -32,7 +46,7 @@ $NetBSD: patch-cg,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
  	int i = 0;
  	xenstat_vbd *vbd;
  	unsigned num_vbds = 0;
-@@ -911,6 +917,7 @@
+@@ -933,6 +940,7 @@
  		      xenstat_vbd_rd_reqs(vbd),
  		      xenstat_vbd_wr_reqs(vbd));
  	}
diff --git a/sysutils/xentools3/patches/patch-cw b/sysutils/xentools3/patches/patch-cw
new file mode 100644
index 00000000000..91a6071dd80
--- /dev/null
+++ b/sysutils/xentools3/patches/patch-cw
@@ -0,0 +1,12 @@
+$NetBSD: patch-cw,v 1.1 2007/11/17 16:45:32 bouyer Exp $
+
+--- python/xen/xend/arch.py.orig	2007-11-17 16:30:03.000000000 +0100
++++ python/xen/xend/arch.py	2007-11-17 16:30:26.000000000 +0100
+@@ -25,6 +25,7 @@
+     "i586": "x86",
+     "i686": "x86",
+     "x86_64": "x86",
++    "amd64": "x86",
+     "i86pc": "x86",
+     "ia64": "ia64",
+     "ppc": "powerpc",