Update wm/fluxbox to 0.9.9, based on patch sent by Stefan Kruger in

PR pkg/25468.

News in 0.9.9:
    * New commands:
      * Deiconify <mode> <dest>
        * Where mode is:
          * last
           - deiconify last iconified window
          * lastworkspace (default)
           - deiconify last iconified window from current workspace
          * all
           - deiconify all iconified windows
          * allworkspace
           - deiconify all iconfied windows from current workspace
        * and dest is:
          * current (default)
           - deiconify them on current windows
          * origin
           - deiconify them where they were
          * originquiet
           - deiconify to old workspace but dont follow
      * SendToNextWorkspace <num>
        * sends current window forward <num> workspaces
      * SendToPrevWorkspace <num>
        * sends current window backward <num> workspaces
      * WindowMenu
        * popups the window menu
    * New resources:
      * session.tabsAttachArea: <mode>
        * where mode is:
           * Window
            - dropping tabs to any part of the destination-window leads
              to attaching to that frame (default)
           * Titlebar
            - dropping tabs only to the titlebar of the destination-
              window leads to attaching to that frame
      * session.screen<num>.overlay.lineWidth: <integer>
      * session.screen<num>.overlay.lineStyle:
         * Valid arguments: LineSolid, LineOnOffDash LineDoubleDash

      * session.screen<num>.overlay.joinStyle:
         * Valid arguments: JoinRound, JoindMiter, JoinBevel

      * session.screen<num>.overlay.capStyle:
         * Valid arguments: CapNotLast, CapRound, CapButt, CapProjecting

    * KDE dockapps docks in systray inside toolbar now
    * Support aspect ratio hints
    * Optional decoration on transient windows
    * Added ! as a comment char in keys file
    * Improved rendering speed while changing workspace
    * Improved checking for compiler and compiler version
    * Improved transparent rendering speed
    * Remember hidden state for apps
      * [IconHidden] hides the app from the icon bar
      * [FocusHidden] hides the app from the list to be reachable
        via Next/PrevWindow
      * [Hidden] is [IconHidden] + [FocusHidden]
        Example ~/.fluxbox/apps: [IconHidden] {true}
    * Expands tilde for slitlist file
    * Using WM_CLASS instead of NAME in slitlist file
    * Window snapping to other windows
    * More support for Extended Window Manager Hints:
      * _NET_WM_WINDOW_TYPE
      * _NET_WM_WINDOW_TYPE_DOCK
      * _NET_WM_STATE_ABOVE
      * _NET_WM_STATE_BELOW
      * _NET_WM_CLIENT_LIST_STACKING
      * _NET_WM_DESKTOP_VIEWPORT
      * _NET_WM_DESKTOP_GEOMETRY
      * _NET_WORKAREA
      * _NET_ACTIVE_WINDOW
      * _NET_WM_STATE_HIDDEN
      * _NET_WM_STATE_SKIP_TASKBAR
    * sl_SI nls
    * Updated nl_NL locales
    * fbrun news:
      * cycling in tab completion
      * completes binaries from your $PATH
        * if you want to use old history tab-complete, press Ctrl-tab
      * completes path names
      * Control-C clears the text
      * Fixed cursor bug
    * fluxbox-generate_menu news:
      * Updated German locales
      * More firefox support
      * portability fixes
      * improve menu reloading
      * more menu entries
      * French locales
      * Portuguese locales
Bug fixes:
    * Decoration bug with mwm hint + remember
    * Drawing issues with big menus
    * _MOTIF_WM_HINTS decoration toggle bug
    * No-text-in-iconbar bug on restart
    * Menu time stamp on root menu
    * placeWindow caused spinning with screens higher than width
      e.g. vertical xinerama
    * compiles in cygwin
    * update of keys on keymap change
    * infinite loop in fbrun
    * window size bug in no-decor windows on start/restart
    * The _NET_MOVERESIZE_WINDOW crash bug
    * mplayer -vo xvid bug
    * menu keyboard navigation bug

8 files changed, 47 insertions, 113 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 44b2282b7f3..945e40f73a0 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5917 2004/05/13 03:47:28 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5918 2004/05/13 04:29:12 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2500,3 +2500,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated tcl-itcl to 3.2nb1 [minskim 2004-05-13]
 	Updated tcl to 8.4.6nb4 [minskim 2004-05-13]
 	Updated amaya to 8.5 [xtraeme 2004-05-13]
