Index: head/sysutils/xen-tools/Makefile
===================================================================
--- head/sysutils/xen-tools/Makefile	(revision 470623)
+++ head/sysutils/xen-tools/Makefile	(revision 470624)
@@ -1,92 +1,93 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
 PORTVERSION=	4.7.2
 PORTREVISION=	4
 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:2.7 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}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch:-p1 \
 		${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch:-p1 \
 		${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch:-p1 \
 		${FILESDIR}/kdd.patch:-p1 \
 		${FILESDIR}/0001-xenstored-apply-a-write-transaction-rate-limit.patch:-p1 \
-		${FILESDIR}/0002-xenstored-Log-when-the-write-transaction-rate-limit-.patch:-p1
+		${FILESDIR}/0002-xenstored-Log-when-the-write-transaction-rate-limit-.patch:-p1 \
+		${FILESDIR}/0001-Backport-of-commit-858dba.patch:-p1
 
 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/xen-ringwatch \
 		tools/misc/xencov_split \
 		tools/python/scripts/convert-legacy-stream \
 		tools/python/scripts/verify-stream-v2 \
 		tools/xenmon/xenmon.py
 
 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: head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch
===================================================================
--- head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch	(nonexistent)
+++ head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.patch	(revision 470624)
@@ -0,0 +1,35 @@
+From 2ff6287610fa44eec9f30630d87166ad1fc0e452 Mon Sep 17 00:00:00 2001
+From: Roger Pau Monne <roger.pau@citrix.com>
+Date: Tue, 22 May 2018 17:47:37 +0200
+Subject: [PATCH] Backport of commit 858dba
+
+This is required in order to build Xen with newer iasl found in HEAD.
+---
+ tools/firmware/hvmloader/acpi/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
+index d3e882ac69..29f93e6a8c 100644
+--- a/tools/firmware/hvmloader/acpi/Makefile
++++ b/tools/firmware/hvmloader/acpi/Makefile
+@@ -27,7 +27,7 @@ all: acpi.a
+ 
+ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
+ 	iasl -vs -p $* -tc $<
+-	sed -e 's/AmlCode/$*/g' $*.hex >$@
++	sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+ 	rm -f $*.hex $*.aml
+ 
+ mk_dsdt: mk_dsdt.c
+@@ -44,7 +44,7 @@ dsdt_%cpu.asl: dsdt.asl mk_dsdt
+ 
+ $(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
+ 	iasl -vs -p $* -tc $*.asl
+-	sed -e 's/AmlCode/$*/g' $*.hex >$@
++	sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $*.hex >$@
+ 	echo "int $*_len=sizeof($*);" >>$@
+ 	rm -f $*.aml $*.hex
+ 
+-- 
+2.17.0
+

Property changes on: head/sysutils/xen-tools/files/0001-Backport-of-commit-858dba.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