7 files changed, 246 insertions, 59 deletions

diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index bf7133cdbafd..baa6ebbe0908 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	2.3.4
+PORTVERSION=	3.1.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
@@ -14,49 +14,50 @@ MAINTAINER=	ntarmos@ceid.upatras.gr
 COMMENT=	A tiling window manager initially based on a dwm code rewriting
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto
-LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
-		cairo.2:${PORTSDIR}/graphics/cairo \
-		freetype.9:${PORTSDIR}/print/freetype2
+		xmlto:${PORTSDIR}/textproc/xmlto \
+		xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
+		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
+		gperf>=3.0.3:${PORTSDIR}/devel/gperf
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
+		ev.3:${PORTSDIR}/devel/libev \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-event.1:${PORTSDIR}/x11/xcb-util
 
 USE_ICONV=	yes
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
+CMAKE_ENV+=	PATH=${LOCALBASE}:\${PATH}
 USE_EFL=	imlib2
-USE_GNOME=	pango
-USE_XORG=	x11 xft xext xinerama xt xrandr xproto
+USE_GNOME=	glib20 pango
+USE_LUA=	5.1+
+USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
 
 MAN1=		awesome.1 \
 		awesome-client.1 \
-		awesome-menu.1 \
-		awesome-message.1
+		awsetbg.1
 MAN5=		awesomerc.5
