Update to 0.1.8 from pkg/16440.

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

6 files changed, 39 insertions, 105 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 253f35167a7..1eabd83a27a 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2002/04/22 18:39:18 wiz Exp $
 #
 
-DISTNAME=	fluxbox-0.1.5
+DISTNAME=	fluxbox-0.1.8
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
@@ -16,5 +16,10 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-kde
 CONFLICTS=		blackbox-*
 
+GCC_VERSION!=		gcc --version
+.if (${GCC_VERSION:C/-.*$$//} == egcs)
+.include "../../lang/gcc/Makefile.gcc"
+.endif
+
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 31407e9bdbf..56256ab9cdc 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/04/22 18:39:18 wiz Exp $
 bin/bsetbg
 bin/bsetroot
 bin/fluxbox
@@ -7,9 +7,11 @@ man/man1/fluxbox.1
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
+share/fluxbox/titlebar
 share/fluxbox/nls/C/blackbox.cat
 share/fluxbox/nls/POSIX
 share/fluxbox/nls/US_ASCII
+share/fluxbox/nls/bg_BG
 share/fluxbox/nls/da_DK/blackbox.cat
 share/fluxbox/nls/en
 share/fluxbox/nls/en_US
@@ -18,8 +20,10 @@ 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/it_IT/blackbox.cat
+share/fluxbox/nls/ja_JP/blackbox.cat
 share/fluxbox/nls/pt_BR/blackbox.cat
+share/fluxbox/nls/pt_PT/blackbox.cat
 share/fluxbox/nls/ru_RU/blackbox.cat
 share/fluxbox/nls/sv_SE/blackbox.cat
 share/fluxbox/nls/tr_TR/blackbox.cat
@@ -44,16 +48,18 @@ 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/da_DK
+@dirrm share/fluxbox/nls/es_ES
+@dirrm share/fluxbox/nls/et_EE
+@dirrm share/fluxbox/nls/fr_FR
+@dirrm share/fluxbox/nls/it_IT
+@dirrm share/fluxbox/nls/ja_JP
+@dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/pt_PT
+@dirrm share/fluxbox/nls/ru_RU
+@dirrm share/fluxbox/nls/sv_SE
+@dirrm share/fluxbox/nls/tr_TR
 @dirrm share/fluxbox/nls
 @dirrm share/fluxbox
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index d44daa9692a..1e1487d74e1 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/04 02:05:33 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2002/04/22 18:39:19 wiz 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
+SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3
+Size (fluxbox-0.1.8.tar.gz) = 437047 bytes
+SHA1 (patch-aa) = 4d2360c918e6df49ab306fad67d43b1cc9a1020e
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;