openbsd-ports/x11/i3/patches/patch-common_mk

$OpenBSD: patch-common_mk,v 1.13 2012/09/21 17:16:14 dcoppa Exp $
--- common.mk.orig	Wed Sep 19 18:08:09 2012
+++ common.mk	Fri Sep 21 15:20:57 2012
@@ -1,5 +1,5 @@
 UNAME=$(shell uname)
-DEBUG=1
+DEBUG=0
 COVERAGE=0
 INSTALL=install
 FLEX=flex
@@ -161,20 +161,13 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
 endif
 
 ifeq ($(UNAME),OpenBSD)
-I3_CFLAGS += -I${X11BASE}/include
+I3_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
 LIBS += -liconv
-I3_LDFLAGS += -L${X11BASE}/lib
+I3_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
 endif
 
 ifeq ($(UNAME),FreeBSD)
 LIBS += -liconv
-endif
-
-ifeq ($(UNAME),Darwin)
-LIBS += -liconv
-else
-# Darwin (Mac OS X) doesn’t have librt
-LIBS += -lrt
 endif
 
 ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								$OpenBSD: patch-common_mk,v 1.13 2012/09/21 17:16:14 dcoppa Exp $
 								--- common.mk.orig	Wed Sep 19 18:08:09 2012
 								+++ common.mk	Fri Sep 21 15:20:57 2012
-												Update to i3-4.2

OK jasper@

											
										
										
											2012-05-09 07:56:49 -04:00
+								@@ -1,5 +1,5 @@
-												Update to i3-3.5.1

resolve_tilde() function by Christopher Zimmermann
(madroach AT zakweb DOT de): thanks!

OK landry@

											
										
										
											2010-09-14 04:54:18 -04:00
+								 UNAME=$(shell uname)
-												Update to i3-3.e-bf3 (i3-3.5.3)

											
										
										
											2011-05-09 07:03:40 -04:00
+								-DEBUG=1
 								+DEBUG=0
-												Update to i3-4.0.2 (plus patches from upstream git).
i3bar is now part of i3 itself and i3-wsbar is gone.

											
										
										
											2011-11-06 15:23:24 -05:00
+								 COVERAGE=0
-												Update to i3-3.5.1

resolve_tilde() function by Christopher Zimmermann
(madroach AT zakweb DOT de): thanks!

OK landry@

											
										
										
											2010-09-14 04:54:18 -04:00
+								 INSTALL=install
-												Update to i3-4.2

OK jasper@

											
										
										
											2012-05-09 07:56:49 -04:00
+								 FLEX=flex
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								@@ -161,20 +161,13 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
-												Update to i3-4.0.2 (plus patches from upstream git).
i3bar is now part of i3 itself and i3-wsbar is gone.

											
										
										
											2011-11-06 15:23:24 -05:00
+								 endif
 								 ifeq ($(UNAME),OpenBSD)
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								-I3_CFLAGS += -I${X11BASE}/include
 								+I3_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
-												Update to i3-4.0.2 (plus patches from upstream git).
i3bar is now part of i3 itself and i3-wsbar is gone.

											
										
										
											2011-11-06 15:23:24 -05:00
+								 LIBS += -liconv
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								-I3_LDFLAGS += -L${X11BASE}/lib
 								+I3_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
-												Update to i3-4.0.2 (plus patches from upstream git).
i3bar is now part of i3 itself and i3-wsbar is gone.

											
										
										
											2011-11-06 15:23:24 -05:00
+								 endif
-												Import (really, this time) i3 3.c, from MAINTAINER Baptiste Daroussin,
with tweaks by me.

i3 is an improved dynamic, tiling window manager.

note: It is still young, so some debug options are still enable by
default, and it's a bit verbose.

ok ajacoutot@

											
										
										
											2009-09-02 15:26:17 -04:00
-												Update to i3-4.0.2 (plus patches from upstream git).
i3bar is now part of i3 itself and i3-wsbar is gone.

											
										
										
											2011-11-06 15:23:24 -05:00
+								 ifeq ($(UNAME),FreeBSD)
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								 LIBS += -liconv
 								-endif
 								-
 								-ifeq ($(UNAME),Darwin)
 								-LIBS += -liconv
-												Bugfixing update to i3-4.1.1

											
										
										
											2011-12-27 04:05:17 -05:00
+								-else
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								-# Darwin (Mac OS X) doesn’t have librt
 								-LIBS += -lrt
-												Import (really, this time) i3 3.c, from MAINTAINER Baptiste Daroussin,
with tweaks by me.

i3 is an improved dynamic, tiling window manager.

note: It is still young, so some debug options are still enable by
default, and it's a bit verbose.

ok ajacoutot@

											
										
										
											2009-09-02 15:26:17 -04:00
+								 endif
-												Update to i3-4.3

OK jasper@

											
										
										
											2012-09-21 13:16:13 -04:00
+								 ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))