5 files changed, 31 insertions, 29 deletions

diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 62aa61841277..b23c6229863b 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	neovim
-PORTVERSION=	0.2.0
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.2.1
 CATEGORIES=	editors
 
 MAINTAINER=	gor@clogic.com.ua
diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
index 1f18198c4796..f9e407a8a2bf 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1494237437
-SHA256 (neovim-neovim-v0.2.0_GH0.tar.gz) = 72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5
-SIZE (neovim-neovim-v0.2.0_GH0.tar.gz) = 7846467
+TIMESTAMP = 1510118947
+SHA256 (neovim-neovim-v0.2.1_GH0.tar.gz) = 9e2c068a8994c9023a5f84cde9eb7188d3c85996a7e42e611e3cd0996e345dd3
+SIZE (neovim-neovim-v0.2.1_GH0.tar.gz) = 8326881
 SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956
 SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966
 SHA256 (libmpack-libmpack-lua-1.0.6_GH0.tar.gz) = 66811e30b316b53d1e3c4225248d4813b8b852c3e19121ba5ad47a9d4537d1ae
diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/files/patch-CMakeLists.txt
index 46a244f67af0..7a80bd3d0938 100644
--- a/editors/neovim/files/patch-CMakeLists.txt
+++ b/editors/neovim/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
---- CMakeLists.txt.orig	2017-05-04 05:07:26 UTC
+--- CMakeLists.txt.orig	2017-11-08 05:34:30 UTC
 +++ CMakeLists.txt
-@@ -223,7 +223,7 @@ else()
- 
-   # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
-   # 3.4.1 used there.
--  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
-     add_definitions(-Wno-c11-extensions)
-   endif()
- endif()
-@@ -401,9 +401,9 @@ endforeach()
+@@ -433,9 +433,9 @@ endforeach()
  
  # Find Lua interpreter
  include(LuaHelpers)
diff --git a/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c b/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c
deleted file mode 100644
index fee4466ad2dc..000000000000
--- a/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nvim/os/pty_process_unix.c.orig	2017-05-04 05:10:42 UTC
-+++ src/nvim/os/pty_process_unix.c
-@@ -12,7 +12,7 @@
- #include <sys/ioctl.h>
- 
- // forkpty is not in POSIX, so headers are platform-specific
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined (__DragonFly__)
- # include <libutil.h>
- #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
- # include <util.h>
diff --git a/editors/neovim/pkg-plist b/editors/neovim/pkg-plist
index dd93e114db8c..7a1553df6293 100644
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
@@ -1,5 +1,6 @@
 bin/nvim
 man/man1/nvim.1.gz
+share/applications/nvim.desktop
 share/locale/af/LC_MESSAGES/nvim.mo
 share/locale/ca/LC_MESSAGES/nvim.mo
 share/locale/cs.cp1250/LC_MESSAGES/nvim.mo
@@ -51,6 +52,7 @@ share/nvim/runtime/autoload/netrwSettings.vim
 share/nvim/runtime/autoload/netrw_gitignore.vim
 share/nvim/runtime/autoload/paste.vim
 share/nvim/runtime/autoload/phpcomplete.vim
+share/nvim/runtime/autoload/provider.vim
 share/nvim/runtime/autoload/provider/clipboard.vim
 share/nvim/runtime/autoload/provider/python.vim
 share/nvim/runtime/autoload/provider/python3.vim
@@ -62,6 +64,8 @@ share/nvim/runtime/autoload/pythoncomplete.vim
 share/nvim/runtime/autoload/remote/define.vim
 share/nvim/runtime/autoload/remote/host.vim
 share/nvim/runtime/autoload/rubycomplete.vim
+share/nvim/runtime/autoload/rust.vim
+share/nvim/runtime/autoload/rustfmt.vim
 share/nvim/runtime/autoload/shada.vim
 share/nvim/runtime/autoload/spellfile.vim
 share/nvim/runtime/autoload/sqlcomplete.vim
@@ -107,6 +111,7 @@ share/nvim/runtime/colors/zellner.vim
 share/nvim/runtime/compiler/ant.vim
 share/nvim/runtime/compiler/bcc.vim
 share/nvim/runtime/compiler/bdf.vim
+share/nvim/runtime/compiler/cargo.vim
 share/nvim/runtime/compiler/checkstyle.vim
 share/nvim/runtime/compiler/context.vim
 share/nvim/runtime/compiler/cs.vim
