From de1a79ce077e2589d6887dc02d0f94232634ac79 Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Fri, 11 Jan 2013 08:11:26 +0000
Subject: [PATCH] Update to fluxbox-1.3.3.

Tested on sparc64.
Tested by bcallah@ on amd64 and loongson.

OK bcallah@
---
 x11/fluxbox/Makefile                          |   8 +-
 x11/fluxbox/distinfo                          |   7 +-
 x11/fluxbox/patches/patch-src_FbAtoms_cc      |  17 --
 x11/fluxbox/patches/patch-src_FbAtoms_hh      |  17 --
 x11/fluxbox/patches/patch-src_FbTk_App_cc     |  23 ---
 x11/fluxbox/patches/patch-src_FbTk_FbTime_cc  |  16 ++
 .../patches/patch-src_FbTk_StringUtil_cc      |  27 ----
 .../patches/patch-src_FbTk_TextureRender_cc   |  16 --
 x11/fluxbox/patches/patch-src_FbTk_Theme_cc   |  22 ---
 x11/fluxbox/patches/patch-src_Makefile_in     |  14 +-
 x11/fluxbox/patches/patch-src_Window_cc       |  53 ++++---
 x11/fluxbox/patches/patch-src_main_cc         |  22 ---
 x11/fluxbox/patches/patch-util_fbsetbg        |  29 ++++
 .../patch-util_fluxbox-generate_menu_in       |  31 +++-
 x11/fluxbox/pkg/PLIST                         | 145 +++++++++++++++++-
 15 files changed, 255 insertions(+), 192 deletions(-)
 delete mode 100644 x11/fluxbox/patches/patch-src_FbAtoms_cc
 delete mode 100644 x11/fluxbox/patches/patch-src_FbAtoms_hh
 delete mode 100644 x11/fluxbox/patches/patch-src_FbTk_App_cc
 create mode 100644 x11/fluxbox/patches/patch-src_FbTk_FbTime_cc
 delete mode 100644 x11/fluxbox/patches/patch-src_FbTk_StringUtil_cc
 delete mode 100644 x11/fluxbox/patches/patch-src_FbTk_TextureRender_cc
 delete mode 100644 x11/fluxbox/patches/patch-src_FbTk_Theme_cc
 delete mode 100644 x11/fluxbox/patches/patch-src_main_cc
 create mode 100644 x11/fluxbox/patches/patch-util_fbsetbg

diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index 88bd445bf15..f0dbe192ec6 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.66 2012/12/27 13:51:17 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.67 2013/01/11 08:11:26 dcoppa Exp $
 
 COMMENT=		window manager based on the original Blackbox code
 
-DISTNAME=		fluxbox-1.3.2
-
-REVISION=		7
+DISTNAME=		fluxbox-1.3.3
 
 CATEGORIES=		x11
 
@@ -36,8 +34,6 @@ USE_GROFF =		Yes
 
 NO_REGRESS=		Yes
 
-SEPARATE_BUILD=		Yes
-
 LIB_DEPENDS=		devel/fribidi>=0.19.2 \
 			graphics/imlib2
 
