Update to 9.5a.

PR:	ports/86232 (vile only)

6 files changed, 302 insertions, 258 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 5738381808b1..1806cb08ba04 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.5
+PORTVERSION=	9.5a
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/ \
 		ftp://invisible-island.net/vile/ \
 		ftp://ftp.phred.org/pub/vile/
+DISTNAME=	vile-9.5
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=    ${MASTER_SITES:S,vile/,vile/patches/,g}
+PATCH_SITES=	${MASTER_SITES:S,vile/,vile/patches/,g}
+PATCHFILES=	vile-9.5a.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs.  a vi "workalike", with many additional features
@@ -29,12 +31,12 @@ WITH_PERL=1
 .endif
 
 .if defined(WITH_PERL)
-CONFIGURE_ARGS+= --with-perl
+CONFIGURE_ARGS+=	--with-perl
 PLIST=		${PKGDIR}/pkg-plist.perl
 .endif
 
 .if defined(WITH_FILTERS)
-CONFIGURE_ARGS+= --with-loadable-filters
+CONFIGURE_ARGS+=	--with-loadable-filters
 PLIST=		${PKGDIR}/pkg-plist.filt
 .endif
 
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index c325b4858655..523de05205eb 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,2 +1,4 @@
 MD5 (vile-9.5.tgz) = bc0049be8b4906dacc1165e04a6d29e5
 SIZE (vile-9.5.tgz) = 1656429
+MD5 (vile-9.5a.patch.gz) = caa7b14a1405a0fccc9062e06711edb0
+SIZE (vile-9.5a.patch.gz) = 89872
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index 4b562dcd5523..5b7d62c915ec 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -3,45 +3,49 @@ bin/vile-pager
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
+lib/vile/vile-ada-filt
 lib/vile/vile-as-filt
 lib/vile/vile-asm-filt
-lib/vile/vile-basic-filt
-lib/vile/vile-c-filt
-lib/vile/vile-crypt
-lib/vile/vile-key-filt
-lib/vile/vile-manfilt
-lib/vile/vile-pas-filt
-lib/vile/vile-ada-filt
 lib/vile/vile-au3-filt
 lib/vile/vile-awk-filt
+lib/vile/vile-basic-filt
 lib/vile/vile-bat-filt
+lib/vile/vile-bnf-filt
+lib/vile/vile-c-filt
 lib/vile/vile-cfg-filt
+lib/vile/vile-crypt
+lib/vile/vile-css-filt
 lib/vile/vile-cweb-filt
 lib/vile/vile-dcl-filt
-lib/vile/vile-fdl-filt
 lib/vile/vile-def-filt
 lib/vile/vile-diff-filt
 lib/vile/vile-ecl-filt
 lib/vile/vile-esql-filt
 lib/vile/vile-est-filt
+lib/vile/vile-fdl-filt
 lib/vile/vile-html-filt
-lib/vile/vile-info-filt
 lib/vile/vile-imake-filt
+lib/vile/vile-info-filt
 lib/vile/vile-ini-filt
 lib/vile/vile-iss-filt
+lib/vile/vile-key-filt
 lib/vile/vile-latex-filt
 lib/vile/vile-lex-filt
 lib/vile/vile-lisp-filt
 lib/vile/vile-m4-filt
 lib/vile/vile-mail-filt
 lib/vile/vile-make-filt
+lib/vile/vile-manfilt
+lib/vile/vile-midl-filt
 lib/vile/vile-mms-filt
 lib/vile/vile-nr-filt
+lib/vile/vile-pas-filt
 lib/vile/vile-perl-filt
+lib/vile/vile-php-filt
 lib/vile/vile-pl-filt
 lib/vile/vile-pot-filt
-lib/vile/vile-py-filt
 lib/vile/vile-ps-filt
+lib/vile/vile-py-filt
 lib/vile/vile-rb-filt
 lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
@@ -63,11 +67,11 @@ lib/vile/vile-ti-filt
 lib/vile/vile-txt-filt
 lib/vile/vile-vile-filt
 lib/vile/vile-vlog-filt
