From 9037fd218267e7ccf5d57e1424eacf905ca458ae Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 2 May 2012 07:39:08 +0000
Subject: [PATCH] no need to set status_command by default to /usr/bin/true
 anymore, we have i3status now.

ok dcoppa@ (MAINTAINER)
---
 x11/i3/Makefile                         |  7 ++++---
 x11/i3/patches/patch-i3_config          |  9 ++++-----
 x11/i3/patches/patch-i3_config_keycodes | 11 +++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/x11/i3/Makefile b/x11/i3/Makefile
index 40381fcb01e..d4255e2244c 100644
--- a/x11/i3/Makefile
+++ b/x11/i3/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2012/04/26 10:55:10 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.30 2012/05/02 07:39:08 jasper Exp $
 
 COMMENT =	improved dynamic tiling window manager
 
 DISTNAME =	i3-4.1.2
-REVISION =	2
+REVISION =	3
 CATEGORIES =	x11
 
 EXTRACT_SUFX =	.tar.bz2
@@ -34,7 +34,8 @@ LIB_DEPENDS =	devel/libev \
 BUILD_DEPENDS =	devel/bison \
 		devel/flex
 
-RUN_DEPENDS =	x11/dmenu
+RUN_DEPENDS =	x11/dmenu \
+		x11/i3status
 
 USE_GMAKE =	Yes
 
diff --git a/x11/i3/patches/patch-i3_config b/x11/i3/patches/patch-i3_config
index e6f9158299f..4ceed0b9a3f 100644
--- a/x11/i3/patches/patch-i3_config
+++ b/x11/i3/patches/patch-i3_config
@@ -1,6 +1,6 @@
-$OpenBSD: patch-i3_config,v 1.8 2012/04/26 10:55:10 dcoppa Exp $
+$OpenBSD: patch-i3_config,v 1.9 2012/05/02 07:39:08 jasper Exp $
 --- i3.config.orig	Fri Jan 27 20:24:09 2012
-+++ i3.config	Thu Apr 26 12:13:23 2012
++++ i3.config	Mon Apr 30 16:38:57 2012
 @@ -16,13 +16,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
  floating_modifier Mod1
  
@@ -17,17 +17,16 @@ $OpenBSD: patch-i3_config,v 1.8 2012/04/26 10:55:10 dcoppa Exp $
  
  # change focus
  bindsym Mod1+j focus left
-@@ -145,19 +145,8 @@ mode "resize" {
+@@ -145,19 +145,7 @@ mode "resize" {
  
  bindsym Mod1+r mode "resize"
  
 -# Start i3bar to display a workspace bar (plus the system information i3status
 -# finds out, if available)
 +# Start i3bar to display a workspace bar
-+# XXX: i3status has not been ported to OpenBSD yet
  bar {
 -        status_command i3status
-+        status_command /usr/bin/true
++        status_command ${LOCALBASE}/bin/i3status
  }
 -
 -#######################################################################
diff --git a/x11/i3/patches/patch-i3_config_keycodes b/x11/i3/patches/patch-i3_config_keycodes
index cddb256b0a5..e53059afc34 100644
--- a/x11/i3/patches/patch-i3_config_keycodes
+++ b/x11/i3/patches/patch-i3_config_keycodes
@@ -1,6 +1,6 @@
-$OpenBSD: patch-i3_config_keycodes,v 1.4 2011/12/27 09:05:17 dcoppa Exp $
---- i3.config.keycodes.orig	Sat Dec 24 16:25:08 2011
-+++ i3.config.keycodes	Tue Dec 27 09:30:43 2011
+$OpenBSD: patch-i3_config_keycodes,v 1.5 2012/05/02 07:39:08 jasper Exp $
+--- i3.config.keycodes.orig	Fri Jan 27 20:24:09 2012
++++ i3.config.keycodes	Wed May  2 09:31:03 2012
 @@ -17,13 +17,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
  floating_modifier $mod
  
@@ -17,15 +17,14 @@ $OpenBSD: patch-i3_config_keycodes,v 1.4 2011/12/27 09:05:17 dcoppa Exp $
  
  # change focus
  bindcode $mod+44 focus left
-@@ -146,8 +146,8 @@ mode "resize" {
+@@ -146,8 +146,7 @@ mode "resize" {
  
  bindcode $mod+27 mode "resize"
  
 -# Start i3bar to display a workspace bar (plus the system information i3status
 -# finds out, if available)
 +# Start i3bar to display a workspace bar
-+# XXX: i3status has not been ported to OpenBSD yet
  bar {
 -        status_command i3status
-+        status_command /usr/bin/true
++	status_command ${LOCALBASE}/bin/i3status
  }