3 files changed, 55 insertions, 17 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 7fc32304f6eb..d07137ea0a6b 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -6,24 +6,25 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	3.2.1
-PORTREVISION=	1
+DISTVERSION=	3.3-rc2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/ \
 		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	ntarmos@cs.uoi.gr
-COMMENT=	A tiling window manager initially based on a dwm code rewriting
+COMMENT=	A highly configurable, next generation framework window manager
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		gperf>=3.0.3:${PORTSDIR}/devel/gperf \
 		pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
 		xmlto:${PORTSDIR}/textproc/xmlto \
-		xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
+		xcb-util>=0.3.4:${PORTSDIR}/x11/xcb-util \
 		xproto>=7.0.11:${PORTSDIR}/x11/xproto
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		ev.3:${PORTSDIR}/devel/libev \
 		freetype.9:${PORTSDIR}/print/freetype2 \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+		xdg-basedir.1:${PORTSDIR}/x11/libxdg-basedir \
 		xcb.2:${PORTSDIR}/x11/libxcb \
 		xcb-event.1:${PORTSDIR}/x11/xcb-util
 
@@ -52,10 +53,6 @@ OPTIONS+=	DBUS "Enable D-BUS support" On
 IGNORE=	cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
 .endif
 
-.if exists(${LOCALBASE}/lib/libxcb-keysyms.so.1)
-BROKEN=	doesn't work with latest version of x11/xcb-util (>=0.3.4). You may try to downgrade xcb-util to 0.3.3 as a temporary solution
-.endif
-
 .ifdef(WITH_DBUS)
 LIB_DEPENDS += dbus-1.3:${PORTSDIR}/devel/dbus
 CMAKE_ARGS += -DWITH_DBUS=YES
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index 8eecbc453d85..51de4f39bc77 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-3.2.1.tar.gz) = afdf031c1235a8a89fc766494963a56f
-SHA256 (awesome-3.2.1.tar.gz) = 4be37c7d343b33cc3cac035533d01058b39b5c7f99a38be6d4362de954fee015
-SIZE (awesome-3.2.1.tar.gz) = 275609
+MD5 (awesome-3.3-rc2.tar.gz) = 4fd1abe54200b881c71b1bc99bb278e5
+SHA256 (awesome-3.3-rc2.tar.gz) = 1b1af11292914c9788e8965bd0bb3a62eb53843451346baed1427b93ec03d662
+SIZE (awesome-3.3-rc2.tar.gz) = 291500
diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist
index c28c08e42fd3..48f7993f7ea6 100644
--- a/x11-wm/awesome/pkg-plist
+++ b/x11-wm/awesome/pkg-plist
@@ -11,6 +11,8 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/icons/invaders/enemy_2.png
 %%DATADIR%%/icons/invaders/enemy_3.png
 %%DATADIR%%/icons/invaders/player.png
+%%DATADIR%%/lib/awful/button.lua
+%%DATADIR%%/lib/awful/button.lua.in
 %%DATADIR%%/lib/awful/client.lua
 %%DATADIR%%/lib/awful/client.lua.in
 %%DATADIR%%/lib/awful/completion.lua
@@ -19,6 +21,8 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/lib/awful/hooks.lua.in
 %%DATADIR%%/lib/awful/init.lua
 %%DATADIR%%/lib/awful/init.lua.in
+%%DATADIR%%/lib/awful/key.lua
+%%DATADIR%%/lib/awful/key.lua.in
 %%DATADIR%%/lib/awful/layout/init.lua
 %%DATADIR%%/lib/awful/layout/init.lua.in
 %%DATADIR%%/lib/awful/layout/suit/fair.lua
@@ -41,16 +45,32 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/lib/awful/placement.lua.in
 %%DATADIR%%/lib/awful/prompt.lua
 %%DATADIR%%/lib/awful/prompt.lua.in
+%%DATADIR%%/lib/awful/remote.lua
+%%DATADIR%%/lib/awful/remote.lua.in
 %%DATADIR%%/lib/awful/screen.lua
 %%DATADIR%%/lib/awful/screen.lua.in
+%%DATADIR%%/lib/awful/startup_notification.lua
+%%DATADIR%%/lib/awful/startup_notification.lua.in
 %%DATADIR%%/lib/awful/tag.lua
 %%DATADIR%%/lib/awful/tag.lua.in
 %%DATADIR%%/lib/awful/titlebar.lua
 %%DATADIR%%/lib/awful/titlebar.lua.in
 %%DATADIR%%/lib/awful/util.lua
 %%DATADIR%%/lib/awful/util.lua.in
-%%DATADIR%%/lib/awful/widget.lua
-%%DATADIR%%/lib/awful/widget.lua.in
+%%DATADIR%%/lib/awful/widget/button.lua
+%%DATADIR%%/lib/awful/widget/button.lua.in
+%%DATADIR%%/lib/awful/widget/common.lua
+%%DATADIR%%/lib/awful/widget/common.lua.in
+%%DATADIR%%/lib/awful/widget/init.lua
+%%DATADIR%%/lib/awful/widget/init.lua.in
+%%DATADIR%%/lib/awful/widget/launcher.lua
+%%DATADIR%%/lib/awful/widget/launcher.lua.in
+%%DATADIR%%/lib/awful/widget/prompt.lua
+%%DATADIR%%/lib/awful/widget/prompt.lua.in
+%%DATADIR%%/lib/awful/widget/taglist.lua
+%%DATADIR%%/lib/awful/widget/taglist.lua.in
+%%DATADIR%%/lib/awful/widget/tasklist.lua
+%%DATADIR%%/lib/awful/widget/tasklist.lua.in
 %%DATADIR%%/lib/beautiful.lua
 %%DATADIR%%/lib/beautiful.lua.in
 %%DATADIR%%/lib/invaders.lua
@@ -68,6 +88,8 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/themes/default/layouts/fairvw.png
 %%DATADIR%%/themes/default/layouts/floating.png
 %%DATADIR%%/themes/default/layouts/floatingw.png
+%%DATADIR%%/themes/default/layouts/fullscreen.png
+%%DATADIR%%/themes/default/layouts/fullscreenw.png
 %%DATADIR%%/themes/default/layouts/magnifier.png
 %%DATADIR%%/themes/default/layouts/magnifierw.png
 %%DATADIR%%/themes/default/layouts/max.png
@@ -85,10 +107,28 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/themes/default/taglist/squarew.png
 %%DATADIR%%/themes/default/tasklist/floating.png
 %%DATADIR%%/themes/default/tasklist/floatingw.png
-%%DATADIR%%/themes/default/theme
-%%DATADIR%%/themes/default/theme.in
+%%DATADIR%%/themes/default/theme.lua
+%%DATADIR%%/themes/default/theme.lua.in
 %%DATADIR%%/themes/default/titlebar/close.png
+%%DATADIR%%/themes/default/titlebar/close_focus.png
+%%DATADIR%%/themes/default/titlebar/close_normal.png
 %%DATADIR%%/themes/default/titlebar/closer.png
+%%DATADIR%%/themes/default/titlebar/floating_focus_active.png
+%%DATADIR%%/themes/default/titlebar/floating_focus_inactive.png
+%%DATADIR%%/themes/default/titlebar/floating_normal_active.png
+%%DATADIR%%/themes/default/titlebar/floating_normal_inactive.png
+%%DATADIR%%/themes/default/titlebar/maximized_focus_active.png
+%%DATADIR%%/themes/default/titlebar/maximized_focus_inactive.png
+%%DATADIR%%/themes/default/titlebar/maximized_normal_active.png
+%%DATADIR%%/themes/default/titlebar/maximized_normal_inactive.png
+%%DATADIR%%/themes/default/titlebar/ontop_focus_active.png
+%%DATADIR%%/themes/default/titlebar/ontop_focus_inactive.png
+%%DATADIR%%/themes/default/titlebar/ontop_normal_active.png
+%%DATADIR%%/themes/default/titlebar/ontop_normal_inactive.png
+%%DATADIR%%/themes/default/titlebar/sticky_focus_active.png
+%%DATADIR%%/themes/default/titlebar/sticky_focus_inactive.png
+%%DATADIR%%/themes/default/titlebar/sticky_normal_active.png
+%%DATADIR%%/themes/default/titlebar/sticky_normal_inactive.png
 %%DATADIR%%/themes/sky/awesome-icon.png
 %%DATADIR%%/themes/sky/layouts/fairh.png
 %%DATADIR%%/themes/sky/layouts/fairv.png
@@ -101,13 +141,14 @@ etc/xdg/awesome/rc.lua
 %%DATADIR%%/themes/sky/layouts/tileleft.png
 %%DATADIR%%/themes/sky/layouts/tiletop.png
 %%DATADIR%%/themes/sky/sky-background.png
-%%DATADIR%%/themes/sky/theme
-%%DATADIR%%/themes/sky/theme.in
+%%DATADIR%%/themes/sky/theme.lua
+%%DATADIR%%/themes/sky/theme.lua.in
 share/xsessions/awesome.desktop
 @dirrm %%DATADIR%%/icons/invaders
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/lib/awful/layout/suit
 @dirrm %%DATADIR%%/lib/awful/layout
+@dirrm %%DATADIR%%/lib/awful/widget
 @dirrm %%DATADIR%%/lib/awful
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/themes/default/layouts