From 3dc0d27e2ebf4f54f9f2da5b7561f884d134e0af Mon Sep 17 00:00:00 2001
From: bam80 <butirsky@gmail.com>
Date: Wed, 4 Dec 2019 01:50:52 +0300
Subject: [PATCH 1/3] system-tools: Vim update

---
 .../addons/addon-depends/system-tools-depends/vim/package.mk  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
index 1a10a6e6dd..47b6fb055f 100644
--- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vim"
-PKG_VERSION="8.1.2384"
-PKG_SHA256="f17462971e577063552cd4dbbebeb84e77a9fb47cd40c6234969e7672aebcd59"
+PKG_VERSION="8.2.0023"
+PKG_SHA256="100c1226286e24421084b9301d945d0310c7b3c9d45a6da4741dc23c0be60050"
 PKG_LICENSE="VIM"
 PKG_SITE="http://www.vim.org/"
 PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"

From 47ba2c024360e904eed43aaaa27515525f42a7f4 Mon Sep 17 00:00:00 2001
From: Andrey Butirsky <butirsky@gmail.com>
Date: Wed, 25 Dec 2019 17:12:45 +0300
Subject: [PATCH 2/3] system-tools: move redundant Vim runtime dir

---
 .../addon-depends/system-tools-depends/vim/package.mk       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
index 47b6fb055f..ebcbf5ce02 100644
--- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
@@ -29,6 +29,8 @@ PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \
                            --with-tlib=ncurses \
                            --without-x"
 
+PKG_MAKEINSTALL_OPTS_TARGET=VIMRTDIR=
+
 pre_configure_target() {
   cd ..
   rm -rf .$TARGET_NAME
@@ -40,8 +42,8 @@ make_target() {
 
 post_makeinstall_target() {
   (
-  cd $INSTALL/storage/.kodi/addons/virtual.system-tools/data/vim/vim*
+  cd $INSTALL/storage/.kodi/addons/virtual.system-tools/data/vim
   rm -r doc tutor gvimrc_example.vim
-  mv vimrc_example.vim ../vimrc
+  mv vimrc_example.vim vimrc
   )
 }

From 1169eb2f8101988b501def2aa5b96509a5f9415a Mon Sep 17 00:00:00 2001
From: Andrey Butirsky <butirsky@gmail.com>
Date: Wed, 25 Dec 2019 22:48:58 +0300
Subject: [PATCH 3/3] system-tools: bump PKG_REV

---
 packages/addons/tools/system-tools/changelog.txt | 4 ++++
 packages/addons/tools/system-tools/package.mk    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt
index 96c00c7cac..fb65819be0 100644
--- a/packages/addons/tools/system-tools/changelog.txt
+++ b/packages/addons/tools/system-tools/changelog.txt
@@ -1,3 +1,7 @@
+112
+- added vim runtime files
+- updated vim
+
 111
 - updated autossh to 1.4g
 - updated file to d1ff3af
diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
index 5e350b059f..7bd3069132 100644
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="111"
+PKG_REV="112"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"