Reorganize and simplify the vim Makefile

There should be no changes to the generated packages from this reorganization.
The bulk of the changes involve better leveraging OPTIONS helpers, including
making vim-lite into an OPTION (which is always SLAVEd or EXCLUDEd).

3 files changed, 213 insertions, 207 deletions

diff --git a/editors/vim-lite/Makefile b/editors/vim-lite/Makefile
index bd5c13567a7a..a990773079c6 100644
--- a/editors/vim-lite/Makefile
+++ b/editors/vim-lite/Makefile
@@ -1,7 +1,8 @@
 # Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
 
-MAINTAINER=	adamw@FreeBSD.org
+PKGNAMESUFFIX=	-lite
+
 COMMENT=	Improved version of the vi editor (lite package)
 
 LITE=		yes
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 012d1bd53d7c..94b6512c8510 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -14,16 +14,38 @@ LICENSE_NAME=	VIM License
 LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=		CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE
+USES=		cpe iconv ncurses pkgconfig shebangfix
+MAKE_JOBS_UNSAFE=	yes
+
+USE_GITHUB=	yes
+SHEBANG_FILES=	runtime/tools/demoserver.py runtime/tools/efm_perl.pl
+CPE_VERSION=	${PORTVERSION:R}
+PORTSCOUT=	site:https://github.com/vim/vim/releases
+
+PLIST_SUB=	VIM_VER=${VIM_VER}
+PORTDATA=	${VIM_VER}
+SLAVEDIRS=	editors/vim-lite
+REINPLACE_ARGS=	-i ''
+VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
+
+ALL_TARGET=	# empty
+MAKE_ARGS+=	CC="${CC}" \
+		CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" \
+		STRIP="${STRIP_CMD}" \
+		VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} \
+		VIMRCLOC=${ETCDIR} \
+		CONF_OPT_MULTIBYTE=--enable-multibyte \
+		CONF_TERM_LIB=--with-tlib=ncurses
+
+# OPTIONS
+OPTIONS_DEFAULT=	CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL
+OPTIONS_DEFINE=		CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LITE NLS XTERM_SAVE
 OPTIONS_SINGLE=		UI
 OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11
 OPTIONS_GROUP=		LANGBIND
 OPTIONS_GROUP_LANGBIND=	LUA PERL PYTHON RUBY TCL
 OPTIONS_SUB=		yes
 
-# BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute
-OPTIONS_EXCLUDE_powerpc64=	RUBY
-
 DEFAULT_VIMRC_DESC=	Install bundled vimrc as default setting
 EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
 XTERM_SAVE_DESC=	Restore xterm screen after exit
@@ -35,54 +57,32 @@ CONSOLE_DESC=		Console/terminal mode
 
 LANGBIND_DESC=		Optional language bindings
 
-ALL_TARGET=	# empty
-MAKE_ARGS+=	CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}"
-MAKE_ARGS+=	VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} VIMRCLOC=${ETCDIR}
-MAKE_ARGS+=	CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=ncurses
-REINPLACE_ARGS=	-i ''
-USES=		cpe iconv ncurses pkgconfig shebangfix
-MAKE_JOBS_UNSAFE=	yes
-
-PLIST_SUB=	VIM_VER=${VIM_VER}
-PORTDATA=	${VIM_VER}
-VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
-SLAVEDIRS=	editors/vim-lite
-
-USE_GITHUB=	yes
-SHEBANG_FILES=	runtime/tools/demoserver.py runtime/tools/efm_perl.pl
-CPE_VERSION=	${PORTVERSION:R}
-PORTSCOUT=	site:https://github.com/vim/vim/releases
+# BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute
+OPTIONS_EXCLUDE_powerpc64=	RUBY
 
 .if defined(LITE)
-PKGNAMESUFFIX+=	-lite
-CONFLICTS_INSTALL=	vim-[0-9]*
 OPTIONS_DEFAULT=DEFAULT_VIMRC
-OPTIONS_SLAVE=	CONSOLE
-OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NDEFAULT_VIMRC} \
+OPTIONS_SLAVE=	CONSOLE LITE
+OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NDEFAULT_VIMRC:NLITE} \
 			${OPTIONS_SINGLE_UI:NCONSOLE} \
 			${OPTIONS_GROUP_LANGBIND}
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" \
-		CONF_OPT_LUA=--disable-luainterp \
-		CONF_OPT_PERL=--disable-perlinterp \
-		CONF_OPT_PYTHON="--disable-pythoninterp --disable-python3interp" \
-		CONF_OPT_RUBY=--disable-rubyinterp \
-		CONF_OPT_TCL=--disable-tclinterp
-PLIST_SUB+=	NON_LITE="@comment "
 .else
-CONFLICTS_INSTALL=	vim-lite-[0-9]*
-OPTIONS_DEFAULT=CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL
-MAKE_ARGS+=	CONF_OPT_FEAT=--with-features=huge \
-		CONF_OPT_INPUT=--enable-xim \
-		CONF_OPT_OUTPUT=--enable-fontset
-PLIST_SUB+=	NON_LITE=""
+OPTIONS_EXCLUDE=LITE
 .endif
 
 # GENERAL OPTIONS
 CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
