9menu: Update to 1.10

2020-04-16         Arnold D. Robbins     <arnold@skeeve.com>

	* 9menu.c (version): Bump to 1.10 (finally).
	(usage): Clean up white space in error messages.
	(args): Fix comparison in first int. Thanks to GCC.
	General: Change a number of variables from int to bool, and
	use <stdbool.h>.  Use strerror(errno) in all relevant error messages.
	* 9menu.1: Increment the version.

2018-04-25         Arnold D. Robbins     <arnold@skeeve.com>

	Updates suggested by Eric Lindblad <msvc_test@outlook.com>.

	* 9menu.c (version): Remove the @(#) SCCS marker. Hasn't been
	necessary for decades, really.
	* 9menu.1: Update the Examples.

2016-01-07         Arnold D. Robbins     <arnold@skeeve.com>

	* 9menu.c: Convert forward declarations to use prototypes.
	(run_menu): Bug fix. Increment/decrement `i' when keypress
	moves things up and down so that mouse moves to the right
	place upon remapping the window.

2015-06-25         Arnold D. Robbins     <arnold@skeeve.com>

	* 9menu.1: Updated.

2015-03-19         Arnold D. Robbins     <arnold@skeeve.com>

	* ChangeLog: Reconstituted from check-in logs and diffs.
	* 9menu.c: Typo fix. Convert all function signatures to
	ANSI style.
	* README: Update the date.

2015-01-14         Arnold D. Robbins     <arnold@skeeve.com>

	* 9menu.c (main): Fix compile warnings.
	(run_menu): Call XkbKeycodeToKeysym() instead of XKeycodeToKeysym().

5 files changed, 16 insertions, 153 deletions

diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile
index d4797a1d6e5..b00b8c34820 100644
--- a/misc/9menu/Makefile
+++ b/misc/9menu/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.24 2018/02/21 15:12:00 triaxx Exp $
+# $NetBSD: Makefile,v 1.25 2020/12/08 11:15:57 nia Exp $
 
-DISTNAME=		9menu-1.9
+DISTNAME=		9menu-1.10
 CATEGORIES=		misc plan9
-GITHUB_TAG=		${PKGBASE}-release-${PKGVERSION_NOREV}
 MASTER_SITES=		${MASTER_SITE_GITHUB:=arnoldrobbins/}
-LICENSE=		9menu-license
+GITHUB_TAG=		${PKGBASE}-release-${PKGVERSION_NOREV}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		Simple menu patterned after the plan9 user interface
+HOMEPAGE=		https://github.com/arnoldrobbins/9menu
+COMMENT=		Simple menu patterned after the Plan9 user interface
+LICENSE=		9menu-license
 
 MAKE_FILE=		Makefile.noimake
 BUILD_TARGET=		9menu
diff --git a/misc/9menu/distinfo b/misc/9menu/distinfo
index a30403a093a..c3884742ee6 100644
--- a/misc/9menu/distinfo
+++ b/misc/9menu/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/02/21 15:12:00 triaxx Exp $
+$NetBSD: distinfo,v 1.10 2020/12/08 11:15:57 nia Exp $
 
-SHA1 (9menu-1.9.tar.gz) = c121ac0bdec798e7340063e48e0cf33ac3319ca9
-RMD160 (9menu-1.9.tar.gz) = b69942cea4e839ffafcec16e96eebcc8ef35ec35
-SHA512 (9menu-1.9.tar.gz) = c08ad77d11857bef78d7275ba1dbed27603188a8786b81b28fa3cdb85bd6445717b5b79b2b4a1eca917e0eedec7a3f9e1b12b5ccfd51198197a6889b466ca521
-Size (9menu-1.9.tar.gz) = 16620 bytes
-SHA1 (patch-9menu.1) = 443b69fa07aca82f4a03810d99b0099298e53f74
-SHA1 (patch-9menu.c) = f9471be52bc3367c096593a82cb60f5a04250582
-SHA1 (patch-aa) = d03504dc3d17c4b10e38cc6f1253d30885669749
+SHA1 (9menu-1.10.tar.gz) = 069e916a3ba0e6da14b8e9a21a4f176503ff6680
+RMD160 (9menu-1.10.tar.gz) = f0a7d11e3eecc78a1751cc193b6d8ece9e3fe9bf
+SHA512 (9menu-1.10.tar.gz) = 14fc4e69135222ca840bcf6580321987cac38a1b6ad4cdc0ea4f1e17d16dd9be942afee13133b0f851ca01d6c3dfc5f280838f5defaced2f4215a61caf1bafb7
+Size (9menu-1.10.tar.gz) = 17097 bytes
+SHA1 (patch-Makefile.noimake) = b737c7b5300ab6fb240f44a462aeaef2c70c0f75
diff --git a/misc/9menu/patches/patch-9menu.1 b/misc/9menu/patches/patch-9menu.1
deleted file mode 100644
index 87f7b43792f..00000000000
--- a/misc/9menu/patches/patch-9menu.1
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-9menu.1,v 1.1 2018/02/21 15:12:00 triaxx Exp $
-
-Allow '-file -' to cause stdin to be read as the file.
-From Debian
-
---- 9menu.1.orig	2015-06-25 20:15:02.000000000 +0000
-+++ 9menu.1
-@@ -98,7 +98,7 @@ Read items to display from
- in addition to any other command line arguments.  This is intended for use
- with
- .B #!
--in scripts.
-+in scripts.  If the filename is "-" read from stdin.
- A
- .I filename
- of
diff --git a/misc/9menu/patches/patch-9menu.c b/misc/9menu/patches/patch-9menu.c
deleted file mode 100644
index aa3bdc2587d..00000000000
--- a/misc/9menu/patches/patch-9menu.c
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-9menu.c,v 1.1 2018/02/21 15:12:00 triaxx Exp $
-
-Bug fix for use with keyboard. More prototypes.
-https://github.com/arnoldrobbins/9menu/commit/43465036b6f986dd2638504e9ce51b3b6dc976e3
-
-Fix resource leak: fp.
-Fix compilation warngings.
-From Debian
-
---- 9menu.c.orig	2015-06-25 20:15:02.000000000 +0000
-+++ 9menu.c
-@@ -113,7 +113,7 @@ char *fontlist[] = {	/* default font lis
- /* the 9menu icon, for garish window managers */
- #define nine_menu_width 40
- #define nine_menu_height 40
--static unsigned char nine_menu_bits[] = {
-+static char nine_menu_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00,
-    0x80, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00,
-    0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x04,
-@@ -154,11 +154,14 @@ int numitems;
- 
- char *shell = "/bin/sh";	/* default shell */
- 
--extern void usage(), run_menu(), spawn(), ask_wm_for_delete();
--extern void reap(), set_wm_hints();
--extern void redraw(), teleportmenu(), warpmouse(), restoremouse();
--extern void memory();
--extern int args();
-+extern void usage(), run_menu(), spawn(char *com), ask_wm_for_delete();
-+extern void reap(int sig), set_wm_hints(int wide, int high);
-+extern void redraw(int cur, int high, int wide);
-+extern void teleportmenu(int cur, int wide, int high);
-+extern void warpmouse(int cur, int wide, int high);
-+extern void restoremouse();
-+extern void memory(char *msg);
-+extern int args(int argc, char **argv);
- 
- /* memory --- print the out of memory message and die */
- 
-@@ -278,11 +281,13 @@ main(int argc, char **argv)
- 		} else {
- 			fp = fopen(filename, "r");
- 		}
-+
- 		if (fp == NULL) {
- 			fprintf(stderr, "%s: couldn't open '%s'\n", progname,
- 				filename);
- 			exit(1);
- 		}
-+
- 		while (fgets(fbuf, sizeof fbuf, fp)) {
- 			char *s = fbuf;
- 			strtok(s, "\n");
-@@ -327,6 +332,7 @@ main(int argc, char **argv)
- 			strcpy(f_argv[nlabels], s);
- 			++nlabels;
- 		}
-+    fclose(fp);
- 	}
- 
- 	labels = (char **) malloc((numitems + nlabels) * sizeof(char *));
-@@ -368,8 +374,10 @@ main(int argc, char **argv)
- 		fprintf(stderr, "\n");
- 		exit(1);
- 	}
-+
- 	screen = DefaultScreen(dpy);
- 	root = RootWindow(dpy, screen);
-+
- 	/*
- 	 * This used to be
- 	 * black = BlackPixel(dpy, screen);
-@@ -471,10 +479,10 @@ spawn(char *com)
- /* reap --- collect dead children */
- 
- void
--reap(int s)
-+reap(int sig)
- {
- 	(void) wait((int *) NULL);
--	signal(s, reap);
-+	signal(sig, reap);
- }
- 
- /* usage --- print a usage message and die */
-@@ -585,12 +593,15 @@ run_menu()
- 			    && key != CONFIG_MENU_SELECT_KEY)
- 				break;
- 
-+			/* adjust i so mapping will work */
- 			if (key == CONFIG_MENU_UP_KEY) {
- 				old = cur;
- 				cur--;
-+				i--;
- 			} else if (key == CONFIG_MENU_DOWN_KEY) {
- 				old = cur;
- 				cur++;
-+				i++;
- 			}
- 			
- 			while (cur < 0)
-@@ -787,7 +798,7 @@ teleportmenu(int cur, int wide, int high
- 	Window wdummy;
- 
- 	if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &x, &y,
--			       &dummy, &dummy, &dummy))
-+			       &dummy, &dummy, (unsigned int *)&dummy))
- 		XMoveWindow(dpy, menuwin, x-wide/2, y-cur*high-high/2);
- }
- 
-@@ -805,7 +816,7 @@ warpmouse(int cur, int wide, int high)
- 	offset += 6;	/* fudge factor */
- 
- 	if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &savex, &savey,
--			       &dummy, &dummy, &dummy))
-+			       &dummy, &dummy, (unsigned int *)&dummy))
- 		XWarpPointer(dpy, None, menuwin, 0, 0, 0, 0,
- 				wide/2, cur*high-high/2+offset);
- }
diff --git a/misc/9menu/patches/patch-aa b/misc/9menu/patches/patch-Makefile.noimake
index 176cb6d5eab..84631c2eff9 100644
--- a/misc/9menu/patches/patch-aa
+++ b/misc/9menu/patches/patch-Makefile.noimake
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2018/02/21 15:12:00 triaxx Exp $
+$NetBSD: patch-Makefile.noimake,v 1.1 2020/12/08 11:15:57 nia Exp $
 
-Adjust compilation and linking flags to pkgsrc.
+Respect CFLAGS and LDFLAGS.
 
---- Makefile.noimake	2003/06/04 08:23:07	1.1
-+++ Makefile.noimake	2003/06/04 08:37:56
+--- Makefile.noimake.orig	2020-04-16 18:08:32.000000000 +0000
++++ Makefile.noimake
 @@ -5,9 +5,8 @@
  # Arnold Robbins
  # arnold@skeeve.atl.ga.us