Update to 3.3:

3.3:
  * Add a showDelay option for the dock.
  * Fixed onscreen-keeping code which broke a bit in -rc2.
  * Fix incorrect handling of window properties on 64 bit arches.
  * Fix pixelsize being the same as size for pango, now it is correct.
  * Fix drawing of icons taller than wide, eg gimp.
  * Add a 'mirrorhorizontal' gradient, like horizontal but mirrored in the
    center and 'splitvertical' which is like vertical but nonlinear in a fancy
    way.
  * Translations for de, hr and zh_TW added.
  * Add initial per-app settings support.
  * Fix some outstanding issues with 64-bit support.
  * Add an optional delay for displaying submenus so you can move the mouse
    over some entries without flashing each submenu.
  * Plug some minor memleaks and fix minor bugs.
  * Changed algorithm for downscaling window icons.
  * New themes!
  * Disable support for libstartup-notification by default, it doesn't seem
    to work well.
  * Allow disabling of duplicate window numbering by option titleNumber in
    theme section.
  * Add moverelative and resizerelative actions.
  * Option middle for menus that make submenus be centered instead of aligned
    by the top edge to the parent entry.
  * Fix transient (ie dialog) windows being placed offscreen if the parent
    is close to the edge of the screen.

3.3-rc2:
  * Fixed some typos and errors in rc.xsd
  * Add the noStrut option to the dock (to allow maximizing windows over it),
    useful when it is not in the above layer.
  * Fix transparent terminals not updating when using ToggleDecor.
  * Yet more poking at the onscreen-keeping code, should now do the right
    thing always.
  * Add an option to hide disabled buttons instead of showing them as disabled.
  * Hopefully fixed all the remaining pango issues. The new 1.10 release also
    fixes shadows again.
  * I think the lib linking in Makefile.am is right now, please tell me if it
    isn't.
  * Added a finnish translation and some minor updates to others.
  * Fixed configure.ac so --enable-pango doesn't disable pango support or the
    other way around, make enabled be default to get some extra testing.

3.3-rc1:
  * Poked around a bit in the code that keeps windows onscreen, if you
    are using xinerama, please let me know if things are better/worse/same.
  * Add support for pango, disabled by default due to a bug in pango 1.8 that
    breaks shadows, it works fine with 1.6.x though. Poke the pango developers
    here http://bugzilla.gnome.org/show_bug.cgi?id=169622 if you want this
    to be fixed.
  * Made edge resist and Send/MoveToEdge not hit windows at layers below
    the current one, add option to disable this behaviour.
  * Fixed directional focus not getting trapped in omnipresent windows
  * Fixed focus actions when bound to the mouse, normal focus cycle is always
    linear and directional focus is totally disabled, it makes no sense
    anyway, just move the mouse.
  * Added an option for the raise/lower/raiselower/unshaderaise/shadelower
    options called group that lets you bind stuff to raise/lower the whole
    window group. <action name="raise"><group>yes</group></action>
  * Add various new actions. I haven't updated the web docs yet, but I think
    I managed to get all of them listed in rc.xsd.
  * Bugs 1783, 1812, 1863, 1905, 2005, 1957 fixed.
  * Some translations added. (ca, no, pl, ru, fr)

4 files changed, 108 insertions, 54 deletions

diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 703d09c0912..c735ece5846 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/04/13 18:23:38 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/09/03 14:27:59 wiz Exp $
 
-DISTNAME=	openbox-3.2
-PKGREVISION=	3
+DISTNAME=	openbox-3.3
 CATEGORIES=	wm x11
 MASTER_SITES=	http://icculus.org/openbox/releases/
 
@@ -30,8 +29,10 @@ CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+# disabled by default in 3.3 because "it doesn't seem to work well"
+#.include "../../x11/startup-notification/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST
index bc9d6137c29..cbbd28a0872 100644
--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,11 +1,18 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/17 07:07:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/09/03 14:27:59 wiz Exp $
 bin/gnome-panel-control
 bin/kdetrayproxy
 bin/openbox
-include/openbox/3.0/openbox/parse.h
-include/openbox/3.0/openbox/render.h
-include/openbox/3.0/openbox/theme.h
-include/openbox/3.0/openbox/version.h
+include/openbox/${PKGVERSION}/openbox/color.h
+include/openbox/${PKGVERSION}/openbox/font.h
+include/openbox/${PKGVERSION}/openbox/geom.h
+include/openbox/${PKGVERSION}/openbox/gradient.h
+include/openbox/${PKGVERSION}/openbox/image.h
+include/openbox/${PKGVERSION}/openbox/instance.h
+include/openbox/${PKGVERSION}/openbox/mask.h
+include/openbox/${PKGVERSION}/openbox/parse.h
+include/openbox/${PKGVERSION}/openbox/render.h
+include/openbox/${PKGVERSION}/openbox/theme.h
+include/openbox/${PKGVERSION}/openbox/version.h
 lib/libobparser.la
 lib/libobrender.la
 lib/pkgconfig/obparser-3.0.pc
