Update to 9.7j.

14 files changed, 147 insertions, 11 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index c3f9a04b1f80..327074aba570 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.7
+PORTVERSION=	9.7j
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/ \
 		ftp://invisible-island.net/vile/ \
@@ -15,6 +15,16 @@ DISTNAME=	vile-9.7
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=	${MASTER_SITES:S,vile/,vile/patches/,g}
+PATCHFILES=	vile-9.7a.patch.gz \
+		vile-9.7b.patch.gz \
+		vile-9.7c.patch.gz \
+		vile-9.7d.patch.gz \
+		vile-9.7e.patch.gz \
+		vile-9.7f.patch.gz \
+		vile-9.7g.patch.gz \
+		vile-9.7h.patch.gz \
+		vile-9.7i.patch.gz \
+		vile-9.7j.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs.  a vi "workalike", with many additional features
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index 08a09d0ab7ab..f18121a8df58 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,3 +1,33 @@
 MD5 (vile-9.7.tgz) = 3ef25a8b4778d4790defb24729c60ce2
 SHA256 (vile-9.7.tgz) = 14c14b29d6f03311c325351cf633b823917c0c3b4a9e580fb3d3e228a7b917dd
 SIZE (vile-9.7.tgz) = 1796227
+MD5 (vile-9.7a.patch.gz) = 93b34038d8a26b353688ea056af36b98
+SHA256 (vile-9.7a.patch.gz) = a045feffd90538e9ca5a66361954ca85f256c2fe6bb9688d240dc9889c8473ed
+SIZE (vile-9.7a.patch.gz) = 8183
+MD5 (vile-9.7b.patch.gz) = 89956de099dabbedecefb18764bd0a38
+SHA256 (vile-9.7b.patch.gz) = 29c755f683e8e34eb47d090418284dae5e16578638fdd9e7bbea9ae163663324
+SIZE (vile-9.7b.patch.gz) = 65273
+MD5 (vile-9.7c.patch.gz) = 30268930726b8713e1d0119d44dcfc54
+SHA256 (vile-9.7c.patch.gz) = 020237804a11e7ebe39b1caf23ec7c766b963b450265022ff5aa8f222b597fb4
+SIZE (vile-9.7c.patch.gz) = 13060
+MD5 (vile-9.7d.patch.gz) = 5e81ff3f4ceeb1b7b7886903cedca042
+SHA256 (vile-9.7d.patch.gz) = 37183976adf867bf9561c723826010cb9700365d1f4399885c70aff2fb14c128
+SIZE (vile-9.7d.patch.gz) = 67034
+MD5 (vile-9.7e.patch.gz) = 9fc27df27a0ecdd2c7554220380116ae
+SHA256 (vile-9.7e.patch.gz) = eaae0b50e9f69c31ecdc9e6576d2495f7117643b170ec38008e1081bfc8db3c2
+SIZE (vile-9.7e.patch.gz) = 46752
+MD5 (vile-9.7f.patch.gz) = a83ba6f39c6729072df1b3cce72711bb
+SHA256 (vile-9.7f.patch.gz) = e7f49875819ca1d6abd86fc1a3b162fd5e2fcc524fb014fcbfe528974f2bb0f4
+SIZE (vile-9.7f.patch.gz) = 89029
+MD5 (vile-9.7g.patch.gz) = 268fe0dda71d5260562afeb26235f5d6
+SHA256 (vile-9.7g.patch.gz) = c348ae3f834ec773b0615aa173abf3ba8b7a8aad3349f36e9401b1bb869a3714
+SIZE (vile-9.7g.patch.gz) = 13248
+MD5 (vile-9.7h.patch.gz) = 7a0c923f80b8a07fc1286081db518c2e
+SHA256 (vile-9.7h.patch.gz) = d924288cc80fa5d42b110f279903746c32e1118dc5c5114da85269e5eb298e24
+SIZE (vile-9.7h.patch.gz) = 31314
+MD5 (vile-9.7i.patch.gz) = 5c71ee2ba4ce7dcd9dc999084c485daa
+SHA256 (vile-9.7i.patch.gz) = bfe580f78e68d0ddd8fdc64f1770b9d34b84bcdf4260ed051213c07a1f7ec604
+SIZE (vile-9.7i.patch.gz) = 47601
+MD5 (vile-9.7j.patch.gz) = a68160c3546de5f1ccbab7ba52402b9d
+SHA256 (vile-9.7j.patch.gz) = a7c837c948ebdee57e3dc39beb9ebb2b63c404bf4505d6f00edeb48be93a0cf0
+SIZE (vile-9.7j.patch.gz) = 6654
diff --git a/editors/vile/files/patch-ac b/editors/vile/files/patch-ac
index fbf45120a120..824316f8501e 100644
--- a/editors/vile/files/patch-ac
+++ b/editors/vile/files/patch-ac
@@ -1,9 +1,9 @@
---- makefile.in.orig	Mon May  5 11:16:17 2003
-+++ makefile.in	Mon May  5 11:16:30 2003
-@@ -52,7 +52,7 @@
+--- makefile.in.orig	2009-01-05 12:09:43.000000000 +0100
++++ makefile.in	2009-01-05 12:13:44.000000000 +0100
+@@ -54,7 +54,7 @@
  AWK		= @AWK@
  PERL		= @PERL@