+	Updated fluxbox to 0.9.9 [xtraeme 2004-05-13]
diff --git a/doc/TODO b/doc/TODO
index 623fa27fc3e..613bd89ec15 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -208,7 +208,6 @@ Suggested package updates
 	o findutils-4.1.20
 	o firewalk-5.0
 	o firewalk-gtk-5.0
-	o fluxbox-0.9.9 [pkg/25468]
 	o foomatic-2.9.1 [jlam]
 	o fop-0.20.5
 	o fox-1.0.51
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index e122c7b7cdf..a69e8f5d58d 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/03/10 14:12:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/13 04:29:13 xtraeme Exp $
 #
 
-DISTNAME=	fluxbox-0.9.8
+DISTNAME=	fluxbox-0.9.9
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
 USE_BUILDLINK3=	YES
 USE_X11=	YES
-USE_GCC_SHLIB=	YES
+USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 69ff2c71320..fd7292b3c15 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2004/01/29 16:58:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/05/13 04:29:13 xtraeme Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fluxbox
 bin/fluxbox-generate_menu
 bin/startfluxbox
+man/man1/fbrun.1
+man/man1/fbsetbg.1
 man/man1/fluxbox.1
+man/man1/fluxstyle.1
+man/man1/startfluxbox.1
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
@@ -26,9 +30,11 @@ share/fluxbox/nls/ja_JP/fluxbox.cat
 share/fluxbox/nls/lv
 share/fluxbox/nls/lv_LV/fluxbox.cat
 share/fluxbox/nls/nl_NL/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/styles/Artwiz
@@ -99,9 +105,11 @@ share/fluxbox/styles/qnx-photon
 @dirrm share/fluxbox/styles
 @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/nl_NL
 @dirrm share/fluxbox/nls/lv_LV
 @dirrm share/fluxbox/nls/ja_JP
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index db0f7bad542..af9e1250a69 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/01/29 16:58:03 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/05/13 04:29:13 xtraeme Exp $
 
-SHA1 (fluxbox-0.9.8.tar.bz2) = 77368a2a64cc6e4e09e77711d8799dd154f29f8c
-Size (fluxbox-0.9.8.tar.bz2) = 506099 bytes
-SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31
-SHA1 (patch-ab) = da8f09ce7e52e8459b8e561500fec5b4c41bd96a
+SHA1 (fluxbox-0.9.9.tar.bz2) = 4322b7abf20b79539c36c74d101a9fb40b6360e2
+Size (fluxbox-0.9.9.tar.bz2) = 536673 bytes
+SHA1 (patch-aa) = 878b07c3dec47316508d330780d6a05fec968dd9
+SHA1 (patch-ab) = 04076d5633acf396ae981255c0a64f6d29fa0ed2
 SHA1 (patch-ac) = 81962d7dc7d063f5d85e1dc6d3ba801ab45b74fb
 SHA1 (patch-ad) = ea13a889a03203ce559e9d08c7c83dcc86f21cba
-SHA1 (patch-ae) = f6424828354d6118ee350ae4739a6ebeb0db5bdb
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index 97d756a5a36..fe77dd63786 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2002/12/10 20:39:09 jschauma Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/13 04:29:13 xtraeme Exp $
 
---- doc/Makefile.in.orig	Tue Dec 10 15:17:17 2002
-+++ doc/Makefile.in	Tue Dec 10 15:17:30 2002
-@@ -94,8 +94,8 @@
+--- doc/Makefile.in.orig	2004-05-13 06:03:22.000000000 +0200
++++ doc/Makefile.in	2004-05-13 06:04:16.000000000 +0200
+@@ -93,10 +93,10 @@
  
  CLEANFILES = fluxbox.1
  MAINTAINERCLEANFILES = Makefile.in
--man_MANS = fluxbox.1 bsetroot.1
--EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
-+man_MANS = fluxbox.1
-+EXTRA_DIST = fluxbox.1.in Coding_style
+-man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
++man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 \
+ 	startfluxbox.1 fluxstyle.1 fbrun.1
+ 
+-EXTRA_DIST = fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
++EXTRA_DIST = fluxbox.1.in fbrun.1 startfluxbox.1 fbsetbg.1 \
+ 	fluxstyle.1 Coding_style
+ 
  subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index 2aadebafa18..ee5979a7897 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,100 +1,40 @@
-$NetBSD: patch-ab,v 1.8 2004/01/29 16:58:03 jmmv Exp $
+$NetBSD: patch-ab,v 1.9 2004/05/13 04:29:13 xtraeme Exp $
 
