Index: branches/2017Q2/emulators/qemu-utils/Makefile
===================================================================
--- branches/2017Q2/emulators/qemu-utils/Makefile	(revision 439779)
+++ branches/2017Q2/emulators/qemu-utils/Makefile	(revision 439780)
@@ -1,86 +1,86 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	QEMU userland utilities
 
 HAS_CONFIGURE=	yes
 USES=		cpe gmake pkgconfig perl5 python:2,build tar:bzip2
 USES+=		gettext-runtime
 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 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
 		STATIC_LINK NCURSES
 MASTERDIR=	${.CURDIR}/../qemu
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr
-EXTRA_PATCHES=	${.CURDIR}/files/patch-configure
+EXTRA_PATCHES=	${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure
 PKGMESSAGE=
 
 PORTDOCS=	qemu-doc.html qmp-commands.txt
 
 CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
 		--disable-libssh2 \
 		--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-uuid \
 		--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-archipelago \
 		--disable-tpm \
 		--disable-numa \
 		--disable-blobs \
 		--without-pixman
 
 LIB_DEPENDS=
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 	@${RMDIR} ${STAGEDIR}${DATADIR}
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2017Q2/emulators/qemu-utils/files/patch-Makefile
===================================================================
--- branches/2017Q2/emulators/qemu-utils/files/patch-Makefile	(nonexistent)
+++ branches/2017Q2/emulators/qemu-utils/files/patch-Makefile	(revision 439780)
@@ -0,0 +1,14 @@
+--- Makefile.orig	2017-03-31 14:07:03 UTC
++++ Makefile
+@@ -484,11 +490,6 @@ endif
+ ifeq ($(CONFIG_GTK),y)
+ 	$(MAKE) -C po $@
+ 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"
+ 	for d in $(TARGET_DIRS); do \
+ 	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
+         done

Property changes on: branches/2017Q2/emulators/qemu-utils/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 439779)
+++ branches/2017Q2	(revision 439780)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r439132