xbindkeys: Update to 1.8.7

2020-05-23  Philippe Brochard <hocwp@free.fr>

	* Fix some compilation warnings

2020-05-23 Jason Miller  <jasom@fastmail.com>

	* Prevent scheme functions to be garbage collected

4 files changed, 53 insertions, 10 deletions

diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 62b57cbc758..d3a33c0dd49 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.22 2020/03/08 16:51:51 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2020/11/24 10:25:24 nia Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-tk
diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common
index dda0830efe3..672fb42283c 100644
--- a/x11/xbindkeys/Makefile.common
+++ b/x11/xbindkeys/Makefile.common
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile.common,v 1.14 2020/01/18 23:35:58 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2020/11/24 10:25:24 nia Exp $
 #
 # used by x11/xbindkeys-tk/Makefile
 
-DISTNAME=	xbindkeys-1.8.6
+DISTNAME=	xbindkeys-1.8.7
 CATEGORIES=	x11
 MASTER_SITES=	http://www.nongnu.org/xbindkeys/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.nongnu.org/xbindkeys/xbindkeys.html
 COMMENT=	Launches shell commands with your keyboard or your mouse
+LICENSE=	gnu-gpl-v2
 
 DISTINFO_FILE=	${.CURDIR}/../../x11/xbindkeys/distinfo
-#PATCHDIR=	${.CURDIR}/../../x11/xbindkeys/patches
+PATCHDIR=	${.CURDIR}/../../x11/xbindkeys/patches
 
 GNU_CONFIGURE=	yes
 
diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo
index fd017564e58..7474434ded9 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2016/09/15 15:58:49 wiz Exp $
+$NetBSD: distinfo,v 1.12 2020/11/24 10:25:24 nia Exp $
 
-SHA1 (xbindkeys-1.8.6.tar.gz) = 913d772613fe0b05307d02417f6e6d8badbc296a
-RMD160 (xbindkeys-1.8.6.tar.gz) = 5c3fe8a1c343729033b287e47c2689724ae8ebba
-SHA512 (xbindkeys-1.8.6.tar.gz) = 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
-Size (xbindkeys-1.8.6.tar.gz) = 151941 bytes
+SHA1 (xbindkeys-1.8.7.tar.gz) = eb5eed246ccec4f5a513b0a0e7367ba669c77dba
+RMD160 (xbindkeys-1.8.7.tar.gz) = c8c53a5625e4a956a365a593800c01ccad54d1c6
+SHA512 (xbindkeys-1.8.7.tar.gz) = a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
+Size (xbindkeys-1.8.7.tar.gz) = 177532 bytes
+SHA1 (patch-options.c) = 2341200cf21a380c8f79c9d7ab37860766999245
diff --git a/x11/xbindkeys/patches/patch-options.c b/x11/xbindkeys/patches/patch-options.c
new file mode 100644
index 00000000000..84774d79f46
--- /dev/null
+++ b/x11/xbindkeys/patches/patch-options.c
@@ -0,0 +1,42 @@
+$NetBSD: patch-options.c,v 1.1 2020/11/24 10:25:24 nia Exp $
+
+Argument to ctype functions must be unsigned char.
+
+--- options.c.orig	2020-05-23 16:22:19.000000000 +0000
++++ options.c
+@@ -708,7 +708,7 @@ get_rc_file (void)
+ 			  /* is a numeric keycode (c:nnn) ? */
+ 			  if (line2[0] == 'c' && line2[1] == ':')
+ 			    {
+-			      if (isdigit (line2[2]))
++			      if (isdigit ((unsigned char)line2[2]))
+ 				{
+ 				  type = CODE;
+ 				  keycode = strtol (line2+2, (char **) NULL, 0);
+@@ -725,7 +725,7 @@ get_rc_file (void)
+ 			    /* is a numeric modifier (m:nnn) ? */
+ 			  if (line2[0] == 'm' && line2[1] == ':')
+ 			    {
+-			      if (isdigit (line2[2]))
++			      if (isdigit ((unsigned char)line2[2]))
+ 				{
+ 				  modifier |= strtol (line2+2, (char **) NULL, 0);
+ 				}
+@@ -741,7 +741,7 @@ get_rc_file (void)
+ 			    /* is a mouse button (b:nnn) ? */
+ 			  if (line2[0] == 'b' && line2[1] == ':')
+ 			    {
+-			      if (isdigit (line2[2]))
++			      if (isdigit ((unsigned char)line2[2]))
+ 				{
+ 				  type = BUTTON;
+ 				  button = strtol (line2+2, (char **) NULL, 0);
+@@ -967,7 +967,7 @@ SCM extract_key (SCM key, KeyType_t *typ
+   //Check for special numeric stuff.
+   //This way is really far nicer looking and more efficient than
+   //having three copies of the code.
+-  if(strlen (str) > 2 && str[1] == ':' && isdigit (str[2]))
++  if(strlen (str) > 2 && str[1] == ':' && isdigit ((unsigned char)str[2]))
+     {
+       switch (str[0])
+         {