@@ -13,53 +20,99 @@ lib/pkgconfig/obrender-3.0.pc
 share/examples/openbox/menu.xml
 share/examples/openbox/rc.xml
 share/gnome/wm-properties/openbox.desktop
+share/locale/ca/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
 share/locale/es/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/ja/LC_MESSAGES/openbox.mo
+share/locale/no/LC_MESSAGES/openbox.mo
+share/locale/pl/LC_MESSAGES/openbox.mo
+share/locale/pt/LC_MESSAGES/openbox.mo
+share/locale/ru/LC_MESSAGES/openbox.mo
+share/locale/sk/LC_MESSAGES/openbox.mo
 share/locale/sv/LC_MESSAGES/openbox.mo
+share/locale/zh_TW/LC_MESSAGES/openbox.mo
 share/openbox/menu.xsd
 share/openbox/rc.xsd
 share/openbox/themeupdate.py
 share/pixmaps/openbox.png
-share/themes/Allegro/openbox-3/bullet.xbm
-share/themes/Allegro/openbox-3/themerc
-share/themes/Artwiz/openbox-3/themerc
-share/themes/Blah41/openbox-3/themerc
-share/themes/Om4Ob/openbox-3/close.xbm
-share/themes/Om4Ob/openbox-3/close_hover.xbm
-share/themes/Om4Ob/openbox-3/desk.xbm
-share/themes/Om4Ob/openbox-3/desk_hover.xbm
-share/themes/Om4Ob/openbox-3/desk_toggled.xbm
-share/themes/Om4Ob/openbox-3/iconify.xbm
-share/themes/Om4Ob/openbox-3/iconify_hover.xbm
-share/themes/Om4Ob/openbox-3/iconify_pressed.xbm
-share/themes/Om4Ob/openbox-3/max.xbm
-share/themes/Om4Ob/openbox-3/max_disabled.xbm
-share/themes/Om4Ob/openbox-3/max_hover.xbm
-share/themes/Om4Ob/openbox-3/max_pressed.xbm
-share/themes/Om4Ob/openbox-3/max_toggled.xbm
-share/themes/Om4Ob/openbox-3/shade.xbm
-share/themes/Om4Ob/openbox-3/shade_disabled.xbm
-share/themes/Om4Ob/openbox-3/shade_hover.xbm
-share/themes/Om4Ob/openbox-3/shade_toggled.xbm
-share/themes/Om4Ob/openbox-3/themerc
-share/themes/TheBear/openbox-3/themerc
-@dirrm share/themes/TheBear/openbox-3
-@unexec ${RMDIR} %D/share/themes/TheBear 2>/dev/null || ${TRUE}
-@dirrm share/themes/Om4Ob/openbox-3
-@unexec ${RMDIR} %D/share/themes/Om4Ob 2>/dev/null || ${TRUE}
-@dirrm share/themes/Blah41/openbox-3
-@unexec ${RMDIR} %D/share/themes/Blah41 2>/dev/null || ${TRUE}
-@dirrm share/themes/Artwiz/openbox-3
-@unexec ${RMDIR} %D/share/themes/Artwiz 2>/dev/null || ${TRUE}
-@dirrm share/themes/Allegro/openbox-3
-@unexec ${RMDIR} %D/share/themes/Allegro 2>/dev/null || ${TRUE}
+share/themes/Mikachu/openbox-3/bullet.xbm
+share/themes/Mikachu/openbox-3/close.xbm
+share/themes/Mikachu/openbox-3/desk.xbm
+share/themes/Mikachu/openbox-3/iconify.xbm
+share/themes/Mikachu/openbox-3/max.xbm
+share/themes/Mikachu/openbox-3/themerc
+share/themes/Natura/openbox-3/close.xbm
+share/themes/Natura/openbox-3/close_hover.xbm
+share/themes/Natura/openbox-3/desk.xbm
+share/themes/Natura/openbox-3/desk_toggled.xbm
+share/themes/Natura/openbox-3/iconify.xbm
+share/themes/Natura/openbox-3/iconify_disabled.xbm
+share/themes/Natura/openbox-3/iconify_hover.xbm
+share/themes/Natura/openbox-3/max.xbm
+share/themes/Natura/openbox-3/max_disabled.xbm
+share/themes/Natura/openbox-3/max_hover.xbm
+share/themes/Natura/openbox-3/max_toggled.xbm
+share/themes/Natura/openbox-3/shade.xbm
+share/themes/Natura/openbox-3/themerc
+share/themes/artwiz-boxed/openbox-3/bullet.xbm
+share/themes/artwiz-boxed/openbox-3/close.xbm
+share/themes/artwiz-boxed/openbox-3/desk.xbm
+share/themes/artwiz-boxed/openbox-3/desk_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/iconify.xbm
+share/themes/artwiz-boxed/openbox-3/max.xbm
+share/themes/artwiz-boxed/openbox-3/max_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/themerc
+share/themes/bear2/openbox-3/close.xbm
+share/themes/bear2/openbox-3/close_pressed.xbm
+share/themes/bear2/openbox-3/desk.xbm
+share/themes/bear2/openbox-3/desk_toggled.xbm
+share/themes/bear2/openbox-3/iconify.xbm
+share/themes/bear2/openbox-3/iconify_disabled.xbm
+share/themes/bear2/openbox-3/iconify_pressed.xbm
+share/themes/bear2/openbox-3/max.xbm
+share/themes/bear2/openbox-3/max_disabled.xbm
+share/themes/bear2/openbox-3/max_pressed.xbm
+share/themes/bear2/openbox-3/max_toggled.xbm
+share/themes/bear2/openbox-3/shade.xbm
+share/themes/bear2/openbox-3/shade_pressed.xbm
+share/themes/bear2/openbox-3/themerc
+share/themes/orang/openbox-3/themerc
+share/themes/syscrash/openbox-3/bullet.xbm
+share/themes/syscrash/openbox-3/close.xbm
+share/themes/syscrash/openbox-3/close_disabled.xbm
+share/themes/syscrash/openbox-3/desk.xbm
+share/themes/syscrash/openbox-3/desk_toggled.xbm
+share/themes/syscrash/openbox-3/iconify.xbm
+share/themes/syscrash/openbox-3/max.xbm
+share/themes/syscrash/openbox-3/max_disabled.xbm
+share/themes/syscrash/openbox-3/max_pressed.xbm
+share/themes/syscrash/openbox-3/max_toggled.xbm
+share/themes/syscrash/openbox-3/shade.xbm
+share/themes/syscrash/openbox-3/themerc
+@dirrm share/themes/syscrash/openbox-3
+@unexec ${RMDIR} %D/share/themes/syscrash 2>/dev/null || ${TRUE}
+@dirrm share/themes/orang/openbox-3
+@unexec ${RMDIR} %D/share/themes/orang 2>/dev/null || ${TRUE}
+@dirrm share/themes/bear2/openbox-3
+@unexec ${RMDIR} %D/share/themes/bear2 2>/dev/null || ${TRUE}
+@dirrm share/themes/artwiz-boxed/openbox-3
+@unexec ${RMDIR} %D/share/themes/artwiz-boxed 2>/dev/null || ${TRUE}
+@dirrm share/themes/Natura/openbox-3
+@unexec ${RMDIR} %D/share/themes/Natura 2>/dev/null || ${TRUE}
+@dirrm share/themes/Mikachu/openbox-3
+@unexec ${RMDIR} %D/share/themes/Mikachu 2>/dev/null || ${TRUE}
 @comment in xdg-dirs: @dirrm share/themes
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/openbox
 @comment in gnome2-dirs: @dirrm share/gnome/wm-properties
 @dirrm share/examples/openbox
