Update to 1.1.1.

Take over maintainership.

Changes for 1.1.1
*08/09/14:
   * Fixed a minor pixmap resource leak (Henrik)
     FbTk/Menu.cc, FbTk/ImageControl.cc/hh
*08/09/11:
   * Fixed unshading crash (Mark)
     src/FbWinFrame.cc
   * Be aware of badly specified _NET_WM_ICONS (Mathias)
     Ewmh.cc
*08/09/03:
   * Added windowmenu to distpackage (Mark)
-----------------------------
Changes for 1.1.0
*08/09/01:
   * When the current menu item gets disabled, highlight its nearest
     neighbor and add separators to the focus model menu (Mark)
     Screen.cc FbTk/Menu.cc
*08/08/22:
   * Remove borders from maximized windows (Mark)
     FbWinFrame.cc
   * Add -sync command line option for debugging X issues (Mark)
     fluxbox.cc/hh main.cc
*08/08/21:
   * Added SendToNextHead and SendToPrevHead commands (Mark)
     CurrentWindowCmd.cc/hh
*08/08/20:
   * Added SetDecor key command (Mark)
     CurrentWindowCmd.cc/hh
*08/08/19:
   * Add new [transient] tag to apps file to match transient windows (Mark)
     ClientPattern.cc/hh Remember.cc
*08/08/18:
   * Combined code for MoveTo key command and saved window positions (Mark)
     Side effects:
     - both now have the following options: TopLeft Left BottomLeft Top
     Center
       Bottom TopRight Right BottomRight
     - the CENTER reference in apps now behaves like WINCENTER
     - some previously saved positions will be wrong, since they are now
       computed relative to the toolbar and slit
     - CENTER/WINCENTER will now work properly with Xinerama when placing
       the window on a head other than the top left one
     CurrentWindowCmd.cc/hh Remember.cc Window.cc/hh
   * Add Top Center, Left Center, Right Center, and Bottom Center tab
     placement options (Mark)
     FbWinFrame.cc/hh Screen.cc FbTk/Container.cc/hh
*08/08/17:
   * Add new key commands SetTitle and SetTitleDialog (thanks Matteo
     Galiazzo)
     CommandDialog.cc/hh TextDialog.cc/hh CurrentWindowCmd.cc/hh Makefile.am
*08/08/06:
   * Created manual for fluxbox-remote (Mark)
     doc/asciidoc/fluxbox-remote.txt doc/fluxbox-remote.1
   * Automatically restore the previous background on startup (Mark)
     RootTheme.cc/hh util/fbsetbg startfluxbox.in
