Pullup ticket #6123 - requested by gutteridge

emulators/qemu: build fix

Revisions pulled up:
- emulators/qemu/Makefile                                       1.223-1.224,1.226
- emulators/qemu/PLIST                                          1.64-1.65
- emulators/qemu/options.mk                                     1.6
- mk/defaults/options.description                               1.605

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Sat Jan  4 13:47:00 UTC 2020

   Modified Files:
           pkgsrc/emulators/qemu: Makefile PLIST

   Log Message:
   Include xkbcommon unconditionally and directly to reduce PLIST divergence

   * Bump PKGREVISION.

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Fri Jan 10 20:27:04 UTC 2020

   Modified Files:
           pkgsrc/emulators/qemu: Makefile PLIST

   Log Message:
   qemu: fix build on macOS

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Mon Jan 13 02:50:25 UTC 2020

   Modified Files:
           pkgsrc/emulators/qemu: Makefile options.mk

   Log Message:
   qemu: fix Linux build in most environments

   Addresses PR pkg/54772, reported by and patch tested by Ottavio Caruso.
   virtfs-proxy-helper is only built if two development libraries (for
   libcap and libattr) are installed, which typically aren't included by
   default in Linux distros. Make virtfs support a non-default option that
   someone would enable when they expressly want it, and they have first
   installed the necessary upstream header packages to support the
   compilation of this option.

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Mon Jan 13 02:52:28 UTC 2020

   Modified Files:
           pkgsrc/mk/defaults: options.description

   Log Message:
   options.description: add virtfs-proxy-helper

4 files changed, 23 insertions, 6 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 833040c5123..bf530552d75 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.222 2019/12/15 18:35:25 adam Exp $
+# $NetBSD: Makefile,v 1.222.4.1 2020/01/27 10:59:04 bsiegert Exp $
 
 DISTNAME=	qemu-4.2.0
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
@@ -124,14 +125,13 @@ PLIST.bridge-helper=		yes
 PLIST.nbd=			yes
 PLIST.ivshmem=			yes
 PLIST.pr-helper=		yes
-PLIST.virtfs-proxy-helper=	yes
 .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 PLIST.ivshmem=			yes
 PLIST.nbd=			yes
 CONFIGURE_ARGS+=		--disable-coroutine-pool
 .endif
 
-PLIST_VARS+=		${UE_ARCHS} bridge-helper ivshmem nbd pr-helper virtfs-proxy-helper
+PLIST_VARS+=		${UE_ARCHS} bridge-helper ivshmem keymap nbd pr-helper
 .for pvar in ${USER_EMUL}
 PLIST.${pvar}=		yes
 .endfor
@@ -157,6 +157,8 @@ post-install:
 
 # On Darwin, qemu uses Cocoa and CoreAudio
 .if ${OPSYS} != "Darwin"
+PLIST.keymap=	yes
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../archivers/lzo/buildlink3.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 5dd07c7447c..3701da2b425 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2019/12/15 18:35:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.63.4.1 2020/01/27 10:59:04 bsiegert Exp $
 bin/elf2dmp
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
@@ -14,6 +14,7 @@ ${PLIST.hppa}bin/qemu-hppa
 ${PLIST.i386}bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
+${PLIST.keymap}bin/qemu-keymap
 ${PLIST.m68k}bin/qemu-m68k
 ${PLIST.microblaze}bin/qemu-microblaze
 ${PLIST.microblazeel}bin/qemu-microblazeel
diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk
index e7fbed3df64..551f8a9f564 100644
--- a/emulators/qemu/options.mk
+++ b/emulators/qemu/options.mk
@@ -1,17 +1,21 @@
-# $NetBSD: options.mk,v 1.5 2018/08/14 06:57:26 adam Exp $
+# $NetBSD: options.mk,v 1.5.14.1 2020/01/27 10:59:04 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS=	gtk3 sdl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=	virtfs-proxy-helper
+.endif
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	sdl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk
+PLIST_VARS+=		gtk virtfs-proxy-helper
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 PLIST.gtk=		yes
@@ -27,3 +31,12 @@ CONFIGURE_ARGS+=	--enable-sdl
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
+
+# NB to successfully build virtfs-proxy-helper, the upstream Linux
+# header/development libraries for libcap and libattr must be installed.
+.if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)
+PLIST.virtfs-proxy-helper=	yes
+CONFIGURE_ARGS+=		--enable-virtfs
+.else
+CONFIGURE_ARGS+=		--disable-virtfs
+.endif
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 0a96f6f4988..a4d03f1c491 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -830,6 +830,7 @@ vice-fullscreen		Enable full-screen support.
 vice-hwscaling		Enable hardware-assisted screen scaling.
 vidix			Enable VIDIX (Video Interface for *niX support).
 viewvc-php		Use php to colorize .php and .inc files.
+virtfs-proxy-helper	Enable virtfs-proxy-helper support (Linux only).
 vlc-skins		Enable skins support in VLC.
 vorbis			Enable Ogg Vorbis support.
 vulkan			Enable support for the Vulkan 3D and compute API.