Update this port to apply all the officially released patches (up to

j, which is why PORTVERSION is now 9.2j).

Add WITH_FILTERS so that the user can compile all the filters into
the binary.

For xvile, add WITH_XAW3D so that users with the Xaw3d library can use it
instead of plain Xaw.

Add 2 new PLISTs to reflect that most of the filters are not installed
when WITH_FILTERS is used.

Replace an obsolete ftp site with one which works.

6 files changed, 258 insertions, 2 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index f729ab719eed..249f885a2776 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,10 +6,23 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.2
+PORTVERSION=	9.2_pj
+DISTNAME=	vile-9.2
 CATEGORIES=	editors
 MASTER_SITES=   ftp://ftp.phred.org/pub/vile/ \
-		ftp://id.wing.net/pub/pgf/vile/
+		ftp://dickey.his.com/vile/
+PATCH_SITES=	${MASTER_SITES:S,vile/,vile/patches,g}
+PATCHFILES=	vile-9.2a.patch.gz \
+		vile-9.2b.patch.gz \
+		vile-9.2c.patch.gz \
+		vile-9.2d.patch.gz \
+		vile-9.2e.patch.gz \
+		vile-9.2f.patch.gz \
+		vile-9.2g.patch.gz \
+		vile-9.2h.patch.gz \
+		vile-9.2i.patch.gz \
+		vile-9.2j.patch.gz
+
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gj@freebsd.org
@@ -24,11 +37,24 @@ PLIST=		${PKGDIR}/pkg-plist.perl
 USE_PERL5=	yes
 .endif
 
