tech-pkg: updates for bbkeys and blackbox

Subject: updates for bbkeys and blackbox
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 11/04/2005 18:33:40
Here is an update for bbkeys and blackbox. It needs to be cleaned up some 
and has some old junk. (I started this maybe a year ago.)
One problem for me is that I lost Xft support. I will need to look at 
that.

diff -pruN wm/blackbox/DESCR new/blackbox/DESCR
--- wm/blackbox/DESCR	2003-05-19 13:16:04.000000000 -0700
+++ new/blackbox/DESCR	2005-11-04 13:58:52.000000000 -0800
@@ -1,4 +1,9 @@
-Blackbox is yet another addition to the list of window managers For X11R6.
-Blackbox is built with C++, sharing no common code with any other window
-manager.  It is designed to be small and fast, with a built in graphics class,
-near complete ICCCM compliance, and support for multple desktop environments.
+Blackbox is yet another addition to the list of window managers
+For X11R6.  Blackbox is built with C++, sharing no common code with
+any other window manager.  It is designed to be small and fast,
+with a built in graphics class, complete ICCCM compliance, EWMH
+(aka NETWM) implementation, and support for multiple desktop
+environments.
+
+This package also provides the Blackbox Toolbox utility class
+library for writing small applications.
diff -pruN wm/blackbox/Makefile new/blackbox/Makefile
--- wm/blackbox/Makefile	2005-06-02 10:09:23.000000000 -0700
+++ new/blackbox/Makefile	2005-11-04 18:27:31.000000000 -0800
@@ -1,20 +1,26 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/10 14:12:51 xtraeme Exp $
  #

-DISTNAME=	blackbox-0.65.0
-PKGREVISION=	5
+DISTNAME=	blackbox-0.70.1
  CATEGORIES=	wm x11
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
+#MASTER_SITES=	http://blackboxwm.sourceforge.net/
+EXTRACT_SUFX=	.tar.bz2

-MAINTAINER=	jschauma@NetBSD.org
+MAINTAINER=	reed@reedmedia.net
  HOMEPAGE=	http://blackboxwm.sourceforge.net/
  COMMENT=	Small and fast X11R6 window manager

-DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
+CONFLICTS+=	bsetroot-[0-9]*
+CONFLICTS+=	fluxbox-[0-9]*

-USE_LANGUAGES=	c c++
+#USE_GCC_SHLIB=	YES
+USE_LIBTOOL=	yes
+USE_X11=	YES
  GNU_CONFIGURE=	YES

+#GCC_REQD=	3.0
+
  .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
diff -pruN wm/blackbox/PLIST new/blackbox/PLIST
--- wm/blackbox/PLIST	2002-11-25 12:56:30.000000000 -0800
+++ new/blackbox/PLIST	2005-11-04 14:33:32.000000000 -0800
@@ -1,78 +1,37 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/20 18:20:30 jschauma Exp $
+@comment $NetBSD$
  bin/blackbox
+bin/bsetbg
+bin/bsetroot
+bin/bstyleconvert
+include/bt/Application.hh
+include/bt/Bitmap.hh
+include/bt/Color.hh
+include/bt/Display.hh
+include/bt/EWMH.hh
+include/bt/EventHandler.hh
+include/bt/Font.hh
+include/bt/Image.hh
+include/bt/Menu.hh
+include/bt/Pen.hh
+include/bt/PixmapCache.hh
+include/bt/Rect.hh
+include/bt/Resource.hh
+include/bt/Texture.hh
+include/bt/Timer.hh
+include/bt/Unicode.hh
+include/bt/Util.hh
+include/bt/XDG.hh
+lib/libbt.la
+lib/pkgconfig/libbt.pc
  man/man1/blackbox.1
+man/man1/bsetbg.1
+man/man1/bsetroot.1
  share/blackbox/menu
