Update bbkeys to version 0.9.1.

Pkgsrc changes:
 * Add a bugfix patch for an LP64 problem in the X11 protocol handling, from
   FreeBSD ports tree
 * Add a patch to complete initialization of pointers, also from FreeBSD
 * Add dependency on libXft, it appears to be required

Upstream changes:
 * Add sendToPreviousWorkspace and sendToNextWorkspace functions
 * Add new config option: followWindowOnSend, allows bbkeys to change
   workspace to the space it just sent a window to
 * Fix for underquoted definitions in configure.ac
 * Fix annoying behaviour when cycling through windows on all workspaces,
   no longer flip workspace when doing this
 * Add config option includeIconifiedWindowsInCycle to include iconified
   windows in window cycling list

10 files changed, 156 insertions, 68 deletions

diff --git a/wm/bbkeys09/Makefile b/wm/bbkeys09/Makefile
index 628d29a368f..db2b8bf3ab2 100644
--- a/wm/bbkeys09/Makefile
+++ b/wm/bbkeys09/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2015/06/12 10:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/11/17 15:59:13 he Exp $
 #
 
-DISTNAME=	bbkeys-0.9.0
-PKGNAME=	bbkeys09-0.9.0
-PKGREVISION=	4
+DISTNAME=	bbkeys-0.9.1
+PKGNAME=	bbkeys09-0.9.1
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
+LICENSE=	mit
 
 CONFLICTS+=	bbkeys<=0.9
 
@@ -24,4 +24,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbkeys09/distinfo b/wm/bbkeys09/distinfo
index 5aa2da3e8b7..b5451f41346 100644
--- a/wm/bbkeys09/distinfo
+++ b/wm/bbkeys09/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.3 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.4 2015/11/17 15:59:13 he Exp $
 
-SHA1 (bbkeys-0.9.0.tar.gz) = b406f47f298fe83df6be89d2437dae2cee007439
-RMD160 (bbkeys-0.9.0.tar.gz) = a42506693da977bed17d56ee0c1e5d0440464ac6
-SHA512 (bbkeys-0.9.0.tar.gz) = 8d4dccf56eddfa0fabe4050b82da94433eef640d69a7cac9d778eb0244c68af33ca06d1fb3bc7ac558ad962dda793e16137084323a8b0b145e8e341149e26955
-Size (bbkeys-0.9.0.tar.gz) = 199146 bytes
-SHA1 (patch-aa) = b0c79c06d3e7897a63c43ee09ccbf7e05eedffe8
-SHA1 (patch-src_Config.cpp) = 4f4a575931dc1b0c9f5d871f5d42e75d868bdfa4
-SHA1 (patch-src_KeyClient.cpp) = b4fc5930eb0f5ad0821aac73c5806b11f0f4a12e
-SHA1 (patch-src_Netclient.cpp) = e40c8ea01b551f8713e22142309a3e8a40097380
-SHA1 (patch-src_actions.cc) = 0af59ca4be45cb5020da71837a794d2f34a6df24
-SHA1 (patch-src_main.cpp) = 3a54f4f8c2d0731619b7306573d31e3369a524c5
+SHA1 (bbkeys-0.9.1.tar.gz) = 93708f6b082e1b6e61173b49e2198f24411f3470
+RMD160 (bbkeys-0.9.1.tar.gz) = b498845ea6cd11dd638f203b75e9ec14ca0e62ce
+SHA512 (bbkeys-0.9.1.tar.gz) = c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
+Size (bbkeys-0.9.1.tar.gz) = 226941 bytes
+SHA1 (patch-Makefile.in) = 3e61b500d79de5cafa5d746b546196c9a9a3a652
+SHA1 (patch-src_Config.cpp) = 8624e2bc6a08c6d6de0b0e488617ce84c1fe1d15
+SHA1 (patch-src_KeyClient.cpp) = e6c9479b1847f0872d729cc5a112b9293d6158ee
+SHA1 (patch-src_Netclient.cpp) = 6d91c21a6eb33dd860c39e207d8c3fa3b1842b9b
+SHA1 (patch-src_ScreenHandler.cpp) = 8c883c9c9db39bca86f8579dc8ba1cc35b619d7c
diff --git a/wm/bbkeys09/patches/patch-Makefile.in b/wm/bbkeys09/patches/patch-Makefile.in
new file mode 100644
index 00000000000..f8ec5d1419b
--- /dev/null
+++ b/wm/bbkeys09/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/11/17 15:59:13 he Exp $
+
+Place documents elsewhere.
+
+--- Makefile.in.orig	2008-12-22 03:08:52.000000000 +0000
++++ Makefile.in
+@@ -152,7 +152,7 @@ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/bbkeys
++docdir = $(datadir)/share/doc/bbkeys
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
diff --git a/wm/bbkeys09/patches/patch-aa b/wm/bbkeys09/patches/patch-aa
deleted file mode 100644
index 6ba0bc1200d..00000000000
--- a/wm/bbkeys09/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/20 23:07:18 jschauma Exp $
-
---- Makefile.in.orig	2006-08-20 11:44:15.000000000 -0400
-+++ Makefile.in	2006-08-20 11:43:55.000000000 -0400
-@@ -130,7 +130,7 @@
- SUBDIRS = src data doc rpm
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- 
--docdir = $(datadir)/doc/bbkeys
-+docdir = $(datadir)/share/doc/bbkeys
- doc_DATA = AUTHORS BUGS ChangeLog LICENSE NEWS README TODO
- EXTRA_DIST = $(doc_DATA) debian
- subdir = .
diff --git a/wm/bbkeys09/patches/patch-src_Config.cpp b/wm/bbkeys09/patches/patch-src_Config.cpp
index 7d23fcbff73..ffaf2196fda 100644
--- a/wm/bbkeys09/patches/patch-src_Config.cpp
+++ b/wm/bbkeys09/patches/patch-src_Config.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_Config.cpp,v 1.1 2011/11/25 22:21:28 joerg Exp $
+$NetBSD: patch-src_Config.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
+
+Include strings.h too.
 
 --- src/Config.cpp.orig	2011-11-25 16:58:41.000000000 +0000
 +++ src/Config.cpp