- PERLLIB		= @perl_lib_path@
+ PERLLIB		= @PERLLIB@
 -INSTALL_SCRIPT	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
 +INSTALL_SCRIPT	= $(INSTALL) -m 555
  INSTALL_MODULE	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index f660eb5514be..f840c022ea0b 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -24,6 +24,7 @@ lib/vile/vile-ecl-filt
 lib/vile/vile-esql-filt
 lib/vile/vile-est-filt
 lib/vile/vile-fdl-filt
+lib/vile/vile-hs-filt
 lib/vile/vile-html-filt
 lib/vile/vile-imake-filt
 lib/vile/vile-info-filt
@@ -36,6 +37,7 @@ lib/vile/vile-lisp-filt
 lib/vile/vile-lua-filt
 lib/vile/vile-m4-filt
 lib/vile/vile-mail-filt
+lib/vile/vile-mailcap-filt
 lib/vile/vile-make-filt
 lib/vile/vile-manfilt
 lib/vile/vile-mcrl-filt
@@ -112,6 +114,7 @@ share/vile/est.keywords
 share/vile/fdl.keywords
 share/vile/filters.rc
 share/vile/gnugpg.rc
+share/vile/hs.keywords
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -142,6 +145,7 @@ share/vile/macros/vilemenu.rc
 share/vile/macros/vileperl.rc
 share/vile/macros/which.rc
 share/vile/mail.keywords
+share/vile/mailcap.keywords
 share/vile/make.keywords
 share/vile/manpage.rc
 share/vile/mcrl.keywords
@@ -149,6 +153,7 @@ share/vile/midl.keywords
 share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/objc.keywords
 share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
@@ -182,6 +187,8 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vb6.keywords
+share/vile/vbs.keywords
 share/vile/vile.hlp
 share/vile/vile.keywords
 share/vile/vileinit.rc
diff --git a/editors/vile/pkg-plist.filt b/editors/vile/pkg-plist.filt
index 808ce311c57e..2c73507e483f 100644
--- a/editors/vile/pkg-plist.filt
+++ b/editors/vile/pkg-plist.filt
@@ -24,6 +24,7 @@ lib/vile/vile-ecl-filt.so
 lib/vile/vile-esql-filt.so
 lib/vile/vile-est-filt.so
 lib/vile/vile-fdl-filt.so
+lib/vile/vile-hs-filt.so
 lib/vile/vile-html-filt.so
 lib/vile/vile-imake-filt.so
 lib/vile/vile-info-filt.so