+lib/vile/vile-wbt-filt
 lib/vile/vile-xml-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
-@dirrm lib/vile
 share/doc/vile/Vileserv.doc
 share/doc/vile/config.doc
 share/doc/vile/dir.doc
@@ -78,24 +82,6 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-@dirrm share/doc/vile
-share/vile/color-ls.rc
-share/vile/dates.rc
-share/vile/digraphs.rc
-share/vile/filters.rc
-share/vile/gnugpg.rc
-share/vile/loaderrs.rc
-share/vile/manpage.rc
-share/vile/modes.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/search.rc
-share/vile/shifts.rc
-share/vile/showeach.rc
-share/vile/spell.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -104,46 +90,81 @@ share/vile/au3.keywords
 share/vile/awk.keywords
 share/vile/basic.keywords
 share/vile/bat.keywords
+share/vile/bnf.keywords
 share/vile/c.keywords
+share/vile/color-ls.rc
 share/vile/cpp.keywords
 share/vile/csh.keywords
+share/vile/css.keywords
 share/vile/cweb.keywords
+share/vile/dates.rc
 share/vile/dcl.keywords
 share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/digraphs.rc
 share/vile/ecl.keywords
-share/vile/est.keywords
 share/vile/esql.keywords
+share/vile/est.keywords
 share/vile/fdl.keywords
-share/vile/js.keywords
+share/vile/filters.rc
+share/vile/gnugpg.rc
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
 share/vile/iss.keywords
 share/vile/java.keywords
+share/vile/js.keywords
 share/vile/latex.keywords
 share/vile/lex.keywords
 share/vile/lisp.keywords
+share/vile/loaderrs.rc
 share/vile/m4.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/dates.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/gnugpg.rc
+share/vile/macros/loaderrs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/modes.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/search.rc
+share/vile/macros/shifts.rc
+share/vile/macros/showeach.rc
+share/vile/macros/vile-pager
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/which.rc
 share/vile/mail.keywords
 share/vile/make.keywords
+share/vile/manpage.rc
+share/vile/midl.keywords
+share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/php.keywords
+share/vile/pictmode.rc
+share/vile/pot.keywords
 share/vile/ps.keywords
 share/vile/py.keywords
-share/vile/pot.keywords
 share/vile/rb.keywords
 share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/sccs.keywords
+share/vile/search.rc
 share/vile/sh.keywords
-share/vile/sql.keywords
+share/vile/shifts.rc
+share/vile/showeach.rc
 share/vile/sml.keywords
+share/vile/spell.rc
+share/vile/sql.keywords
 share/vile/syntax.keywords
 share/vile/tags.keywords
 share/vile/tbl.keywords
@@ -153,30 +174,19 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vile.hlp
 share/vile/vile.keywords
+share/vile/vileinit.rc
+share/vile/vileperl.rc
 share/vile/vim.keywords
 share/vile/vlog.keywords
+share/vile/wbt.keywords
 share/vile/which.rc
 share/vile/xml.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
 share/vile/yacc.keywords
-share/vile/macros/color-ls.rc
-share/vile/macros/dates.rc
-share/vile/macros/digraphs.rc
-share/vile/macros/gnugpg.rc
-share/vile/macros/loaderrs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/modes.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/search.rc
-share/vile/macros/shifts.rc
-share/vile/macros/showeach.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
-share/vile/macros/which.rc
 @dirrm share/vile/macros
 @dirrm share/vile
+@dirrm share/doc/vile
+@dirrm lib/vile
diff --git a/editors/vile/pkg-plist.filt b/editors/vile/pkg-plist.filt
index 44d725ba2d0b..b5d43749db43 100644
--- a/editors/vile/pkg-plist.filt
+++ b/editors/vile/pkg-plist.filt
@@ -3,15 +3,6 @@ bin/vile-pager
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
-lib/vile/vile-manfilt
-lib/vile/vile-crypt
-lib/vile/vile-c-filt.so
-lib/vile/vile-key-filt.so
-lib/vile/vile-m4-filt.so
-lib/vile/vile-perl-filt.so
-lib/vile/vile-ruby-filt.so
-lib/vile/vile-sed-filt.so
-lib/vile/vile-tags-filt.so
 lib/vile/vile-ada-filt.so
 lib/vile/vile-as-filt.so
 lib/vile/vile-asm-filt.so
@@ -19,7 +10,11 @@ lib/vile/vile-au3-filt.so
 lib/vile/vile-awk-filt.so
 lib/vile/vile-basic-filt.so
 lib/vile/vile-bat-filt.so
+lib/vile/vile-bnf-filt.so
+lib/vile/vile-c-filt.so
 lib/vile/vile-cfg-filt.so
+lib/vile/vile-crypt
+lib/vile/vile-css-filt.so
 lib/vile/vile-cweb-filt.so
 lib/vile/vile-dcl-filt.so
 lib/vile/vile-def-filt.so
@@ -33,14 +28,20 @@ lib/vile/vile-imake-filt.so
 lib/vile/vile-info-filt.so
 lib/vile/vile-ini-filt.so
 lib/vile/vile-iss-filt.so
+lib/vile/vile-key-filt.so
 lib/vile/vile-latex-filt.so
 lib/vile/vile-lex-filt.so
 lib/vile/vile-lisp-filt.so
+lib/vile/vile-m4-filt.so
 lib/vile/vile-mail-filt.so
 lib/vile/vile-make-filt.so
+lib/vile/vile-manfilt
+lib/vile/vile-midl-filt.so
 lib/vile/vile-mms-filt.so
 lib/vile/vile-nr-filt.so
 lib/vile/vile-pas-filt.so
+lib/vile/vile-perl-filt.so
+lib/vile/vile-php-filt.so
 lib/vile/vile-pl-filt.so
 lib/vile/vile-pot-filt.so
 lib/vile/vile-ps-filt.so
@@ -50,11 +51,14 @@ lib/vile/vile-rc-filt.so
 lib/vile/vile-rcs-filt.so
 lib/vile/vile-rexx-filt.so
 lib/vile/vile-rpm-filt.so
+lib/vile/vile-ruby-filt.so
 lib/vile/vile-sccs-filt.so
+lib/vile/vile-sed-filt.so
 lib/vile/vile-sh-filt.so
 lib/vile/vile-sml-filt.so
 lib/vile/vile-spell-filt.so
 lib/vile/vile-sql-filt.so
+lib/vile/vile-tags-filt.so
 lib/vile/vile-tbl-filt.so
 lib/vile/vile-tc-filt.so
 lib/vile/vile-tcl-filt.so
@@ -63,11 +67,11 @@ lib/vile/vile-ti-filt.so
 lib/vile/vile-txt-filt.so
 lib/vile/vile-vile-filt.so
 lib/vile/vile-vlog-filt.so
+lib/vile/vile-wbt-filt.so
 lib/vile/vile-xml-filt.so
 lib/vile/vile-xres-filt.so
 lib/vile/vile-xs-filt.so
 lib/vile/vile-yacc-filt.so
-@dirrm lib/vile
 share/doc/vile/Vileserv.doc
 share/doc/vile/config.doc
 share/doc/vile/dir.doc
@@ -78,24 +82,6 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-@dirrm share/doc/vile
-share/vile/color-ls.rc
-share/vile/dates.rc
-share/vile/digraphs.rc
-share/vile/filters.rc
-share/vile/gnugpg.rc
-share/vile/loaderrs.rc
-share/vile/manpage.rc
-share/vile/modes.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/search.rc
-share/vile/shifts.rc
-share/vile/showeach.rc
-share/vile/spell.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -104,46 +90,81 @@ share/vile/au3.keywords
 share/vile/awk.keywords
 share/vile/basic.keywords
 share/vile/bat.keywords
+share/vile/bnf.keywords
 share/vile/c.keywords
+share/vile/color-ls.rc
 share/vile/cpp.keywords
 share/vile/csh.keywords