-share/blackbox/nls/C/blackbox.cat
-share/blackbox/nls/POSIX
-share/blackbox/nls/US_ASCII
-share/blackbox/nls/da_DK/blackbox.cat
-share/blackbox/nls/de
-share/blackbox/nls/de_DE/blackbox.cat
-share/blackbox/nls/en
-share/blackbox/nls/en_GB
-share/blackbox/nls/en_US
-share/blackbox/nls/es
-share/blackbox/nls/es_AR/blackbox.cat
-share/blackbox/nls/es_ES/blackbox.cat
-share/blackbox/nls/es_MX
-share/blackbox/nls/fr
-share/blackbox/nls/fr_FR/blackbox.cat
-share/blackbox/nls/hu_HU/blackbox.cat
-share/blackbox/nls/it
-share/blackbox/nls/it_IT/blackbox.cat
-share/blackbox/nls/ja_JP/blackbox.cat
-share/blackbox/nls/ko_KR/blackbox.cat
-share/blackbox/nls/lv_LV/blackbox.cat
-share/blackbox/nls/nl
-share/blackbox/nls/nl_NL/blackbox.cat
-share/blackbox/nls/no_NO/blackbox.cat
-share/blackbox/nls/pl_PL/blackbox.cat
-share/blackbox/nls/pt_BR/blackbox.cat
-share/blackbox/nls/ro_RO/blackbox.cat
-share/blackbox/nls/ru_RU/blackbox.cat
-share/blackbox/nls/sk_SK/blackbox.cat
-share/blackbox/nls/sl_SI/blackbox.cat
-share/blackbox/nls/sv_SE/blackbox.cat
-share/blackbox/nls/uk_UA/blackbox.cat
-share/blackbox/nls/zh_CN/blackbox.cat
-share/blackbox/nls/zh_TW/blackbox.cat
-share/blackbox/styles/Artwiz
-share/blackbox/styles/Cthulhain
-share/blackbox/styles/Flux
-share/blackbox/styles/Minimal
-share/blackbox/styles/Nyz
-share/blackbox/styles/Operation
-share/blackbox/styles/Outcomes
-share/blackbox/styles/Rampage
-share/blackbox/styles/Rancor
-share/blackbox/styles/Results
-share/blackbox/styles/Shade
-share/blackbox/styles/Spiff
-share/blackbox/styles/TDF
-share/blackbox/styles/Twice
+share/blackbox/styles/Blue
+share/blackbox/styles/Gray
+share/blackbox/styles/Green
+share/blackbox/styles/Purple
+share/blackbox/styles/Red
  @dirrm share/blackbox/styles
-@dirrm share/blackbox/nls/zh_TW
-@dirrm share/blackbox/nls/zh_CN
-@dirrm share/blackbox/nls/uk_UA
-@dirrm share/blackbox/nls/sv_SE
-@dirrm share/blackbox/nls/sl_SI
-@dirrm share/blackbox/nls/sk_SK
-@dirrm share/blackbox/nls/ru_RU
-@dirrm share/blackbox/nls/ro_RO
-@dirrm share/blackbox/nls/pt_BR
-@dirrm share/blackbox/nls/pl_PL
-@dirrm share/blackbox/nls/no_NO
-@dirrm share/blackbox/nls/nl_NL
-@dirrm share/blackbox/nls/lv_LV
-@dirrm share/blackbox/nls/ko_KR
-@dirrm share/blackbox/nls/ja_JP
-@dirrm share/blackbox/nls/it_IT
-@dirrm share/blackbox/nls/hu_HU
-@dirrm share/blackbox/nls/fr_FR
-@dirrm share/blackbox/nls/es_ES
-@dirrm share/blackbox/nls/es_AR
-@dirrm share/blackbox/nls/de_DE
-@dirrm share/blackbox/nls/da_DK
-@dirrm share/blackbox/nls/C
-@dirrm share/blackbox/nls
  @dirrm share/blackbox
+@dirrm include/bt
diff -pruN wm/blackbox/buildlink3.mk new/blackbox/buildlink3.mk
--- wm/blackbox/buildlink3.mk	1969-12-31 16:00:00.000000000 -0800
+++ new/blackbox/buildlink3.mk	2005-11-04 14:37:05.000000000 -0800
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+# XXX for now blackbox only provides static library
+BUILDLINK_DEPMETHOD.blackbox?=	build
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+BLACKBOX_BUILDLINK3_MK:=	${BLACKBOX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	blackbox
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblackbox}
+BUILDLINK_PACKAGES+=	blackbox
+
+.if !empty(BLACKBOX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.blackbox+=	blackbox>=0.70.1
+BUILDLINK_PKGSRCDIR.blackbox?=	../../new/blackbox-devel
+.endif	# BLACKBOX_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -pruN wm/blackbox/distinfo new/blackbox/distinfo
--- wm/blackbox/distinfo	2005-02-24 13:38:16.000000000 -0800
+++ new/blackbox/distinfo	2005-11-04 13:59:24.000000000 -0800
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.7 2003/08/30 20:34:15 reed Exp $

-SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
-RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
-Size (blackbox-0.65.0.tar.gz) = 292950 bytes
-SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f
-SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05
-SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
-SHA1 (patch-ad) = 0906aa36c45b1e9ebd8c10e166ac1ba8e345fd9e
+SHA1 (blackbox-0.70.1.tar.bz2) = 66455b8400d6659b5681c290a5ced3697d199955
+RMD160 (blackbox-0.70.1.tar.bz2) = daa414d3d9093614ad7caa18c0fe3863ef3db707
+Size (blackbox-0.70.1.tar.bz2) = 492399 bytes
diff -pruN wm/bbkeys/DESCR new/bbkeys/DESCR
--- wm/bbkeys/DESCR	2003-05-19 13:16:01.000000000 -0700
+++ new/bbkeys/DESCR	2005-11-04 18:24:43.000000000 -0800
@@ -1,5 +1,9 @@
-Provide keyboard shortcuts for X11R6, specifically intended for use with the
-Blackbox window manager but usable with any.
+Provide keyboard shortcuts for X11R6, specifically intended for
+use with 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.
+It can bind actions such as executing commands, altering the states
+of windows, switching workspaces, etc. to arbitrary keys.
+
+bbkeys uses Blackbox's shared libbt library. It is EWMH-compliant
+and works with Openbox, Blackbox (0.70.0+), KDE, Metacity, and any
+other NETWM/EWMH-compliant window manager.
diff -pruN wm/bbkeys/Makefile new/bbkeys/Makefile
--- wm/bbkeys/Makefile	2005-07-19 22:52:45.000000000 -0700
+++ new/bbkeys/Makefile	2005-11-04 18:24:04.000000000 -0800
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:50 xtraeme Exp $
  #

-DISTNAME=	bbkeys-0.8.6
+DISTNAME=	bbkeys-0.9.0
+PKGNAME=	bbkeys-0.9.0
  CATEGORIES=	x11 wm
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}