@@ -36,6 +37,7 @@ lib/vile/vile-lisp-filt.so
 lib/vile/vile-lua-filt.so
 lib/vile/vile-m4-filt.so
 lib/vile/vile-mail-filt.so
+lib/vile/vile-mailcap-filt.so
 lib/vile/vile-make-filt.so
 lib/vile/vile-manfilt
 lib/vile/vile-mcrl-filt.so
@@ -112,6 +114,7 @@ share/vile/est.keywords
 share/vile/fdl.keywords
 share/vile/filters.rc
 share/vile/gnugpg.rc
+share/vile/hs.keywords
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -142,6 +145,7 @@ share/vile/macros/vilemenu.rc
 share/vile/macros/vileperl.rc
 share/vile/macros/which.rc
 share/vile/mail.keywords
+share/vile/mailcap.keywords
 share/vile/make.keywords
 share/vile/manpage.rc
 share/vile/mcrl.keywords
@@ -149,6 +153,7 @@ share/vile/midl.keywords
 share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/objc.keywords
 share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
@@ -182,6 +187,8 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vb6.keywords
+share/vile/vbs.keywords
 share/vile/vile.hlp
 share/vile/vile.keywords
 share/vile/vileinit.rc
diff --git a/editors/vile/pkg-plist.perl b/editors/vile/pkg-plist.perl
index f9fc78986114..e4a9b3fcfdb9 100644
--- a/editors/vile/pkg-plist.perl
+++ b/editors/vile/pkg-plist.perl
@@ -25,6 +25,7 @@ lib/vile/vile-ecl-filt
 lib/vile/vile-esql-filt
 lib/vile/vile-est-filt
 lib/vile/vile-fdl-filt
+lib/vile/vile-hs-filt
 lib/vile/vile-html-filt
 lib/vile/vile-imake-filt
 lib/vile/vile-info-filt
@@ -37,6 +38,7 @@ lib/vile/vile-lisp-filt
 lib/vile/vile-lua-filt
 lib/vile/vile-m4-filt
 lib/vile/vile-mail-filt
+lib/vile/vile-mailcap-filt
 lib/vile/vile-make-filt
 lib/vile/vile-manfilt
 lib/vile/vile-mcrl-filt
@@ -113,6 +115,7 @@ share/vile/est.keywords
 share/vile/fdl.keywords
 share/vile/filters.rc
 share/vile/gnugpg.rc
+share/vile/hs.keywords
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -143,6 +146,7 @@ share/vile/macros/vilemenu.rc
 share/vile/macros/vileperl.rc
 share/vile/macros/which.rc
 share/vile/mail.keywords
+share/vile/mailcap.keywords
 share/vile/make.keywords
 share/vile/manpage.rc
 share/vile/mcrl.keywords
@@ -150,6 +154,7 @@ share/vile/midl.keywords
 share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/objc.keywords
 share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
@@ -206,6 +211,8 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vb6.keywords
+share/vile/vbs.keywords
 share/vile/vile.hlp
 share/vile/vile.keywords
 share/vile/vileinit.rc
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
index 0d0489c505c4..7999956e7863 100644
--- a/editors/vile/pkg-plist.perl+filt
+++ b/editors/vile/pkg-plist.perl+filt
@@ -25,6 +25,7 @@ lib/vile/vile-ecl-filt.so
 lib/vile/vile-esql-filt.so
 lib/vile/vile-est-filt.so
 lib/vile/vile-fdl-filt.so
+lib/vile/vile-hs-filt.so
 lib/vile/vile-html-filt.so
 lib/vile/vile-imake-filt.so
 lib/vile/vile-info-filt.so
@@ -37,6 +38,7 @@ 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-mailcap-filt.so
 lib/vile/vile-make-filt.so
 lib/vile/vile-manfilt
 lib/vile/vile-mcrl-filt.so
@@ -113,6 +115,7 @@ share/vile/est.keywords
 share/vile/fdl.keywords
 share/vile/filters.rc
 share/vile/gnugpg.rc
+share/vile/hs.keywords
 share/vile/html.keywords
 share/vile/imake.keywords
 share/vile/ini.keywords
@@ -143,6 +146,7 @@ share/vile/macros/vilemenu.rc
 share/vile/macros/vileperl.rc
 share/vile/macros/which.rc
 share/vile/mail.keywords
+share/vile/mailcap.keywords
 share/vile/make.keywords
 share/vile/manpage.rc
 share/vile/mcrl.keywords
@@ -150,6 +154,7 @@ share/vile/midl.keywords
 share/vile/modes.rc
 share/vile/nr.keywords
 share/vile/nsis.keywords
+share/vile/objc.keywords
 share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
@@ -206,6 +211,8 @@ share/vile/tex.keywords
 share/vile/texi.keywords
 share/vile/ti.keywords
 share/vile/vb.keywords
+share/vile/vb6.keywords
+share/vile/vbs.keywords
 share/vile/vile.hlp
 share/vile/vile.keywords
 share/vile/vileinit.rc
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 7b02fff7447b..007b19acbe7a 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xvile
-PORTVERSION=	9.7
+PORTVERSION=	9.7j
 CATEGORIES=	editors
 MASTER_SITES=	ftp://invisible-island.net/vile/ \
 		ftp://dickey.his.com/vile/ \
@@ -15,6 +15,16 @@ DISTNAME=	vile-9.7
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=    ${MASTER_SITES:S,vile/,vile/patches/,g}
+PATCHFILES=	vile-9.7a.patch.gz \
+		vile-9.7b.patch.gz \
+		vile-9.7c.patch.gz \
+		vile-9.7d.patch.gz \
+		vile-9.7e.patch.gz \
+		vile-9.7f.patch.gz \
+		vile-9.7g.patch.gz \
+		vile-9.7h.patch.gz \
+		vile-9.7i.patch.gz \
+		vile-9.7j.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index 08a09d0ab7ab..f18121a8df58 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -1,3 +1,33 @@
 MD5 (vile-9.7.tgz) = 3ef25a8b4778d4790defb24729c60ce2
 SHA256 (vile-9.7.tgz) = 14c14b29d6f03311c325351cf633b823917c0c3b4a9e580fb3d3e228a7b917dd
 SIZE (vile-9.7.tgz) = 1796227
+MD5 (vile-9.7a.patch.gz) = 93b34038d8a26b353688ea056af36b98
+SHA256 (vile-9.7a.patch.gz) = a045feffd90538e9ca5a66361954ca85f256c2fe6bb9688d240dc9889c8473ed
+SIZE (vile-9.7a.patch.gz) = 8183
+MD5 (vile-9.7b.patch.gz) = 89956de099dabbedecefb18764bd0a38
+SHA256 (vile-9.7b.patch.gz) = 29c755f683e8e34eb47d090418284dae5e16578638fdd9e7bbea9ae163663324
+SIZE (vile-9.7b.patch.gz) = 65273
+MD5 (vile-9.7c.patch.gz) = 30268930726b8713e1d0119d44dcfc54
+SHA256 (vile-9.7c.patch.gz) = 020237804a11e7ebe39b1caf23ec7c766b963b450265022ff5aa8f222b597fb4
+SIZE (vile-9.7c.patch.gz) = 13060
+MD5 (vile-9.7d.patch.gz) = 5e81ff3f4ceeb1b7b7886903cedca042
+SHA256 (vile-9.7d.patch.gz) = 37183976adf867bf9561c723826010cb9700365d1f4399885c70aff2fb14c128
+SIZE (vile-9.7d.patch.gz) = 67034
+MD5 (vile-9.7e.patch.gz) = 9fc27df27a0ecdd2c7554220380116ae
+SHA256 (vile-9.7e.patch.gz) = eaae0b50e9f69c31ecdc9e6576d2495f7117643b170ec38008e1081bfc8db3c2
+SIZE (vile-9.7e.patch.gz) = 46752
+MD5 (vile-9.7f.patch.gz) = a83ba6f39c6729072df1b3cce72711bb
+SHA256 (vile-9.7f.patch.gz) = e7f49875819ca1d6abd86fc1a3b162fd5e2fcc524fb014fcbfe528974f2bb0f4
+SIZE (vile-9.7f.patch.gz) = 89029
+MD5 (vile-9.7g.patch.gz) = 268fe0dda71d5260562afeb26235f5d6
+SHA256 (vile-9.7g.patch.gz) = c348ae3f834ec773b0615aa173abf3ba8b7a8aad3349f36e9401b1bb869a3714
+SIZE (vile-9.7g.patch.gz) = 13248
+MD5 (vile-9.7h.patch.gz) = 7a0c923f80b8a07fc1286081db518c2e
+SHA256 (vile-9.7h.patch.gz) = d924288cc80fa5d42b110f279903746c32e1118dc5c5114da85269e5eb298e24
+SIZE (vile-9.7h.patch.gz) = 31314
+MD5 (vile-9.7i.patch.gz) = 5c71ee2ba4ce7dcd9dc999084c485daa
+SHA256 (vile-9.7i.patch.gz) = bfe580f78e68d0ddd8fdc64f1770b9d34b84bcdf4260ed051213c07a1f7ec604
+SIZE (vile-9.7i.patch.gz) = 47601
+MD5 (vile-9.7j.patch.gz) = a68160c3546de5f1ccbab7ba52402b9d
+SHA256 (vile-9.7j.patch.gz) = a7c837c948ebdee57e3dc39beb9ebb2b63c404bf4505d6f00edeb48be93a0cf0
+SIZE (vile-9.7j.patch.gz) = 6654
diff --git a/editors/xvile/files/patch-ac b/editors/xvile/files/patch-ac
index da3eff1235bb..99a511507602 100644
--- a/editors/xvile/files/patch-ac
+++ b/editors/xvile/files/patch-ac
@@ -1,15 +1,15 @@
---- makefile.in.orig	Mon May  5 12:52:50 2003
-+++ makefile.in	Mon May  5 13:02:33 2003
-@@ -52,7 +52,7 @@
+--- makefile.in.orig	2009-01-05 13:21:04.000000000 +0100
++++ makefile.in	2009-01-05 13:24:59.000000000 +0100
+@@ -54,7 +54,7 @@
  AWK		= @AWK@
  PERL		= @PERL@
- PERLLIB		= @perl_lib_path@
+ PERLLIB		= @PERLLIB@
 -INSTALL_SCRIPT	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
 +INSTALL_SCRIPT	= $(INSTALL) -m 555
  INSTALL_MODULE	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
  
  prefix		= @prefix@
-@@ -628,7 +628,7 @@
+@@ -672,7 +672,7 @@
  	$(INSTALL_PROGRAM)	$(TARGET) $@
  
  $(BINDIR)/xshell.sh:		$(srcdir)/xshell.sh
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index 10f557266414..83fc4e6e8b3c 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -24,6 +24,7 @@ lib/xvile/vile-css-filt
 lib/xvile/vile-cweb-filt
 lib/xvile/vile-dcl-filt
 lib/xvile/vile-fdl-filt
+lib/xvile/vile-hs-filt
 lib/xvile/vile-def-filt
 lib/xvile/vile-diff-filt
 lib/xvile/vile-ecl-filt
@@ -39,6 +40,7 @@ lib/xvile/vile-lex-filt
 lib/xvile/vile-lua-filt
 lib/xvile/vile-m4-filt
 lib/xvile/vile-mail-filt
+lib/xvile/vile-mailcap-filt
 lib/xvile/vile-make-filt
 lib/xvile/vile-mcrl-filt
 lib/xvile/vile-midl-filt
