diff options
| author | bapt <bapt@FreeBSD.org> | 2014-01-11 00:59:28 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-01-11 00:59:28 +0800 |
| commit | cdc811e292c4a2e565d96535294449d1b4cc221d (patch) | |
| tree | 451153aece08de662087b87ce13bfc685f41c57c /editors | |
| parent | 1a1a9134c17564fb35b16637032a3a6fcd1662a0 (diff) | |
| download | freebsd-ports-gnome-cdc811e292c4a2e565d96535294449d1b4cc221d.tar.gz freebsd-ports-gnome-cdc811e292c4a2e565d96535294449d1b4cc221d.tar.zst freebsd-ports-gnome-cdc811e292c4a2e565d96535294449d1b4cc221d.zip | |
Switch to use lua 5.2
While here change CONFLICTS into CONFLICTS_INSTALL which is what they really are
Bump portrevision
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 11f4af8f864f..974689b1013b 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -44,9 +44,9 @@ OPTIONS_DEFAULT+= CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \ CONFLICTS= vim6* vim*-gnome .if defined(LITE) -CONFLICTS+= vim* +CONFLICTS_INSTALL+= vim* .else -CONFLICTS+= vim*-lite +CONFLICTS_INSTALL+= vim*-lite .endif USES= pkgconfig @@ -96,7 +96,7 @@ MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE .endif .if ${PORT_OPTIONS:MLUA} -USE_LUA= yes +USES+= lua MAKE_ARGS+= CONF_OPT_LUA="--enable-luainterp=dynamic" MAKE_ARGS+= CONF_OPT_LUA_PREFIX="--with-lua-prefix=${LOCALBASE}" .endif @@ -180,7 +180,7 @@ pre-configure: s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ s|/usr/local|${LOCALBASE}|g; \ - s|set dummy lua;|set dummy lua-${LUA_VER};|g' \ + s|set dummy lua;|set dummy ${LUA_CMD};|g' \ ${WRKSRC}/auto/configure .if ${PORT_OPTIONS:MXTERM_SAVE} @${REINPLACE_CMD} -e ' \ |