- Update to 1.3

PR:		ports/116964
Submitted by:	Nikos Ntarmos <ntarmos at ceid.upatras.gr> (maintainer)

10 files changed, 18 insertions, 56 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 5a081c834f3d..73d2c11abd8a 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index b643c80ad1d3..7cd015052c27 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-1.2.tar.gz) = 810de61609a3fabd1ce5ec745e385c57
-SHA256 (awesome-1.2.tar.gz) = 44bce503a3c27a9afc4b4f508a5cb2930ca2ace0317f24f34ab543390402cf9d
-SIZE (awesome-1.2.tar.gz) = 39006
+MD5 (awesome-1.3.tar.gz) = c5625853e5f79ed7cde618b872928527
+SHA256 (awesome-1.3.tar.gz) = 72f8b6d9107e8c4d55eead8b13b71f4459b0d415cd67f2958c80ed32878f9635
+SIZE (awesome-1.3.tar.gz) = 40012
diff --git a/x11-wm/awesome/files/extrapatch-warp b/x11-wm/awesome/files/extrapatch-warp
index 47b1d2dd41cd..ef27961d3af6 100644
--- a/x11-wm/awesome/files/extrapatch-warp
+++ b/x11-wm/awesome/files/extrapatch-warp
@@ -5,11 +5,11 @@
      XEvent ev;
      XWindowChanges wc;
 +	 Window dummy, root;
-+	 int wex, wey, ex, ey, i, dummyscno;
++	 int wex, wey, ex, ey, i;
 +	 unsigned int dmask;
 +
 +	 if(sel) {
-+		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, awesomeconf->statusbar, &dummyscno);
++		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 +		 root = RootWindow(disp, awesomeconf->screen);
 +		 XQueryPointer(disp, sel->win, &dummy, &dummy, &i, &i, &wex, &wey, &dmask);
 +		 XTranslateCoordinates(disp, sel->win, root, wex, wey, &ex, &ey, &dummy);
diff --git a/x11-wm/awesome/files/patch-config.mk b/x11-wm/awesome/files/patch-config.mk
index 0d4a628d9107..26ccec6d6e7e 100644
--- a/x11-wm/awesome/files/patch-config.mk
+++ b/x11-wm/awesome/files/patch-config.mk
@@ -1,7 +1,7 @@
 --- config.mk.orig	2007-09-26 11:41:29.000000000 +0300
 +++ config.mk	2007-09-26 11:42:35.000000000 +0300
 @@ -7,19 +7,19 @@
- LAYOUTS = layouts/tile.c layouts/floating.c
+ LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
  
  # paths
 -PREFIX = /usr/local
@@ -15,8 +15,8 @@
 +X11LIB = ${X11BASE}/lib
  
  # includes and libs
- INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfig`
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfig` -lXext -lXrandr -lXinerama
+ 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}\"
diff --git a/x11-wm/awesome/files/patch-tag.c b/x11-wm/awesome/files/patch-tag.c
deleted file mode 100644
index 2a2280d0b3c3..000000000000
--- a/x11-wm/awesome/files/patch-tag.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tag.c.orig
-+++ tag.c
-@@ -67,13 +67,13 @@ applyrules(Client * c, awesome_config *awesomeconf)
-     XClassHint ch = { 0, 0 };
-     char *prop;
- 
-+    XGetClassHint(c->display, c->win, &ch);
-     len += a_strlen(ch.res_class) + a_strlen(ch.res_name) + a_strlen(c->name);
- 
--    prop = p_new(char, len + 1);
-+    prop = p_new(char, len + 3);
- 
-     /* rule matching */
--    XGetClassHint(c->display, c->win, &ch);
--    snprintf(prop, len + 1, "%s:%s:%s",
-+    snprintf(prop, len + 3, "%s:%s:%s",
-              ch.res_class ? ch.res_class : "", ch.res_name ? ch.res_name : "", c->name);
-     for(i = 0; i < awesomeconf->nrules; i++)
-         if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0))
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 5a081c834f3d..73d2c11abd8a 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
diff --git a/x11-wm/awesome2/distinfo b/x11-wm/awesome2/distinfo
index b643c80ad1d3..7cd015052c27 100644
--- a/x11-wm/awesome2/distinfo
+++ b/x11-wm/awesome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-1.2.tar.gz) = 810de61609a3fabd1ce5ec745e385c57
-SHA256 (awesome-1.2.tar.gz) = 44bce503a3c27a9afc4b4f508a5cb2930ca2ace0317f24f34ab543390402cf9d
-SIZE (awesome-1.2.tar.gz) = 39006
+MD5 (awesome-1.3.tar.gz) = c5625853e5f79ed7cde618b872928527
+SHA256 (awesome-1.3.tar.gz) = 72f8b6d9107e8c4d55eead8b13b71f4459b0d415cd67f2958c80ed32878f9635
+SIZE (awesome-1.3.tar.gz) = 40012
diff --git a/x11-wm/awesome2/files/extrapatch-warp b/x11-wm/awesome2/files/extrapatch-warp
index 47b1d2dd41cd..ef27961d3af6 100644
--- a/x11-wm/awesome2/files/extrapatch-warp
+++ b/x11-wm/awesome2/files/extrapatch-warp
@@ -5,11 +5,11 @@
      XEvent ev;
      XWindowChanges wc;
 +	 Window dummy, root;
-+	 int wex, wey, ex, ey, i, dummyscno;
++	 int wex, wey, ex, ey, i;
 +	 unsigned int dmask;
 +
 +	 if(sel) {
-+		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, awesomeconf->statusbar, &dummyscno);
++		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 +		 root = RootWindow(disp, awesomeconf->screen);
 +		 XQueryPointer(disp, sel->win, &dummy, &dummy, &i, &i, &wex, &wey, &dmask);
 +		 XTranslateCoordinates(disp, sel->win, root, wex, wey, &ex, &ey, &dummy);
diff --git a/x11-wm/awesome2/files/patch-config.mk b/x11-wm/awesome2/files/patch-config.mk
index 0d4a628d9107..26ccec6d6e7e 100644
--- a/x11-wm/awesome2/files/patch-config.mk
+++ b/x11-wm/awesome2/files/patch-config.mk
@@ -1,7 +1,7 @@
 --- config.mk.orig	2007-09-26 11:41:29.000000000 +0300
 +++ config.mk	2007-09-26 11:42:35.000000000 +0300
 @@ -7,19 +7,19 @@
- LAYOUTS = layouts/tile.c layouts/floating.c
+ LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c
  
  # paths
 -PREFIX = /usr/local
@@ -15,8 +15,8 @@
 +X11LIB = ${X11BASE}/lib
  
  # includes and libs
- INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfig`
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfig` -lXext -lXrandr -lXinerama
+ 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}\"
diff --git a/x11-wm/awesome2/files/patch-tag.c b/x11-wm/awesome2/files/patch-tag.c
deleted file mode 100644
index 2a2280d0b3c3..000000000000
--- a/x11-wm/awesome2/files/patch-tag.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tag.c.orig
-+++ tag.c
-@@ -67,13 +67,13 @@ applyrules(Client * c, awesome_config *awesomeconf)
-     XClassHint ch = { 0, 0 };
-     char *prop;
- 
-+    XGetClassHint(c->display, c->win, &ch);
-     len += a_strlen(ch.res_class) + a_strlen(ch.res_name) + a_strlen(c->name);
- 
--    prop = p_new(char, len + 1);
-+    prop = p_new(char, len + 3);
- 
-     /* rule matching */
--    XGetClassHint(c->display, c->win, &ch);
--    snprintf(prop, len + 1, "%s:%s:%s",
-+    snprintf(prop, len + 3, "%s:%s:%s",
-              ch.res_class ? ch.res_class : "", ch.res_name ? ch.res_name : "", c->name);
-     for(i = 0; i < awesomeconf->nrules; i++)
-         if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0))