-@dirrm include/openbox/3.0/openbox
-@dirrm include/openbox/3.0
+@dirrm include/openbox/${PKGVERSION}/openbox
+@dirrm include/openbox/${PKGVERSION}
 @dirrm include/openbox
+@dirrm etc/xdg/openbox
+@dirrm etc/xdg
diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index 9fc98a4a408..db5717ffbf4 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/09/03 14:27:59 wiz Exp $
 
-SHA1 (openbox-3.2.tar.gz) = 2cc97b38d1fd5e40ba2631fcd1b2a0bc5dcc2813
-RMD160 (openbox-3.2.tar.gz) = bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d
-Size (openbox-3.2.tar.gz) = 561115 bytes
-SHA1 (patch-aa) = 8ef551974b465a55e56d635df1f0e449250c579f
+SHA1 (openbox-3.3.tar.gz) = 6ba5014e9d3ac13fe67074883ce78c8ffccdb38a
+RMD160 (openbox-3.3.tar.gz) = 87cf1e4ceee2ef8190cb06575add37a49236d037
+Size (openbox-3.3.tar.gz) = 603678 bytes
+SHA1 (patch-aa) = b2e0e14658e234c04751f900f9450ee913611f21
diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
index 68672ccf246..85b1579470e 100644
--- a/wm/openbox/patches/patch-aa
+++ b/wm/openbox/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2004/02/07 23:22:17 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2006/09/03 14:27:59 wiz Exp $
 
---- Makefile.in.orig	2003-12-22 20:54:44.000000000 +0100
+--- Makefile.in.orig	2006-08-26 22:24:47.000000000 +0000
 +++ Makefile.in
-@@ -183,7 +183,7 @@ SUBDIRS = m4 po
+@@ -188,7 +188,7 @@ target_alias = @target_alias@
+ SUBDIRS = m4 po
  
  themedir = $(datadir)/themes
- localedir = $(datadir)/locale
 -configdir = $(sysconfdir)/xdg
 +configdir = $(sysconfdir)
  rcdir = $(configdir)/openbox
  desktopfilesdir = $(datadir)/gnome/wm-properties
  pkgconfigdir = $(libdir)/pkgconfig
-@@ -2725,12 +2725,12 @@ uninstall-nodist_pkgconfigDATA:
+@@ -2802,12 +2802,12 @@ uninstall-nodist_pkgconfigDATA:
  nodist_rcDATA_INSTALL = $(INSTALL_DATA)
  install-nodist_rcDATA: $(nodist_rc_DATA)
  	@$(NORMAL_INSTALL)