qemu: add missing build dependency on ninja

Fix some pkglint and an unportable test operator.

4 files changed, 43 insertions, 8 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 62c860f6748..a776992f1f6 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2021/02/20 22:59:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.264 2021/02/23 09:28:33 wiz Exp $
 
 DISTNAME=	qemu-5.2.0
 CATEGORIES=	emulators
@@ -10,6 +10,8 @@ HOMEPAGE=	http://www.qemu-project.org/
 COMMENT=	CPU emulator using dynamic translation
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
 
+BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
+
 USE_CURSES=		resize_term wide
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		bison flex gmake makeinfo perl:build pod2man pkg-config
@@ -36,7 +38,7 @@ SUBST_SED.sphinx-build+=	-e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
 
 DISTFILES=		${DEFAULT_DISTFILES}
 DISTFILES+=		palcode-clipper
-SITES.palcode-clipper=	http://ftp.netbsd.org/pub/NetBSD/arch/alpha/qemu/
+SITES.palcode-clipper=	http://ftp.NetBSD.org/pub/NetBSD/arch/alpha/qemu/
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--interp-prefix=${PREFIX}/share/qemu
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index e217156bb0b..5d1e0ca7679 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.170 2021/02/20 22:59:29 ryoon Exp $
+$NetBSD: distinfo,v 1.171 2021/02/23 09:28:33 wiz Exp $
 
 SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
 RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
@@ -38,6 +38,7 @@ SHA1 (patch-roms_qemu-palcode_printf.c) = 7fb158f85bd1be9a939850d9d86175013f7a14
 SHA1 (patch-roms_qemu-palcode_protos.h) = 60cf9db5544cb842207a893a78fa6bbe45af4c71
 SHA1 (patch-roms_qemu-palcode_sys-clipper.h) = 8983d7072b1c1e66bf0a18d2e49e503745692a46
 SHA1 (patch-roms_qemu-palcode_vgaio.c) = c8d7adc053cd6655f005527d16647611040c09d2
+SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-roms_u-boot_tools_imx8m__image.sh) = e4c452062f40569e33aa93eec4a65bd3af2e74fc
 SHA1 (patch-target_i386_kvm-stub.c) = 4cd2b7a8d8d8a317829f982b5acff7fdf2479d9f
 SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76
diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk
index 8bb942ad7ec..83c99433906 100644
--- a/emulators/qemu/options.mk
+++ b/emulators/qemu/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2021/01/03 22:47:23 adam Exp $
+# $NetBSD: options.mk,v 1.16 2021/02/23 09:28:33 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS=	debug-info gtk3 iscsi sdl spice
@@ -24,7 +24,7 @@ PKG_SUGGESTED_OPTIONS+=	sdl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gtk virtfs-proxy-helper
+PLIST_VARS+=		gtk keymap virtfs-proxy-helper
 
 .if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=	--enable-debug-info
@@ -57,13 +57,13 @@ CONFIGURE_ARGS+=	--disable-sdl
 
 # On Darwin, qemu uses Cocoa
 .if ${OPSYS} != "Darwin"
-.if !empty(PKG_OPTIONS:Mgtk3) || \
+.  if !empty(PKG_OPTIONS:Mgtk3) || \
     !empty(PKG_OPTIONS:Mopengl) || !empty(PKG_OPTIONS:Msdl)
 PLIST.keymap=		yes
 .include "../../x11/libxkbcommon/buildlink3.mk"
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-xkbcommon
-.endif
+.  endif
 .endif
 
 # NB to successfully build virtfs-proxy-helper, the upstream Linux
diff --git a/emulators/qemu/patches/patch-roms_u-boot-sam460ex_Makefile b/emulators/qemu/patches/patch-roms_u-boot-sam460ex_Makefile
new file mode 100644
index 00000000000..e09c20775b8
--- /dev/null
+++ b/emulators/qemu/patches/patch-roms_u-boot-sam460ex_Makefile
@@ -0,0 +1,32 @@
+$NetBSD: patch-roms_u-boot-sam460ex_Makefile,v 1.3 2021/02/23 09:28:33 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- roms/u-boot-sam460ex/Makefile.orig	2020-12-08 17:00:58.000000000 +0000
++++ roms/u-boot-sam460ex/Makefile
+@@ -2189,10 +2189,10 @@ M5475GFE_config :	unconfig
+ 	if [ "$${CODE}" != "0" ] ; then \
+ 		echo "#define CONFIG_SYS_NOR1SZ	$${CODE}" >> $(obj)include/config.h ; \
+ 	fi; \
+-	if [ "$${VID}" == "1" ] ; then \
++	if [ "$${VID}" = "1" ] ; then \
+ 		echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
+ 	fi; \
+-	if [ "$${USB}" == "1" ] ; then \
++	if [ "$${USB}" = "1" ] ; then \
+ 		echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
+ 	fi
+ 	@$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
+@@ -2224,10 +2224,10 @@ M5485HFE_config :	unconfig
+ 	if [ "$${CODE}" != "0" ] ; then \
+ 		echo "#define CONFIG_SYS_NOR1SZ	$${CODE}" >> $(obj)include/config.h ; \
+ 	fi; \
+-	if [ "$${VID}" == "1" ] ; then \
++	if [ "$${VID}" = "1" ] ; then \
+ 		echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
+ 	fi; \
+-	if [ "$${USB}" == "1" ] ; then \
++	if [ "$${USB}" = "1" ] ; then \
+ 		echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
+ 	fi
+ 	@$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale