- Use USES=iconv unconditionally

- Remove cumbersome do-patch:
  - Use do-patch: in bsd.port.mk
  - Mark 064, 087 and 147 as BADPATCHES
    - 064 does not apply cleanly (in bsd.port.mk way on FreeBSD 9.x or older)
    - 087 contains patch for src/ops.c which must be applied after 064
    - 147 contains patch for src/version.c which must be applied after 087
  - Apply BADPATCHES in post-patch:
- Fix keymap installation for vim-lite
  - Install keymap in vim source
  - Install vietnamese_viscii.vim correctly
- Do not install GUI binary executables and manpages when GUI options are off
- Allow build with python 3.x
- Merge options to Makefile
- Use PORTDATA
- Convert to new options helper
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Use REINPLACE_CMD instead of patch file
- Support STAGEDIR
- Pet portlint
- Cleanup Makefile
- Fix PLIST
- Cosmetic change
- Bump PORTREVISION for dependency and package change

7 files changed, 332 insertions, 399 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 320eab0089bd..405f95186cbf 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -2,295 +2,179 @@
 # $FreeBSD$
 
 PORTNAME=	vim
-#		! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL
-#		! value # is added to BADPATCHES.  Doing otherwise will cause
-#		! PORTEPOCH to be needed, which we do NOT want.
-#
-#		! DO NOT increase PATCHLEVEL to a patch listed in BADPATCHES.
-#		! Doing so is dis-genuine.  It implies we're at a level we are
-#		! not.  The "PATCHLEVEL" patch needs to apply before bumping
-#		! PATCHLEVEL to that level.
-PATCHLEVEL=	169
 PORTVERSION=	7.4.${PATCHLEVEL}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	editors
 MASTER_SITES=	VIM
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:R}|}\
-		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/obrien/:local
-PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
-			${PATCHLEVEL} 1 ${PATCHLEVEL}
-#	bits to remove
-BADPATCHES=	# empty
-.for p in ${BADPATCHES}
-PATCHFILES:=	${PATCHFILES:N${PORTVERSION:R}.${p}}
-.endfor
+PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:R}|} \
+		LOCAL/sunpoet/${PORTNAME}
 
 MAINTAINER?=	sunpoet@FreeBSD.org
 COMMENT?=	Vi "workalike", with many additional features
 
-SLAVEDIRS=	editors/vim-lite
-NO_STAGE=	yes
-
-.if !defined(LITE)
-.include "${.CURDIR}/../vim/options"
-OPTIONS_DEFAULT+=	CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \
-			TCL LUA X11 GTK2
-.endif
-
-.include <bsd.port.options.mk>
-
-CONFLICTS=	vim6* vim*-gnome
-.if defined(LITE)
-CONFLICTS_INSTALL+=	vim*
-.else
-CONFLICTS_INSTALL+=	vim*-lite
-.endif
-
-USES=		pkgconfig
+OPTIONS_DEFINE=	CSCOPE EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
+OPTIONS_RADIO=	UI
+OPTIONS_RADIO_UI=	ATHENA CONSOLE GNOME GTK2 MOTIF X11
+OPTIONS_SUB=	yes
+ATHENA_DESC=		Athena GUI toolkit
+CSCOPE_DESC=		cscope support
+CONSOLE_DESC=		Console/terminal mode
+EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
+UI_DESC=		User interface
+XTERM_SAVE_DESC=	Restore xterm screen after exit
+
+ALL_TARGET=	# empty
+MAKE_ARGS+=	CC=${CC} CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP=${STRIP_CMD} CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
 MAKE_JOBS_UNSAFE=	yes
+PATCH_DIST_ARGS=--batch --directory ${WRKSRC} --forward --quiet --remove-empty-files ${PATCH_DIST_STRIP}
+REINPLACE_ARGS=	-i ''
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/vim${PORTVERSION:R:S/.//g}/src
-PATCH_DIST_ARGS=-d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
-# consider
-#PATCH_DIST_ARGS=	-t
-REINPLACE_ARGS=		-i ""
-MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
-ALL_TARGET=	#
-_DATADIR=	${PORTNAME}${PORTVERSION:R:S/.//g}
-DATADIR=	${PREFIX}/share/vim/${_DATADIR}
-PLIST_SUB=	VIM_VER=${_DATADIR}
-MANLANG=	""
-MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
-MLINKS=		vim.1 rvim.1	vim.1 rview.1
-.if !defined(LITE)
-MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
-		vim.1 rgvim.1	vim.1 rgview.1	evim.1 eview.1
-.endif
+USES=		iconv pkgconfig shebangfix
+WANT_GNOME=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-MANLANG+=	fr fr.ISO8859-1 fr.UTF-8 it it.ISO8859-1 it.UTF-8 ja pl \
-		pl.ISO8859-2 pl.UTF-8 ru.KOI8-R ru.UTF-8
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-MAKE_ARGS+=	CONF_OPT_NLS="--disable-nls"
-PLIST_SUB+=	NLS="@comment "
-.endif
+PATCHLEVEL=	169
+PATCHFILES!=	/usr/bin/jot -s " " -w "%03d" ${PATCHLEVEL} 1 ${PATCHLEVEL}
+BADPATCHES=	064 087 147 # empty
+.for p in ${BADPATCHES}
+PATCHFILES:=	${PATCHFILES:N${p}}
+.endfor
+PATCHFILES:=	${PATCHFILES:C/^/${PORTVERSION:R}./g}
 
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp"
-.endif
+BUILD_WRKSRC=	${WRKDIR}/${VIM_VER}/src
+CONFIGURE_WRKSRC=	${WRKDIR}/${VIM_VER}/src
+INSTALL_WRKSRC=	${WRKDIR}/${VIM_VER}/src
+WRKSRC=		${WRKDIR}/${VIM_VER}
 
-.if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=	yes
-MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
-.endif
+PLIST_SUB=	VIM_VER=${VIM_VER}
+PORTDATA=	*
 
-.if ${PORT_OPTIONS:MTCL}
-USES+=		tcl:85+
-MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE}\/bin\///g}""
-.endif
+VIM_VER=	${PORTNAME}${PORTVERSION:R:S/.//g}
 
-.if ${PORT_OPTIONS:MLUA}
-USES+=		lua
-MAKE_ARGS+=	CONF_OPT_LUA="--enable-luainterp=dynamic"
-MAKE_ARGS+=	CONF_OPT_LUA_PREFIX="--with-lua-prefix=${LOCALBASE}"
-.endif
+SLAVEDIRS=	editors/vim-lite
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=	perl5
-MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp"
-.endif
-
-WANT_GNOME=	yes
+SHEBANG_FILES=	runtime/tools/efm_perl.pl
 
 .if defined(LITE)
 PKGNAMESUFFIX=	-lite
-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
+CONFLICTS_INSTALL=	vim-[0-9]*
+OPTIONS_EXCLUDE=ATHENA CSCOPE EXUBERANT_CTAGS GNOME GTK2 LUA MOTIF NLS PERL PYTHON RUBY TCL X11 XTERM_SAVE
+OPTIONS_SLAVE=	CONSOLE
+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 EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL
+MAKE_ARGS+=	CONF_OPT_FEAT=--with-features=big \
+		CONF_OPT_INPUT=--enable-xim \
+		CONF_OPT_OUTPUT=--enable-fontset
+PLIST_SUB+=	NON_LITE=""
+.endif
+
+ATHENA_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=athena
+ATHENA_USE=		XORG=xaw
+CONSOLE_MAKE_ARGS=	CONF_OPT_GUI="--enable-gui=no --without-x"
+CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
+CSCOPE_RUN_DEPENDS=	${LOCALBASE}/bin/cscope:${PORTSDIR}/devel/cscope
+EXUBERANT_CTAGS_RUN_DEPENDS=	${LOCALBASE}/bin/exctags:${PORTSDIR}/devel/ctags
+GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXt"
+GNOME_USE=		GNOME=libgnomeui XORG=glproto,xt
+GTK2_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" X_LIBS="$(X_LIBS) -lX11 -lXt"
+GTK2_USE=		GNOME=gtk20 XORG=xt
+LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic \
+			CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
+LUA_USES=		lua
+MOTIF_MAKE_ARGS=	CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE}
+MOTIF_USES=		motif
+NLS_USES=		gettext
+PERL_MAKE_ARGS=		CONF_OPT_PERL=--enable-perlinterp
+PERL_USES=		perl5
+PYTHON_USE=		PYTHON=yes
+RUBY_MAKE_ARGS=		CONF_OPT_RUBY=--enable-rubyinterp
+RUBY_USE=		RUBY=yes
+TCL_MAKE_ARGS=		CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}"
+TCL_USES=		tcl:85+
+X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt"
 
