6 files changed, 169 insertions, 140 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index ed59f6790562..fef1af8fe769 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xvile
-PORTVERSION=	9.5d
+PORTVERSION=	9.5g
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.phred.org/pub/vile/ \
 		ftp://invisible-island.net/vile/ \
@@ -18,14 +18,18 @@ PATCH_SITES=    ${MASTER_SITES:S,vile/,vile/patches/,g}
 PATCHFILES=	vile-9.5a.patch.gz \
 		vile-9.5b.patch.gz \
 		vile-9.5c.patch.gz \
-		vile-9.5d.patch.gz
+		vile-9.5d.patch.gz \
+		vile-9.5e.patch.gz \
+		vile-9.5f.patch.gz \
+		vile-9.5g.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
+USE_PERL5=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-libdir-path=${PREFIX}/lib/xvile \
@@ -61,10 +65,10 @@ pre-configure:
 CONFIGURE_ARGS+= --with-screen=Xaw
 .if defined(WITH_XAW3D)
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
-CONFIGURE_ARGS+= --with-Xaw3d
+CONFIGURE_ARGS+=	--with-Xaw3d
 .endif
 .else
-CONFIGURE_ARGS+= --with-screen=x11
+CONFIGURE_ARGS+=	--with-screen=x11
 .endif
 
 .if defined(WITH_PERL)
@@ -74,7 +78,7 @@ USE_PERL5=	yes
 .endif
 
 .if defined(WITH_FILTERS)
-CONFIG_ARGS+= --with-loadable-filters
+CONFIGURE_ARGS+=	--with-loadable-filters
 PLIST=		${PKGDIR}/pkg-plist.filt
 .endif
 
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index 0a44345e2269..e80db6a22085 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -13,3 +13,12 @@ SIZE (vile-9.5c.patch.gz) = 40916
 MD5 (vile-9.5d.patch.gz) = bfcb93c4241cb4e87cbff35f551b1073
 SHA256 (vile-9.5d.patch.gz) = 1dc8c0e397811f04e80c8eefea38d8b14632aef5e97bebc245ee7dd92e424cad
 SIZE (vile-9.5d.patch.gz) = 10843
+MD5 (vile-9.5e.patch.gz) = 6176730d3c7ad740de3fd3f866532b0c
+SHA256 (vile-9.5e.patch.gz) = 7b16830584f23535f14997a3cc771339a9999cab09b2a12c707f88db6b77b72f
+SIZE (vile-9.5e.patch.gz) = 20892
+MD5 (vile-9.5f.patch.gz) = 463abf66ee814a41e14cc87ecfd84bf8
+SHA256 (vile-9.5f.patch.gz) = 38bc55a4f19df2651f6d13e1b984a54ef6023890a6ea261916dba75203b23cb6
+SIZE (vile-9.5f.patch.gz) = 38678
+MD5 (vile-9.5g.patch.gz) = 0964a9dc9bdeee27fa99bb1efb62898c
+SHA256 (vile-9.5g.patch.gz) = 38455a7c6b39d626ee95ae433af232d9dc421aa36ae9a55ae5c6bf47478e45b3
+SIZE (vile-9.5g.patch.gz) = 5986
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index 90ba2bc7fe42..205a2ae28eca 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -35,6 +35,7 @@ lib/xvile/vile-info-filt
 lib/xvile/vile-iss-filt
 lib/xvile/vile-latex-filt
 lib/xvile/vile-lex-filt
+lib/xvile/vile-lua-filt
 lib/xvile/vile-m4-filt
 lib/xvile/vile-mail-filt
 lib/xvile/vile-make-filt
@@ -120,6 +121,7 @@ share/xvile/vile/vim.keywords
 share/xvile/vile/ada.keywords
 share/xvile/vile/awk.keywords
 share/xvile/vile/bat.keywords
+share/xvile/vile/cs.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/cweb.keywords
 share/xvile/vile/dcl.keywords
@@ -138,6 +140,7 @@ share/xvile/vile/js.keywords
 share/xvile/vile/latex.keywords
 share/xvile/vile/lex.keywords
 share/xvile/vile/lisp.keywords
