From 111729c744c7e3ac51a0acf44aff88ba7d22deca Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 16 Mar 2016 18:25:19 -0400 Subject: [PATCH 1/1] vim: Keep files for vimtutor and spelling --- packages/vim-python/build.sh | 8 ++++---- packages/vim/build.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index 5a4dd081..abaa7be4 100755 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -3,14 +3,14 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/ TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python" # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README -TERMUX_PKG_VERSION=7.4.1510 +TERMUX_PKG_VERSION=7.4.1581 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/vim74/spell/en.ascii* share/vim/vim74/print share/vim/vim74/tools' # vim-python: TERMUX_PKG_CONFLICTS="vim" @@ -31,7 +31,7 @@ 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/ + cp $TERMUX_PREFIX/share/vim/vim74/tutor/{tutor,tutor.vim,tutor.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/ + cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim74/tutor/ } diff --git a/packages/vim/build.sh b/packages/vim/build.sh index 1c0eb526..c8615cae 100755 --- a/packages/vim/build.sh +++ b/packages/vim/build.sh @@ -3,14 +3,14 @@ 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 -TERMUX_PKG_VERSION=7.4.1510 +TERMUX_PKG_VERSION=7.4.1581 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/vim74/spell/en.ascii* share/vim/vim74/print share/vim/vim74/tools' TERMUX_PKG_CONFLICTS="vim-python" @@ -26,7 +26,7 @@ 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/ + cp $TERMUX_PREFIX/share/vim/vim74/tutor/{tutor,tutor.vim,tutor.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/ + cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim74/tutor/ } -- 2.11.0