Index: head/editors/kak-lsp/Makefile
===================================================================
--- head/editors/kak-lsp/Makefile	(revision 494298)
+++ head/editors/kak-lsp/Makefile	(revision 494299)
@@ -1,169 +1,169 @@
 # $FreeBSD$
 
 PORTNAME=	kak-lsp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Kakoune Language Server Protocol Client
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
 RUN_DEPENDS=	kakoune>=2018.10.27:editors/kakoune
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	ul
 
 CARGO_CRATES=	adler32-1.0.3 \
 		aho-corasick-0.6.9 \
 		ansi_term-0.11.0 \
 		argon2rs-0.2.5 \
 		arrayvec-0.4.9 \
 		atty-0.2.11 \
 		autocfg-0.1.1 \
 		backtrace-0.3.13 \
 		backtrace-sys-0.1.26 \
 		bitflags-1.0.4 \
 		blake2-rfc-0.2.18 \
 		byteorder-1.2.7 \
 		cc-1.0.27 \
 		cfg-if-0.1.6 \
 		chrono-0.4.6 \
 		clap-2.32.0 \
 		cloudabi-0.0.3 \
 		constant_time_eq-0.1.3 \
 		crc32fast-1.1.2 \
 		crossbeam-0.2.12 \
 		crossbeam-0.6.0 \
 		crossbeam-channel-0.2.6 \
 		crossbeam-channel-0.3.4 \
 		crossbeam-deque-0.6.3 \
 		crossbeam-epoch-0.6.1 \
 		crossbeam-epoch-0.7.0 \
 		crossbeam-utils-0.5.0 \
 		crossbeam-utils-0.6.3 \
 		daemonize-0.3.0 \
 		dirs-1.0.4 \
 		either-1.5.0 \
 		enum_primitive-0.1.1 \
 		failure-0.1.3 \
 		failure_derive-0.1.3 \
 		fnv-1.0.6 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.1.25 \
 		glob-0.2.11 \
 		idna-0.1.5 \
 		isatty-0.1.9 \
 		itertools-0.8.0 \
 		itoa-0.4.3 \
 		jsonrpc-core-8.0.1 \
 		languageserver-types-0.53.0 \
 		lazy_static-1.2.0 \
 		libc-0.2.49 \
 		libflate-0.1.19 \
 		lock_api-0.1.5 \
 		log-0.3.9 \
 		log-0.4.6 \
 		matches-0.1.8 \
 		memchr-2.1.2 \
 		memoffset-0.2.1 \
 		nodrop-0.1.13 \
 		num-derive-0.2.3 \
 		num-integer-0.1.39 \
 		num-traits-0.1.43 \
 		num-traits-0.2.6 \
 		num_cpus-1.9.0 \
 		owning_ref-0.4.0 \
 		parking_lot-0.6.4 \
 		parking_lot-0.7.0 \
 		parking_lot_core-0.3.1 \
 		parking_lot_core-0.4.0 \
 		percent-encoding-1.0.1 \
 		proc-macro2-0.4.24 \
 		quote-0.6.10 \
 		rand-0.4.3 \
 		rand-0.5.5 \
 		rand-0.6.1 \
 		rand_chacha-0.1.0 \
 		rand_core-0.2.2 \
 		rand_core-0.3.0 \
 		rand_hc-0.1.0 \
 		rand_isaac-0.1.1 \
 		rand_pcg-0.1.1 \
 		rand_xorshift-0.1.0 \
 		redox_syscall-0.1.44 \
 		redox_termios-0.1.1 \
 		redox_users-0.2.0 \
 		regex-0.2.11 \
 		regex-1.1.0 \
 		regex-syntax-0.5.6 \
 		regex-syntax-0.6.4 \
 		rustc-demangle-0.1.11 \
 		rustc_version-0.2.3 \
 		ryu-0.2.7 \
 		scoped_threadpool-0.1.9 \
 		scopeguard-0.3.3 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.82 \
 		serde_derive-1.0.82 \
 		serde_json-1.0.33 \
 		slog-2.4.1 \
 		slog-async-2.3.0 \
 		slog-kvfilter-0.7.0 \
 		slog-scope-4.1.0 \
 		slog-stdlog-3.0.2 \
 		slog-term-2.4.0 \
 		sloggers-0.3.1 \
 		smallvec-0.6.7 \
 		stable_deref_trait-1.1.1 \
 		strsim-0.7.0 \
 		syn-0.15.23 \
 		synstructure-0.10.1 \
 		take_mut-0.2.2 \
 		term-0.5.1 \
 		termion-1.5.1 \
 		textwrap-0.10.0 \
 		thread_local-0.3.6 \
 		time-0.1.41 \
 		toml-0.4.10 \
 		trackable-0.2.20 \
 		trackable_derive-0.1.1 \
 		ucd-util-0.1.3 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.7 \
 		unicode-width-0.1.5 \
 		unicode-xid-0.1.0 \
 		unreachable-1.0.0 \
 		url-1.7.2 \
 		url_serde-0.2.0 \
 		utf8-ranges-1.0.2 \
 		vec_map-0.8.1 \
 		version_check-0.1.5 \
 		void-1.0.2 \
 		winapi-0.3.6 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 PLIST_FILES=	bin/kak-lsp \
 		"@sample ${ETCDIR}/kak-lsp.toml.sample"
 PORTDOCS=	README.asciidoc
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak-lsp
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/kak-lsp.toml ${STAGEDIR}${ETCDIR}/kak-lsp.toml.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.asciidoc ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/editors/kak-lsp/files/patch-kak-lsp.toml
===================================================================
--- head/editors/kak-lsp/files/patch-kak-lsp.toml	(revision 494298)
+++ head/editors/kak-lsp/files/patch-kak-lsp.toml	(revision 494299)
@@ -1,42 +1,48 @@
 --- kak-lsp.toml.orig	2019-01-14 07:08:28 UTC
 +++ kak-lsp.toml