+share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
 share/xvile/vile/make.keywords
@@ -190,6 +193,7 @@ share/xvile/macros/vilemenu.rc
 share/xvile/macros/vileperl.rc
 share/xvile/macros/vile-pager
 share/xvile/macros/which.rc
+@dirrm share/xvile/vile/doc
 @dirrm share/xvile/vile
 @dirrm share/xvile/macros
 @dirrm share/xvile
diff --git a/editors/xvile/pkg-plist.filt b/editors/xvile/pkg-plist.filt
index b60ee439e92e..fc68fd598eab 100644
--- a/editors/xvile/pkg-plist.filt
+++ b/editors/xvile/pkg-plist.filt
@@ -6,73 +6,74 @@ lib/xvile/atr2html
 lib/xvile/atr2text
 lib/xvile/vile-manfilt
 lib/xvile/vile-crypt
-lib/xvile/vile-c-filt
-lib/xvile/vile-key-filt
-lib/xvile/vile-m4-filt
-lib/xvile/vile-perl-filt
-lib/xvile/vile-ruby-filt
-lib/xvile/vile-sed-filt
-lib/xvile/vile-tags-filt
-lib/xvile/vile-ada-filt
-lib/xvile/vile-as-filt
-lib/xvile/vile-asm-filt
-lib/xvile/vile-au3-filt
-lib/xvile/vile-awk-filt
-lib/xvile/vile-basic-filt
-lib/xvile/vile-bat-filt
-lib/xvile/vile-bnf-filt
-lib/xvile/vile-cfg-filt
-lib/xvile/vile-css-filt
-lib/xvile/vile-cweb-filt
-lib/xvile/vile-dcl-filt
-lib/xvile/vile-def-filt
-lib/xvile/vile-diff-filt
-lib/xvile/vile-ecl-filt
-lib/xvile/vile-esql-filt
-lib/xvile/vile-est-filt
-lib/xvile/vile-fdl-filt
-lib/xvile/vile-html-filt
-lib/xvile/vile-imake-filt
-lib/xvile/vile-info-filt
-lib/xvile/vile-ini-filt
-lib/xvile/vile-iss-filt
-lib/xvile/vile-latex-filt
-lib/xvile/vile-lex-filt
-lib/xvile/vile-lisp-filt
-lib/xvile/vile-mail-filt
-lib/xvile/vile-make-filt
-lib/xvile/vile-midl-filt
-lib/xvile/vile-mms-filt
-lib/xvile/vile-nr-filt
-lib/xvile/vile-pas-filt
-lib/xvile/vile-php-filt
-lib/xvile/vile-pl-filt
-lib/xvile/vile-pot-filt
-lib/xvile/vile-ps-filt
-lib/xvile/vile-py-filt
-lib/xvile/vile-rb-filt
-lib/xvile/vile-rc-filt
-lib/xvile/vile-rcs-filt
-lib/xvile/vile-rexx-filt
-lib/xvile/vile-rpm-filt
-lib/xvile/vile-sccs-filt
-lib/xvile/vile-sh-filt
-lib/xvile/vile-sml-filt
-lib/xvile/vile-spell-filt
-lib/xvile/vile-sql-filt
-lib/xvile/vile-tbl-filt
-lib/xvile/vile-tc-filt
-lib/xvile/vile-tcl-filt
-lib/xvile/vile-texi-filt
-lib/xvile/vile-ti-filt
-lib/xvile/vile-txt-filt
-lib/xvile/vile-vile-filt
-lib/xvile/vile-vlog-filt
-lib/xvile/vile-wbt-filt
-lib/xvile/vile-xml-filt
-lib/xvile/vile-xres-filt
-lib/xvile/vile-xs-filt
-lib/xvile/vile-yacc-filt
+lib/xvile/vile-c-filt.so
+lib/xvile/vile-key-filt.so
+lib/xvile/vile-m4-filt.so
+lib/xvile/vile-perl-filt.so
+lib/xvile/vile-ruby-filt.so
+lib/xvile/vile-sed-filt.so
+lib/xvile/vile-tags-filt.so
+lib/xvile/vile-ada-filt.so
+lib/xvile/vile-as-filt.so
+lib/xvile/vile-asm-filt.so
+lib/xvile/vile-au3-filt.so
+lib/xvile/vile-awk-filt.so
+lib/xvile/vile-basic-filt.so
+lib/xvile/vile-bat-filt.so
+lib/xvile/vile-bnf-filt.so
+lib/xvile/vile-cfg-filt.so
+lib/xvile/vile-css-filt.so
+lib/xvile/vile-cweb-filt.so
+lib/xvile/vile-dcl-filt.so
+lib/xvile/vile-def-filt.so
+lib/xvile/vile-diff-filt.so
+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-html-filt.so
+lib/xvile/vile-imake-filt.so
+lib/xvile/vile-info-filt.so
+lib/xvile/vile-ini-filt.so
+lib/xvile/vile-iss-filt.so
+lib/xvile/vile-latex-filt.so
+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-make-filt.so
+lib/xvile/vile-midl-filt.so
+lib/xvile/vile-mms-filt.so
+lib/xvile/vile-nr-filt.so
+lib/xvile/vile-pas-filt.so
+lib/xvile/vile-php-filt.so
+lib/xvile/vile-pl-filt.so
+lib/xvile/vile-pot-filt.so
+lib/xvile/vile-ps-filt.so
+lib/xvile/vile-py-filt.so
+lib/xvile/vile-rb-filt.so
+lib/xvile/vile-rc-filt.so
+lib/xvile/vile-rcs-filt.so
+lib/xvile/vile-rexx-filt.so
+lib/xvile/vile-rpm-filt.so
+lib/xvile/vile-sccs-filt.so
+lib/xvile/vile-sh-filt.so
+lib/xvile/vile-sml-filt.so
+lib/xvile/vile-spell-filt.so
+lib/xvile/vile-sql-filt.so
+lib/xvile/vile-tbl-filt.so
+lib/xvile/vile-tc-filt.so
+lib/xvile/vile-tcl-filt.so
+lib/xvile/vile-texi-filt.so
+lib/xvile/vile-ti-filt.so
+lib/xvile/vile-txt-filt.so
+lib/xvile/vile-vile-filt.so
+lib/xvile/vile-vlog-filt.so
+lib/xvile/vile-wbt-filt.so
+lib/xvile/vile-xml-filt.so
+lib/xvile/vile-xres-filt.so
+lib/xvile/vile-xs-filt.so
+lib/xvile/vile-yacc-filt.so
 @dirrm lib/xvile
 share/doc/xvile/Vileserv.doc
 share/doc/xvile/config.doc
