kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch to use lua 5.2

Browse source 
While here change CONFLICTS into CONFLICTS_INSTALL which is what they really are
Bump portrevision
This commit is contained in:
Baptiste Daroussin 2014-01-10 16:59:28 +00:00
parent a518b2145e
commit 85e19b2207
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=339371
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editors/vim/Makefile
View file

@ -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 ' \