From owner-svn-ports-all@FreeBSD.ORG  Fri Apr  5 08:23:45 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1EBAB1BC;
 Fri,  5 Apr 2013 08:23:45 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ED004835;
 Fri,  5 Apr 2013 08:23:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r358NiYT002201;
 Fri, 5 Apr 2013 08:23:44 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r358NiDP002199;
 Fri, 5 Apr 2013 08:23:44 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304050823.r358NiDP002199@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 5 Apr 2013 08:23:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315730 - in head/editors: vim vim-lite
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.14
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, 05 Apr 2013 08:23:45 -0000

Author: bapt
Date: Fri Apr  5 08:23:44 2013
New Revision: 315730
URL: http://svnweb.freebsd.org/changeset/ports/315730

Log:
  Fix conversion to optionsng breaking multibyte support
  
  Reported by:	Sergey V. Dyatko via irc
  Tested by:	Sergey V. Dyatko via irc
  Approved by:	portmgr (implicit)

Modified:
  head/editors/vim-lite/Makefile
  head/editors/vim/Makefile

Modified: head/editors/vim-lite/Makefile
==============================================================================
--- head/editors/vim-lite/Makefile	Thu Apr  4 22:58:47 2013	(r315729)
+++ head/editors/vim-lite/Makefile	Fri Apr  5 08:23:44 2013	(r315730)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  vim-lite
-# Date created:			  Fri Jun 25, 1999
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
+# Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
-#
 
 LITE=		yes
 
@@ -13,4 +8,6 @@ MASTERDIR=	${.CURDIR}/../vim
 MAINTAINER?=	obrien@FreeBSD.org
 COMMENT?=	Vi "workalike", with many additional features (Lite package)
 
+PORTREVISION=	2
+
 .include "${MASTERDIR}/Makefile"

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Thu Apr  4 22:58:47 2013	(r315729)
+++ head/editors/vim/Makefile	Fri Apr  5 08:23:44 2013	(r315730)
@@ -112,11 +112,12 @@ WANT_GNOME=	yes
 
 .if defined(LITE)
 PKGNAMESUFFIX=	-lite
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
+CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp --disable-luainterp"
 .else	# !LITE
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+CONF_OPT_GUI="--enable-gui=no --without-x"
 .endif
 
 .if ${PORT_OPTIONS:MCSCOPE}
@@ -131,7 +132,6 @@ CTAGS_CMD=	exctags -R .
 CTAGS_CMD=	${FIND} . -type f \\|${XARGS} ctags
 .endif
 
-CONF_OPT_GUI="--enable-gui=no --without-x"
 
 .if ${PORT_OPTIONS:MX11}
 CONF_OPT_GUI="--enable-gui=no --with-x"