Index: head/editors/kakoune/Makefile
===================================================================
--- head/editors/kakoune/Makefile	(revision 468273)
+++ head/editors/kakoune/Makefile	(revision 468274)
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	kakoune
 DISTVERSION=	2018.04.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Modal code editor with a focus on interactivity
 
 LICENSE=	UNLICENSE
-LICENSE_FILE=	${WRKSRC}/../UNLICENSE
+LICENSE_FILE=	${WRKSRC:H}/UNLICENSE
 
 BUILD_DEPENDS=	a2x:textproc/asciidoc
 
 USES=		compiler:c++14-lang gmake ncurses tar:bzip2
 
 DATADIR=	${PREFIX}/share/kak
 DOCSDIR=	${PREFIX}/share/doc/kak
+PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_MAKE_ARGS=	debug=yes
 DEBUG_MAKE_ARGS_OFF=	debug=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/share/man/,/man/,' -e '/-O3/d' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak
 
 do-test:
-	@cd ${WRKSRC}/../test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
+	@cd ${WRKSRC:H}/test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
 
 .include <bsd.port.mk>
Index: head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak
===================================================================
--- head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak	(nonexistent)
+++ head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak	(revision 468274)
@@ -0,0 +1,20 @@
+tmux-repl fails on FreeBSD and claims that tmux' version is too old even
+though tmux >= 2 is installed.
+
+The expr is only compatible with GNU expr.
+
+https://github.com/mawww/kakoune/pull/2006
+
+--- rc/extra/tmux-repl.kak.orig	2018-04-12 11:28:15 UTC
++++ rc/extra/tmux-repl.kak
+@@ -4,8 +4,8 @@
+ hook global KakBegin .* %{
+     %sh{
+         if [ -n "$TMUX" ]; then
+-            VERSION_TMUX=$(tmux -V)
+-            VERSION_TMUX=$(expr "${VERSION_TMUX}" : 'tmux \([0-9]*\|master\)')
++            VERSION_TMUX=$(tmux -V | cut -d' ' -f2)
++            VERSION_TMUX=${VERSION_TMUX%%.*}
+ 
+             if [ "${VERSION_TMUX}" = "master" ] \
+                 || [ "${VERSION_TMUX}" -ge 2 ]; then

Property changes on: head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property