cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix config file; fix WANTLIB

Browse Source
This commit is contained in:
dcoppa 2012-04-26 10:55:10 +00:00
parent 19da65adfd
commit 77526c84bf
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/i3/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2012/03/23 08:43:54 dcoppa Exp $
# $OpenBSD: Makefile,v 1.29 2012/04/26 10:55:10 dcoppa Exp $
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.1.2
REVISION = 1
REVISION = 2
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@ -17,24 +17,31 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += X11 Xcursor c ev m xcb xcb-atom xcb-aux
WANTLIB += xcb-event xcb-icccm xcb-keysyms
WANTLIB += xcb-property xcb-randr xcb-xinerama yajl
WANTLIB += pcre startup-notification-1
WANTLIB = X11 X11-xcb Xau Xcursor Xdmcp Xfixes \
Xrender c ev m pcre pthread-stubs \
startup-notification-1 xcb xcb-atom \
xcb-aux xcb-event xcb-icccm \
xcb-keysyms xcb-property xcb-randr \
xcb-xinerama yajl
MODULES = converters/libiconv
LIB_DEPENDS = devel/libev \
devel/libyajl>=2.0.0 \
devel/pcre \
devel/startup-notification
BUILD_DEPENDS = devel/bison \
devel/flex
RUN_DEPENDS = x11/dmenu
USE_GMAKE = Yes
NO_REGRESS = Yes
MAKE_FLAGS = CC="${CC}"
.if defined(DEBUG)
MAKE_FLAGS += DEBUG=1
.endif

8
x11/i3/patches/patch-common_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-common_mk,v 1.8 2012/02/21 14:05:39 dcoppa Exp $
--- common.mk.orig Sat Dec 24 16:25:15 2011
+++ common.mk Tue Dec 27 09:50:07 2011
$OpenBSD: patch-common_mk,v 1.9 2012/04/26 10:55:10 dcoppa Exp $
--- common.mk.orig Fri Jan 27 20:24:15 2012
+++ common.mk Thu Apr 26 12:28:18 2012
@@ -1,90 +1,28 @@
UNAME=$(shell uname)
-DEBUG=1
@ -92,7 +92,7 @@ $OpenBSD: patch-common_mk,v 1.8 2012/02/21 14:05:39 dcoppa Exp $
-LIBS += $(call ldflags_for_lib, libev,ev)
-LIBS += $(call ldflags_for_lib, libpcre,pcre)
-LIBS += $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
+LIBS += -L$(TOPDIR)/libi3 -li3 -lX11 -lXcursor -lev -lm -lxcb -lxcb-atom -lxcb-aux -lxcb-event -lxcb-icccm -lxcb-keysyms -lxcb-property -lxcb-randr -lxcb-xinerama -lyajl -lpcre -lstartup-notification-1
+LIBS += -L$(TOPDIR)/libi3 -lX11 -lX11-xcb -lXau -lXcursor -lXdmcp -lXfixes -lXrender -lev -li3 -lm -lpcre -lpthread-stubs -lstartup-notification-1 -lxcb -lxcb-atom -lxcb-aux -lxcb-event -lxcb-icccm -lxcb-keysyms -lxcb-property -lxcb-randr -lxcb-xinerama -lyajl
# Please test if -Wl,--as-needed works on your platform and send me a patch.
# it is known not to work on Darwin (Mac OS X)

19
x11/i3/patches/patch-i3_config
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-i3_config,v 1.7 2011/12/27 09:05:17 dcoppa Exp $
--- i3.config.orig Sat Dec 24 16:25:08 2011
+++ i3.config Tue Dec 27 09:26:06 2011
@@ -9,6 +9,8 @@
# layout, use the i3-config-wizard
#
+set $mod Mod1
+
# font for window titles. ISO 10646 = Unicode
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@@ -16,13 +18,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
$OpenBSD: patch-i3_config,v 1.8 2012/04/26 10:55:10 dcoppa Exp $
--- i3.config.orig Fri Jan 27 20:24:09 2012
+++ i3.config Thu Apr 26 12:13:23 2012
@@ -16,13 +16,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
floating_modifier Mod1
# start a terminal
@ -26,7 +17,7 @@ $OpenBSD: patch-i3_config,v 1.7 2011/12/27 09:05:17 dcoppa Exp $
# change focus
bindsym Mod1+j focus left
@@ -145,19 +147,8 @@ mode "resize" {
@@ -145,19 +145,8 @@ mode "resize" {
bindsym Mod1+r mode "resize"