+share/vile/css.keywords
 share/vile/cweb.keywords
+share/vile/dates.rc
 share/vile/dcl.keywords
 share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/digraphs.rc
 share/vile/ecl.keywords
-share/vile/est.keywords
 share/vile/esql.keywords
+share/vile/est.keywords
 share/vile/fdl.keywords
-share/vile/js.keywords
+share/vile/filters.rc
+share/vile/gnugpg.rc
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
 share/vile/iss.keywords
 share/vile/java.keywords
+share/vile/js.keywords
 share/vile/latex.keywords
 share/vile/lex.keywords
 share/vile/lisp.keywords
+share/vile/loaderrs.rc
 share/vile/m4.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/dates.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/gnugpg.rc
+share/vile/macros/loaderrs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/modes.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/search.rc
+share/vile/macros/shifts.rc
+share/vile/macros/showeach.rc
+share/vile/macros/vile-pager
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/which.rc
 share/vile/mail.keywords
 share/vile/make.keywords
+share/vile/manpage.rc
+share/vile/midl.keywords
+share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/php.keywords
+share/vile/pictmode.rc
+share/vile/pot.keywords
 share/vile/ps.keywords
 share/vile/py.keywords
-share/vile/pot.keywords
 share/vile/rb.keywords
 share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/sccs.keywords
+share/vile/search.rc
 share/vile/sh.keywords
-share/vile/sql.keywords
+share/vile/shifts.rc
+share/vile/showeach.rc
 share/vile/sml.keywords
+share/vile/spell.rc
+share/vile/sql.keywords
 share/vile/syntax.keywords
 share/vile/tags.keywords
 share/vile/tbl.keywords
@@ -153,30 +174,19 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vile.hlp
 share/vile/vile.keywords
+share/vile/vileinit.rc
+share/vile/vileperl.rc
 share/vile/vim.keywords
 share/vile/vlog.keywords
+share/vile/wbt.keywords
 share/vile/which.rc
 share/vile/xml.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
 share/vile/yacc.keywords
-share/vile/macros/color-ls.rc
-share/vile/macros/dates.rc
-share/vile/macros/digraphs.rc
-share/vile/macros/gnugpg.rc
-share/vile/macros/loaderrs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/modes.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/search.rc
-share/vile/macros/shifts.rc
-share/vile/macros/showeach.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
-share/vile/macros/which.rc
 @dirrm share/vile/macros
 @dirrm share/vile
+@dirrm share/doc/vile
+@dirrm lib/vile
diff --git a/editors/vile/pkg-plist.perl b/editors/vile/pkg-plist.perl
index 783b3a0a5b9c..ebcd64823226 100644
--- a/editors/vile/pkg-plist.perl
+++ b/editors/vile/pkg-plist.perl
@@ -4,45 +4,49 @@ bin/vileget
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
+lib/vile/vile-ada-filt
 lib/vile/vile-as-filt
 lib/vile/vile-asm-filt
 lib/vile/vile-au3-filt
-lib/vile/vile-basic-filt
-lib/vile/vile-c-filt
-lib/vile/vile-crypt
-lib/vile/vile-key-filt
-lib/vile/vile-manfilt
-lib/vile/vile-pas-filt
-lib/vile/vile-ada-filt
 lib/vile/vile-awk-filt
+lib/vile/vile-basic-filt
 lib/vile/vile-bat-filt
+lib/vile/vile-bnf-filt
+lib/vile/vile-c-filt
 lib/vile/vile-cfg-filt
+lib/vile/vile-crypt
+lib/vile/vile-css-filt
 lib/vile/vile-cweb-filt
 lib/vile/vile-dcl-filt
 lib/vile/vile-def-filt
-lib/vile/vile-fdl-filt
 lib/vile/vile-diff-filt
 lib/vile/vile-ecl-filt
 lib/vile/vile-esql-filt
 lib/vile/vile-est-filt
+lib/vile/vile-fdl-filt
 lib/vile/vile-html-filt
 lib/vile/vile-imake-filt
