Update to version 0.8.5, released today.

- fix recursive redhat-build bug (fixes 577135)
- fix a memory leak in ToolWindow::windowAttributeChange.
- remove server grabs from the Image code. They prove to not be needed (they
  no longer exist in the blackbox code.) And they cause the X server to lock
  indefinately if you run 2 bbkeys on the same display, running the second
  one from a terminal on the display.
- when we recieve a startup message from blackbox, clear out any leftover
  windows in the window list. These are caused by the fact that on shutdown
  of blackbox, if any windows are unmanaged after bbkeys, bbkeys doesn't get
  notified of their destruction and so ends up with extra windows in its list.
- fix compiling issues under solaris. Thanks to grub on irc for use of his
  time for testing.
- get rid of work-around for pre-0.60 blackbox, which fixes bug that let you
  move the toolbar around with bbkeys.
- fix window focus tracking bug. Fixes bug where you could manipulate the
  last focused window on a nono-visible workspace.
- fix multi-head bug in main.cc.  We now putenv("DISPLAY=...") so that
  applications launched will be launched on the correct display.  Thanks to
  Greg Gilbert for his patch!
- fix bug in main.cc (| rather than ||).  Thanks to Roman Neuhauser!
- fix bug in bbkeys.hh--increasing MaxInstructions to 100 for cthulhain
- fix in bbkeys.cc -- XUngrabKey changed to use same call to find what
  screen we're on as the XGrabKey call
- fix in bbkeys.cc -- doing "xterm -e sh -c $command" rather than "xterm -e
  $command".  Thanks to Magnus Solvang for the bug report.  Also, changing
  hideous char* and snprintf() to ostrstream, YAY!!

5 files changed, 14 insertions, 38 deletions

diff --git a/wm/bbkeys/DESCR b/wm/bbkeys/DESCR
index efe31876aac..162ce46f60d 100644
--- a/wm/bbkeys/DESCR
+++ b/wm/bbkeys/DESCR
@@ -3,7 +3,3 @@ the Blackbox window manager but usable with any.
 
 Can bind actions such as executing commands, altering the states of windows,
 switching workspaces, etc. to arbitrary keys.
-
-Note: since the basic package does not install the qt-based configuration
-tool, bbkeys ought to be invoked with the -noqt option unless you also
-install the wm/bbkeys-qt package.
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index dfc7f611be6..1d46c54f039 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:27 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/24 14:21:53 jschauma Exp $
 #
 
-DISTNAME=	bbkeys-0.8.4
+DISTNAME=	bbkeys-0.8.5
 CATEGORIES=	x11 wm
-MASTER_SITES=	http://bbkeys.sourceforge.net/downloads/
-# I'd like to add the next line, but the file there has the same name,
-# but is just a tar, not a tar.gz. [wiz 2002-03-18]
-#		${MASTER_SITE_SOURCEFORGE:=bbkeys/}
+MASTER_SITES=	http://bbkeys.sourceforge.net/downloads/ \
+		${MASTER_SITE_SOURCEFORGE:=bbkeys/}
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
 
diff --git a/wm/bbkeys/distinfo b/wm/bbkeys/distinfo
index fb0569f8173..2b18dbceadb 100644
--- a/wm/bbkeys/distinfo
+++ b/wm/bbkeys/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/03/18 09:23:02 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/24 14:21:53 jschauma Exp $
 
-SHA1 (bbkeys-0.8.4.tar.gz) = 08db9aadac6e7c3a793de0af4ca1522d492a6c55
-Size (bbkeys-0.8.4.tar.gz) = 183028 bytes
-SHA1 (patch-aa) = 295e195b368d45cef51064da67b520764395349b
-SHA1 (patch-ab) = 9cdcb9e6c19f178232527a9ad28d222ffe0d98ac
+SHA1 (bbkeys-0.8.5.tar.gz) = 3f7198956b4112a4b20d205d63a686e11f4f5fe0
+Size (bbkeys-0.8.5.tar.gz) = 184795 bytes
+SHA1 (patch-aa) = 303186f314c9d0f18415cef97630e874de14048d
diff --git a/wm/bbkeys/patches/patch-aa b/wm/bbkeys/patches/patch-aa
index bd36ef4fbb4..789729d637a 100644
--- a/wm/bbkeys/patches/patch-aa
+++ b/wm/bbkeys/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2002/03/18 09:23:03 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/24 14:21:53 jschauma Exp $
 
---- Makefile.in.orig	Fri Jan 18 14:34:58 2002
-+++ Makefile.in
-@@ -78,7 +78,7 @@
+--- Makefile.in.orig	Tue Sep 24 10:06:49 2002
++++ Makefile.in	Tue Sep 24 10:07:14 2002
+@@ -80,7 +80,7 @@
  
  SUBDIRS = src data doc redhat
  
 -docdir = $(prefix)/doc/bbkeys
 +docdir = $(prefix)/share/doc/bbkeys
  doc_DATA = README AUTHORS BUGS ChangeLog NEWS
- EXTRA_DIST = $(doc_DATA) debian redhat
+ EXTRA_DIST = $(doc_DATA) debian
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/wm/bbkeys/patches/patch-ab b/wm/bbkeys/patches/patch-ab
deleted file mode 100644
index 76fb9351e87..00000000000
--- a/wm/bbkeys/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/03/18 09:23:03 wiz Exp $
-
---- src/bbkeys.cc.orig	Tue Jan 15 04:21:25 2002
-+++ src/bbkeys.cc
-@@ -676,10 +676,10 @@
- 		    char *args = new char[strlen(begin) + strlen(bbkeys_rcfile) +1];
- 				sprintf(args, "%s%s", begin, bbkeys_rcfile);
- 			 	res = execlp("rxvt", "rxvt", "-bg", "black", "-fg", "red",
--								"-e", args, NULL);
-+								"-e", "bbkeysconf.pl", "-rcfile", bbkeys_rcfile, NULL);
- 			 	if (res != 0) {
- 						execlp("xterm", "xterm", "-bg", "black", "-fg",
--								"red", "-e", args, NULL);
-+						       "red", "-e", "bbkeysconf.pl", "-rcfile", bbkeys_rcfile, NULL);
- 			 	}
- 				delete args;
- 			}