Update i3 to version 4.13.

Pkgsrc changes:
Added comments and RCS tags to patches.
Make perl a runtime dependency since installed
runtime scripts uses it.

Changes and bugfixes from release notes:

Changes in 4.13:

* build: wire up version handling for non-release tarballs (as opposed to git
  checkouts)
* build: switch to the GNU build system
* i3bar: disable pango markup for plain-text input
* man/i3-msg: point out default ipc message type
* config: introduce support for specifying variables from X resources
* config: ensure variables match on longest-length, eliminating problems
  where one variable was a prefix of another
* config: do not count '\' in comment lines as line continuation
* ipc: introduce a new GET_BINDING_MODES command
* ipc: implement new window::mark event
* ipc: add ?output? to IPC events referencing a container
* make fullscreen windows open on the output which is indicated by their
  geometry (fixes LibreOffice Impress multi-monitor presentations)
* focus newly managed windows only if they don?t use the globally active
  input mode (fixes issues with RubyMine)
* remove title indentation in nested containers (rationale was unclear,
  nobody spoke up when we asked about the feature on i3-discuss)
* use the last known timestamp when calling xcb_set_input_focus (might fix
  rare race conditions in focus handling)
* introduce the "smart" option for hide_edge_borders, which will hide borders
  when there is precisely one window on the workspace
* handle _MOTIF_WM_HINTS changes (_MOTIF_WM_HINTS were previously only
  considered when managing a new window)
* don?t change border style if BS_NORMAL is requested in _MOTIF_WM_HINTS
* only add numlock fallback for keybindings where necessary (allows users to
  correctly bind keys on the numpad)
* do not match docks in config and command criteria
* get DPI from the Xft.dpi resource instead of directly looking at the screen
  resolution/size
* handle _NET_ACTIVE_WINDOW for scratchpad windows (for pagers)
* set _NET_WM_DESKTOP to sticky for scratchpad windows
* add new criteria "tiling" and "floating"
* implement special output name "current" for commands
* handle ResizeRequests for tray clients (fixes VLC tray icon)

Bugfixes in 4.13:

* i3bar: fix crash when the I3SOCK environment variable is present
* i3-dmenu-desktop: do not die on failed open
* i3-input: properly position in non-standard cases (fixes an issue where
  i3-input would launch off-screen)
* i3-save-tree: rename "mark" to "marks" to reflect our recent change to
  allow multiple marks
* mouse bindings: only grab the mouse buttons that need to be grabbed
* no_focus: correctly count the number of windows (makes no_focus work with
  tabbed/stacked workspace layouts).
* properly close disabled outputs restored during a restart (this fixes state
  handling when RandR changes happen during i3 restarts)
* don't trigger bindings on window border clicks unless --border was
  specified for the binding
* traverse numbered workspaces in correct order
  fix transition from named to numbered workspaces in "workspace next|prev"
* avoid setting urgency hint on content containers and above (fixes crashes)
* don't trigger unrelated key bindings for --release bindings
* fix colormap handling for containers (fixes taking screenshots using xwd)
* check output crossing on ENTER_NOTIFY to dockarea (fixes pointer jumping)
* fix a use-after-free bug (fixes "floating enable" on single split windows)

7 files changed, 50 insertions, 38 deletions

diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index acf213a63ca..c0c680f67c5 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2017/04/19 11:24:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2017/08/09 11:13:30 nros Exp $
 #
 
-DISTNAME=	i3-4.12
-PKGREVISION=	3
+DISTNAME=	i3-4.13
 CATEGORIES=	wm
 MASTER_SITES=	http://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,35 +11,27 @@ HOMEPAGE=	http://i3wm.org/
 COMMENT=	Improved dynamic tiling window manager
 LICENSE=	modified-bsd
 
-USE_TOOLS+=	gmake bison lex yacc pkg-config perl
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake bison lex yacc pkg-config perl:run
 USE_LANGUAGES=	c99
