4 files changed, 135 insertions, 90 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index baa1e501083f..5738381808b1 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,41 +6,14 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.4z
+PORTVERSION=	9.5
 CATEGORIES=	editors
-MASTER_SITES=   ftp://dickey.his.com/vile/ \
+MASTER_SITES=	ftp://dickey.his.com/vile/ \
+		ftp://invisible-island.net/vile/ \
 		ftp://ftp.phred.org/pub/vile/
-		
-DISTNAME=	vile-9.4
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=    ${MASTER_SITES:S,vile/,vile/patches/,g}
-PATCHFILES=	vile-9.4a.patch.gz \
-		vile-9.4b.patch.gz \
-		vile-9.4c.patch.gz \
-		vile-9.4d.patch.gz \
-		vile-9.4e.patch.gz \
-		vile-9.4f.patch.gz \
-		vile-9.4g.patch.gz \
-		vile-9.4h.patch.gz \
-		vile-9.4i.patch.gz \
-		vile-9.4j.patch.gz \
-		vile-9.4k.patch.gz \
-		vile-9.4l.patch.gz \
-		vile-9.4m.patch.gz \
-		vile-9.4n.patch.gz \
-		vile-9.4o.patch.gz \
-		vile-9.4p.patch.gz \
-		vile-9.4q.patch.gz \
-		vile-9.4r.patch.gz \
-		vile-9.4s.patch.gz \
-		vile-9.4t.patch.gz \
-		vile-9.4u.patch.gz \
-		vile-9.4v.patch.gz \
-		vile-9.4w.patch.gz \
-		vile-9.4x.patch.gz \
-		vile-9.4y.patch.gz \
-		vile-9.4z.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs.  a vi "workalike", with many additional features
@@ -56,12 +29,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-builtin-filters=all
+CONFIGURE_ARGS+= --with-loadable-filters
 PLIST=		${PKGDIR}/pkg-plist.filt
 .endif
 
@@ -75,8 +48,8 @@ pre-configure:
 	@${ECHO_MSG} "PERL functionality"
 .endif
 .if ! defined(WITH_FILTERS)
-	@${ECHO_MSG} "Define WITH_FILTERS if you want to make a vile which includes"
-	@${ECHO_MSG} "all filters in the binary"
+	@${ECHO_MSG} "Define WITH_FILTERS if you want to make a vile which will"
+	@${ECHO_MSG} "dynamically load filters as needed."
 .endif
 
 post-install:
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index 851b2ae580a2..c325b4858655 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,54 +1,2 @@
-MD5 (vile-9.4.tgz) = 1c69045467b7c48be99fa7ac2052a95f
-SIZE (vile-9.4.tgz) = 1549606
-MD5 (vile-9.4a.patch.gz) = a6fc7b8a370cbd75d8b08c78c10c9422
-SIZE (vile-9.4a.patch.gz) = 17204
-MD5 (vile-9.4b.patch.gz) = a1cfe131604727f8c7e79e6d6adce601
-SIZE (vile-9.4b.patch.gz) = 63382
-MD5 (vile-9.4c.patch.gz) = 8b0d033ea3efe2ea40050d66892017e1
-SIZE (vile-9.4c.patch.gz) = 8660
-MD5 (vile-9.4d.patch.gz) = 4b425a8bc9f5a7fcf12277f63e4e6b69
-SIZE (vile-9.4d.patch.gz) = 18117
-MD5 (vile-9.4e.patch.gz) = 47bc4094e9d48e215b6a35c3c49a08fa
-SIZE (vile-9.4e.patch.gz) = 65335
-MD5 (vile-9.4f.patch.gz) = c6dbd9f6bbcdad0fc4e1370b2c18753a
-SIZE (vile-9.4f.patch.gz) = 33952
-MD5 (vile-9.4g.patch.gz) = a191a3d133c4c296e7cf88c2e7a7b370
-SIZE (vile-9.4g.patch.gz) = 118824
-MD5 (vile-9.4h.patch.gz) = ee974b18621b67bceb6aa58bf4f41823
-SIZE (vile-9.4h.patch.gz) = 5336
-MD5 (vile-9.4i.patch.gz) = b0f73b2d3acc9e1344413dbff4828fe6
-SIZE (vile-9.4i.patch.gz) = 15720
-MD5 (vile-9.4j.patch.gz) = 02c76bc6a58baf98fef1db3ded0a049c
-SIZE (vile-9.4j.patch.gz) = 92150
-MD5 (vile-9.4k.patch.gz) = d625c68a035b6e49f8d21e4ff80baba3
-SIZE (vile-9.4k.patch.gz) = 14496
-MD5 (vile-9.4l.patch.gz) = 71c21a98ddf328b6d675d7996ea78680
-SIZE (vile-9.4l.patch.gz) = 82349
-MD5 (vile-9.4m.patch.gz) = d7983d67b1c9772f52d5fa3e4ac7982f
-SIZE (vile-9.4m.patch.gz) = 79121
-MD5 (vile-9.4n.patch.gz) = 4c8b6b6fa36568af268235323418f260
-SIZE (vile-9.4n.patch.gz) = 103867
-MD5 (vile-9.4o.patch.gz) = 4fbc866ebab1803133449aa44519c218
-SIZE (vile-9.4o.patch.gz) = 3034
-MD5 (vile-9.4p.patch.gz) = 32621c2d1e93d9ed21a4396b043a8535
-SIZE (vile-9.4p.patch.gz) = 20705
-MD5 (vile-9.4q.patch.gz) = f7cdb95f607b9fdb15696b654c427aee
-SIZE (vile-9.4q.patch.gz) = 11787
-MD5 (vile-9.4r.patch.gz) = e5855f7612edd72b21432da1d0b4eeb0
-SIZE (vile-9.4r.patch.gz) = 61010
-MD5 (vile-9.4s.patch.gz) = 1a6160043e3f1e2124c03e5cd5b627b6
-SIZE (vile-9.4s.patch.gz) = 7937
-MD5 (vile-9.4t.patch.gz) = 877f4539b59cc2f22d98c6df17dbfdd2
-SIZE (vile-9.4t.patch.gz) = 69656
-MD5 (vile-9.4u.patch.gz) = 197e37a99902c439ea36d3d0da311ddb
-SIZE (vile-9.4u.patch.gz) = 65325
-MD5 (vile-9.4v.patch.gz) = 17d49898593a360544835e7a85ad84f6
-SIZE (vile-9.4v.patch.gz) = 23563
-MD5 (vile-9.4w.patch.gz) = 0130f56ab19944e6770075c77bf02524
-SIZE (vile-9.4w.patch.gz) = 14334
-MD5 (vile-9.4x.patch.gz) = 5cf38c5e3177d12eb8c5ec19aa2b3405
-SIZE (vile-9.4x.patch.gz) = 6148
-MD5 (vile-9.4y.patch.gz) = c3bb3b48682d5b823280f4be370f617e
-SIZE (vile-9.4y.patch.gz) = 4413
-MD5 (vile-9.4z.patch.gz) = 94db1cc8e000c3a40fa933b73d6a684e
-SIZE (vile-9.4z.patch.gz) = 17222
+MD5 (vile-9.5.tgz) = bc0049be8b4906dacc1165e04a6d29e5
+SIZE (vile-9.5.tgz) = 1656429
diff --git a/editors/vile/pkg-plist.filt b/editors/vile/pkg-plist.filt
index faa649337252..44d725ba2d0b 100644
--- a/editors/vile/pkg-plist.filt
+++ b/editors/vile/pkg-plist.filt
@@ -3,8 +3,70 @@ bin/vile-pager
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
-lib/vile/vile-crypt
 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
