- Update to 1.3.0

- Remove MD5 checksums

6 files changed, 6 insertions, 358 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index f381964a1324..eccc712be842 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.3.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -25,9 +24,10 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
-MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
+MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 \
 		startfluxbox.1 fluxbox-remote.1
-MAN5=		fluxbox-keys.5
+MAN5=		fluxbox-apps.5 fluxbox-keys.5 fluxbox-menu.5 \
+		fluxbox-style.5
 DOCSVERSION=	20060629
 
 OPTIONS=	DOCHTML "Install html documentation" off \
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 9ad1c9a02cf6..6f0f1abe266b 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1,9 +1,6 @@
-MD5 (fluxbox-1.1.1.tar.gz) = e0be927617be4ffc1ddc79513f4eb0f9
-SHA256 (fluxbox-1.1.1.tar.gz) = 7306ee55a8e95a4d07bee339ffb3be2d88ef8cc08b86edd6c63d7b28f559ec88
-SIZE (fluxbox-1.1.1.tar.gz) = 1012997
-MD5 (fb-doc-mfhtml-20060629.tgz) = 0c100fe1489c22f5b205d87b9a6fa006
+SHA256 (fluxbox-1.3.0.tar.gz) = af60878f20de6d56ae77f8d134d67bf4cea820165546eb493c485c5bb9808a20
+SIZE (fluxbox-1.3.0.tar.gz) = 1070861
 SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
 SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
-MD5 (fluxbook-20060629.pdf) = 83d96b1c8a9276238300cf732f137182
 SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
 SIZE (fluxbook-20060629.pdf) = 430351