-.if ${PORT_OPTIONS:MCSCOPE}
-RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
-MAKE_ARGS+=	CONF_OPT_CSCOPE="--enable-cscope"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCONSOLE}
+PLIST_SUB+=	GUI="@comment "
+.else
+PLIST_SUB+=	GUI=""
 .endif
 
 .if ${PORT_OPTIONS:MEXUBERANT_CTAGS}
-RUN_DEPENDS+=	exctags:${PORTSDIR}/devel/ctags
 CTAGS_CMD=	exctags -R .
 .else
-CTAGS_CMD=	${FIND} . -type f \\|${XARGS} ctags
+CTAGS_CMD=	${FIND} . -type f \\| ${XARGS} ctags
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-CONF_OPT_GUI="--enable-gui=no --with-x"
-
-. if ${PORT_OPTIONS:MATHENA}
-CONF_OPT_GUI="--enable-gui=athena"
-USE_XORG+=	xaw
-. endif
-
-. if ${PORT_OPTIONS:MGTK2}
-USE_GNOME=	gtk20
-CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}"
-MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lX11 -lXt"
-USE_XORG+=	xt
-. endif
+.if ${PORT_OPTIONS:MNLS}
+MAKE_ARGS+=	CONF_OPT_NLS=--enable-nls
+.else
+MAKE_ARGS+=	CONF_OPT_NLS=--disable-nls
+.endif
 
-. if ${PORT_OPTIONS:MGNOME}
-USE_GNOME=	libgnomeui
+.if ${PORT_OPTIONS:MGNOME}
 PKGNAMESUFFIX=	-gnome2
-CONF_OPT_GUI=	"--enable-gui=gnome2"
-MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lX11 -lXt"
-USE_XORG+=	xt glproto
-. endif
+.endif
 
-. if ${PORT_OPTIONS:MMOTIF}
-USES+=		motif
-CONF_OPT_GUI=	"--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\""
-MAKE_ARGS+=	MOTIFHOME=${LOCALBASE}
-. endif
+.include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MPYTHON}
+.if ${PYTHON_REL} < 300
+MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp --disable-python3interp"
+.else
+MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-python3interp --disable-pythoninterp"
 .endif
-MAKE_ARGS+=	CONF_OPT_GUI=${CONF_OPT_GUI} ${I18N}
-
-.if exists(${LOCALBASE}/lib/libiconv.so)
-USES+=	iconv
 .endif
 
 post-patch:
