neovim: Changes to add Ruby support

[Jonathan Buschmann <jonthn+pkgsrc%pinacea.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Buschmann <jonthn+pkgsrc%pinacea.com@localhost>
Pushed By:	jonthn
Date:		Wed Aug 10 21:39:51 2016 +0200
Changeset:	d2483756e6a64c6310f12d7bacdf419342c08f4a

Modified Files:
	neovim/PLIST
	neovim/distinfo
	neovim/options.mk
	neovim/patches/patch-runtime_CMakeLists.txt

Log Message:
 neovim: Changes to add Ruby support

  + Rework patch due to Ruby support changes
  + Add option to enable Ruby
  + Correctly de-activate jemalloc when not requested

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d2483756e6a64c6310f12d7bacdf419342c08f4a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 neovim/PLIST                                | 13 ++++++++++---
 neovim/distinfo                             |  2 +-
 neovim/options.mk                           | 15 +++++++++++++--
 neovim/patches/patch-runtime_CMakeLists.txt | 12 ++++++------
 4 files changed, 30 insertions(+), 12 deletions(-)

diffs:
diff --git a/neovim/PLIST b/neovim/PLIST
index 1744a93..b84b247 100644
--- a/neovim/PLIST
+++ b/neovim/PLIST
@@ -62,6 +62,7 @@ share/nvim/runtime/autoload/provider/python.vim
 share/nvim/runtime/autoload/provider/python3.vim
 share/nvim/runtime/autoload/provider/pythonx.vim
 share/nvim/runtime/autoload/provider/ruby.vim
+share/nvim/runtime/autoload/provider/script_host.rb
 share/nvim/runtime/autoload/python3complete.vim
 share/nvim/runtime/autoload/pythoncomplete.vim
 share/nvim/runtime/autoload/remote/define.vim
@@ -74,7 +75,6 @@ share/nvim/runtime/autoload/syntaxcomplete.vim
 share/nvim/runtime/autoload/tar.vim
 share/nvim/runtime/autoload/tohtml.vim
 share/nvim/runtime/autoload/tutor.vim
-share/nvim/runtime/autoload/vimball.vim
 share/nvim/runtime/autoload/vimexpect.vim
 share/nvim/runtime/autoload/xml/html32.vim
 share/nvim/runtime/autoload/xml/html401f.vim
@@ -192,6 +192,7 @@ share/nvim/runtime/doc/helphelp.txt
 share/nvim/runtime/doc/howto.txt
 share/nvim/runtime/doc/if_cscop.txt
 share/nvim/runtime/doc/if_pyth.txt
+share/nvim/runtime/doc/if_ruby.txt
 share/nvim/runtime/doc/indent.txt
 share/nvim/runtime/doc/index.txt
 share/nvim/runtime/doc/insert.txt
@@ -218,7 +219,6 @@ share/nvim/runtime/doc/pi_paren.txt
 share/nvim/runtime/doc/pi_spec.txt
 share/nvim/runtime/doc/pi_tar.txt
 share/nvim/runtime/doc/pi_tutor.txt
-share/nvim/runtime/doc/pi_vimball.txt
 share/nvim/runtime/doc/pi_zip.txt
 share/nvim/runtime/doc/print.txt
 share/nvim/runtime/doc/provider.txt
@@ -330,6 +330,7 @@ share/nvim/runtime/ftplugin/dosbatch.vim
 share/nvim/runtime/ftplugin/dosini.vim
 share/nvim/runtime/ftplugin/dtd.vim
 share/nvim/runtime/ftplugin/dtrace.vim
+share/nvim/runtime/ftplugin/eiffel.vim
 share/nvim/runtime/ftplugin/elinks.vim
 share/nvim/runtime/ftplugin/erlang.vim
 share/nvim/runtime/ftplugin/eruby.vim
@@ -685,6 +686,13 @@ share/nvim/runtime/makemenu.vim
 share/nvim/runtime/menu.vim
 share/nvim/runtime/mswin.vim
 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/vimball/autoload/vimball.vim
+share/nvim/runtime/pack/dist/opt/vimball/doc/tags
+share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt
+share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
 share/nvim/runtime/plugin/gzip.vim
 share/nvim/runtime/plugin/health.vim
 share/nvim/runtime/plugin/man.vim
@@ -698,7 +706,6 @@ share/nvim/runtime/plugin/spellfile.vim
 share/nvim/runtime/plugin/tarPlugin.vim
 share/nvim/runtime/plugin/tohtml.vim
 share/nvim/runtime/plugin/tutor.vim
-share/nvim/runtime/plugin/vimballPlugin.vim
 share/nvim/runtime/plugin/zipPlugin.vim
 share/nvim/runtime/print/ascii.ps
 share/nvim/runtime/print/cidfont.ps
diff --git a/neovim/distinfo b/neovim/distinfo
index 5df49cf..9ce029e 100644
--- a/neovim/distinfo
+++ b/neovim/distinfo
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-runtime_CMakeLists.txt) = 79ebff18726b594011ee7dd302359f6585a7b3ab
+SHA1 (patch-runtime_CMakeLists.txt) = 0f61c508bb58c6f86b81c0dbb41f790ad2c076ea
diff --git a/neovim/options.mk b/neovim/options.mk
index 15c49a0..2f13460 100644
--- a/neovim/options.mk
+++ b/neovim/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.2 2015/04/30 22:22:00 jonthn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.neovim
-PKG_SUPPORTED_OPTIONS=	python jemalloc
-PKG_SUGGESTED_OPTIONS=	python
+PKG_SUPPORTED_OPTIONS=	python ruby jemalloc
+PKG_SUGGESTED_OPTIONS=	python ruby
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,8 +16,19 @@ DEPENDS+=       ${PYPKGPREFIX}-neovim-[0-9]*:../../wip/py-neovim
 .  endif
 
 ###
