diff --git a/emulators/qemu31/Makefile b/emulators/qemu31/Makefile
index 11a84b824980..ef173179cf8f 100644
--- a/emulators/qemu31/Makefile
+++ b/emulators/qemu31/Makefile
@@ -1,148 +1,157 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 
 PORTNAME=	qemu
 PORTVERSION=	3.1.1.1
 PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 PKGNAMESUFFIX=	31
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER?=	bofh@FreeBSD.org
 COMMENT?=	QEMU CPU Emulator - 3.1.X version
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	fails to build: accel/tcg/user-exec.c:486:36: error: no member named 'pc' in 'struct __mcontext'
+DEPRECATED=	Use emulators/qemu or emulators/qemu-devel
+EXPIRATION_DATE=2021-11-01
 
-LIB_DEPENDS?=	libnettle.so:security/nettle \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+LIB_DEPENDS?=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libnettle.so:security/nettle
 
 USES?=		compiler:c11 cpe gmake gnome pkgconfig bison perl5 \
 		python:build tar:xz
+USE_GNOME+=	libxml2
 USE_PERL5=	build
 
 PORTSCOUT=	limit:^3\.1\.
 
 HAS_CONFIGURE=	yes
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 
 OPTIONS_DEFINE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
 		VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
 		STATIC_LINK DOCS NCURSES
 CDROM_DMA_DESC=		IDE CDROM DMA
 GNUTLS_DESC=		gnutls dependency (vnc encryption)
 JPEG_DESC=		jpeg dependency (vnc lossy compression)
 PCAP_DESC=		pcap dependency (networking with bpf)
 PNG_DESC=		png dependency (vnc compression)
 SAMBA_DESC=		samba dependency (for -smb)
 SASL_DESC=		cyrus-sasl dependency (vnc encryption)
 STATIC_LINK_DESC=	Statically link the executables
 USBREDIR_DESC=		usb device network redirection (experimental!)
 VDE_DESC=		vde dependency (for vde networking)
 X86_TARGETS_DESC=	Build only x86 system targets
-OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE
+OPTIONS_DEFAULT=X11 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE
 OPTIONS_SUB=	yes
 CURL_CONFIGURE_OFF=	--disable-curl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
 DOCS_USES=		makeinfo
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GTK3_CONFIGURE_OFF=	--disable-gtk --disable-vte
-GTK3_LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
-			libepoxy.so:graphics/libepoxy \
-			libpcre2-8.so:devel/pcre2
+GTK3_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
+			libpcre2-8.so:devel/pcre2 \
+			libxkbcommon.so:x11/libxkbcommon
 GTK3_USE=	GNOME=gtk30,vte3,gdkpixbuf2 XORG=x11,xext GL=gbm
-GTK3_USES=	gettext gl gnome xorg
+GTK3_USES=	gettext gl xorg
 JPEG_CONFIGURE_OFF=	--disable-vnc-jpeg
 JPEG_USES=		jpeg
 NCURSES_USES=		ncurses:base
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 OPENGL_USE=	GL=glu
 OPENGL_USES=		gl
 PCAP_CONFIGURE_ON=	--enable-pcap
 PCAP_EXTRA_PATCHES=	${FILESDIR}/pcap-patch ${FILESDIR}/pcap-patch-net_net.c \
 			${FILESDIR}/pcap-patch-net_clients.h
 PNG_CONFIGURE_OFF=	--disable-vnc-png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 SAMBA_CONFIGURE_ON=	--smbd=${LOCALBASE}/sbin/smbd
 SAMBA_USES=		samba:run # smbd
 SASL_CONFIGURE_OFF=	--disable-vnc-sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 STATIC_LINK_CONFIGURE_ON=	--static
 STATIC_LINK_PREVENTS=		GTK2 X11
 STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
 USBREDIR_BUILD_DEPENDS=	usbredir>=0.6:net/usbredir
 USBREDIR_CONFIGURE_OFF=	--disable-usb-redir
 USBREDIR_RUN_DEPENDS=	usbredir>=0.6:net/usbredir
 VDE_CONFIGURE_OFF=	--disable-vde
 VDE_LIB_DEPENDS=	libvdeplug.so:net/vde2
 X11_CONFIGURE_ENABLE=	sdl
 X11_USE=	SDL=sdl2 XORG=x11,xext
 X11_USES=	sdl xorg
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils"
-X86_TARGETS_USE_OFF=	GNOME=cairo,gdkpixbuf2
-X86_TARGETS_USES_OFF=	gnome
+X86_TARGETS_USE_OFF=	GNOME=cairo,gdkpixbuf2 XORG=pixman
+X86_TARGETS_USES_OFF=	gnome xorg
 .endif
 
 PORTDOCS?=	docs qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
 	       	qemu-qmp-ref.html qemu-qmp-ref.txt
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CFLAGS_powerpc=	-D_CALL_SYSV
 CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
 		--extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh2 --enable-debug \
 		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--enable-debug-info --python=${PYTHON_CMD} \
 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 .include <bsd.port.options.mk>
 
 .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
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000
+PLIST_SUB+=	IVSHMEM=""
+.else
+PLIST_SUB+=	IVSHMEM="@comment "
+.endif
+
 PLIST_SUB+=	LINUXBOOT_DMA=""
 
 post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h
 
 # 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:
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/qemu31/pkg-descr b/emulators/qemu31/pkg-descr
index 018952f53cf1..c43a6a43c80f 100644
--- a/emulators/qemu31/pkg-descr
+++ b/emulators/qemu31/pkg-descr
@@ -1,19 +1,15 @@
-QEMU is a FAST! processor emulator using dynamic translation to achieve
-good emulation speed.
+QEMU is a FAST! processor emulator using dynamic translation to achieve good
+emulation speed.
 QEMU has two operating modes:
 
