Sat Jan 4 13:47:00 2020 UTC ()
Include xkbcommon unconditionally and directly to reduce PLIST divergence

* Bump PKGREVISION.


(ryoon)
diff -r1.222 -r1.223 pkgsrc/emulators/qemu/Makefile
diff -r1.63 -r1.64 pkgsrc/emulators/qemu/PLIST
cvs diff -r1.222 -r1.223 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2019/12/15 18:35:25 1.222
+++ pkgsrc/emulators/qemu/Makefile 2020/01/04 13:46:59 1.223
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.222 2019/12/15 18:35:25 adam Exp $ 1# $NetBSD: Makefile,v 1.223 2020/01/04 13:46:59 ryoon Exp $
2 2
3DISTNAME= qemu-4.2.0 3DISTNAME= qemu-4.2.0
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
10COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
12 13
13USE_CURSES= resize_term wide 14USE_CURSES= resize_term wide
14USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
15USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config 16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config
16FAKE_NCURSES= yes 17FAKE_NCURSES= yes
@@ -160,18 +161,19 @@ post-install: @@ -160,18 +161,19 @@ post-install:
160.include "../../mk/oss.buildlink3.mk" 161.include "../../mk/oss.buildlink3.mk"
161.endif 162.endif
162.include "../../archivers/lzo/buildlink3.mk" 163.include "../../archivers/lzo/buildlink3.mk"
163.include "../../devel/glib2/buildlink3.mk" 164.include "../../devel/glib2/buildlink3.mk"
164.include "../../devel/jemalloc/buildlink3.mk" 165.include "../../devel/jemalloc/buildlink3.mk"
165.include "../../devel/snappy/buildlink3.mk" 166.include "../../devel/snappy/buildlink3.mk"
166.include "../../devel/zlib/buildlink3.mk" 167.include "../../devel/zlib/buildlink3.mk"
167.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 168.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
168.include "../../graphics/png/buildlink3.mk" 169.include "../../graphics/png/buildlink3.mk"
169.include "../../lang/python/extension.mk" 170.include "../../lang/python/extension.mk"
170.include "../../lang/python/versioned_dependencies.mk" 171.include "../../lang/python/versioned_dependencies.mk"
171.include "../../security/libgcrypt/buildlink3.mk" 172.include "../../security/libgcrypt/buildlink3.mk"
172.include "../../www/curl/buildlink3.mk" 173.include "../../www/curl/buildlink3.mk"
 174.include "../../x11/libxkbcommon/buildlink3.mk"
173.include "../../x11/pixman/buildlink3.mk" 175.include "../../x11/pixman/buildlink3.mk"
174.include "../../mk/curses.buildlink3.mk" 176.include "../../mk/curses.buildlink3.mk"
175.include "../../mk/jpeg.buildlink3.mk" 177.include "../../mk/jpeg.buildlink3.mk"
176.include "../../mk/pthread.buildlink3.mk" 178.include "../../mk/pthread.buildlink3.mk"
177.include "../../mk/bsd.pkg.mk" 179.include "../../mk/bsd.pkg.mk"
cvs diff -r1.63 -r1.64 pkgsrc/emulators/qemu/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/PLIST 2019/12/15 18:35:25 1.63
+++ pkgsrc/emulators/qemu/PLIST 2020/01/04 13:46:59 1.64
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1@comment $NetBSD: PLIST,v 1.63 2019/12/15 18:35:25 adam Exp $ 1@comment $NetBSD: PLIST,v 1.64 2020/01/04 13:46:59 ryoon Exp $
2bin/elf2dmp 2bin/elf2dmp
3${PLIST.ivshmem}bin/ivshmem-client 3${PLIST.ivshmem}bin/ivshmem-client
4${PLIST.ivshmem}bin/ivshmem-server 4${PLIST.ivshmem}bin/ivshmem-server
5${PLIST.aarch64}bin/qemu-aarch64 5${PLIST.aarch64}bin/qemu-aarch64
6${PLIST.aarch64_be}bin/qemu-aarch64_be 6${PLIST.aarch64_be}bin/qemu-aarch64_be
7${PLIST.alpha}bin/qemu-alpha 7${PLIST.alpha}bin/qemu-alpha
8${PLIST.arm}bin/qemu-arm 8${PLIST.arm}bin/qemu-arm
9${PLIST.armeb}bin/qemu-armeb 9${PLIST.armeb}bin/qemu-armeb
10${PLIST.cris}bin/qemu-cris 10${PLIST.cris}bin/qemu-cris
11bin/qemu-edid 11bin/qemu-edid
12bin/qemu-ga 12bin/qemu-ga
13${PLIST.hppa}bin/qemu-hppa 13${PLIST.hppa}bin/qemu-hppa
14${PLIST.i386}bin/qemu-i386 14${PLIST.i386}bin/qemu-i386
15bin/qemu-img 15bin/qemu-img
16bin/qemu-io 16bin/qemu-io
 17bin/qemu-keymap
17${PLIST.m68k}bin/qemu-m68k 18${PLIST.m68k}bin/qemu-m68k
18${PLIST.microblaze}bin/qemu-microblaze 19${PLIST.microblaze}bin/qemu-microblaze
19${PLIST.microblazeel}bin/qemu-microblazeel 20${PLIST.microblazeel}bin/qemu-microblazeel
20${PLIST.mips}bin/qemu-mips 21${PLIST.mips}bin/qemu-mips
21${PLIST.mips64}bin/qemu-mips64 22${PLIST.mips64}bin/qemu-mips64
22${PLIST.mips64el}bin/qemu-mips64el 23${PLIST.mips64el}bin/qemu-mips64el
23${PLIST.mipsel}bin/qemu-mipsel 24${PLIST.mipsel}bin/qemu-mipsel
24${PLIST.mipsn32}bin/qemu-mipsn32 25${PLIST.mipsn32}bin/qemu-mipsn32
25${PLIST.mipsn32el}bin/qemu-mipsn32el 26${PLIST.mipsn32el}bin/qemu-mipsn32el
26${PLIST.nbd}bin/qemu-nbd 27${PLIST.nbd}bin/qemu-nbd
27${PLIST.nios2}bin/qemu-nios2 28${PLIST.nios2}bin/qemu-nios2
28${PLIST.or1k}bin/qemu-or1k 29${PLIST.or1k}bin/qemu-or1k
29${PLIST.ppc}bin/qemu-ppc 30${PLIST.ppc}bin/qemu-ppc