Update to 2.2.3:

 * Add an option to disable the window raise on         (Scott Moynes)
   mouse clicks with the modifierMask.
 * Make configure look for Xft version 2 libraries and  (Ben Jansens)
   use them if they are available.
 * Add bitmap button support to all the default styles. (Ben Jansens)
 * Change the default premax values to be larger than 0 (Ben Jansens)
   for clients that map in a maximized state. (avoid a
   mozilla crash.)
and some bug fixes, as well as a polish translation.

5 files changed, 67 insertions, 37 deletions

diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 9a5b3f6a4f1..d68aea8be0b 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/26 01:48:32 wiz Exp $
 #
 
-DISTNAME=	openbox-2.2.0
-PKGREVISION=	1
+DISTNAME=	openbox-2.2.3
 CATEGORIES=	wm
 MASTER_SITES=	http://icculus.org/openbox/releases/
 
@@ -15,7 +14,6 @@ DEPENDS+=	bsetroot>=0.1:../../wm/bsetroot
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
-WRKSRC=		${WRKDIR}/openbox-2.2.0
-
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST
index c0d7efa4543..413cebb2555 100644
--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,11 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/20 18:16:19 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/26 01:48:32 wiz Exp $
 bin/epist
 bin/openbox
-bin/xftlsfonts
 man/man1/epist.1
 man/man1/openbox.1
-man/man1/xftlsfonts.1
 man/man5/epistrc.5
+share/openbox/buttons/close.xbm
+share/openbox/buttons/fieron-bullet.xbm
+share/openbox/buttons/fieron-bulletl.xbm
+share/openbox/buttons/fieron-close.xbm
+share/openbox/buttons/fieron-icon.xbm
+share/openbox/buttons/fieron-max.xbm
+share/openbox/buttons/fieron-stick.xbm
+share/openbox/buttons/icon.xbm
+share/openbox/buttons/max.xbm
+share/openbox/buttons/stick.xbm
 share/openbox/epistrc
 share/openbox/menu
 share/openbox/nls/C/openbox.cat
@@ -33,6 +41,8 @@ share/openbox/nls/nl
 share/openbox/nls/nl_NL/openbox.cat
 share/openbox/nls/no
 share/openbox/nls/no_NO/openbox.cat
+share/openbox/nls/pl
+share/openbox/nls/pl_PL/openbox.cat
 share/openbox/nls/pt
 share/openbox/nls/pt_BR/openbox.cat
 share/openbox/nls/ro
@@ -50,6 +60,7 @@ share/openbox/styles/bluebox
 share/openbox/styles/cthulhain
 share/openbox/styles/deep
 share/openbox/styles/fieron
+share/openbox/styles/fieron2
 share/openbox/styles/flux
 share/openbox/styles/frobozz
 share/openbox/styles/frobust
@@ -62,6 +73,14 @@ share/openbox/styles/operation
 share/openbox/styles/outcomes
 share/openbox/styles/paper
 share/openbox/styles/purplehaaze
+share/openbox/styles/shade
+share/openbox/styles/steelblue
+share/openbox/styles/steelblue2
+share/openbox/styles/steelblue3
+share/openbox/styles/the_orange
+share/openbox/styles/trisb
+share/openbox/styles/twice
+share/openbox/styles/warp-xp
 @dirrm share/openbox/styles
 @dirrm share/openbox/nls/zh_TW
 @dirrm share/openbox/nls/zh_CN
@@ -72,6 +91,7 @@ share/openbox/styles/purplehaaze
 @dirrm share/openbox/nls/ru_RU
 @dirrm share/openbox/nls/ro_RO
 @dirrm share/openbox/nls/pt_BR
+@dirrm share/openbox/nls/pl_PL
 @dirrm share/openbox/nls/no_NO
 @dirrm share/openbox/nls/nl_NL
 @dirrm share/openbox/nls/ko_KO
@@ -86,4 +106,5 @@ share/openbox/styles/purplehaaze
 @dirrm share/openbox/nls/da_DK
 @dirrm share/openbox/nls/C
 @dirrm share/openbox/nls
+@dirrm share/openbox/buttons
 @dirrm share/openbox
diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index c1e7fd47df7..a7818433119 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/20 18:16:19 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2002/12/26 01:48:32 wiz Exp $
 
