X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c355f81c362c7c7f6fd02b815b073a96bba83513..02baa030aa6273c97592f6790499f8892cb59223:/packages/vim/build.sh

diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index dec4d18f..f9ba96a5 100755
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -1,29 +1,18 @@
-TERMUX_PKG_DESCRIPTION="Highly configurable text editor built to enable efficient text editing"
+TERMUX_PKG_DESCRIPTION="Vi IMproved - enhanced vi editor"
 TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
 
-# Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-VIM_MINOR_REVISION=796
-VIM_TAGNAME="v7-4-${VIM_MINOR_REVISION}"
-TERMUX_PKG_VERSION=7.4.${VIM_MINOR_REVISION}
-TERMUX_PKG_SRCURL="https://code.google.com/p/vim/source/browse/?name=$VIM_TAGNAME"
+# Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
+TERMUX_PKG_VERSION=8.0.0206
+TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
+TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-tlib=ncursesw --enable-multibyte --without-x --enable-gui=no --disable-darwin --with-features=huge"
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_RM_AFTER_INSTALL='bin/rview bin/rvim bin/ex share/man/man1/evim.1 share/icons share/vim/vim74/spell/en.ascii* share/vim/vim74/spell/en.latin1* share/vim/vim74/print share/vim/vim74/tools'
+TERMUX_PKG_RM_AFTER_INSTALL='bin/rview bin/rvim bin/ex share/man/man1/evim.1 share/icons share/vim/vim80/spell/en.ascii* share/vim/vim80/print share/vim/vim80/tools'
 
-termux_step_extract_package () {
-	if test ! -d $TERMUX_PKG_CACHEDIR/vim-hg; then
-		hg clone https://vim.googlecode.com/hg/ $TERMUX_PKG_CACHEDIR/vim-hg
-	fi
-	cd $TERMUX_PKG_CACHEDIR/vim-hg
-	hg pull -u
-	hg update "$VIM_TAGNAME"
-
-	cp -Rf $TERMUX_PKG_CACHEDIR/vim-hg $TERMUX_PKG_SRCDIR
-	cd $TERMUX_PKG_SRCDIR
-}
+TERMUX_PKG_CONFLICTS="vim-python"
 
 termux_step_pre_configure () {
 	make distclean
@@ -36,8 +25,11 @@ termux_step_pre_configure () {
 termux_step_post_make_install () {
 	cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
 
-        # Remove most tutor files:
-        cp $TERMUX_PREFIX/share/vim/vim74/tutor/tutor.{vim,utf-8} $TERMUX_PKG_TMPDIR/
-        rm -f $TERMUX_PREFIX/share/vim/vim74/tutor/*
-        cp $TERMUX_PKG_TMPDIR/tutor.{vim,utf-8} $TERMUX_PREFIX/share/vim/vim74/tutor/
+	# Remove most tutor files:
+	cp $TERMUX_PREFIX/share/vim/vim80/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/
+	rm -f $TERMUX_PREFIX/share/vim/vim80/tutor/*
+	cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim80/tutor/
+
+	cd $TERMUX_PREFIX/bin
+	ln -f -s vim vi
 }