@@ -121,6 +122,7 @@ share/xvile/vile/vlog.keywords
 share/xvile/vile/ada.keywords
 share/xvile/vile/awk.keywords
 share/xvile/vile/bat.keywords
+share/xvile/vile/cs.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/css.keywords
 share/xvile/vile/cweb.keywords
@@ -140,6 +142,7 @@ share/xvile/vile/js.keywords
 share/xvile/vile/latex.keywords
 share/xvile/vile/lex.keywords
 share/xvile/vile/lisp.keywords
+share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
 share/xvile/vile/make.keywords
@@ -190,6 +193,7 @@ share/xvile/macros/vilemenu.rc
 share/xvile/macros/vileperl.rc
 share/xvile/macros/which.rc
 share/xvile/macros/vile-pager
+@dirrm share/xvile/vile/doc
 @dirrm share/xvile/vile
 @dirrm share/xvile/macros
 @dirrm share/xvile
diff --git a/editors/xvile/pkg-plist.perl b/editors/xvile/pkg-plist.perl
index 18c69b5e7a0c..c830460fe5eb 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -36,6 +36,7 @@ lib/xvile/vile-iss-filt
 lib/xvile/vile-latex-filt
 lib/xvile/vile-lex-filt
 lib/xvile/vile-lisp-filt
+lib/xvile/vile-lua-filt
 lib/xvile/vile-m4-filt
 lib/xvile/vile-mail-filt
 lib/xvile/vile-make-filt
@@ -146,6 +147,7 @@ share/xvile/vile/vlog.keywords
 share/xvile/vile/ada.keywords
 share/xvile/vile/awk.keywords
 share/xvile/vile/bat.keywords
+share/xvile/vile/cs.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/cweb.keywords
 share/xvile/vile/dcl.keywords
@@ -164,6 +166,7 @@ share/xvile/vile/js.keywords
 share/xvile/vile/latex.keywords
 share/xvile/vile/lex.keywords
 share/xvile/vile/lisp.keywords
+share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
 share/xvile/vile/make.keywords
@@ -214,6 +217,7 @@ share/xvile/macros/vileperl.rc
 share/xvile/macros/which.rc
 share/xvile/macros/vile-pager
 share/xvile/vile/yacc.keywords
+@dirrm share/xvile/vile/doc
 @dirrm share/xvile/vile/perl/Vile
 @dirrm share/xvile/vile/perl
 @dirrm share/xvile/macros
diff --git a/editors/xvile/pkg-plist.perl+filt b/editors/xvile/pkg-plist.perl+filt
index 472e6cdda382..edacc5cbcbee 100644
--- a/editors/xvile/pkg-plist.perl+filt
+++ b/editors/xvile/pkg-plist.perl+filt
@@ -7,73 +7,74 @@ lib/xvile/atr2html
 lib/xvile/atr2text
 lib/xvile/vile-manfilt
 lib/xvile/vile-crypt
-lib/xvile/vile-c-filt
-lib/xvile/vile-key-filt
-lib/xvile/vile-m4-filt
-lib/xvile/vile-perl-filt
-lib/xvile/vile-ruby-filt
-lib/xvile/vile-sed-filt
-lib/xvile/vile-tags-filt
-lib/xvile/vile-ada-filt
-lib/xvile/vile-as-filt
-lib/xvile/vile-asm-filt
-lib/xvile/vile-au3-filt
-lib/xvile/vile-awk-filt
-lib/xvile/vile-basic-filt
-lib/xvile/vile-bat-filt
-lib/xvile/vile-bnf-filt
-lib/xvile/vile-cfg-filt
-lib/xvile/vile-css-filt
-lib/xvile/vile-cweb-filt
-lib/xvile/vile-dcl-filt
-lib/xvile/vile-def-filt
-lib/xvile/vile-diff-filt
-lib/xvile/vile-ecl-filt
-lib/xvile/vile-esql-filt
-lib/xvile/vile-est-filt
-lib/xvile/vile-fdl-filt
-lib/xvile/vile-html-filt
-lib/xvile/vile-imake-filt
-lib/xvile/vile-info-filt
-lib/xvile/vile-ini-filt
-lib/xvile/vile-iss-filt
-lib/xvile/vile-latex-filt
-lib/xvile/vile-lex-filt
-lib/xvile/vile-lisp-filt
-lib/xvile/vile-mail-filt
-lib/xvile/vile-make-filt
-lib/xvile/vile-midl-filt
-lib/xvile/vile-mms-filt
-lib/xvile/vile-nr-filt
-lib/xvile/vile-pas-filt
-lib/xvile/vile-php-filt
-lib/xvile/vile-pl-filt
-lib/xvile/vile-pot-filt
-lib/xvile/vile-ps-filt
-lib/xvile/vile-py-filt
-lib/xvile/vile-rb-filt
-lib/xvile/vile-rc-filt
-lib/xvile/vile-rcs-filt
-lib/xvile/vile-rexx-filt
-lib/xvile/vile-rpm-filt
-lib/xvile/vile-sccs-filt
-lib/xvile/vile-sh-filt
-lib/xvile/vile-sml-filt
-lib/xvile/vile-spell-filt
-lib/xvile/vile-sql-filt
-lib/xvile/vile-tbl-filt
-lib/xvile/vile-tc-filt
-lib/xvile/vile-tcl-filt
-lib/xvile/vile-texi-filt
-lib/xvile/vile-ti-filt
-lib/xvile/vile-txt-filt
-lib/xvile/vile-vile-filt
-lib/xvile/vile-vlog-filt
-lib/xvile/vile-wbt-filt
-lib/xvile/vile-xml-filt
-lib/xvile/vile-xres-filt
-lib/xvile/vile-xs-filt
-lib/xvile/vile-yacc-filt
+lib/xvile/vile-c-filt.so
+lib/xvile/vile-key-filt.so
+lib/xvile/vile-m4-filt.so
+lib/xvile/vile-perl-filt.so
+lib/xvile/vile-ruby-filt.so
+lib/xvile/vile-sed-filt.so
+lib/xvile/vile-tags-filt.so
+lib/xvile/vile-ada-filt.so
+lib/xvile/vile-as-filt.so
+lib/xvile/vile-asm-filt.so
+lib/xvile/vile-au3-filt.so
+lib/xvile/vile-awk-filt.so
+lib/xvile/vile-basic-filt.so
+lib/xvile/vile-bat-filt.so
+lib/xvile/vile-bnf-filt.so
+lib/xvile/vile-cfg-filt.so
+lib/xvile/vile-css-filt.so
+lib/xvile/vile-cweb-filt.so
+lib/xvile/vile-dcl-filt.so
+lib/xvile/vile-def-filt.so
+lib/xvile/vile-diff-filt.so
+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-html-filt.so
+lib/xvile/vile-imake-filt.so
+lib/xvile/vile-info-filt.so
+lib/xvile/vile-ini-filt.so
+lib/xvile/vile-iss-filt.so
+lib/xvile/vile-latex-filt.so
+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-make-filt.so
+lib/xvile/vile-midl-filt.so
+lib/xvile/vile-mms-filt.so
+lib/xvile/vile-nr-filt.so
+lib/xvile/vile-pas-filt.so
+lib/xvile/vile-php-filt.so
+lib/xvile/vile-pl-filt.so
+lib/xvile/vile-pot-filt.so
+lib/xvile/vile-ps-filt.so
+lib/xvile/vile-py-filt.so
+lib/xvile/vile-rb-filt.so
+lib/xvile/vile-rc-filt.so
+lib/xvile/vile-rcs-filt.so
+lib/xvile/vile-rexx-filt.so
+lib/xvile/vile-rpm-filt.so
+lib/xvile/vile-sccs-filt.so
+lib/xvile/vile-sh-filt.so
+lib/xvile/vile-sml-filt.so
+lib/xvile/vile-spell-filt.so
+lib/xvile/vile-sql-filt.so
+lib/xvile/vile-tbl-filt.so
+lib/xvile/vile-tc-filt.so
+lib/xvile/vile-tcl-filt.so
+lib/xvile/vile-texi-filt.so
+lib/xvile/vile-ti-filt.so
+lib/xvile/vile-txt-filt.so
+lib/xvile/vile-vile-filt.so
+lib/xvile/vile-vlog-filt.so
+lib/xvile/vile-wbt-filt.so
+lib/xvile/vile-xml-filt.so
+lib/xvile/vile-xres-filt.so
+lib/xvile/vile-xs-filt.so
+lib/xvile/vile-yacc-filt.so
 @dirrm lib/xvile
 share/doc/xvile/Vileserv.doc
 share/doc/xvile/config.doc
@@ -146,6 +147,7 @@ share/xvile/vile/vlog.keywords
 share/xvile/vile/ada.keywords
 share/xvile/vile/awk.keywords
 share/xvile/vile/bat.keywords
+share/xvile/vile/cs.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/cweb.keywords
 share/xvile/vile/dcl.keywords
@@ -164,6 +166,7 @@ share/xvile/vile/js.keywords
 share/xvile/vile/latex.keywords
 share/xvile/vile/lex.keywords
 share/xvile/vile/lisp.keywords
+share/xvile/vile/lua.keywords
 share/xvile/vile/m4.keywords
 share/xvile/vile/mail.keywords
 share/xvile/vile/make.keywords
@@ -214,6 +217,7 @@ share/xvile/macros/vileperl.rc
 share/xvile/macros/which.rc
 share/xvile/macros/vile-pager
 share/xvile/vile/yacc.keywords
+@dirrm share/xvile/vile/doc
 @dirrm share/xvile/vile/perl/Vile
 @dirrm share/xvile/vile/perl
 @dirrm share/xvile/macros