Updated xbindkeys to 1.8.6 and switch it to guile20.

2011-03-09  Hans-Peter Deifel <hpdeifel@gmx.de>

	* options.c: Replace some deprecated guile functions.
	The GH interface has been removed in guile-2.0 so do not use it
	anymore in xbindkeys.

2011-02-21  Philippe Brochard  <pbrochard@common-lisp.net>

	* options.c (get_rc_guile_file): Fix a crash related to guile's GC
	and freeing of static memory. Thanks to Thomas Lindroth.

2010-12-04  Philippe Brochard  <pbrochard@common-lisp.net>

	* options.c: Fix some compilations warnings.

	* xbindkeys.c (adjust_display): adjust envstr_size to prevent a
	segfault with libX11-1.4.0.

2010-01-24  Alexander Clouter <alex@digriz.org.uk>

	* xbindkeys.c (event_loop): Doesn't stat on configuration file
	change the first time if poll-rc is false.

2010-01-23  Philippe Brochard  <hocwp@free.fr>
	* options.c: A poll-rc flag has been added to poll the rc/guile
	configuration file for update. By default no poll is done on
	configuration files. Many thanks to Alexander Clouter.

	* xbindkeys.c (event_loop): Stat both default rc file and guile rc
	file for reloading them when they change.

xbindkeys changelog by Philippe Brochard <hocwp@free.fr>


version:

1.8.3:
	Add a listen loop in the main loop. This fix a bug where, in the
	previous version, a keypress was needed to reload the
	configuration file after a keybinding change. Now one can edit the
	configuration file and keybindings are automatically updated after
	each save. Many thanks to Edwin Stang!

1.8.2:
	Correction of typos in the man page. An emphasis is made on the
	documentation about the guile configuration file (the prefered way
	for non trivial configuration).
	Many thanks to Brad Sawatzky.

1.8.1:
	Better Guile configuration with autotools.
	Minor compilation warning have been fixed.

1.8.0:
	Enable a full access to the xbindkeys internal from the guile
	scheme configuration file. A grabbed key can start a shell command
	or run a scheme function. This enable to do more powerfull things
	inside xbindkeys whitout the need of an external shell script
	(like double click, timed double click or keys combinations).

---------------------------------------------------------------------------

1.7.4:
	xbindkeys.spec: Change Copyright to License.
	Little english correction in warnings.
	Configuration files are reloaded on the fly when they have
	changed so there is no more need to send a HUP signal to reload
	them (Many thanks to Shish).
	Use `scm_c_define_gsubr' instead of 'scm_make_gsubr' with the
	guile mode.

4 files changed, 14 insertions, 16 deletions

diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 551d8ba9cfa..3996631933c 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2016/09/15 14:32:41 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2016/09/15 15:58:49 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		5
-
 CONFIGURE_ARGS+=	--disable-tk
 
 PTHREAD_AUTO_VARS=	yes
diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common
index 83d32fbb7d7..8f7d79a75ba 100644
--- a/x11/xbindkeys/Makefile.common
+++ b/x11/xbindkeys/Makefile.common
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.12 2014/10/05 16:41:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2016/09/15 15:58:49 wiz Exp $
 #
 # used by x11/xbindkeys-tk/Makefile
 
-DISTNAME=	xbindkeys-1.7.3
+DISTNAME=	xbindkeys-1.8.6
 CATEGORIES=	x11
-MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
+MASTER_SITES=	http://www.nongnu.org/xbindkeys/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://hocwp.free.fr/xbindkeys/xbindkeys.html
+HOMEPAGE=	http://www.nongnu.org/xbindkeys/xbindkeys.html
 COMMENT=	Launches shell commands with your keyboard or your mouse
 
 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 e64df0b3318..fd017564e58 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:28:57 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/09/15 15:58:49 wiz Exp $
 
-SHA1 (xbindkeys-1.7.3.tar.gz) = ccbc30d27d9a65cf2531c41e5d2db106e9029e7a
-RMD160 (xbindkeys-1.7.3.tar.gz) = 134207d4370c98f74d39aeb0cf79d94cbbaeae38
-SHA512 (xbindkeys-1.7.3.tar.gz) = 44ddf14e3a572ba71582895fb16a385c6176dfa921336df1ec050a3d658438bb5756eca63c6efeadcc6870f1a585b34652067d1d1aceb1fed1483afe898ea73f
-Size (xbindkeys-1.7.3.tar.gz) = 110561 bytes
+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
diff --git a/x11/xbindkeys/options.mk b/x11/xbindkeys/options.mk
index d4e37d828e1..acd5077866c 100644
--- a/x11/xbindkeys/options.mk
+++ b/x11/xbindkeys/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/10/29 12:32:44 sborrill Exp $
+# $NetBSD: options.mk,v 1.2 2016/09/15 15:58:49 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xbindkeys
 PKG_SUPPORTED_OPTIONS=	guile
@@ -8,7 +8,8 @@ PKG_SUGGESTED_OPTIONS+=	guile
 
 .if !empty(PKG_OPTIONS:Mguile)
 CONFIGURE_ARGS+=	--enable-guile
-.include "../../lang/guile/buildlink3.mk"
+USE_TOOLS+=		pkg-config
+.include "../../lang/guile20/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-guile
 .endif