+lib/vile/vile-info-filt
 lib/vile/vile-ini-filt
 lib/vile/vile-iss-filt
-lib/vile/vile-info-filt
+lib/vile/vile-key-filt
 lib/vile/vile-latex-filt
 lib/vile/vile-lex-filt
 lib/vile/vile-lisp-filt
 lib/vile/vile-m4-filt
 lib/vile/vile-mail-filt
 lib/vile/vile-make-filt
+lib/vile/vile-manfilt
+lib/vile/vile-midl-filt
 lib/vile/vile-mms-filt
 lib/vile/vile-nr-filt
+lib/vile/vile-pas-filt
 lib/vile/vile-perl-filt
+lib/vile/vile-php-filt
 lib/vile/vile-pl-filt
 lib/vile/vile-pot-filt
-lib/vile/vile-py-filt
 lib/vile/vile-ps-filt
+lib/vile/vile-py-filt
 lib/vile/vile-rb-filt
 lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
@@ -64,11 +68,11 @@ lib/vile/vile-ti-filt
 lib/vile/vile-txt-filt
 lib/vile/vile-vile-filt
 lib/vile/vile-vlog-filt
+lib/vile/vile-wbt-filt
 lib/vile/vile-xml-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
-@dirrm lib/vile
 share/doc/vile/Vileserv.doc
 share/doc/vile/config.doc
 share/doc/vile/dir.doc
@@ -79,71 +83,32 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-@dirrm share/doc/vile
-share/vile/perl/Vile/Exporter.pm
-share/vile/perl/Vile/Manual.pm
-share/vile/perl/Breadcrumbs.pm
-share/vile/perl/CaptHook.pm
-share/vile/perl/Glob2re.pm
-share/vile/perl/Help.pm
-share/vile/perl/Vile.pm
-share/vile/perl/Vileserv.pm
-share/vile/perl/Visit.pm
-share/vile/perl/capture.pm
-share/vile/perl/dict.pm
-share/vile/perl/directory.pm
-share/vile/perl/dirlist.pm
-share/vile/perl/gdb.pm
-share/vile/perl/hgrep.pm
-share/vile/perl/lock.pm
-share/vile/perl/man.pm
-share/vile/perl/mime.pl
-share/vile/perl/plugins.pl
-share/vile/perl/search.pm
-share/vile/perl/shell.pm
-share/vile/perl/spell.pm
-share/vile/perl/winops.pm
-share/vile/color-ls.rc
-share/vile/dates.rc
-share/vile/digraphs.rc
-share/vile/gnugpg.rc
-share/vile/loaderrs.rc
-share/vile/manpage.rc
-share/vile/modes.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/search.rc
-share/vile/shifts.rc
-share/vile/showeach.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
+share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
 share/vile/asm.keywords
 share/vile/au3.keywords
+share/vile/awk.keywords
 share/vile/basic.keywords
+share/vile/bat.keywords
+share/vile/bnf.keywords
 share/vile/c.keywords
+share/vile/color-ls.rc
 share/vile/cpp.keywords
-share/vile/filters.rc
-share/vile/pas.keywords
-share/vile/pc.keywords
-share/vile/vb.keywords
-share/vile/vile.keywords
-share/vile/vim.keywords
-share/vile/vlog.keywords
-share/vile/ada.keywords
-share/vile/awk.keywords
-share/vile/bat.keywords
 share/vile/csh.keywords
+share/vile/css.keywords
 share/vile/cweb.keywords
+share/vile/dates.rc
 share/vile/dcl.keywords
 share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/digraphs.rc
 share/vile/ecl.keywords
 share/vile/esql.keywords
 share/vile/est.keywords
 share/vile/fdl.keywords
+share/vile/filters.rc
+share/vile/gnugpg.rc
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -153,22 +118,74 @@ share/vile/js.keywords
 share/vile/latex.keywords
 share/vile/lex.keywords
 share/vile/lisp.keywords
+share/vile/loaderrs.rc
 share/vile/m4.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/dates.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/gnugpg.rc
