Index: emulators/Makefile
===================================================================
--- emulators/Makefile	(revision 518473)
+++ emulators/Makefile	(working copy)
@@ -114,6 +114,7 @@
     SUBDIR += qemu-powernv
     SUBDIR += qemu-sbruno
     SUBDIR += qemu-user-static
+    SUBDIR += qemu-user-static-devel
     SUBDIR += qemu-utils
     SUBDIR += qemu30
     SUBDIR += qemu31
Index: emulators/qemu-sbruno/Makefile
===================================================================
--- emulators/qemu-sbruno/Makefile	(revision 518441)
+++ emulators/qemu-sbruno/Makefile	(working copy)
@@ -40,6 +40,8 @@
 
 .if !defined(QEMU_USER_STATIC)
 CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-*
+.else
+CONFLICTS_INSTALL=	qemu-user-static-devel-*
 .endif
 
 .if defined(QEMU_USER_STATIC)
Index: emulators/qemu-user-static-devel/Makefile
===================================================================
--- emulators/qemu-user-static-devel/Makefile	(revision 517377)
+++ emulators/qemu-user-static-devel/Makefile	(working copy)
@@ -1,133 +1,50 @@
-# Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.11.50.g20191112
+PORTVERSION=	3.1.0
 CATEGORIES=	emulators
-PKGNAMESUFFIX?=	-sbruno
-DIST_SUBDIR=	qemu/${PORTVERSION}
+PKGNAMESUFFIX?=	-user-static-devel
 
-MAINTAINER=	sbruno@FreeBSD.org
-COMMENT?=	QEMU CPU Emulator - github bsd-user branch
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	QEMU CPU Emulator - github bsd-user branch
 
 LICENSE=	GPLv2
+
+ONLY_FOR_ARCHS=		amd64 powerpc powerpc64
+BROKEN_i386=		aarch64 system target is currently broken for i386 hosts, disable for now while dealing with upstream
+CONFLICTS_INSTALL=	qemu-user-static-*
+
+USES=		bison compiler:c11 gmake perl5 pkgconfig python:2.7,build
 USE_GITHUB=	yes
-GH_TUPLE=	seanbruno:qemu-bsd-user:b581800	\
+GH_TUPLE=	seanbruno:qemu-bsd-user:0337421f238	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
-USES=		bison compiler:c11 gmake perl5 pkgconfig python:2.7,build
 USE_PERL5=	build
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 
-ONLY_FOR_ARCHS=		amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
-BROKEN_i386=		aarch64 system target is currently broken for i386 hosts, disable for now while dealing with upstream
-
-OPTIONS_DEFINE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
-		CDROM_DMA PCAP USBREDIR X86_TARGETS BSD_USER \
-		STATIC_LINK DOCS
-SAMBA_DESC=		samba dependency (for -smb)
-GNUTLS_DESC=		gnutls dependency (vnc encryption)
-SASL_DESC=		cyrus-sasl dependency (vnc encryption)
-JPEG_DESC=		jpeg dependency (vnc lossy compression)
-PNG_DESC=		png dependency (vnc compression)
-CDROM_DMA_DESC=		IDE CDROM DMA
-PCAP_DESC=		pcap dependency (networking with bpf)
-USBREDIR_DESC=		usb device network redirection (experimental!)
-X86_TARGETS_DESC=	Don't build non-x86 system targets
-BSD_USER_DESC=		Also build bsd-user targets (for testing)
-STATIC_LINK_DESC=	Statically link the executables
-OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
-
-.if !defined(QEMU_USER_STATIC)
-CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-*
-.endif
-
-.if defined(QEMU_USER_STATIC)
-.if exists(/usr/sbin/binmiscctl)
 USE_RC_SUBR=	qemu_user_static
 SUB_LIST=	NAME=qemu_user_static
-CONFIGURE_ARGS+=	--disable-tools
-.endif
-.else
-# qemu-system-* targets require pixman to build, add an explicit dependency.
-USES+=		xorg
-USE_XORG=	pixman
-.endif
 
 # When static linking we have a build dependency on libglib-2.0.a, otherwise
 # we use glib20 in the usual way (shared-lib runtime dependency).
