Index: head/emulators/qemu-utils/Makefile
===================================================================
--- head/emulators/qemu-utils/Makefile	(revision 549673)
+++ head/emulators/qemu-utils/Makefile	(revision 549674)
@@ -1,92 +1,90 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	ken@FreeBSD.org
 COMMENT=	QEMU userland utilities
 
-BROKEN=		fails to configure
-
 HAS_CONFIGURE=	yes
 USES=		compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \
 		python:build tar:xz
 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=	interop/* specs/*
 
 CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
 		--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}
 	@${RM} -rf ${STAGEDIR}${PREFIX}/share
 
 .include "${MASTERDIR}/Makefile"
Index: head/emulators/qemu-utils/files/patch-Makefile
===================================================================
--- head/emulators/qemu-utils/files/patch-Makefile	(revision 549673)
+++ head/emulators/qemu-utils/files/patch-Makefile	(revision 549674)
@@ -1,46 +1,47 @@
---- Makefile.orig	2019-08-08 19:18:25.578250000 +0000
-+++ Makefile	2019-08-08 19:20:21.482341000 +0000
-@@ -355,14 +355,10 @@
+--- Makefile.orig	2020-09-18 12:03:57 UTC
++++ Makefile
+@@ -344,14 +344,11 @@ endif
  ifdef BUILD_DOCS
  ifdef NOPORTDOCS
- DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+ DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
 -DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7
++DOCS+=docs/interop/qemu-ga-ref.7
  else
- DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+ DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
 -DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
  DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
  endif
 -DOCS+=docs/qemu-block-drivers.7
 -DOCS+=docs/qemu-cpu-models.7
  ifdef CONFIG_VIRTFS
  DOCS+=fsdev/virtfs-proxy-helper.1
  endif
-@@ -832,16 +828,10 @@
+@@ -828,16 +825,10 @@ ifndef NOPORTDOCS
  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
  	$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"
  	$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"
 -	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"
 -	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
  endif
  ifdef CONFIG_POSIX
  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
  	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
 -	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7"
 -	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
 -	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
 -	$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"
- ifneq ($(TOOLS),)
+ ifeq ($(CONFIG_TOOLS),y)
  	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
-@@ -895,11 +885,6 @@
- ifdef CONFIG_GTK
- 	$(MAKE) -C po $@
+@@ -942,11 +933,6 @@ endif
+ ifeq ($(CONFIG_PLUGIN),y)
+ 	$(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h"
  endif
 -	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
 -	set -e; for x in $(KEYMAPS); do \
 -		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
 -	done
 -	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
  
  .PHONY: ctags
  ctags: