Update for Nono to 0.2.4

Including a fix for llvm13

OK jca@ aoyama@ daniel@

emulators/nono/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2021/10/05 10:15:59 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.18 2021/12/08 08:52:43 gonzalo Exp $
 
 # Big endian support is not complete as of 0.1.0
 NOT_FOR_ARCHS=		${BE_ARCHS}
@@ -6,7 +6,7 @@ BROKEN-i386=		requires __m128i and similar types; may work if SSE is disabled
 
 COMMENT=		OMRON LUNA-I and LUNA-88K emulator
 
-DISTNAME=		nono-0.2.2
+DISTNAME=		nono-0.2.4
 CATEGORIES=		emulators
 
 MAINTAINER=		Gonzalo L. R. <gonzalo@openbsd.org>
@@ -30,6 +30,9 @@ LIB_DEPENDS=		x11/wxWidgets
 NO_TEST=		Yes
 CONFIGURE_STYLE=	gnu
 
+post-extract:
+	sed -i 's/-Werror//g' ${WRKSRC}/Makefile.inc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nono
 	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/nono/manual.html

emulators/nono/distinfo

@@ -1,2 +1,2 @@
-SHA256 (nono-0.2.2.tar.gz) = r0XLb0w7LBsDYf6An0xkR2rns8hzqk1UwFezHrMDN30=
-SIZE (nono-0.2.2.tar.gz) = 2574001
+SHA256 (nono-0.2.4.tar.gz) = qscokp95lFkihZ+HakeJMNyHu2zi/TY/DO1zjCq51ns=
+SIZE (nono-0.2.4.tar.gz) = 2655094

emulators/nono/patches/patch-debugger_debugger_private_h

@@ -1,37 +0,0 @@
-$OpenBSD: patch-debugger_debugger_private_h,v 1.2 2021/07/15 05:01:38 daniel Exp $
-
-Index: debugger/debugger_private.h
---- debugger/debugger_private.h.orig
-+++ debugger/debugger_private.h
-@@ -125,11 +125,11 @@ class Debugger final : public Object
- 		Quit,		// デバッガとの接続を終了する
- 	};
- 	using cmdfunc_t = void (Debugger::*)();
--	typedef struct {
-+	struct cmddef_t {
- 		const char *name;
- 		cmdfunc_t func;
- 		CommandAction action;
--	} cmddef_t;
-+	};
- 
- 	// ブレークポイント種別
- 	enum BreakpointType {
-@@ -141,7 +141,7 @@ class Debugger final : public Object
- 	};
- 
- 	// ブレークポイント
--	typedef struct {
-+	struct breakpoint_t {
- 		BreakpointType type {};	// 種別
- 		// 種別ごとのパラメータ
- 		union {
-@@ -164,7 +164,7 @@ class Debugger final : public Object
- 		// n(>0) なら n 回の成立をスキップし、(n+1) 回目でブレークの意。
- 		int32 skip {};			// スキップ回数 (ユーザ指定値)
- 		int32 skipremain {};	// 残りスキップ回数 (0 で成立)
--	} breakpoint_t;
-+	};
- 	static const int MAX_BREAKPOINTS = 8;
- 
-  public:

emulators/nono/pkg/README

@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.4 2021/10/05 10:15:59 gonzalo Exp $
+$OpenBSD: README,v 1.5 2021/12/08 08:52:44 gonzalo Exp $
 
 +-----------------------------------------------------------------------
 | Running NetBSD on ${PKGSTEM}
@@ -32,7 +32,7 @@ boot
 g
 x
 
-For more options you should read the manual (for now only in Japanese).
+For more options you should read the manual.
 
 +-----------------------------------------------------------------------
 | Running OpenBSD on ${PKGSTEM}
@@ -55,4 +55,24 @@ hostnet-driver = none
 
 To turn it on:
 
-$ nono -c ~/nono -s 0.5 -C -Lhostname=1 
+$ nono -c ~/nono -s 0.5 -C 
+
+Now inside the console you should follow these instructions:
+
+** NVRAM Initialized.
+
+N>nvram boot_filename boot
+Update boot_filename : "vmunix" -> "boot" (Y/[N]):y
+Updated
+N>b
+
+You can connect to the vm with a serial console by
+adding the follow to your nono.cfg:
+
+hostcom-driver = tcp
+hostcom-tcp-port = 9999
+luna-dipsw1 = 10111111
+
+Then, after staring nono, try:
+
+$ telnet localhost 9999