+share/vile/macros/loaderrs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/modes.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/search.rc
+share/vile/macros/shifts.rc
+share/vile/macros/showeach.rc
+share/vile/macros/vile-pager
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/which.rc
 share/vile/mail.keywords
 share/vile/make.keywords
+share/vile/manpage.rc
+share/vile/midl.keywords
+share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/palettes.rc
+share/vile/pas.keywords
+share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/perl/Breadcrumbs.pm
+share/vile/perl/CaptHook.pm
+share/vile/perl/Glob2re.pm
+share/vile/perl/Help.pm
+share/vile/perl/Vile.pm
+share/vile/perl/Vile/Exporter.pm
+share/vile/perl/Vile/Manual.pm
+share/vile/perl/Vileserv.pm
+share/vile/perl/Visit.pm
+share/vile/perl/capture.pm
+share/vile/perl/dict.pm
+share/vile/perl/directory.pm
+share/vile/perl/dirlist.pm
+share/vile/perl/gdb.pm
+share/vile/perl/hgrep.pm
+share/vile/perl/lock.pm
+share/vile/perl/man.pm
+share/vile/perl/mime.pl
+share/vile/perl/plugins.pl
+share/vile/perl/search.pm
+share/vile/perl/shell.pm
+share/vile/perl/spell.pm
+share/vile/perl/winops.pm
+share/vile/php.keywords
+share/vile/pictmode.rc
+share/vile/pot.keywords
 share/vile/ps.keywords
 share/vile/py.keywords
-share/vile/pot.keywords
 share/vile/rb.keywords
 share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/sccs.keywords
+share/vile/search.rc
 share/vile/sh.keywords
+share/vile/shifts.rc
+share/vile/showeach.rc
 share/vile/sml.keywords
 share/vile/spell.rc
 share/vile/sql.keywords
@@ -180,29 +197,22 @@ share/vile/tcl.keywords
 share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
+share/vile/vb.keywords
+share/vile/vile.hlp
+share/vile/vile.keywords
+share/vile/vileinit.rc
+share/vile/vileperl.rc
+share/vile/vim.keywords
+share/vile/vlog.keywords
+share/vile/wbt.keywords
 share/vile/which.rc
 share/vile/xml.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
-share/vile/macros/color-ls.rc
-share/vile/macros/dates.rc
-share/vile/macros/digraphs.rc
-share/vile/macros/gnugpg.rc
-share/vile/macros/loaderrs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/modes.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/search.rc
-share/vile/macros/shifts.rc
-share/vile/macros/showeach.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
-share/vile/macros/which.rc
 share/vile/yacc.keywords
 @dirrm share/vile/perl/Vile
 @dirrm share/vile/perl
 @dirrm share/vile/macros
 @dirrm share/vile
+@dirrm share/doc/vile
+@dirrm lib/vile
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
index 35b426a53306..c7f920625695 100644
--- a/editors/vile/pkg-plist.perl+filt
+++ b/editors/vile/pkg-plist.perl+filt
@@ -4,15 +4,6 @@ bin/vileget
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
-lib/vile/vile-manfilt
-lib/vile/vile-crypt
-lib/vile/vile-c-filt.so
-lib/vile/vile-key-filt.so
-lib/vile/vile-m4-filt.so
-lib/vile/vile-perl-filt.so
-lib/vile/vile-ruby-filt.so
-lib/vile/vile-sed-filt.so
-lib/vile/vile-tags-filt.so
 lib/vile/vile-ada-filt.so
 lib/vile/vile-as-filt.so
 lib/vile/vile-asm-filt.so
@@ -20,7 +11,11 @@ lib/vile/vile-au3-filt.so
 lib/vile/vile-awk-filt.so
 lib/vile/vile-basic-filt.so
 lib/vile/vile-bat-filt.so
+lib/vile/vile-bnf-filt.so
+lib/vile/vile-c-filt.so
 lib/vile/vile-cfg-filt.so
