Index: head/editors/vim/Makefile =================================================================== --- head/editors/vim/Makefile (revision 430124) +++ head/editors/vim/Makefile (revision 430125) @@ -1,187 +1,188 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= vim PORTVERSION= 8.0.0134 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org COMMENT?= Improved version of the vi editor LICENSE= VIM LICENSE_NAME= VIM License LICENSE_FILE= ${WRKSRC}/runtime/doc/uganda.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE OPTIONS_SINGLE= UI OPTIONS_SINGLE_UI= ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11 OPTIONS_GROUP= LANGBIND OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON RUBY TCL OPTIONS_SUB= yes DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting EXUBERANT_CTAGS_DESC= Use exctags instead of ctags XTERM_SAVE_DESC= Restore xterm screen after exit UI_DESC= User interface ATHENA_DESC= Athena GUI toolkit CSCOPE_DESC= cscope support CONSOLE_DESC= Console/terminal mode LANGBIND_DESC= Optional language bindings ALL_TARGET= # empty MAKE_ARGS+= CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" MAKE_ARGS+= VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR} MAKE_ARGS+= CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=ncurses REINPLACE_ARGS= -i '' USES= cpe iconv ncurses pkgconfig shebangfix PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA= ${VIM_VER} VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} SLAVEDIRS= editors/vim-lite USE_GITHUB= yes SHEBANG_FILES= runtime/tools/efm_perl.pl CPE_VERSION= ${PORTVERSION:R} PORTSCOUT= site:https://github.com/vim/vim/releases .if defined(LITE) PKGNAMESUFFIX+= -lite CONFLICTS_INSTALL= vim-[0-9]* OPTIONS_DEFAULT=DEFAULT_VIMRC OPTIONS_SLAVE= CONSOLE OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC} \ ${OPTIONS_SINGLE_UI:NCONSOLE} \ ${OPTIONS_GROUP_LANGBIND} 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=huge \ CONF_OPT_INPUT=--enable-xim \ CONF_OPT_OUTPUT=--enable-fontset PLIST_SUB+= NON_LITE="" .endif # GENERAL OPTIONS CSCOPE_MAKE_ARGS= CONF_OPT_CSCOPE=--enable-cscope CSCOPE_RUN_DEPENDS= cscope:devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= exctags:devel/ctags NLS_MAKE_ARGS= CONF_OPT_NLS=--enable-nls NLS_MAKE_ARGS_OFF= CONF_OPT_NLS=--disable-nls NLS_USES= gettext # UI ATHENA_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=athena ATHENA_PLIST_SUB= GUI="" ATHENA_USE= XORG=ice,sm,x11,xaw,xmu,xpm,xt CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --without-x" CONSOLE_PLIST_SUB= GUI="@comment " GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 GNOME_PLIST_SUB= GUI="" GNOME_IMPLIES= NLS GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 GTK2_PLIST_SUB= GUI="" GTK2_USE= GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt GTK3_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk3 GTK3_PLIST_SUB= GUI="" GTK3_USE= GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt MOTIF_MAKE_ARGS= CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE} MOTIF_PLIST_SUB= GUI="" MOTIF_USES= motif MOTIF_USE= XORG=ice,sm,x11,xmu,xt X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X11_PLIST_SUB= GUI="@comment " X11_USE= XORG=ice,sm,x11,xt # LANGUAGE BINDINGS LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} LUA_USES= lua 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+ .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-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap post-patch: @${FIND} ${WRKSRC}/ -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e 's| $$<| $$>|' @${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 @${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h @${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h post-patch-EXUBERANT_CTAGS-off: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R \.|${FIND} . -type f \\\| ${XARGS} ctags|g' post-patch-EXUBERANT_CTAGS-on: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R \.|exctags -R .|g' pre-configure: @${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk @${DO_MAKE_BUILD} -C ${WRKSRC}/src 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 pre-configure-XTERM_SAVE-on: @${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h post-configure: @${DO_MAKE_BUILD} -C ${WRKSRC}/src scratch config @${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h post-install: .for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff ${LN} -s vim ${STAGEDIR}${PREFIX}/bin/$F .endfor post-install-DEFAULT_VIMRC-on: @${MKDIR} ${STAGEDIR}${ETCDIR} ${SED} -e '/set nocompatible/d' ${FILESDIR}/vimrc > ${STAGEDIR}${ETCDIR}/gvimrc.sample ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample post-install-NLS-off: @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap .include Index: head/editors/vim/files/patch-src-auto-configure =================================================================== --- head/editors/vim/files/patch-src-auto-configure (revision 430124) +++ head/editors/vim/files/patch-src-auto-configure (revision 430125) @@ -1,74 +1,74 @@ --- src/auto/configure.orig 2016-01-31 19:24:32 UTC +++ src/auto/configure @@ -895,7 +895,7 @@ pdfdir='${docdir}' psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +mandir='${prefix}/man' ac_prev= ac_dashdash= @@ -4963,7 +4963,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; } @@ -5017,7 +5017,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; } @@ -5108,7 +5108,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" @@ -5165,7 +5165,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" && \ @@ -5806,7 +5807,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 @@ -6146,7 +6147,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.5 python3.4 python3.3 python3.2 ++ for ac_prog in python3.6 python3.5 python3.4 python3.3 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6970,6 +6971,7 @@ $as_echo "$try/tclConfig.sh" >&6; } TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` fi 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