@@ -157,6 +162,7 @@ share/nvim/runtime/compiler/rspec.vim
 share/nvim/runtime/compiler/rst.vim
 share/nvim/runtime/compiler/ruby.vim
 share/nvim/runtime/compiler/rubyunit.vim
+share/nvim/runtime/compiler/rustc.vim
 share/nvim/runtime/compiler/sass.vim
 share/nvim/runtime/compiler/se.vim
 share/nvim/runtime/compiler/splint.vim
@@ -183,13 +189,14 @@ share/nvim/runtime/doc/farsi.txt
 share/nvim/runtime/doc/filetype.txt
 share/nvim/runtime/doc/fold.txt
 share/nvim/runtime/doc/ft_ada.txt
+share/nvim/runtime/doc/ft_rust.txt
 share/nvim/runtime/doc/ft_sql.txt
 share/nvim/runtime/doc/gui.txt
 share/nvim/runtime/doc/hebrew.txt
 share/nvim/runtime/doc/help.txt
 share/nvim/runtime/doc/helphelp.txt
-share/nvim/runtime/doc/howto.txt
 share/nvim/runtime/doc/if_cscop.txt
+share/nvim/runtime/doc/if_lua.txt
 share/nvim/runtime/doc/if_pyth.txt
 share/nvim/runtime/doc/if_ruby.txt
 share/nvim/runtime/doc/indent.txt
@@ -208,7 +215,6 @@ share/nvim/runtime/doc/msgpack_rpc.txt
 share/nvim/runtime/doc/nvim.txt
 share/nvim/runtime/doc/nvim_terminal_emulator.txt
 share/nvim/runtime/doc/options.txt
-share/nvim/runtime/doc/os_win32.txt
 share/nvim/runtime/doc/pattern.txt
 share/nvim/runtime/doc/pi_gzip.txt
 share/nvim/runtime/doc/pi_health.txt
@@ -242,6 +248,7 @@ share/nvim/runtime/doc/tagsrch.txt
 share/nvim/runtime/doc/term.txt
 share/nvim/runtime/doc/tips.txt
 share/nvim/runtime/doc/uganda.txt
+share/nvim/runtime/doc/ui.txt
 share/nvim/runtime/doc/undo.txt
 share/nvim/runtime/doc/usr_01.txt
 share/nvim/runtime/doc/usr_02.txt
@@ -341,6 +348,7 @@ share/nvim/runtime/ftplugin/flexwiki.vim
 share/nvim/runtime/ftplugin/fortran.vim
 share/nvim/runtime/ftplugin/framescript.vim
 share/nvim/runtime/ftplugin/fvwm.vim
+share/nvim/runtime/ftplugin/gdb.vim
 share/nvim/runtime/ftplugin/git.vim
 share/nvim/runtime/ftplugin/gitcommit.vim
 share/nvim/runtime/ftplugin/gitconfig.vim
@@ -404,6 +412,7 @@ share/nvim/runtime/ftplugin/mrxvtrc.vim
 share/nvim/runtime/ftplugin/msmessages.vim
 share/nvim/runtime/ftplugin/muttrc.vim
 share/nvim/runtime/ftplugin/nanorc.vim
+share/nvim/runtime/ftplugin/neomuttrc.vim
 share/nvim/runtime/ftplugin/netrc.vim
 share/nvim/runtime/ftplugin/nsis.vim
 share/nvim/runtime/ftplugin/objc.vim
@@ -439,7 +448,9 @@ share/nvim/runtime/ftplugin/rpl.vim
 share/nvim/runtime/ftplugin/rrst.vim
 share/nvim/runtime/ftplugin/rst.vim
 share/nvim/runtime/ftplugin/ruby.vim
+share/nvim/runtime/ftplugin/rust.vim
 share/nvim/runtime/ftplugin/sass.vim
+share/nvim/runtime/ftplugin/sbt.vim
 share/nvim/runtime/ftplugin/scala.vim
 share/nvim/runtime/ftplugin/scheme.vim
 share/nvim/runtime/ftplugin/screen.vim
@@ -467,6 +478,7 @@ share/nvim/runtime/ftplugin/tcsh.vim
 share/nvim/runtime/ftplugin/terminfo.vim
 share/nvim/runtime/ftplugin/tex.vim
 share/nvim/runtime/ftplugin/text.vim