+lib/vile/vile-crypt
+lib/vile/vile-css-filt.so
 lib/vile/vile-cweb-filt.so
 lib/vile/vile-dcl-filt.so
 lib/vile/vile-def-filt.so
@@ -34,14 +29,20 @@ lib/vile/vile-imake-filt.so
 lib/vile/vile-info-filt.so
 lib/vile/vile-ini-filt.so
 lib/vile/vile-iss-filt.so
+lib/vile/vile-key-filt.so
 lib/vile/vile-latex-filt.so
 lib/vile/vile-lex-filt.so
 lib/vile/vile-lisp-filt.so
+lib/vile/vile-m4-filt.so
 lib/vile/vile-mail-filt.so
 lib/vile/vile-make-filt.so
+lib/vile/vile-manfilt
+lib/vile/vile-midl-filt.so
 lib/vile/vile-mms-filt.so
 lib/vile/vile-nr-filt.so
 lib/vile/vile-pas-filt.so
+lib/vile/vile-perl-filt.so
+lib/vile/vile-php-filt.so
 lib/vile/vile-pl-filt.so
 lib/vile/vile-pot-filt.so
 lib/vile/vile-ps-filt.so
@@ -51,11 +52,14 @@ lib/vile/vile-rc-filt.so
 lib/vile/vile-rcs-filt.so
 lib/vile/vile-rexx-filt.so
 lib/vile/vile-rpm-filt.so
+lib/vile/vile-ruby-filt.so
 lib/vile/vile-sccs-filt.so
+lib/vile/vile-sed-filt.so
 lib/vile/vile-sh-filt.so
 lib/vile/vile-sml-filt.so
 lib/vile/vile-spell-filt.so
 lib/vile/vile-sql-filt.so
+lib/vile/vile-tags-filt.so
 lib/vile/vile-tbl-filt.so
 lib/vile/vile-tc-filt.so
 lib/vile/vile-tcl-filt.so
@@ -64,11 +68,11 @@ lib/vile/vile-ti-filt.so
 lib/vile/vile-txt-filt.so
 lib/vile/vile-vile-filt.so
 lib/vile/vile-vlog-filt.so
+lib/vile/vile-wbt-filt.so
 lib/vile/vile-xml-filt.so
 lib/vile/vile-xres-filt.so
 lib/vile/vile-xs-filt.so
 lib/vile/vile-yacc-filt.so
-@dirrm lib/vile
 share/doc/vile/Vileserv.doc
 share/doc/vile/config.doc
 share/doc/vile/dir.doc
@@ -79,71 +83,32 @@ share/doc/vile/modes.doc
 share/doc/vile/oleauto.doc
 share/doc/vile/perl.doc
 share/doc/vile/visvile.doc
-@dirrm share/doc/vile
-share/vile/perl/Vile/Exporter.pm
-share/vile/perl/Vile/Manual.pm
-share/vile/perl/Breadcrumbs.pm
-share/vile/perl/CaptHook.pm
-share/vile/perl/Glob2re.pm
-share/vile/perl/Help.pm
-share/vile/perl/Vile.pm
-share/vile/perl/Vileserv.pm
-share/vile/perl/Visit.pm
-share/vile/perl/capture.pm
-share/vile/perl/dict.pm
-share/vile/perl/directory.pm
-share/vile/perl/dirlist.pm
-share/vile/perl/gdb.pm
-share/vile/perl/hgrep.pm
-share/vile/perl/lock.pm
-share/vile/perl/man.pm
-share/vile/perl/mime.pl
-share/vile/perl/plugins.pl
-share/vile/perl/search.pm
-share/vile/perl/shell.pm
-share/vile/perl/spell.pm
-share/vile/perl/winops.pm
-share/vile/color-ls.rc
-share/vile/dates.rc
-share/vile/digraphs.rc
-share/vile/gnugpg.rc
-share/vile/loaderrs.rc
-share/vile/manpage.rc
-share/vile/modes.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/search.rc
-share/vile/shifts.rc
-share/vile/showeach.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
+share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
 share/vile/asm.keywords
 share/vile/au3.keywords