---- util/Makefile.in.orig	2004-01-15 13:22:41.000000000 +0100
-+++ util/Makefile.in
-@@ -95,10 +95,10 @@ regex_cmd = @regex_cmd@
+--- util/Makefile.in.orig	2004-05-13 06:01:43.000000000 +0200
++++ util/Makefile.in	2004-05-13 06:02:50.000000000 +0200
+@@ -94,7 +94,7 @@
  SUBDIRS = fbrun
- INCLUDES = -I../src/FbTk/
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
  bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
 -bin_PROGRAMS = bsetroot
--bsetroot_SOURCES = bsetroot.cc bsetroot.hh
--bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
--			../src/FbAtoms.o ../src/FbTk/libFbTk.a
-+#HF#bin_PROGRAMS = bsetroot
-+#HF#bsetroot_SOURCES = bsetroot.cc bsetroot.hh
-+#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
-+#HF#			../src/FbAtoms.o ../src/FbTk/libFbTk.a
- 
- 
- MAINTAINERCLEANFILES = Makefile.in
-@@ -109,14 +109,14 @@ subdir = util
++bin_PROGRAMS =
+ bsetroot_SOURCES = bsetroot.cc bsetroot.hh
+ bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
+ 			../src/FbAtoms.o ../src/FbTk/libFbTk.a
+@@ -108,7 +108,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
 -bin_PROGRAMS = bsetroot$(EXEEXT)
-+#HF#bin_PROGRAMS = bsetroot$(EXEEXT)
++bin_PROGRAMS =
  PROGRAMS = $(bin_PROGRAMS)
  
--am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
--bsetroot_OBJECTS = $(am_bsetroot_OBJECTS)
--bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \
--	../src/FbAtoms.o ../src/FbTk/libFbTk.a
--bsetroot_LDFLAGS =
-+#HF#am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
-+#HF#bsetroot_OBJECTS = $(am_bsetroot_OBJECTS)
-+#HF#bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \
-+#HF#	../src/FbAtoms.o ../src/FbTk/libFbTk.a
-+#HF#bsetroot_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
- 
- 
-@@ -126,7 +126,7 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bsetroot.Po
-+#HF#@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bsetroot.Po
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-@@ -144,7 +144,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
+@@ -143,7 +143,7 @@
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 -DIST_SOURCES = $(bsetroot_SOURCES)
-+#HF#DIST_SOURCES = $(bsetroot_SOURCES)
++DIST_SOURCES =
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
  	uninstall-info-recursive all-recursive install-data-recursive \
-@@ -152,7 +152,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -151,7 +151,7 @@
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(bsetroot_SOURCES)
-+#HF#SOURCES = $(bsetroot_SOURCES)
++SOURCES =
  
  all: all-recursive
  
-@@ -198,9 +198,9 @@ uninstall-binPROGRAMS:
- 
- clean-binPROGRAMS:
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) 
--	@rm -f bsetroot$(EXEEXT)
--	$(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
-+#HF#bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) 
-+#HF#	@rm -f bsetroot$(EXEEXT)
-+#HF#	$(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -229,7 +229,7 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bsetroot.Po@am__quote@
-+#HF#@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bsetroot.Po@am__quote@
- 
- distclean-depend:
- 	-rm -rf $(DEPDIR)
-@@ -477,8 +477,8 @@ all-local:	startfluxbox
- clean-local:
- 		rm -f startfluxbox fluxbox-generate_menu
- 
--bsetroot.o: 	bsetroot.cc ../config.h bsetroot.hh \
--			../src/FbRootWindow.hh ../src/FbAtoms.hh
-+#HF#bsetroot.o: 	bsetroot.cc ../config.h bsetroot.hh \
-+#HF#			../src/FbRootWindow.hh ../src/FbAtoms.hh
- 
- startfluxbox: 	startfluxbox.in
- 		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
diff --git a/wm/fluxbox/patches/patch-ae b/wm/fluxbox/patches/patch-ae
deleted file mode 100644
index c9f1ed7f16d..00000000000
--- a/wm/fluxbox/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/08/14 14:17:41 jschauma Exp $
-
---- src/I18n.cc.orig	2003-08-14 10:03:53.000000000 -0400
-+++ src/I18n.cc	2003-08-14 10:05:06.000000000 -0400
-@@ -58,7 +58,9 @@
- I18n::I18n():m_multibyte(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_ALL, "");
-+    char *temp;
-+    (void)setlocale(LC_ALL, "");
-+    temp = setlocale(LC_MESSAGES, NULL);
-     m_locale = ( temp ?  temp : ""); 
-     if (m_locale.size() == 0) {
-         cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;