Update wm/fluxbox to 1.0rc2

Apply a patch by Dan Bilik to remove optimisation flags that cause compiler to
fail

Changelog contains many bugfixes and improvements:
- New resource/command: session.modKey, command SetModKey
- More ewmh support: _NET_WM_WINDOW_TYPE_DIALOG and  _NET_FRAME_EXTENTS
- External tabs are back
- Added support for net wm atoms
- Added new commands: ToggleCmd, CloseAllWindows
- Supports urgency hint ( flashing titlebar/iconbar )
- Pressing shift while pressing enter in menu item will fake a right mouse
  button press.
- Better UTF-8 handling
- Added option to reverse desktop wheeling: session.screen0.reversewheeling
- Vertical toolbar is back

5 files changed, 121 insertions, 72 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 1ca4f62dfdb..322670cdfea 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2007/01/15 17:41:28 tonio Exp $
 #
 
-DISTNAME=	fluxbox-0.9.15.1
-PKGREVISION=	1
+DISTNAME=	fluxbox-1.0rc2
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +17,9 @@ USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_TRANSFORM+=	rename:-O2:-O1
+.for option in 9 8 7 6 5 4 3 2 s
+BUILDLINK_TRANSFORM+=	rename:-O${option}:-O1
+.endfor
 
 CONFIGURE_ARGS+=	--enable-shape
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 27f00dc5c77..4e9c3136e5b 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/08 23:26:56 minskim Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/15 17:41:28 tonio Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fbsetroot
@@ -15,32 +15,56 @@ share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
 share/fluxbox/nls/C/fluxbox.cat
-share/fluxbox/nls/be_BY/fluxbox.cat
-share/fluxbox/nls/bg_BG/fluxbox.cat
-share/fluxbox/nls/cs_CZ/fluxbox.cat
-share/fluxbox/nls/da_DK/fluxbox.cat
-share/fluxbox/nls/de_DE/fluxbox.cat
-share/fluxbox/nls/el_GR/fluxbox.cat
-share/fluxbox/nls/es_ES/fluxbox.cat
-share/fluxbox/nls/et_EE/fluxbox.cat
-share/fluxbox/nls/fr_FR/fluxbox.cat
-share/fluxbox/nls/it_IT/fluxbox.cat
-share/fluxbox/nls/ja_JP/fluxbox.cat
-share/fluxbox/nls/ko_KR/fluxbox.cat
-share/fluxbox/nls/lv_LV/fluxbox.cat
-share/fluxbox/nls/nb_NO/fluxbox.cat
-share/fluxbox/nls/nl_NL/fluxbox.cat
-share/fluxbox/nls/no_NO/fluxbox.cat
-share/fluxbox/nls/pl_PL/fluxbox.cat
-share/fluxbox/nls/pt_BR/fluxbox.cat
-share/fluxbox/nls/pt_PT/fluxbox.cat
-share/fluxbox/nls/ru_RU/fluxbox.cat
-share/fluxbox/nls/sl_SI/fluxbox.cat
-share/fluxbox/nls/sv_SE/fluxbox.cat
-share/fluxbox/nls/tr_TR/fluxbox.cat
-share/fluxbox/nls/uk_UA/fluxbox.cat
-share/fluxbox/nls/vi_VN/fluxbox.cat
-share/fluxbox/nls/zh_CN/fluxbox.cat
+share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
+share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
+share/fluxbox/nls/bg_BG.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/bg_BG.UTF-8/fluxbox.cat
+share/fluxbox/nls/cs_CZ.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/cs_CZ.UTF-8/fluxbox.cat
+share/fluxbox/nls/da_DK.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/da_DK.UTF-8/fluxbox.cat
+share/fluxbox/nls/de_DE.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/de_DE.UTF-8/fluxbox.cat
+share/fluxbox/nls/el_GR.UTF-8/fluxbox.cat
+share/fluxbox/nls/el_GR.utf8/fluxbox.cat
+share/fluxbox/nls/es_ES.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/es_ES.UTF-8/fluxbox.cat
+share/fluxbox/nls/et_EE.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/et_EE.UTF-8/fluxbox.cat
+share/fluxbox/nls/fr_FR.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/fr_FR.UTF-8/fluxbox.cat
+share/fluxbox/nls/it_IT.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/it_IT.UTF-8/fluxbox.cat
+share/fluxbox/nls/ja_JP.UTF-8/fluxbox.cat
+share/fluxbox/nls/ja_JP.eucJP/fluxbox.cat
+share/fluxbox/nls/ko_KR.EUC-KR/fluxbox.cat
+share/fluxbox/nls/ko_KR.UTF-8/fluxbox.cat
+share/fluxbox/nls/lv_LV.ISO-8859-13/fluxbox.cat
+share/fluxbox/nls/lv_LV.UTF-8/fluxbox.cat
+share/fluxbox/nls/nb_NO.UTF-8/fluxbox.cat
+share/fluxbox/nls/nl_NL.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/nl_NL.UTF-8/fluxbox.cat
+share/fluxbox/nls/no_NO.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/no_NO.UTF-8/fluxbox.cat
+share/fluxbox/nls/pl_PL.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/pl_PL.UTF-8/fluxbox.cat
+share/fluxbox/nls/pt_BR.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/pt_BR.UTF-8/fluxbox.cat
+share/fluxbox/nls/pt_PT.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/pt_PT.UTF-8/fluxbox.cat
+share/fluxbox/nls/ru_RU.KOI8-R/fluxbox.cat
+share/fluxbox/nls/ru_RU.UTF-8/fluxbox.cat
+share/fluxbox/nls/sl_SI.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/sl_SI.UTF-8/fluxbox.cat
+share/fluxbox/nls/sv_SE.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/sv_SE.UTF-8/fluxbox.cat
+share/fluxbox/nls/tr_TR.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/tr_TR.UTF-8/fluxbox.cat
+share/fluxbox/nls/uk_UA.KOI8-U/fluxbox.cat
+share/fluxbox/nls/uk_UA.UTF-8/fluxbox.cat
+share/fluxbox/nls/vi_VN.UTF-8/fluxbox.cat
+share/fluxbox/nls/zh_CN.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
@@ -107,32 +131,56 @@ share/fluxbox/styles/qnx-photon
 @dirrm share/fluxbox/styles/BlueFlux/pixmaps
 @dirrm share/fluxbox/styles/BlueFlux
 @dirrm share/fluxbox/styles
-@dirrm share/fluxbox/nls/zh_CN
-@dirrm share/fluxbox/nls/vi_VN
-@dirrm share/fluxbox/nls/uk_UA
-@dirrm share/fluxbox/nls/tr_TR
-@dirrm share/fluxbox/nls/sv_SE
-@dirrm share/fluxbox/nls/sl_SI
-@dirrm share/fluxbox/nls/ru_RU
-@dirrm share/fluxbox/nls/pt_PT
-@dirrm share/fluxbox/nls/pt_BR
-@dirrm share/fluxbox/nls/pl_PL
-@dirrm share/fluxbox/nls/no_NO
-@dirrm share/fluxbox/nls/nl_NL
-@dirrm share/fluxbox/nls/nb_NO
-@dirrm share/fluxbox/nls/lv_LV
-@dirrm share/fluxbox/nls/ko_KR
-@dirrm share/fluxbox/nls/ja_JP
-@dirrm share/fluxbox/nls/it_IT
-@dirrm share/fluxbox/nls/fr_FR
-@dirrm share/fluxbox/nls/et_EE
-@dirrm share/fluxbox/nls/es_ES
-@dirrm share/fluxbox/nls/el_GR
-@dirrm share/fluxbox/nls/de_DE
-@dirrm share/fluxbox/nls/da_DK
-@dirrm share/fluxbox/nls/cs_CZ
-@dirrm share/fluxbox/nls/bg_BG
-@dirrm share/fluxbox/nls/be_BY
+@dirrm share/fluxbox/nls/zh_CN.UTF-8
+@dirrm share/fluxbox/nls/zh_CN.ISO-8859-1
+@dirrm share/fluxbox/nls/vi_VN.UTF-8
+@dirrm share/fluxbox/nls/uk_UA.UTF-8
+@dirrm share/fluxbox/nls/uk_UA.KOI8-U
+@dirrm share/fluxbox/nls/tr_TR.UTF-8
+@dirrm share/fluxbox/nls/tr_TR.ISO-8859-1
+@dirrm share/fluxbox/nls/sv_SE.UTF-8
+@dirrm share/fluxbox/nls/sv_SE.ISO-8859-1
+@dirrm share/fluxbox/nls/sl_SI.UTF-8
+@dirrm share/fluxbox/nls/sl_SI.ISO-8859-2
+@dirrm share/fluxbox/nls/ru_RU.UTF-8
+@dirrm share/fluxbox/nls/ru_RU.KOI8-R
+@dirrm share/fluxbox/nls/pt_PT.UTF-8
+@dirrm share/fluxbox/nls/pt_PT.ISO-8859-1
+@dirrm share/fluxbox/nls/pt_BR.UTF-8
+@dirrm share/fluxbox/nls/pt_BR.ISO-8859-1
+@dirrm share/fluxbox/nls/pl_PL.UTF-8
+@dirrm share/fluxbox/nls/pl_PL.ISO-8859-2
+@dirrm share/fluxbox/nls/no_NO.UTF-8
+@dirrm share/fluxbox/nls/no_NO.ISO-8859-1
+@dirrm share/fluxbox/nls/nl_NL.UTF-8
+@dirrm share/fluxbox/nls/nl_NL.ISO-8859-15
+@dirrm share/fluxbox/nls/nb_NO.UTF-8
+@dirrm share/fluxbox/nls/lv_LV.UTF-8
+@dirrm share/fluxbox/nls/lv_LV.ISO-8859-13
+@dirrm share/fluxbox/nls/ko_KR.UTF-8
+@dirrm share/fluxbox/nls/ko_KR.EUC-KR
+@dirrm share/fluxbox/nls/ja_JP.eucJP
+@dirrm share/fluxbox/nls/ja_JP.UTF-8
+@dirrm share/fluxbox/nls/it_IT.UTF-8
+@dirrm share/fluxbox/nls/it_IT.ISO-8859-1
+@dirrm share/fluxbox/nls/fr_FR.UTF-8
+@dirrm share/fluxbox/nls/fr_FR.ISO-8859-15
+@dirrm share/fluxbox/nls/et_EE.UTF-8
+@dirrm share/fluxbox/nls/et_EE.ISO-8859-15
+@dirrm share/fluxbox/nls/es_ES.UTF-8
+@dirrm share/fluxbox/nls/es_ES.ISO-8859-15
+@dirrm share/fluxbox/nls/el_GR.utf8
+@dirrm share/fluxbox/nls/el_GR.UTF-8
+@dirrm share/fluxbox/nls/de_DE.UTF-8
+@dirrm share/fluxbox/nls/de_DE.ISO-8859-15
+@dirrm share/fluxbox/nls/da_DK.UTF-8
+@dirrm share/fluxbox/nls/da_DK.ISO-8859-1
+@dirrm share/fluxbox/nls/cs_CZ.UTF-8
+@dirrm share/fluxbox/nls/cs_CZ.ISO-8859-2
+@dirrm share/fluxbox/nls/bg_BG.UTF-8
+@dirrm share/fluxbox/nls/bg_BG.ISO-8859-1
+@dirrm share/fluxbox/nls/be_BY.UTF-8
+@dirrm share/fluxbox/nls/be_BY.CP1251
 @dirrm share/fluxbox/nls/C
 @dirrm share/fluxbox/nls
-@unexec ${RMDIR} %D/share/fluxbox 2>/dev/null || ${TRUE}
+@dirrm share/fluxbox
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 6815dbb2948..e98cd482c43 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2006/04/08 15:41:21 tonio Exp $
+$NetBSD: distinfo,v 1.22 2007/01/15 17:41:28 tonio Exp $
 
-SHA1 (fluxbox-0.9.15.1.tar.bz2) = 94652432037203f1619ba8ed657339fb85b3c894
-RMD160 (fluxbox-0.9.15.1.tar.bz2) = aa9418de9ff700c14b21911f6de24503449e7f0f
-Size (fluxbox-0.9.15.1.tar.bz2) = 685740 bytes
+SHA1 (fluxbox-1.0rc2.tar.bz2) = fb9dc0913b2362e714a63e1bddff1960fd5c2c54
+RMD160 (fluxbox-1.0rc2.tar.bz2) = 6094001f653aaaaef6d625ded1c716669113bc8b
+Size (fluxbox-1.0rc2.tar.bz2) = 752913 bytes
 SHA1 (patch-aa) = e93ce1d4100fe3899ff226fbf6d99fb2526babf4
 SHA1 (patch-ac) = f180c8cc2878f73ca14fa48aea73e04ff599004b
-SHA1 (patch-af) = 2e20d43536b348dc72696110d41d85a69f2f19c9
+SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
diff --git a/wm/fluxbox/options.mk b/wm/fluxbox/options.mk
index 6bb2f47b702..edf505a24e6 100644
--- a/wm/fluxbox/options.mk
+++ b/wm/fluxbox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: options.mk,v 1.5 2007/01/15 17:41:28 tonio Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fluxbox
 PKG_SUPPORTED_OPTIONS=	gnome kde imlib2 xft xrender
@@ -7,13 +7,13 @@ PKG_SUGGESTED_OPTIONS=	xrender
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=        --enable-gnome
+CONFIGURE_ARGS+=	--enable-gnome
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
 .if !empty(PKG_OPTIONS:Mkde)
-CONFIGURE_ARGS+=        --enable-kde
+CONFIGURE_ARGS+=	--enable-kde
 .else
 CONFIGURE_ARGS+=	--disable-kde
 .endif
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-imlib2
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft)
-CONFIGURE_ARGS+=        --enable-xft
+CONFIGURE_ARGS+=	--enable-xft
 .include "../../x11/libXft/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xft
diff --git a/wm/fluxbox/patches/patch-af b/wm/fluxbox/patches/patch-af
index 82a64533468..0e9c7374a35 100644
--- a/wm/fluxbox/patches/patch-af
+++ b/wm/fluxbox/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.3 2005/09/27 12:49:04 tonio Exp $
+$NetBSD: patch-af,v 1.4 2007/01/15 17:41:28 tonio Exp $
 
---- src/FbTk/I18n.cc.orig	2005-05-18 10:31:05.000000000 +0200
+--- src/FbTk/I18n.cc.orig	2007-01-15 17:54:14.000000000 +0100
 +++ src/FbTk/I18n.cc
-@@ -74,7 +74,9 @@ void NLSInit(const char *catalog) {
- I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
+@@ -76,7 +76,9 @@ void NLSInit(const char *catalog) {
+ I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)(-1)) {
  #ifdef 	HAVE_SETLOCALE
      //make sure we don't get 0 to m_locale string
 -    char *temp = setlocale(LC_MESSAGES, "");
 +    char *temp;
 +    (void)setlocale(LC_ALL, "");
 +    temp = setlocale(LC_MESSAGES, NULL);
-     m_locale = ( temp ?  temp : ""); 
+     m_locale = ( temp ?  temp : "");
      if (m_locale.empty()) {
          cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;