-share/vile/c.keywords
-share/vile/cpp.keywords
-share/vile/filters.rc
-share/vile/pas.keywords
-share/vile/pc.keywords
-share/vile/vb.keywords
-share/vile/vile.keywords
-share/vile/vim.keywords
-share/vile/vlog.keywords
-share/vile/ada.keywords
 share/vile/awk.keywords
 share/vile/basic.keywords
 share/vile/bat.keywords
+share/vile/bnf.keywords
+share/vile/c.keywords
+share/vile/color-ls.rc
+share/vile/cpp.keywords
 share/vile/csh.keywords
+share/vile/css.keywords
 share/vile/cweb.keywords
+share/vile/dates.rc
 share/vile/dcl.keywords
 share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/digraphs.rc
 share/vile/ecl.keywords
 share/vile/esql.keywords
 share/vile/est.keywords
 share/vile/fdl.keywords
+share/vile/filters.rc
+share/vile/gnugpg.rc
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -153,22 +118,74 @@ share/vile/js.keywords
 share/vile/latex.keywords
 share/vile/lex.keywords
 share/vile/lisp.keywords
+share/vile/loaderrs.rc
 share/vile/m4.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/dates.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/gnugpg.rc
+share/vile/macros/loaderrs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/modes.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/search.rc
+share/vile/macros/shifts.rc
+share/vile/macros/showeach.rc
+share/vile/macros/vile-pager
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/which.rc
 share/vile/mail.keywords
 share/vile/make.keywords
+share/vile/manpage.rc
+share/vile/midl.keywords
+share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/palettes.rc
+share/vile/pas.keywords
+share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/perl/Breadcrumbs.pm
+share/vile/perl/CaptHook.pm
+share/vile/perl/Glob2re.pm
+share/vile/perl/Help.pm
+share/vile/perl/Vile.pm
+share/vile/perl/Vile/Exporter.pm
+share/vile/perl/Vile/Manual.pm
+share/vile/perl/Vileserv.pm
+share/vile/perl/Visit.pm
+share/vile/perl/capture.pm
+share/vile/perl/dict.pm
+share/vile/perl/directory.pm
+share/vile/perl/dirlist.pm
+share/vile/perl/gdb.pm
+share/vile/perl/hgrep.pm
+share/vile/perl/lock.pm
+share/vile/perl/man.pm
+share/vile/perl/mime.pl
+share/vile/perl/plugins.pl
+share/vile/perl/search.pm
+share/vile/perl/shell.pm
+share/vile/perl/spell.pm
+share/vile/perl/winops.pm
+share/vile/php.keywords
+share/vile/pictmode.rc
+share/vile/pot.keywords
 share/vile/ps.keywords
 share/vile/py.keywords
-share/vile/pot.keywords
 share/vile/rb.keywords
 share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/sccs.keywords
+share/vile/search.rc
 share/vile/sh.keywords
+share/vile/shifts.rc
+share/vile/showeach.rc
 share/vile/sml.keywords
 share/vile/spell.rc
 share/vile/sql.keywords
@@ -180,29 +197,22 @@ share/vile/tcl.keywords
 share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
+share/vile/vb.keywords
+share/vile/vile.hlp
+share/vile/vile.keywords
+share/vile/vileinit.rc
+share/vile/vileperl.rc
+share/vile/vim.keywords
+share/vile/vlog.keywords
+share/vile/wbt.keywords
 share/vile/which.rc
 share/vile/xml.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
-share/vile/macros/color-ls.rc
-share/vile/macros/dates.rc
-share/vile/macros/digraphs.rc
-share/vile/macros/gnugpg.rc
-share/vile/macros/loaderrs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/modes.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/search.rc
-share/vile/macros/shifts.rc
-share/vile/macros/showeach.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
-share/vile/macros/which.rc
 share/vile/yacc.keywords
 @dirrm share/vile/perl/Vile
 @dirrm share/vile/perl
 @dirrm share/vile/macros
 @dirrm share/vile
+@dirrm share/doc/vile
+@dirrm lib/vile