-PORTDOCS=	AUTHORS LICENSE README STYLE UPGRADE
-PORTEXAMPLES=	awesomerc
-
-post-patch:
-	@${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \
-			  -e 's,\([[:space:]]\)install-docDATA ,\1,g' \
-		${WRKSRC}/Makefile.in
-
-post-configure:
-	@${REINPLACE_CMD} -E '/^awesome_(message_)?LDADD/s/$$/ -liconv/g; \
-			      /^doc_DATA/s/=.*$$/=/g' \
-		${WRKSRC}/Makefile
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
-	@${MKDIR} ${DOCSDIR}
-. for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-. endfor
+MANCOMPRESSED=	yes
+PORTDOCS=	AUTHORS BUGS LICENSE README
+
+.include <bsd.port.pre.mk>
+
+.if	(exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \
+	!exists(${LOCALBASE}/libdata/pkgconfig/cairo-xcb.pc))
+IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
-	@${MKDIR} ${EXAMPLESDIR}
-. for example in ${PORTEXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR}
-. endfor
+
+pre-configure:
+	@${REINPLACE_CMD} \
+	-e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \
+		${WRKSRC}/awesomeConfig.cmake
+	@${REINPLACE_CMD} \
+	-e 's,gperf,${LOCALBASE}/bin/gperf,g' \
+		${WRKSRC}/build-utils/gperf.sh
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} \
+		-e 's/"install port docs" ON/\"install port docs" OFF/g' \
+		${WRKSRC}/awesomeConfig.cmake
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/awesome2/distinfo b/x11-wm/awesome2/distinfo
index 26e4b016eae1..a6cbea707f52 100644
--- a/x11-wm/awesome2/distinfo
+++ b/x11-wm/awesome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-2.3.4.tar.gz) = c7e27e94a9e8badfee7bcca4ac6ff9ce
-SHA256 (awesome-2.3.4.tar.gz) = a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
-SIZE (awesome-2.3.4.tar.gz) = 230800
+MD5 (awesome-3.1.1.tar.gz) = c82a5bfe4cf4012047eecfe1a4000180
+SHA256 (awesome-3.1.1.tar.gz) = e777fca8d0154f1a2555371f20d91eccc9290238c2a52b81a8f1313d4b517c9c
+SIZE (awesome-3.1.1.tar.gz) = 272091
diff --git a/x11-wm/awesome2/files/patch-CMakeLists.txt b/x11-wm/awesome2/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4cf6de177772
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2009-01-08 12:04:44.000000000 +0200
++++ CMakeLists.txt	2009-02-01 00:10:36.000000000 +0200
+@@ -330,7 +330,9 @@
+ install(DIRECTORY ${BUILD_DIR}/themes DESTINATION ${AWESOME_DATA_PATH})
+ install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
+     PATTERN "*.in" EXCLUDE)
+-install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
++if(INSTALL_PORTDOCS)
++    install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
++endif()
+ install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
+ if(GENERATE_LUADOC)
+     install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
diff --git a/x11-wm/awesome2/files/patch-awesomeConfig.cmake b/x11-wm/awesome2/files/patch-awesomeConfig.cmake
new file mode 100644
index 000000000000..7429e1349934
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-awesomeConfig.cmake
@@ -0,0 +1,39 @@
+--- awesomeConfig.cmake.orig	2009-01-08 12:04:44.000000000 +0200
++++ awesomeConfig.cmake	2009-02-01 00:11:33.000000000 +0200
+@@ -14,8 +14,9 @@
+ set(CURSES_NEED_NCURSES true)
+ 
+ option(WITH_DBUS "build with D-BUS" ON)
++option(INSTALL_PORTDOCS "install port docs" ON)
+ option(GENERATE_MANPAGES "generate manpages" ON)
+-option(GENERATE_LUADOC "generate luadoc" ON)
++option(GENERATE_LUADOC "generate luadoc" OFF)
+ 
+ link_directories(/usr/local/lib)
+ 
+@@ -134,14 +135,14 @@
+     cairo
+     pango
+     pangocairo
+-    x11-xcb
++    xcb
+     xcb-randr
+     xcb-xinerama
+     xcb-event>=0.3.0
+     xcb-aux>=0.3.0
+     xcb-atom>=0.3.0
+     xcb-keysyms>=0.3.0
+-    xcb-icccm>=0.3.0
++    xcb-icccm>=0.3.3
+     cairo-xcb
+     xproto>=7.0.11
+     imlib2)
+@@ -248,7 +249,7 @@
+ if(DEFINED AWESOME_MAN_PATH)
+    set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
+ else()
+-   set(AWESOME_MAN_PATH ${PREFIX}/share/man CACHE PATH "awesome manpage directory")
++   set(AWESOME_MAN_PATH ${PREFIX}/man CACHE PATH "awesome manpage directory")
+ endif()
+ 
+ # Hide to avoid confusion
diff --git a/x11-wm/awesome2/files/patch-client.c b/x11-wm/awesome2/files/patch-client.c
new file mode 100644
index 000000000000..8ca7dcd25a5e
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-client.c
@@ -0,0 +1,20 @@
+--- client.c.orig	2009-01-08 12:04:44.000000000 +0200
++++ client.c	2009-01-31 21:03:28.000000000 +0200
+@@ -1455,7 +1455,7 @@
+                                    xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
+                                    &hint, NULL))
+              return 0;
+-        lua_pushstring(L, hint.class);
++        lua_pushstring(L, hint.class_name);
+         xcb_get_wm_class_reply_wipe(&hint);
+         break;
+       case A_TK_INSTANCE:
+@@ -1463,7 +1463,7 @@
+                                    xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
+                                    &hint, NULL))
+             return 0;
+-        lua_pushstring(L, hint.name);
++        lua_pushstring(L, hint.instance_name);
+         xcb_get_wm_class_reply_wipe(&hint);
+         break;
+       case A_TK_ROLE:
diff --git a/x11-wm/awesome2/files/patch-wibox.c b/x11-wm/awesome2/files/patch-wibox.c
new file mode 100644
index 000000000000..80ebd4a39ba1
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-wibox.c
@@ -0,0 +1,28 @@
+--- wibox.c.orig
++++ wibox.c
+@@ -101,14 +101,17 @@ wibox_systray_kickout(int phys_screen)
+ {
+     xcb_screen_t *s = xutil_screen_get(globalconf.connection, phys_screen);
+ 
+-    /* Who! Check that we're not deleting a wibox with a systray, because it
+-     * may be its parent. If so, we reparent to root before, otherwise it will
+-     * hurt very much. */
+-    xcb_reparent_window(globalconf.connection,
+-                        globalconf.screens[phys_screen].systray.window,
+-                        s->root, -512, -512);
+-
+-    globalconf.screens[phys_screen].systray.parent = s->root;
++    if(globalconf.screens[phys_screen].systray.parent != s->root)
++    {
++        /* Who! Check that we're not deleting a wibox with a systray, because it
++         * may be its parent. If so, we reparent to root before, otherwise it will
++         * hurt very much. */
++        xcb_reparent_window(globalconf.connection,
++                            globalconf.screens[phys_screen].systray.window,
++                            s->root, -512, -512);
++
++        globalconf.screens[phys_screen].systray.parent = s->root;
++    }
+ }
+ 
+ static void
diff --git a/x11-wm/awesome2/pkg-plist b/x11-wm/awesome2/pkg-plist
index 2f8c3fe51050..4e80dada8d30 100644
--- a/x11-wm/awesome2/pkg-plist
+++ b/x11-wm/awesome2/pkg-plist
@@ -1,28 +1,114 @@
 @comment $FreeBSD$
 bin/awesome
 bin/awesome-client
-bin/awesome-menu
-bin/awesome-message
+bin/awsetbg
+etc/xdg/awesome/rc.lua
 %%DATADIR%%/icons/awesome16.png
 %%DATADIR%%/icons/awesome32.png
 %%DATADIR%%/icons/awesome48.png
 %%DATADIR%%/icons/awesome64.png
-%%DATADIR%%/icons/layouts/dwindle.png
-%%DATADIR%%/icons/layouts/dwindlew.png
-%%DATADIR%%/icons/layouts/floating.png
-%%DATADIR%%/icons/layouts/floatingw.png
-%%DATADIR%%/icons/layouts/max.png
-%%DATADIR%%/icons/layouts/maxw.png
-%%DATADIR%%/icons/layouts/spiral.png
-%%DATADIR%%/icons/layouts/spiralw.png
-%%DATADIR%%/icons/layouts/tile.png
-%%DATADIR%%/icons/layouts/tilebottom.png
-%%DATADIR%%/icons/layouts/tilebottomw.png
-%%DATADIR%%/icons/layouts/tileleft.png
-%%DATADIR%%/icons/layouts/tileleftw.png
-%%DATADIR%%/icons/layouts/tiletop.png
-%%DATADIR%%/icons/layouts/tiletopw.png
-%%DATADIR%%/icons/layouts/tilew.png
-@dirrm %%DATADIR%%/icons/layouts
+%%DATADIR%%/icons/invaders/enemy_1.png
+%%DATADIR%%/icons/invaders/enemy_2.png
+%%DATADIR%%/icons/invaders/enemy_3.png
+%%DATADIR%%/icons/invaders/player.png
+%%DATADIR%%/lib/awful/client.lua
+%%DATADIR%%/lib/awful/client.lua.in
+%%DATADIR%%/lib/awful/completion.lua
+%%DATADIR%%/lib/awful/completion.lua.in
+%%DATADIR%%/lib/awful/hooks.lua
+%%DATADIR%%/lib/awful/hooks.lua.in
+%%DATADIR%%/lib/awful/init.lua
+%%DATADIR%%/lib/awful/init.lua.in
+%%DATADIR%%/lib/awful/layout.lua
+%%DATADIR%%/lib/awful/layout.lua.in
+%%DATADIR%%/lib/awful/menu.lua
+%%DATADIR%%/lib/awful/menu.lua.in
+%%DATADIR%%/lib/awful/placement.lua
+%%DATADIR%%/lib/awful/placement.lua.in
+%%DATADIR%%/lib/awful/prompt.lua
+%%DATADIR%%/lib/awful/prompt.lua.in
+%%DATADIR%%/lib/awful/screen.lua
+%%DATADIR%%/lib/awful/screen.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/beautiful.lua
+%%DATADIR%%/lib/beautiful.lua.in
+%%DATADIR%%/lib/invaders.lua
+%%DATADIR%%/lib/invaders.lua.in
+%%DATADIR%%/lib/naughty.lua
+%%DATADIR%%/lib/naughty.lua.in
+%%DATADIR%%/lib/revelation.lua
+%%DATADIR%%/lib/revelation.lua.in
+%%DATADIR%%/lib/tabulous.lua
+%%DATADIR%%/lib/tabulous.lua.in
+%%DATADIR%%/themes/default/background.png
+%%DATADIR%%/themes/default/layouts/dwindle.png
+%%DATADIR%%/themes/default/layouts/dwindlew.png
+%%DATADIR%%/themes/default/layouts/fairh.png
+%%DATADIR%%/themes/default/layouts/fairhw.png
+%%DATADIR%%/themes/default/layouts/fairv.png
+%%DATADIR%%/themes/default/layouts/fairvw.png
+%%DATADIR%%/themes/default/layouts/floating.png
+%%DATADIR%%/themes/default/layouts/floatingw.png
+%%DATADIR%%/themes/default/layouts/magnifier.png
+%%DATADIR%%/themes/default/layouts/magnifierw.png
+%%DATADIR%%/themes/default/layouts/max.png
+%%DATADIR%%/themes/default/layouts/maxw.png
+%%DATADIR%%/themes/default/layouts/spiral.png
+%%DATADIR%%/themes/default/layouts/spiralw.png
+%%DATADIR%%/themes/default/layouts/tile.png
+%%DATADIR%%/themes/default/layouts/tilebottom.png
+%%DATADIR%%/themes/default/layouts/tilebottomw.png
+%%DATADIR%%/themes/default/layouts/tileleft.png
+%%DATADIR%%/themes/default/layouts/tileleftw.png
+%%DATADIR%%/themes/default/layouts/tiletop.png
+%%DATADIR%%/themes/default/layouts/tiletopw.png
+%%DATADIR%%/themes/default/layouts/tilew.png
+%%DATADIR%%/themes/default/submenu.png
+%%DATADIR%%/themes/default/taglist/squarefw.png
+%%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/titlebar/close.png
+%%DATADIR%%/themes/default/titlebar/closer.png
+%%DATADIR%%/themes/sky/awesome-icon.png
+%%DATADIR%%/themes/sky/layouts/dwindle.png
+%%DATADIR%%/themes/sky/layouts/fairh.png
+%%DATADIR%%/themes/sky/layouts/fairv.png
+%%DATADIR%%/themes/sky/layouts/floating.png
+%%DATADIR%%/themes/sky/layouts/fullscreen.png
+%%DATADIR%%/themes/sky/layouts/magnifier.png
+%%DATADIR%%/themes/sky/layouts/max.png
+%%DATADIR%%/themes/sky/layouts/spiral.png
+%%DATADIR%%/themes/sky/layouts/tile.png
+%%DATADIR%%/themes/sky/layouts/tilebottom.png
+%%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
+@dirrm %%DATADIR%%/icons/invaders
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/lib/awful
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/themes/default/layouts
+@dirrm %%DATADIR%%/themes/default/taglist
+@dirrm %%DATADIR%%/themes/default/tasklist
+@dirrm %%DATADIR%%/themes/default/titlebar
+@dirrm %%DATADIR%%/themes/default
+@dirrm %%DATADIR%%/themes/sky/layouts
+@dirrm %%DATADIR%%/themes/sky
+@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
+share/xsessions/awesome.desktop
+@dirrmtry share/xsessions
+@dirrmtry etc/xdg/awesome
+@dirrmtry etc/xdg