- Update to 7.4.738

- Add PORTSCOUT

Changes:	https://github.com/vim/vim/commits/master
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2015-06-14 09:18:40 +00:00
parent ec56d1becc
commit ebd95eeb50
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=389616
5 changed files with 29 additions and 18 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vim
PORTVERSION= 7.4.729
PORTVERSION= 7.4.738
CATEGORIES?= editors
MAINTAINER?= sunpoet@FreeBSD.org
@ -20,6 +20,8 @@ EXUBERANT_CTAGS_DESC= Use exctags instead of ctags
UI_DESC= User interface
XTERM_SAVE_DESC= Restore xterm screen after exit
PORTSCOUT= site:https://github.com/vim/vim/releases
ALL_TARGET= # empty
MAKE_ARGS+= CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
MAKE_ARGS+= VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR}
@ -32,7 +34,7 @@ PORTDATA= ${VIM_VER}
VIM_VER= ${PORTNAME}${PORTVERSION:R:S/.//g}
GH_TAGNAME= db9bc0b
GH_TAGNAME= 29a5011
USE_GITHUB= yes
CPE_VERSION= ${PORTVERSION:R}

View file

@ -1,2 +1,2 @@
SHA256 (vim-vim-7.4.729-db9bc0b_GH0.tar.bz2) = 119c549cc8c3e13cf206f255be999ac3d47a36bfac8642c4c01700ffb9da4d54
SIZE (vim-vim-7.4.729-db9bc0b_GH0.tar.bz2) = 12172344
SHA256 (vim-vim-7.4.738-29a5011_GH0.tar.bz2) = 49c48b0d4cb3f5f6e05bce146c81d55c2c7923fe39aad7821e074d88078fe476
SIZE (vim-vim-7.4.738-29a5011_GH0.tar.bz2) = 12178259

View file

@ -1,6 +1,6 @@
--- src/auto/configure.orig 2014-12-04 04:16:00.326888901 +0800
+++ src/auto/configure 2014-12-04 04:18:43.019881161 +0800
@@ -889,7 +889,7 @@
--- src/auto/configure.orig 2015-05-14 03:56:21 UTC
+++ src/auto/configure
@@ -889,7 +889,7 @@ pdfdir='${docdir}'
psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
@ -9,7 +9,7 @@
ac_prev=
ac_dashdash=
@@ -4952,7 +4952,7 @@
@@ -4952,7 +4952,7 @@ $as_echo_n "checking Lua version of LuaJ
if ${vi_cv_version_lua_luajit+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -18,7 +18,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
$as_echo "$vi_cv_version_lua_luajit" >&6; }
@@ -5006,7 +5006,7 @@
@@ -5006,7 +5006,7 @@ $as_echo_n "checking Lua version... " >&
if ${vi_cv_version_plain_lua+:} false; then :
$as_echo_n "(cached) " >&6
else
@ -27,7 +27,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
$as_echo "$vi_cv_version_plain_lua" >&6; }
@@ -5097,7 +5097,7 @@
@@ -5097,7 +5097,7 @@ rm -f core conftest.err conftest.$ac_obj
LIBS=$libs_save
fi
if test "x$lua_ok" = "xyes"; then
@ -36,7 +36,7 @@
LUA_SRC="if_lua.c"
LUA_OBJ="objects/if_lua.o"
LUA_PRO="if_lua.pro"
@@ -5154,7 +5154,8 @@
@@ -5154,7 +5154,8 @@ $as_echo "yes" >&6; }
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
LUA_LIBS=""
@ -46,7 +46,7 @@
fi
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
@@ -5732,7 +5733,7 @@
@@ -5732,7 +5733,7 @@ if test "$enable_pythoninterp" = "yes" -
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
@ -55,7 +55,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6052,7 +6053,7 @@
@@ -6069,7 +6070,7 @@ if test "$enable_python3interp" = "yes"
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
@ -64,7 +64,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6867,7 +6868,7 @@
@@ -6884,7 +6885,7 @@ $as_echo_n "checking for location of tcl
$as_echo "$try/tclConfig.sh" >&6; }
. $try/tclConfig.sh
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`

View file

@ -1,6 +1,8 @@
--- src/installml.sh.orig Sun Apr 30 08:48:53 2006
+++ src/installml.sh Mon Jun 19 03:36:37 2006
@@ -55,12 +55,12 @@ if test $what = "install" -a \( -f $dest
--- src/installml.sh.orig 2015-05-14 03:56:21 UTC
+++ src/installml.sh
@@ -53,16 +53,16 @@ if test $what = "install" -a \( -f $dest
fi
# ex
- if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
- echo creating link $destdir/$exname.1
@ -21,7 +23,11 @@
+ # cd $destdir; ln -s $vimname.1 $viewname.1
+ #fi
@@ -121,10 +121,10 @@ if test $what = "uninstall"; then
# rvim
if test ! -f $destdir/$rvimname.1 -a -f $destdir/$vimname.1; then
@@ -119,14 +119,14 @@ fi
if test $what = "uninstall"; then
echo Checking for Vim manual page links in $destdir...
- if test -L $destdir/$exname.1; then
- echo deleting $destdir/$exname.1
@ -40,3 +46,5 @@
+ # rm -f $destdir/$viewname.1
+ #fi
if test -L $destdir/$rvimname.1; then
echo deleting $destdir/$rvimname.1
rm -f $destdir/$rvimname.1

View file

@ -10,3 +10,4 @@ Despite what the above comic suggests, Vim can be configured to work in a very
simple (Notepad-like) way, called evim or Easy Vim.
WWW: http://www.vim.org/
WWW: https://github.com/vim/vim