Simplify the "lite" package even more

Make the only differences between "lite" and "regular" vim just console
mode and no language bindings. This was already the case (the default
feature set is "huge"), but now it's explicit.

Add a pkg-descr to vim-lite that explains the above, and remove some
text in the pkg-descr that makes absolutely no sense.

There's no effective change to generated package, but the port is
getting updated tomorrow anyway.

This will facilitate the future removal at some point of the "lite"
package, so that it can be replaced by a "console" flavour.

While here, remove a variable that was last used in 2001.

5 files changed, 198 insertions, 189 deletions

diff --git a/editors/vim-lite/Makefile b/editors/vim-lite/Makefile
index a990773079c6..eaffd721e0d0 100644
--- a/editors/vim-lite/Makefile
+++ b/editors/vim-lite/Makefile
@@ -5,6 +5,8 @@ PKGNAMESUFFIX=	-lite
 
 COMMENT=	Improved version of the vi editor (lite package)
 
+CONFLICTS_INSTALL=	vim-[0-9]*
+
 LITE=		yes
 MASTERDIR=	${.CURDIR}/../vim
 
diff --git a/editors/vim-lite/pkg-descr b/editors/vim-lite/pkg-descr
new file mode 100644
index 000000000000..3dcc27c71e4b
--- /dev/null
+++ b/editors/vim-lite/pkg-descr
@@ -0,0 +1,14 @@
+Vim is a highly configurable text editor built to enable efficient text editing.
+It is an improved version of the vi editor distributed with most UNIX systems.
+
+Vim is often called a "programmer's editor," and so useful for programming that
+many consider it an entire IDE. It's not just for programmers, though. Vim is
+perfect for all kinds of text editing, from composing email to editing
+configuration files.
+
+This is the "lite" version, which is console-only and contains no external
+languange bindings (for Ruby, Python, etc.). The editing experience for files
+of those languages is unaffected.
+
+WWW: http://www.vim.org/
+WWW: https://github.com/vim/vim
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 468ef766ad74..90cea144a545 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -14,6 +14,8 @@ LICENSE_NAME=	VIM License
 LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+CONFLICTS_INSTALL?=	vim-lite-[0-9]*
+
 USES=		cpe iconv ncurses pkgconfig shebangfix
 MAKE_JOBS_UNSAFE=	yes
 
@@ -30,7 +32,7 @@ VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
 
 ALL_TARGET=	# empty
 MAKE_ARGS+=	CC="${CC}" \
-		CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" \
+		CONF_ARGS="--prefix=${PREFIX}" \
 		STRIP="${STRIP_CMD}" \
 		VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} \
 		VIMRCLOC=${ETCDIR} \
@@ -39,13 +41,21 @@ MAKE_ARGS+=	CC="${CC}" \
 
 # 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_DEFINE=		CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS 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
 
+.if defined(LITE)
+OPTIONS_DEFAULT=	DEFAULT_VIMRC
+OPTIONS_SLAVE=		CONSOLE
+OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NDEFAULT_VIMRC} \
+			${OPTIONS_SINGLE_UI:NCONSOLE} \
+			${OPTIONS_GROUP_LANGBIND}
+.endif
+
 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
@@ -60,16 +70,6 @@ LANGBIND_DESC=		Optional language bindings
 # BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute
 OPTIONS_EXCLUDE_powerpc64=	RUBY
 
-.if defined(LITE)
-OPTIONS_DEFAULT=DEFAULT_VIMRC
-OPTIONS_SLAVE=	CONSOLE LITE
-OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NDEFAULT_VIMRC:NLITE} \
-			${OPTIONS_SINGLE_UI:NCONSOLE} \
-			${OPTIONS_GROUP_LANGBIND}
-.else
-OPTIONS_EXCLUDE=LITE
-.endif
-
 # GENERAL OPTIONS
 CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
 CSCOPE_MAKE_ARGS_OFF=	CONF_OPT_CSCOPE=--disable-cscope
@@ -77,12 +77,6 @@ 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
@@ -93,6 +87,8 @@ ATHENA_PLIST_SUB=	GUI="" DESKTOP="@comment "
 ATHENA_USE=		XORG=ice,sm,x11,xaw,xmu,xpm,xt
 
 CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
+CONSOLE_MAKE_ARGS_OFF=	CONF_OPT_INPUT=--enable-xim \
+			CONF_OPT_OUTPUT=--enable-fontset
 CONSOLE_PLIST_SUB=	GUI="@comment " DESKTOP="@comment "
 
 GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2
diff --git a/editors/vim/pkg-descr b/editors/vim/pkg-descr
index 555c4cfcc53c..96764a7b709e 100644
--- a/editors/vim/pkg-descr
+++ b/editors/vim/pkg-descr
@@ -6,8 +6,5 @@ many consider it an entire IDE. It's not just for programmers, though. Vim is
 perfect for all kinds of text editing, from composing email to editing
 configuration files.
 
-Despite what the above comic suggests, Vim can be configured to work in a very
-simple (Notepad-like) way, called evim or Easy Vim.
-
 WWW: http://www.vim.org/
 WWW: https://github.com/vim/vim
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 14b557080ab0..edefb7a6b60d 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%%%%NO_LITE%%bin/gvimtutor
+%%GUI%%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%%%%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
+%%GUI%%%%NLS%%man/fr/man1/eview.1.gz
+%%NLS%%man/fr/man1/evim.1.gz
+%%GUI%%%%NLS%%man/fr/man1/gview.1.gz
+%%GUI%%%%NLS%%man/fr/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/fr/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/fr/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/fr/man1/rgvim.1.gz
+%%NLS%%man/fr/man1/rview.1.gz
+%%NLS%%man/fr/man1/rvim.1.gz
+%%NLS%%man/fr/man1/vim.1.gz
+%%NLS%%man/fr/man1/vimdiff.1.gz
+%%NLS%%man/fr/man1/vimtutor.1.gz
+%%NLS%%man/fr/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/eview.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/evim.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/gview.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/fr.ISO8859-1/man1/rgvim.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/rview.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/rvim.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/vim.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/vimdiff.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/vimtutor.1.gz
+%%NLS%%man/fr.ISO8859-1/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/eview.1.gz
+%%NLS%%man/fr.UTF-8/man1/evim.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/gview.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/fr.UTF-8/man1/rgvim.1.gz
+%%NLS%%man/fr.UTF-8/man1/rview.1.gz
+%%NLS%%man/fr.UTF-8/man1/rvim.1.gz
+%%NLS%%man/fr.UTF-8/man1/vim.1.gz
+%%NLS%%man/fr.UTF-8/man1/vimdiff.1.gz
+%%NLS%%man/fr.UTF-8/man1/vimtutor.1.gz
+%%NLS%%man/fr.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/it/man1/eview.1.gz
+%%NLS%%man/it/man1/evim.1.gz
+%%GUI%%%%NLS%%man/it/man1/gview.1.gz
+%%GUI%%%%NLS%%man/it/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/it/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/it/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/it/man1/rgvim.1.gz
+%%NLS%%man/it/man1/rview.1.gz
+%%NLS%%man/it/man1/rvim.1.gz
+%%NLS%%man/it/man1/vim.1.gz
+%%NLS%%man/it/man1/vimdiff.1.gz
+%%NLS%%man/it/man1/vimtutor.1.gz
+%%NLS%%man/it/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/eview.1.gz
+%%NLS%%man/it.ISO8859-1/man1/evim.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/gview.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/it.ISO8859-1/man1/rgvim.1.gz
+%%NLS%%man/it.ISO8859-1/man1/rview.1.gz
+%%NLS%%man/it.ISO8859-1/man1/rvim.1.gz
+%%NLS%%man/it.ISO8859-1/man1/vim.1.gz
+%%NLS%%man/it.ISO8859-1/man1/vimdiff.1.gz
+%%NLS%%man/it.ISO8859-1/man1/vimtutor.1.gz
+%%NLS%%man/it.ISO8859-1/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/eview.1.gz
+%%NLS%%man/it.UTF-8/man1/evim.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/gview.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/it.UTF-8/man1/rgvim.1.gz
+%%NLS%%man/it.UTF-8/man1/rview.1.gz
+%%NLS%%man/it.UTF-8/man1/rvim.1.gz
+%%NLS%%man/it.UTF-8/man1/vim.1.gz
+%%NLS%%man/it.UTF-8/man1/vimdiff.1.gz
+%%NLS%%man/it.UTF-8/man1/vimtutor.1.gz
+%%NLS%%man/it.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/ja/man1/eview.1.gz
+%%NLS%%man/ja/man1/evim.1.gz
+%%GUI%%%%NLS%%man/ja/man1/gview.1.gz
+%%GUI%%%%NLS%%man/ja/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/ja/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/ja/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/ja/man1/rgvim.1.gz
+%%NLS%%man/ja/man1/rview.1.gz
+%%NLS%%man/ja/man1/rvim.1.gz
+%%NLS%%man/ja/man1/vim.1.gz
+%%NLS%%man/ja/man1/vimdiff.1.gz
+%%NLS%%man/ja/man1/vimtutor.1.gz
+%%NLS%%man/ja/man1/xxd.1.gz
+%%GUI%%man/man1/eview.1.gz
 man/man1/evim.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
