Index: head/emulators/xen/Makefile
===================================================================
--- head/emulators/xen/Makefile	(revision 401103)
+++ head/emulators/xen/Makefile	(revision 401104)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PORTVERSION=	4.5.1
 PORTREVISION=	1
 CATEGORIES=	emulators
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xen Hyvervisor meta port
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64
 
 RUN_DEPENDS=	/boot/xen:${PORTSDIR}/emulators/xen-kernel \
 		xl:${PORTSDIR}/sysutils/xen-tools
 
 USES=		metaport
 
 .include <bsd.port.mk>
Index: head/emulators/xen-kernel/Makefile
===================================================================
--- head/emulators/xen-kernel/Makefile	(revision 401103)
+++ head/emulators/xen-kernel/Makefile	(revision 401104)
@@ -1,60 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-kernel
 PORTVERSION=	4.5.1
 PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hypervisor using a microkernel design
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		cpe gmake python:build
 MAKE_ARGS=	HOSTCC="${CC}" CC="${CC}" PYTHON=${PYTHON_CMD} \
 		NM="${NM}" LD="${LD}"
 USE_GCC=	yes
 NO_MTREE=	yes
 PLIST_FILES=	/boot/xen \
 		/boot/xen.4th
 ALL_TARGET=	build
 STRIP=		#
 WRKSRC_SUBDIR=	xen
 EXTRA_PATCHES=	${FILESDIR}/0001-introduce-a-helper-to-allocate-non-contiguous-memory.patch:-p2 \
 		${FILESDIR}/0002-vmap-avoid-hitting-an-ASSERT-with-vfree-NULL.patch:-p2 \
 		${FILESDIR}/0003-x86-shadow-fix-shadow_track_dirty_vram-to-work-on-hv.patch:-p2 \
 		${FILESDIR}/0004-x86-hap-make-hap_track_dirty_vram-use-non-contiguous.patch:-p2 \
 		${FILESDIR}/0005-x86-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p2 \
 		${FILESDIR}/0006-xen-pvh-enable-mmu_update-hypercall.patch:-p2 \
 		${FILESDIR}/0007-iommu-fix-usage-of-shared-EPT-IOMMU-page-tables-on-P.patch:-p2 \
 		${FILESDIR}/0008-xen-arm-mm-Do-not-dump-the-p2m-when-mapping-a-foreig.patch:-p2 \
 		${FILESDIR}/xsa148-4.5.patch:-p2 \
 		${FILESDIR}/xsa149.patch:-p2 \
 		${FILESDIR}/xsa150.patch:-p2 \
 		${FILESDIR}/xsa151.patch:-p2 \
 		${FILESDIR}/xsa152-4.5.patch:-p2
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		Only supported on FreeBSD
 .endif
 
 .if ${OSVERSION} < 1100055
 IGNORE=		Only supported on recent FreeBSD 11
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/boot
 	${INSTALL_PROGRAM} ${WRKSRC}/xen ${STAGEDIR}/boot
 	${INSTALL_DATA} ${FILESDIR}/xen.4th ${STAGEDIR}/boot
 
 .include <bsd.port.mk>
 
 #Filter out LDFLAGS
 .undef LDFLAGS
 RUN_DEPENDS:=	${RUN_DEPENDS:N*gcc*}
Index: head/sysutils/xen-tools/Makefile
===================================================================
--- head/sysutils/xen-tools/Makefile	(revision 401103)
+++ head/sysutils/xen-tools/Makefile	(revision 401104)
@@ -1,89 +1,89 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PORTVERSION=	4.5.1
 PORTREVISION=	2
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \
 		http://code.coreboot.org/p/seabios/downloads/get/:seabios
 PKGNAMESUFFIX=	-tools
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xen management tool, based on LibXenlight
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
 		libpixman-1.so:${PORTSDIR}/x11/pixman
 BUILD_DEPENDS=	dev86>0:${PORTSDIR}/devel/dev86
 
 OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than amd64"
 
 SEABIOSVERSION=	1.8.1
 DISTFILES+=	${DISTNAME}.tar.gz \
 		seabios-${SEABIOSVERSION}.tar.gz:seabios
 
 WRKSRC=		${WRKDIR}/xen-${PORTVERSION}
 
 USES=		cpe gmake libtool perl5 pkgconfig python shebangfix
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	HOSTCC="${CC}" CC="${CC}" \
 		ac_cv_path_BASH=${TRUE} \
 		ac_cv_path_XGETTEXT=${TRUE}
 MAKE_ARGS=	HOSTCC="${CC}" CC="${CC}" GCC="${GCC}" cc="${GCC}"
 QEMU_ARGS=	--disable-gtk \
 		--disable-smartcard-nss \
 		--disable-sdl \
 		--disable-vte \
 		--disable-glx \
 		--disable-curses \
 		--disable-tools \
 		--disable-curl \
 		--cxx=c++
 
 EXTRA_PATCHES=	${FILESDIR}/xsa137.patch:-p1 \
 		${FILESDIR}/xsa142-4.5.patch:-p1 \
 		${FILESDIR}/xsa153-libxl.patch:-p1 \
 		${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1
 
 CONFIGURE_ARGS+=	--with-extra-qemuu-configure-args="${QEMU_ARGS}"
 SHEBANG_FILES=	tools/misc/xencov_split \
 		tools/misc/xen-ringwatch
 USE_GCC=	yes
 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-extract:
 	${MV} ${WRKDIR}/seabios-${SEABIOSVERSION} ${WRKSRC}/tools/firmware/seabios-dir
 
 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 ${FILESDIR}/*qemuu*.patch; 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>