-	@(${FIND} ${WRKSRC}/../runtime/ -name menu\*.vim -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g')
-.if !defined(STRIP) || ${STRIP} == ""
-	${REINPLACE_CMD} '/$$(STRIP)/d' ${WRKSRC}/Makefile
-.endif
+	@${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile
+	@${FIND} ${WRKSRC}/runtime/ -name menu\*.vim -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's,ctags -R \\.,${CTAGS_CMD},g'
+.for badpatch in ${BADPATCHES}
+	@${ECHO_MSG} "===>   Applying distribution patch ${badpatch}"
+	@${PATCH} ${PATCH_DIST_ARGS} -i ${_DISTDIR}/${PORTVERSION:R}.${badpatch}
+.endfor
 
 pre-configure:
-	@${CP} -pv ${WRKSRC}/config.mk.dist ${WRKSRC}/auto/config.mk
-	@(cd ${WRKSRC} ; ${MAKE} distclean)
-	@${REINPLACE_CMD} -e ' \
-		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
-		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
-		s|/usr/local|${LOCALBASE}|g; \
-		s|set dummy lua;|set dummy ${LUA_CMD};|g' \
-		${WRKSRC}/auto/configure
+	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
+	@(cd ${WRKSRC}/src/ && ${MAKE} distclean)
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
+		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
+		-e 's|set dummy lua;|set dummy lua-${LUA_VER};|g' ${WRKSRC}/src/auto/configure
 .if ${PORT_OPTIONS:MXTERM_SAVE}
-	@${REINPLACE_CMD} -e ' \
-		s|/\* #define FEAT_XTERM_SAVE \*/|#define FEAT_XTERM_SAVE|g' \
-		${WRKSRC}/feature.h
+	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
 .endif
 
 post-configure:
-	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} scratch config)
-	${REINPLACE_CMD} -e 's@#define HAVE_SYSINFO 1@/* #undef HAVE_SYSINFO */@' ${WRKSRC}/auto/config.h
-
-#	Clean up junk files to keep them from being installed.
-pre-install:
-	@${FIND} ${WRKSRC:H} -type f -name '*.orig' -delete
+	@(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} scratch config)
+	@${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h
 
 post-install:
-	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
-	#	below needed for `vim-lite' port
-	${TEST} -e ${PREFIX}/bin/rgvim  || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
-	${TEST} -e ${PREFIX}/bin/gview  || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
-	${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
-	${TEST} -e ${PREFIX}/bin/evim   || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
-	${TEST} -e ${PREFIX}/bin/eview  || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
-	${TEST} -e ${PREFIX}/bin/gvimdiff  \
-		|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
-	${TEST} -e ${PREFIX}/bin/gvimtutor  \
-		|| (cd ${PREFIX}/bin ; ${LN} -sf vimtutor gvimtutor)
-	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
-	cd ${PREFIX} ;						\
-	    ${FIND} share/vim/${_DATADIR} -type f -o -type l	\
-	    	| ${SORT}					\
-	    	>${WRKDIR}/PLIST.share-vim
-	cd ${PREFIX} ;						\
-	    ${FIND} share/vim/${_DATADIR} -type d		\
-	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
-		>>${WRKDIR}/PLIST.share-vim
-	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim"	>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
-	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
-	cd ${WRKDIR} ; ex < ex.script
-
-show-options:
-	@${MAKE} showconfig
-
-.if defined(ONT_CHECKSUM)
-checksum:
+	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/
+.for file in evim rview rvim vimdiff
+	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
+.endfor
+.if !${PORT_OPTIONS:MCONSOLE}
+.for file in eview gview gvim gvimdiff rgview rgvim
+	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
+.endfor
 .endif
+.if !${PORT_OPTIONS:MNLS}
+	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
+	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
+.endif
+	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
+	${TOUCH} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/.keepme
 
-cklatest: .PHONY
-	@${ECHO} -n "Currently at: "
-	@${MAKE} -V PATCHLEVEL
-	-(${SED} -i '' "s/^PATCHLEVEL=.*$$/PATCHLEVEL=	`ncftpls \
-	    ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
-		| grep "^${PORTVERSION:C/\.[0-9a-z]*$//}" \
-		| ${SED} -n -E -e 's/${PORTVERSION:C/[0-9]*$//}([0-9]+)$$/\1/p' \
-		| sort -n | ${TAIL} -1`/" Makefile)
-	@${ECHO} -n "Now at: "
-	@${MAKE} -V PATCHLEVEL
-
-find-bad-patches:
-	@cd ${DISTDIR} ; egrep -l \
-		'(src/if_(ole|mzsch)|src/gui_(w32|w48|mac)|src/os_(riscos|cyg|os2|vms|amiga|win32|mswin))|src(/testdir)?/Make_(dos|cyg|vms|mvc|ming|os2|amiga|mms)'\
-		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
-
-ckp:
-	/usr/bin/time -h ${MAKE} -DPATCH_DEBUG -DONT_CHECKSUM clean patch
-
-ckmtree:
-	${MTREE_CMD} -f ${MTREE_FILE} -p ${PREFIX}
-
-do-patch:
-	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME} from `pwd`"
-	@set -e ; \
-	(cd ${_DISTDIR} ; \
-	for i  in ${_PATCHFILES}; do \
-		if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-			${ECHO_MSG} "===>   Applying distribution patch $$i" ; \
-		fi ; \
-		${PATCH} ${PATCH_DIST_ARGS} -i ${_DISTDIR}/$$i; \
-	done )
-	@set -e ;\
-	if [ -d ${PATCHDIR} ]; then \
-		if [ "`${ECHO_CMD} ${PATCHDIR}/patch-*`" != "${PATCHDIR}/patch-*" ]; then \
-			${ECHO_MSG} "===>  Applying ${OPSYS} patches for ${PKGNAME}" ; \
-			PATCHES_APPLIED="" ; \
-			for i in ${PATCHDIR}/patch-*; do \
-				case $$i in \
-					*.orig|*.rej|*~|*,v) \
-						${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
-						;; \
-					*) \
-						if [ ${PATCH_DEBUG_TMP} = yes ]; then \
-							${ECHO_MSG} "===>   Applying ${OPSYS} patch $$i" ; \
-						fi; \
-						if ${PATCH} ${PATCH_ARGS} < $$i ; then \
-							PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
-						else \
-							${ECHO_MSG} `${ECHO_CMD} "=> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
-							if [ x"$$PATCHES_APPLIED" != x"" ]; then \
-								${ECHO_MSG} `${ECHO_CMD} "=> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
-							fi; \
-							${FALSE} ; \
-						fi; \
-						;; \
-				esac; \
-			done; \
-		fi; \
-	fi
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/vim/add-bad.sh b/editors/vim/add-bad.sh
deleted file mode 100644
index a13edbca61c7..000000000000
--- a/editors/vim/add-bad.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-:
-# $FreeBSD$
-
-usage() {
-	echo 'usage: ${0##*/} <bad patch #s to add to ${BADPATCHES}>'
-	exit 1
-}
-if [ $# -lt 1 ]; then
-	usage
-fi
-
-sed -i '' "s/^BADPATCHES=.*$/& $*/" Makefile
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
deleted file mode 100644
index 546c96742891..000000000000
--- a/editors/vim/files/patch-01
+++ /dev/null
@@ -1,77 +0,0 @@
---- Makefile.orig	Sun Jun  1 06:18:29 2003
-+++ Makefile	Sat Nov  1 15:39:09 2003
-@@ -256,7 +256,7 @@
- #DO NOT CHANGE the next line, we need it for configure to find the compiler
- #instead of using the default from the "make" program.
- #Use a line further down to change the value for CC.
--CC=
-+#CC=
- 
- # Change and use these defines if configure cannot find your Motif stuff.
- # Unfortunately there is no "standard" location for Motif. {{{
-@@ -288,6 +288,7 @@
- # of make, will buid Vim.
- 
- # CONFIGURE - configure arguments {{{1
-+CONF_ARGS = --prefix=$(PREFIX)
- # You can give a lot of options to configure.
- # Change this to your desire and do 'make config' afterwards
- 
-@@ -1829,3 +1830,3 @@ install: $(GUI_INSTALL)
- 
--install_normal: installvim installtools $(INSTALL_LANGS) install-icons
-+install_normal: installvim installtools $(INSTALL_LANGS) # install-icons
- 
-@@ -1794,40 +1795,40 @@
- installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
- 
- $(DEST_BIN)/$(EXTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
-+	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EXTARGET)
- 
- $(DEST_BIN)/$(VIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
-+	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIEWTARGET)
- 
- $(DEST_BIN)/$(GVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMTARGET)
- 
- $(DEST_BIN)/$(GVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIEWTARGET)
- 
- $(DEST_BIN)/$(RVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIMTARGET)
- 
- $(DEST_BIN)/$(RVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIEWTARGET)
- 
- $(DEST_BIN)/$(RGVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIMTARGET)
- 
- $(DEST_BIN)/$(RGVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
- 
- $(DEST_BIN)/$(VIMDIFFTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIMDIFFTARGET)
- 
- $(DEST_BIN)/$(GVIMDIFFTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMDIFFTARGET)
- 
- $(DEST_BIN)/$(EVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIMTARGET)
- 
- $(DEST_BIN)/$(EVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIEWTARGET)
- 
- # create links for the manual pages with various names to vim.	This is only
- # done when the links (or manpages with the same name) don't exist yet.
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure
index 67f951f5d0e8..1d260f37c11d 100644
--- a/editors/vim/files/patch-configure
+++ b/editors/vim/files/patch-configure
@@ -1,5 +1,5 @@
---- auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
-+++ auto/configure	2013-10-17 12:12:56.000000000 +0200
+--- src/auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
++++ src/auto/configure	2013-10-17 12:12:56.000000000 +0200
 @@ -858,7 +858,7 @@
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
diff --git a/editors/vim/files/patch-installml.sh b/editors/vim/files/patch-installml.sh
index 136015bcec51..8b96642e4d87 100644
--- a/editors/vim/files/patch-installml.sh
+++ b/editors/vim/files/patch-installml.sh
@@ -1,5 +1,5 @@
---- installml.sh.orig	Sun Apr 30 08:48:53 2006
-+++ installml.sh	Mon Jun 19 03:36:37 2006
+--- src/installml.sh.orig	Sun Apr 30 08:48:53 2006
++++ src/installml.sh	Mon Jun 19 03:36:37 2006
 @@ -55,12 +55,12 @@ if test $what = "install" -a \( -f $dest
     # ex
 -   if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
diff --git a/editors/vim/options b/editors/vim/options
deleted file mode 100644
index f4797f234385..000000000000
--- a/editors/vim/options
+++ /dev/null
@@ -1,24 +0,0 @@
-OPTIONS_DEFINE=	\
-		PERL \
-		PYTHON \
-		RUBY \
-		TCL \
-		LUA \
-		CSCOPE \
-		EXUBERANT_CTAGS \
-		XTERM_SAVE \
-		NLS \
-		X11
-OPTIONS_RADIO=	\
-		UI
-OPTIONS_RADIO_UI=\
-		ATHENA \
-		GTK2 \
-		GNOME \
-		MOTIF
-
-CSCOPE_DESC=		cscope support
-EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
-ATHENA_DESC=		Athena GUI toolkit
-XTERM_SAVE_DESC=	Restore xterm screen after exit
-UI_DESC=		Graphical toolkit to use
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 5aea24065937..bf65b4c84c2a 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -1,42 +1,204 @@
-bin/vim
-bin/vimtutor
-bin/xxd
-@comment bin/ex
-@comment bin/gex
-bin/eview
+%%GUI%%bin/eview
 bin/evim
-bin/gview
-bin/gvim
-bin/gvimtutor
-bin/rgview
-bin/rgvim
+@comment bin/ex
+%%GUI%%@comment bin/gex
+%%GUI%%bin/gview
+%%GUI%%bin/gvim
+%%GUI%%bin/gvimdiff
+%%GUI%%%%NON_LITE%%bin/gvimtutor
+%%GUI%%bin/rgview
+%%GUI%%bin/rgvim
 bin/rview
 bin/rvim
+bin/vim
 bin/vimdiff
-bin/gvimdiff
+bin/vimtutor
+bin/xxd
 @comment bin/view
-@exec mkdir -p %D/share/vim/%%VIM_VER%%/lang
-@comment Insert PLIST.share-vim here
-@comment -=[ begin PLIST.share-vim ]=-
-@comment -=[ end PLIST.share-vim ]=-
-%%NLS%%@dirrmtry man/fr/man1
-%%NLS%%@dirrmtry man/fr
-%%NLS%%@dirrmtry man/fr.ISO8859-1/man1
-%%NLS%%@dirrmtry man/fr.ISO8859-1
-%%NLS%%@dirrmtry man/fr.UTF-8/man1
-%%NLS%%@dirrmtry man/fr.UTF-8
-%%NLS%%@dirrmtry man/it/man1
-%%NLS%%@dirrmtry man/it
-%%NLS%%@dirrmtry man/it.ISO8859-1/man1
-%%NLS%%@dirrmtry man/it.ISO8859-1
-%%NLS%%@dirrmtry man/it.UTF-8/man1
-%%NLS%%@dirrmtry man/it.UTF-8
-%%NLS%%@dirrmtry man/pl/man1
-%%NLS%%@dirrmtry man/pl
-%%NLS%%@dirrmtry man/pl.ISO8859-2/man1
-%%NLS%%@dirrmtry man/pl.ISO8859-2
-%%NLS%%@dirrmtry man/pl.UTF-8/man1
-%%NLS%%@dirrmtry man/pl.UTF-8
-%%NLS%%@dirrmtry man/ru.UTF-8/man1
-%%NLS%%@dirrmtry man/ru.UTF-8
-@dirrm share/vim
+%%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
+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
+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
+%%NON_LITE%%%%NLS%%@dirrmtry man/ru.UTF-8/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/ru.UTF-8
+%%NON_LITE%%%%NLS%%@dirrmtry man/pl.UTF-8/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/pl.UTF-8
+%%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2
+%%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8
+%%NON_LITE%%%%NLS%%@dirrmtry man/it.ISO8859-1/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/it.ISO8859-1
+%%NON_LITE%%%%NLS%%@dirrmtry man/it/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/it
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr.UTF-8/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr.UTF-8
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr.ISO8859-1/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr.ISO8859-1
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr/man1
+%%NON_LITE%%%%NLS%%@dirrmtry man/fr