*08/08/05:
   * Fixed Focus key command (Mark)
     CurrentWindowCmd.cc/hh FocusableList.cc/hh
   * Added new SetLayer key command (Mark)
     CurrentWindowCmd.cc/hh
   * Make ShowDesktop command toggle between showing windows and desktop
     (Mark)
     WorkspaceCmd.cc
   * Created new `fluxbox-keys' man page (thanks Jim Ramsay)
     doc/asciidoc/fluxbox-keys.txt
   * Make resize cursors consistent (thanks Dmitry E. Oboukhov)
     FbWinFrameTheme.cc
*08/08/04:
   * Add selection box to various "choose one of these" menu items (Mark)
     Toolbar.cc Slit.cc Screen.cc LayerMenu.hh Xinerama.hh
     StyleMenuItem.cc/hh
     added FbTk/RadioMenuItem.hh
   * Add window list argument to ArrangeWindows (Mark)
     WorkspaceCmd.cc/hh
*08/06/26:
   * Remove antiquated dithering code (Mark)
     FbTk/ImageControl.cc/hh FbTk/TextureRender.cc Screen.cc/hh
*08/06/20:
   * Move default window menu to ~/.fluxbox/windowmenu (Mark)
     configure.in data/Makefile.am data/windowmenu Screen.cc
*08/06/08:
   * Add (urgent=yes|no) option to client patterns (Mark)
     ClientPattern.cc/hh
*08/06/06:
   * Allow window menu items in ordinary menus (Mark)
     MenuCreator.cc/hh
*08/06/04:
   * Leave titlebar and handle borders alone with borderless windows (Mark)
     FbWinFrame.cc/hh
*08/06/03:
   * Add -list-commands command line option, which prints a list of valid
     fluxbox commands (Mark)
     main.cc
*08/05/13:
   * Only reload custom menus when necessary (Mark)
     FbCommands.cc/hh
*08/05/12:
   * Only reload the keys file if the contents have changed (Mark)
     Keys.cc/hh fluxbox.cc/hh
   * Modifying the apps file no longer requires a reconfigure (Mark)
     Remember.cc/hh
*08/05/09:
   * Made tooltip in toolbar update when the title changes (Henrik)
     Tooltip.cc/hh, Screen.cc/cc, OSDWindow.hh
*08/05/05:
   * Add tooltips for iconbar buttons (thanks Matteo Galiazzo)
     TooltipWindow.cc/hh
*08/05/02:
   * Minor changes for fluxbox-generate_menu (thanks skiidoo)
     util/fluxbox-generate_menu.in
*08/05/01:
   * Notice when user replaces a non-existent menu file (Mark)
     fluxbox.cc Screen.cc
*08/04/30:
   * Don't allow empty root menu (Mark)
     Screen.cc
*08/04/27:
   * Added SimpleObserver class. (Henrik)
     SimpleObserver.hh, SendToMenu.hh/cc, Toolbar.hh/cc,
     SystemTray.hh/cc
*08/01/27:
   * Reload the Xinerama layout on RandR signal (Tomas)
     Screen.cc/hh
   * Move windows out of inactive heads upon Xinerama layout change (Tomas)
     Screen.cc/hh
*07/12/28:
   * Added new key command :Delay {<command>} [<int>], which runs the
command
     after a delay of <int> microseconds (default is 200 milliseconds)
(Mark)
     FbTk/Timer.cc/hh
*07/12/25:
   * Updated german translations for maximization menu (thanks Christian
Loosli)
     nls/de_*/Translation.m
   * Removed KDE configure option, since it didn't do anything (Mark)
     configure.in config.h.in main.cc
   * Added resource session.screen<N>.slit.acceptKdeDockapps: <boolean>
     (Mark)
     Screen.cc Slit.cc/hh
*07/12/23:
   * Added new style items window.(un)focus.border{Width,Color} (Mark)
     FbWinFrameTheme.cc/hh FbWinFrame.cc
*07/12/21:
   * Added new key command :StartTabbing (Mark)
     Window.cc/hh CurrentWindowCmd.cc/hh
*07/12/20:
   * Added new key command :ForEach (or :Map) (Mark)
     - :ForEach {<command>} [{ [{<list opts>}] [<bool command>] }]
     - For example, the following command will shade all windows on the
       current workspace:
       ForEach {shade} {{groups} Matches (workspace=[current])}
     - <list opts> can be any combination of `static' and `groups' where
       static means windows are listed in creation order, and groups means
       individual tabs are not considered separately
     - This replaces syntax such as `:Minimize (layer)', which no longer
       works
     WorkspaceCmd.cc/hh
*07/12/19:
   * Don't let transient windows steal focus from other programs (Mark)
     Window.cc
*07/12/18:
   * NLS entries for Mouse Tab Focus and Click Tab Focus were switched -
     please make sure they're right now in your language, bug #1786566
     (Mark)
     fluxbox-nls.hh
   * Open transient windows on same workspace as parent (thanks Sascha
     Hunold)
     Window.cc
   * Holding control while clicking on a menu item will now keep the menu
     open (Mark)
     FbTk/Menu.cc MenuItem.cc/hh
*07/12/17:
   * Fix startup items in apps file with specified screen number, bug
     #1843325 (thanks Martin)
     Remember.cc
*07/12/14:
   * Fix compiling with gcc 4.3 (thanks Dmitry E. Oboukhov)
     main.cc
*07/12/13:
   * Fix configure option --with-style (thanks Slava Semushin)
     configure.in Makefile.am
   * Close menus only when they lose focus (Mark)
     MenuCreator.cc FbTk/Menu.cc
   * Moved command parsing code all over the place -- expect any patches
     that add new commands to be broken (Mark, Simon)
     Added FbTk/CommandRegistry.cc/hh
     Removed FbCommandFactory.cc/hh CommandParser.cc/hh
*07/12/11:
   * Added new resize modes for key command StartResizing: NearestEdge,
     Left, Right, Top, Bottom (Mark)
     Window.cc
   * Only allow one menu to be open at a time (Mark)
     FbTk/Menu.cc/hh
*07/12/09:
   * Added OnTitlebar and Double modifiers to the keys file for clicks on
     the titlebar and double clicks, respectively (Mark, thanks Matteo
     Galiazzo)
     - For example, `OnTitlebar Double Mouse3 :Maximize' will maximize a
       window when you double click on the titlebar with the right mouse
       button
     - Note: if you have commands bound to both a single and double click,
       the single click command will still be executed on the first half of
       a double click
     - Added new key commands ShadeOn and ShadeOff that set whether or not a
       window is shaded, rather than toggling the current state
       Window.cc Keys.cc/hh FbCommandFactory.cc
*07/11/22:
   * Added some new special keys to the keys file: FocusIn, FocusOut,
MouseOver,
     MouseOut, ChangeWorkspace (Mark)
     - FocusIn/FocusOut correspond to a window gaining or losing focus, e.g.
     the
       following will raise all xterms when one gains focus:
       FocusIn :If {Matches (xterm)} {Raise (xterm)} {}
     - MouseOver/MouseOut correspond to the mouse moving over the window or
       toolbar (when used with OnToolbar) -- OnDesktop not yet supported,
       e.g.
       the following will unshade a window when you move your mouse over it
       with
       alt pressed:
       Mod1 MouseOver :If {Matches (shaded=yes)} {Shade} {}
     - ChangeWorkspace corresponds to the workspace being changed, e.g. the
       following will set a different wallpaper for each workspace:
       ChangeWorkspace :Exec fbsetbg ~/.fluxbox/bg$(xprop -root
       _NET_CURRENT_DESKTOP | awk '{print $3}').png
     Keys.cc Window.cc Screen.cc Toolbar.cc
   * Added translations for zh_TW (thanks Wei-Lun Chao)
   * Fix division by 0 error when resize increments are set to 0 by an
     application, bug #1836182
     WinClient.cc
   * Added conditional statements to key commands (Mark)
     - for example, this will search for an open xterm window, cycle through
       them if there are any, or else open one:
       Mod4 t :If {Some Matches (xterm)} {NextWindow (xterm)} {Exec xterm}
     - the syntax is :If {<test>} {<command if true>} {<command if false>}
     - `Matches <pattern>' is currently the only test you can make; when
       used
       alone, it tests the focused window or the clicked window for OnWindow
       mouse events
     - there are many ways to combine tests:
       - `Some <test>' returns true if any open client matches <test>
       - `Every <test>' returns true if every open client matches <test>
       - `Not <test>' negates the value of <test>
       - `Or {<test>} {<test>} ...' returns true if any of the tests is true
       - `And {<test>} {<test>} ...' returns true if all of the tests are
       true
       - `Xor {<test>} {<test>} ...' returns the boolean xor of the truth
       values
     FbCommandFactory.cc CurrentWindowCmd.cc/hh WorkspaceCmd.cc/hh
     FbTk/Command.hh FbTk/SimpleCommand.hh, added files
FbTk/LogicCommands.cc/hh
*07/11/16:
   * Added new key command :Focus [<pattern>] that focuses a window (e.g.,
     using OnWindow or specified using a window pattern) (Mark, thanks Tomas
     Janousek)
     FbCommandFactory.cc
   * Using ToggleDecor from Deco=TAB should hide tabs (thanks Tomas
     Janousek)
     Window.cc
*07/11/12:
   * Allow arbitrary window patterns for the iconbar mode (Mark)
     - Note: for now, if you match against the current head of a window, it
     will
       not be updated as expected in the toolbar
     ClientPattern.cc/hh FocusControl.cc/hh IconbarTool.cc/hh
     FbTk/Subject.cc fluxbox.cc, added FocusableList.cc/hh
*07/11/08:
   * Fix crash when cycling focus and window closes, bug #1787345 (Mark)
     FocusControl.cc
*07/11/04:
   * Update autoraise delay on reconfigure (Mark)
     Window.cc
*07/10/31:
   * Move fullscreen windows to normal layer when they lose focus (Mark)
     Window.cc FocusControl.cc
*07/10/24:
   * Fixed some gcc 2.96 compile issues ( Henrik )
     Layer.hh, MinOverlapPlacement.cc, Workspace.cc
   * Introduced (workspacename=...) for pattern matching and changed
     (workspace=...) to use the workspace number, indexed from 0 (Mark)
     ClientPattern.cc/hh
   * Reenabled raising window if window was moved by mouse by 0 pixels
     (Mathias)
     Window.cc
*07/10/23:
   * Adding/removing workspaces wasn't updating menu (Mark)
     Screen.cc
   * Support remembering maximized, minimized, and fullscreen state (Mark)
     - [Maximized] {yes|no|horz|vert}
     - [Minimized] {yes|no}
     - [Fullscreen] {yes|no}
     - also fixed window placement when remembering head but not position
     Window.cc/hh Remember.cc/hh Screen.cc/hh Ewmh.cc fluxbox-nls.hh
     CurrentWindowCmd.cc
   * Allow negated patterns, e.g. (name!=xterm) (Mark)
     ClientPattern.cc/hh
*07/10/22:
   * Added option "mouse" to client pattern ( Henrik )
     This is usefull for xinerama. For example:
     Mod1 Tab :NextWindow (head=[mouse])
     This will cycle focus through windows that are on the same head as
     the mouse pointer.
     ClientPattern.cc
   * Fixed crash bug at restart. ( Henrik )
     Window.cc
   * Replaced modKey with new commands StartMoving and StartResizing (Mark)
     - your keys file should be updated automatically
     - they must be used with a mouse button, or they won't work
     - StartResizing takes one or none of the following arguments:
       NearestCorner, Center, TopLeft, TopRight, BottomLeft, BottomRight
     Window.cc/hh CurrentWindowCmd.cc/hh FbCommandFactory.cc Screen.cc/hh
     fluxbox.cc/hh ScreenResources.cc FbCommands.cc/hh
     util/fluxbox-update_configs.cc
*07/10/21:
   * Allow decorations bitmask to be specified using '0x' (Mark)
     Window.cc
*07/10/18:
   * Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail )
     bug #1809786
     src/FbTk/TextBox.cc
*07/10/15:
   * Added OnWindow modifier to keys file (Mark)
     Keys.cc Window.cc Screen.cc CurrentWindowCmd.cc
*07/10/14:
   * Added support for transient windows in window patterns, e.g.
     (transient=yes|no), defaulting to "no" for the apps file (Mark)
     Remember.cc ClientPattern.cc/hh Focusable.hh Window.cc/hh
   * Bugfix for SendToPrevWorkspace/TakeToPrevWorkspace (Mathias)
     CurrentWindowCmd.cc/hh
*07/10/13:
   * Merged pre-devel branch; see all Changes since 1.0.0 (Mark)
   * Updated ru_RU (Thanks Konstantin Shashkin)
   * deiconify windows via :Deiconify in reverse order (Mathias)
     FbCommands.cc
*07/05/23:
   * Added key command :Attach <pattern> which groups all windows matching
     the given pattern (Mark)
     FbCommandFactory.cc WorkspaceCmd.cc/hh
*07/05/20:
   * Added resources session.screen<N>.maxDisable{Move,Resize}: <boolean>,
which
     prevent maximized windows from being moved/resized (Mark)
     Window.cc Screen.cc/hh nls/fluxbox-nls.hh
*07/05/19:
   * Changed behavior of resource session.screen<N>.followModel (Mark)
     - now only options are Ignore and Follow, the latter using the setting
     in
       session.screen<N>.userFollowModel
     Window.cc/hh Ewmh.cc Screen.cc/hh
*07/05/16:
   * Added new resource session.screen<N>.noFocusWhileTypingDelay: <int>
     (Mark)
     - specifies a time in milliseconds that new windows should not gain
       focus while the user is typing in the focused window
     Window.cc/hh Screen.cc/hh
*07/05/13:
   * Added new placement policies {Row,Col}MinOverlapPlacement. They behave
     the same as {Row,Col}SmartPlacement when the window fits but fall back
     on minimizing overlap with other windows instead of CascadePlacement
     (Mark)
     MinOverlapPlacement.cc/hh ScreenPlacement.cc/hh
*07/04/23:
   * Set IconicState on all unmapped clients and unmap clients with frames,
     as per ICCCM 4.1.4 (Mark)
     Screen.cc Window.cc FocusControl.cc
   * Added ClientMenu key command, which pops up a menu of open windows,
     based
     on a pattern match
     - e.g. :ClientMenu (workspace=[current]) (minimized=no)
     ClientMenu.cc FbCommands.cc/hh FbCommandFactory.cc
*07/04/11:
   * Added resource session.screen<N>.maxIgnoreIncrement: <boolean>, to
     disable size checking when maximizing a window (e.g. terminals) (Mark)
     - Also added a new configuration submenu for maximize options, to be
       filled at a later date
     Screen.cc/hh Window.cc
*07/04/08:
   * Added OnToolbar modifier to keys file (Mark)
     Keys.cc/hh Toolbar.cc/hh Screen.cc/hh IconbarTool.cc fluxbox.cc
*07/04/06:
   * More changes to theme handling (Mark)
     - introduced window.label.(un)focused.{justify,border{Color,Width}},
       which fallback to window.label.{justify,border{Color,Width}} before
       window.{justify,border{Color,Width}}
     - this has the backwards-incompatible effect that
       toolbar.iconbar.(un)focused.* fallback first to toolbar.iconbar.* and
       then to window.label.*
     FbWinFrame.cc/hh IconbarTool.cc/hh IconButton.cc/hh IconbarTheme.cc
     FbWinFrameTheme.cc/hh
*07/04/03:
   * Added window.label.(un)focused.font to styles (Mark)
     FbWinFrame.cc
*07/03/31:
   * [group] tag in apps file may now have a pattern appended to it, and a
     new window will only be automatically attached to the group if the group
     matches that pattern -- e.g. [group] (workspace) (shaded=no) will only
     automatically group with windows on the current workspace that are not
     shaded (Mark)
     Remember.cc/hh
   * Lots of window commands now take a client pattern as an additional
     argument, and the command will then be applied to all matching windows
     (Mark)
     - For example: `SendToWorkspace 2 (xterm)' will send all xterm windows
       to workspace 2
     - Here is the full list of affected commands (which is not to imply they
       all necessarily make sense to do): Fullscreen, Minimize, Maximize,
       MaximizeVertical, MaximizeHorizontal, SetAlpha, Resize, ResizeTo,
       ResizeHorizontal, ResizeVertical, MoveTo, Move, MoveRight, MoveLeft,
       MoveUp, MoveDown, Raise, RaiseLayer, Lower, LowerLayer, Close, Kill,
       Shade, Stick, ToggleDecor, SetHead, Tab, SendToNextWorkspace,
       SendToPrevWorkspace, TakeToNextWorkspace, TakeToPrevWorkspace,
       SendToWorkspace, TakeToWorkspace, NextTab, PrevTab, MoveTabLeft,
       MoveTabRight, DetachClient
     WorkspaceCmd.cc/hh CurrentWindowCmd.cc/hh FbCommandFactory.cc
