Index: head/editors/vim/Makefile =================================================================== --- head/editors/vim/Makefile (revision 389615) +++ head/editors/vim/Makefile (revision 389616) @@ -1,165 +1,167 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= vim -PORTVERSION= 7.4.729 +PORTVERSION= 7.4.738 CATEGORIES?= editors MAINTAINER?= sunpoet@FreeBSD.org COMMENT?= Improved version of the vi editor OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE OPTIONS_SINGLE= UI OPTIONS_SINGLE_UI= ATHENA CONSOLE GNOME GTK2 MOTIF X11 OPTIONS_SUB= yes ATHENA_DESC= Athena GUI toolkit CSCOPE_DESC= cscope support CONSOLE_DESC= Console/terminal mode DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting 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} REINPLACE_ARGS= -i '' USES= cpe iconv pkgconfig shebangfix tar:bzip2 WANT_GNOME= yes PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA= ${VIM_VER} VIM_VER= ${PORTNAME}${PORTVERSION:R:S/.//g} -GH_TAGNAME= db9bc0b +GH_TAGNAME= 29a5011 USE_GITHUB= yes CPE_VERSION= ${PORTVERSION:R} SLAVEDIRS= editors/vim-lite SHEBANG_FILES= runtime/tools/efm_perl.pl .if defined(LITE) PKGNAMESUFFIX+= -lite CONFLICTS_INSTALL= vim-[0-9]* OPTIONS_DEFAULT=DEFAULT_VIMRC OPTIONS_EXCLUDE=ATHENA CSCOPE EXUBERANT_CTAGS GNOME GTK2 LUA MOTIF NLS PERL PYTHON RUBY TCL X11 XTERM_SAVE OPTIONS_SLAVE= CONSOLE MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" \ CONF_OPT_LUA=--disable-luainterp \ CONF_OPT_PERL=--disable-perlinterp \ CONF_OPT_PYTHON="--disable-pythoninterp --disable-python3interp" \ CONF_OPT_RUBY=--disable-rubyinterp \ CONF_OPT_TCL=--disable-tclinterp PLIST_SUB+= NON_LITE="@comment " .else CONFLICTS_INSTALL= vim-lite-[0-9]* OPTIONS_DEFAULT=CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL MAKE_ARGS+= CONF_OPT_FEAT=--with-features=big \ CONF_OPT_INPUT=--enable-xim \ CONF_OPT_OUTPUT=--enable-fontset PLIST_SUB+= NON_LITE="" .endif ATHENA_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=athena ATHENA_USE= XORG=xaw CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --without-x" CSCOPE_MAKE_ARGS= CONF_OPT_CSCOPE=--enable-cscope CSCOPE_RUN_DEPENDS= ${LOCALBASE}/bin/cscope:${PORTSDIR}/devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= ${LOCALBASE}/bin/exctags:${PORTSDIR}/devel/ctags GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" GNOME_USE= GNOME=libgnomeui XORG=glproto,xpm,xt GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" GTK2_USE= GNOME=gtk20 XORG=xpm,xt LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} LUA_USES= lua MOTIF_MAKE_ARGS= CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE} MOTIF_USES= motif NLS_MAKE_ARGS= CONF_OPT_NLS=--enable-nls NLS_MAKE_ARGS_OFF= CONF_OPT_NLS=--disable-nls NLS_USES= gettext PERL_MAKE_ARGS= CONF_OPT_PERL=--enable-perlinterp PERL_USES= perl5 PYTHON_USES= python RUBY_MAKE_ARGS= CONF_OPT_RUBY=--enable-rubyinterp RUBY_USE= RUBY=yes TCL_MAKE_ARGS= CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}" TCL_USES= tcl:85+ X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt" X11_USE= XORG=x11,xt .include .if !${PORT_OPTIONS:MATHENA} && !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MGNOME} && !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MMOTIF} && !${PORT_OPTIONS:MX11} IGNORE= this port has new UI option (CONSOLE) for users who do not need GUI support. Please run "make config" to modify your setting .endif .if ${PORT_OPTIONS:MCONSOLE} || ${PORT_OPTIONS:MX11} PLIST_SUB+= GUI="@comment " .else PLIST_SUB+= GUI="" .endif .if ${PORT_OPTIONS:MEXUBERANT_CTAGS} CTAGS_CMD= exctags -R . .else CTAGS_CMD= ${FIND} . -type f \\| ${XARGS} ctags .endif .include .if ${PORT_OPTIONS:MPYTHON} .if ${PYTHON_REL} < 3000 MAKE_ARGS+= CONF_OPT_PYTHON="--enable-pythoninterp --disable-python3interp" .else MAKE_ARGS+= CONF_OPT_PYTHON="--enable-python3interp --disable-pythoninterp" .endif .endif post-patch: @${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g' ${WRKSRC}/src/auto/configure @${FIND} ${WRKSRC}/runtime/ -name menu\*.vim -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g' @${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h @${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h pre-configure: @${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk @(cd ${WRKSRC}/src/ && ${MAKE_CMD} distclean) @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \ -e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \ -e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure .if ${PORT_OPTIONS:MXTERM_SAVE} @${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h .endif post-configure: @(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} scratch config) @${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/ .for file in evim rview rvim vimdiff ${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} .endfor .if !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MX11} .for file in eview gview gvim gvimdiff rgview rgvim ${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} .endfor .endif .if ${PORT_OPTIONS:MDEFAULT_VIMRC} ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/gvimrc.sample ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample .endif .if !${PORT_OPTIONS:MNLS} ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/ ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/ .endif ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/ ${TOUCH} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/.keepme .include Index: head/editors/vim/distinfo =================================================================== --- head/editors/vim/distinfo (revision 389615) +++ head/editors/vim/distinfo (revision 389616) @@ -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 Index: head/editors/vim/files/patch-installml.sh =================================================================== --- head/editors/vim/files/patch-installml.sh (revision 389615) +++ head/editors/vim/files/patch-installml.sh (nonexistent) @@ -1,42 +0,0 @@ ---- 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 - # ex -- if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then -- echo creating link $destdir/$exname.1 -- cd $destdir; ln -s $vimname.1 $exname.1 -- fi -+ #if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then -+ # echo creating link $destdir/$exname.1 -+ # cd $destdir; ln -s $vimname.1 $exname.1 -+ #fi - - # view -- if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then -- echo creating link $destdir/$viewname.1 -- cd $destdir; ln -s $vimname.1 $viewname.1 -- fi -+ #if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then -+ # echo creating link $destdir/$viewname.1 -+ # cd $destdir; ln -s $vimname.1 $viewname.1 -+ #fi - -@@ -121,10 +121,10 @@ if test $what = "uninstall"; then - -- if test -L $destdir/$exname.1; then -- echo deleting $destdir/$exname.1 -- rm -f $destdir/$exname.1 -- fi -- if test -L $destdir/$viewname.1; then -- echo deleting $destdir/$viewname.1 -- rm -f $destdir/$viewname.1 -- fi -+ #if test -L $destdir/$exname.1; then -+ # echo deleting $destdir/$exname.1 -+ # rm -f $destdir/$exname.1 -+ #fi -+ #if test -L $destdir/$viewname.1; then -+ # echo deleting $destdir/$viewname.1 -+ # rm -f $destdir/$viewname.1 -+ #fi - if test -L $destdir/$rvimname.1; then Property changes on: head/editors/vim/files/patch-installml.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vim/files/patch-src-auto-configure =================================================================== --- head/editors/vim/files/patch-src-auto-configure (revision 389615) +++ head/editors/vim/files/patch-src-auto-configure (revision 389616) @@ -1,75 +1,75 @@ ---- 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' -mandir='${datarootdir}/man' +mandir='${prefix}/man' 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 - vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` + vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'` 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 - vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'` + vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'` 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 - LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}" + LUA_CFLAGS="-I${LUA_INCDIR}" 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="" - LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" + vi_cv_version_lua=${LUA_VER} + LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so\\\" $LUA_CFLAGS" 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 - for ac_prog in python2 python + for ac_prog in python2.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 - for ac_prog in python3 python + for ac_prog in python3.4 python3.3 python3.2 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"` - TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi done Index: head/editors/vim/files/patch-src-installml.sh =================================================================== --- head/editors/vim/files/patch-src-installml.sh (nonexistent) +++ head/editors/vim/files/patch-src-installml.sh (revision 389616) @@ -0,0 +1,50 @@ +--- 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 +- cd $destdir; ln -s $vimname.1 $exname.1 +- fi ++ #if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then ++ # echo creating link $destdir/$exname.1 ++ # cd $destdir; ln -s $vimname.1 $exname.1 ++ #fi + + # view +- if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then +- echo creating link $destdir/$viewname.1 +- cd $destdir; ln -s $vimname.1 $viewname.1 +- fi ++ #if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then ++ # echo creating link $destdir/$viewname.1 ++ # cd $destdir; ln -s $vimname.1 $viewname.1 ++ #fi + + # 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 +- rm -f $destdir/$exname.1 +- fi +- if test -L $destdir/$viewname.1; then +- echo deleting $destdir/$viewname.1 +- rm -f $destdir/$viewname.1 +- fi ++ #if test -L $destdir/$exname.1; then ++ # echo deleting $destdir/$exname.1 ++ # rm -f $destdir/$exname.1 ++ #fi ++ #if test -L $destdir/$viewname.1; then ++ # echo deleting $destdir/$viewname.1 ++ # rm -f $destdir/$viewname.1 ++ #fi + if test -L $destdir/$rvimname.1; then + echo deleting $destdir/$rvimname.1 + rm -f $destdir/$rvimname.1 Property changes on: head/editors/vim/files/patch-src-installml.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/vim/pkg-descr =================================================================== --- head/editors/vim/pkg-descr (revision 389615) +++ head/editors/vim/pkg-descr (revision 389616) @@ -1,12 +1,13 @@ Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX systems. Vim is often called a "programmer's editor," and so useful for programming that many consider it an entire IDE. It's not just for programmers, though. Vim is perfect for all kinds of text editing, from composing email to editing configuration files. 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