-MAKE_JOBS_SAFE=	no
+
+CONFIGURE_ARGS+=--disable-builddir
 
 PKG_SYSCONFSUBDIR=	i3
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/${PKGBASE}
 
 EGDIR=		${PREFIX}/share/examples/i3
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
 CONF_FILES+=	${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/config.keycodes
 
-MAKE_ENV+=	SYSCONFDIR=${PKG_SYSCONFDIR:C/\/i3//}
-MAKE_ENV+=	DEBUG=0
-MAKE_ENV+=	SHM_SUPPORT=0
-
 REPLACE_PERL+=	i3-dmenu-desktop
 REPLACE_PERL+=	i3-migrate-config-to-v4
 REPLACE_PERL+=	i3-save-tree
 
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	pre-install
-SUBST_MESSAGE.conf=	Change src/i3.mk to install conf files in share/examples
-SUBST_FILES.conf=	src/i3.mk
-SUBST_SED.conf=		-e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g
-
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
+BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
+
 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
@@ -51,6 +42,7 @@ post-install:
 .include "../../x11/xcb-util-cursor/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/xcb-util-xrm/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
diff --git a/wm/i3/PLIST b/wm/i3/PLIST
index 4432e59c64d..2ee90b0e165 100644
--- a/wm/i3/PLIST
+++ b/wm/i3/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2016/05/01 09:39:58 degroote Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/08/09 11:13:30 nros Exp $
 bin/i3
 bin/i3-config-wizard
 bin/i3-dmenu-desktop
+bin/i3-dump-log
 bin/i3-input
 bin/i3-migrate-config-to-v4
 bin/i3-msg
@@ -28,6 +29,17 @@ man/man1/i3.1
 man/man1/i3bar.1
 share/applications/i3.desktop
 share/doc/i3/LICENSE
+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/config
 share/examples/i3/config.keycodes
 share/xsessions/i3-with-shmlog.desktop
diff --git a/wm/i3/distinfo b/wm/i3/distinfo
index 38c8e8f0906..a73bbdc8904 100644
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2016/05/01 09:39:58 degroote Exp $
+$NetBSD: distinfo,v 1.11 2017/08/09 11:13:30 nros Exp $
 
-SHA1 (i3-4.12.tar.bz2) = 264e682c7404ee8d5da76e3d652c546db1662a2b
-RMD160 (i3-4.12.tar.bz2) = 65d74a4ddc775d7e5888c72cf72fbb43873dd9e0
-SHA512 (i3-4.12.tar.bz2) = 966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5
-Size (i3-4.12.tar.bz2) = 988084 bytes
-SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a
-SHA1 (patch-src_log.c) = 3d2a869a79e9ae851c6044752d1d0b3d2a4b0ee2
-SHA1 (patch-src_main.c) = 98428db66fed3352ee8f76ad43930b0418079b01
+SHA1 (i3-4.13.tar.bz2) = f4ca5c9023563f42be9c36b605c7a18d6f70114a
+RMD160 (i3-4.13.tar.bz2) = 7d085216b2e7d53fad9bbb0bb9782d8998702710
+SHA512 (i3-4.13.tar.bz2) = 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
+Size (i3-4.13.tar.bz2) = 1121298 bytes
+SHA1 (patch-Makefile.in) = 9908543534c88946dd8a430cd208814cae0a03a1
+SHA1 (patch-src_log.c) = 4d703eea9609e9b7cc53d85895f0860d085b1f84
+SHA1 (patch-src_main.c) = 8d84ec8da864ffb041f22c53f587105acea00cf8
diff --git a/wm/i3/patches/patch-Makefile b/wm/i3/patches/patch-Makefile
deleted file mode 100644
index 4e6434b1a9e..00000000000
--- a/wm/i3/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2013/02/12 23:25:35 tonnerre Exp $
-
---- Makefile.orig	2012-11-25 16:04:42.000000000 +0000
-+++ Makefile
-@@ -18,7 +18,6 @@ include i3-msg/i3-msg.mk
- include i3-input/i3-input.mk
- include i3-nagbar/i3-nagbar.mk
- include i3bar/i3bar.mk
--include i3-dump-log/i3-dump-log.mk
- include docs/docs.mk
- include man/man.mk
- 
diff --git a/wm/i3/patches/patch-Makefile.in b/wm/i3/patches/patch-Makefile.in
new file mode 100644
index 00000000000..a06e8ed0ae2
--- /dev/null
+++ b/wm/i3/patches/patch-Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/08/09 11:13:30 nros Exp $
+* install conf files in examples dir to follow the pkgsrc
+  way of installing conf files.
+--- Makefile.in.orig	2017-08-08 07:26:56.000000000 +0000
++++ Makefile.in
+@@ -749,7 +749,7 @@ dist_bin_SCRIPTS = \
+ 	i3-sensible-pager \
+ 	i3-sensible-terminal
+ 
+-i3confdir = $(sysconfdir)/i3
++i3confdir = $(datadir)/examples/i3
+ dist_i3conf_DATA = \
+ 	etc/config \
+ 	etc/config.keycodes
diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c
index df1f2493f48..6beeaa265ab 100644
--- a/wm/i3/patches/patch-src_log.c
+++ b/wm/i3/patches/patch-src_log.c
@@ -1,3 +1,6 @@
+$NetBSD: patch-src_log.c,v 1.5 2017/08/09 11:13:30 nros Exp $
+* NetBSD versions below and 7 miss shm_open and shm_unlink
+* NetBSD versions below 8 miss pthread_condattr_pshared 
 --- src/log.c.orig	2016-03-06 15:17:18.000000000 +0000
 +++ src/log.c	2016-05-01 10:51:32.392955298 +0000
 @@ -116,6 +116,7 @@
diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c
index 6d94c7bef0a..8983d11e455 100644
--- a/wm/i3/patches/patch-src_main.c
+++ b/wm/i3/patches/patch-src_main.c
@@ -1,3 +1,6 @@
+$NetBSD: patch-src_main.c,v 1.3 2017/08/09 11:13:30 nros Exp $
+* NetBSD versions lower than 7 does not have shm_open and shm_unlink
+  see patch-src_log.c 
 --- src/main.c.orig	2016-05-01 10:53:25.236039259 +0000
 +++ src/main.c	2016-05-01 10:54:26.269651048 +0000
 @@ -166,11 +166,13 @@