8 files changed, 28 insertions, 94 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 65587c70e5d9..7e7d9920fbb2 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	3.1.1
+PORTVERSION=	3.1.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://awesome.naquadah.org/download/
+MASTER_SITES=	http://awesome.naquadah.org/download/ \
+		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	ntarmos@ceid.upatras.gr
 COMMENT=	A tiling window manager initially based on a dwm code rewriting
@@ -32,18 +33,13 @@ 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 \
-		awsetbg.1
-MAN5=		awesomerc.5
-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
+IGNORE=	cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
 .endif
 
 pre-configure:
@@ -51,6 +47,7 @@ pre-configure:
 	-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)
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index a6cbea707f52..fa1b4ec1c2be 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-3.1.1.tar.gz) = c82a5bfe4cf4012047eecfe1a4000180
-SHA256 (awesome-3.1.1.tar.gz) = e777fca8d0154f1a2555371f20d91eccc9290238c2a52b81a8f1313d4b517c9c
-SIZE (awesome-3.1.1.tar.gz) = 272091
+MD5 (awesome-3.1.2.tar.gz) = 175c67f279e8d2da962dea99a0f30b3c
+SHA256 (awesome-3.1.2.tar.gz) = 5a3396ba2962c5ae1f53d09f13dec42e69a36089b1abae922a54609980b06df9
+SIZE (awesome-3.1.2.tar.gz) = 272089
diff --git a/x11-wm/awesome/files/patch-wibox.c b/x11-wm/awesome/files/patch-wibox.c
deleted file mode 100644
index 80ebd4a39ba1..000000000000
--- a/x11-wm/awesome/files/patch-wibox.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/awesome/pkg-descr b/x11-wm/awesome/pkg-descr
index 5a24aaaed4f8..b1ca7a573e0e 100644
--- a/x11-wm/awesome/pkg-descr
+++ b/x11-wm/awesome/pkg-descr
@@ -1,12 +1,10 @@
-awesome is a tiling window manager initially 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, small, dynamic, heavily extensible using
+the Lua programming language, and licensed under the GNU GPLv2 license.
 
-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.
+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.
 
 
 WWW: http://awesome.naquadah.org/
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 65587c70e5d9..7e7d9920fbb2 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	3.1.1
+PORTVERSION=	3.1.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://awesome.naquadah.org/download/
+MASTER_SITES=	http://awesome.naquadah.org/download/ \
+		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	ntarmos@ceid.upatras.gr
 COMMENT=	A tiling window manager initially based on a dwm code rewriting
@@ -32,18 +33,13 @@ 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 \
-		awsetbg.1
-MAN5=		awesomerc.5
-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
+IGNORE=	cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
 .endif
 
 pre-configure:
@@ -51,6 +47,7 @@ pre-configure:
 	-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)
diff --git a/x11-wm/awesome2/distinfo b/x11-wm/awesome2/distinfo
index a6cbea707f52..fa1b4ec1c2be 100644
--- a/x11-wm/awesome2/distinfo
+++ b/x11-wm/awesome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-3.1.1.tar.gz) = c82a5bfe4cf4012047eecfe1a4000180
-SHA256 (awesome-3.1.1.tar.gz) = e777fca8d0154f1a2555371f20d91eccc9290238c2a52b81a8f1313d4b517c9c
-SIZE (awesome-3.1.1.tar.gz) = 272091
+MD5 (awesome-3.1.2.tar.gz) = 175c67f279e8d2da962dea99a0f30b3c
+SHA256 (awesome-3.1.2.tar.gz) = 5a3396ba2962c5ae1f53d09f13dec42e69a36089b1abae922a54609980b06df9
+SIZE (awesome-3.1.2.tar.gz) = 272089
diff --git a/x11-wm/awesome2/files/patch-wibox.c b/x11-wm/awesome2/files/patch-wibox.c
deleted file mode 100644
index 80ebd4a39ba1..000000000000
--- a/x11-wm/awesome2/files/patch-wibox.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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-descr b/x11-wm/awesome2/pkg-descr
index 5a24aaaed4f8..b1ca7a573e0e 100644
--- a/x11-wm/awesome2/pkg-descr
+++ b/x11-wm/awesome2/pkg-descr
@@ -1,12 +1,10 @@
-awesome is a tiling window manager initially 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, small, dynamic, heavily extensible using
+the Lua programming language, and licensed under the GNU GPLv2 license.
 
-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.
+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.
 
 
 WWW: http://awesome.naquadah.org/