-.if defined(QEMU_USER_STATIC)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libglib-2.0.a:devel/glib20
-.else
-USES+=		gnome
-USE_GNOME+=	glib20
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libfdt.so:sysutils/dtc
-.endif
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--extra-cflags=-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-libssh2
-PORTDOCS=	docs qemu-doc.html
 
-.if defined(QEMU_USER_STATIC)
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
+QEMU_TARGETS=		i386-bsd-user sparc-bsd-user arm-bsd-user mips-bsd-user mipsel-bsd-user ppc-bsd-user
+.if ${ARCH} == "amd64"
+QEMU_TARGETS+=		x86_64-bsd-user riscv64-bsd-user sparc64-bsd-user mips64-bsd-user mips64el-bsd-user ppc64-bsd-user aarch64-bsd-user
+PLIST_SUB+=	BSD_USER64=""
 .else
-CONFIGURE_ARGS+=	--target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
-.endif
-.else
-.if ${PORT_OPTIONS:MX86_TARGETS}
-.if ${PORT_OPTIONS:MBSD_USER}
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
-.else
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
-.endif
-.else
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu
-.endif
-.else
-.if empty(PORT_OPTIONS:MBSD_USER)
-CONFIGURE_ARGS+=	--disable-bsd-user
-.else
-.if ${ARCH} != "amd64"
-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
-.endif
-.endif
-.endif
-.endif
-
-.if empty(PORT_OPTIONS:MBSD_USER)
-PLIST_SUB+=	BSD_USER="@comment "
-.else
-PLIST_SUB+=	BSD_USER=""
-.if ${ARCH} == "sparc64"
-IGNORE=		bsd-user targets not tested on sparc64
-.endif
-.endif
-.if empty(PORT_OPTIONS:MBSD_USER) || ${ARCH} != "amd64"
 PLIST_SUB+=	BSD_USER64="@comment "
-.else
-PLIST_SUB+=	BSD_USER64=""
 .endif
+CONFIGURE_ARGS+=	--target-list=${QEMU_TARGETS:ts,}
 
-.if ${PORT_OPTIONS:MX86_TARGETS}
-PLIST_SUB+=	NONX86="@comment "
-.else
-PLIST_SUB+=	NONX86=""
-.endif
-
-.if defined(QEMU_USER_STATIC)
-PLIST_SUB+=	SOFTMMU="@comment "
-PLIST_SUB+=	STATIC="-static"
-.else
-PLIST_SUB+=	SOFTMMU=""
-PLIST_SUB+=	STATIC=""
-.endif
-
 SSP_CFLAGS?=	-fstack-protector # XXX -strong crashes qemu-user-static
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
@@ -139,128 +56,18 @@
 	--smbd=${LOCALBASE}/sbin/smbd \
 	--enable-debug \
 	--enable-debug-info \
+	--static \
+	--python=${PYTHON_CMD} \
+	--disable-sdl --disable-gtk --disable-vte --disable-gnutls --disable-vnc \
+	--disable-curl --disable-opengl --disable-usb-redir --disable-pcap \
+	--disable-docs --disable-tools --disable-system --disable-guest-agent \
 	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
-.if empty(PORT_OPTIONS:MX11)
-CONFIGURE_ARGS+=	--disable-sdl
-.else
-CONFIGURE_ARGS+=	--enable-sdl
-USES+=		sdl
-USE_SDL=	sdl
-.endif
+QEMU_ARCH=	${ARCH:C/amd64/x86_64/:C/powerpc/ppc/}
+MAKE_ARGS+=	ARCH=${QEMU_ARCH}
 
