Update to 3.4.10, from wip/awesome.

Main points: Lua configuration, instead of the old one.
(Awesome-2.x.x hasn't been updated since 2009.)

9 files changed, 263 insertions, 110 deletions

diff --git a/wm/awesome/DESCR b/wm/awesome/DESCR
index fb5202c9c30..2750642cf51 100644
--- a/wm/awesome/DESCR
+++ b/wm/awesome/DESCR
@@ -1,14 +1,6 @@
-awesome is a tiling window manager initialy based on a dwm code
-rewriting.  It's extremely fast, small, dynamic and awesome.
+awesome is a highly configurable, next generation framework window manager
+for X. It is very fast, extensible and licensed under the GNU GPLv2 license.
 
-Windows can be managed in several layouts: tiled, maximized, dwindle,
-spiral, floating. Each layout can be applied on the fly, optimizing
-the environment for the application in use and the task performed.
-
-Managing windows in tiled mode assures that no space will be wasted
-on your screen. No gaps, no overlap. Other layouts can be used for
-different purpose.
-
-If you do not want to use the tiling management, you can use the
-floating layout wich will let you organize your windows as you
-wish, like any other window manager.
+It is primarly targeted at power users, developers and any people dealing
+with every day computing tasks and who want to have fine-grained control
+on theirs graphical environment.
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index ddc53013e91..731bd7f648a 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,39 +1,61 @@
-# $NetBSD: Makefile,v 1.26 2012/03/15 11:53:41 obache Exp $
+# $NetBSD: Makefile,v 1.27 2012/08/26 20:28:16 is Exp $
 #
 
-DISTNAME=		awesome-2.3.6
-PKGREVISION=		11
-CATEGORIES=		wm
-MASTER_SITES=		http://awesome.naquadah.org/download/
+DISTNAME=	awesome-3.4.10
+CATEGORIES=	x11 wm
+MASTER_SITES=	http://awesome.naquadah.org/download/
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://awesome.naquadah.org/
-COMMENT=		Tiling window manager based on dwm
+MAINTAINER=	pallegra@gmail.com
+HOMEPAGE=	http://awesome.naquadah.org/
+COMMENT=	Tiling window manager based on dwm
+LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
-BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
-BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-EGDIR=			${PREFIX}/share/examples/awesome
+CONFLICTS+=	awesome<3.0
 
-USE_LANGUAGES=		c99
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
-PKG_DESTDIR_SUPPORT=	user-destdir
+USE_TOOLS+=	bash gmake pkg-config
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 
-LDFLAGS.DragonFly=	-lX11 -lXext
+PKG_SYSCONFSUBDIR=	xdg/awesome
 
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/awesomerc ${DESTDIR}${EGDIR}
+CMAKE_ARGS+=	-DWITH_DBUS=OFF
+CMAKE_ARGS+=	-DSYSCONFDIR=${PKG_SYSCONFDIR:C/\/xdg\/awesome//}
+CMAKE_ARGS+=	-DCOMPRESS_MANPAGES=${MANZ:Q}
+CMAKE_ARGS+=	-DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
 
-.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"
+REPLACE_BASH+=	build-utils/gperf.sh
+
+EGDIR=		${PREFIX}/share/examples/awesome
+CONF_FILES=	${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
+
+SUBST_CLASSES+=		eg
+SUBST_MESSAGE.eg=	Fixing pathnames
+SUBST_STAGE.eg=		pre-configure
+SUBST_FILES.eg=		CMakeLists.txt
+SUBST_SED.eg=		-e "s,\$${AWESOME_SYSCONFDIR},${EGDIR},"
+
+SUBST_CLASSES+=		ev
+SUBST_MESSAGE.ev=	Fixing pathnames for libev
+SUBST_STAGE.ev=		pre-configure
+SUBST_FILES.ev=		awesomeConfig.cmake
+SUBST_SED.ev=		-e "s,PKGPREFIX,${PREFIX},"
+
+BUILD_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+BUILD_DEPENDS+=	asciidoc>=8.3.0:../../textproc/asciidoc
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+BUILD_DEPENDS+=	docbook-xml-[0-9]*:../../textproc/docbook-xml
+
+
+.include "../../devel/gperf/buildlink3.mk"
+.include "../../devel/libev/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../x11/libxdg-basedir/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST
index 0e1d0cbc4bf..4439dbef5cc 100644
--- a/wm/awesome/PLIST
+++ b/wm/awesome/PLIST
@@ -1,35 +1,176 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:18:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/08/26 20:28:16 is Exp $
 bin/awesome
 bin/awesome-client
-bin/awesome-menu
-bin/awesome-message
+bin/awsetbg
+man/de/man1/awesome-client.1
+man/de/man1/awesome.1
+man/de/man1/awsetbg.1
+man/de/man5/awesomerc.5
+man/es/man1/awesome-client.1
+man/es/man1/awesome.1
+man/es/man1/awsetbg.1
+man/es/man5/awesomerc.5
+man/fr/man1/awesome-client.1
+man/fr/man1/awesome.1
+man/fr/man1/awsetbg.1
+man/fr/man5/awesomerc.5
 man/man1/awesome-client.1
-man/man1/awesome-menu.1
-man/man1/awesome-message.1
 man/man1/awesome.1
+man/man1/awsetbg.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
-share/awesome/icons/layouts/floatingw.png
-share/awesome/icons/layouts/max.png
-share/awesome/icons/layouts/maxw.png
-share/awesome/icons/layouts/spiral.png
-share/awesome/icons/layouts/spiralw.png
-share/awesome/icons/layouts/tile.png
-share/awesome/icons/layouts/tilebottom.png
-share/awesome/icons/layouts/tilebottomw.png
-share/awesome/icons/layouts/tileleft.png
-share/awesome/icons/layouts/tileleftw.png
-share/awesome/icons/layouts/tiletop.png
-share/awesome/icons/layouts/tiletopw.png
-share/awesome/icons/layouts/tilew.png
+share/awesome/lib/awful/autofocus.lua
+share/awesome/lib/awful/button.lua
+share/awesome/lib/awful/client.lua
+share/awesome/lib/awful/completion.lua
+share/awesome/lib/awful/dbus.lua
+share/awesome/lib/awful/hooks.lua
+share/awesome/lib/awful/init.lua
+share/awesome/lib/awful/key.lua
+share/awesome/lib/awful/layout/init.lua
+share/awesome/lib/awful/layout/suit/fair.lua
+share/awesome/lib/awful/layout/suit/floating.lua
+share/awesome/lib/awful/layout/suit/init.lua
+share/awesome/lib/awful/layout/suit/magnifier.lua
+share/awesome/lib/awful/layout/suit/max.lua
+share/awesome/lib/awful/layout/suit/spiral.lua
+share/awesome/lib/awful/layout/suit/tile.lua
+share/awesome/lib/awful/menu.lua
+share/awesome/lib/awful/mouse/finder.lua
+share/awesome/lib/awful/mouse/init.lua
+share/awesome/lib/awful/placement.lua
+share/awesome/lib/awful/prompt.lua
+share/awesome/lib/awful/remote.lua
+share/awesome/lib/awful/rules.lua
+share/awesome/lib/awful/screen.lua
+share/awesome/lib/awful/startup_notification.lua
+share/awesome/lib/awful/tag.lua
+share/awesome/lib/awful/titlebar.lua
+share/awesome/lib/awful/tooltip.lua
+share/awesome/lib/awful/util.lua
+share/awesome/lib/awful/wibox.lua
+share/awesome/lib/awful/widget/button.lua
+share/awesome/lib/awful/widget/common.lua
+share/awesome/lib/awful/widget/graph.lua
+share/awesome/lib/awful/widget/init.lua
+share/awesome/lib/awful/widget/launcher.lua
+share/awesome/lib/awful/widget/layout/default.lua
+share/awesome/lib/awful/widget/layout/horizontal.lua
+share/awesome/lib/awful/widget/layout/init.lua
+share/awesome/lib/awful/widget/layout/vertical.lua
+share/awesome/lib/awful/widget/layoutbox.lua
+share/awesome/lib/awful/widget/progressbar.lua
+share/awesome/lib/awful/widget/prompt.lua
+share/awesome/lib/awful/widget/taglist.lua
+share/awesome/lib/awful/widget/tasklist.lua
+share/awesome/lib/awful/widget/textclock.lua
+share/awesome/lib/beautiful.lua
+share/awesome/lib/naughty.lua
+share/awesome/themes/default/README
+share/awesome/themes/default/background.png
+share/awesome/themes/default/background_white.png
+share/awesome/themes/default/layouts/dwindle.png
+share/awesome/themes/default/layouts/dwindlew.png
+share/awesome/themes/default/layouts/fairh.png
+share/awesome/themes/default/layouts/fairhw.png
+share/awesome/themes/default/layouts/fairv.png
+share/awesome/themes/default/layouts/fairvw.png
+share/awesome/themes/default/layouts/floating.png
+share/awesome/themes/default/layouts/floatingw.png
+share/awesome/themes/default/layouts/fullscreen.png
+share/awesome/themes/default/layouts/fullscreenw.png
+share/awesome/themes/default/layouts/magnifier.png
+share/awesome/themes/default/layouts/magnifierw.png
+share/awesome/themes/default/layouts/max.png
+share/awesome/themes/default/layouts/maxw.png
+share/awesome/themes/default/layouts/spiral.png
+share/awesome/themes/default/layouts/spiralw.png
+share/awesome/themes/default/layouts/tile.png
+share/awesome/themes/default/layouts/tilebottom.png
+share/awesome/themes/default/layouts/tilebottomw.png
+share/awesome/themes/default/layouts/tileleft.png
+share/awesome/themes/default/layouts/tileleftw.png
+share/awesome/themes/default/layouts/tiletop.png
+share/awesome/themes/default/layouts/tiletopw.png
+share/awesome/themes/default/layouts/tilew.png
+share/awesome/themes/default/submenu.png
+share/awesome/themes/default/taglist/squarefw.png
+share/awesome/themes/default/taglist/squarew.png
+share/awesome/themes/default/tasklist/floating.png
+share/awesome/themes/default/tasklist/floatingw.png
+share/awesome/themes/default/theme.lua
+share/awesome/themes/default/titlebar/close_focus.png
+share/awesome/themes/default/titlebar/close_normal.png
+share/awesome/themes/default/titlebar/floating_focus_active.png
+share/awesome/themes/default/titlebar/floating_focus_inactive.png
+share/awesome/themes/default/titlebar/floating_normal_active.png
+share/awesome/themes/default/titlebar/floating_normal_inactive.png
+share/awesome/themes/default/titlebar/maximized_focus_active.png
+share/awesome/themes/default/titlebar/maximized_focus_inactive.png
+share/awesome/themes/default/titlebar/maximized_normal_active.png
+share/awesome/themes/default/titlebar/maximized_normal_inactive.png
+share/awesome/themes/default/titlebar/ontop_focus_active.png
+share/awesome/themes/default/titlebar/ontop_focus_inactive.png
+share/awesome/themes/default/titlebar/ontop_normal_active.png
+share/awesome/themes/default/titlebar/ontop_normal_inactive.png
+share/awesome/themes/default/titlebar/sticky_focus_active.png
+share/awesome/themes/default/titlebar/sticky_focus_inactive.png
+share/awesome/themes/default/titlebar/sticky_normal_active.png
+share/awesome/themes/default/titlebar/sticky_normal_inactive.png
+share/awesome/themes/sky/awesome-icon.png
+share/awesome/themes/sky/layouts/fairh.png
+share/awesome/themes/sky/layouts/fairv.png
+share/awesome/themes/sky/layouts/floating.png
+share/awesome/themes/sky/layouts/fullscreen.png
+share/awesome/themes/sky/layouts/magnifier.png
+share/awesome/themes/sky/layouts/max.png
+share/awesome/themes/sky/layouts/tile.png
+share/awesome/themes/sky/layouts/tilebottom.png
+share/awesome/themes/sky/layouts/tileleft.png
+share/awesome/themes/sky/layouts/tiletop.png
+share/awesome/themes/sky/sky-background.png
+share/awesome/themes/sky/theme.lua
+share/awesome/themes/zenburn/awesome-icon.png
+share/awesome/themes/zenburn/layouts/dwindle.png
+share/awesome/themes/zenburn/layouts/fairh.png
+share/awesome/themes/zenburn/layouts/fairv.png
+share/awesome/themes/zenburn/layouts/floating.png
+share/awesome/themes/zenburn/layouts/fullscreen.png
+share/awesome/themes/zenburn/layouts/magnifier.png
+share/awesome/themes/zenburn/layouts/max.png
+share/awesome/themes/zenburn/layouts/spiral.png
+share/awesome/themes/zenburn/layouts/tile.png
+share/awesome/themes/zenburn/layouts/tilebottom.png
+share/awesome/themes/zenburn/layouts/tileleft.png
+share/awesome/themes/zenburn/layouts/tiletop.png
+share/awesome/themes/zenburn/taglist/squarefz.png
+share/awesome/themes/zenburn/taglist/squarez.png
+share/awesome/themes/zenburn/theme.lua
+share/awesome/themes/zenburn/titlebar/close_focus.png
+share/awesome/themes/zenburn/titlebar/close_normal.png
+share/awesome/themes/zenburn/titlebar/floating_focus_active.png
+share/awesome/themes/zenburn/titlebar/floating_focus_inactive.png
+share/awesome/themes/zenburn/titlebar/floating_normal_active.png
+share/awesome/themes/zenburn/titlebar/floating_normal_inactive.png
+share/awesome/themes/zenburn/titlebar/maximized_focus_active.png
+share/awesome/themes/zenburn/titlebar/maximized_focus_inactive.png
+share/awesome/themes/zenburn/titlebar/maximized_normal_active.png
+share/awesome/themes/zenburn/titlebar/maximized_normal_inactive.png
+share/awesome/themes/zenburn/titlebar/ontop_focus_active.png
+share/awesome/themes/zenburn/titlebar/ontop_focus_inactive.png
+share/awesome/themes/zenburn/titlebar/ontop_normal_active.png
+share/awesome/themes/zenburn/titlebar/ontop_normal_inactive.png
+share/awesome/themes/zenburn/titlebar/sticky_focus_active.png
+share/awesome/themes/zenburn/titlebar/sticky_focus_inactive.png
+share/awesome/themes/zenburn/titlebar/sticky_normal_active.png
+share/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png
+share/awesome/themes/zenburn/zenburn-background.png
+share/doc/awesome/AUTHORS
+share/doc/awesome/BUGS
+share/doc/awesome/LICENSE
 share/doc/awesome/README
-share/doc/awesome/STYLE
-share/doc/awesome/UPGRADE
-share/doc/awesome/awesomerc
-share/examples/awesome/awesomerc
+share/examples/awesome/rc.lua
+share/xsessions/awesome.desktop
diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo
index 4a2d070d358..e4f76942694 100644
--- a/wm/awesome/distinfo
+++ b/wm/awesome/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/08/29 17:51:05 wiz Exp $
+$NetBSD: distinfo,v 1.9 2012/08/26 20:28:16 is Exp $
 
-SHA1 (awesome-2.3.6.tar.gz) = ccc70f810617b6fecc256296f1a3d75a59c5de61
-RMD160 (awesome-2.3.6.tar.gz) = c4a097026bff49a6a0ac65af13818958c3365bde
-Size (awesome-2.3.6.tar.gz) = 232212 bytes
-SHA1 (patch-aa) = a04211c3886c4bd01891b6182071eabdc065a94f
-SHA1 (patch-ab) = f997bc4f26e31ea07109861ac12f4a9771745c60
-SHA1 (patch-ac) = be1f54ba543dfe9f4f24eaba6623c4a912e1f60b
+SHA1 (awesome-3.4.10.tar.xz) = c5c774cc1ca416863e200fcfe01a05acc0fbcbc2
+RMD160 (awesome-3.4.10.tar.xz) = 66dc56438f577e30ac67507af243e955b7e39f79
+Size (awesome-3.4.10.tar.xz) = 715484 bytes
+SHA1 (patch-awesomeConfig.cmake) = ce48651d804fb8b277c33aed94861219acc1bc73
+SHA1 (patch-spawn.c) = 0e5f9ae05c950df85d3da3d22754e9d8c658ad93
diff --git a/wm/awesome/patches/patch-aa b/wm/awesome/patches/patch-aa
deleted file mode 100644
index 7e679c9527a..00000000000
--- a/wm/awesome/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/08/29 17:51:05 wiz Exp $
-
---- configure.orig	2009-04-18 14:56:52.000000000 +0000
-+++ configure
-@@ -6292,7 +6292,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
- { $as_echo "$as_me:$LINENO: checking for GTK" >&5
diff --git a/wm/awesome/patches/patch-ab b/wm/awesome/patches/patch-ab
deleted file mode 100644
index 4ae6f74bf85..00000000000
--- a/wm/awesome/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$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>
diff --git a/wm/awesome/patches/patch-ac b/wm/awesome/patches/patch-ac
deleted file mode 100644
index 0d0f75b0df2..00000000000
--- a/wm/awesome/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/07/17 20:54:00 ahoka Exp $
-
---- common/socket.c.orig	2008-06-24 09:05:44.000000000 +0200
-+++ common/socket.c
-@@ -22,6 +22,7 @@
- 
- #include <stdio.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- 
diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake
new file mode 100644
index 00000000000..77c8e47204b
--- /dev/null
+++ b/wm/awesome/patches/patch-awesomeConfig.cmake
@@ -0,0 +1,22 @@
+$NetBSD: patch-awesomeConfig.cmake,v 1.1 2012/08/26 20:28:17 is Exp $
+
+--- awesomeConfig.cmake.orig	2011-01-17 11:38:13.000000000 +0000
++++ awesomeConfig.cmake
+@@ -16,7 +16,7 @@ option(COMPRESS_MANPAGES "compress manpa
+ option(GENERATE_LUADOC "generate luadoc" ON)
+ 
+ # {{{ CFLAGS
+-add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra
++add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
+     -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
+     -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
+     -Wpointer-arith -Wredundant-decls -Wformat-nonliteral
+@@ -155,7 +155,7 @@ if(NOT AWESOME_REQUIRED_FOUND OR NOT AWE
+ endif()
+ 
+ macro(a_find_library variable library)
+-    find_library(${variable} ${library})
++    find_library(${variable} ${library} PKGPREFIX/lib/ev)
+     if(NOT ${variable})
+         message(FATAL_ERROR ${library} " library not found.")
+     endif()
diff --git a/wm/awesome/patches/patch-spawn.c b/wm/awesome/patches/patch-spawn.c
new file mode 100644
index 00000000000..3469549c800
--- /dev/null
+++ b/wm/awesome/patches/patch-spawn.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-spawn.c,v 1.1 2012/08/26 20:28:17 is Exp $
+
+--- spawn.c.orig        2012-08-20 16:48:36.000000000 +0000
++++ spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#include <glib/gspawn.h>
++#include <glib.h>
+ 
+ #include "spawn.h"
+ #include "screen.h"
+