diff --git a/x11-wm/fluxbox/files/patch-aaa05 b/x11-wm/fluxbox/files/patch-aaa05
deleted file mode 100644
index ada823f49861..000000000000
--- a/x11-wm/fluxbox/files/patch-aaa05
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Mark Tiefenbruck <mark@fluxbox.org>
-Date: Sun, 12 Oct 2008 16:54:35 +0000 (-0700)
-Subject: focus window when done dragging to a new workspace with outline moving
-X-Git-Url: http://git.fluxbox.org/?p=fluxbox.git;a=commitdiff_plain;h=e5fd401f4eadef1aa4ab91b11d38653d1a4b7194
-
-focus window when done dragging to a new workspace with outline moving
----
-
-diff --git a/src/Window.cc b/src/Window.cc
-index e29e761..d23bf44 100644
---- a/src/Window.cc
-+++ src/Window.cc
-@@ -2861,11 +2861,9 @@ void FluxboxWindow::stopMoving(bool interrupted) {
-                                frame().height() + 2*frame().window().borderWidth()-1);
-         if (!interrupted) {
-             moveResize(m_last_move_x, m_last_move_y, frame().width(), frame().height());
--            if (m_workspace_number != screen().currentWorkspaceID()) {
--                screen().reassociateWindow(this, screen().currentWorkspaceID(), true);
--                frame().show();
--                focus();
--            }
-+            if (m_workspace_number != screen().currentWorkspaceID())
-+                screen().sendToWorkspace(screen().currentWorkspaceID(), this);
-+            focus();
-         }
-         fluxbox->ungrab();
-     } else if (!interrupted) {
diff --git a/x11-wm/fluxbox/files/patch-aaa06 b/x11-wm/fluxbox/files/patch-aaa06
deleted file mode 100644
index 7a142894d012..000000000000
--- a/x11-wm/fluxbox/files/patch-aaa06
+++ /dev/null
@@ -1,162 +0,0 @@
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Wed, 15 Oct 2008 06:31:10 +0000 (+0200)
-Subject: don't allow resizing to negative dimensions
-X-Git-Url: http://git.fluxbox.org/?p=fluxbox.git;a=commitdiff_plain;h=3441261346fcee4efb6ba27764384d141b2c4f7e
-
-don't allow resizing to negative dimensions
-
-this fixes a problem when the user resizes a window over the opposite border.
-as a result a signed overflow occured which lead to quite huge windows.
----
-
-diff --git a/ChangeLog b/ChangeLog
-index 5eeda89..67ee11d 100644
---- a/ChangeLog
-+++ ChangeLog
-@@ -1,5 +1,8 @@
-  (Format: Year/Month/Day)
- Changes for 1.1
-+ *08/10/15:
-+   * Don't allow resizing to negative dimensions (Mathias)
-+     Window.cc/hh
- *08/09/01:
-    * When the current menu item gets disabled, highlight its nearest neighbor
-      and add separators to the focus model menu (Mark)
-diff --git a/src/Window.cc b/src/Window.cc
-index d23bf44..4b4d1dc 100644
---- a/src/Window.cc
-+++ src/Window.cc
-@@ -2433,19 +2433,15 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
-         int borderw = frame().window().borderWidth();
-         //!! TODO(tabs): the below test ought to be in FbWinFrame
-         // if mouse is currently on the window border, ignore it
--        if ( ! insideBorder(frame(),
--                            me.x_root, me.y_root, borderw)  &&
-+        if ( ! insideBorder(frame(), me.x_root, me.y_root, borderw)  &&
-              ( !frame().externalTabMode() ||
--               ! insideBorder(frame().tabcontainer(),
--                              me.x_root, me.y_root, borderw) )
-+               ! insideBorder(frame().tabcontainer(), me.x_root, me.y_root, borderw) )
- 
-              || // or if mouse was on border when it was last clicked
- 
--             ! insideBorder(frame(),
--                            m_last_button_x, m_last_button_y, borderw) &&
-+             ! insideBorder(frame(), m_last_button_x, m_last_button_y, borderw) &&
-              ( ! frame().externalTabMode() ||
--               ! insideBorder(frame().tabcontainer(),
--                              m_last_button_x, m_last_button_y, borderw ) ) ) {
-+               ! insideBorder(frame().tabcontainer(), m_last_button_x, m_last_button_y, borderw ) ) ) {
-             return;
-         }
-     }
-@@ -2563,11 +2559,12 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
- 
-             int old_resize_x = m_last_resize_x;
-             int old_resize_y = m_last_resize_y;
--            unsigned int old_resize_w = m_last_resize_w;
--            unsigned int old_resize_h = m_last_resize_h;
-+            int old_resize_w = m_last_resize_w;
-+            int old_resize_h = m_last_resize_h;
- 
-             int dx = me.x - m_button_grab_x;
-             int dy = me.y - m_button_grab_y;
-+
-             if (m_resize_corner == LEFTTOP || m_resize_corner == LEFTBOTTOM ||
-                 m_resize_corner == LEFT) {
-                 m_last_resize_w = frame().width() - dx;
-@@ -2598,7 +2595,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
-                 }
-             }
- 
--            fixsize();
-+            fixSize();
-             frame().displaySize(m_last_resize_w, m_last_resize_h);
- 
-             if (old_resize_x != m_last_resize_x ||
-@@ -3107,7 +3104,7 @@ void FluxboxWindow::startResizing(int x, int y, ReferenceCorner dir) {
-     m_last_resize_w = frame().width();
-     m_last_resize_h = frame().height();
- 
--    fixsize();
-+    fixSize();
-     frame().displaySize(m_last_resize_w, m_last_resize_h);
- 
-     parent().drawRectangle(screen().rootTheme()->opGC(),
-@@ -3127,7 +3124,7 @@ void FluxboxWindow::stopResizing(bool interrupted) {
-     screen().hideGeometry();
- 
-     if (!interrupted) {
--        fixsize();
-+        fixSize();
- 
-         moveResize(m_last_resize_x, m_last_resize_y,
-                    m_last_resize_w, m_last_resize_h);
-@@ -3375,8 +3372,21 @@ bool FluxboxWindow::isTransient() const {
- 
- int FluxboxWindow::initialState() const { return m_client->initial_state; }
- 
--void FluxboxWindow::fixsize() {
--    frame().applySizeHints(m_last_resize_w, m_last_resize_h);
-+void FluxboxWindow::fixSize() {
-+
-+    // m_last_resize_w / m_last_resize_h could be negative
-+    // due to user interactions. check here and limit
-+    unsigned int w = 1;
-+    unsigned int h = 1;
-+    if (m_last_resize_w > 0)
-+        w = m_last_resize_w;
-+    if (m_last_resize_h > 0)
-+        h = m_last_resize_h;
-+
-+    frame().applySizeHints(w, h);
-+
-+    m_last_resize_w = w;
-+    m_last_resize_h = h;
- 
-     // move X if necessary
-     if (m_resize_corner == LEFTTOP || m_resize_corner == LEFTBOTTOM ||
-diff --git a/src/Window.hh b/src/Window.hh
-index 97ece55..bf177b4 100644
---- a/src/Window.hh
-+++ src/Window.hh
-@@ -507,7 +507,7 @@ private:
-     // modifies left and top if snap is necessary
-     void doSnapping(int &left, int &top);
-     // user_w/h return the values that should be shown to the user
--    void fixsize();
-+    void fixSize();
-     void moveResizeClient(WinClient &client);
-     /// sends configurenotify to all clients
-     void sendConfigureNotify();
-@@ -547,7 +547,7 @@ private:
-     int m_button_grab_x, m_button_grab_y; // handles last button press event for move
-     int m_last_resize_x, m_last_resize_y; // handles last button press event for resize
-     int m_last_move_x, m_last_move_y; // handles last pos for non opaque moving
--    unsigned int m_last_resize_h, m_last_resize_w; // handles height/width for resize "window"
-+    int m_last_resize_h, m_last_resize_w; // handles height/width for resize "window"
- 
-     timeval m_last_keypress_time;
- 
-@@ -562,16 +562,16 @@ private:
-     Client2ButtonMap m_labelbuttons;
- 
-     SizeHints m_size_hint;
--    struct _decorations {
--        bool titlebar, handle, border, iconify,
--            maximize, close, menu, sticky, shade, tab, enabled;
-+    struct {
-+        bool titlebar:1, handle:1, border:1, iconify:1,
-+            maximize:1, close:1, menu:1, sticky:1, shade:1, tab:1, enabled:1;
-     } decorations;
- 
-     std::vector<WinButton::Type> m_titlebar_buttons[2];
-     bool m_toggled_decos;
- 
--    struct _functions {
--        bool resize, move, iconify, maximize, close, tabable;
-+    struct {
-+        bool resize:1, move:1, iconify:1, maximize:1, close:1, tabable:1;
-     } functions;
- 
-     typedef FbTk::ConstObjectAccessor<bool, FocusControl> BoolAcc;
diff --git a/x11-wm/fluxbox/files/patch-aaa07 b/x11-wm/fluxbox/files/patch-aaa07
deleted file mode 100644
index fe415738344a..000000000000
--- a/x11-wm/fluxbox/files/patch-aaa07
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Wed, 15 Oct 2008 21:31:37 +0000 (+0200)
-Subject: additional fix for the resize bug
-X-Git-Url: http://git.fluxbox.org/?p=fluxbox.git;a=commitdiff_plain;h=6642792f68ae42ba8d2bcbe2033284f7e8e61167
-
-additional fix for the resize bug
----
-
-From: Peter Hercek <hercek at sf dot net>
-Date: Sun, 11 Jan 2009 13:23:08 +0000 (+0100)
-Subject: fixed resize bug (caused by typo, see #2498507)
-X-Git-Url: http://git.fluxbox.org/?p=fluxbox.git;a=commitdiff_plain;h=4e831484d55398e5c328aeb531060ffaf997f300
-
-fixed resize bug (caused by typo, see #2498507)
----
-
-diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
-index ce25004..711e993 100644
---- a/src/FbWinFrame.cc
-+++ src/FbWinFrame.cc
-@@ -38,6 +38,7 @@
- #include <algorithm>
- #include <X11/X.h>
- 
-+using std::max;
- using std::mem_fun;
- using std::string;
- 
-@@ -1702,7 +1703,8 @@ int FbWinFrame::yOffset() const {
- 
- void FbWinFrame::applySizeHints(unsigned int &width, unsigned int &height,
-                                 bool maximizing) const {
--    height -= titlebarHeight() + handleHeight();
-+    const int h = height - titlebarHeight() - handleHeight();
-+    height = max(h, static_cast<int>(titlebarHeight() + handleHeight()));
-     sizeHints().apply(width, height, maximizing);
-     height += titlebarHeight() + handleHeight();
- }
diff --git a/x11-wm/fluxbox/files/patch-disable-remember.patch b/x11-wm/fluxbox/files/patch-disable-remember.patch
deleted file mode 100644
index 7c147ded83a3..000000000000
--- a/x11-wm/fluxbox/files/patch-disable-remember.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- src/Makefile.in.orig	2009-03-23 20:37:16.000000000 +0100
-+++ src/Makefile.in	2009-03-23 20:37:26.000000000 +0100
-@@ -86,31 +86,30 @@
- 	FbMenuParser.hh FbMenuParser.cc StyleMenuItem.hh \
- 	StyleMenuItem.cc RootCmdMenuItem.hh RootCmdMenuItem.cc \
- 	MenuCreator.hh MenuCreator.cc ClientMenu.hh ClientMenu.cc \
--	WorkspaceMenu.hh WorkspaceMenu.cc FocusModelMenuItem.hh \
--	ToggleMenu.hh HeadArea.hh HeadArea.cc Resources.cc \
--	WindowCmd.hh WindowCmd.cc FocusControl.hh FocusControl.cc \
--	PlacementStrategy.hh CascadePlacement.hh CascadePlacement.cc \
--	ColSmartPlacement.hh ColSmartPlacement.cc \
--	MinOverlapPlacement.hh MinOverlapPlacement.cc \
--	RowSmartPlacement.hh RowSmartPlacement.cc ScreenPlacement.hh \
--	ScreenPlacement.cc UnderMousePlacement.hh \
--	UnderMousePlacement.cc AttentionNoticeHandler.hh \
--	AttentionNoticeHandler.cc IconButton.hh IconButton.cc \
--	IconbarTheme.hh IconbarTheme.cc Focusable.hh FocusableList.hh \
--	FocusableList.cc FocusableTheme.hh WindowMenuAccessor.hh \
--	RectangleUtil.hh Ewmh.hh Ewmh.cc Gnome.hh Gnome.cc Remember.hh \
--	Remember.cc ClientPattern.hh ClientPattern.cc Toolbar.hh \
--	Toolbar.cc ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh \
--	ToolbarItem.cc ClockTool.hh ClockTool.cc WorkspaceNameTool.hh \
--	WorkspaceNameTool.cc WorkspaceNameTheme.hh IconbarTool.hh \
--	IconbarTool.cc ToolTheme.hh ToolTheme.cc SystemTray.hh \
--	SystemTray.cc GenericTool.hh GenericTool.cc ButtonTool.hh \
--	ButtonTool.cc ButtonTheme.hh ButtonTheme.cc ToolFactory.hh \
--	ToolFactory.cc
-+	ClientPattern.hh ClientPattern.cc WorkspaceMenu.hh \
-+	WorkspaceMenu.cc FocusModelMenuItem.hh ToggleMenu.hh \
-+	HeadArea.hh HeadArea.cc Resources.cc WindowCmd.hh WindowCmd.cc \
-+	FocusControl.hh FocusControl.cc PlacementStrategy.hh \
-+	CascadePlacement.hh CascadePlacement.cc ColSmartPlacement.hh \
-+	ColSmartPlacement.cc MinOverlapPlacement.hh \
-+	MinOverlapPlacement.cc RowSmartPlacement.hh \
-+	RowSmartPlacement.cc ScreenPlacement.hh ScreenPlacement.cc \
-+	UnderMousePlacement.hh UnderMousePlacement.cc \
-+	AttentionNoticeHandler.hh AttentionNoticeHandler.cc \
-+	IconButton.hh IconButton.cc IconbarTheme.hh IconbarTheme.cc \
-+	Focusable.hh FocusableList.hh FocusableList.cc \
-+	FocusableTheme.hh WindowMenuAccessor.hh RectangleUtil.hh \
-+	Ewmh.hh Ewmh.cc Gnome.hh Gnome.cc Remember.hh Remember.cc \
-+	Toolbar.hh Toolbar.cc ToolbarTheme.hh ToolbarTheme.cc \
-+	ToolbarItem.hh ToolbarItem.cc ClockTool.hh ClockTool.cc \
-+	WorkspaceNameTool.hh WorkspaceNameTool.cc \
-+	WorkspaceNameTheme.hh IconbarTool.hh IconbarTool.cc \
-+	ToolTheme.hh ToolTheme.cc SystemTray.hh SystemTray.cc \
-+	GenericTool.hh GenericTool.cc ButtonTool.hh ButtonTool.cc \
-+	ButtonTheme.hh ButtonTheme.cc ToolFactory.hh ToolFactory.cc
- @NEWWMSPEC_TRUE@am__objects_1 = Ewmh.$(OBJEXT)
- @GNOME_TRUE@am__objects_2 = Gnome.$(OBJEXT)
--@REMEMBER_SRC_TRUE@am__objects_3 = Remember.$(OBJEXT) \
--@REMEMBER_SRC_TRUE@	ClientPattern.$(OBJEXT)
-+@REMEMBER_SRC_TRUE@am__objects_3 = Remember.$(OBJEXT)
- @TOOLBAR_SRC_TRUE@am__objects_4 = Toolbar.$(OBJEXT) \
- @TOOLBAR_SRC_TRUE@	ToolbarTheme.$(OBJEXT) ToolbarItem.$(OBJEXT) \
- @TOOLBAR_SRC_TRUE@	ClockTool.$(OBJEXT) \
-@@ -135,15 +134,15 @@
- 	AlphaMenu.$(OBJEXT) FbMenuParser.$(OBJEXT) \
- 	StyleMenuItem.$(OBJEXT) RootCmdMenuItem.$(OBJEXT) \
- 	MenuCreator.$(OBJEXT) ClientMenu.$(OBJEXT) \
--	WorkspaceMenu.$(OBJEXT) HeadArea.$(OBJEXT) Resources.$(OBJEXT) \
--	WindowCmd.$(OBJEXT) FocusControl.$(OBJEXT) \
--	CascadePlacement.$(OBJEXT) ColSmartPlacement.$(OBJEXT) \
--	MinOverlapPlacement.$(OBJEXT) RowSmartPlacement.$(OBJEXT) \
--	ScreenPlacement.$(OBJEXT) UnderMousePlacement.$(OBJEXT) \
--	AttentionNoticeHandler.$(OBJEXT) IconButton.$(OBJEXT) \
--	IconbarTheme.$(OBJEXT) FocusableList.$(OBJEXT) \
--	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
--	$(am__objects_4)
-+	ClientPattern.$(OBJEXT) WorkspaceMenu.$(OBJEXT) \
-+	HeadArea.$(OBJEXT) Resources.$(OBJEXT) WindowCmd.$(OBJEXT) \
-+	FocusControl.$(OBJEXT) CascadePlacement.$(OBJEXT) \
-+	ColSmartPlacement.$(OBJEXT) MinOverlapPlacement.$(OBJEXT) \
-+	RowSmartPlacement.$(OBJEXT) ScreenPlacement.$(OBJEXT) \
-+	UnderMousePlacement.$(OBJEXT) AttentionNoticeHandler.$(OBJEXT) \
-+	IconButton.$(OBJEXT) IconbarTheme.$(OBJEXT) \
-+	FocusableList.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-+	$(am__objects_3) $(am__objects_4)
- fluxbox_OBJECTS = $(am_fluxbox_OBJECTS)
- fluxbox_LDADD = $(LDADD)
- fluxbox_DEPENDENCIES = FbTk/libFbTk.a FbTk/LogicCommands.o \
-@@ -285,6 +284,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = FbTk
-@@ -298,9 +298,7 @@
- CONFIG_CLEAN_FILES = defaults.hh
- @NEWWMSPEC_TRUE@newwmspec_SOURCE = Ewmh.hh Ewmh.cc
- @GNOME_TRUE@gnome_SOURCE = Gnome.hh Gnome.cc
--@REMEMBER_SRC_TRUE@REMEMBER_SOURCE = Remember.hh Remember.cc \
--@REMEMBER_SRC_TRUE@	ClientPattern.hh ClientPattern.cc
--
-+@REMEMBER_SRC_TRUE@REMEMBER_SOURCE = Remember.hh Remember.cc
- @TOOLBAR_SRC_TRUE@TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
- @TOOLBAR_SRC_TRUE@	ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \
- @TOOLBAR_SRC_TRUE@	ClockTool.hh ClockTool.cc \
-@@ -344,6 +342,7 @@
- 	RootCmdMenuItem.hh RootCmdMenuItem.cc\
- 	MenuCreator.hh MenuCreator.cc \
- 	ClientMenu.hh ClientMenu.cc \
-+	ClientPattern.hh ClientPattern.cc \
- 	WorkspaceMenu.hh WorkspaceMenu.cc \
- 	FocusModelMenuItem.hh \
- 	ToggleMenu.hh \
---- src/Window.cc.orig	2009-03-25 00:05:17.000000000 +0100
-+++ src/Window.cc	2009-03-25 00:05:42.000000000 +0100
-@@ -2189,9 +2189,11 @@
-         } else if (atom == fbatoms->getMWMHintsAtom()) {
-             client.updateMWMHints();
-             updateMWMHintsFromClient(client);
-+#ifdef REMEMBER
-             if (!m_toggled_decos) {
-                 Remember::instance().updateDecoStateFromClient(client);
-             }
-+#endif
-             applyDecorations(); // update decorations (if they changed)
-         }
-         break;