-.if empty(PORT_OPTIONS:MGTK2)
-CONFIGURE_ARGS+=	--disable-gtk --disable-vte
-PLIST_SUB+=	GTK2="@comment "
-.else
-USE_GNOME+=	gtk20 vte
-USES+=		gettext gnome
-PLIST_SUB+=	GTK2=""
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls
-.else
-CONFIGURE_ARGS+=	--disable-gnutls
-.endif
-
-.if empty(PORT_OPTIONS:MSASL)
-CONFIGURE_ARGS+=	--disable-vnc-sasl
-.else
-LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
-.endif
-
-.if empty(PORT_OPTIONS:MJPEG)
-CONFIGURE_ARGS+=	--disable-vnc-jpeg
-.else
-USES+=		jpeg
-.endif
-
-.if empty(PORT_OPTIONS:MPNG)
-CONFIGURE_ARGS+=	--disable-vnc-png
-.else
-LIB_DEPENDS+=	libpng.so:graphics/png
-.endif
-
-.if empty(PORT_OPTIONS:MCURL)
-CONFIGURE_ARGS+=	--disable-curl
-.else
-LIB_DEPENDS+=	libcurl.so:ftp/curl
-.endif
-
-.if empty(PORT_OPTIONS:MOPENGL)
-CONFIGURE_ARGS+=	--disable-opengl
-.else
-USES+=		gl
-USE_GL=		glu
-.endif
-
-.if empty(PORT_OPTIONS:MUSBREDIR)
-CONFIGURE_ARGS+=	--disable-usb-redir
-.else
-BUILD_DEPENDS+=	usbredir>=0.6:net/usbredir
-RUN_DEPENDS+=	usbredir>=0.6:net/usbredir
-.endif
-
-.if ${PORT_OPTIONS:MPCAP}
-CONFIGURE_ARGS+=	--enable-pcap
-.else
-CONFIGURE_ARGS+=	--disable-pcap
-.endif
-
-.if ${PORT_OPTIONS:MSTATIC_LINK}
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11}
-IGNORE=		the X11 ui cannot be built static
-.endif
-CONFIGURE_ARGS+=	--static
-.endif
-
-.if ${PORT_OPTIONS:MSAMBA}
-USES+=		samba:run # smbd
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	texi2html:textproc/texi2html
-USES+=		makeinfo
-.else
-MAKE_ARGS+=	NOPORTDOCS=1
-.endif
-
-.if !defined(STRIP) || ${STRIP} == ""
-CONFIGURE_ARGS+=--disable-strip
-.endif
-
-.if ${ARCH} == "amd64"
-MAKE_ARGS+=	ARCH=x86_64
-.endif
-
-.if ${ARCH} == "powerpc"
-MAKE_ARGS+=	ARCH=ppc
-.endif
-
-.if ${ARCH} == "powerpc64"
-MAKE_ARGS+=	ARCH=ppc64
-.endif
-
-.if ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=	--sparc_cpu=v9
-.endif
-
-CONFIGURE_ARGS+=	--python=${PYTHON_CMD}
-
-PLIST_SUB+=	LINUXBOOT_DMA=""
-
 post-patch:
-	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
-
-.if empty(PORT_OPTIONS:MCDROM_DMA)
-	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch
-.endif
 	@${REINPLACE_CMD} -E \
-		-e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \
-		${WRKSRC}/qemu-doc.texi
-	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile.target
@@ -268,25 +75,16 @@
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -E \
-		-e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \
-		${WRKSRC}/scripts/texi2pod.pl
 
