svn commit: r315730 - in head/editors: vim vim-lite

[Baptiste Daroussin]

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 at NUXI.com)
-#
+# Created by: David O'Brien (obrien at NUXI.com)
 # $FreeBSD$
-#
 
 LITE=		yes
 
@@ -13,4 +8,6 @@ MASTERDIR=	${.CURDIR}/../vim
 MAINTAINER?=	obrien at 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"