From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 10 16:59:28 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D78B411E;
 Fri, 10 Jan 2014 16:59:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3CFB1C82;
 Fri, 10 Jan 2014 16:59:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0AGxSnm093871;
 Fri, 10 Jan 2014 16:59:28 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0AGxS3T093870;
 Fri, 10 Jan 2014 16:59:28 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401101659.s0AGxS3T093870@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 10 Jan 2014 16:59:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339371 - head/editors/vim
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 16:59:28 -0000

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