-MAINTAINER=	jschauma@NetBSD.org
+MAINTAINER=	reed@reedmedia.net
  HOMEPAGE=	http://bbkeys.sourceforge.net/
  COMMENT=	General X Window keygrabber

  GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c++
-USE_TOOLS+=	perl:run
+USE_BUILDLINK3=	YES
+USE_X11=	YES
+#USE_GCC_SHLIB=	YES
+
+#GCC_REQD=	3.0
+
+.include "../../new/blackbox/buildlink3.mk"

-.include "../../mk/x11.buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
diff -pruN wm/bbkeys/PLIST new/bbkeys/PLIST
--- wm/bbkeys/PLIST	2003-01-23 23:51:48.000000000 -0800
+++ new/bbkeys/PLIST	2005-11-04 15:58:41.000000000 -0800
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:47 tron Exp $
+@comment $NetBSD$
  bin/bbkeys
-bin/bbkeysconf.pl
  man/man1/bbkeys.1
-man/man5/bbkeys.bb.5
  man/man5/bbkeysrc.5
-share/bbtools/bbkeys.bb
-share/bbtools/bbkeys.nobb
+share/bbkeys/bbkeysrc
+share/bbkeys/defaultStyle
  share/doc/bbkeys/AUTHORS
  share/doc/bbkeys/BUGS
  share/doc/bbkeys/ChangeLog
+share/doc/bbkeys/LICENSE
  share/doc/bbkeys/NEWS
  share/doc/bbkeys/README
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
+share/doc/bbkeys/TODO
  @dirrm share/doc/bbkeys
+@dirrm share/bbkeys
diff -pruN wm/bbkeys/PLIST.new new/bbkeys/PLIST.new
--- wm/bbkeys/PLIST.new	1969-12-31 16:00:00.000000000 -0800
+++ new/bbkeys/PLIST.new	2005-11-04 15:52:22.000000000 -0800
@@ -0,0 +1,15 @@
+@comment $NetBSD$
+bin/bbkeys
+man/man1/bbkeys.1
+man/man5/bbkeysrc.5
+share/bbkeys/bbkeysrc
+share/bbkeys/defaultStyle
+share/doc/bbkeys/AUTHORS
+share/doc/bbkeys/BUGS
+share/doc/bbkeys/ChangeLog
+share/doc/bbkeys/LICENSE
+share/doc/bbkeys/NEWS
+share/doc/bbkeys/README
+share/doc/bbkeys/TODO
+@dirrm share/doc/bbkeys
+@dirrm share/bbkeys
diff -pruN wm/bbkeys/TODO new/bbkeys/TODO
--- wm/bbkeys/TODO	1969-12-31 16:00:00.000000000 -0800
+++ new/bbkeys/TODO	2004-09-03 15:48:41.000000000 -0700
@@ -0,0 +1,4 @@
+fix path in bbkeys manpage?
+
+suggestion: have a small dialog in middle of screen showing title
+of window being rotated on (like when using nextWorkspace)
diff -pruN wm/bbkeys/distinfo new/bbkeys/distinfo
--- wm/bbkeys/distinfo	2005-02-24 13:38:12.000000000 -0800
+++ new/bbkeys/distinfo	2005-11-04 14:44:25.000000000 -0800
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/05/22 15:39:31 jschauma Exp $

-SHA1 (bbkeys-0.8.6.tar.gz) = b1638ec44903fffbe8ca822b6ee854c8d48d91eb
-RMD160 (bbkeys-0.8.6.tar.gz) = c78e1386e18131105a9be7eacf249026d315c516
-Size (bbkeys-0.8.6.tar.gz) = 185230 bytes
-SHA1 (patch-aa) = 303186f314c9d0f18415cef97630e874de14048d
+SHA1 (bbkeys-0.9.0.tar.gz) = b406f47f298fe83df6be89d2437dae2cee007439
+RMD160 (bbkeys-0.9.0.tar.gz) = a42506693da977bed17d56ee0c1e5d0440464ac6
+Size (bbkeys-0.9.0.tar.gz) = 199146 bytes


  Jeremy C. Reed

  	  	 	 BSD News, BSD tutorials, BSD links
 	  	 	 http://www.bsdnewsletter.com/