CVS commit: pkgsrc/emulators/qemu

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

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


To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/emulators/qemu/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.223 pkgsrc/emulators/qemu/Makefile:1.224
--- pkgsrc/emulators/qemu/Makefile:1.223        Sat Jan  4 13:46:59 2020
+++ pkgsrc/emulators/qemu/Makefile      Fri Jan 10 20:27:03 2020
@@ -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 @@ 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 virtfs-proxy-helper
 .for pvar in ${USER_EMUL}
 PLIST.${pvar}=         yes
 .endfor
@@ -158,6 +158,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"
@@ -171,7 +173,6 @@ post-install:
 .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"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.64 pkgsrc/emulators/qemu/PLIST:1.65
--- pkgsrc/emulators/qemu/PLIST:1.64    Sat Jan  4 13:46:59 2020
+++ pkgsrc/emulators/qemu/PLIST Fri Jan 10 20:27:03 2020
@@ -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.hppa}bin/qemu-hppa
 ${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