Index: head/editors/libreoffice/Makefile.common
===================================================================
--- head/editors/libreoffice/Makefile.common	(revision 392870)
+++ head/editors/libreoffice/Makefile.common	(revision 392871)
@@ -1,76 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
 PORTVERSION=	4.3.7
 RCVER=		2
 #PRERELEASE=	yes
 LOVERSION=	${PORTVERSION}.${RCVER}
 CATEGORIES?=	editors
 MAINTAINER?=	office@FreeBSD.org
 
 LICENSE=	LGPL3 MPL
 LICENSE_COMB=	dual
 
 .if defined(PRERELEASE)
 MASTER_SITES?=	http://dev-builds.libreoffice.org/pre-releases/${MASTER_SITE_SUBDIR}
 .else
 MASTER_SITES?=	http://download.documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR}/
 .endif
 
-ONLY_FOR_ARCH=	i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64
 
 # for dynamic plist generation
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .if defined(LO_I18N)
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 RUN_DEPENDS=	libreoffice:${PORTSDIR}/editors/libreoffice
 
 .if defined(PRERELEASE)
 MASTER_SITE_SUBDIR=	deb/x86/
 LO_I18N_FILE=	LibreOffice_${LOVERSION}_Linux_x86_deb
 .else
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/deb/x86/
 LO_I18N_FILE=	LibreOffice_${PORTVERSION}_Linux_x86_deb
 .endif
 
 DIST_SUBDIR?=	libreoffice/i18n
 
 PKGNAMEPREFIX=	${LO_I18N}-
 
 DISTFILES=	${LO_I18N_FILE}_langpack_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
 .if defined(LO_HAS_HELPPACK)
 DISTFILES+=	${LO_I18N_FILE}_helppack_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
 .endif
 COMMENT?=	${LO_I18N} language pack for ${PORTNAME}
 
 EXTRACT_AFTER_ARGS=	--exclude '${PORTNAME}*-dict-*.deb' \
 			--strip-components 1
 
 post-extract:
 	@${MKDIR} ${WRKSRC}; \
 	for deb in ${WRKDIR}/DEBS/*.deb ; do \
 		${TAR} xfO $${deb} data.tar.gz | ${TAR} -C ${WRKSRC} -xf - ; \
 	done ; \
 
 do-install:
 	@${RM} -f ${PLISTF}
 	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; ${FIND} * \( -type f -o -type l \) -exec ${ECHO_CMD} "lib/${PORTNAME}/{} " \; >> ${PLISTF}
 
 	${SORT} ${PLISTF} >> ${TMPPLIST}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	cd ${WRKSRC}/opt/${PORTNAME}${PORTVERSION:R} ; \
 	    ${PAX} -rw . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .else
 MASTER_SITES+=	http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
 .if defined(PRERELEASE)
 MASTER_SITE_SUBDIR=	src/
 .else
 MASTER_SITE_SUBDIR=	src/${PORTVERSION}/
 .endif
 .endif
Index: head/emulators/xen/Makefile
===================================================================
--- head/emulators/xen/Makefile	(revision 392870)
+++ head/emulators/xen/Makefile	(revision 392871)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PORTVERSION=	4.5.0
 CATEGORIES=	emulators
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Xen Hyvervisor meta port
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCH=	amd64
+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 392870)
+++ head/emulators/xen-kernel/Makefile	(revision 392871)
@@ -1,61 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-kernel
 PORTVERSION=	4.5.0
 PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Hypervisor using a microkernel design
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCH=	amd64
+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}/iommu_share_p2m_table.patch:-p2 \
 		${FILESDIR}/0001-x86-pvh-disable-posted-interrupts.patch:-p2 \
 		${FILESDIR}/xsa117.patch:-p2 \
 		${FILESDIR}/xsa118-4.5-unstable-1.patch:-p2 \
 		${FILESDIR}/xsa118-4.5-unstable-2.patch:-p2 \
 		${FILESDIR}/xsa121.patch:-p2 \
 		${FILESDIR}/xsa122.patch:-p2 \
 		${FILESDIR}/xsa123.patch:-p2 \
 		${FILESDIR}/xsa125.patch:-p2 \
 		${FILESDIR}/xsa127-4.x.patch:-p2 \
 		${FILESDIR}/xsa132.patch:-p2 \
 		${FILESDIR}/xsa134.patch:-p2 \
 		${FILESDIR}/xsa136.patch:-p2 \
 		${FILESDIR}/0001-libelf-fix-elf_parse_bsdsyms-call.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*}