From owner-svn-ports-all@freebsd.org Wed Apr 25 10:52:11 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F7F7FA0309; Wed, 25 Apr 2018 10:52:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3A83C84F2F; Wed, 25 Apr 2018 10:52:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 355B4257; Wed, 25 Apr 2018 10:52:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3PAqBVo060832; Wed, 25 Apr 2018 10:52:11 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3PAqAZI060830; Wed, 25 Apr 2018 10:52:10 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201804251052.w3PAqAZI060830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 25 Apr 2018 10:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468274 - in head/editors/kakoune: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/editors/kakoune: . files X-SVN-Commit-Revision: 468274 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 10:52:11 -0000 Author: tobik Date: Wed Apr 25 10:52:10 2018 New Revision: 468274 URL: https://svnweb.freebsd.org/changeset/ports/468274 Log: editors/kakoune: Fix tmux-repl.kak It fails on FreeBSD and claims that tmux' version is too old even though tmux >= 2 is installed. Added: head/editors/kakoune/files/ head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak (contents, props changed) Modified: head/editors/kakoune/Makefile Modified: head/editors/kakoune/Makefile ============================================================================== --- head/editors/kakoune/Makefile Wed Apr 25 10:34:04 2018 (r468273) +++ head/editors/kakoune/Makefile Wed Apr 25 10:52:10 2018 (r468274) @@ -2,7 +2,7 @@ PORTNAME= kakoune DISTVERSION= 2018.04.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/ @@ -10,7 +10,7 @@ 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 @@ -18,6 +18,7 @@ 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 @@ -33,6 +34,6 @@ 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 Added: head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/kakoune/files/patch-rc_extra_tmux-repl.kak Wed Apr 25 10:52:10 2018 (r468274) @@ -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