Index: head/emulators/qemu-sbruno/Makefile
===================================================================
--- head/emulators/qemu-sbruno/Makefile	(revision 448741)
+++ head/emulators/qemu-sbruno/Makefile	(revision 448742)
@@ -1,305 +1,304 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	2.9.50.g20170721
+PORTVERSION=	2.9.94.g20170825
 CATEGORIES=	emulators
 MASTER_SITES=	GH
 PKGNAMESUFFIX?=	-sbruno
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	sbruno@FreeBSD.org
 COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 
 LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	seanbruno
 GH_PROJECT=	${PORTNAME}-bsd-user
-GH_TAGNAME=	17977d0
+GH_TAGNAME=	2dbc44a
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig bison perl5 python:2,build
 USE_PERL5=	build
 PATCH_STRIP=	-p1
 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
 BROKEN_powerpc64=	fails to build: async.c: internal compiler error: Segmentation fault
 
 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.
 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
 USE_GNOME+=	glib20
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libfdt.so:sysutils/dtc
 .endif
 
 .include <bsd.port.options.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
 .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
 
 .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
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC} --enable-docs \
 	--disable-linux-user --disable-linux-aio \
 	--disable-kvm --disable-xen \
 	--smbd=${LOCALBASE}/sbin/smbd \
 	--enable-debug \
 	--enable-debug-info \
 	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 .if empty(PORT_OPTIONS:MX11)
 CONFIGURE_ARGS+=	--disable-sdl
 .else
 CONFIGURE_ARGS+=	--enable-sdl
 USE_SDL=	sdl
 .endif
 
 .if empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--disable-gtk --disable-vte
 PLIST_SUB+=	GTK2="@comment "
 .else
 USE_GNOME+=	gtk20 vte
 USES+=		gettext
 PLIST_SUB+=	GTK2=""
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	libgnutls.so:security/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
 USE_GL=		yes
 .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}
 
 # clang in freebsd 10 is unable to assemble linuxboot_dma.bin
 .if (${OSVERSION} < 1100000)
 PLIST_SUB+=	LINUXBOOT_DMA="@comment "
 .else
 PLIST_SUB+=	LINUXBOOT_DMA=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 # clang in freebsd 10 is unable to assemble linuxboot_dma.bin
 .if (${OSVERSION} < 1100000)
 	@${REINPLACE_CMD} -E \
 		-e 's|linuxboot_dma.bin||' \
 		${WRKSRC}/pc-bios/optionrom/Makefile
 	@${REINPLACE_CMD} -E \
 		-e 's|linuxboot_dma.bin||' \
 		${WRKSRC}/Makefile
 .endif
 
 #.if ${PORT_OPTIONS:MPCAP}
 #	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
 #.endif
 .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
 	@${REINPLACE_CMD} -E \
 		-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
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-*
 .endif
 
 .include <bsd.port.mk>
Index: head/emulators/qemu-sbruno/distinfo
===================================================================
--- head/emulators/qemu-sbruno/distinfo	(revision 448741)
+++ head/emulators/qemu-sbruno/distinfo	(revision 448742)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500667034
-SHA256 (qemu/2.9.50.g20170721/seanbruno-qemu-bsd-user-2.9.50.g20170721-17977d0_GH0.tar.gz) = 4c637b3db30a002e51a676787304c8fdaca0321678d4386210491964b6727ad3
-SIZE (qemu/2.9.50.g20170721/seanbruno-qemu-bsd-user-2.9.50.g20170721-17977d0_GH0.tar.gz) = 14562658
+TIMESTAMP = 1503667589
+SHA256 (qemu/2.9.94.g20170825/seanbruno-qemu-bsd-user-2.9.94.g20170825-2dbc44a_GH0.tar.gz) = 3fc2f3532a0e4c809c9a070f0616a46ab3110c2829f3271012c1ecd19f4741a2
+SIZE (qemu/2.9.94.g20170825/seanbruno-qemu-bsd-user-2.9.94.g20170825-2dbc44a_GH0.tar.gz) = 14636493
Index: head/emulators/qemu-sbruno/files/qemu_user_static.in
===================================================================
--- head/emulators/qemu-sbruno/files/qemu_user_static.in	(revision 448741)
+++ head/emulators/qemu-sbruno/files/qemu_user_static.in	(revision 448742)
@@ -1,142 +1,152 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: %%NAME%%
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable `%%NAME%%':
 #
 # %%NAME%%_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=%%NAME%%
 rcvar=%%NAME%%_enable
 
 # read configuration and set defaults
 load_rc_config "$name"
 
 : ${%%NAME%%_enable:="NO"}
 
 BINMISCCTL=/usr/sbin/binmiscctl
 QEMU_DIR=%%PREFIX%%/bin
 QEMU_PREFIX=qemu-
 QEMU_SUFFIX=-static
 
 start_cmd=%%NAME%%_start
 stop_cmd=%%NAME%%_stop
 extra_commands=list
 list_cmd="${BINMISCCTL} list"
 
 %%NAME%%_start()
 {
 	# register arm interpreter styled 'arm'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add arm --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
 			--mask  "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register armv6 interpreter styled 'arm'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add armv6 --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
 			--mask  "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
+	# register armv7 interpreter styled 'arm'
+	interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX}
+	if [ -x "${interpreter}" ]; then
+		${BINMISCCTL} add armv7 --interpreter "${interpreter}" \
+			--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
+			--mask  "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \
+			--size 20 --set-enabled
+	else
+		echo "$0: interpreter ${interpreter} not found, cannot register."
+	fi
 	# register aarch64 interpreter styled 'aarch64'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}aarch64${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add aarch64 --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \
 			--mask  "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register mips interpreter styled 'mips'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}mips${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add mips --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08" \
 			--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register mipsle interpreter styled 'mipsle'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}mipsel${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add mipsel --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00" \
 			--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register mips64 interpreter styled 'mips64'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}mips64${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add mips64 --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08" \
 			--mask  "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register powerpc interpreter styled 'ppc'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}ppc${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add powerpc --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14" \
 			--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register powerpc64 interpreter styled 'ppc64'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}ppc64${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add powerpc64 --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15" \
 			--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 	# register sparc64 interpreter styled 'sparc64'
 	interpreter=${QEMU_DIR}/${QEMU_PREFIX}sparc64${QEMU_SUFFIX}
 	if [ -x "${interpreter}" ]; then
 		${BINMISCCTL} add sparc64 --interpreter "${interpreter}" \
 			--magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b" \
 			--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \
 			--size 20 --set-enabled
 	else
 		echo "$0: interpreter ${interpreter} not found, cannot register."
 	fi
 }
 
 %%NAME%%_stop()
 {
 	${BINMISCCTL} remove mips64
 	${BINMISCCTL} remove arm
 	${BINMISCCTL} remove armv6
 	${BINMISCCTL} remove aarch64
 	${BINMISCCTL} remove mips
 	${BINMISCCTL} remove mipsel
 	${BINMISCCTL} remove powerpc
 	${BINMISCCTL} remove powerpc64
 	${BINMISCCTL} remove sparc64
 }
 
 run_rc_command "$1"
Index: head/emulators/qemu-sbruno/pkg-plist
===================================================================
--- head/emulators/qemu-sbruno/pkg-plist	(revision 448741)
+++ head/emulators/qemu-sbruno/pkg-plist	(revision 448742)
@@ -1,148 +1,146 @@
-%%SOFTMMU%%bin/ivshmem-client
-%%SOFTMMU%%bin/ivshmem-server
 %%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
 %%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-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-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%%/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%%/s390-ccw.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