Update to version 2.3.2.

Based on PR 38953 from Joel CARNAT. Thanks!

Changes since last packaged version:

Show correct geometry on mouse resize(FS#203);
Fix build issues with simple POSIX shell.
Fix focus handling on new window managing with multi monitors (FS#188);
Add support for mouse with up to 9 buttons.
Fix cache invalidation when swapping clients
Fix handling of keycode and keysyms (FS#64)
Do not focus new client if current client is maximized (FS#182)
Documentation update
Fix a bug with UTF-8 strings rendering
Fix titlebar map/unmap
Allow NULL in command for widgets (FS#175)
Documentation update;
Store KeySym not KeyCode in keys bindings (FS#161);
Fix some drawing problems.
Documentation update;
Fix placement for maximized apps;
Give focus when clicking with Button1 on titlebars;
Use mwfact lower and upper limits in mouse;
Fix opacity focused issue;
Fix focus on arrange for multi head;
Allow multiple bindings for mouse events.
Support for multiple image format, using Imlib2 (default) or GTK pixbuf (FS#82);
Use pango for font display instead of Xft;
Better documentation: the documentation is now autogenerated from source code: everything is now in
the manpage and will always be (FS#101);
awesome-menu: a dmenu clone (FS#7);
Support for styles section;
mwfact lower and upper limits are configurable (FS#92);
widget_tell now allows to change widget properties like colors, etc. (FS#144, FS#36)
Errors and warnings messages are more clear and consistent, prefixed with E or W and indicating in which function it fails;
Add titlebar support for windows (FS#38);
Fix support for SDL apps (you can play Xmoto and Quake);
New option for progressbar with ticks (FS#81);
New emptybox widget which deprecated padding options of various widgets;
New opacity_focused option;
Widget graph can grow right/left;
Add support for shadowed text (FS#90);
Probably more.

6 files changed, 46 insertions, 13 deletions

diff --git a/wm/awesome/MESSAGE b/wm/awesome/MESSAGE
index 66d7d9ca822..44021913e82 100644
--- a/wm/awesome/MESSAGE
+++ b/wm/awesome/MESSAGE
@@ -1,8 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/11/14 20:52:49 rillig Exp $
+$NetBSD: MESSAGE,v 1.3 2008/07/15 14:31:12 ahoka Exp $
 
-To use awesome, you need an ~/.awesomerc file. You can use the example:
-
-	${EGDIR}
+If you are upgrading from an older version,
+run awesome -k to check your configuration file syntax.
 
 ===========================================================================
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index f1590c5fc46..4768705729e 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2008/07/08 14:28:53 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2008/07/15 14:31:12 ahoka Exp $
 #
 
-DISTNAME=		awesome-2.2
-PKGREVISION=		1
+DISTNAME=		awesome-2.3.2
 CATEGORIES=		wm
 MASTER_SITES=		http://awesome.naquadah.org/download/
 
@@ -15,7 +14,6 @@ BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 
 EGDIR=			${PREFIX}/share/examples/awesome
-MESSAGE_SUBST+=		EGDIR=${EGDIR}/awesomerc
 
 USE_LANGUAGES=		c99
 GNU_CONFIGURE=		yes
@@ -27,8 +25,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/awesomerc ${DESTDIR}${EGDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../devel/confuse/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST
index 7cb00b93937..ef3118813fa 100644
--- a/wm/awesome/PLIST
+++ b/wm/awesome/PLIST
@@ -1,11 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/23 22:11:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/07/15 14:31:12 ahoka Exp $
 bin/awesome
 bin/awesome-client
+bin/awesome-menu
 bin/awesome-message
 man/man1/awesome-client.1
+man/man1/awesome-menu.1
 man/man1/awesome-message.1
 man/man1/awesome.1
 man/man5/awesomerc.5
+share/awesome/icons/awesome16.png
+share/awesome/icons/awesome32.png
+share/awesome/icons/awesome48.png
+share/awesome/icons/awesome64.png
 share/awesome/icons/layouts/dwindle.png
 share/awesome/icons/layouts/dwindlew.png
 share/awesome/icons/layouts/floating.png
diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo
index 34b9b280752..9d88b6b64ac 100644
--- a/wm/awesome/distinfo
+++ b/wm/awesome/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/04/23 22:11:27 wiz Exp $
+$NetBSD: distinfo,v 1.5 2008/07/15 14:31:12 ahoka Exp $
 
-SHA1 (awesome-2.2.tar.gz) = d96f4a7b51bc7b4a9765de329d95d4904c831532
-RMD160 (awesome-2.2.tar.gz) = c873c6bc8b983538d2427f4cd83838797df6bfe8
-Size (awesome-2.2.tar.gz) = 208012 bytes
+SHA1 (awesome-2.3.2.tar.gz) = d49ceec58c456fff696432d2226f4eb10d2f605b
+RMD160 (awesome-2.3.2.tar.gz) = 02bfaf317d849991a52e0d8a1bcdfd415798ae1d
+Size (awesome-2.3.2.tar.gz) = 230593 bytes
+SHA1 (patch-aa) = 5c61dd95f26067b31429e00d27d28fc5be1a80c2
+SHA1 (patch-ab) = f997bc4f26e31ea07109861ac12f4a9771745c60
diff --git a/wm/awesome/patches/patch-aa b/wm/awesome/patches/patch-aa
new file mode 100644
index 00000000000..aeaa8ea7d18
--- /dev/null
+++ b/wm/awesome/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2008/07/15 14:31:12 ahoka Exp $
+
+--- configure.orig	2008-07-15 13:31:31.000000000 +0200
++++ configure
+@@ -6101,7 +6101,7 @@ if test "${with_gtk+set}" = set; then
+ fi
+ 
+ 
+-if test "x$with_gtk" == "xyes"; then
++if test "x$with_gtk" = "xyes"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GTK" >&5
diff --git a/wm/awesome/patches/patch-ab b/wm/awesome/patches/patch-ab
new file mode 100644
index 00000000000..4ae6f74bf85
--- /dev/null
+++ b/wm/awesome/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2008/07/15 14:31:12 ahoka Exp $
+
+--- awesome-menu.c.orig	2008-06-24 09:05:44.000000000 +0200
++++ awesome-menu.c
+@@ -29,6 +29,7 @@
+ #include <signal.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <ctype.h>
+ #include <dirent.h>
+ #include <pwd.h>
+ #include <sys/types.h>