-@@ -52,11 +52,16 @@ filetypes = ["python"]
+@@ -52,11 +52,22 @@ filetypes = ["python"]
  roots = ["requirements.txt", "setup.py", ".git", ".hg"]
  command = "pyls"
  
 +#[language.c_cpp]
 +#filetypes = ["c", "cpp"]
 +#roots = ["compile_commands.json", ".cquery"]
 +#command = "cquery"
 +#args = ["--init={\"cacheDirectory\":\"/tmp/cquery\"}"]
 +
  [language.c_cpp]
  filetypes = ["c", "cpp"]
 -roots = ["compile_commands.json", ".cquery"]
 -command = "cquery"
 -args = ["--init={\"cacheDirectory\":\"/tmp/cquery\"}"]
 +roots = ["compile_commands.json", ".ccls", ".git"]
 +command = "ccls"
++# With completion.detailedLabel turned on ccls embeds type
++# signatures and other metadata in completion entries.  Kak-lsp
++# does not filter them, so they appear alongside the selected entry,
++# which is not very convenient.  It is recommended that you disable
++# it.
++args = ["--init={\"completion\":{\"detailedLabel\":false}}"]
  
  [language.haskell]
  filetypes = ["haskell"]
-@@ -64,11 +69,17 @@ roots = ["Setup.hs", "stack.yaml", "*.cabal"]
+@@ -64,11 +75,17 @@ roots = ["Setup.hs", "stack.yaml", "*.cabal"]
  command = "hie"
  args = ["--lsp"]
  
 +#[language.go]
 +#filetypes = ["go"]
 +#roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
 +#command = "go-langserver"
 +#args = ["-mode", "stdio", "-gocodecompletion"]
 +
  [language.go]
  filetypes = ["go"]
  roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
 -command = "go-langserver"
 -args = ["-mode", "stdio", "-gocodecompletion"]
 +command = "bingo"
 +args = ["-mode", "stdio"]
  
  [language.bash]
  filetypes = ["sh"]