-SHA1 (openbox-2.2.0.tar.gz) = f024a72ad803471c54763f5b6b22ef7885a48233
-Size (openbox-2.2.0.tar.gz) = 386430 bytes
-SHA1 (patch-aa) = e33f48c2ca639494a74e473067b2c75ae45f89cd
-SHA1 (patch-ab) = c3a2d3015bc2fb3346cf0dc3aead859cc9a9b05f
+SHA1 (openbox-2.2.3.tar.gz) = 972b7b62ced97dcdcc05be0038f3c929765f8fde
+Size (openbox-2.2.3.tar.gz) = 484100 bytes
+SHA1 (patch-aa) = 0e52e4bd1c8b0d053b9b7734871aeb924b89f82a
+SHA1 (patch-ab) = 210b3cb925b7a0b1441c4dfa87760a9c97bb249c
diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
index 731cf97f86f..97d386436fc 100644
--- a/wm/openbox/patches/patch-aa
+++ b/wm/openbox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/20 18:16:19 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2002/12/26 01:48:33 wiz Exp $
 
---- doc/Makefile.in.orig	Wed Nov 20 10:20:24 2002
-+++ doc/Makefile.in	Wed Nov 20 10:20:46 2002
-@@ -72,7 +72,7 @@
+--- doc/Makefile.in.orig	Sun Dec 15 08:03:11 2002
++++ doc/Makefile.in
+@@ -132,7 +132,7 @@ target_alias = @target_alias@
  
  CLEANFILES = openbox.1
  MAINTAINERCLEANFILES = Makefile.in
--man_MANS = openbox.1 bsetroot.1 bsetbg.1 xftlsfonts.1
-+man_MANS = openbox.1 xftlsfonts.1
+-man_MANS = openbox.1 bsetroot.1 bsetbg.1 $(XFTMAN)
++man_MANS = openbox.1 $(XFTMAN)
  SUBDIRS = 
  
  DEFAULT_MENU = $(pkgdatadir)/menu
diff --git a/wm/openbox/patches/patch-ab b/wm/openbox/patches/patch-ab
index 26b741cd2ba..ccbd82fcbf1 100644
--- a/wm/openbox/patches/patch-ab
+++ b/wm/openbox/patches/patch-ab
@@ -1,25 +1,36 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/11/20 18:16:19 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2002/12/26 01:48:33 wiz Exp $
 
---- util/Makefile.in.orig	Wed Nov 20 11:21:35 2002
-+++ util/Makefile.in	Wed Nov 20 11:24:04 2002
-@@ -73,7 +73,6 @@
- CPPFLAGS = @CPPFLAGS@ @DEBUG@
+--- util/Makefile.in.orig	Sun Dec 15 08:03:15 2002
++++ util/Makefile.in
+@@ -130,14 +130,13 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
  SUBDIRS = epist
 -bin_SCRIPTS = bsetbg
- bin_PROGRAMS = bsetroot xftlsfonts
  
- bsetroot_SOURCES = bsetroot.cc
-@@ -140,10 +139,10 @@
+ @XFT2_FALSE@@XFT_TRUE@TMP_PROGS = xftlsfonts
+ @XFT2_FALSE@@XFT_TRUE@xftlsfonts_SOURCES = xftlsfonts.cc
+ @XFT2_FALSE@@XFT_TRUE@xftlsfonts_CPPFLAGS = @CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@
+ @XFT2_FALSE@@XFT_TRUE@xftlsfonts_LDFLAGS = @XFT_LIBS@
+ 
+-bin_PROGRAMS = bsetroot $(TMP_PROGS)
++bin_PROGRAMS = $(TMP_PROGS)
  
- maintainer-clean-binPROGRAMS:
+ bsetroot_SOURCES = bsetroot.cc
+ bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
+@@ -149,11 +148,11 @@ subdir = util
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) \
++@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS =  \
+ @XFT2_FALSE@@XFT_TRUE@	xftlsfonts$(EXEEXT)
+-@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT)
+-@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT)
+-@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT)
++@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = 
++@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = 
++@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = 
+ PROGRAMS = $(bin_PROGRAMS)
  
--install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: xftlsfonts
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	@list='xftlsfonts'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- 	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)