Update to 0.1.8 from pkg/16440.

Changes: Lots of bugfixes, code cleanup, new features.

3 files changed, 11 insertions, 86 deletions

diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index 6a71eff8757..b2dec0626b4 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,17 +1,16 @@
-$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; }
- 
+$NetBSD: patch-aa,v 1.2 2002/04/22 18:39:19 wiz Exp $
+--- src/i18n.hh.orig	Sun Apr 21 12:36:45 2002
++++ src/i18n.hh	Sun Apr 21 12:37:23 2002
+@@ -51,7 +51,12 @@
+ 	static I18n *instance();
+ 	inline const char *getLocale(void) const { return m_locale.c_str(); }
+ 	inline bool multibyte(void) const { return m_multibyte; }
 +#ifndef __NetBSD__
-+  /*
++  /* 
 +   * Compilation dies here on NetBSD -- luckily, nothing uses this function
 +   */
-   inline const nl_catd &getCatalogFd(void) const { return catalog_fd; }
+ 	inline const nl_catd &getCatalogFd(void) const { return m_catalog_fd; }
 +#endif // __NetBSD__
  
-   const char *getMessage(int, int, const char * = 0);
-   void openCatalog(const char *);
+ 	const char *getMessage(int set_number, int message_number, const char *default_messsage = 0);
+ 	void openCatalog(const char *);
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
deleted file mode 100644
index d7160140b94..00000000000
--- a/wm/fluxbox/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$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
deleted file mode 100644
index 2abcb8c19da..00000000000
--- a/wm/fluxbox/patches/patch-ac
+++ /dev/null
@@ -1,47 +0,0 @@
-$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;