7 files changed, 150 insertions, 211 deletions

diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 7e859e90ed76..f315beaded92 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -1,67 +1,73 @@
-# New ports collection makefile for:   awesome
-# Date created:                September 26, 2007
-# Whom:                        Nikos Ntarmos <ntarmos@ceid.upatras.gr>
+# New ports collection makefile for:   awesome2
+# Date created:                February 26, 2009
+# Whom:                        Nikos Ntarmos <ntarmos@cs.uoi.gr>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	awesome
-PORTVERSION=	3.2
+PORTNAME=	awesome2
+PORTVERSION=	2.3.5
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://awesome.naquadah.org/download/ \
-		http://redundancy.redundancy.org/mirror/
+MASTER_SITES=	http://awesome.naquadah.org/download/
+DISTNAME=	awesome-${PORTVERSION}
 
-MAINTAINER=	ntarmos@cs.uoi.gr
+MAINTAINER=	ntarmos@ceid.upatras.gr
 COMMENT=	A tiling window manager initially based on a dwm code rewriting
 
 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 \
-		xproto>=7.0.11:${PORTSDIR}/x11/xproto
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
-		ev.3:${PORTSDIR}/devel/libev \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		xcb.2:${PORTSDIR}/x11/libxcb \
-		xcb-event.1:${PORTSDIR}/x11/xcb-util
+		xmlto:${PORTSDIR}/textproc/xmlto
+LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
+		cairo.2:${PORTSDIR}/graphics/cairo \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 USE_ICONV=	yes
-USE_CMAKE=	yes
-CMAKE_USE_PTHREAD=yes
-CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
+GNU_CONFIGURE=	yes
 USE_EFL=	imlib2
-USE_GNOME=	glib20 pango
-USE_LUA=	5.1+
-USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
+USE_GNOME=	pango
+USE_XORG=	x11 xft xext xinerama xt xrandr xproto
 
-MAN1=	awesome.1 \
-	awesome-client.1 \
-	awsetbg.1
-MAN5=	awesomerc.5
-MANCOMPRESSED=	yes
-PORTDOCS=	AUTHORS BUGS LICENSE README
+MAN1=		awesome2.1 \
+		awesome2-client.1 \
+		awesome2-menu.1 \
+		awesome2-message.1
+MAN5=		awesome2rc.5
+PORTDOCS=	AUTHORS LICENSE README STYLE UPGRADE
+PORTEXAMPLES=	awesomerc
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \
+			  -e 's,\([[:space:]]\)install-docDATA ,\1,g' \
+			  -e 's,awesome_,awesome2_,g' \
+			  -e 's,awesomerc\.5,awesome2rc\.5,g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e  "s,PACKAGE='awesome',PACKAGE='awesome2',g" \
+		${WRKSRC}/configure
+.	for man in ${MAN1} ${MAN5}
+		@${MV} ${WRKSRC}/${man:S%awesome2%awesome%}.txt ${WRKSRC}/${man}.txt
+		@${REINPLACE_CMD} -e 's,awesome,awesome2,g' \
+				  -e 's,\~/\.awesome2,~/.awesome,g' \
+			${WRKSRC}/${man}.txt
+.	endfor
 
-.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
+post-configure:
+	@${REINPLACE_CMD} -E '/^awesome2_(message_)?LDADD/s/$$/ -liconv/g; \
+			      /^doc_DATA/s/=.*$$/=/g' \
+		${WRKSRC}/Makefile
 
-pre-configure:
-	@${REINPLACE_CMD} \
-	-e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \
-		${WRKSRC}/awesomeConfig.cmake
-	@${REINPLACE_CMD} \
-	-e 's,tr ,env LC_ALL="C" tr ,g' \
-	-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
+post-install:
+.	if !defined(NOPORTDOCS)
+		@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
+		@${MKDIR} ${DOCSDIR}
+.		for doc in ${PORTDOCS}
+			${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.		endfor
+.	endif
+.	if !defined(NOPORTEXAMPLES)
+		@${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
+		@${MKDIR} ${EXAMPLESDIR}
+.		for example in ${PORTEXAMPLES}
+			${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR}
+.		endfor
+.	endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/awesome2/distinfo b/x11-wm/awesome2/distinfo
index 3899e5d6d933..7f4ad0e6618a 100644
--- a/x11-wm/awesome2/distinfo
+++ b/x11-wm/awesome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-3.2.tar.gz) = 1f5c4b2b5c1594eb7f362bb73f266b31
-SHA256 (awesome-3.2.tar.gz) = 34df6c9ab1ed09d1a37ff25e1f16b17231d92c495d0eb9fe681fe4a9ae93837f
-SIZE (awesome-3.2.tar.gz) = 275745
+MD5 (awesome-2.3.5.tar.gz) = 9a246b4e19690df76eac3a34551f4c64
+SHA256 (awesome-2.3.5.tar.gz) = 50e107ae67a4eb0bbdb3e9975a6bd43e3435db4d8c2493031479930bfcc329cb
+SIZE (awesome-2.3.5.tar.gz) = 230884
diff --git a/x11-wm/awesome2/files/patch-CMakeLists.txt b/x11-wm/awesome2/files/patch-CMakeLists.txt
deleted file mode 100644
index 4cf6de177772..000000000000
--- a/x11-wm/awesome2/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-Makefile.in b/x11-wm/awesome2/files/patch-Makefile.in
new file mode 100644
index 000000000000..5df8c52c8bd4
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-Makefile.in
@@ -0,0 +1,58 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -33,12 +33,12 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = awesome$(EXEEXT) awesome-client$(EXEEXT) \
+-	awesome-message$(EXEEXT) awesome-menu$(EXEEXT)
+-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome.1 \
+-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-client.1 \
+-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-message.1 \
+-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-menu.1 \
++bin_PROGRAMS = awesome2$(EXEEXT) awesome2-client$(EXEEXT) \
++	awesome2-message$(EXEEXT) awesome2-menu$(EXEEXT)
++@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome2.1 \
++@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-client.1 \
++@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-message.1 \
++@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-menu.1 \
+ @HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesomerc.5
+ @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = optsdocgen.txt \
+ @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@	rcskeletongen.txt \
+@@ -278,8 +278,8 @@
+ #       restart the whole dist process from the start and there is none.
+ EXTRA_DIST = UPGRADE LICENSE UPGRADE STYLE awesomerc.in \
+ 	build-utils/uicbgen.sh build-utils/layoutgen.sh \
+-	build-utils/widgetgen.sh awesome.1.txt awesome-client.1.txt \
+-	awesome-message.1.txt awesome-menu.1.txt awesomerc.5.txt \
++	build-utils/widgetgen.sh awesome2.1.txt awesome2-client.1.txt \
++	awesome2-message.1.txt awesome2-menu.1.txt awesomerc.5.txt \
+ 	build-utils/extractuicbdoc.py build-utils/extractoptsdoc.py \
+ 	build-utils/extractrcskeleton.py build-utils/package-version \
+ 	awesome.doxygen.in
+@@ -496,17 +496,17 @@
+ 	widgets/$(DEPDIR)/$(am__dirstamp)
+ widgets/common.$(OBJEXT): widgets/$(am__dirstamp) \
+ 	widgets/$(DEPDIR)/$(am__dirstamp)
+-awesome$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) 
+-	@rm -f awesome$(EXEEXT)
++awesome2$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) 
++	@rm -f awesome2$(EXEEXT)
+ 	$(LINK) $(awesome_OBJECTS) $(awesome_LDADD) $(LIBS)
+-awesome-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) 
+-	@rm -f awesome-client$(EXEEXT)
++awesome2-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) 
++	@rm -f awesome2-client$(EXEEXT)
+ 	$(LINK) $(awesome_client_OBJECTS) $(awesome_client_LDADD) $(LIBS)
+-awesome-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) 
+-	@rm -f awesome-menu$(EXEEXT)
++awesome2-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) 
++	@rm -f awesome2-menu$(EXEEXT)
+ 	$(LINK) $(awesome_menu_OBJECTS) $(awesome_menu_LDADD) $(LIBS)
+-awesome-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) 
+-	@rm -f awesome-message$(EXEEXT)
++awesome2-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) 
++	@rm -f awesome2-message$(EXEEXT)
+ 	$(LINK) $(awesome_message_OBJECTS) $(awesome_message_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
diff --git a/x11-wm/awesome2/files/patch-awesomeConfig.cmake b/x11-wm/awesome2/files/patch-awesomeConfig.cmake
deleted file mode 100644
index acac59fd644c..000000000000
--- a/x11-wm/awesome2/files/patch-awesomeConfig.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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)
- 
-@@ -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/pkg-descr b/x11-wm/awesome2/pkg-descr
index b1ca7a573e0e..e19f4d096072 100644
--- a/x11-wm/awesome2/pkg-descr
+++ b/x11-wm/awesome2/pkg-descr
@@ -1,10 +1,16 @@
-awesome is a highly configurable, next generation framework window
-manager for X. It is very fast, small, dynamic, heavily extensible using
-the Lua programming language, and licensed under the GNU GPLv2 license.
+awesome is a tiling window manager initially based on a dwm code
+rewriting. It's extremely fast, small, dynamic and awesome.
 
-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.
+Windows can be managed in several layouts: tiled and 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 waste on
+your screen. No gaps, no overlap.
+
+This port contains the older and somewhat static 2.x branch of the
+awesome window manager. If you prefer the latest stable version, try the
+x11-wm/awesome port.
 
 
 WWW: http://awesome.naquadah.org/
diff --git a/x11-wm/awesome2/pkg-plist b/x11-wm/awesome2/pkg-plist
index c28c08e42fd3..64b5a20517dc 100644
--- a/x11-wm/awesome2/pkg-plist
+++ b/x11-wm/awesome2/pkg-plist
@@ -1,124 +1,28 @@
 @comment $FreeBSD$
-bin/awesome
-bin/awesome-client
-bin/awsetbg
-etc/xdg/awesome/rc.lua
+bin/awesome2
+bin/awesome2-client
+bin/awesome2-menu
+bin/awesome2-message
 %%DATADIR%%/icons/awesome16.png
 %%DATADIR%%/icons/awesome32.png
 %%DATADIR%%/icons/awesome48.png
 %%DATADIR%%/icons/awesome64.png
-%%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/init.lua
-%%DATADIR%%/lib/awful/layout/init.lua.in
-%%DATADIR%%/lib/awful/layout/suit/fair.lua
-%%DATADIR%%/lib/awful/layout/suit/fair.lua.in
-%%DATADIR%%/lib/awful/layout/suit/floating.lua
-%%DATADIR%%/lib/awful/layout/suit/floating.lua.in
-%%DATADIR%%/lib/awful/layout/suit/init.lua
-%%DATADIR%%/lib/awful/layout/suit/init.lua.in
-%%DATADIR%%/lib/awful/layout/suit/magnifier.lua
-%%DATADIR%%/lib/awful/layout/suit/magnifier.lua.in
-%%DATADIR%%/lib/awful/layout/suit/max.lua
-%%DATADIR%%/lib/awful/layout/suit/max.lua.in
-%%DATADIR%%/lib/awful/layout/suit/tile.lua
-%%DATADIR%%/lib/awful/layout/suit/tile.lua.in
-%%DATADIR%%/lib/awful/menu.lua
-%%DATADIR%%/lib/awful/menu.lua.in
-%%DATADIR%%/lib/awful/mouse.lua
-%%DATADIR%%/lib/awful/mouse.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/tabulous.lua
-%%DATADIR%%/lib/tabulous.lua.in
-%%DATADIR%%/lib/telak.lua
-%%DATADIR%%/lib/telak.lua.in
-%%DATADIR%%/themes/default/background.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/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/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/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
-share/xsessions/awesome.desktop
-@dirrm %%DATADIR%%/icons/invaders
+%%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
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/lib/awful/layout/suit
-@dirrm %%DATADIR%%/lib/awful/layout
-@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%%
-@dirrmtry etc/xdg/awesome
-@dirrmtry etc/xdg
-@dirrmtry share/xsessions