Update to 3.4.8:

3.4.8:
  * Updated translations: Slovak.
  * Allow windows to change their decorations at any time (Fix for
    Google Chrome).
  * Make openbox-session to respect the $XDG_CONFIG_HOME environment variable.
  * Fixed bug #4344 where borders were given to windows that should not have
    them.
  * Merge the SessionLogout and Exit actions.  They now test if connected to a
    session manager and ask it to exit if so, or simply kill Openbox if not.
  * Further tweaks to the _NET_ACTIVE_WINDOW message handling.  Use the same
    logic for focus-stealing as is used when mapping a new window.
  * Don't go out of our way any more to prevent focus from moving while the
    keyboard is grabbed.
  * Fix openbox-gnome-session when using gnome-session > 2.22.

7 files changed, 22 insertions, 75 deletions

diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index dda31e04faa..93cacde2171 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2009/11/15 03:11:12 snj Exp $
+# $NetBSD: Makefile,v 1.55 2009/12/15 12:42:04 wiz Exp $
 
-DISTNAME=	openbox-3.4.7.2
-PKGREVISION=	2
+DISTNAME=	openbox-3.4.8
 CATEGORIES=	wm x11
 MASTER_SITES=	http://icculus.org/openbox/releases/
 # PR pkg/36489
diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST
index 5aa1da87177..b6c602f18b2 100644
--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:19:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/12/15 12:42:04 wiz Exp $
 bin/gdm-control
 bin/gnome-panel-control
 bin/openbox
 bin/openbox-gnome-session
 bin/openbox-kde-session
 bin/openbox-session
+etc/xdg/openbox/autostart.sh
 include/openbox/3.4/openbox/color.h
 include/openbox/3.4/openbox/font.h
 include/openbox/3.4/openbox/geom.h
@@ -49,6 +50,7 @@ share/locale/ar/LC_MESSAGES/openbox.mo
 share/locale/bn_IN/LC_MESSAGES/openbox.mo
 share/locale/ca/LC_MESSAGES/openbox.mo
 share/locale/cs/LC_MESSAGES/openbox.mo
+share/locale/da/LC_MESSAGES/openbox.mo
 share/locale/de/LC_MESSAGES/openbox.mo
 share/locale/en@boldquot/LC_MESSAGES/openbox.mo
 share/locale/en@quot/LC_MESSAGES/openbox.mo
@@ -57,9 +59,12 @@ share/locale/et/LC_MESSAGES/openbox.mo
 share/locale/eu/LC_MESSAGES/openbox.mo
 share/locale/fi/LC_MESSAGES/openbox.mo
 share/locale/fr/LC_MESSAGES/openbox.mo
+share/locale/hr/LC_MESSAGES/openbox.mo
 share/locale/hu/LC_MESSAGES/openbox.mo
 share/locale/it/LC_MESSAGES/openbox.mo
 share/locale/ja/LC_MESSAGES/openbox.mo
+share/locale/lt/LC_MESSAGES/openbox.mo
+share/locale/lv/LC_MESSAGES/openbox.mo
 share/locale/nl/LC_MESSAGES/openbox.mo
 share/locale/no/LC_MESSAGES/openbox.mo
 share/locale/pl/LC_MESSAGES/openbox.mo
@@ -67,8 +72,11 @@ share/locale/pt/LC_MESSAGES/openbox.mo
 share/locale/pt_BR/LC_MESSAGES/openbox.mo
 share/locale/ru/LC_MESSAGES/openbox.mo
 share/locale/sk/LC_MESSAGES/openbox.mo
+share/locale/sr/LC_MESSAGES/openbox.mo
+share/locale/sr@latin/LC_MESSAGES/openbox.mo
 share/locale/sv/LC_MESSAGES/openbox.mo
-share/locale/ua/LC_MESSAGES/openbox.mo
+share/locale/tr/LC_MESSAGES/openbox.mo
+share/locale/uk/LC_MESSAGES/openbox.mo
 share/locale/vi/LC_MESSAGES/openbox.mo
 share/locale/zh_CN/LC_MESSAGES/openbox.mo
 share/locale/zh_TW/LC_MESSAGES/openbox.mo
diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index a779a71e46d..d558ea82390 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.21 2009/11/15 03:11:12 snj Exp $
+$NetBSD: distinfo,v 1.22 2009/12/15 12:42:04 wiz Exp $
 
-SHA1 (openbox-3.4.7.2.tar.gz) = f34c3ec43b7e39bf57d64dbef97c35b68fea5254
-RMD160 (openbox-3.4.7.2.tar.gz) = a5ab5f4c3db81625d512da48189e34aeeec244d8
-Size (openbox-3.4.7.2.tar.gz) = 828190 bytes
-SHA1 (patch-aa) = 343f54e1aa60dd9e0e69cb6e6a53c80dc8d071df
+SHA1 (openbox-3.4.8.tar.gz) = dae3c3d84ce896e93a52bca0d098fe37c4df4424
+RMD160 (openbox-3.4.8.tar.gz) = 93b8a28275261563b988ca893a3577a2297c60a9
+Size (openbox-3.4.8.tar.gz) = 906181 bytes
+SHA1 (patch-aa) = ab103dd0ac0c711f5f4670e30596646b86fcd158
 SHA1 (patch-ab) = bb13ec5801c2e271f1e6b2dc4d0aa149c9e2dff1
-SHA1 (patch-ac) = cd5d329332623b97435fd72cf2be1b52049c041f
-SHA1 (patch-ad) = 86d624aa32e5de4835bec1db18896c65b0c24f3d
-SHA1 (patch-ae) = 9ff91b6a23a322d11be49e7894c42f14efa859e5
diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
index 6d372f11733..4cd01fa82e0 100644
--- a/wm/openbox/patches/patch-aa
+++ b/wm/openbox/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2009/02/16 12:04:01 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2009/12/15 12:42:04 wiz Exp $
 
---- Makefile.in.orig	2008-04-23 15:18:43.000000000 +0000
+--- Makefile.in.orig	2009-12-08 20:57:45.000000000 +0000
 +++ Makefile.in
-@@ -471,7 +471,7 @@ target_alias = @target_alias@
+@@ -483,7 +483,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = m4 po
  docxbmdir = $(docdir)/xbm
  themedir = $(datadir)/themes
@@ -11,11 +11,11 @@ $NetBSD: patch-aa,v 1.7 2009/02/16 12:04:01 wiz Exp $
  rcdir = $(configdir)/openbox
  xsessionsdir = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
-@@ -3101,12 +3101,12 @@ uninstall-dist_pixmapDATA:
+@@ -3095,12 +3095,12 @@ uninstall-dist_pixmapDATA:
  	done
  install-dist_rcDATA: $(dist_rc_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+-	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
  	@list='$(dist_rc_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/wm/openbox/patches/patch-ac b/wm/openbox/patches/patch-ac
deleted file mode 100644
index d94add0a2c8..00000000000
--- a/wm/openbox/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/11/24 21:35:16 tnn Exp $
-
---- openbox/actions/desktop.c.orig	2008-04-14 01:22:11.000000000 +0200
-+++ openbox/actions/desktop.c
-@@ -21,7 +21,9 @@ typedef struct {
-             gboolean wrap;
-             ObDirection dir;
-         } rel;
--    };
-+    } options_u;
-+#define abs options_u.abs
-+#define rel options_u.rel
-     gboolean send;
-     gboolean follow;
- } Options;
diff --git a/wm/openbox/patches/patch-ad b/wm/openbox/patches/patch-ad
deleted file mode 100644
index 92a14ece072..00000000000
--- a/wm/openbox/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/11/15 03:11:12 snj Exp $
-
-This is git revision 59eb52b7c6ccbe83742e5eb8b40b5e32bb6600cc upstream.
-
---- openbox/client.c.orig	2008-04-13 16:22:11.000000000 -0700
-+++ openbox/client.c	2009-11-14 01:16:58.000000000 -0800
-@@ -3897,12 +3897,15 @@ static void client_present(ObClient *sel
-     client_focus(self);
- }
- 
--/* this function exists to map to the client_activate message in the ewmh,
--   the user arg is unused because nobody uses it correctly anyway. */
-+/* this function exists to map to the net_active_window message in the ewmh */
- void client_activate(ObClient *self, gboolean here, gboolean raise,
-                      gboolean unshade, gboolean user)
- {
--    client_present(self, here, raise, unshade);
-+    if (user || (self->desktop == DESKTOP_ALL ||
-+                 self->desktop == screen_desktop))
-+        client_present(self, here, raise, unshade);
-+    else
-+        client_hilite(self, TRUE);
- }
- 
- static void client_bring_windows_recursive(ObClient *self,
diff --git a/wm/openbox/patches/patch-ae b/wm/openbox/patches/patch-ae
deleted file mode 100644
index f7ecc4ea2c0..00000000000
--- a/wm/openbox/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/11/15 03:11:12 snj Exp $
-
---- data/menu.xml.orig	2008-03-03 08:07:59.000000000 -0800
-+++ data/menu.xml	2009-11-14 17:41:32.000000000 -0800
-@@ -389,8 +389,10 @@
-   <separator label="System" />
-   <menu id="system-menu"/>
-   <separator />
--  <item label="Log Out">
--    <action name="SessionLogout">
-+  <!--<item label="Log Out">
-+        <action name="SessionLogout"> -->
-+  <item label="Quit Openbox">
-+    <action name="Exit">
-       <prompt>yes</prompt>
-     </action>
-   </item>