[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: fix build on macOS

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1e1a7af179a
branches:  trunk
changeset: 407837:b1e1a7af179a
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jan 10 20:27:03 2020 +0000

description:
qemu: fix build on macOS

diffstat:

 emulators/qemu/Makefile |  7 ++++---
 emulators/qemu/PLIST    |  4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 59eafff65f7b -r b1e1a7af179a emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Fri Jan 10 19:38:06 2020 +0000
+++ b/emulators/qemu/Makefile   Fri Jan 10 20:27:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.223 2020/01/04 13:46:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.224 2020/01/10 20:27:03 adam Exp $
 
 DISTNAME=      qemu-4.2.0
 PKGREVISION=   1
@@ -132,7 +132,7 @@
 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 virtfs-proxy-helper
 .for pvar in ${USER_EMUL}
 PLIST.${pvar}=         yes
 .endfor
@@ -158,6 +158,8 @@
 
 # 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"
@@ -171,7 +173,6 @@
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff -r 59eafff65f7b -r b1e1a7af179a emulators/qemu/PLIST
--- a/emulators/qemu/PLIST      Fri Jan 10 19:38:06 2020 +0000
+++ b/emulators/qemu/PLIST      Fri Jan 10 20:27:03 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.64 2020/01/04 13:46:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.65 2020/01/10 20:27:03 adam Exp $
 bin/elf2dmp
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
@@ -14,7 +14,7 @@
 ${PLIST.i386}bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
-bin/qemu-keymap
+${PLIST.keymap}bin/qemu-keymap
 ${PLIST.m68k}bin/qemu-m68k
 ${PLIST.microblaze}bin/qemu-microblaze
 ${PLIST.microblazeel}bin/qemu-microblazeel