-    * Full system emulation. In this mode, QEMU emulates a full system
-(for example a PC), including a processor and various peripherials.
-It can be used to launch different Operating Systems without rebooting
-the PC or to debug system code.
-    * User mode emulation (Linux host only). In this mode, QEMU can launch
-Linux processes compiled for one CPU on another CPU. It can be used to
-launch the Wine Windows API emulator or to ease cross-compilation and
-cross-debugging.
+    * Full system emulation. In this mode, QEMU emulates a full system (for
+    example a PC), including a processor and various peripherials. It can be
+    used to launch different Operating Systems without rebooting the PC or to
+    debug system code.
+    * User mode emulation (Linux host only). In this mode, QEMU can launch Linux
+    processes compiled for one CPU on another CPU. It can be used to launch the
+    Wine Windows API emulator or to ease cross-compilation and cross-debugging.
 
 As QEMU requires no host kernel patches to run, it is very safe and easy to use.
 
-See also the preconfigured system images on http://oszoo.org/
-Many live cd isos also work.
-
 WWW: http://wiki.qemu.org/Main_Page
diff --git a/emulators/qemu31/pkg-plist b/emulators/qemu31/pkg-plist
index 87b2236d079e..4ee1d3075e11 100644
--- a/emulators/qemu31/pkg-plist
+++ b/emulators/qemu31/pkg-plist
@@ -1,147 +1,149 @@
+%%IVSHMEM%%bin/ivshmem-client
+%%IVSHMEM%%bin/ivshmem-server
 bin/qemu-edid
 bin/qemu-ga
 bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
 %%GTK3%%bin/qemu-keymap
 bin/qemu-nbd
 %%NO_X86_TARGETS%%bin/qemu-sparc
 %%NO_X86_TARGETS%%bin/qemu-sparc64
 %%NO_X86_TARGETS%%bin/qemu-system-aarch64
 %%NO_X86_TARGETS%%bin/qemu-system-alpha
 %%NO_X86_TARGETS%%bin/qemu-system-arm
 %%NO_X86_TARGETS%%bin/qemu-system-cris
 %%NO_X86_TARGETS%%bin/qemu-system-hppa
 bin/qemu-system-i386
 %%NO_X86_TARGETS%%bin/qemu-system-lm32
 %%NO_X86_TARGETS%%bin/qemu-system-m68k
 %%NO_X86_TARGETS%%bin/qemu-system-microblaze
 %%NO_X86_TARGETS%%bin/qemu-system-microblazeel
 %%NO_X86_TARGETS%%bin/qemu-system-mips
 %%NO_X86_TARGETS%%bin/qemu-system-mips64
 %%NO_X86_TARGETS%%bin/qemu-system-mips64el
 %%NO_X86_TARGETS%%bin/qemu-system-mipsel
 %%NO_X86_TARGETS%%bin/qemu-system-moxie
 %%NO_X86_TARGETS%%bin/qemu-system-nios2
 %%NO_X86_TARGETS%%bin/qemu-system-or1k
 %%NO_X86_TARGETS%%bin/qemu-system-ppc
 %%NO_X86_TARGETS%%bin/qemu-system-ppc64
 %%NO_X86_TARGETS%%bin/qemu-system-riscv32
 %%NO_X86_TARGETS%%bin/qemu-system-riscv64
 %%NO_X86_TARGETS%%bin/qemu-system-s390x
 %%NO_X86_TARGETS%%bin/qemu-system-sh4
 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb
 %%NO_X86_TARGETS%%bin/qemu-system-sparc
 %%NO_X86_TARGETS%%bin/qemu-system-sparc64
 %%NO_X86_TARGETS%%bin/qemu-system-tricore
 %%NO_X86_TARGETS%%bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 %%NO_X86_TARGETS%%bin/qemu-system-xtensa
 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
 bin/qemu-x86_64
 man/man1/qemu.1.gz
 man/man1/qemu-img.1.gz
 man/man7/qemu-block-drivers.7.gz
 man/man7/qemu-cpu-models.7.gz
 man/man7/qemu-ga-ref.7.gz
 man/man7/qemu-qmp-ref.7.gz
 man/man8/qemu-ga.8.gz
 man/man8/qemu-nbd.8.gz
 @sample etc/qemu-ifup.sample
 @sample etc/qemu-ifdown.sample
 %%DATADIR%%/QEMU,tcx.bin
 %%DATADIR%%/QEMU,cgthree.bin
 %%DATADIR%%/bios-256k.bin
 %%DATADIR%%/bios.bin
 %%DATADIR%%/canyonlands.dtb
 %%DATADIR%%/efi-e1000.rom
 %%DATADIR%%/efi-e1000e.rom
 %%DATADIR%%/efi-eepro100.rom
 %%DATADIR%%/efi-ne2k_pci.rom
 %%DATADIR%%/efi-pcnet.rom
 %%DATADIR%%/efi-rtl8139.rom
 %%DATADIR%%/efi-virtio.rom
 %%DATADIR%%/efi-vmxnet3.rom
 %%DATADIR%%/hppa-firmware.img
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
 %%DATADIR%%/palcode-clipper
 %%DATADIR%%/petalogix-ml605.dtb
 %%DATADIR%%/ppc_rom.bin
 %%DATADIR%%/pxe-e1000.rom
 %%DATADIR%%/pxe-eepro100.rom
 %%DATADIR%%/pxe-ne2k_pci.rom
 %%DATADIR%%/pxe-rtl8139.rom
 %%DATADIR%%/pxe-pcnet.rom
 %%DATADIR%%/pxe-virtio.rom
 %%DATADIR%%/qemu_vga.ndrv
 %%DATADIR%%/s390-netboot.img
 %%DATADIR%%/u-boot-sam460-20100605.bin
 %%DATADIR%%/vgabios.bin
 %%DATADIR%%/vgabios-bochs-display.bin
 %%DATADIR%%/vgabios-cirrus.bin
 %%DATADIR%%/vgabios-qxl.bin
 %%DATADIR%%/vgabios-ramfb.bin
 %%DATADIR%%/vgabios-stdvga.bin
 %%DATADIR%%/vgabios-virtio.bin
 %%DATADIR%%/vgabios-vmware.bin
 %%DATADIR%%/spapr-rtas.bin
 %%DATADIR%%/slof.bin
 %%DATADIR%%/s390-ccw.img
 %%DATADIR%%/linuxboot.bin
 %%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin
 %%DATADIR%%/multiboot.bin
 %%DATADIR%%/sgabios.bin
 %%DATADIR%%/skiboot.lid
 %%DATADIR%%/trace-events-all
 %%DATADIR%%/petalogix-s3adsp1800.dtb
 %%DATADIR%%/bamboo.dtb
 %%DATADIR%%/kvmvapic.bin
 %%DATADIR%%/qemu-icon.bmp
 %%DATADIR%%/qemu_logo_no_text.svg
 %%DATADIR%%/u-boot.e500
 %%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
 %%GTK3%%share/locale/bg/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/de_DE/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/hu/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo
 %%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo