Index: head/emulators/qemu-cheri/pkg-plist
===================================================================
--- head/emulators/qemu-cheri/pkg-plist	(revision 540985)
+++ head/emulators/qemu-cheri/pkg-plist	(nonexistent)
@@ -1,92 +0,0 @@
-bin/qemu-ga
-bin/qemu-img
-bin/qemu-io
-bin/qemu-nbd
-bin/qemu-system-cheri
-%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
-%%PORTDOCS%%%%DOCSDIR%%/qmp-commands.txt
-share/man/man1/qemu-img.1.gz
-share/man/man1/qemu.1.gz
-share/man/man8/qemu-nbd.8.gz
-%%DATADIR%%/QEMU,cgthree.bin
-%%DATADIR%%/QEMU,tcx.bin
-%%DATADIR%%/acpi-dsdt.aml
-%%DATADIR%%/bamboo.dtb
-%%DATADIR%%/bios-256k.bin
-%%DATADIR%%/bios.bin
-%%DATADIR%%/efi-e1000.rom
-%%DATADIR%%/efi-eepro100.rom
-%%DATADIR%%/efi-ne2k_pci.rom
-%%DATADIR%%/efi-pcnet.rom
-%%DATADIR%%/efi-rtl8139.rom
-%%DATADIR%%/efi-virtio.rom
-%%DATADIR%%/keymaps/ar
-%%DATADIR%%/keymaps/bepo
-%%DATADIR%%/keymaps/common
-%%DATADIR%%/keymaps/cz
-%%DATADIR%%/keymaps/da
-%%DATADIR%%/keymaps/de
-%%DATADIR%%/keymaps/de-ch
-%%DATADIR%%/keymaps/en-gb
-%%DATADIR%%/keymaps/en-us
-%%DATADIR%%/keymaps/es
-%%DATADIR%%/keymaps/et
-%%DATADIR%%/keymaps/fi
-%%DATADIR%%/keymaps/fo
-%%DATADIR%%/keymaps/fr
-%%DATADIR%%/keymaps/fr-be
-%%DATADIR%%/keymaps/fr-ca
-%%DATADIR%%/keymaps/fr-ch
-%%DATADIR%%/keymaps/hr
-%%DATADIR%%/keymaps/hu
-%%DATADIR%%/keymaps/is
-%%DATADIR%%/keymaps/it
-%%DATADIR%%/keymaps/ja
-%%DATADIR%%/keymaps/lt
-%%DATADIR%%/keymaps/lv
-%%DATADIR%%/keymaps/mk
-%%DATADIR%%/keymaps/modifiers
-%%DATADIR%%/keymaps/nl
-%%DATADIR%%/keymaps/nl-be
-%%DATADIR%%/keymaps/no
-%%DATADIR%%/keymaps/pl
-%%DATADIR%%/keymaps/pt
-%%DATADIR%%/keymaps/pt-br
-%%DATADIR%%/keymaps/ru
-%%DATADIR%%/keymaps/sl
-%%DATADIR%%/keymaps/sv
-%%DATADIR%%/keymaps/th
-%%DATADIR%%/keymaps/tr
-%%DATADIR%%/kvmvapic.bin
-%%DATADIR%%/linuxboot.bin
-%%DATADIR%%/multiboot.bin
-%%DATADIR%%/openbios-ppc
-%%DATADIR%%/openbios-sparc32
-%%DATADIR%%/openbios-sparc64
-%%DATADIR%%/palcode-clipper
-%%DATADIR%%/petalogix-ml605.dtb
-%%DATADIR%%/petalogix-s3adsp1800.dtb
-%%DATADIR%%/ppc_rom.bin
-%%DATADIR%%/pxe-e1000.rom
-%%DATADIR%%/pxe-eepro100.rom
-%%DATADIR%%/pxe-ne2k_pci.rom
-%%DATADIR%%/pxe-pcnet.rom
-%%DATADIR%%/pxe-rtl8139.rom
-%%DATADIR%%/pxe-virtio.rom
-%%DATADIR%%/q35-acpi-dsdt.aml
-%%DATADIR%%/qemu-icon.bmp
-%%DATADIR%%/qemu_logo_no_text.svg
-%%DATADIR%%/s390-ccw.img
-%%DATADIR%%/s390-zipl.rom
-%%DATADIR%%/sgabios.bin
-%%DATADIR%%/slof.bin
-%%DATADIR%%/spapr-rtas.bin
-%%DATADIR%%/trace-events
-%%DATADIR%%/u-boot.e500
-%%DATADIR%%/vgabios-cirrus.bin
-%%DATADIR%%/vgabios-qxl.bin
-%%DATADIR%%/vgabios-stdvga.bin
-%%DATADIR%%/vgabios-virtio.bin
-%%DATADIR%%/vgabios-vmware.bin
-%%DATADIR%%/vgabios.bin

Property changes on: head/emulators/qemu-cheri/pkg-plist
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/emulators/qemu-cheri/Makefile
===================================================================
--- head/emulators/qemu-cheri/Makefile	(revision 540985)
+++ head/emulators/qemu-cheri/Makefile	(revision 540986)
@@ -1,70 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
 PORTVERSION=	0.d${SNAPDATE}
 PORTREVISION=	1
 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_TUPLE=	CTSRD-CHERI:qemu:${QEMU_COMMIT} \
 		CTSRD-CHERI:dtc:${DTC_COMMIT}:dtc/dtc \
 		CTSRD-CHERI:libslirp:${LIBSLIRP_COMMIT}:libslirp/slirp \
 		qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \
 
 HAS_CONFIGURE=	yes
-USES=	compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
-	python:build xorg
+USES=		compiler:c11 gettext-runtime gl gmake gnome iconv:wchar_t perl5 \
+		pkgconfig python:build xorg
 USE_XORG=	pixman
 USE_GNOME+=	glib20 libxml2
-USE_GL+=	gbm
+USE_PERL5=	build
+USE_GL+=	gl
 ONLY_FOR_ARCHS=	amd64 powerpc64
 
 OPTIONS_DEFINE=	DOCS
 
 .include "Makefile.snapshot"
 
 CONFIGURE_ARGS+= \
 		--target-list=cheri128-softmmu,cheri128magic-softmmu,riscv64cheri-softmmu \
 		--disable-curl \
 		--disable-git-update \
 		--disable-gtk \
 		--disable-linux-user \
 		--disable-linux-aio \
 		--disable-kvm \
 		--disable-opengl \
 		--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-riscv64cheri
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cheri128-softmmu/qemu-system-cheri128 \
 	    ${WRKSRC}/cheri128magic-softmmu/qemu-system-cheri128magic \
 	    ${WRKSRC}/riscv64cheri-softmmu/qemu-system-riscv64cheri \
 	    ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>