*07/03/30:
   * Changed syntax for window cycling (Mark)
     - Instead of a bitmask, the window cycling functions NextWindow,
       PrevWindow, TypeAheadFocus, and GoToWindow now take a list of options
       enclosed in {} followed by a pattern similar to those used in the
       apps
       file.
     - Examples:
         * NextWindow {static groups} (shaded=yes) (name=xterm)
           - cycles through all shaded xterms in creation order, only
           focusing
             the active tab in the group
         * GoToWindow 3 (title=[current])
           - focuses the third client in last-focused order with the same
           title
             as the currently focused window
     - The options are: name, class, title, role, maximized, minimized,
       shaded, stuck, focushidden (can't be disabled), iconhidden, workspace
       (matches workspace names, not numbers), head (numbers), and layer
       (names)
     - Parsing is a pain, so you'll have to update your keys file yourself
       for now.
*07/03/29:
   * Removed groups file; entries will be added to the apps file
     automatically (Mark)
   * Fixed a problem with programs starting in IconicState (Mark)
*07/03/27:
   * Added new resource session.screen<N>.clientMenu.usePixmap that puts the
     window's icon in the workspace and icons menus: default true. (Mark)
     - For some reason, it doesn't work with un-shaped icons yet, but I've
       spent way too many hours already trying to figure out why
   * Use IconTitle in iconbar for minimized windows (Mark)
*07/03/25:
   * Added new resource session.screen<N>.tabs.usePixmap that puts the
window's
     icon in the tab, if available. This is on by default. (Mark)
     Window.cc FbWinFrame.cc/hh WinClient.cc Screen.cc/hh
*07/03/24:
   * Added new key command GoToWindow (Mark)
     - Syntax is GoToWindow <int> [<bitmask>], where the int gives the
       position of the desired window with respect to a list of windows,
       and the bitmask is the same as for NextWindow. A negative number for
       <int> will count back from the end of the list.
     - Particularly useful examples are GoToWindow <int> 9 and
       GoToWindow <int> 25, which will focus the window at position <int> in
       the iconbar modes Workspace and WorkspaceNoIcons, respectively.
   * Fixed creation order window cycling with tabbed windows (Mark)
*07/03/21:
   * Added new command TypeAheadFocus (Mark)
     - syntax is the same as for NextWindow; when you run the command, you
       can start typing the title of the window, and it will gain focus;
       pressing tab will cycle through all matching entries using the
       options specified; when you've found the window you want, just press
       return or escape
     WinClient.hh Screen.cc/hh FbCommandFactory.cc WorkspaceCmd.cc/hh

12 files changed, 57 insertions, 171 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index af92bcbe75b..4b473ed266e 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.47 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2009/07/07 15:47:59 sborrill Exp $
 #
 
-DISTNAME=	fluxbox-1.0.0
-PKGREVISION=	2
+DISTNAME=	fluxbox-1.1.1
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tonio@NetBSD.org
+MAINTAINER=	sborrill@NetBSD.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
@@ -43,6 +42,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index c787400c08d..2b594a51793 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:18:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/07/07 15:47:59 sborrill Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fbsetroot
@@ -11,11 +11,16 @@ man/man1/fbrun.1
 man/man1/fbsetbg.1
 man/man1/fbsetroot.1
 man/man1/fluxbox.1
+man/man1/fluxbox-remote.1
 man/man1/fluxstyle.1
 man/man1/startfluxbox.1
+man/man5/fluxbox-keys.5
+share/fluxbox/apps
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
+share/fluxbox/overlay
+share/fluxbox/windowmenu
 share/fluxbox/nls/C/fluxbox.cat
 share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
 share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
@@ -56,6 +61,7 @@ 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/mk_MK.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
@@ -75,7 +81,7 @@ 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.ISO-8859-9/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
@@ -85,6 +91,7 @@ share/fluxbox/nls/zh_CN.GB18030/fluxbox.cat
 share/fluxbox/nls/zh_CN.GB2312/fluxbox.cat
 share/fluxbox/nls/zh_CN.GBK/fluxbox.cat
 share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
+share/fluxbox/nls/zh_TW.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
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 070dec0a423..ae0c0cc781a 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,19 +1,15 @@
-$NetBSD: distinfo,v 1.27 2007/11/04 15:34:08 rillig Exp $
+$NetBSD: distinfo,v 1.28 2009/07/07 15:47:59 sborrill Exp $
 
-SHA1 (fluxbox-1.0.0.tar.bz2) = 7985e35fbb170fda24b9e04610690cd04c7a8748
-RMD160 (fluxbox-1.0.0.tar.bz2) = 320b11a1cf96a757da079886cd6496b9d84ab202
-Size (fluxbox-1.0.0.tar.bz2) = 767586 bytes
-SHA1 (patch-aa) = a7edf240ed45bc91431f86efdc371f4e9e2080aa
-SHA1 (patch-ac) = 467154bd1f43e68997bb368883016c65e1afd7b2
+SHA1 (fluxbox-1.1.1.tar.bz2) = 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f
+RMD160 (fluxbox-1.1.1.tar.bz2) = aabfdd10c835d0ef903885646a7f34f7df75af17
+Size (fluxbox-1.1.1.tar.bz2) = 777660 bytes
+SHA1 (patch-aa) = efc7dc56fcf34e337f2c65f7de4e3e8da2114787
+SHA1 (patch-ac) = c15ebee53312d2f18f8dac2e2ee221f9015d744e
 SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
 SHA1 (patch-ba) = 27ecea84bfe459656f4ff5a09b4f24abf1519097
-SHA1 (patch-bb) = fc698dcb8c8592bbc46aa9d02dbbf8f9e870f700
-SHA1 (patch-bc) = f6cfcd5ef3db3a69504152cf9329110e63778693
 SHA1 (patch-bd) = 6f57ed17a0d7330d3a3c0f246b1d69e2f61d8984
-SHA1 (patch-be) = 6dc8547ef5b5144e61fba02ccfb683853280d15e
-SHA1 (patch-bf) = b7c44cfbb1c3e5997bb5c499ae8a15f239f1bce7
+SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a
+SHA1 (patch-bf) = 365d372379ddbeb7ed930a6a953c0f245e2fec9e
 SHA1 (patch-bg) = c6a1c79adb48c78a6ac6e5c57e1211d807eff2ce
-SHA1 (patch-bh) = f5c98c6eab9f5fd6de35b991a67273985e949648
-SHA1 (patch-bi) = 17c9f36b3beb12903dcdb4ab2ea98b2be0c72c46
 SHA1 (patch-bj) = 24eb486f2414bd82bcb85e2ee86f87a061faaa16
-SHA1 (patch-bk) = 6e1319418c3f30dc06a9cdaa57086f90859859e7
+SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index f9a9af02286..dffc18c52ba 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
+$NetBSD: patch-aa,v 1.11 2009/07/07 15:47:59 sborrill Exp $
 
 * "grep -q" doesn't work everywhere.
 * Do not use the home directory of the user building the package.
 
---- util/fluxbox-generate_menu.in.orig	2007-10-08 18:49:08.000000000 +0000
-+++ util/fluxbox-generate_menu.in	2007-11-04 15:31:20.000000000 +0000
-@@ -51,7 +51,7 @@ WHOAMI=`whoami`
+--- util/fluxbox-generate_menu.in.orig	2009-07-06 11:35:35.000000000 +0100
++++ util/fluxbox-generate_menu.in	2009-07-06 11:38:59.000000000 +0100
+@@ -48,7 +48,7 @@
  [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
  
  # Check for Imlib2-support
--if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
-+if fluxbox -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
+-if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
++if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
      PNG_ICONS="yes"
  else
      # better assume to assume "no"
-@@ -338,7 +338,7 @@ searchForIcon(){
+@@ -308,7 +308,7 @@
      # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
              echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
          else 
              : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
-@@ -1210,7 +1210,7 @@ case ${LC_ALL} in
+@@ -1185,7 +1185,7 @@
  esac
  
  # Set Defaults
@@ -32,12 +32,3 @@ $NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
  MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
  MENUTITLE="${MENUTITLE:=Fluxbox}"
  HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
-@@ -1708,7 +1708,7 @@ append_submenu "${MULTIMEDIAMENU}"
-        append_submenu "${XUTILSMENU}"
-            normal_find xfontsel xman xload xbiff editres viewres xclock \
-                xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave 
--           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
-+           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
-        append_menu_end
- append_menu_end
- 
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index ac7d8d0c63a..29698befb13 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,34 +1,17 @@
-$NetBSD: patch-ac,v 1.9 2007/11/01 13:08:05 rillig Exp $
+$NetBSD: patch-ac,v 1.10 2009/07/07 15:47:59 sborrill Exp $
 
---- src/fluxbox.cc.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/fluxbox.cc	2007-10-31 00:54:40.610976000 +0100
-@@ -94,7 +94,8 @@ class Toolbar { };
+--- src/fluxbox.cc.orig	2009-07-06 12:28:48.000000000 +0100
++++ src/fluxbox.cc	2009-07-06 12:35:00.000000000 +0100
+@@ -84,7 +84,7 @@
  #ifdef SHAPE
  #include <X11/extensions/shape.h>
  #endif // SHAPE
 -#ifdef HAVE_RANDR
-+#undef HAVE_RANDR
-+#if defined(HAVE_RANDR) && !defined(__sun)
++#if !defined(__sun)
  #include <X11/extensions/Xrandr.h>
  #endif // HAVE_RANDR
  
-@@ -596,11 +597,11 @@ void Fluxbox::setupConfigFiles() {
- 
-     bool create_init = false, create_keys = false, create_menu = false;
- 
--    string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
-+    string dirname = getenv("HOME") + string("/.") + m_RC_PATH;
-     string init_file, keys_file, menu_file, slitlist_file;
--    init_file = dirname + m_RC_INIT_FILE;
--    keys_file = dirname + "keys";
--    menu_file = dirname + "menu";
-+    init_file = dirname + "/" + m_RC_INIT_FILE;
-+    keys_file = dirname + "/" + "keys";
-+    menu_file = dirname + "/" + "menu";
- 
-     struct stat buf;
- 
-@@ -1349,7 +1350,7 @@ void Fluxbox::saveWindowSearchGroup(Wind
+@@ -1227,7 +1227,7 @@
  }
  
  void Fluxbox::saveGroupSearch(Window window, WinClient *data) {
diff --git a/wm/fluxbox/patches/patch-bb b/wm/fluxbox/patches/patch-bb
deleted file mode 100644
index 8aa49953846..00000000000
--- a/wm/fluxbox/patches/patch-bb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2007/11/01 13:08:05 rillig Exp $
-
-Do not include files inside namespaces.
-
---- src/FbTk/Font.cc.orig	2007-03-19 20:57:07.000000000 +0100
-+++ src/FbTk/Font.cc	2007-10-30 16:53:50.021147000 +0100
-@@ -76,7 +76,7 @@ using std::string;
- using std::map;
- using std::list;
- 
--namespace {
-+//namespace {
- 
- #ifdef HAVE_SETLOCALE
- #include <locale.h>
-@@ -102,7 +102,7 @@ void resetEffects(FbTk::Font& font) {
-     font.setShadowOffX(2);
- }
- 
--}; // end nameless namespace
-+//}; // end nameless namespace
- 
- 
- 
diff --git a/wm/fluxbox/patches/patch-bc b/wm/fluxbox/patches/patch-bc
deleted file mode 100644
index 8be04449956..00000000000
--- a/wm/fluxbox/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/11/01 13:08:05 rillig Exp $
-
-sunpro doesn't know whether it should call abs(int) or abs(long), so we
-need to make it explicit.
-
---- src/FbTk/TextBox.cc.orig	2007-03-19 20:57:07.000000000 +0100
-+++ src/FbTk/TextBox.cc	2007-10-30 16:57:31.306492000 +0100
-@@ -193,7 +193,7 @@ void TextBox::buttonPressEvent(XButtonEv
-         int delta = width();
-         int tmp = 0;
-         for(i = m_start_pos; i <= m_end_pos; i++) {
--            tmp = abs(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
-+            tmp = abs((int)(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos)));
- 
-             if (tmp < delta) {
-                 delta = tmp;
diff --git a/wm/fluxbox/patches/patch-be b/wm/fluxbox/patches/patch-be
index 49b242dd421..11648a70e0b 100644
--- a/wm/fluxbox/patches/patch-be
+++ b/wm/fluxbox/patches/patch-be
@@ -1,25 +1,16 @@
-$NetBSD: patch-be,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-be,v 1.2 2009/07/07 15:47:59 sborrill Exp $
 
 sunpro couldn't resolve "find" without the prefix. Maybe there is some
 method of that name?
 
---- src/Workspace.cc.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/Workspace.cc	2007-10-31 01:05:46.195938000 +0100
-@@ -167,7 +167,7 @@ Workspace::~Workspace() {
+--- src/Workspace.cc.orig	2008-01-15 09:50:53.000000000 +0000
++++ src/Workspace.cc	2009-07-06 12:47:47.000000000 +0100
+@@ -85,7 +85,7 @@
  
- void Workspace::addWindow(FluxboxWindow &w, bool place) {
+ void Workspace::addWindow(FluxboxWindow &w) {
      // we don't need to add a window that already exist in our list
 -    if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
 +    if (std::find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
          return;
  
      w.setWorkspace(m_id);
-@@ -207,7 +207,7 @@ int Workspace::removeWindow(FluxboxWindo
-         FocusControl::unfocusWindow(w->winClient(), true, true);
- 
-     // we don't remove it from the layermanager, as it may be being moved
--    Windows::iterator erase_it = remove(m_windowlist.begin(),
-+    Windows::iterator erase_it = std::remove(m_windowlist.begin(),
-                                         m_windowlist.end(), w);
-     if (erase_it != m_windowlist.end())
-         m_windowlist.erase(erase_it);
diff --git a/wm/fluxbox/patches/patch-bf b/wm/fluxbox/patches/patch-bf
index 5347e5026f4..e7512914944 100644
--- a/wm/fluxbox/patches/patch-bf
+++ b/wm/fluxbox/patches/patch-bf
@@ -1,37 +1,28 @@
-$NetBSD: patch-bf,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-bf,v 1.2 2009/07/07 15:47:59 sborrill Exp $
 
 Adding "const" to a primitive type is useless. Sunpro doesn't like it.
 
---- src/CurrentWindowCmd.cc.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/CurrentWindowCmd.cc	2007-11-01 13:05:58.247018000 +0100
-@@ -111,7 +111,7 @@ FluxboxWindow &WindowHelperCmd::fbwindow
-     return *FocusControl::focusedFbWindow();
- }
+--- src/CurrentWindowCmd.cc.orig	2008-09-01 16:59:05.000000000 +0100
++++ src/CurrentWindowCmd.cc	2009-07-06 12:50:49.000000000 +0100
+@@ -348,7 +348,7 @@
+ REGISTER_COMMAND_PARSER(moveup, MoveCmd::parse, void);
+ REGISTER_COMMAND_PARSER(movedown, MoveCmd::parse, void);
  
 -MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :
 +MoveCmd::MoveCmd(int step_size_x, int step_size_y) :
    m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
  
  void MoveCmd::real_execute() {
-@@ -120,7 +120,7 @@ void MoveCmd::real_execute() {
-       fbwindow().y() + m_step_size_y);
- }
+@@ -379,7 +379,7 @@
+ REGISTER_COMMAND_PARSER(resizehorizontal, ResizeCmd::parse, void);
+ REGISTER_COMMAND_PARSER(resizevertical, ResizeCmd::parse, void);
  
 -ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
 +ResizeCmd::ResizeCmd(int step_size_x, int step_size_y) :
      m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
  
  void ResizeCmd::real_execute() {
-@@ -134,7 +134,7 @@ void ResizeCmd::real_execute() {
-     fbwindow().resize(w, h);
- }
- 
--MoveToCmd::MoveToCmd(const int step_size_x, const int step_size_y, const unsigned int refc) :
-+MoveToCmd::MoveToCmd(int step_size_x, int step_size_y, unsigned int refc) :
-     m_step_size_x(step_size_x), m_step_size_y(step_size_y), m_refc(refc) { }
- 
- void MoveToCmd::real_execute() {
-@@ -161,7 +161,7 @@ void MoveToCmd::real_execute() {
+@@ -440,7 +440,7 @@
  }
  
  
diff --git a/wm/fluxbox/patches/patch-bh b/wm/fluxbox/patches/patch-bh
deleted file mode 100644
index 31ec97adcd6..00000000000
--- a/wm/fluxbox/patches/patch-bh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2007/11/01 13:08:06 rillig Exp $
-
---- nls/fr_CH/Translation.m.orig	2007-11-01 13:29:28.791251000 +0100
-+++ nls/fr_CH/Translation.m	2007-11-01 13:29:21.380303000 +0100
-@@ -232,6 +232,7 @@ $set 19 #main
- 10 Enregistrement du journal vers
- 11 erreur: '-rc' nécessite un argument
- 12 erreur: 'screen' nécessite un argument
-+13 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
- Website: http://www.fluxbox.org/\n\n\
- -display <chaîne de caractere>\t\utilise la connexion sur le display\
- -screen <tous|entier,entier,entier>\tfonctionne uniquement sur un écran spécifique\
diff --git a/wm/fluxbox/patches/patch-bi b/wm/fluxbox/patches/patch-bi
deleted file mode 100644
index 485d20f7c55..00000000000
--- a/wm/fluxbox/patches/patch-bi
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2007/11/01 13:08:06 rillig Exp $
-
---- nls/fr_FR/Translation.m.orig	2007-03-25 18:53:43.000000000 +0200
-+++ nls/fr_FR/Translation.m	2007-11-01 13:26:42.788210000 +0100
-@@ -232,6 +232,7 @@ $set 19 #main
- 10 Enregistrement du journal vers
- 11 erreur: '-rc' nécessite un argument
- 12 erreur: 'screen' nécessite un argument
-+13 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
- Website: http://www.fluxbox.org/\n\n\
- -display <chaîne de caractere>\t\utilise la connexion sur le display\
- -screen <tous|entier,entier,entier>\tfonctionne uniquement sur un écran spécifique\
diff --git a/wm/fluxbox/patches/patch-bk b/wm/fluxbox/patches/patch-bk
index d19fca825fa..762801e8aa1 100644
--- a/wm/fluxbox/patches/patch-bk
+++ b/wm/fluxbox/patches/patch-bk
@@ -1,22 +1,13 @@
-$NetBSD: patch-bk,v 1.1 2007/11/01 13:08:07 rillig Exp $
+$NetBSD: patch-bk,v 1.2 2009/07/07 15:47:59 sborrill Exp $
 
---- src/CurrentWindowCmd.hh.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/CurrentWindowCmd.hh	2007-11-01 13:47:51.707603000 +0100
-@@ -137,7 +137,7 @@ private:
+--- src/CurrentWindowCmd.hh.orig	2008-09-01 16:59:05.000000000 +0100
++++ src/CurrentWindowCmd.hh	2009-07-06 12:53:48.000000000 +0100
+@@ -144,7 +144,7 @@
  // move cmd, relative position
  class MoveCmd: public WindowHelperCmd {
  public:
 -    explicit MoveCmd(const int step_size_x, const int step_size_y);
 +    explicit MoveCmd(int step_size_x, int step_size_y);
+     static FbTk::Command<void> *parse(const std::string &command,
+                                 const std::string &args, bool trusted);
  protected:
-     void real_execute();
- 
-@@ -170,7 +170,7 @@ public:
-         IGNORE_X = 1 << 8,
-         IGNORE_Y = 1 << 9
-     };
--    explicit MoveToCmd(const int step_size_x, const int step_size_y, const unsigned int refc);
-+    explicit MoveToCmd(int step_size_x, int step_size_y, unsigned int refc);
- protected:
-     void real_execute();
-