Hi i3 users,
Here's the update to i3-4.13.
Please test and report (comments, OKs, whatever...)
Ciao!
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 Makefile
--- Makefile 29 Aug 2016 09:13:37 -0000 1.105
+++ Makefile 10 Nov 2016 21:06:13 -0000
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.12
-REVISION = 0
+DISTNAME = i3-4.13
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -16,9 +15,13 @@ PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pcre startup-notification-1 xcb xcb-cursor
-WANTLIB += xcb-icccm xcb-keysyms xcb-randr xcb-render xcb-util
-WANTLIB += xcb-xinerama xcb-xkb xkbcommon xkbcommon-x11 yajl
+WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1 xcb
+WANTLIB += xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-util
+WANTLIB += xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
+WANTLIB += yajl
+
+BUILD_DEPENDS = textproc/asciidoc \
+ textproc/xmlto
LIB_DEPENDS = devel/libev \
devel/libyajl>=2.0.0 \
@@ -32,40 +35,27 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/i3status \
x11/p5-AnyEvent-I3
+FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
+
+SEPARATE_BUILD = Yes
+
USE_GMAKE = Yes
-NO_TEST = Yes
+CONFIGURE_STYLE = gnu
-MAKE_FLAGS = CC="${CC}" \
- SYSCONFDIR=${SYSCONFDIR} \
- V=1
-
-.if defined(DEBUG)
-MAKE_FLAGS += DEBUG=1
-.endif
-
-FAKE_FLAGS = PREFIX=${PREFIX} \
- EXEC_PREFIX=${PREFIX} \
- SYSCONFDIR=${PREFIX}/share/examples \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ARGS = --enable-builddir=${WRKBUILD}
-post-configure:
- ${SUBST_CMD} ${WRKSRC}/i3-dmenu-desktop \
+CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib \
+ -L${LOCALBASE}/lib"
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/etc/config \
+ ${WRKSRC}/etc/config.keycodes \
+ ${WRKSRC}/i3-dmenu-desktop \
${WRKSRC}/i3-nagbar/main.c \
- ${WRKSRC}/i3.config \
- ${WRKSRC}/i3.config.keycodes \
${WRKSRC}/libi3/get_config_path.c \
${WRKSRC}/libi3/get_exe_path.c
-
-post-install:
- ${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
- ${SUBST_MAN} ${WRKBUILD}/man/i3-config-wizard.1 \
- ${PREFIX}/man/man1/i3-config-wizard.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3-dmenu-desktop.1 \
- ${PREFIX}/man/man1/i3-dmenu-desktop.1
- ${SUBST_MAN} ${WRKBUILD}/man/i3.1 ${PREFIX}/man/man1/i3.1
- @rm ${PREFIX}/man/man1/i3-sensible*.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo 9 Mar 2016 09:25:51 -0000 1.25
+++ distinfo 10 Nov 2016 21:06:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (i3-4.12.tar.bz2) = 4Z4c4IwlScuoPgg8x2jUhyAsQXYNXCg/Z3UueR8deLQ=
-SIZE (i3-4.12.tar.bz2) = 988084
+SHA256 (i3-4.13.tar.bz2) = lMExg+UnqYQTKjsFDIv2KWJlAqbhM+B7QTZBrsX4z4o=
+SIZE (i3-4.13.tar.bz2) = 1121298
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 10 Nov 2016 21:06:13 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- Makefile.in.orig Tue Nov 8 19:54:08 2016
++++ Makefile.in Thu Nov 10 19:44:19 2016
+@@ -744,10 +744,7 @@ i3include_HEADERS = \
+ dist_bin_SCRIPTS = \
+ i3-dmenu-desktop \
+ i3-migrate-config-to-v4 \
+- i3-save-tree \
+- i3-sensible-editor \
+- i3-sensible-pager \
+- i3-sensible-terminal
++ i3-save-tree
+
+ i3confdir = $(sysconfdir)/i3
+ dist_i3conf_DATA = \
+@@ -882,9 +879,6 @@ docs_poddir = ${docdir}
+ @BUILD_MANS_TRUE@ man/i3-nagbar.1 \
+ @BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
+ @BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-editor.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-pager.1 \
+-@BUILD_MANS_TRUE@ man/i3-sensible-terminal.1 \
+ @BUILD_MANS_TRUE@ man/i3-dump-log.1
+
+ @BUILD_MANS_TRUE@pod_MANS = \
+@@ -3121,7 +3115,7 @@ distclean-tags:
+
+ # Leading 'am--fnord' is there to ensure the list of targets does not
+ # expand to empty, as could happen e.g. with make check TESTS=''.
+-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
++am--fnord $(TEST_LOGS): $(am__force_recheck)
+ am--force-recheck:
+ @:
+
Index: patches/patch-common_mk
===================================================================
RCS file: patches/patch-common_mk
diff -N patches/patch-common_mk
--- patches/patch-common_mk 9 Mar 2016 09:25:51 -0000 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-common_mk,v 1.24 2016/03/09 09:25:51 dcoppa Exp $
---- common.mk.orig Sun Mar 6 16:17:18 2016
-+++ common.mk Mon Mar 7 15:15:37 2016
-@@ -171,9 +171,9 @@ 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)
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 10 Nov 2016 21:06:13 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Thu Nov 10 21:43:14 2016
++++ configure Thu Nov 10 21:43:53 2016
+@@ -3351,7 +3351,7 @@ if test "x$_cv_gnu_make_command" = x""; then :
+ fi
+
+ case $srcdir in #(
+- .|.*) :
++ /*|.|.*) :
+
+ # pwd -P is specified in IEEE 1003.1 from 2004
+ as_dir=`cd "$srcdir" && pwd -P`
Index: patches/patch-etc_config
===================================================================
RCS file: patches/patch-etc_config
diff -N patches/patch-etc_config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-etc_config 10 Nov 2016 21:06:13 -0000
@@ -0,0 +1,19 @@
+$OpenBSD: patch-i3_config,v 1.16 2015/03/30 12:33:46 dcoppa Exp $
+--- etc/config.orig Sun Mar 29 19:07:08 2015
++++ etc/config Mon Mar 30 14:13:25 2015
+@@ -35,13 +35,13 @@ set $right semicolon
+ floating_modifier Mod1
+
+ # start a terminal
+-bindsym Mod1+Return exec i3-sensible-terminal
++bindsym Mod1+Return exec ${X11BASE}/bin/xterm
+
+ # kill focused window
+ bindsym Mod1+Shift+q kill
+
+ # start dmenu (a program launcher)
+-bindsym Mod1+d exec dmenu_run
++bindsym Mod1+d exec ${LOCALBASE}/bin/dmenu_run
+ # There also is the (new) i3-dmenu-desktop which only displays applications
+ # shipping a .desktop file. It is a wrapper around dmenu, so you need that
+ # installed.
Index: patches/patch-etc_config_keycodes
===================================================================
RCS file: patches/patch-etc_config_keycodes
diff -N patches/patch-etc_config_keycodes
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-etc_config_keycodes 10 Nov 2016 21:06:13 -0000
@@ -0,0 +1,68 @@
+$OpenBSD: patch-i3_config_keycodes,v 1.12 2015/03/30 12:33:46 dcoppa Exp $
+
+Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
+different between Linux and OpenBSD.
+
+--- etc/config.keycodes.orig Sun Mar 29 19:07:08 2015
++++ etc/config.keycodes Mon Mar 30 14:13:25 2015
+@@ -29,13 +29,13 @@ font pango:monospace 8
+ floating_modifier $mod
+
+ # start a terminal
+-bindcode $mod+36 exec i3-sensible-terminal
++bindcode $mod+36 exec ${X11BASE}/bin/xterm
+
+ # kill focused window
+ bindcode $mod+Shift+24 kill
+
+ # start dmenu (a program launcher)
+-bindcode $mod+40 exec dmenu_run
++bindcode $mod+40 exec ${LOCALBASE}/bin/dmenu_run
+ # There also is the (new) i3-dmenu-desktop which only displays applications
+ # shipping a .desktop file. It is a wrapper around dmenu, so you need that
+ # installed.
+@@ -48,10 +48,10 @@ bindcode $mod+46 focus up
+ bindcode $mod+47 focus right
+
+ # alternatively, you can use the cursor keys:
+-bindcode $mod+113 focus left
+-bindcode $mod+116 focus down
+-bindcode $mod+111 focus up
+-bindcode $mod+114 focus right
++bindcode $mod+100 focus left
++bindcode $mod+104 focus down
++bindcode $mod+98 focus up
++bindcode $mod+102 focus right
+
+ # move focused window
+ bindcode $mod+Shift+44 move left
+@@ -60,10 +60,10 @@ bindcode $mod+Shift+46 move up
+ bindcode $mod+Shift+47 move right
+
+ # alternatively, you can use the cursor keys:
+-bindcode $mod+Shift+113 move left
+-bindcode $mod+Shift+116 move down
+-bindcode $mod+Shift+111 move up
+-bindcode $mod+Shift+114 move right
++bindcode $mod+Shift+100 move left
++bindcode $mod+Shift+104 move down
++bindcode $mod+Shift+98 move up
++bindcode $mod+Shift+102 move right
+
+ # split in horizontal orientation
+ bindcode $mod+43 split h
+@@ -136,10 +136,10 @@ mode "resize" {
+ bindcode 47 resize grow width 10 px or 10 ppt
+
+ # same bindings, but for the arrow keys
+- bindcode 113 resize shrink width 10 px or 10 ppt
+- bindcode 116 resize grow height 10 px or 10 ppt
+- bindcode 111 resize shrink height 10 px or 10 ppt
+- bindcode 114 resize grow width 10 px or 10 ppt
++ bindcode 100 resize shrink width 10 px or 10 ppt
++ bindcode 104 resize grow height 10 px or 10 ppt
++ bindcode 98 resize shrink height 10 px or 10 ppt
++ bindcode 102 resize grow width 10 px or 10 ppt
+
+ # back to normal: Enter or Escape
+ bindcode 36 mode "default"
Index: patches/patch-i3-config-wizard_i3-config-wizard_mk
===================================================================
RCS file: patches/patch-i3-config-wizard_i3-config-wizard_mk
diff -N patches/patch-i3-config-wizard_i3-config-wizard_mk
--- patches/patch-i3-config-wizard_i3-config-wizard_mk 4 Oct 2015 08:48:12
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-i3-config-wizard_i3-config-wizard_mk,v 1.3 2015/10/04 08:48:12
dcoppa Exp $
---- i3-config-wizard/i3-config-wizard.mk.orig Fri Sep 21 11:40:58 2012
-+++ i3-config-wizard/i3-config-wizard.mk Fri Sep 21 11:42:00 2012
-@@ -21,7 +21,7 @@ i3-config-wizard/i3-config-wizard: libi3.a $(i3_config
- install-i3-config-wizard: i3-config-wizard/i3-config-wizard
- echo "[i3-config-wizard] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3-config-wizard/i3-config-wizard
$(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3-config-wizard/i3-config-wizard
$(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3-config-wizard:
- echo "[i3-config-wizard] Clean"
Index: patches/patch-i3-dmenu-desktop
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-i3-dmenu-desktop
--- patches/patch-i3-dmenu-desktop 17 Mar 2015 15:39:47 -0000 1.5
+++ patches/patch-i3-dmenu-desktop 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-i3-dmenu-desktop,v 1.5 2015/03/17 15:39:47 dcoppa Exp $
---- i3-dmenu-desktop.orig Sun Jun 15 19:12:43 2014
-+++ i3-dmenu-desktop Fri Jul 11 16:49:32 2014
-@@ -107,7 +107,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
+--- i3-dmenu-desktop.orig Tue Nov 8 19:54:01 2016
++++ i3-dmenu-desktop Thu Nov 10 18:04:35 2016
+@@ -111,7 +111,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
! -d $xdg_data_home;
my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
@@ -10,7 +10,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.5 2
!defined($xdg_data_dirs) ||
$xdg_data_dirs eq '';
-@@ -209,12 +209,12 @@ for my $file (values %desktops) {
+@@ -213,12 +213,12 @@ for my $file (values %desktops) {
# 'evince.desktop' => {
# 'Exec' => 'evince %U',
# 'Name' => 'Dokumentenbetrachter',
@@ -25,7 +25,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.5 2
# }
# };
-@@ -420,7 +420,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
+@@ -424,7 +424,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
# we need to create a temporary script that contains the full command line
# as the syntax for starting commands with arguments varies from terminal
# emulator to terminal emulator.
@@ -34,7 +34,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.5 2
my ($fh, $filename) = tempfile();
binmode($fh, ':utf8');
say $fh <<EOT;
-@@ -431,7 +431,7 @@ EOT
+@@ -435,7 +435,7 @@ EOT
close($fh);
chmod 0755, $filename;
@@ -43,7 +43,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.5 2
} else {
# i3 executes applications by passing the argument to i3???s ???exec???
command
# as-is to $SHELL -c. The i3 parser supports quoted strings: When a string
-@@ -472,7 +472,7 @@ notifications.
+@@ -476,7 +476,7 @@ notifications.
The .desktop files are searched in $XDG_DATA_HOME/applications (by default
$HOME/.local/share/applications) and in the "applications" subdirectory of
each
@@ -52,7 +52,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.5 2
Files with the same name in $XDG_DATA_HOME/applications take precedence over
files in $XDG_DATA_DIRS, so that you can overwrite parts of the system-wide
-@@ -486,7 +486,7 @@ file respectively) by appending it to the name of the
+@@ -490,7 +490,7 @@ file respectively) by appending it to the name of the
want to launch "GNU Emacs 24" with the patch /tmp/foobar.txt, you would type
"emacs", press TAB, type " /tmp/foobar.txt" and press ENTER.
Index: patches/patch-i3-dump-log_i3-dump-log_mk
===================================================================
RCS file: patches/patch-i3-dump-log_i3-dump-log_mk
diff -N patches/patch-i3-dump-log_i3-dump-log_mk
--- patches/patch-i3-dump-log_i3-dump-log_mk 4 Oct 2015 08:48:12 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-i3-dump-log_i3-dump-log_mk,v 1.2 2015/10/04 08:48:12 dcoppa
Exp $
---- i3-dump-log/i3-dump-log.mk.orig Thu May 23 11:38:40 2013
-+++ i3-dump-log/i3-dump-log.mk Thu May 23 11:40:29 2013
-@@ -21,7 +21,7 @@ i3-dump-log/i3-dump-log: libi3.a $(i3_dump_log_OBJECTS
- install-i3-dump-log: i3-dump-log/i3-dump-log
- echo "[i3-dump-log] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3-dump-log/i3-dump-log $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3-dump-log/i3-dump-log $(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3-dump-log:
- echo "[i3-dump-log] Clean"
Index: patches/patch-i3-dump-log_main_c
===================================================================
RCS file: patches/patch-i3-dump-log_main_c
diff -N patches/patch-i3-dump-log_main_c
--- patches/patch-i3-dump-log_main_c 9 Mar 2016 09:25:51 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-$OpenBSD: patch-i3-dump-log_main_c,v 1.4 2016/03/09 09:25:51 dcoppa Exp $
-
-OpenBSD lacks pthread_condattr_setpshared()
-
---- i3-dump-log/main.c.orig Sun Mar 6 16:17:18 2016
-+++ i3-dump-log/main.c Mon Mar 7 15:15:37 2016
-@@ -28,8 +28,12 @@
- #include "shmlog.h"
- #include <i3/ipc.h>
-
-+#if !defined(__OpenBSD__)
- static uint32_t offset_next_write,
- wrap_count;
-+#else
-+static uint32_t wrap_count;
-+#endif
-
- static i3_shmlog_header *header;
- static char *logbuffer,
-@@ -57,17 +61,27 @@ static void print_till_end(void) {
-
- int main(int argc, char *argv[]) {
- int o, option_index = 0;
-+#if !defined(__OpenBSD__)
- bool verbose = false,
- follow = false;
-+#else
-+ bool verbose = false;
-+#endif
-
- static struct option long_options[] = {
- {"version", no_argument, 0, 'v'},
- {"verbose", no_argument, 0, 'V'},
-+#if !defined(__OpenBSD__)
- {"follow", no_argument, 0, 'f'},
-+#endif
- {"help", no_argument, 0, 'h'},
- {0, 0, 0, 0}};
-
-+#if !defined(__OpenBSD__)
- char *options_string = "s:vfVh";
-+#else
-+ char *options_string = "vVh";
-+#endif
-
- while ((o = getopt_long(argc, argv, options_string, long_options,
&option_index)) != -1) {
- if (o == 'v') {
-@@ -75,11 +89,17 @@ int main(int argc, char *argv[]) {
- return 0;
- } else if (o == 'V') {
- verbose = true;
-+#if !defined(__OpenBSD__)
- } else if (o == 'f') {
- follow = true;
-+#endif
- } else if (o == 'h') {
- printf("i3-dump-log " I3_VERSION "\n");
-- printf("i3-dump-log [-f] [-s <socket>]\n");
-+#if !defined(__OpenBSD__)
-+ printf("i3-dump-log [-fhVv]\n");
-+#else
-+ printf("i3-dump-log [-hVv]\n");
-+#endif
- return 0;
- }
- }
-@@ -162,6 +182,7 @@ int main(int argc, char *argv[]) {
- walk = logbuffer + sizeof(i3_shmlog_header);
- print_till_end();
-
-+#if !defined(__OpenBSD__)
- if (follow) {
- /* Since pthread_cond_wait() expects a mutex, we need to provide one.
- * To not lock i3 (that???s bad, mhkay?) we just define one outside of
-@@ -177,6 +198,7 @@ int main(int argc, char *argv[]) {
- }
- }
- }
-+#endif
-
- return 0;
- }
Index: patches/patch-i3-input_i3-input_mk
===================================================================
RCS file: patches/patch-i3-input_i3-input_mk
diff -N patches/patch-i3-input_i3-input_mk
--- patches/patch-i3-input_i3-input_mk 4 Oct 2015 08:48:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-i3-input_i3-input_mk,v 1.2 2015/10/04 08:48:12 dcoppa Exp $
---- i3-input/i3-input.mk.orig Fri Sep 21 11:42:35 2012
-+++ i3-input/i3-input.mk Fri Sep 21 11:43:10 2012
-@@ -21,7 +21,7 @@ i3-input/i3-input: libi3.a $(i3_input_OBJECTS)
- install-i3-input: i3-input/i3-input
- echo "[i3-input] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3-input/i3-input $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3-input/i3-input $(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3-input:
- echo "[i3-input] Clean"
Index: patches/patch-i3-msg_i3-msg_mk
===================================================================
RCS file: patches/patch-i3-msg_i3-msg_mk
diff -N patches/patch-i3-msg_i3-msg_mk
--- patches/patch-i3-msg_i3-msg_mk 4 Oct 2015 08:48:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-i3-msg_i3-msg_mk,v 1.2 2015/10/04 08:48:12 dcoppa Exp $
---- i3-msg/i3-msg.mk.orig Wed Sep 19 18:08:09 2012
-+++ i3-msg/i3-msg.mk Fri Sep 21 15:22:52 2012
-@@ -12,7 +12,7 @@ i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o)
-
- i3-msg/%.o: i3-msg/%.c $(i3_msg_HEADERS)
- echo "[i3-msg] CC $<"
-- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_msg_CFLAGS)
$(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(I3_CFLAGS)
$(i3_msg_CFLAGS) $(CFLAGS) -c -o $@ $<
-
- i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS)
- echo "[i3-msg] Link i3-msg"
-@@ -21,7 +21,7 @@ i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS)
- install-i3-msg: i3-msg/i3-msg
- echo "[i3-msg] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3-msg/i3-msg $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3-msg/i3-msg $(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3-msg:
- echo "[i3-msg] Clean"
Index: patches/patch-i3-nagbar_i3-nagbar_mk
===================================================================
RCS file: patches/patch-i3-nagbar_i3-nagbar_mk
diff -N patches/patch-i3-nagbar_i3-nagbar_mk
--- patches/patch-i3-nagbar_i3-nagbar_mk 4 Oct 2015 08:48:12 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-i3-nagbar_i3-nagbar_mk,v 1.2 2015/10/04 08:48:12 dcoppa Exp $
---- i3-nagbar/i3-nagbar.mk.orig Fri Sep 21 11:45:36 2012
-+++ i3-nagbar/i3-nagbar.mk Fri Sep 21 11:45:51 2012
-@@ -21,7 +21,7 @@ i3-nagbar/i3-nagbar: libi3.a $(i3_nagbar_OBJECTS)
- install-i3-nagbar: i3-nagbar/i3-nagbar
- echo "[i3-nagbar] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3-nagbar/i3-nagbar $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3-nagbar/i3-nagbar $(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3-nagbar:
- echo "[i3-nagbar] Clean"
Index: patches/patch-i3-nagbar_main_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 9 Mar 2016 09:25:51 -0000 1.10
+++ patches/patch-i3-nagbar_main_c 10 Nov 2016 21:06:13 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-i3-nagbar_main_c,v 1.10 2016/03/09 09:25:51 dcoppa Exp $
---- i3-nagbar/main.c.orig Sun Mar 6 16:17:18 2016
-+++ i3-nagbar/main.c Mon Mar 7 15:15:37 2016
-@@ -175,7 +175,7 @@ static void handle_button_release(xcb_connection_t *co
+--- i3-nagbar/main.c.orig Tue Nov 8 19:54:01 2016
++++ i3-nagbar/main.c Thu Nov 10 18:04:35 2016
+@@ -176,7 +176,7 @@ static void handle_button_release(xcb_connection_t *co
}
char *terminal_cmd;
Index: patches/patch-i3_config
===================================================================
RCS file: patches/patch-i3_config
diff -N patches/patch-i3_config
--- patches/patch-i3_config 30 Mar 2015 12:33:46 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-i3_config,v 1.16 2015/03/30 12:33:46 dcoppa Exp $
---- i3.config.orig Sun Mar 29 19:07:08 2015
-+++ i3.config Mon Mar 30 14:13:25 2015
-@@ -35,13 +35,13 @@ set $right semicolon
- floating_modifier Mod1
-
- # start a terminal
--bindsym Mod1+Return exec i3-sensible-terminal
-+bindsym Mod1+Return exec ${X11BASE}/bin/xterm
-
- # kill focused window
- bindsym Mod1+Shift+q kill
-
- # start dmenu (a program launcher)
--bindsym Mod1+d exec dmenu_run
-+bindsym Mod1+d exec ${LOCALBASE}/bin/dmenu_run
- # There also is the (new) i3-dmenu-desktop which only displays applications
- # shipping a .desktop file. It is a wrapper around dmenu, so you need that
- # installed.
Index: patches/patch-i3_config_keycodes
===================================================================
RCS file: patches/patch-i3_config_keycodes
diff -N patches/patch-i3_config_keycodes
--- patches/patch-i3_config_keycodes 30 Mar 2015 12:33:46 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-$OpenBSD: patch-i3_config_keycodes,v 1.12 2015/03/30 12:33:46 dcoppa Exp $
-
-Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
-different between Linux and OpenBSD.
-
---- i3.config.keycodes.orig Sun Mar 29 19:07:08 2015
-+++ i3.config.keycodes Mon Mar 30 14:13:25 2015
-@@ -29,13 +29,13 @@ font pango:monospace 8
- floating_modifier $mod
-
- # start a terminal
--bindcode $mod+36 exec i3-sensible-terminal
-+bindcode $mod+36 exec ${X11BASE}/bin/xterm
-
- # kill focused window
- bindcode $mod+Shift+24 kill
-
- # start dmenu (a program launcher)
--bindcode $mod+40 exec dmenu_run
-+bindcode $mod+40 exec ${LOCALBASE}/bin/dmenu_run
- # There also is the (new) i3-dmenu-desktop which only displays applications
- # shipping a .desktop file. It is a wrapper around dmenu, so you need that
- # installed.
-@@ -48,10 +48,10 @@ bindcode $mod+46 focus up
- bindcode $mod+47 focus right
-
- # alternatively, you can use the cursor keys:
--bindcode $mod+113 focus left
--bindcode $mod+116 focus down
--bindcode $mod+111 focus up
--bindcode $mod+114 focus right
-+bindcode $mod+100 focus left
-+bindcode $mod+104 focus down
-+bindcode $mod+98 focus up
-+bindcode $mod+102 focus right
-
- # move focused window
- bindcode $mod+Shift+44 move left
-@@ -60,10 +60,10 @@ bindcode $mod+Shift+46 move up
- bindcode $mod+Shift+47 move right
-
- # alternatively, you can use the cursor keys:
--bindcode $mod+Shift+113 move left
--bindcode $mod+Shift+116 move down
--bindcode $mod+Shift+111 move up
--bindcode $mod+Shift+114 move right
-+bindcode $mod+Shift+100 move left
-+bindcode $mod+Shift+104 move down
-+bindcode $mod+Shift+98 move up
-+bindcode $mod+Shift+102 move right
-
- # split in horizontal orientation
- bindcode $mod+43 split h
-@@ -136,10 +136,10 @@ mode "resize" {
- bindcode 47 resize grow width 10 px or 10 ppt
-
- # same bindings, but for the arrow keys
-- bindcode 113 resize shrink width 10 px or 10 ppt
-- bindcode 116 resize grow height 10 px or 10 ppt
-- bindcode 111 resize shrink height 10 px or 10 ppt
-- bindcode 114 resize grow width 10 px or 10 ppt
-+ bindcode 100 resize shrink width 10 px or 10 ppt
-+ bindcode 104 resize grow height 10 px or 10 ppt
-+ bindcode 98 resize shrink height 10 px or 10 ppt
-+ bindcode 102 resize grow width 10 px or 10 ppt
-
- # back to normal: Enter or Escape
- bindcode 36 mode "default"
Index: patches/patch-i3bar_i3bar_mk
===================================================================
RCS file: patches/patch-i3bar_i3bar_mk
diff -N patches/patch-i3bar_i3bar_mk
--- patches/patch-i3bar_i3bar_mk 4 Oct 2015 08:48:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-i3bar_i3bar_mk,v 1.2 2015/10/04 08:48:12 dcoppa Exp $
---- i3bar/i3bar.mk.orig Fri Sep 21 11:43:45 2012
-+++ i3bar/i3bar.mk Fri Sep 21 11:44:13 2012
-@@ -21,7 +21,7 @@ i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
- install-i3bar: i3bar/i3bar
- echo "[i3bar] Install"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin
-- $(INSTALL) -m 0755 i3bar/i3bar $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ ${INSTALL_PROGRAM} i3bar/i3bar $(DESTDIR)$(EXEC_PREFIX)/bin/
-
- clean-i3bar:
- echo "[i3bar] Clean"
Index: patches/patch-include_shmlog_h
===================================================================
RCS file: patches/patch-include_shmlog_h
diff -N patches/patch-include_shmlog_h
--- patches/patch-include_shmlog_h 11 Jul 2014 15:49:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-include_shmlog_h,v 1.3 2014/07/11 15:49:58 dcoppa Exp $
-
-OpenBSD lacks pthread_condattr_setpshared()
-
---- include/shmlog.h.orig Sun Jun 15 19:12:43 2014
-+++ include/shmlog.h Thu Jul 3 21:06:32 2014
-@@ -11,7 +11,9 @@
- #pragma once
-
- #include <stdint.h>
-+#if !defined(__OpenBSD__)
- #include <pthread.h>
-+#endif
-
- /* Default shmlog size if not set by user. */
- extern const int default_shmlog_size;
-@@ -37,8 +39,10 @@ typedef struct i3_shmlog_header {
- * and don???t matter ??? clients use an equality check (==). */
- uint32_t wrap_count;
-
-+#if !defined(__OpenBSD__)
- /* pthread condvar which will be broadcasted whenever there is a new
- * message in the log. i3-dump-log uses this to implement -f (follow, like
- * tail -f) in an efficient way. */
- pthread_cond_t condvar;
-+#endif
- } i3_shmlog_header;
Index: patches/patch-libi3_get_config_path_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-libi3_get_config_path_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-libi3_get_config_path_c
--- patches/patch-libi3_get_config_path_c 4 Oct 2015 08:48:12 -0000
1.1
+++ patches/patch-libi3_get_config_path_c 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libi3_get_config_path_c,v 1.1 2015/10/04 08:48:12 dcoppa Exp $
---- libi3/get_config_path.c.orig Sun Oct 4 10:09:31 2015
-+++ libi3/get_config_path.c Sun Oct 4 10:09:58 2015
-@@ -70,7 +70,7 @@ char *get_config_path(const char *override_configpath,
+--- libi3/get_config_path.c.orig Tue Nov 8 19:54:01 2016
++++ libi3/get_config_path.c Thu Nov 10 18:04:35 2016
+@@ -71,7 +71,7 @@ char *get_config_path(const char *override_configpath,
/* 4: check for $XDG_CONFIG_DIRS/i3/config */
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL)
Index: patches/patch-libi3_get_exe_path_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-libi3_get_exe_path_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-libi3_get_exe_path_c
--- patches/patch-libi3_get_exe_path_c 11 Jul 2014 15:49:58 -0000 1.2
+++ patches/patch-libi3_get_exe_path_c 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libi3_get_exe_path_c,v 1.2 2014/07/11 15:49:58 dcoppa Exp $
---- libi3/get_exe_path.c.orig Sun Jun 15 19:12:43 2014
-+++ libi3/get_exe_path.c Thu Jul 3 21:06:32 2014
-@@ -96,5 +96,5 @@ char *get_exe_path(const char *argv0) {
+--- libi3/get_exe_path.c.orig Tue Nov 8 19:54:01 2016
++++ libi3/get_exe_path.c Thu Nov 10 18:04:35 2016
+@@ -103,5 +103,5 @@ char *get_exe_path(const char *argv0) {
free(tmp);
/* Last resort: maybe it???s in /usr/bin? */
Index: patches/patch-libi3_libi3_mk
===================================================================
RCS file: patches/patch-libi3_libi3_mk
diff -N patches/patch-libi3_libi3_mk
--- patches/patch-libi3_libi3_mk 16 May 2013 18:42:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libi3_libi3_mk,v 1.2 2013/05/16 18:42:30 dcoppa Exp $
---- libi3/libi3.mk.orig Thu Dec 27 15:01:05 2012
-+++ libi3/libi3.mk Thu Dec 27 15:01:40 2012
-@@ -10,7 +10,7 @@ libi3_OBJECTS := $(libi3_SOURCES:.c=.o)
-
- libi3/%.o: libi3/%.c $(libi3_HEADERS)
- echo "[libi3] CC $<"
-- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(libi3_CFLAGS)
$(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(I3_CFLAGS)
$(libi3_CFLAGS) $(CFLAGS) -c -o $@ $<
-
- libi3.a: $(libi3_OBJECTS)
- echo "[libi3] AR libi3.a"
Index: patches/patch-man_i3-dmenu-desktop_1
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-man_i3-dmenu-desktop_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-man_i3-dmenu-desktop_1
--- patches/patch-man_i3-dmenu-desktop_1 11 Jan 2014 16:04:43 -0000
1.2
+++ patches/patch-man_i3-dmenu-desktop_1 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-man_i3-dmenu-desktop_1,v 1.2 2014/01/11 16:04:43 dcoppa Exp $
---- man/i3-dmenu-desktop.1.orig Sun Dec 22 21:12:52 2013
-+++ man/i3-dmenu-desktop.1 Fri Jan 10 16:31:33 2014
-@@ -98,7 +98,7 @@ notifications.
+--- man/i3-dmenu-desktop.1.orig Tue Nov 8 19:54:12 2016
++++ man/i3-dmenu-desktop.1 Thu Nov 10 18:04:35 2016
+@@ -94,7 +94,7 @@ notifications.
.PP
The .desktop files are searched in \f(CW$XDG_DATA_HOME\fR/applications (by
default
\&\f(CW$HOME\fR/.local/share/applications) and in the \*(L"applications\*(R"
subdirectory of each
@@ -10,7 +10,7 @@ $OpenBSD: patch-man_i3-dmenu-desktop_1,v
.PP
Files with the same name in \f(CW$XDG_DATA_HOME\fR/applications take
precedence over
files in \f(CW$XDG_DATA_DIRS\fR, so that you can overwrite parts of the
system-wide
-@@ -112,7 +112,7 @@ file respectively) by appending it to the name of the
+@@ -108,7 +108,7 @@ file respectively) by appending it to the name of the
want to launch \*(L"\s-1GNU\s0 Emacs 24\*(R" with the patch /tmp/foobar.txt,
you would type
\&\*(L"emacs\*(R", press \s-1TAB,\s0 type \*(L" /tmp/foobar.txt\*(R" and
press \s-1ENTER.\s0
.PP
Index: patches/patch-man_i3-migrate-config-to-v4_1
===================================================================
RCS file: patches/patch-man_i3-migrate-config-to-v4_1
diff -N patches/patch-man_i3-migrate-config-to-v4_1
--- patches/patch-man_i3-migrate-config-to-v4_1 9 Mar 2016 09:25:51 -0000
1.21
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-man_i3-migrate-config-to-v4_1,v 1.21 2016/03/09 09:25:51
dcoppa Exp $
-
-The escape sequence \" introduces a comment.
-Consequently, the rest of the input line is ignored.
-That means the information that this is a section 1 manual page and
-the date of the last change is lost.
-
---- man/i3-migrate-config-to-v4.1.orig Wed Sep 30 08:55:23 2015
-+++ man/i3-migrate-config-to-v4.1 Fri Oct 2 16:59:55 2015
-@@ -7,7 +7,7 @@
- .\" Source: i3 4.12
- .\" Language: English
- .\"
--.TH "I3\-MIGRATE\-CONFIG\" "1" "03/06/2016" "i3 4\&.12" "i3 Manual"
-+.TH "I3\-MIGRATE\-CONFIG" "1" "03/06/2016" "i3 4\&.12" "i3 Manual"
- .\" -----------------------------------------------------------------
- .\" * Define some portability stuff
- .\" -----------------------------------------------------------------
Index: patches/patch-src_bindings_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_bindings_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_bindings_c
--- patches/patch-src_bindings_c 9 Mar 2016 09:25:51 -0000 1.5
+++ patches/patch-src_bindings_c 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_bindings_c,v 1.5 2016/03/09 09:25:51 dcoppa Exp $
---- src/bindings.c.orig Sun Mar 6 16:17:18 2016
-+++ src/bindings.c Mon Mar 7 15:15:37 2016
-@@ -663,7 +663,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
+--- src/bindings.c.orig Tue Nov 8 19:54:01 2016
++++ src/bindings.c Thu Nov 10 18:04:35 2016
+@@ -797,7 +797,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
if (result->parse_error) {
char *pageraction;
Index: patches/patch-src_config_parser_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_config_parser_c,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_config_parser_c
--- patches/patch-src_config_parser_c 9 Mar 2016 09:25:51 -0000 1.9
+++ patches/patch-src_config_parser_c 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_config_parser_c,v 1.9 2016/03/09 09:25:51 dcoppa Exp $
---- src/config_parser.c.orig Mon Mar 7 15:15:54 2016
-+++ src/config_parser.c Mon Mar 7 15:16:45 2016
-@@ -788,8 +788,8 @@ static char *migrate_config(char *input, off_t size) {
+--- src/config_parser.c.orig Tue Nov 8 19:54:01 2016
++++ src/config_parser.c Thu Nov 10 18:04:35 2016
+@@ -789,8 +789,8 @@ static char *migrate_config(char *input, off_t size) {
*/
void start_config_error_nagbar(const char *configpath, bool has_errors) {
char *editaction, *pageraction;
Index: patches/patch-src_i3_mk
===================================================================
RCS file: patches/patch-src_i3_mk
diff -N patches/patch-src_i3_mk
--- patches/patch-src_i3_mk 9 Mar 2016 09:25:51 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-src_i3_mk,v 1.11 2016/03/09 09:25:51 dcoppa Exp $
-
-OpenBSD lacks pthread_condattr_setpshared(), so no need to link
-with libpthread here.
-
---- src/i3.mk.orig Wed Sep 30 08:55:10 2015
-+++ src/i3.mk Sun Oct 4 10:06:37 2015
-@@ -6,7 +6,11 @@ i3_SOURCES := $(filter-out $(i3_SOURCES_GENE
- i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h)
- i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard
include/*.h))
- i3_CFLAGS = $(XKB_COMMON_CFLAGS) $(XKB_COMMON_X11_CFLAGS)
$(XCB_CFLAGS) $(XCB_KBD_CFLAGS) $(XCB_WM_CFLAGS) $(XCB_CURSOR_CFLAGS)
$(PANGO_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS)
-+ifneq ($(UNAME),OpenBSD)
- i3_LIBS = $(XKB_COMMON_LIBS) $(XKB_COMMON_X11_LIBS) $(XCB_LIBS)
$(XCB_XKB_LIBS) $(XCB_KBD_LIBS) $(XCB_WM_LIBS) $(XCB_CURSOR_LIBS) $(PANGO_LIBS)
$(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) -lm -lpthread
-+else
-+i3_LIBS = $(XKB_COMMON_LIBS) $(XKB_COMMON_X11_LIBS) $(XCB_LIBS)
$(XCB_XKB_LIBS) $(XCB_KBD_LIBS) $(XCB_WM_LIBS) $(XCB_CURSOR_LIBS) $(PANGO_LIBS)
$(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) -lm
-+endif
-
- # When using clang, we use pre-compiled headers to speed up the build. With
- # gcc, this actually makes the build slower.
-@@ -79,20 +83,17 @@ install-i3: i3
- $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/include/i3
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications
-- $(INSTALL) -m 0755 i3 $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ $(INSTALL_PROGRAM) i3 $(DESTDIR)$(EXEC_PREFIX)/bin/
- $(LN) -sf i3 $(DESTDIR)$(EXEC_PREFIX)/bin/i3-with-shmlog
-- $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(EXEC_PREFIX)/bin/
-- $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(EXEC_PREFIX)/bin/
-- $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(EXEC_PREFIX)/bin/
-- $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(EXEC_PREFIX)/bin/
-- $(INSTALL) -m 0755 i3-save-tree $(DESTDIR)$(EXEC_PREFIX)/bin/
-- $(INSTALL) -m 0755 i3-dmenu-desktop $(DESTDIR)$(EXEC_PREFIX)/bin/
-- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644
i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
-- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m
0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
-- $(INSTALL) -m 0644 i3.xsession.desktop
$(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
-- $(INSTALL) -m 0644 i3-with-shmlog.xsession.desktop
$(DESTDIR)$(PREFIX)/share/xsessions/i3-with-shmlog.desktop
-- $(INSTALL) -m 0644 i3.applications.desktop
$(DESTDIR)$(PREFIX)/share/applications/i3.desktop
-- $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(EXEC_PREFIX)/include/i3/
-+ $(INSTALL_SCRIPT) i3-migrate-config-to-v4 $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ $(INSTALL_SCRIPT) i3-save-tree $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ $(INSTALL_SCRIPT) i3-dmenu-desktop $(DESTDIR)$(EXEC_PREFIX)/bin/
-+ $(INSTALL_DATA) i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
-+ $(INSTALL_DATA) i3.config.keycodes
$(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
-+ $(INSTALL_DATA) i3.xsession.desktop
$(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
-+ $(INSTALL_DATA) i3-with-shmlog.xsession.desktop
$(DESTDIR)$(PREFIX)/share/xsessions/i3-with-shmlog.desktop
-+ $(INSTALL_DATA) i3.applications.desktop
$(DESTDIR)$(PREFIX)/share/applications/i3.desktop
-+ $(INSTALL_DATA) include/i3/ipc.h $(DESTDIR)$(EXEC_PREFIX)/include/i3/
-
- clean-i3:
- echo "[i3] Clean"
Index: patches/patch-src_ipc_c
===================================================================
RCS file: patches/patch-src_ipc_c
diff -N patches/patch-src_ipc_c
--- patches/patch-src_ipc_c 9 Mar 2016 09:25:51 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_ipc_c,v 1.16 2016/03/09 09:25:51 dcoppa Exp $
-
-Add missing header
-
---- src/ipc.c.orig Sun Jun 15 19:12:43 2014
-+++ src/ipc.c Fri Jul 11 16:39:36 2014
-@@ -12,6 +12,7 @@
- #include "all.h"
- #include "yajl_utils.h"
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <fcntl.h>
Index: patches/patch-src_log_c
===================================================================
RCS file: patches/patch-src_log_c
diff -N patches/patch-src_log_c
--- patches/patch-src_log_c 9 Mar 2016 09:25:51 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_log_c,v 1.12 2016/03/09 09:25:51 dcoppa Exp $
-
-OpenBSD lacks pthread_condattr_setpshared()
-
---- src/log.c.orig Sun Mar 6 16:17:18 2016
-+++ src/log.c Mon Mar 7 15:15:37 2016
-@@ -20,7 +20,9 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#if !defined(__OpenBSD__)
- #include <pthread.h>
-+#endif
-
- #include "util.h"
- #include "log.h"
-@@ -157,11 +159,13 @@ void open_logbuffer(void) {
-
- header = (i3_shmlog_header *)logbuffer;
-
-+#if !defined(__OpenBSD__)
- pthread_condattr_t cond_attr;
- pthread_condattr_init(&cond_attr);
- if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0)
- fprintf(stderr, "pthread_condattr_setpshared() failed, i3-dump-log -f
will not work!\n");
- pthread_cond_init(&(header->condvar), &cond_attr);
-+#endif
-
- logwalk = logbuffer + sizeof(i3_shmlog_header);
- loglastwrap = logbuffer + logbuffer_size;
-@@ -277,8 +281,10 @@ static void vlog(const bool print, const char *fmt, va
-
- store_log_markers();
-
-+#if !defined(__OpenBSD__)
- /* Wake up all (i3-dump-log) processes waiting for condvar. */
- pthread_cond_broadcast(&(header->condvar));
-+#endif
-
- if (print)
- fwrite(message, len, 1, stdout);
Index: patches/patch-src_manage_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_manage_c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-src_manage_c
--- patches/patch-src_manage_c 9 Mar 2016 09:25:51 -0000 1.18
+++ patches/patch-src_manage_c 10 Nov 2016 21:06:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_manage_c,v 1.18 2016/03/09 09:25:51 dcoppa Exp $
---- src/manage.c.orig Sun Mar 6 16:17:18 2016
-+++ src/manage.c Tue Mar 8 13:31:05 2016
-@@ -468,10 +468,16 @@ void manage_window(xcb_window_t window, xcb_get_window
+--- src/manage.c.orig Tue Nov 8 19:54:01 2016
++++ src/manage.c Thu Nov 10 18:04:35 2016
+@@ -480,10 +480,16 @@ void manage_window(xcb_window_t window, xcb_get_window
if (cwindow->dock)
want_floating = false;
Index: patches/patch-src_startup_c
===================================================================
RCS file: patches/patch-src_startup_c
diff -N patches/patch-src_startup_c
--- patches/patch-src_startup_c 9 Mar 2016 09:25:51 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_startup_c,v 1.7 2016/03/09 09:25:51 dcoppa Exp $
-
-On OpenBSD, time_t is long long.
-
---- src/startup.c.orig Sun Jun 15 19:12:43 2014
-+++ src/startup.c Wed Jul 2 20:42:22 2014
-@@ -103,8 +103,8 @@ static int _prune_startup_sequences(void) {
- */
- void startup_sequence_delete(struct Startup_Sequence *sequence) {
- assert(sequence != NULL);
-- DLOG("Deleting startup sequence %s, delete_at = %ld, current_time =
%ld\n",
-- sequence->id, sequence->delete_at, time(NULL));
-+ DLOG("Deleting startup sequence %s, delete_at = %lld, current_time =
%lld\n",
-+ sequence->id, (long long)sequence->delete_at, (long long)time(NULL));
-
- /* Unref the context, will be free()d */
- sn_launcher_context_unref(sequence->context);
-@@ -239,8 +239,8 @@ void startup_monitor_event(SnMonitorEvent *event, void
- /* Mark the given sequence for deletion in 30 seconds. */
- time_t current_time = time(NULL);
- sequence->delete_at = current_time + 30;
-- DLOG("Will delete startup sequence %s at timestamp %ld\n",
-- sequence->id, sequence->delete_at);
-+ DLOG("Will delete startup sequence %s at timestamp %lld\n",
-+ sequence->id, (long long)sequence->delete_at);
-
- if (_prune_startup_sequences() == 0) {
- DLOG("No more startup sequences running, changing root window
cursor to default pointer.\n");
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/i3/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 11 Jul 2014 15:49:58 -0000 1.10
+++ pkg/PLIST 10 Nov 2016 21:06:13 -0000
@@ -25,6 +25,18 @@ include/i3/ipc.h
@man man/man1/i3.1
@man man/man1/i3bar.1
share/applications/i3.desktop
+share/doc/i3/
+share/doc/i3/debugging.html
+share/doc/i3/hacking-howto.html
+share/doc/i3/i3bar-protocol.html
+share/doc/i3/ipc.html
+share/doc/i3/layout-saving.html
+share/doc/i3/lib-i3test-test.html
+share/doc/i3/lib-i3test.html
+share/doc/i3/multi-monitor.html
+share/doc/i3/testsuite.html
+share/doc/i3/userguide.html
+share/doc/i3/wsbar.html
share/examples/i3/
@sample ${SYSCONFDIR}/i3/
share/examples/i3/config
