Index: branches/2016Q4/sysutils/xen-tools/Makefile
===================================================================
--- branches/2016Q4/sysutils/xen-tools/Makefile	(revision 428668)
+++ branches/2016Q4/sysutils/xen-tools/Makefile	(revision 428669)
@@ -1,85 +1,86 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
 PORTVERSION=	4.7.1
-PORTREVISION=   0
+PORTREVISION=   1
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Xen management tool, based on LibXenlight
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 
 BROKEN_FreeBSD_10=	does not build
 
 LIB_DEPENDS=	libyajl.so:devel/yajl \
 		liblzo2.so:archivers/lzo2 \
 		libpixman-1.so:x11/pixman \
 		libargp.so:devel/argp-standalone
 BUILD_DEPENDS=	dev86>0:devel/dev86 \
 		seabios>0:misc/seabios \
 		markdown>0:textproc/markdown
 
 OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than amd64"
 
 USES=		cpe gettext gmake libtool localbase:ldflags perl5 pkgconfig \
 		python shebangfix
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	clang=y
 QEMU_ARGS=	--disable-gtk \
 		--disable-smartcard-nss \
 		--disable-sdl \
 		--disable-vte \
 		--disable-curses \
 		--disable-tools \
 		--disable-curl \
 		--cxx=c++
 
 EXTRA_PATCHES=	${FILESDIR}/var_paths.patch:-p1 \
 		${FILESDIR}/xsa198.patch:-p1 \
 		${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch \
-		${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch
+		${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch \
+		${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch
 
 CONFIGURE_ARGS+=	--with-extra-qemuu-configure-args="${QEMU_ARGS}" \
 			--with-system-seabios=${LOCALBASE}/share/seabios/bios.bin
 
 # Disable bash and xgettext tests, they are not needed on FreeBSD.
 CONFIGURE_ENV+=		ac_cv_path_BASH=${TRUE}
 
 SHEBANG_FILES=	tools/misc/xencov_split \
 		tools/misc/xen-ringwatch
 ALL_TARGET=	tools docs
 INSTALL_TARGET=	install-tools install-docs
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		only supported on FreeBSD
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} "s,x86_64,amd64,g" ${WRKSRC}/tools/configure
 	@${REINPLACE_CMD} -e "s,/var/lib,/var/db,g" \
 		${WRKSRC}/tools/Makefile \
 		${WRKSRC}/tools/libxc/include/xenguest.h \
 		${WRKSRC}/tools/libxl/libxl_dom.c \
 		${WRKSRC}/tools/libxl/libxl_dm.c \
 		${WRKSRC}/tools/qemu-xen-traditional/i386-dm/helper2.c \
 		${WRKSRC}/docs/man/*
 	@for p in `ls ${FILESDIR}/*qemuu*.patch 2>/dev/null`; do \
 		${ECHO_CMD} "====> Applying $${p##*/}" ; \
 		${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \
 	done
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/xen
 
 .include <bsd.port.mk>
Index: branches/2016Q4/sysutils/xen-tools/files/0001-libs-xenstore-set-correct-FreeBSD-device.patch
===================================================================
--- branches/2016Q4/sysutils/xen-tools/files/0001-libs-xenstore-set-correct-FreeBSD-device.patch	(nonexistent)
+++ branches/2016Q4/sysutils/xen-tools/files/0001-libs-xenstore-set-correct-FreeBSD-device.patch	(revision 428669)
@@ -0,0 +1,32 @@
+From 7ff99b232e0f91a5189f429498868bfccf8d7154 Mon Sep 17 00:00:00 2001
+From: Roger Pau Monne <roger.pau@citrix.com>
+Date: Mon, 12 Dec 2016 16:07:40 +0000
+Subject: [PATCH] libs/xenstore: set correct FreeBSD device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The path to the xenstore FreeBSD device is /dev/xen/xenstore.
+
+Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
+Acked-by: Wei Liu <wei.liu2@citrix.com>
+---
+ tools/xenstore/xs_lib.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
+index 5ef3d6d..3e43f88 100644
+--- a/tools/xenstore/xs_lib.c
++++ b/tools/xenstore/xs_lib.c
+@@ -85,6 +85,8 @@ const char *xs_domain_dev(void)
+ 	return "/proc/xen/xenbus";
+ #elif defined(__NetBSD__)
+ 	return "/kern/xen/xenbus";
++#elif defined(__FreeBSD__)
++	return "/dev/xen/xenstore";
+ #else
+ 	return "/dev/xen/xenbus";
+ #endif
+-- 
+2.10.1 (Apple Git-78)
+

Property changes on: branches/2016Q4/sysutils/xen-tools/files/0001-libs-xenstore-set-correct-FreeBSD-device.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 428668)
+++ branches/2016Q4	(revision 428669)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r428628