Index: head/emulators/qemu-cheri/Makefile
===================================================================
--- head/emulators/qemu-cheri/Makefile	(revision 515274)
+++ head/emulators/qemu-cheri/Makefile	(revision 515275)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
 PORTVERSION=	0.d${SNAPDATE}
 PORTREVISION=	0
 CATEGORIES=	emulators devel
 PKGNAMESUFFIX=	-cheri
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT?=	QEMU emulator with CHERI CPU support
 
 # XXX: disabling gnutls doesn't work so depend on it to avoid breakage.
 LIB_DEPENDS=	libcapstone.so:devel/capstone3 \
 		libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 RUN_DEPENDS=	qemu-system-i386:emulators/qemu
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	${QEMU_COMMIT}
 GH_TUPLE=	qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb
 
 HAS_CONFIGURE=	yes
-USES=	gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
+USES=	compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
 	python:2.7,build xorg
 USE_XORG=	pixman
 USE_GNOME+=	glib20 libxml2
 USE_GL+=	gbm
 ONLY_FOR_ARCHS=	amd64 powerpc64
 
 OPTIONS_DEFINE=	DOCS
 
 .include "Makefile.snapshot"
 
 CONFIGURE_ARGS+= \
 		--target-list=cheri128-softmmu,cheri128magic-softmmu,cheri256-softmmu \
 		--disable-curl \
 		--disable-git-update \
 		--disable-gtk \
 		--disable-libssh2 \
 		--disable-linux-user \
 		--disable-linux-aio \
 		--disable-kvm \
 		--disable-vnc-png \
 		--disable-sdl \
 		--disable-vte \
 		--disable-xen \
 		--smbd=${LOCALBASE}/sbin/smbd \
 		--extra-cflags="-g ${EXTRA_CFLAGS}" \
 		--localstatedir=/var
 EXTRA_CFLAGS=	-DCHERI_UNALIGNED
 
 QEMU_SYSTEM_CHERI?=	qemu-system${PKGNAMESUFFIX}
 PLIST=	/dev/null
 PLIST_FILES=	bin/qemu-system-cheri128 \
 		bin/qemu-system-cheri128magic \
 		bin/qemu-system-cheri256
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cheri128-softmmu/qemu-system-cheri128 \
 	    ${WRKSRC}/cheri128magic-softmmu/qemu-system-cheri128magic \
 	    ${WRKSRC}/cheri256-softmmu/qemu-system-cheri256 \
 	    ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/emulators/qemu-utils/Makefile
===================================================================
--- head/emulators/qemu-utils/Makefile	(revision 515274)
+++ head/emulators/qemu-utils/Makefile	(revision 515275)
@@ -1,90 +1,90 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	QEMU userland utilities
 
 HAS_CONFIGURE=	yes
-USES=		cpe gmake pkgconfig perl5 python:build tar:xz
+USES=		compiler:c11 cpe gmake pkgconfig perl5 python:build tar:xz
 USES+=		gettext-runtime
 USE_GNOME+=	glib20
 MAKE_ENV+=	BSD_MAKE="${MAKE}" PREFIX=${PREFIX}
 CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-* qemu-sbruno-*
 
 OPTIONS_SLAVE=	DOCS
 OPTIONS_EXCLUDE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
 		STATIC_LINK NCURSES VDE
 MASTERDIR=	${.CURDIR}/../qemu
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr
 EXTRA_PATCHES=	${.CURDIR}/files/patch-configure
 PKGMESSAGE=
 
 PORTDOCS=	qemu-doc.html qemu-doc.txt
 
 CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
 		--disable-libssh2 \
 		--mandir=${MANPREFIX}/man \
 		--prefix=${PREFIX} --cc=${CC} --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--python=${PYTHON_CMD} \
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \
 		--disable-curl \
 		--disable-gnutls \
 		--disable-gtk \
 		--disable-vte \
 		--disable-vnc-jpeg \
 		--disable-opengl \
 		--disable-usb-redir \
 		--disable-sdl \
 		--disable-system \
 		--disable-user \
 		--disable-guest-agent \
 		--disable-nettle \
 		--disable-gcrypt \
 		--disable-curses \
 		--disable-vnc \
 		--disable-virtfs \
 		--disable-brlapi \
 		--disable-fdt \
 		--disable-bluez \
 		--disable-kvm \
 		--disable-rdma \
 		--disable-vde \
 		--disable-netmap \
 		--disable-cap-ng \
 		--disable-attr \
 		--disable-vhost-net \
 		--disable-spice \
 		--disable-rbd \
 		--disable-libiscsi \
 		--disable-libnfs \
 		--disable-smartcard \
 		--disable-libusb \
 		--disable-usb-redir \
 		--disable-lzo \
 		--disable-snappy \
 		--disable-bzip2 \
 		--disable-seccomp \
 		--disable-coroutine-pool \
 		--disable-glusterfs \
 		--disable-tpm \
 		--disable-numa \
 		--disable-blobs
 
 LIB_DEPENDS=
 
 # qemu-utils must patch Makefile during pre-configure, because the master port
 # also patches Makefile.  We can't use EXTRA_PATCHES, because that happens
 # before do-patch, and causes a conflict with the master port's patch. And we
 # can't use post-patch, because the master port also defines that target.
 pre-configure:
 	${PATCH} ${WRKSRC}/Makefile ${.CURDIR}/files/patch-Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 	@${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include "${MASTERDIR}/Makefile"