-# XXX need to disable usb host code on head while it's not ported to the
-# new usb stack yet
-post-configure:
-	@${REINPLACE_CMD} -E \
-		-e "s|^(HOST_USB=)bsd|\1stub|" \
-		${WRKSRC}/config-host.mak
-
-.if !target(post-install)
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
-.endif
-	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
+	@${MV} ${STAGEDIR}${PREFIX}/etc/rc.d ${WRKDIR}
+	@${RM} -r ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
+	@${MV} ${WRKDIR}/rc.d ${STAGEDIR}${PREFIX}/etc
+	@${RM} -r ${STAGEDIR}${PREFIX}/man
+	@${RM} -r ${STAGEDIR}${DATADIR}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
-.endif
+	@(cd ${STAGEDIR}${PREFIX}/bin && \
+		for i in qemu-*; do ${MV} -i $$i $$i-static; done)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: emulators/qemu-user-static-devel/distinfo
===================================================================
--- emulators/qemu-user-static-devel/distinfo	(revision 517377)
+++ emulators/qemu-user-static-devel/distinfo	(working copy)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1573592353
-SHA256 (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = d4dd9ab5fcc7c72f63f1068ff443bb9b0b14c87334e7aa18d147596f139ffa0d
-SIZE (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = 15511875
-SHA256 (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
-SIZE (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
+TIMESTAMP = 1574787241
+SHA256 (seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 7ae7340a2b99e24e0d85b8d632ecef41ddd3ef76382af4dbe6dab082d3c4d16a
+SIZE (seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 16903184
+SHA256 (qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
+SIZE (qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
Index: emulators/qemu-user-static-devel/files/qemu_user_static.in
===================================================================
Index: emulators/qemu-user-static-devel/pkg-descr
===================================================================
--- emulators/qemu-user-static-devel/pkg-descr	(revision 518441)
+++ emulators/qemu-user-static-devel/pkg-descr	(working copy)
@@ -13,10 +13,9 @@
 
 As QEMU requires no host kernel patches to run, it is very safe and easy to use.
 
-This is a slave port of emulators/qemu-sbruno to build only static
-bsd-user targets named like qemu-mips-static.  While still being
-experimental people have already built quite a few armv6/mips/mips64
-packages using these and e.g. poudriere.  Some notes are also here:
+This port builds static bsd-user targets named like qemu-mips-static. While
+still being experimental, people have already built many armv6/mips/mips64 ports
+using these and, e.g., poudriere.  Some notes are also here:
 
 	http://wiki.freebsd.org/QemuUserModeHowTo
 
Index: emulators/qemu-user-static-devel/pkg-plist
===================================================================
--- emulators/qemu-user-static-devel/pkg-plist	(revision 517377)
+++ emulators/qemu-user-static-devel/pkg-plist	(working copy)
@@ -1,153 +1,13 @@
-%%SOFTMMU%%bin/qemu-ga
-%%SOFTMMU%%bin/qemu-img
-%%SOFTMMU%%bin/qemu-io
-%%SOFTMMU%%bin/qemu-nbd
-%%NONX86%%bin/qemu-system-aarch64
-%%NONX86%%bin/qemu-system-alpha
-%%NONX86%%bin/qemu-system-arm
-%%NONX86%%bin/qemu-system-cris
-%%NONX86%%bin/qemu-system-hppa
-%%SOFTMMU%%bin/qemu-system-i386
-%%NONX86%%bin/qemu-system-lm32
-%%NONX86%%bin/qemu-system-m68k
-%%NONX86%%bin/qemu-system-microblaze
-%%NONX86%%bin/qemu-system-microblazeel
-%%NONX86%%bin/qemu-system-mips
-%%NONX86%%bin/qemu-system-mips64
-%%NONX86%%bin/qemu-system-mips64el
-%%NONX86%%bin/qemu-system-mipsel
-%%NONX86%%bin/qemu-system-moxie
-%%NONX86%%bin/qemu-system-nios2
-%%NONX86%%bin/qemu-system-or1k
-%%NONX86%%bin/qemu-system-ppc
-%%NONX86%%bin/qemu-system-ppc64
-%%NONX86%%bin/qemu-system-ppcemb
-%%NONX86%%bin/qemu-system-s390x
-%%NONX86%%bin/qemu-system-sh4
-%%NONX86%%bin/qemu-system-sh4eb
-%%NONX86%%bin/qemu-system-sparc
-%%NONX86%%bin/qemu-system-sparc64
-%%NONX86%%bin/qemu-system-tricore
-%%NONX86%%bin/qemu-system-unicore32
-%%SOFTMMU%%bin/qemu-system-x86_64
-%%NONX86%%bin/qemu-system-xtensa
-%%NONX86%%bin/qemu-system-xtensaeb
-%%BSD_USER64%%bin/qemu-aarch64%%STATIC%%
-%%BSD_USER%%bin/qemu-arm%%STATIC%%
-%%BSD_USER%%bin/qemu-i386%%STATIC%%
-%%BSD_USER%%bin/qemu-mips%%STATIC%%
-%%BSD_USER64%%bin/qemu-mips64%%STATIC%%
-%%BSD_USER64%%bin/qemu-mips64el%%STATIC%%
-%%BSD_USER%%bin/qemu-mipsel%%STATIC%%
-%%BSD_USER%%bin/qemu-ppc%%STATIC%%
-%%BSD_USER64%%bin/qemu-ppc64%%STATIC%%
-%%BSD_USER%%bin/qemu-sparc%%STATIC%%
-%%BSD_USER64%%bin/qemu-sparc64%%STATIC%%
-%%BSD_USER64%%bin/qemu-x86_64%%STATIC%%
-%%SOFTMMU%%@sample etc/qemu-ifup.sample
-%%SOFTMMU%%@sample etc/qemu-ifdown.sample
-%%SOFTMMU%%man/man1/qemu.1.gz
-%%SOFTMMU%%man/man1/qemu-img.1.gz
-%%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-block-drivers.7.gz
-%%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-ga-ref.7.gz
-%%PORTDOCS%%%%SOFTMMU%%man/man7/qemu-qmp-ref.7.gz
-%%SOFTMMU%%man/man8/qemu-ga.8.gz
-%%SOFTMMU%%man/man8/qemu-nbd.8.gz
-%%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin
-%%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin
-%%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml
-%%SOFTMMU%%%%DATADIR%%/bamboo.dtb
-%%SOFTMMU%%%%DATADIR%%/bios-256k.bin
-%%SOFTMMU%%%%DATADIR%%/bios.bin
-%%SOFTMMU%%%%DATADIR%%/efi-e1000.rom
-%%SOFTMMU%%%%DATADIR%%/efi-e1000e.rom
-%%SOFTMMU%%%%DATADIR%%/efi-eepro100.rom
-%%SOFTMMU%%%%DATADIR%%/efi-ne2k_pci.rom
-%%SOFTMMU%%%%DATADIR%%/efi-pcnet.rom
-%%SOFTMMU%%%%DATADIR%%/efi-rtl8139.rom
-%%SOFTMMU%%%%DATADIR%%/efi-virtio.rom
-%%SOFTMMU%%%%DATADIR%%/efi-vmxnet3.rom
-%%SOFTMMU%%%%DATADIR%%/hppa-firmware.img
-%%SOFTMMU%%%%DATADIR%%/keymaps/ar
-%%SOFTMMU%%%%DATADIR%%/keymaps/bepo
-%%SOFTMMU%%%%DATADIR%%/keymaps/common
-%%SOFTMMU%%%%DATADIR%%/keymaps/cz
-%%SOFTMMU%%%%DATADIR%%/keymaps/da
-%%SOFTMMU%%%%DATADIR%%/keymaps/de
-%%SOFTMMU%%%%DATADIR%%/keymaps/de-ch
-%%SOFTMMU%%%%DATADIR%%/keymaps/en-gb
-%%SOFTMMU%%%%DATADIR%%/keymaps/en-us
-%%SOFTMMU%%%%DATADIR%%/keymaps/es
-%%SOFTMMU%%%%DATADIR%%/keymaps/et
-%%SOFTMMU%%%%DATADIR%%/keymaps/fi
-%%SOFTMMU%%%%DATADIR%%/keymaps/fo
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-be
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-ca
-%%SOFTMMU%%%%DATADIR%%/keymaps/fr-ch
-%%SOFTMMU%%%%DATADIR%%/keymaps/hr
-%%SOFTMMU%%%%DATADIR%%/keymaps/hu
-%%SOFTMMU%%%%DATADIR%%/keymaps/is
-%%SOFTMMU%%%%DATADIR%%/keymaps/it
-%%SOFTMMU%%%%DATADIR%%/keymaps/ja
-%%SOFTMMU%%%%DATADIR%%/keymaps/lt
-%%SOFTMMU%%%%DATADIR%%/keymaps/lv
-%%SOFTMMU%%%%DATADIR%%/keymaps/mk
-%%SOFTMMU%%%%DATADIR%%/keymaps/modifiers
-%%SOFTMMU%%%%DATADIR%%/keymaps/nl
-%%SOFTMMU%%%%DATADIR%%/keymaps/nl-be
-%%SOFTMMU%%%%DATADIR%%/keymaps/no
-%%SOFTMMU%%%%DATADIR%%/keymaps/pl
-%%SOFTMMU%%%%DATADIR%%/keymaps/pt
-%%SOFTMMU%%%%DATADIR%%/keymaps/pt-br
-%%SOFTMMU%%%%DATADIR%%/keymaps/ru
-%%SOFTMMU%%%%DATADIR%%/keymaps/sl
-%%SOFTMMU%%%%DATADIR%%/keymaps/sv
-%%SOFTMMU%%%%DATADIR%%/keymaps/th
-%%SOFTMMU%%%%DATADIR%%/keymaps/tr
-%%SOFTMMU%%%%DATADIR%%/kvmvapic.bin
-%%SOFTMMU%%%%DATADIR%%/linuxboot.bin
-%%LINUXBOOT_DMA%%%%SOFTMMU%%%%DATADIR%%/linuxboot_dma.bin
-%%SOFTMMU%%%%DATADIR%%/multiboot.bin
-%%SOFTMMU%%%%DATADIR%%/openbios-ppc
-%%SOFTMMU%%%%DATADIR%%/openbios-sparc32
-%%SOFTMMU%%%%DATADIR%%/openbios-sparc64
-%%SOFTMMU%%%%DATADIR%%/palcode-clipper
-%%SOFTMMU%%%%DATADIR%%/petalogix-ml605.dtb
-%%SOFTMMU%%%%DATADIR%%/petalogix-s3adsp1800.dtb
-%%SOFTMMU%%%%DATADIR%%/ppc_rom.bin
-%%SOFTMMU%%%%DATADIR%%/pxe-e1000.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-eepro100.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-ne2k_pci.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-pcnet.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-rtl8139.rom
-%%SOFTMMU%%%%DATADIR%%/pxe-virtio.rom
-%%SOFTMMU%%%%DATADIR%%/qemu-icon.bmp
-%%SOFTMMU%%%%DATADIR%%/qemu_logo_no_text.svg
-%%SOFTMMU%%%%DATADIR%%/qemu_vga.ndrv
-%%SOFTMMU%%%%DATADIR%%/s390-ccw.img
-%%SOFTMMU%%%%DATADIR%%/s390-netboot.img
-%%SOFTMMU%%%%DATADIR%%/sgabios.bin
-%%SOFTMMU%%%%DATADIR%%/slof.bin
-%%SOFTMMU%%%%DATADIR%%/spapr-rtas.bin
-%%SOFTMMU%%%%DATADIR%%/trace-events-all
-%%SOFTMMU%%%%DATADIR%%/u-boot.e500
-%%SOFTMMU%%%%DATADIR%%/vgabios-cirrus.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-qxl.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-stdvga.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin
-%%SOFTMMU%%%%DATADIR%%/vgabios.bin
-%%SOFTMMU%%%%DATADIR%%/skiboot.lid
-%%GTK2%%share/locale/bg/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/de_DE/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/hu/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/it/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/tr/LC_MESSAGES/qemu.mo
-%%GTK2%%share/locale/zh_CN/LC_MESSAGES/qemu.mo
-%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.txt
-%%PORTDOCS%%%%DOCSDIR%%/qemu-ga-ref.html
-%%PORTDOCS%%%%DOCSDIR%%/qemu-ga-ref.txt
-%%PORTDOCS%%%%DOCSDIR%%/qemu-qmp-ref.html
-%%PORTDOCS%%%%DOCSDIR%%/qemu-qmp-ref.txt
+%%BSD_USER64%%bin/qemu-aarch64-static
+bin/qemu-arm-static
+bin/qemu-i386-static
+bin/qemu-mips-static
+%%BSD_USER64%%bin/qemu-mips64-static
+%%BSD_USER64%%bin/qemu-mips64el-static
+bin/qemu-mipsel-static
+bin/qemu-ppc-static
+%%BSD_USER64%%bin/qemu-ppc64-static
+%%BSD_USER64%%bin/qemu-riscv64-static
+bin/qemu-sparc-static
+%%BSD_USER64%%bin/qemu-sparc64-static
+%%BSD_USER64%%bin/qemu-x86_64-static