+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-cfg-filt.so
+lib/vile/vile-cweb-filt.so
+lib/vile/vile-dcl-filt.so
+lib/vile/vile-def-filt.so
+lib/vile/vile-diff-filt.so
+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-html-filt.so
+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-latex-filt.so
+lib/vile/vile-lex-filt.so
+lib/vile/vile-lisp-filt.so
+lib/vile/vile-mail-filt.so
+lib/vile/vile-make-filt.so
+lib/vile/vile-mms-filt.so
+lib/vile/vile-nr-filt.so
+lib/vile/vile-pas-filt.so
+lib/vile/vile-pl-filt.so
+lib/vile/vile-pot-filt.so
+lib/vile/vile-ps-filt.so
+lib/vile/vile-py-filt.so
+lib/vile/vile-rb-filt.so
+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-sccs-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-tbl-filt.so
+lib/vile/vile-tc-filt.so
+lib/vile/vile-tcl-filt.so
+lib/vile/vile-texi-filt.so
+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-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
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
index f89101a13e46..35b426a53306 100644
--- a/editors/vile/pkg-plist.perl+filt
+++ b/editors/vile/pkg-plist.perl+filt
@@ -4,8 +4,70 @@ bin/vileget
 lib/vile/atr2ansi
 lib/vile/atr2html
 lib/vile/atr2text
-lib/vile/vile-crypt
 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
+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-cfg-filt.so
+lib/vile/vile-cweb-filt.so
+lib/vile/vile-dcl-filt.so
+lib/vile/vile-def-filt.so
+lib/vile/vile-diff-filt.so
+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-html-filt.so
+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-latex-filt.so
+lib/vile/vile-lex-filt.so
+lib/vile/vile-lisp-filt.so
+lib/vile/vile-mail-filt.so
+lib/vile/vile-make-filt.so
+lib/vile/vile-mms-filt.so
+lib/vile/vile-nr-filt.so
+lib/vile/vile-pas-filt.so
+lib/vile/vile-pl-filt.so
+lib/vile/vile-pot-filt.so
+lib/vile/vile-ps-filt.so
+lib/vile/vile-py-filt.so
+lib/vile/vile-rb-filt.so
+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-sccs-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-tbl-filt.so
+lib/vile/vile-tc-filt.so
+lib/vile/vile-tcl-filt.so
+lib/vile/vile-texi-filt.so
+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-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