4 files changed, 4 insertions, 53 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index f8e50827e8d9..af27156cd8ba 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	awesome
-PORTVERSION=	3.4.3
-PORTREVISION=	2
+PORTVERSION=	3.4.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/ \
 		http://redundancy.redundancy.org/mirror/
@@ -64,9 +63,6 @@ CMAKE_ARGS += -DWITH_DBUS=YES
 CMAKE_ARGS += -DWITH_DBUS=NO
 .endif
 
-post-patch:
-	@${RM} ${WRKSRC}/lib/awful/*.orig
-
 pre-configure:
 	@${REINPLACE_CMD} \
 	-e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index 0a972ece2a54..22bc69da6e26 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,3 +1,3 @@
-MD5 (awesome-3.4.3.tar.bz2) = bd6c56a0b0e1cc4ce53b0c53d8b0c7c2
-SHA256 (awesome-3.4.3.tar.bz2) = 7d760b8a75f69e385ac7a54bcc72b19225a7095a99609f0e22755724bdf0bb96
-SIZE (awesome-3.4.3.tar.bz2) = 271355
+MD5 (awesome-3.4.4.tar.bz2) = 8c2537ad898d7f58a0f3ba92e6a561a1
+SHA256 (awesome-3.4.4.tar.bz2) = 1fe4346d91eb606456293f5bd7239ce66b8c5c2232848600fffaf264f3b699f3
+SIZE (awesome-3.4.4.tar.bz2) = 271404
diff --git a/x11-wm/awesome/files/patch-lib__awful__rules.lua.in b/x11-wm/awesome/files/patch-lib__awful__rules.lua.in
deleted file mode 100644
index e0feba5c9e94..000000000000
--- a/x11-wm/awesome/files/patch-lib__awful__rules.lua.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/awful/rules.lua.in
-+++ lib/awful/rules.lua.in
-@@ -112,7 +112,7 @@ function apply(c)
-         if property == "floating" then
-             aclient.floating.set(c, value)
-         elseif property == "tag" then
--            aclient.movetotag(value, c)
-+            c:tags({ value })
-         elseif property == "switchtotag" and value and props.tag then
-             atag.viewonly(props.tag)
-         elseif property == "height" or property == "width" or
-@@ -127,6 +127,11 @@ function apply(c)
-         end
-     end
- 
-+    -- If untagged, stick the client on the current one.
-+    if #c:tags() == 0 then
-+        atag.withcurrent(c, startup)
-+    end
-+
-     -- Apply all callbacks from matched rules.
-     for i, callback in pairs(callbacks) do
-         callback(c)
-@@ -140,5 +145,6 @@ function apply(c)
- end
- 
- client.add_signal("manage", apply)
-+client.remove_signal("manage", atag.withcurrent)
- 
- -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/x11-wm/awesome/files/patch-lib__awful__tag.lua.in b/x11-wm/awesome/files/patch-lib__awful__tag.lua.in
deleted file mode 100644
index 595bac2474ab..000000000000
--- a/x11-wm/awesome/files/patch-lib__awful__tag.lua.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/awful/tag.lua.in
-+++ lib/awful/tag.lua.in
-@@ -374,10 +374,11 @@ capi.client.add_signal("manage", function(c, startup)
-             c.screen = capi.mouse.screen
-         end
-     end
--    withcurrent(c, startup)
-     c:add_signal("property::screen", withcurrent)
- end)
- 
-+capi.client.add_signal("manage", withcurrent)
-+
- for s = 1, capi.screen.count() do
-     capi.screen[s]:add_signal("tag::history::update", history.update)
- end