+.if defined(WITH_FILTERS)
+CONFIGURE_ARGS+= --with-builtin-filters=all
+PLIST=		${PKGDIR}/pkg-plist.filt
+.endif
+
+.if defined(WITH_PERL) && defined(WITH_FILTERS)
+PLIST=		${PKGDIR}/pkg-plist.perl+filt
+.endif
+
 pre-configure:
 .if ! defined(WITH_PERL)
 	@${ECHO_MSG} "Define WITH_PERL if you want to make a vile which includes"
 	@${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"
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index da2707c87551..4bac72473577 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1 +1,11 @@
 MD5 (vile-9.2.tgz) = 92b9c329db3f6a528b3b82296714bf4c
+MD5 (vile-9.2a.patch.gz) = a2c5d562302202fe2632746fed0bfbd4
+MD5 (vile-9.2b.patch.gz) = 110dc49ca162ff551c478edb9fd49635
+MD5 (vile-9.2c.patch.gz) = a48389242027723dbdd41dc1fc605026
+MD5 (vile-9.2d.patch.gz) = 513fda8ab5fa3156481966a4451cc36b
+MD5 (vile-9.2e.patch.gz) = 1f3eccdb4527e7fb4649ac8a343e9100
+MD5 (vile-9.2f.patch.gz) = 924a1e612631f8dc0c280096ca68ccad
+MD5 (vile-9.2g.patch.gz) = 535e3eb334fa7da30bd61cc3a37e9001
+MD5 (vile-9.2h.patch.gz) = 02db5c9325dd07eec5824f5756f306ad
+MD5 (vile-9.2i.patch.gz) = 8a7eac1ffe4693bfeb2fcd07e3593d4c
+MD5 (vile-9.2j.patch.gz) = 6acba886d739f7d5cf3d6dadec2bcaa8
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index a64c6d81ef9c..92a3be5b4714 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -1,5 +1,6 @@
 bin/vile
 bin/vile-pager
+lib/vile/vile-basic-filt
 lib/vile/vile-c-filt
 lib/vile/vile-crypt
 lib/vile/vile-key-filt
@@ -12,7 +13,9 @@ lib/vile/vile-cfg-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-html-filt
 lib/vile/vile-imake-filt
@@ -26,6 +29,7 @@ lib/vile/vile-nr-filt
 lib/vile/vile-perl-filt
 lib/vile/vile-pl-filt
 lib/vile/vile-py-filt
+lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
 lib/vile/vile-rexx-filt
 lib/vile/vile-sccs-filt
@@ -41,6 +45,7 @@ lib/vile/vile-tcl-filt
 lib/vile/vile-ti-filt
 lib/vile/vile-txt-filt
 lib/vile/vile-vile-filt
+lib/vile/vile-vlog-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
@@ -70,13 +75,16 @@ share/vile/vileperl.rc
 share/vile/vile.hlp
 share/vile/ada.keywords
 share/vile/awk.keywords
+share/vile/basic.keywords
 share/vile/bat.keywords
 share/vile/c.keywords
 share/vile/cpp.keywords
 share/vile/csh.keywords
 share/vile/cweb.keywords
 share/vile/dcl.keywords
+share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/ecl.keywords
 share/vile/esql.keywords
 share/vile/fdl.keywords
 share/vile/js.keywords
@@ -94,6 +102,7 @@ share/vile/pc.keywords
 share/vile/perl.keywords
 share/vile/py.keywords
 share/vile/pot.keywords
+share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/sccs.keywords
@@ -105,8 +114,10 @@ share/vile/tbl.keywords
 share/vile/tc.keywords
 share/vile/tcl.keywords
 share/vile/ti.keywords
+share/vile/vb.keywords
 share/vile/vile.keywords
 share/vile/vim.keywords
+share/vile/vlog.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
 share/vile/yacc.keywords
diff --git a/editors/vile/pkg-plist.filt b/editors/vile/pkg-plist.filt
new file mode 100644
index 000000000000..6250701fcf6a
--- /dev/null
+++ b/editors/vile/pkg-plist.filt
@@ -0,0 +1,88 @@
+bin/vile
+bin/vile-pager
+lib/vile/vile-crypt
+lib/vile/vile-manfilt
+@dirrm lib/vile
+share/doc/vile/Vileserv.doc
+share/doc/vile/config.doc
+share/doc/vile/dir.doc
+share/doc/vile/filters.doc
+share/doc/vile/macros.doc
+share/doc/vile/menus.doc
+share/doc/vile/modes.doc
+share/doc/vile/oleauto.doc
+share/doc/vile/perl.doc
+share/doc/vile/visvile.doc
+share/doc/vile/w32modes.doc
+@dirrm share/doc/vile
+share/vile/color-ls.rc
+share/vile/digraphs.rc
+share/vile/filters.rc
+share/vile/manpage.rc
+share/vile/palettes.rc
+share/vile/pictmode.rc
+share/vile/shifts.rc
+share/vile/spell.rc
+share/vile/vileinit.rc
+share/vile/vileperl.rc
+share/vile/vile.hlp
+share/vile/ada.keywords
+share/vile/awk.keywords
+share/vile/basic.keywords
+share/vile/bat.keywords
+share/vile/c.keywords
+share/vile/cpp.keywords
+share/vile/csh.keywords
+share/vile/cweb.keywords
+share/vile/dcl.keywords
+share/vile/def.keywords
+share/vile/diff.keywords
+share/vile/ecl.keywords
+share/vile/esql.keywords
+share/vile/fdl.keywords
+share/vile/js.keywords
+share/vile/html.keywords
+share/vile/imake.keywords
+share/vile/java.keywords
+share/vile/latex.keywords
+share/vile/lex.keywords
+share/vile/m4.keywords
+share/vile/mail.keywords
+share/vile/make.keywords
+share/vile/nr.keywords
+share/vile/pas.keywords
+share/vile/pc.keywords
+share/vile/perl.keywords
+share/vile/py.keywords
+share/vile/pot.keywords
+share/vile/rc.keywords
+share/vile/rcs.keywords
+share/vile/rexx.keywords
+share/vile/sccs.keywords
+share/vile/sh.keywords
+share/vile/sql.keywords
+share/vile/sml.keywords
+share/vile/tags.keywords
+share/vile/tbl.keywords
+share/vile/tc.keywords
+share/vile/tcl.keywords
+share/vile/ti.keywords
+share/vile/vb.keywords
+share/vile/vile.keywords
+share/vile/vim.keywords
+share/vile/vlog.keywords
+share/vile/xres.keywords
+share/vile/xs.keywords
+share/vile/yacc.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/shifts.rc
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/vile-pager
+@dirrm share/vile/macros
+@dirrm share/vile
diff --git a/editors/vile/pkg-plist.perl b/editors/vile/pkg-plist.perl
index 9749607a4d79..5cfa3c55bd0e 100644
--- a/editors/vile/pkg-plist.perl
+++ b/editors/vile/pkg-plist.perl
@@ -1,6 +1,7 @@
 bin/vile
 bin/vile-pager
 bin/vileget
+lib/vile/vile-basic-filt
 lib/vile/vile-c-filt
 lib/vile/vile-crypt
 lib/vile/vile-key-filt
@@ -12,8 +13,10 @@ lib/vile/vile-bat-filt
 lib/vile/vile-cfg-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-html-filt
 lib/vile/vile-imake-filt
@@ -27,6 +30,7 @@ lib/vile/vile-nr-filt
 lib/vile/vile-perl-filt
 lib/vile/vile-pl-filt
 lib/vile/vile-py-filt
+lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
 lib/vile/vile-rexx-filt
 lib/vile/vile-sccs-filt
@@ -42,6 +46,7 @@ lib/vile/vile-tcl-filt
 lib/vile/vile-ti-filt
 lib/vile/vile-txt-filt
 lib/vile/vile-vile-filt
+lib/vile/vile-vlog-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
@@ -86,20 +91,25 @@ share/vile/shifts.rc
 share/vile/vileinit.rc
 share/vile/vileperl.rc
 share/vile/vile.hlp
+share/vile/basic.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/bat.keywords
 share/vile/csh.keywords
 share/vile/cweb.keywords
 share/vile/dcl.keywords
+share/vile/def.keywords
 share/vile/diff.keywords
+share/vile/ecl.keywords
 share/vile/esql.keywords
 share/vile/fdl.keywords
 share/vile/html.keywords
@@ -115,6 +125,7 @@ share/vile/nr.keywords
 share/vile/perl.keywords
 share/vile/py.keywords
 share/vile/pot.keywords
+share/vile/rc.keywords
 share/vile/rcs.keywords
 share/vile/rexx.keywords
 share/vile/sccs.keywords
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
new file mode 100644
index 000000000000..5f991889b29e
--- /dev/null
+++ b/editors/vile/pkg-plist.perl+filt
@@ -0,0 +1,110 @@
+bin/vile
+bin/vile-pager
+bin/vileget
+lib/vile/vile-crypt
+lib/vile/vile-manfilt
+@dirrm lib/vile
+share/doc/vile/Vileserv.doc
+share/doc/vile/config.doc
+share/doc/vile/dir.doc
+share/doc/vile/filters.doc
+share/doc/vile/macros.doc
+share/doc/vile/menus.doc
+share/doc/vile/modes.doc
+share/doc/vile/oleauto.doc
+share/doc/vile/perl.doc
+share/doc/vile/visvile.doc
+share/doc/vile/w32modes.doc
+share/doc/vile/vile-perl-api.doc
+@dirrm share/doc/vile
+share/vile/perl/Vile/Exporter.pm
+share/vile/perl/Vile/Manual.pm
+share/vile/perl/Glob2re.pm
+share/vile/perl/Vile.pm
+share/vile/perl/Vileserv.pm
+share/vile/perl/Visit.pm
+share/vile/perl/capture.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/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/digraphs.rc
+share/vile/manpage.rc
+share/vile/palettes.rc
+share/vile/pictmode.rc
+share/vile/shifts.rc
+share/vile/vileinit.rc
+share/vile/vileperl.rc
+share/vile/vile.hlp
+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/csh.keywords
+share/vile/cweb.keywords
+share/vile/dcl.keywords
+share/vile/def.keywords
+share/vile/diff.keywords
+share/vile/ecl.keywords
+share/vile/esql.keywords
+share/vile/fdl.keywords
+share/vile/html.keywords
+share/vile/imake.keywords
+share/vile/java.keywords
+share/vile/js.keywords
+share/vile/latex.keywords
+share/vile/lex.keywords
+share/vile/m4.keywords
+share/vile/mail.keywords
+share/vile/make.keywords
+share/vile/nr.keywords
+share/vile/perl.keywords
+share/vile/py.keywords
+share/vile/pot.keywords
+share/vile/rc.keywords
+share/vile/rcs.keywords
+share/vile/rexx.keywords
+share/vile/sccs.keywords
+share/vile/sh.keywords
+share/vile/sml.keywords
+share/vile/spell.rc
+share/vile/sql.keywords
+share/vile/tags.keywords
+share/vile/tbl.keywords
+share/vile/tc.keywords
+share/vile/tcl.keywords
+share/vile/ti.keywords
+share/vile/xres.keywords
+share/vile/xs.keywords
+share/vile/macros/color-ls.rc
+share/vile/macros/digraphs.rc
+share/vile/macros/manpage.rc
+share/vile/macros/palettes.rc
+share/vile/macros/pictmode.rc
+share/vile/macros/shifts.rc
+share/vile/macros/vileinit.rc
+share/vile/macros/vilemenu.rc
+share/vile/macros/vileperl.rc
+share/vile/macros/vile-pager
+share/vile/yacc.keywords
+@dirrm share/vile/perl/Vile
+@dirrm share/vile/perl
+@dirrm share/vile/macros
+@dirrm share/vile