+share/nvim/runtime/ftplugin/tmux.vim
 share/nvim/runtime/ftplugin/treetop.vim
 share/nvim/runtime/ftplugin/tt2html.vim
 share/nvim/runtime/ftplugin/tutor.vim
@@ -579,6 +591,8 @@ share/nvim/runtime/indent/rpl.vim
 share/nvim/runtime/indent/rrst.vim
 share/nvim/runtime/indent/rst.vim
 share/nvim/runtime/indent/ruby.vim
+share/nvim/runtime/indent/rust.vim
+share/nvim/runtime/indent/sas.vim
 share/nvim/runtime/indent/sass.vim
 share/nvim/runtime/indent/scala.vim
 share/nvim/runtime/indent/scheme.vim
@@ -700,6 +714,7 @@ share/nvim/runtime/optwin.vim
 share/nvim/runtime/pack/dist/opt/justify/plugin/justify.vim
 share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
 share/nvim/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
+share/nvim/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
 share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim
 share/nvim/runtime/pack/dist/opt/vimball/doc/tags
 share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt
@@ -1073,15 +1088,18 @@ share/nvim/runtime/syntax/msidl.vim
 share/nvim/runtime/syntax/msmessages.vim
 share/nvim/runtime/syntax/msql.vim
 share/nvim/runtime/syntax/mupad.vim
+share/nvim/runtime/syntax/murphi.vim
 share/nvim/runtime/syntax/mush.vim
 share/nvim/runtime/syntax/muttrc.vim
 share/nvim/runtime/syntax/mysql.vim
+share/nvim/runtime/syntax/n1ql.vim
 share/nvim/runtime/syntax/named.vim
 share/nvim/runtime/syntax/nanorc.vim
 share/nvim/runtime/syntax/nasm.vim
 share/nvim/runtime/syntax/nastran.vim
 share/nvim/runtime/syntax/natural.vim
 share/nvim/runtime/syntax/ncf.vim
+share/nvim/runtime/syntax/neomuttrc.vim
 share/nvim/runtime/syntax/netrc.vim
 share/nvim/runtime/syntax/netrw.vim
 share/nvim/runtime/syntax/ninja.vim
@@ -1171,10 +1189,12 @@ share/nvim/runtime/syntax/rrst.vim
 share/nvim/runtime/syntax/rst.vim
 share/nvim/runtime/syntax/rtf.vim
 share/nvim/runtime/syntax/ruby.vim
+share/nvim/runtime/syntax/rust.vim
 share/nvim/runtime/syntax/samba.vim
 share/nvim/runtime/syntax/sas.vim
 share/nvim/runtime/syntax/sass.vim
 share/nvim/runtime/syntax/sather.vim
+share/nvim/runtime/syntax/sbt.vim
 share/nvim/runtime/syntax/scala.vim
 share/nvim/runtime/syntax/scheme.vim
 share/nvim/runtime/syntax/scilab.vim
@@ -1255,6 +1275,7 @@ share/nvim/runtime/syntax/tags.vim
 share/nvim/runtime/syntax/tak.vim
 share/nvim/runtime/syntax/takcmp.vim
 share/nvim/runtime/syntax/takout.vim
+share/nvim/runtime/syntax/tap.vim
 share/nvim/runtime/syntax/tar.vim
 share/nvim/runtime/syntax/taskdata.vim
 share/nvim/runtime/syntax/taskedit.vim
@@ -1270,6 +1291,7 @@ share/nvim/runtime/syntax/tf.vim
 share/nvim/runtime/syntax/tidy.vim
 share/nvim/runtime/syntax/tilde.vim
 share/nvim/runtime/syntax/tli.vim
+share/nvim/runtime/syntax/tmux.vim
 share/nvim/runtime/syntax/tpp.vim
 share/nvim/runtime/syntax/trasys.vim
 share/nvim/runtime/syntax/treetop.vim
@@ -1345,4 +1367,4 @@ share/nvim/runtime/syntax/zimbu.vim
 share/nvim/runtime/syntax/zsh.vim
 share/nvim/runtime/tutor/en/vim-01-beginner.tutor
 share/nvim/runtime/tutor/tutor.tutor
-share/nvim/runtime/vimrc_example.vim
+share/pixmaps/nvim.png