+### Support Ruby (add dependency)
+###
+.  if !empty(PKG_OPTIONS:Mruby)
+DEPENDS+=       ${RUBY_PKGPREFIX}-neovim-[0-9]*:../../wip/ruby-neovim
+
+.include "../../lang/ruby/rubyversion.mk"
+.  endif
+
+###
 ### Use jemalloc for memory allocation
 ###
 .  if !empty(PKG_OPTIONS:Mjemalloc)
 .include "../../devel/jemalloc/buildlink3.mk"
+.  else
+CMAKE_ARGS+= -DENABLE_JEMALLOC=OFF
 .  endif
diff --git a/neovim/patches/patch-runtime_CMakeLists.txt b/neovim/patches/patch-runtime_CMakeLists.txt
index 9f0df57..f286959 100644
--- a/neovim/patches/patch-runtime_CMakeLists.txt
+++ b/neovim/patches/patch-runtime_CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD: patch-runtime_CMakeLists.txt,v 1.2 2015/08/29 20:56:15 jonthn Exp $
 
 Awk scripts are not executable install them as simple files
 
---- runtime/CMakeLists.txt.orig	2015-08-29 20:38:10.000000000 +0000
-+++ runtime/CMakeLists.txt
-@@ -71,7 +71,7 @@ install_helper(
+--- runtime/CMakeLists.txt.orig	2016-08-10 00:43:50.000000000 +0200
++++ runtime/CMakeLists.txt	2016-08-10 00:53:10.000000000 +0200
+@@ -114,7 +114,7 @@
  
  file(GLOB_RECURSE RUNTIME_PROGRAMS
    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -13,12 +13,12 @@ Awk scripts are not executable install them as simple files
  
  foreach(PROG ${RUNTIME_PROGRAMS})
    get_filename_component(BASEDIR ${PROG} PATH)
-@@ -81,7 +81,7 @@ endforeach()
+@@ -124,7 +124,7 @@
  
  file(GLOB_RECURSE RUNTIME_FILES
    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
--  *.vim *.dict *.py *.ps *.tutor)
-+  *.vim *.dict *.py *.ps *.awk *.tutor)
+-  *.vim *.dict *.py *.rb *.ps *.tutor)
++  *.vim *.dict *.py *.rb *.ps *.awk *.tutor)
  
  foreach(F ${RUNTIME_FILES})
    get_filename_component(BASEDIR ${F} PATH)