Date: Fri, 10 Jan 2014 16:59:28 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339371 - head/editors/vim Message-ID: <201401101659.s0AGxS3T093870@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jan 10 16:59:28 2014 New Revision: 339371 URL: http://svnweb.freebsd.org/changeset/ports/339371 Log: Switch to use lua 5.2 While here change CONFLICTS into CONFLICTS_INSTALL which is what they really are Bump portrevision Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Fri Jan 10 16:45:49 2014 (r339370) +++ head/editors/vim/Makefile Fri Jan 10 16:59:28 2014 (r339371) @@ -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 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-tclin .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 ' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401101659.s0AGxS3T093870>