From 4456a5234d52a0a9f19c614c622278e46b18a97a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 8 Dec 2016 19:04:09 +0100
Subject: vim: update to 4.8.0

---
 package/vim/Makefile                   | 10 ++++++----
 package/vim/patches/patch-src_osdef_sh | 10 ----------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 package/vim/patches/patch-src_osdef_sh

(limited to 'package/vim')

diff --git a/package/vim/Makefile b/package/vim/Makefile
index 7fe1d70a1..f0a35c3f9 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		vim
-PKG_VERSION:=		7.4
+PKG_VERSION:=		8.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade
+PKG_HASH:=		2e179182814715c3c77010c7300a4abcb964ba8a99a470640f9f2f03884b2ccb
 PKG_DESCR:=		very popular text editor
 PKG_SECTION:=		app/editor
 PKG_DEPENDS:=		libncurses
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.vim.org/
 PKG_SITES:=		ftp://ftp.vim.org/pub/vim/unix/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-WRKDIST=		${WRKDIR}/vim74
+WRKDIST=		${WRKDIR}/vim80
 WRKSRC=			${WRKDIST}/src
 
 include ${ADK_TOPDIR}/mk/package.mk
@@ -61,7 +61,9 @@ vim-install:
 	${INSTALL_DIR} ${IDIR_VIM}/usr/bin
 	${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim
 	${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin
-	${CP} ${WRKINST}/usr/share/vim/vim74/vimrc_example.vim \
+	${CP} ${WRKINST}/usr/share/vim/vim80/defaults.vim \
+		${IDIR_VIM}/usr/share/vim/
+	${CP} ${WRKINST}/usr/share/vim/vim80/vimrc_example.vim \
 		${IDIR_VIM}/usr/share/vim/vimrc
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vim/patches/patch-src_osdef_sh b/package/vim/patches/patch-src_osdef_sh
deleted file mode 100644
index 8524eb74c..000000000
--- a/package/vim/patches/patch-src_osdef_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- vim73.orig/src/osdef.sh	2010-05-15 13:04:08.000000000 +0200
-+++ vim73/src/osdef.sh	2012-07-16 15:36:10.000000000 +0200
-@@ -49,7 +49,6 @@ EOF
- 
- # Mac uses precompiled headers, but we need real headers here.
- case `uname` in
--    Darwin)	$CC -I. -I$srcdir -E -no-cpp-precomp osdef0.c >osdef0.cc;;
-     *)		$CC -I. -I$srcdir -E osdef0.c >osdef0.cc;;
- esac
- 
-- 
cgit v1.2.3