update to vim 7.4.1467
This commit is contained in:
sthen
parent
ac81be2508
commit
d6f0108471
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.144 2015/10/30 13:00:37 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.145 2016/03/02 11:54:28 sthen Exp $
|
||||
|
||||
COMMENT-main= vi clone, many additional features
|
||||
COMMENT-lang= vi clone, NLS subpackage
|
||||
|
||||
V= 7.4.900
|
||||
V= 7.4.1467
|
||||
DISTNAME= vim-$V
|
||||
DISTFILES= vim-$V{v$V}.tar.gz
|
||||
PKGNAME-main= vim-$V
|
||||
@ -151,6 +151,7 @@ MODULES+= devel/gettext
|
||||
WRKSRC= ${WRKDIST}/src
|
||||
SUBST_VARS= P
|
||||
|
||||
# CONFIGURE_STYLE=autoconf doesn't work
|
||||
post-patch:
|
||||
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (vim-7.4.900.tar.gz) = qzCGMgwnzR2NxmZW+N5/Mx25G/BIbjowhwL4SDZTwnM=
|
||||
SIZE (vim-7.4.900.tar.gz) = 12288093
|
||||
SHA256 (vim-7.4.1467.tar.gz) = d2HUWbUlc7JT0+lEb3L2H7LgAAuZMoAzL6DS6kKRlq0=
|
||||
SIZE (vim-7.4.1467.tar.gz) = 12532588
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-runtime_filetype_vim,v 1.9 2015/10/30 13:00:37 sthen Exp $
|
||||
--- runtime/filetype.vim.orig Sun Oct 25 21:42:00 2015
|
||||
+++ runtime/filetype.vim Fri Oct 30 12:01:29 2015
|
||||
$OpenBSD: patch-runtime_filetype_vim,v 1.10 2016/03/02 11:54:29 sthen Exp $
|
||||
--- runtime/filetype.vim.orig Mon Feb 29 22:12:49 2016
|
||||
+++ runtime/filetype.vim Tue Mar 1 18:27:49 2016
|
||||
@@ -71,6 +71,14 @@ func! s:Check_inp()
|
||||
endif
|
||||
endfunc
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1.9 2015/10/30 13:00:37 sthen Exp $
|
||||
|
||||
" MakeIndex
|
||||
au BufNewFile,BufRead *.ist,*.mst setf ist
|
||||
@@ -2322,12 +2330,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
|
||||
@@ -2323,12 +2331,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
|
||||
au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
|
||||
|
||||
" Virata Config Script File or Drupal module
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
$OpenBSD: patch-src_configure_in,v 1.2 2015/04/10 12:25:46 sthen Exp $
|
||||
--- src/configure.in.orig Thu Apr 9 21:08:22 2015
|
||||
+++ src/configure.in Thu Apr 9 23:41:51 2015
|
||||
@@ -557,10 +557,10 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
|
||||
$OpenBSD: patch-src_configure_in,v 1.3 2016/03/02 11:54:29 sthen Exp $
|
||||
--- src/configure.in.orig Mon Feb 29 22:12:49 2016
|
||||
+++ src/configure.in Tue Mar 1 18:29:56 2016
|
||||
@@ -561,10 +561,10 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
- AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
|
||||
- if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
|
||||
- if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
|
||||
+ AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua-$vi_cv_version_lua)
|
||||
+ if test -f $vi_cv_path_lua_pfx/include/lua-$vi_cv_version_lua/lua.h; then
|
||||
+ if test -f "$vi_cv_path_lua_pfx/include/lua-$vi_cv_version_lua/lua.h"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
- LUA_INC=/lua$vi_cv_version_lua
|
||||
+ LUA_INC=/lua-$vi_cv_version_lua
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
vi_cv_path_lua_pfx=
|
||||
@@ -585,9 +585,9 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
|
||||
@@ -589,9 +589,9 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
|
||||
else
|
||||
if test "X$LUA_INC" != "X"; then
|
||||
dnl Test alternate location using version
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_vim_h,v 1.5 2015/04/10 12:25:46 sthen Exp $
|
||||
--- src/vim.h.orig Thu Apr 9 21:08:22 2015
|
||||
+++ src/vim.h Thu Apr 9 23:41:51 2015
|
||||
$OpenBSD: patch-src_vim_h,v 1.6 2016/03/02 11:54:29 sthen Exp $
|
||||
--- src/vim.h.orig Mon Feb 29 22:12:49 2016
|
||||
+++ src/vim.h Tue Mar 1 18:27:49 2016
|
||||
@@ -276,6 +276,7 @@
|
||||
# include "os_beos.h"
|
||||
# define __ARGS(x) x
|
||||
&& !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */
|
||||
# include "auto/osdef.h" /* bring missing declarations in */
|
||||
#endif
|
||||
+#define UNUSED __attribute__((unused))
|
||||
|
||||
#if (defined(UNIX) || defined(__EMX__) || defined(VMS)) \
|
||||
&& (!defined(MACOS_X) || defined(HAVE_CONFIG_H))
|
||||
#ifdef __EMX__
|
||||
# define getcwd _getcwd2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.13 2015/10/30 13:00:37 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.14 2016/03/02 11:54:29 sthen Exp $
|
||||
@pkgpath ${BASE_PKGPATH}
|
||||
%%gtk2%%
|
||||
bin/ex
|
||||
@ -149,6 +149,7 @@ share/vim/${P}/doc/
|
||||
share/vim/${P}/doc/arabic.txt
|
||||
share/vim/${P}/doc/autocmd.txt
|
||||
share/vim/${P}/doc/change.txt
|
||||
share/vim/${P}/doc/channel.txt
|
||||
share/vim/${P}/doc/cmdline.txt
|
||||
share/vim/${P}/doc/debug.txt
|
||||
share/vim/${P}/doc/debugger.txt
|
||||
@ -163,7 +164,6 @@ share/vim/${P}/doc/fold.txt
|
||||
share/vim/${P}/doc/ft_ada.txt
|
||||
share/vim/${P}/doc/ft_sql.txt
|
||||
share/vim/${P}/doc/gui.txt
|
||||
share/vim/${P}/doc/gui_w16.txt
|
||||
share/vim/${P}/doc/gui_w32.txt
|
||||
share/vim/${P}/doc/gui_x11.txt
|
||||
share/vim/${P}/doc/hangulin.txt
|
||||
@ -332,6 +332,7 @@ share/vim/${P}/ftplugin/dosbatch.vim
|
||||
share/vim/${P}/ftplugin/dosini.vim
|
||||
share/vim/${P}/ftplugin/dtd.vim
|
||||
share/vim/${P}/ftplugin/dtrace.vim
|
||||
share/vim/${P}/ftplugin/eiffel.vim
|
||||
share/vim/${P}/ftplugin/elinks.vim
|
||||
share/vim/${P}/ftplugin/erlang.vim
|
||||
share/vim/${P}/ftplugin/eruby.vim
|
||||
@ -356,6 +357,8 @@ share/vim/${P}/ftplugin/haml.vim
|
||||
share/vim/${P}/ftplugin/hamster.vim
|
||||
share/vim/${P}/ftplugin/haskell.vim
|
||||
share/vim/${P}/ftplugin/help.vim
|
||||
share/vim/${P}/ftplugin/hgcommit.vim
|
||||
share/vim/${P}/ftplugin/hog.vim
|
||||
share/vim/${P}/ftplugin/hostconf.vim
|
||||
share/vim/${P}/ftplugin/hostsaccess.vim
|
||||
share/vim/${P}/ftplugin/html.vim
|
||||
@ -532,6 +535,7 @@ share/vim/${P}/indent/gitolite.vim
|
||||
share/vim/${P}/indent/go.vim
|
||||
share/vim/${P}/indent/haml.vim
|
||||
share/vim/${P}/indent/hamster.vim
|
||||
share/vim/${P}/indent/hog.vim
|
||||
share/vim/${P}/indent/html.vim
|
||||
share/vim/${P}/indent/htmldjango.vim
|
||||
share/vim/${P}/indent/idlang.vim
|
||||
@ -1369,6 +1373,7 @@ share/vim/${P}/tools/blink.c
|
||||
share/vim/${P}/tools/ccfilter.1
|
||||
share/vim/${P}/tools/ccfilter.c
|
||||
share/vim/${P}/tools/ccfilter_README.txt
|
||||
share/vim/${P}/tools/demoserver.py
|
||||
share/vim/${P}/tools/efm_filter.pl
|
||||
share/vim/${P}/tools/efm_filter.txt
|
||||
share/vim/${P}/tools/efm_perl.pl
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user