+CSCOPE_MAKE_ARGS_OFF=	CONF_OPT_CSCOPE=--disable-cscope
 CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
 
 EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
 
+LITE_CONFLICTS_INSTALL=		vim-[0-9]*
+LITE_CONFLICTS_INSTALL_OFF=	vim-lite-[0-9]*
+LITE_MAKE_ARGS_OFF=		CONF_OPT_FEAT=--with-features=huge \
+				CONF_OPT_INPUT=--enable-xim \
+				CONF_OPT_OUTPUT=--enable-fontset
+
 NLS_MAKE_ARGS=		CONF_OPT_NLS=--enable-nls
 NLS_MAKE_ARGS_OFF=	CONF_OPT_NLS=--disable-nls
 NLS_USES=		gettext
@@ -125,17 +125,22 @@ X11_USE=		XORG=ice,sm,x11,xt
 
 # LANGUAGE BINDINGS
 LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
+LUA_MAKE_ARGS_OFF=	CONF_OPT_LUA=--disable-luainterp
 LUA_USES=		lua
 
 PERL_MAKE_ARGS=		CONF_OPT_PERL=--enable-perlinterp
+PERL_MAKE_ARGS_OFF=	CONF_OPT_PERL=--disable-perlinterp
 PERL_USES=		perl5
 
+PYTHON_MAKE_ARGS_OFF=	CONF_OPT_PYTHON="--disable-pythoninterp --disable-python3interp"
 PYTHON_USES=		python
 
 RUBY_MAKE_ARGS=		CONF_OPT_RUBY=--enable-rubyinterp
+RUBY_MAKE_ARGS_OFF=	CONF_OPT_RUBY=--disable-rubyinterp
 RUBY_USE=		RUBY=yes
 
 TCL_MAKE_ARGS=		CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}"
+TCL_MAKE_ARGS_OFF=	CONF_OPT_TCL=--disable-tclinterp
 TCL_USES=		tcl:85+
 
 .include <bsd.port.pre.mk>
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 400e4772e25b..14b557080ab0 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -3,7 +3,7 @@ bin/evim
 %%GUI%%bin/gview
 %%GUI%%bin/gvim
 %%GUI%%bin/gvimdiff
-%%GUI%%%%NON_LITE%%bin/gvimtutor
+%%GUI%%%%NO_LITE%%bin/gvimtutor
 %%GUI%%bin/rgview
 %%GUI%%bin/rgvim
 bin/rview
@@ -14,178 +14,178 @@ bin/vimtutor
 bin/xxd
 %%DEFAULT_VIMRC%%@sample %%ETCDIR%%/gvimrc.sample
 %%DEFAULT_VIMRC%%@sample %%ETCDIR%%/vimrc.sample
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/fr/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/fr.ISO8859-1/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/fr.UTF-8/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/it/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/it.ISO8859-1/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/it.UTF-8/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ja/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/ja/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%man/man1/eview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/fr/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/fr.ISO8859-1/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/fr.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/it/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/it.ISO8859-1/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/it.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ja/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/ja/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%man/man1/eview.1.gz
 man/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%man/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%man/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%man/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%man/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%man/man1/rgvim.1.gz
+%%GUI%%%%NO_LITE%%man/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%man/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%man/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%man/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%man/man1/rgvim.1.gz
 man/man1/rview.1.gz
 man/man1/rvim.1.gz
 man/man1/vim.1.gz
 man/man1/vimdiff.1.gz
 man/man1/vimtutor.1.gz
 man/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/pl/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/pl.ISO8859-2/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/pl.UTF-8/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/ru.KOI8-R/man1/xxd.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/eview.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/evim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/gview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/gvim.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/gvimdiff.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/rgview.1.gz
-%%GUI%%%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/rgvim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/rview.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/rvim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/vim.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/vimdiff.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/vimtutor.1.gz
-%%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/xxd.1.gz
-%%DESKTOP%%%%NON_LITE%%share/applications/gvim.desktop
-%%DESKTOP%%%%NON_LITE%%share/applications/vim.desktop
-%%DESKTOP%%%%NON_LITE%%share/icons/hicolor/48x48/apps/gvim.png
-%%DESKTOP%%%%NON_LITE%%share/icons/locolor/16x16/apps/gvim.png
-%%DESKTOP%%%%NON_LITE%%share/icons/locolor/32x32/apps/gvim.png
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/pl/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/pl.ISO8859-2/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/pl.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/ru.KOI8-R/man1/xxd.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/eview.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/evim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/gview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/rgvim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/rview.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/rvim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/vim.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/vimdiff.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/vimtutor.1.gz
+%%NO_LITE%%%%NLS%%man/ru.UTF-8/man1/xxd.1.gz
+%%DESKTOP%%%%NO_LITE%%share/applications/gvim.desktop
+%%DESKTOP%%%%NO_LITE%%share/applications/vim.desktop
+%%DESKTOP%%%%NO_LITE%%share/icons/hicolor/48x48/apps/gvim.png
+%%DESKTOP%%%%NO_LITE%%share/icons/locolor/16x16/apps/gvim.png
+%%DESKTOP%%%%NO_LITE%%share/icons/locolor/32x32/apps/gvim.png
 %%NO_NLS%%@dir %%DATADIR%%/%%VIM_VER%%/lang