reverting it.

4 files changed, 93 insertions, 44 deletions

diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index a2da9170161..191aa651e75 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/11 19:07:40 tonio Exp $
 #
 
-DISTNAME=	blackbox-0.70.0
+DISTNAME=	blackbox-0.65.0
+PKGREVISION=	5
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
@@ -9,12 +10,11 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	Small and fast X11R6 window manager
 
-DEPENDS=	bsetroot>=0.2:../../wm/bsetroot
+DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-USE_TOOLS+=     pkg-config
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox/PLIST b/wm/blackbox/PLIST
index 091fed2808d..a6229a4821b 100644
--- a/wm/blackbox/PLIST
+++ b/wm/blackbox/PLIST
@@ -1,31 +1,78 @@
-@comment $NetBSD: PLIST,v 1.5 2005/11/11 18:50:25 tonio Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/11/11 19:07:40 tonio Exp $
 bin/blackbox
-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
-lib/libbt.la
-lib/pkgconfig/libbt.pc
 man/man1/blackbox.1
 share/blackbox/menu
-share/blackbox/styles/Blue
-share/blackbox/styles/Gray
-share/blackbox/styles/Green
-share/blackbox/styles/Purple
-share/blackbox/styles/Red
+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
 @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 --git a/wm/blackbox/distinfo b/wm/blackbox/distinfo
index 8442f83fff2..c67f82e505f 100644
--- a/wm/blackbox/distinfo
+++ b/wm/blackbox/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/11/11 18:50:25 tonio Exp $
+$NetBSD: distinfo,v 1.10 2005/11/11 19:07:40 tonio Exp $
 
-SHA1 (blackbox-0.70.0.tar.gz) = f700efa5d284f97ba4c7aa27d1a3425cb26baf7b
-RMD160 (blackbox-0.70.0.tar.gz) = 64b857aed8cbd49bb6c5168f5f1fc65c609b4e75
-Size (blackbox-0.70.0.tar.gz) = 583527 bytes
-SHA1 (patch-aa) = b3fee258878443d83be18a47ceab5aa7afcecf35
-SHA1 (patch-ab) = f3c2f4e8b310b38050d39b8ada25c225baa34b78
+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
diff --git a/wm/blackbox/patches/patch-aa b/wm/blackbox/patches/patch-aa
index 5861fbc92e7..2981fdefb12 100644
--- a/wm/blackbox/patches/patch-aa
+++ b/wm/blackbox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2005/11/11 18:50:25 tonio Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/11 19:07:40 tonio Exp $
 
---- doc/Makefile.in.orig	2005-03-01 20:43:25.000000000 +0100
-+++ doc/Makefile.in
-@@ -168,7 +168,7 @@ xft_CFLAGS = @xft_CFLAGS@
- xft_LIBS = @xft_LIBS@
+--- doc/Makefile.in.orig	Wed Nov 20 12:08:31 2002
++++ doc/Makefile.in	Wed Nov 20 12:08:43 2002
+@@ -75,7 +75,7 @@
+ 
  CLEANFILES = blackbox.1
  MAINTAINERCLEANFILES = Makefile.in
 -man_MANS = blackbox.1 bsetroot.1 bsetbg.1
 +man_MANS = blackbox.1
- DEFAULT_MENU = $(pkgdatadir)/menu
- all: all-am
  
+ DEFAULT_MENU = $(pkgdatadir)/menu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs