6 files changed, 60 insertions, 57 deletions
diff --git a/wm/awesome/DESCR b/wm/awesome/DESCR
index 67b82c18147..fb5202c9c30 100644
--- a/wm/awesome/DESCR
+++ b/wm/awesome/DESCR
@@ -1,2 +1,14 @@
-awesome is a tiling window manager initialy based on a dwm code rewriting.
-It's extremely fast, small, dynamic and awesome.
+awesome is a tiling window manager initialy based on a dwm code
+rewriting.  It's extremely fast, small, dynamic and awesome.
+
+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.
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index 6f7f7772203..d863af3341d 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/11/14 20:52:50 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/23 22:11:27 wiz Exp $
 #
 
-DISTNAME=		awesome-1.3
-PKGREVISION=		3
+DISTNAME=		awesome-2.2
 CATEGORIES=		wm
 MASTER_SITES=		http://awesome.naquadah.org/download/
 
@@ -10,18 +9,25 @@ MAINTAINER=		adam.hoka@gmail.com
 HOMEPAGE=		http://awesome.naquadah.org/
 COMMENT=		Tiling window manager based on dwm
 
+BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
+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
 USE_TOOLS+=		pkg-config
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/awesomerc ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/awesomerc ${DESTDIR}${EGDIR}
 
+.include "../../devel/confuse/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
-.include "../../devel/libconfig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST
index efbc19b7cb5..7cb00b93937 100644
--- a/wm/awesome/PLIST
+++ b/wm/awesome/PLIST
@@ -1,5 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/03 17:27:55 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/23 22:11:27 wiz Exp $
 bin/awesome
+bin/awesome-client
+bin/awesome-message
+man/man1/awesome-client.1
+man/man1/awesome-message.1
 man/man1/awesome.1
+man/man5/awesomerc.5
+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/doc/awesome/README
+share/doc/awesome/STYLE
+share/doc/awesome/UPGRADE
+share/doc/awesome/awesomerc
 share/examples/awesome/awesomerc
 @dirrm share/examples/awesome
+@dirrm share/doc/awesome
+@dirrm share/awesome/icons/layouts
+@dirrm share/awesome/icons
+@dirrm share/awesome
diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo
index 4d1fde525bd..34b9b280752 100644
--- a/wm/awesome/distinfo
+++ b/wm/awesome/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/11/16 23:04:54 rillig Exp $
+$NetBSD: distinfo,v 1.4 2008/04/23 22:11:27 wiz Exp $
 
-SHA1 (awesome-1.3.tar.gz) = c8656fda08652cec20217fb369e4a6c7cce0528d
-RMD160 (awesome-1.3.tar.gz) = b640b33a138d57009cdf755e32ea974f52f6d308
-Size (awesome-1.3.tar.gz) = 40012 bytes
-SHA1 (patch-aa) = dfe079ae2bf616e556f6a1dfb5f725160f676782
-SHA1 (patch-ab) = d4ecdb1329343fbad082848a402426856610c979
+SHA1 (awesome-2.2.tar.gz) = d96f4a7b51bc7b4a9765de329d95d4904c831532
+RMD160 (awesome-2.2.tar.gz) = c873c6bc8b983538d2427f4cd83838797df6bfe8
+Size (awesome-2.2.tar.gz) = 208012 bytes
diff --git a/wm/awesome/patches/patch-aa b/wm/awesome/patches/patch-aa
deleted file mode 100644
index 599cd27280f..00000000000
--- a/wm/awesome/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/11/14 20:52:50 rillig Exp $
-
---- config.mk.orig	2007-11-13 16:45:43.000000000 +0100
-+++ config.mk
-@@ -7,19 +7,18 @@ VERSION = 1.3
- LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
- 
--X11INC = /usr/include/X11
--X11LIB = /usr/lib/X11
-+X11INC = $(X11BASE)/include/X11
-+X11LIB = $(X11BASE)/lib/X11
- 
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfig xft`
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfig xft` -lXext -lXrandr -lXinerama
- 
- # flags
--CFLAGS = -fgnu89-inline -std=gnu99 -ggdb3 -pipe -Wall -Wextra -W -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wuninitialized -Winit-self -Wpointer-arith -Wredundant-decls -Wno-format-zero-length -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn -O3 ${INCS} -DVERSION=\"${VERSION}\"
--LDFLAGS = -ggdb3 ${LIBS}
-+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
-+LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc
diff --git a/wm/awesome/patches/patch-ab b/wm/awesome/patches/patch-ab
deleted file mode 100644
index c66893b1ed5..00000000000
--- a/wm/awesome/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/11/16 23:04:54 rillig Exp $
-
---- tag.h.orig	2007-10-05 17:07:18.000000000 +0200
-+++ tag.h	2007-11-17 00:02:23.000000000 +0100
-@@ -22,6 +22,7 @@
- #ifndef AWESOME_TAG_H
- #define AWESOME_TAG_H
- 
-+#include <sys/types.h>
- #include <regex.h>
- #include "client.h"
-