+%%GUI%%man/man1/gview.1.gz
+%%GUI%%man/man1/gvim.1.gz
+%%GUI%%man/man1/gvimdiff.1.gz
+%%GUI%%man/man1/rgview.1.gz
+%%GUI%%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%%%%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
+%%GUI%%%%NLS%%man/pl/man1/eview.1.gz
+%%NLS%%man/pl/man1/evim.1.gz
+%%GUI%%%%NLS%%man/pl/man1/gview.1.gz
+%%GUI%%%%NLS%%man/pl/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/pl/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/pl/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/pl/man1/rgvim.1.gz
+%%NLS%%man/pl/man1/rview.1.gz
+%%NLS%%man/pl/man1/rvim.1.gz
+%%NLS%%man/pl/man1/vim.1.gz
+%%NLS%%man/pl/man1/vimdiff.1.gz
+%%NLS%%man/pl/man1/vimtutor.1.gz
+%%NLS%%man/pl/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/eview.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/evim.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/gview.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/pl.ISO8859-2/man1/rgvim.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/rview.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/rvim.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/vim.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/vimdiff.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/vimtutor.1.gz
+%%NLS%%man/pl.ISO8859-2/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/eview.1.gz
+%%NLS%%man/pl.UTF-8/man1/evim.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/gview.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/pl.UTF-8/man1/rgvim.1.gz
+%%NLS%%man/pl.UTF-8/man1/rview.1.gz
+%%NLS%%man/pl.UTF-8/man1/rvim.1.gz
+%%NLS%%man/pl.UTF-8/man1/vim.1.gz
+%%NLS%%man/pl.UTF-8/man1/vimdiff.1.gz
+%%NLS%%man/pl.UTF-8/man1/vimtutor.1.gz
+%%NLS%%man/pl.UTF-8/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/eview.1.gz
+%%NLS%%man/ru.KOI8-R/man1/evim.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/gview.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/ru.KOI8-R/man1/rgvim.1.gz
+%%NLS%%man/ru.KOI8-R/man1/rview.1.gz
+%%NLS%%man/ru.KOI8-R/man1/rvim.1.gz
+%%NLS%%man/ru.KOI8-R/man1/vim.1.gz
+%%NLS%%man/ru.KOI8-R/man1/vimdiff.1.gz
+%%NLS%%man/ru.KOI8-R/man1/vimtutor.1.gz
+%%NLS%%man/ru.KOI8-R/man1/xxd.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/eview.1.gz
+%%NLS%%man/ru.UTF-8/man1/evim.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/gview.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/gvim.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/gvimdiff.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/rgview.1.gz
+%%GUI%%%%NLS%%man/ru.UTF-8/man1/rgvim.1.gz
+%%NLS%%man/ru.UTF-8/man1/rview.1.gz
+%%NLS%%man/ru.UTF-8/man1/rvim.1.gz
+%%NLS%%man/ru.UTF-8/man1/vim.1.gz
+%%NLS%%man/ru.UTF-8/man1/vimdiff.1.gz
+%%NLS%%man/ru.UTF-8/man1/vimtutor.1.gz
+%%NLS%%man/ru.UTF-8/man1/xxd.1.gz
+%%DESKTOP%%share/applications/gvim.desktop
+%%DESKTOP%%share/applications/vim.desktop
+%%DESKTOP%%share/icons/hicolor/48x48/apps/gvim.png
+%%DESKTOP%%share/icons/locolor/16x16/apps/gvim.png
+%%DESKTOP%%share/icons/locolor/32x32/apps/gvim.png
 %%NO_NLS%%@dir %%DATADIR%%/%%VIM_VER%%/lang