summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2013-04-05 08:23:44 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2013-04-05 08:23:44 +0000
commit2088f0950096ac6ce93100c3d2b4a8669cf97f57 (patch)
treee929e8ac0a3df21219cbcb55911d56834940dc94 /editors
parentRegripper distfile has been rerolled. (diff)
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)
Notes
Notes: svn path=/head/; revision=315730
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-lite/Makefile9
-rw-r--r--editors/vim/Makefile4
2 files changed, 5 insertions, 8 deletions
diff --git a/editors/vim-lite/Makefile b/editors/vim-lite/Makefile
index 75b0ea6c79f0..211f24b21fbd 100644
--- a/editors/vim-lite/Makefile
+++ b/editors/vim-lite/Makefile
@@ -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"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 3675360634b2..1273cc819b84 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -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"