@@ -133,6 +135,7 @@ share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/est.keywords
 share/xvile/vile/fdl.keywords
+share/xvile/vile/hs.keywords
 share/xvile/vile/html.keywords
 share/xvile/vile/imake.keywords
 share/xvile/vile/ini.keywords
@@ -145,11 +148,13 @@ share/xvile/vile/lisp.keywords
 share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
+share/xvile/vile/mailcap.keywords
 share/xvile/vile/make.keywords
 share/xvile/vile/mcrl.keywords
 share/xvile/vile/midl.keywords
 share/xvile/vile/nr.keywords
 share/xvile/vile/nsis.keywords
+share/xvile/vile/objc.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/php.keywords
 share/xvile/vile/py.keywords
@@ -175,6 +180,8 @@ share/xvile/vile/tex.keywords
 share/xvile/vile/texi.keywords
 share/xvile/vile/ti.keywords
 share/xvile/vile/vb.keywords
+share/xvile/vile/vb6.keywords
+share/xvile/vile/vbs.keywords
 share/xvile/vile/vlog.keywords
 share/xvile/vile/wbt.keywords
 share/xvile/vile/xml.keywords
diff --git a/editors/xvile/pkg-plist.filt b/editors/xvile/pkg-plist.filt
index 4cdc9b58ee57..b4144f950503 100644
--- a/editors/xvile/pkg-plist.filt
+++ b/editors/xvile/pkg-plist.filt
@@ -32,6 +32,7 @@ lib/xvile/vile-ecl-filt.so
 lib/xvile/vile-esql-filt.so
 lib/xvile/vile-est-filt.so
 lib/xvile/vile-fdl-filt.so
+lib/xvile/vile-hs-filt.so
 lib/xvile/vile-html-filt.so
 lib/xvile/vile-imake-filt.so
 lib/xvile/vile-info-filt.so
@@ -42,6 +43,7 @@ lib/xvile/vile-lex-filt.so
 lib/xvile/vile-lisp-filt.so
 lib/xvile/vile-lua-filt.so
 lib/xvile/vile-mail-filt.so
+lib/xvile/vile-mailcap-filt.so
 lib/xvile/vile-make-filt.so
 lib/xvile/vile-mcrl-filt.so
 lib/xvile/vile-midl-filt.so
@@ -117,6 +119,8 @@ share/xvile/vile/pas.keywords
 share/xvile/vile/pc.keywords
 share/xvile/vile/ps.keywords
 share/xvile/vile/vb.keywords
+share/xvile/vile/vb6.keywords
+share/xvile/vile/vbs.keywords
 share/xvile/vile/vile.keywords
 share/xvile/vile/vim.keywords
 share/xvile/vile/vlog.keywords
@@ -135,6 +139,7 @@ share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/est.keywords
 share/xvile/vile/fdl.keywords
+share/xvile/vile/hs.keywords
 share/xvile/vile/html.keywords
 share/xvile/vile/imake.keywords
 share/xvile/vile/ini.keywords
@@ -147,11 +152,13 @@ share/xvile/vile/lisp.keywords
 share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
+share/xvile/vile/mailcap.keywords
 share/xvile/vile/make.keywords
 share/xvile/vile/mcrl.keywords
 share/xvile/vile/midl.keywords
 share/xvile/vile/nr.keywords
 share/xvile/vile/nsis.keywords
+share/xvile/vile/objc.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/php.keywords
 share/xvile/vile/py.keywords
diff --git a/editors/xvile/pkg-plist.perl b/editors/xvile/pkg-plist.perl
index b6829d6b159c..b68988d69236 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -24,6 +24,7 @@ lib/xvile/vile-conf-filt
 lib/xvile/vile-cweb-filt
 lib/xvile/vile-dcl-filt
 lib/xvile/vile-fdl-filt
+lib/xvile/vile-hs-filt
 lib/xvile/vile-def-filt
 lib/xvile/vile-diff-filt
 lib/xvile/vile-ecl-filt
@@ -40,6 +41,7 @@ lib/xvile/vile-lisp-filt
 lib/xvile/vile-lua-filt
 lib/xvile/vile-m4-filt
 lib/xvile/vile-mail-filt
+lib/xvile/vile-mailcap-filt
 lib/xvile/vile-make-filt
 lib/xvile/vile-mcrl-filt
 lib/xvile/vile-midl-filt
@@ -142,6 +144,8 @@ share/xvile/vile/pas.keywords
 share/xvile/vile/pc.keywords
 share/xvile/vile/ps.keywords
 share/xvile/vile/vb.keywords
+share/xvile/vile/vb6.keywords
+share/xvile/vile/vbs.keywords
 share/xvile/vile/vile.keywords
 share/xvile/vile/vim.keywords
 share/xvile/vile/vlog.keywords
@@ -159,6 +163,7 @@ share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/est.keywords
 share/xvile/vile/fdl.keywords
+share/xvile/vile/hs.keywords
 share/xvile/vile/html.keywords
 share/xvile/vile/imake.keywords
 share/xvile/vile/ini.keywords
@@ -171,11 +176,13 @@ share/xvile/vile/lisp.keywords
 share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
+share/xvile/vile/mailcap.keywords
 share/xvile/vile/make.keywords
 share/xvile/vile/mcrl.keywords
 share/xvile/vile/midl.keywords
 share/xvile/vile/nr.keywords
 share/xvile/vile/nsis.keywords
+share/xvile/vile/objc.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/php.keywords
 share/xvile/vile/py.keywords
diff --git a/editors/xvile/pkg-plist.perl+filt b/editors/xvile/pkg-plist.perl+filt
index b36b8e2d725b..f2ef9f88f27c 100644
--- a/editors/xvile/pkg-plist.perl+filt
+++ b/editors/xvile/pkg-plist.perl+filt
@@ -33,6 +33,7 @@ lib/xvile/vile-ecl-filt.so
 lib/xvile/vile-esql-filt.so
 lib/xvile/vile-est-filt.so
 lib/xvile/vile-fdl-filt.so
+lib/xvile/vile-hs-filt.so
 lib/xvile/vile-html-filt.so
 lib/xvile/vile-imake-filt.so
 lib/xvile/vile-info-filt.so
@@ -43,6 +44,7 @@ lib/xvile/vile-lex-filt.so
 lib/xvile/vile-lisp-filt.so
 lib/xvile/vile-lua-filt.so
 lib/xvile/vile-mail-filt.so
+lib/xvile/vile-mailcap-filt.so
 lib/xvile/vile-make-filt.so
 lib/xvile/vile-mcrl-filt.so
 lib/xvile/vile-midl-filt.so
@@ -142,6 +144,8 @@ share/xvile/vile/pas.keywords
 share/xvile/vile/pc.keywords
 share/xvile/vile/ps.keywords
 share/xvile/vile/vb.keywords
+share/xvile/vile/vb6.keywords
+share/xvile/vile/vbs.keywords
 share/xvile/vile/vile.keywords
 share/xvile/vile/vim.keywords
 share/xvile/vile/vlog.keywords
@@ -159,6 +163,7 @@ share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/est.keywords
 share/xvile/vile/fdl.keywords
+share/xvile/vile/hs.keywords
 share/xvile/vile/html.keywords
 share/xvile/vile/imake.keywords
 share/xvile/vile/ini.keywords
@@ -171,11 +176,13 @@ share/xvile/vile/lisp.keywords
 share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
+share/xvile/vile/mailcap.keywords
 share/xvile/vile/make.keywords
 share/xvile/vile/mcrl.keywords
 share/xvile/vile/midl.keywords
 share/xvile/vile/nr.keywords
 share/xvile/vile/nsis.keywords
+share/xvile/vile/objc.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/php.keywords
 share/xvile/vile/py.keywords