diff --git a/x11/fluxbox/distinfo b/x11/fluxbox/distinfo
index cdc1e41fea3..9c181540e8a 100644
--- a/x11/fluxbox/distinfo
+++ b/x11/fluxbox/distinfo
@@ -1,5 +1,2 @@
-MD5 (fluxbox-1.3.2.tar.gz) = Uudt4K6W2MXoc3RmHQxxEg==
-RMD160 (fluxbox-1.3.2.tar.gz) = 8dBPUsSjyH88VLjRIysQQVmiCE0=
-SHA1 (fluxbox-1.3.2.tar.gz) = FbobnqrxcNh/pke3EYpjwF8JO1w=
-SHA256 (fluxbox-1.3.2.tar.gz) = wXQDC9NW9oDcVgj1VTysibRPNiwFDQga6Ki3oyJygKA=
-SIZE (fluxbox-1.3.2.tar.gz) = 1065005
+SHA256 (fluxbox-1.3.3.tar.gz) = LqpVlZJOn9saQ4zILFhRW/sbPZqAvOT4nQ+lmugZ7n4=
+SIZE (fluxbox-1.3.3.tar.gz) = 1074561
diff --git a/x11/fluxbox/patches/patch-src_FbAtoms_cc b/x11/fluxbox/patches/patch-src_FbAtoms_cc
deleted file mode 100644
index 612df919732..00000000000
--- a/x11/fluxbox/patches/patch-src_FbAtoms_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_FbAtoms_cc,v 1.1 2012/01/20 11:53:30 dcoppa Exp $
-
-Add mwm _MOTIF_WM_INFO atom to advertise mwm hints capability: fix
-a problem with rxvt-unicode falling out of Fluxbox' control when
-started with the borderless option.
-(upstream git commit db08329d8bc689ff14cbb9084814d652ae349621)
-
---- src/FbAtoms.cc.orig	Fri Jan 20 12:29:06 2012
-+++ src/FbAtoms.cc	Fri Jan 20 12:29:50 2012
-@@ -37,6 +37,7 @@ FbAtoms::FbAtoms() {
-     xa_wm_change_state = XInternAtom(dpy, "WM_CHANGE_STATE", False);
-     xa_wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-     xa_wm_take_focus = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-+    motif_wm_info = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
-     motif_wm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
- 
-     blackbox_attributes = XInternAtom(dpy, "_BLACKBOX_ATTRIBUTES", False);
diff --git a/x11/fluxbox/patches/patch-src_FbAtoms_hh b/x11/fluxbox/patches/patch-src_FbAtoms_hh
deleted file mode 100644
index 743a6cbd0bd..00000000000
--- a/x11/fluxbox/patches/patch-src_FbAtoms_hh
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_FbAtoms_hh,v 1.1 2012/01/20 11:53:30 dcoppa Exp $
-
-Add mwm _MOTIF_WM_INFO atom to advertise mwm hints capability: fix
-a problem with rxvt-unicode falling out of Fluxbox' control when
-started with the borderless option.
-(upstream git commit db08329d8bc689ff14cbb9084814d652ae349621)
-
---- src/FbAtoms.hh.orig	Fri Jan 20 12:29:11 2012
-+++ src/FbAtoms.hh	Fri Jan 20 12:30:20 2012
-@@ -47,6 +47,7 @@ class FbAtoms { (private)
-     FbAtoms();
- 
-     Atom blackbox_attributes;
-+    Atom motif_wm_info;
-     Atom motif_wm_hints;
-     Atom xa_wm_protocols;
-     Atom xa_wm_state;
diff --git a/x11/fluxbox/patches/patch-src_FbTk_App_cc b/x11/fluxbox/patches/patch-src_FbTk_App_cc
deleted file mode 100644
index 233a2c31555..00000000000
--- a/x11/fluxbox/patches/patch-src_FbTk_App_cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_FbTk_App_cc,v 1.1 2011/12/29 16:15:53 dcoppa Exp $
-
-Make startup failure easier to diagnose
-(upstream git commit afa870802ba4296a4ce8c2b9185250f8da1124ca)
-
---- src/FbTk/App.cc.orig	Sat Oct 29 15:46:15 2011
-+++ src/FbTk/App.cc	Thu Dec 29 16:41:30 2011
-@@ -60,8 +60,13 @@ App::App(const char *displayname):m_done(false), m_dis
-     if (displayname != 0 && displayname[0] == '\0')
-         displayname = 0;
-     m_display = XOpenDisplay(displayname);
--    if (!m_display)
--        throw std::string("Couldn't connect to XServer");
-+    if (!m_display) {
-+        if (displayname) {
-+            throw std::string("Couldn't connect to XServer") + displayname;
-+        } else {
-+            throw std::string("Couldn't connect to XServer passing null display");
-+        }
-+    }
- 
-     FbStringUtil::init();
- }
diff --git a/x11/fluxbox/patches/patch-src_FbTk_FbTime_cc b/x11/fluxbox/patches/patch-src_FbTk_FbTime_cc
new file mode 100644
index 00000000000..9c5b389a037
--- /dev/null
+++ b/x11/fluxbox/patches/patch-src_FbTk_FbTime_cc
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_FbTk_FbTime_cc,v 1.1 2013/01/11 08:11:26 dcoppa Exp $
+
+Compile fix: forgotten parentheses around value
+(upstream git commit f587cc9e7e8c40bce778ffc0811a3a6c29107b85)
+
+--- src/FbTk/FbTime.cc.orig	Thu Jan 10 11:32:48 2013
++++ src/FbTk/FbTime.cc	Thu Jan 10 11:36:11 2013
+@@ -71,7 +71,7 @@ uint64_t _now() {
+         initial = false;
+         mach_timebase_info_data_t info;
+         if (mach_timebase_info(&info) == 0) {
+-            micro_scale *= static_cast<double>info.numer / static_cast<double>(info.denom);
++            micro_scale *= static_cast<double>(info.numer) / static_cast<double>(info.denom);
+         }
+     }
+ 
diff --git a/x11/fluxbox/patches/patch-src_FbTk_StringUtil_cc b/x11/fluxbox/patches/patch-src_FbTk_StringUtil_cc
deleted file mode 100644
index 3ed87d568ca..00000000000
--- a/x11/fluxbox/patches/patch-src_FbTk_StringUtil_cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_FbTk_StringUtil_cc,v 1.2 2011/12/29 16:15:53 dcoppa Exp $
-
-Fix out-of-range memory access
-(upstream git commit 757f78035da77fb84ad4ab479506f494353029d1)
-
-Don't return mid-routine
-(upstream git commit 65cb53b68551fde7dafe97f08c90b69f972f93ef)
-
---- src/FbTk/StringUtil.cc.orig	Sat Oct 29 15:46:15 2011
-+++ src/FbTk/StringUtil.cc	Thu Dec 29 16:39:07 2011
-@@ -176,12 +176,13 @@ string expandFilename(const string &filename) {
-     size_t pos = filename.find_first_not_of(" \t");
-     if (pos != string::npos && filename[pos] == '~') {
-         retval = getenv("HOME");
--        if (pos != filename.size()) {
-+        if (pos + 1 < filename.size()) {
-             // copy from the character after '~'
-             retval += static_cast<const char *>(filename.c_str() + pos + 1);
-         }
--    } else
--        return filename; //return unmodified value
-+    } else {
-+        retval = filename; //return unmodified value
-+    }
- 
-     return retval;
- }
diff --git a/x11/fluxbox/patches/patch-src_FbTk_TextureRender_cc b/x11/fluxbox/patches/patch-src_FbTk_TextureRender_cc
deleted file mode 100644
index 6d0190b5edb..00000000000
--- a/x11/fluxbox/patches/patch-src_FbTk_TextureRender_cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_FbTk_TextureRender_cc,v 1.1 2012/04/22 15:52:35 dcoppa Exp $
-
-Bugfix: don't draw the interlace lines 1px too far
-(upstream git commit 56af5a163513abf0c379c164e6d6c4960957a065)
-
---- src/FbTk/TextureRender.cc.orig	Sun Apr 22 17:39:27 2012
-+++ src/FbTk/TextureRender.cc	Sun Apr 22 17:40:06 2012
-@@ -1427,7 +1427,7 @@ Pixmap TextureRender::renderSolid(const FbTk::Texture 
-         lgc.setForeground(texture.colorTo());
-         register unsigned int i = 0;
-         for (; i < height; i += 2)
--            pixmap.drawLine(lgc.gc(), 0, i, width, i);
-+            pixmap.drawLine(lgc.gc(), 0, i, width - 1, i);
- 
-     }
- 
diff --git a/x11/fluxbox/patches/patch-src_FbTk_Theme_cc b/x11/fluxbox/patches/patch-src_FbTk_Theme_cc
deleted file mode 100644
index 24825c381fd..00000000000
--- a/x11/fluxbox/patches/patch-src_FbTk_Theme_cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_FbTk_Theme_cc,v 1.1 2012/12/27 13:51:17 dcoppa Exp $
-
-From d8cd6a928b76dbe63afa82327c51715cb1a1bdc8 Mon Sep 17 00:00:00 2001
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Tue, 11 Dec 2012 18:37:59 +0000
-Subject: Bugfix: use expanded style/theme filename
-
-'filename' might contain a '~' which has to be expanded to work for
-regular system calls. We expanded 'filename' already but then did
-not use it.
-
---- src/FbTk/Theme.cc.orig	Thu Dec 27 12:47:17 2012
-+++ src/FbTk/Theme.cc	Thu Dec 27 12:48:00 2012
-@@ -120,7 +120,7 @@ bool ThemeManager::load(const string &filename,
-     StringUtil::removeFirstWhitespace(location);
-     string prefix = "";
- 
--    if (FileUtil::isDirectory(filename.c_str())) {
-+    if (FileUtil::isDirectory(location.c_str())) {
-         prefix = location;
- 
-         location.append("/theme.cfg");
diff --git a/x11/fluxbox/patches/patch-src_Makefile_in b/x11/fluxbox/patches/patch-src_Makefile_in
index f4180035fc2..5a9719f5193 100644
--- a/x11/fluxbox/patches/patch-src_Makefile_in
+++ b/x11/fluxbox/patches/patch-src_Makefile_in
@@ -1,18 +1,18 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2011/10/30 15:16:13 dcoppa Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.3 2013/01/11 08:11:26 dcoppa Exp $
 
 Don't check for git revision, this is a stable release
 
---- src/Makefile.in.orig	Sat Oct 29 15:49:04 2011
-+++ src/Makefile.in	Sun Oct 30 15:51:09 2011
-@@ -896,7 +896,6 @@ defaults.hh: Makefile
+--- src/Makefile.in.orig	Thu Jan 10 10:43:17 2013
++++ src/Makefile.in	Thu Jan 10 10:45:51 2013
+@@ -932,7 +932,6 @@ defaults.hh: Makefile
  
  defaults.cc: force
  	@( \
 -		GITDIR=$(top_srcdir)/.git; \
+ 		echo '// This file is generated from Makefile. Do not edit!'; \
  		echo '#include "defaults.hh"'; \
  		echo ''; \
- 		echo 'std::string realProgramName(const std::string& name) {'; \
-@@ -904,10 +903,8 @@ defaults.cc: force
+@@ -941,10 +940,8 @@ defaults.cc: force
  		echo '}'; \
  		echo ''; \
  		echo 'const char* gitrevision() {'; \
@@ -20,7 +20,7 @@ Don't check for git revision, this is a stable release
 -		echo '}' ) > defaults_tmp.cc
 -	@if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
 -	@rm defaults_tmp.cc
-+		echo '  return "";';\
++		echo ' return "this_is_tar_ball_build";'; \
 +		echo '}' ) > defaults.cc
  
  force: ;
diff --git a/x11/fluxbox/patches/patch-src_Window_cc b/x11/fluxbox/patches/patch-src_Window_cc
index b5aca12a0ca..61ba251e51e 100644
--- a/x11/fluxbox/patches/patch-src_Window_cc
+++ b/x11/fluxbox/patches/patch-src_Window_cc
@@ -1,31 +1,36 @@
-$OpenBSD: patch-src_Window_cc,v 1.7 2012/08/27 10:45:44 dcoppa Exp $
+$OpenBSD: patch-src_Window_cc,v 1.8 2013/01/11 08:11:26 dcoppa Exp $
 
-When a screen has more heads and some part of the screen is not on
-any head and some window is placed into this invisible area then
-the window is invisible which sucks. This patch repositions such
-windows so that they are visible.
-(upstream git commit 60a53113e05db443af4d520883ec3145680642a8)
+Reduce lagging behind of windows on slower displays
+(upstream git commit 79fe2fca1de5140f538e68f6981b27cf7f917e7a)
 
 --- src/Window.cc.orig	Sat Oct 29 15:46:15 2011
 +++ src/Window.cc	Mon Aug 27 11:52:37 2012
-@@ -446,11 +446,15 @@ void FluxboxWindow::init() {
-         int real_x = frame().x();
-         int real_y = frame().y();
+@@ -2393,6 +2393,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me
+     Fluxbox::instance()->keys()->doAction(me.type, me.state, m_last_pressed_button, context, &winClient(), me.time);
  
--        if (real_x >= 0 &&
--            real_y >= 0 &&
--            real_x <= (signed) screen().width() &&
--            real_y <= (signed) screen().height())
--            m_placed = true;
-+        if (screen().hasXinerama()) { // xinerama available => use head info
-+            if (0 != screen().getHead(real_x, real_y)) // if visible on some head
-+                m_placed = true;
-+        } else { // no xinerama available => use screen info
-+            if (real_x >= 0 && real_y >= 0 &&
-+                real_x <= (signed) screen().width() &&
-+                real_y <= (signed) screen().height()) // if visible on the screen
-+                m_placed = true;
+     if (moving) {
++        XEvent e;
+ 
+         // Warp to next or previous workspace?, must have moved sideways some
+         int moved_x = me.x_root - m_last_resize_x;
+@@ -2428,7 +2429,6 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me
+             if (new_id != cur_id) {
+ 
+                 // remove motion events from queue to avoid repeated warps
+-                XEvent e;
+                 while (XCheckTypedEvent(display, MotionNotify, &e)) {
+                     // might as well update the y-coordinate
+                     m_last_resize_y = e.xmotion.y_root;
+@@ -2453,6 +2453,12 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me
+ 
+         // dx = current left side, dy = current top
+         doSnapping(dx, dy);
++
++        // do not update display if another motion event is already pending
++        if (XCheckTypedEvent(display, MotionNotify, &e)) {
++            XPutBackEvent(display, &e);
++            return;
 +        }
  
-     } else
-         setOnHead(screen().getCurrHead());
+         if (!screen().doOpaqueMove()) {
+             parent().drawRectangle(screen().rootTheme()->opGC(),
diff --git a/x11/fluxbox/patches/patch-src_main_cc b/x11/fluxbox/patches/patch-src_main_cc
deleted file mode 100644
index e1c81fe6a1a..00000000000
--- a/x11/fluxbox/patches/patch-src_main_cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.3 2011/12/29 16:15:53 dcoppa Exp $
-
-Check getenv output better
-(upstream git commit fa63fcdc669efb868ca8979374eca26d82708c38)
-
---- src/main.cc.orig	Sat Oct 29 15:46:15 2011
-+++ src/main.cc	Thu Dec 29 16:41:47 2011
-@@ -220,12 +220,12 @@ struct Options {
-         const char* env;
- 
-         env = getenv("DISPLAY");
--        if (env) {
-+        if (env && strlen(env) > 0) {
-             session_display.assign(env);
-         }
- 
-         env = getenv("HOME");
--        if (env) {
-+        if (env && strlen(env) > 0) {
-             rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
-             rc_file = rc_path + "/init";
-         }
diff --git a/x11/fluxbox/patches/patch-util_fbsetbg b/x11/fluxbox/patches/patch-util_fbsetbg
new file mode 100644
index 00000000000..35aa7f38ab3
--- /dev/null
+++ b/x11/fluxbox/patches/patch-util_fbsetbg
@@ -0,0 +1,29 @@
+$OpenBSD: patch-util_fbsetbg,v 1.1 2013/01/11 08:11:26 dcoppa Exp $
+
+Remove bashisms
+(upstream git commit dcdfdfd56b5dbb6453062ad60876647b11433f18)
+
+--- util/fbsetbg.orig	Mon Dec 10 18:26:53 2012
++++ util/fbsetbg	Thu Jan 10 11:45:28 2013
+@@ -505,7 +505,11 @@ if [ "$option" = random ]; then
+             randomnumber=`random_number`
+         # some shells don't support $RANDOM
+         elif [ -z "$RANDOM" ]; then
+-            randomnumber=`(echo $$ ;time ps; w ; date )2>&1 | cksum | cut -f1 -d' '`
++            if [ -r /dev/urandom ]; then
++                randomnumber=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
++            else
++                randomnumber=`(echo $$; ps; w; date) 2>&1 | cksum | cut -f1 -d' '`
++            fi
+         else
+             randomnumber="$RANDOM"
+         fi
+@@ -526,7 +530,7 @@ fi
+ 
+ 
+ if [ ! -r "$wallpaper" ]; then
+-	if [ "$ignore_missing_wallpaper" == "true" ]; then
++	if [ "$ignore_missing_wallpaper" = "true" ]; then
+ 		exit 0
+ 	fi
+     message "Can't find wallpaper $wallpaper"
diff --git a/x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in b/x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
index 7c2dad8b9e0..25983637bec 100644
--- a/x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
+++ b/x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
@@ -1,15 +1,36 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.8 2011/10/30 15:16:13 dcoppa Exp $
+$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.9 2013/01/11 08:11:26 dcoppa Exp $
 
 Adapt to our non-GNU grep
 
---- util/fluxbox-generate_menu.in.orig	Sat Oct 29 15:46:15 2011
-+++ util/fluxbox-generate_menu.in	Sun Oct 30 13:14:32 2011
-@@ -330,7 +330,7 @@ searchForIcon(){
+Remove bashisms
+(upstream git commit dcdfdfd56b5dbb6453062ad60876647b11433f18)
+
+Default browswer variable can be empty
+(upstream git commit be2c52a146a013ebbfb708073317c337986371ff)
+
+--- util/fluxbox-generate_menu.in.orig	Mon Dec 10 18:26:53 2012
++++ util/fluxbox-generate_menu.in	Thu Jan 10 12:43:23 2013
+@@ -330,8 +330,8 @@ searchForIcon(){
      # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
 -        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-            echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
 +        if ! grep -q "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-             echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
++            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
          else 
              : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+         fi
+@@ -1530,7 +1530,11 @@ else
+     done
+ fi
+ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
+-DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
++if [ "x$DEFAULT_BROWSERNAME" != "x" ]; then
++	DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
++else
++	DEFAULT_BROWSERNAME="firefox"
++fi
+ 
+ if [ -z "$LAUNCHER" ]; then
+     LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
diff --git a/x11/fluxbox/pkg/PLIST b/x11/fluxbox/pkg/PLIST
index ad43f88a4bc..45c6cc75a5c 100644
--- a/x11/fluxbox/pkg/PLIST
+++ b/x11/fluxbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2011/04/24 17:32:24 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.17 2013/01/11 08:11:26 dcoppa Exp $
 @bin bin/fbrun
 bin/fbsetbg
 @bin bin/fbsetroot
@@ -22,6 +22,149 @@ share/fluxbox/apps
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
+share/fluxbox/nls/
+share/fluxbox/nls/C/
+share/fluxbox/nls/C/fluxbox.cat
+share/fluxbox/nls/be_BY.CP1251/
+share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
+share/fluxbox/nls/be_BY.UTF-8/
+share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
+share/fluxbox/nls/bg_BG.ISO-8859-1/
+share/fluxbox/nls/bg_BG.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/bg_BG.UTF-8/
+share/fluxbox/nls/bg_BG.UTF-8/fluxbox.cat
+share/fluxbox/nls/cs_CZ.ISO-8859-2/
+share/fluxbox/nls/cs_CZ.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/cs_CZ.UTF-8/
+share/fluxbox/nls/cs_CZ.UTF-8/fluxbox.cat
+share/fluxbox/nls/da_DK.ISO-8859-1/
+share/fluxbox/nls/da_DK.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/da_DK.UTF-8/
+share/fluxbox/nls/da_DK.UTF-8/fluxbox.cat
+share/fluxbox/nls/de_AT.ISO-8859-15/
+share/fluxbox/nls/de_AT.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/de_AT.UTF-8/
+share/fluxbox/nls/de_AT.UTF-8/fluxbox.cat
+share/fluxbox/nls/de_CH.ISO-8859-15/
+share/fluxbox/nls/de_CH.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/de_CH.UTF-8/
+share/fluxbox/nls/de_CH.UTF-8/fluxbox.cat
+share/fluxbox/nls/de_DE.ISO-8859-15/
+share/fluxbox/nls/de_DE.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/de_DE.UTF-8/
+share/fluxbox/nls/de_DE.UTF-8/fluxbox.cat
+share/fluxbox/nls/el_GR.UTF-8/
+share/fluxbox/nls/el_GR.UTF-8/fluxbox.cat
+share/fluxbox/nls/en_GB.ISO-8859-1/
+share/fluxbox/nls/en_GB.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/en_GB.UTF-8/
+share/fluxbox/nls/en_GB.UTF-8/fluxbox.cat
+share/fluxbox/nls/en_US.ISO-8859-1/
+share/fluxbox/nls/en_US.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/en_US.UTF-8/
+share/fluxbox/nls/en_US.UTF-8/fluxbox.cat
+share/fluxbox/nls/es_AR.ISO-8859-15/
+share/fluxbox/nls/es_AR.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/es_AR.UTF-8/
+share/fluxbox/nls/es_AR.UTF-8/fluxbox.cat
+share/fluxbox/nls/es_ES.ISO-8859-15/
+share/fluxbox/nls/es_ES.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/es_ES.UTF-8/
+share/fluxbox/nls/es_ES.UTF-8/fluxbox.cat
+share/fluxbox/nls/et_EE.ISO-8859-15/
+share/fluxbox/nls/et_EE.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/et_EE.UTF-8/
+share/fluxbox/nls/et_EE.UTF-8/fluxbox.cat
+share/fluxbox/nls/fi_FI.ISO-8859-1/
+share/fluxbox/nls/fi_FI.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/fi_FI.UTF-8/
+share/fluxbox/nls/fi_FI.UTF-8/fluxbox.cat
+share/fluxbox/nls/fr_CH.ISO-8859-15/
+share/fluxbox/nls/fr_CH.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/fr_CH.UTF-8/
+share/fluxbox/nls/fr_CH.UTF-8/fluxbox.cat
+share/fluxbox/nls/fr_FR.ISO-8859-15/
+share/fluxbox/nls/fr_FR.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/fr_FR.UTF-8/
+share/fluxbox/nls/fr_FR.UTF-8/fluxbox.cat
+share/fluxbox/nls/it_IT.ISO-8859-1/
+share/fluxbox/nls/it_IT.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/it_IT.UTF-8/
+share/fluxbox/nls/it_IT.UTF-8/fluxbox.cat
+share/fluxbox/nls/ja_JP.UTF-8/
+share/fluxbox/nls/ja_JP.UTF-8/fluxbox.cat
+share/fluxbox/nls/ja_JP.eucJP/
+share/fluxbox/nls/ja_JP.eucJP/fluxbox.cat
+share/fluxbox/nls/ko_KR.EUC-KR/
+share/fluxbox/nls/ko_KR.EUC-KR/fluxbox.cat
+share/fluxbox/nls/ko_KR.UTF-8/
+share/fluxbox/nls/ko_KR.UTF-8/fluxbox.cat
+share/fluxbox/nls/lv_LV.ISO-8859-13/
+share/fluxbox/nls/lv_LV.ISO-8859-13/fluxbox.cat
+share/fluxbox/nls/lv_LV.UTF-8/
+share/fluxbox/nls/lv_LV.UTF-8/fluxbox.cat
+share/fluxbox/nls/mk_MK.UTF-8/
+share/fluxbox/nls/mk_MK.UTF-8/fluxbox.cat
+share/fluxbox/nls/nb_NO.UTF-8/
+share/fluxbox/nls/nb_NO.UTF-8/fluxbox.cat
+share/fluxbox/nls/nl_NL.ISO-8859-15/
+share/fluxbox/nls/nl_NL.ISO-8859-15/fluxbox.cat
+share/fluxbox/nls/nl_NL.UTF-8/
+share/fluxbox/nls/nl_NL.UTF-8/fluxbox.cat
+share/fluxbox/nls/no_NO.ISO-8859-1/
+share/fluxbox/nls/no_NO.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/no_NO.UTF-8/
+share/fluxbox/nls/no_NO.UTF-8/fluxbox.cat
+share/fluxbox/nls/pl_PL.ISO-8859-2/
+share/fluxbox/nls/pl_PL.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/pl_PL.UTF-8/
+share/fluxbox/nls/pl_PL.UTF-8/fluxbox.cat
+share/fluxbox/nls/pt_BR.ISO-8859-1/
+share/fluxbox/nls/pt_BR.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/pt_BR.UTF-8/
+share/fluxbox/nls/pt_BR.UTF-8/fluxbox.cat
+share/fluxbox/nls/pt_PT.ISO-8859-1/
+share/fluxbox/nls/pt_PT.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/pt_PT.UTF-8/
+share/fluxbox/nls/pt_PT.UTF-8/fluxbox.cat
+share/fluxbox/nls/ru_RU.KOI8-R/
+share/fluxbox/nls/ru_RU.KOI8-R/fluxbox.cat
+share/fluxbox/nls/ru_RU.UTF-8/
+share/fluxbox/nls/ru_RU.UTF-8/fluxbox.cat
+share/fluxbox/nls/sk_SK.ISO-8859-2/
+share/fluxbox/nls/sk_SK.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/sk_SK.UTF-8/
+share/fluxbox/nls/sk_SK.UTF-8/fluxbox.cat
+share/fluxbox/nls/sl_SI.ISO-8859-2/
+share/fluxbox/nls/sl_SI.ISO-8859-2/fluxbox.cat
+share/fluxbox/nls/sl_SI.UTF-8/
+share/fluxbox/nls/sl_SI.UTF-8/fluxbox.cat
+share/fluxbox/nls/sv_SE.ISO-8859-1/
+share/fluxbox/nls/sv_SE.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/sv_SE.UTF-8/
+share/fluxbox/nls/sv_SE.UTF-8/fluxbox.cat
+share/fluxbox/nls/tr_TR.ISO-8859-9/
+share/fluxbox/nls/tr_TR.ISO-8859-9/fluxbox.cat
+share/fluxbox/nls/tr_TR.UTF-8/
+share/fluxbox/nls/tr_TR.UTF-8/fluxbox.cat
+share/fluxbox/nls/uk_UA.KOI8-U/
+share/fluxbox/nls/uk_UA.KOI8-U/fluxbox.cat
+share/fluxbox/nls/uk_UA.UTF-8/
+share/fluxbox/nls/uk_UA.UTF-8/fluxbox.cat
+share/fluxbox/nls/vi_VN.UTF-8/
+share/fluxbox/nls/vi_VN.UTF-8/fluxbox.cat
+share/fluxbox/nls/zh_CN.BIG5/
+share/fluxbox/nls/zh_CN.BIG5/fluxbox.cat
+share/fluxbox/nls/zh_CN.GB18030/
+share/fluxbox/nls/zh_CN.GB18030/fluxbox.cat
+share/fluxbox/nls/zh_CN.GB2312/
+share/fluxbox/nls/zh_CN.GB2312/fluxbox.cat
+share/fluxbox/nls/zh_CN.GBK/
+share/fluxbox/nls/zh_CN.GBK/fluxbox.cat
+share/fluxbox/nls/zh_CN.UTF-8/
+share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
+share/fluxbox/nls/zh_TW.UTF-8/
+share/fluxbox/nls/zh_TW.UTF-8/fluxbox.cat
 share/fluxbox/overlay
 share/fluxbox/styles/
 share/fluxbox/styles/Artwiz