Import fluxbox 0.1.5, a Window Manager for X based on BlackBox

7 files changed, 181 insertions, 0 deletions

diff --git a/wm/fluxbox/DESCR b/wm/fluxbox/DESCR
new file mode 100644
index 00000000000..fc4b4c84d9a
--- /dev/null
+++ b/wm/fluxbox/DESCR
@@ -0,0 +1,4 @@
+Fluxbox is yet another windowmanager for X.
+It is based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and
+handles styles, colors, window placement, and similar things exactly
+like blackbox (100% theme/style compatibility).
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
new file mode 100644
index 00000000000..253f35167a7
--- /dev/null
+++ b/wm/fluxbox/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+#
+
+DISTNAME=	fluxbox-0.1.5
+CATEGORIES=	wm x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+
+MAINTAINER=	jmcneill@invisible.yi.org
+HOMEPAGE=	http://fluxbox.sourceforge.net/
+COMMENT=	Window Manager for X based on Blackbox
+
+USE_BUILDLINK_ONLY=	YES
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
+
+CONFIGURE_ARGS+=	--enable-kde
+CONFLICTS=		blackbox-*
+
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
new file mode 100644
index 00000000000..31407e9bdbf
--- /dev/null
+++ b/wm/fluxbox/PLIST
@@ -0,0 +1,59 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+bin/bsetbg
+bin/bsetroot
+bin/fluxbox
+man/man1/bsetroot.1
+man/man1/fluxbox.1
+share/fluxbox/init
+share/fluxbox/keys
+share/fluxbox/menu
+share/fluxbox/nls/C/blackbox.cat
+share/fluxbox/nls/POSIX
+share/fluxbox/nls/US_ASCII
+share/fluxbox/nls/da_DK/blackbox.cat
+share/fluxbox/nls/en
+share/fluxbox/nls/en_US
+share/fluxbox/nls/es
+share/fluxbox/nls/es_ES/blackbox.cat
+share/fluxbox/nls/et_EE/blackbox.cat
+share/fluxbox/nls/fr
+share/fluxbox/nls/fr_FR/blackbox.cat
+share/fluxbox/nls/it_IT
+share/fluxbox/nls/pt_BR/blackbox.cat
+share/fluxbox/nls/ru_RU/blackbox.cat
+share/fluxbox/nls/sv_SE/blackbox.cat
+share/fluxbox/nls/tr_TR/blackbox.cat
+share/fluxbox/styles/Artwiz
+share/fluxbox/styles/Blue
+share/fluxbox/styles/Carbondioxide
+share/fluxbox/styles/Clean
+share/fluxbox/styles/CleanColor
+share/fluxbox/styles/Cthulhain
+share/fluxbox/styles/Flux
+share/fluxbox/styles/Makro
+share/fluxbox/styles/MerleyKay
+share/fluxbox/styles/Minimal
+share/fluxbox/styles/Nyz
+share/fluxbox/styles/Operation
+share/fluxbox/styles/Outcomes
+share/fluxbox/styles/Rampage
+share/fluxbox/styles/Rancor
+share/fluxbox/styles/Results
+share/fluxbox/styles/Shade
+share/fluxbox/styles/Spiff
+share/fluxbox/styles/TDF
+share/fluxbox/styles/Twice
+share/fluxbox/styles/qnx-photon
+share/fluxbox/titlebar
+@dirrm share/fluxbox/styles
+@dirrm share/fluxbox/nls/tr_TR
+@dirrm share/fluxbox/nls/sv_SE
+@dirrm share/fluxbox/nls/ru_RU
+@dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/fr_FR
+@dirrm share/fluxbox/nls/et_EE
+@dirrm share/fluxbox/nls/es_ES
+@dirrm share/fluxbox/nls/da_DK
+@dirrm share/fluxbox/nls/C
+@dirrm share/fluxbox/nls
+@dirrm share/fluxbox
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
new file mode 100644
index 00000000000..d44daa9692a
--- /dev/null
+++ b/wm/fluxbox/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+
+SHA1 (fluxbox-0.1.5.tar.gz) = 6ff53154dffa7b43c45d0f41c76c30373424d764
+Size (fluxbox-0.1.5.tar.gz) = 332234 bytes
+SHA1 (patch-aa) = 03ce0369139c0aee22df2a6e5c5e2c24d06ff1f3
+SHA1 (patch-ab) = 0a61ec2f94ec5d54e071a064a5b0034815800c04
+SHA1 (patch-ac) = 746e8af05d9ada9323beb46546f96db1e0b8e2af
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
new file mode 100644
index 00000000000..6a71eff8757
--- /dev/null
+++ b/wm/fluxbox/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+
+--- src/i18n.hh.orig	Sat Dec 29 01:30:44 2001
++++ src/i18n.hh	Sat Dec 29 01:31:16 2001
+@@ -58,7 +58,12 @@
+   
+   inline const int &multibyte(void) const { return mb; }
+ 
++#ifndef __NetBSD__
++  /*
++   * Compilation dies here on NetBSD -- luckily, nothing uses this function
++   */
+   inline const nl_catd &getCatalogFd(void) const { return catalog_fd; }
++#endif // __NetBSD__
+ 
+   const char *getMessage(int, int, const char * = 0);
+   void openCatalog(const char *);
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
new file mode 100644
index 00000000000..d7160140b94
--- /dev/null
+++ b/wm/fluxbox/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+
+--- src/misc.cc.orig	Thu Dec 27 04:05:34 2001
++++ src/misc.cc	Thu Dec 27 04:02:59 2001
+@@ -390,8 +390,10 @@
+ void DrawString(Display *display, Window w, GC gc, FFont *font, 
+ 					unsigned int text_w, unsigned int size_w, 
+ 					unsigned int bevel_w, char *text) {
+-//Draw title string	
+ 
++	if (!text || text_w<1 || size_w < 1 || !font || !display)
++		return;
++		
+ 	unsigned int l = text_w;
+ 	int dlen=strlen(text);
+ 	int dx=bevel_w*2;
+@@ -446,7 +448,9 @@
+ 					unsigned int align, unsigned int text_w, 
+ 					unsigned int size_w, unsigned int size_h,
+ 					unsigned int bevel_w, char *text) {
+-
++	if (!text || text_w<1 || size_w < 1 || !font || !display)
++		return;
++		
+ 	unsigned int l = text_w;
+ 	int dlen = strlen(text);
+ 	int dx = bevel_w * 2;
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
new file mode 100644
index 00000000000..2abcb8c19da
--- /dev/null
+++ b/wm/fluxbox/patches/patch-ac
@@ -0,0 +1,47 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+
+--- src/fluxbox.hh.orig	Thu Dec 27 04:19:09 2001
++++ src/fluxbox.hh	Thu Dec 27 04:21:26 2001
+@@ -87,6 +87,20 @@
+ #include <string>
+ #include <vector>
+ 
++template <class Z>
++class DataSearch {
++	private:
++		Window window;
++		Z *data;
++
++
++	public:
++		DataSearch(Window w, Z *d) { window = w; data = d; }
++
++		inline const Window &getWindow(void) const { return window; }
++		inline Z *getData(void) { return data; }
++};
++
+ class Fluxbox : public BaseDisplay, public TimeoutHandler {	
+ public:
+ 	
+@@ -191,21 +205,6 @@
+ 	enum { B_AmericanDate = 1, B_EuropeanDate };
+ #endif // HAVE_STRFTIME
+ 	
+-	template <class Z>
+-	class DataSearch {
+-	private:
+-		Window window;
+-		Z *data;
+-
+-
+-	public:
+-		DataSearch(Window w, Z *d) { window = w; data = d; }
+-
+-		inline const Window &getWindow(void) const { return window; }
+-		inline Z *getData(void) { return data; }
+-	};
+-	
+-		
+ private:
+ 	typedef struct MenuTimestamp {
+ 		char *filename;