diff --git a/wm/bbkeys09/patches/patch-src_KeyClient.cpp b/wm/bbkeys09/patches/patch-src_KeyClient.cpp
index 23c535a1387..fbde1e7b188 100644
--- a/wm/bbkeys09/patches/patch-src_KeyClient.cpp
+++ b/wm/bbkeys09/patches/patch-src_KeyClient.cpp
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_KeyClient.cpp,v 1.1 2011/11/25 22:21:28 joerg Exp $
+$NetBSD: patch-src_KeyClient.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
 
---- src/KeyClient.cpp.orig	2011-11-25 17:00:02.000000000 +0000
+Include strings.h too.
+Initialize all pointers.
+
+--- src/KeyClient.cpp.orig	2008-12-22 01:52:35.000000000 +0000
 +++ src/KeyClient.cpp
 @@ -46,6 +46,7 @@ extern "C" {
  
@@ -10,3 +13,14 @@ $NetBSD: patch-src_KeyClient.cpp,v 1.1 2011/11/25 22:21:28 joerg Exp $
  
  }
  
+@@ -104,6 +105,10 @@ KeyClient::KeyClient (int argc, char **a
+   _netclient = new Netclient(this->display());
+   _active = _clients.end();
+ 
++  // Initialize uninitialized pointers to NULL
++  _keybindings = NULL;
++  config_check_timer = NULL;
++
+   initialize();
+ }
+ 
diff --git a/wm/bbkeys09/patches/patch-src_Netclient.cpp b/wm/bbkeys09/patches/patch-src_Netclient.cpp
index 643caaf0a43..92c71b857b0 100644
--- a/wm/bbkeys09/patches/patch-src_Netclient.cpp
+++ b/wm/bbkeys09/patches/patch-src_Netclient.cpp
@@ -1,15 +1,49 @@
-$NetBSD: patch-src_Netclient.cpp,v 1.1 2011/11/25 22:21:28 joerg Exp $
+$NetBSD: patch-src_Netclient.cpp,v 1.2 2015/11/17 15:59:13 he Exp $
 
---- src/Netclient.cpp.orig	2011-11-25 17:00:35.000000000 +0000
+Fix LP64 problem with the X11 protocol handling, from FreeBSD.
+
+--- src/Netclient.cpp.orig	2008-12-22 01:10:19.000000000 +0000
 +++ src/Netclient.cpp
-@@ -21,9 +21,9 @@
- // DEALINGS IN THE SOFTWARE.
- 
- // E_O_H_VR
-+#include <cstring>
- 
- // Methods, ideas, implementations taken from Openbox's XAtom class *sigh*
--
- #include "Netclient.h"
+@@ -141,6 +141,7 @@ bool Netclient::getValue(Window win, Ato
+   int result;
+   unsigned long maxread = nelements;
+   bool ret = False;
++  int bsize;
  
- Netclient::Netclient (const bt::Display &display)
+   // try get the first element
+   result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, 1l, False,
+@@ -149,18 +150,19 @@ bool Netclient::getValue(Window win, Ato
+   ret = (result == Success && ret_type == type && ret_size == size &&
+          nelements > 0);
+   if (ret) {
++    bsize = (size == 32) ? sizeof(long) : size/8;
+     if (ret_bytes == 0 || maxread <= nelements) {
+       // we got the whole property's value
+-      *value = new unsigned char[nelements * size/8 + 1];
+-      memcpy(*value, c_val, nelements * size/8 + 1);
++      *value = new unsigned char[nelements * bsize + 1];
++      memcpy(*value, c_val, nelements * bsize + 1);
+     } else {
+       // get the entire property since it is larger than one long
+       XFree(c_val);
+       // the number of longs that need to be retreived to get the property's
+       // entire value. The last + 1 is the first long that we retrieved above.
+       int remain = (ret_bytes - 1)/sizeof(long) + 1 + 1;
+-      if (remain > size/8 * (signed)maxread) // dont get more than the max
+-        remain = size/8 * (signed)maxread;
++      if (remain > bsize * (signed)maxread) // dont get more than the max
++        remain = bsize * (signed)maxread;
+       result = XGetWindowProperty(_display.XDisplay(), win, atom, 0l, remain, False, type,
+                                   &ret_type, &ret_size, &nelements, &ret_bytes,
+                                   &c_val);
+@@ -174,8 +176,8 @@ bool Netclient::getValue(Window win, Ato
+       if (! ret)
+         return getValue(win, atom, type, maxread, value, size);
+   
+-      *value = new unsigned char[nelements * size/8 + 1];
+-      memcpy(*value, c_val, nelements * size/8 + 1);
++      *value = new unsigned char[nelements * bsize + 1];
++      memcpy(*value, c_val, nelements * bsize + 1);
+     }    
+   }
+   if (c_val) XFree(c_val);
diff --git a/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp b/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp
new file mode 100644
index 00000000000..1d710ef903b
--- /dev/null
+++ b/wm/bbkeys09/patches/patch-src_ScreenHandler.cpp
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_ScreenHandler.cpp,v 1.1 2015/11/17 15:59:13 he Exp $
+
+Debug output for missing active window.
+Used while debugging what turned out to be an LP64 problem,
+but may be useful later, so left here.
+
+--- src/ScreenHandler.cpp.orig	2008-12-22 02:48:59.000000000 +0000
++++ src/ScreenHandler.cpp
+@@ -467,6 +467,9 @@ void ScreenHandler::keyPressEvent (const
+ 				assert(false);  // unhandled action type!
+ 				break;
+ 		}
++	} else {
++		if ( _debug )
++			cout <<BBTOOL << ": " << "No active window" <<endl;
+ 	}
+ }
+ 
+@@ -564,18 +567,26 @@ void ScreenHandler::updateActiveWindow()
+ {
+   assert(_managed);
+ 
++  if ( _debug )
++    cout <<BBTOOL << ": " << "checking active window" <<endl;
++
+   Window a = None;
+   _netclient->getValue(_root, _netclient->activeWindow(), XA_WINDOW, a);
+ 
+   if ( None == a ) {
++    if ( _debug )
++      cout <<BBTOOL << ": " << "no active window found" << endl;
+     return;
+   }
+ 
+   WindowList::iterator it, end = _clients.end();
+   for (it = _clients.begin(); it != end; ++it) {
+     if ( (*it)->window() == a) {
+-      if ( (*it)->getScreenNumber() != _screenNumber )
++      if ( (*it)->getScreenNumber() != _screenNumber ) {
++        if ( _debug )
++          cout <<BBTOOL << ": " << "wrong screen?" << endl;
+         return;
++      }
+       break;
+     }
+   }
+@@ -597,8 +608,14 @@ void ScreenHandler::updateActiveWindow()
+ 
+       if ( _debug )
+         cout <<BBTOOL << ": " << "active window now: [" << bt::toLocale((*_active)->title()) <<"]" <<endl;
++    } else {
++      if ( _debug )
++        cout <<BBTOOL << ": " << "cycling through window list" <<endl;
+     }
+ 
++  } else {
++    if ( _debug )
++      cout <<BBTOOL << ": " << "active window == end, ignored" <<endl;
+   }
+ 
+ }
diff --git a/wm/bbkeys09/patches/patch-src_actions.cc b/wm/bbkeys09/patches/patch-src_actions.cc
deleted file mode 100644
index ece401e3573..00000000000
--- a/wm/bbkeys09/patches/patch-src_actions.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_actions.cc,v 1.1 2011/11/25 22:21:28 joerg Exp $
-
---- src/actions.cc.orig	2011-11-25 16:59:00.000000000 +0000
-+++ src/actions.cc
-@@ -24,6 +24,7 @@
- 
- #include "actions.hh"
- 
-+#include <cstdlib>
- #include <iostream>
- #include <string>
- #include <sstream>
diff --git a/wm/bbkeys09/patches/patch-src_main.cpp b/wm/bbkeys09/patches/patch-src_main.cpp
deleted file mode 100644
index 3097473886e..00000000000
--- a/wm/bbkeys09/patches/patch-src_main.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_main.cpp,v 1.1 2011/11/25 22:21:28 joerg Exp $
-
---- src/main.cpp.orig	2011-11-25 17:00:21.000000000 +0000
-+++ src/main.cpp
-@@ -21,7 +21,7 @@
- // DEALINGS IN THE SOFTWARE.
- 
- // E_O_H_VR
--
-+#include <cstring>
- #include "KeyClient.h"
- #include "version.h"
-