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, 272 insertions, 5 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index debb8bcff0b6..654707899028 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -6,13 +6,25 @@
 #
 
 PORTNAME=	xvile
-PORTVERSION=	9.2
+PORTVERSION=	9.2j
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.phred.org/pub/vile/ \
-		ftp://id.wing.net/pub/pgf/vile/
-DISTNAME=	vile-${PORTVERSION}
+		ftp://dickey.his.com/vile/
+DISTNAME=	vile-9.2
 EXTRACT_SUFX=	.tgz
 
+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
+
 MAINTAINER=	gj@freebsd.org
 
 USE_XLIB=	yes
@@ -26,14 +38,25 @@ MAN1=		xvile.1
 
 pre-configure:
 .if ! defined(WITH_MENUS)
-	@${ECHO_MSG} "To use xvile with menus, set the environment variable WITH_MENUS"
+	@${ECHO_MSG} "To use xvile with menus, set the environment variable WITH_MENUS,"
+	@${ECHO_MSG} "which will also turn on Xaw. If you have Xaw3d, you can use it"
+	@${ECHO_MSG} "by also settting the environment variable WITH_XAW3D."
 .endif
+
 .if ! defined(WITH_PERL)
-	@${ECHO_MSG} "To use xvile with PERL, set the environment variable WITH_PERL"
+	@${ECHO_MSG} "To use xvile with PERL, set the environment variable WITH_PERL."
+.endif
+
+.if ! defined(WITH_FILTERS)
+	@${ECHO_MSG} "Define WITH_FILTERS if you want to make an xvile which includes"
+	@${ECHO_MSG} "all filters in the binary"
 .endif
 
 .if defined(WITH_MENUS)
 CONFIGURE_ARGS+= --with-screen=Xaw
+.if defined(WITH_XAW3D)
+CONFIGURE_ARGS+= --with-Xaw3d
+.endif
 .else
 CONFIGURE_ARGS+= --with-screen=x11
 .endif
@@ -44,6 +67,15 @@ 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
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@if ! [ -d ${PREFIX}/share/doc/xvile ]; then ${MKDIR} ${PREFIX}/share/doc/xvile; fi
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index da2707c87551..4bac72473577 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/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/xvile/pkg-plist b/editors/xvile/pkg-plist
index 4067b40e9f0e..9defa2df0566 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -1,6 +1,7 @@
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/xvile/vile-basic-filt
 lib/xvile/vile-c-filt
 lib/xvile/vile-crypt
 lib/xvile/vile-key-filt
@@ -13,7 +14,9 @@ lib/xvile/vile-cfg-filt
 lib/xvile/vile-cweb-filt
 lib/xvile/vile-dcl-filt
 lib/xvile/vile-fdl-filt
+lib/xvile/vile-def-filt
 lib/xvile/vile-diff-filt
+lib/xvile/vile-ecl-filt
 lib/xvile/vile-esql-filt
 lib/xvile/vile-html-filt
 lib/xvile/vile-imake-filt
@@ -27,6 +30,7 @@ lib/xvile/vile-nr-filt
 lib/xvile/vile-perl-filt
 lib/xvile/vile-pl-filt
 lib/xvile/vile-py-filt
+lib/xvile/vile-rc-filt
 lib/xvile/vile-rcs-filt
 lib/xvile/vile-rexx-filt
 lib/xvile/vile-sccs-filt
@@ -42,6 +46,7 @@ lib/xvile/vile-tcl-filt
 lib/xvile/vile-ti-filt
 lib/xvile/vile-txt-filt
 lib/xvile/vile-vile-filt
+lib/xvile/vile-vlog-filt
 lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
 lib/xvile/vile-yacc-filt
@@ -68,6 +73,7 @@ share/xvile/vile/shifts.rc
 share/xvile/vile/vileinit.rc
 share/xvile/vile/vileperl.rc
 share/xvile/vile/vile.hlp
+share/xvile/vile/basic.keywords
 share/xvile/vile/c.keywords
 share/xvile/vile/cpp.keywords
 share/xvile/vile/filters.rc
@@ -81,7 +87,9 @@ share/xvile/vile/bat.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/cweb.keywords
 share/xvile/vile/dcl.keywords
+share/xvile/vile/def.keywords
 share/xvile/vile/diff.keywords
+share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/fdl.keywords
 share/xvile/vile/html.keywords
@@ -97,6 +105,7 @@ share/xvile/vile/nr.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/py.keywords
 share/xvile/vile/pot.keywords
+share/xvile/vile/rc.keywords
 share/xvile/vile/rcs.keywords
 share/xvile/vile/rexx.keywords
 share/xvile/vile/sccs.keywords
@@ -109,6 +118,8 @@ share/xvile/vile/tbl.keywords
 share/xvile/vile/tc.keywords
 share/xvile/vile/tcl.keywords
 share/xvile/vile/ti.keywords
+share/xvile/vile/vb.keywords
+share/xvile/vile/vlog.keywords
 share/xvile/vile/xres.keywords
 share/xvile/vile/xs.keywords
 share/xvile/vile/yacc.keywords
diff --git a/editors/xvile/pkg-plist.filt b/editors/xvile/pkg-plist.filt
new file mode 100644
index 000000000000..07ef93b39178
--- /dev/null
+++ b/editors/xvile/pkg-plist.filt
@@ -0,0 +1,91 @@
+bin/xvile
+bin/xvile-pager
+bin/xshell.sh
+lib/xvile/vile-crypt
+lib/xvile/vile-manfilt
+@dirrm lib/xvile
+share/doc/xvile/Vileserv.doc
+share/doc/xvile/config.doc
+share/doc/xvile/dir.doc
+share/doc/xvile/filters.doc
+share/doc/xvile/macros.doc
+share/doc/xvile/menus.doc
+share/doc/xvile/modes.doc
+share/doc/xvile/oleauto.doc
+share/doc/xvile/perl.doc
+share/doc/xvile/visvile.doc
+share/doc/xvile/w32modes.doc
+@dirrm share/doc/xvile
+@unexec rm -f %D/share/xvile/vile/.vilemenu
+share/xvile/vile/color-ls.rc
+share/xvile/vile/digraphs.rc
+share/xvile/vile/manpage.rc
+share/xvile/vile/palettes.rc
+share/xvile/vile/pictmode.rc
+share/xvile/vile/shifts.rc
+share/xvile/vile/vileinit.rc
+share/xvile/vile/vileperl.rc
+share/xvile/vile/vile.hlp
+share/xvile/vile/basic.keywords
+share/xvile/vile/c.keywords
+share/xvile/vile/cpp.keywords
+share/xvile/vile/filters.rc
+share/xvile/vile/pas.keywords
+share/xvile/vile/pc.keywords
+share/xvile/vile/vb.keywords
+share/xvile/vile/vile.keywords
+share/xvile/vile/vim.keywords
+share/xvile/vile/vlog.keywords
+share/xvile/vile/ada.keywords
+share/xvile/vile/awk.keywords
+share/xvile/vile/bat.keywords
+share/xvile/vile/csh.keywords
+share/xvile/vile/cweb.keywords
+share/xvile/vile/dcl.keywords
+share/xvile/vile/def.keywords
+share/xvile/vile/diff.keywords
+share/xvile/vile/ecl.keywords
+share/xvile/vile/esql.keywords
+share/xvile/vile/fdl.keywords
+share/xvile/vile/html.keywords
+share/xvile/vile/imake.keywords
+share/xvile/vile/java.keywords
+share/xvile/vile/js.keywords
+share/xvile/vile/latex.keywords
+share/xvile/vile/lex.keywords
+share/xvile/vile/m4.keywords
+share/xvile/vile/mail.keywords
+share/xvile/vile/make.keywords
+share/xvile/vile/nr.keywords
+share/xvile/vile/perl.keywords
+share/xvile/vile/py.keywords
+share/xvile/vile/pot.keywords
+share/xvile/vile/rc.keywords
+share/xvile/vile/rcs.keywords
+share/xvile/vile/rexx.keywords
+share/xvile/vile/sccs.keywords
+share/xvile/vile/sh.keywords
+share/xvile/vile/sml.keywords
+share/xvile/vile/spell.rc
+share/xvile/vile/sql.keywords
+share/xvile/vile/tags.keywords
+share/xvile/vile/tbl.keywords
+share/xvile/vile/tc.keywords
+share/xvile/vile/tcl.keywords
+share/xvile/vile/ti.keywords
+share/xvile/vile/xres.keywords
+share/xvile/vile/xs.keywords
+share/xvile/vile/yacc.keywords
+share/xvile/macros/color-ls.rc
+share/xvile/macros/digraphs.rc
+share/xvile/macros/manpage.rc
+share/xvile/macros/palettes.rc
+share/xvile/macros/pictmode.rc
+share/xvile/macros/shifts.rc
+share/xvile/macros/vileinit.rc
+share/xvile/macros/vilemenu.rc
+share/xvile/macros/vileperl.rc
+share/xvile/macros/vile-pager
+@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 519b9e8b3e99..c3a6370625d5 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -1,6 +1,7 @@
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/xvile/vile-basic-filt
 lib/xvile/vile-c-filt
 lib/xvile/vile-crypt
 lib/xvile/vile-key-filt
@@ -13,7 +14,9 @@ lib/xvile/vile-cfg-filt
 lib/xvile/vile-cweb-filt
 lib/xvile/vile-dcl-filt
 lib/xvile/vile-fdl-filt
+lib/xvile/vile-def-filt
 lib/xvile/vile-diff-filt
+lib/xvile/vile-ecl-filt
 lib/xvile/vile-esql-filt
 lib/xvile/vile-html-filt
 lib/xvile/vile-imake-filt
@@ -27,6 +30,7 @@ lib/xvile/vile-nr-filt
 lib/xvile/vile-perl-filt
 lib/xvile/vile-pl-filt
 lib/xvile/vile-py-filt
+lib/xvile/vile-rc-filt
 lib/xvile/vile-rcs-filt
 lib/xvile/vile-rexx-filt
 lib/xvile/vile-sccs-filt
@@ -41,6 +45,7 @@ lib/xvile/vile-tc-filt
 lib/xvile/vile-tcl-filt
 lib/xvile/vile-ti-filt
 lib/xvile/vile-txt-filt
+lib/xvile/vile-vlog-filt
 lib/xvile/vile-vile-filt
 lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
@@ -87,20 +92,25 @@ share/xvile/vile/shifts.rc
 share/xvile/vile/vileinit.rc
 share/xvile/vile/vileperl.rc
 share/xvile/vile/vile.hlp
+share/xvile/vile/basic.keywords
 share/xvile/vile/c.keywords
 share/xvile/vile/cpp.keywords
 share/xvile/vile/filters.rc
 share/xvile/vile/pas.keywords
 share/xvile/vile/pc.keywords
+share/xvile/vile/vb.keywords
 share/xvile/vile/vile.keywords
 share/xvile/vile/vim.keywords
+share/xvile/vile/vlog.keywords
 share/xvile/vile/ada.keywords
 share/xvile/vile/awk.keywords
 share/xvile/vile/bat.keywords
 share/xvile/vile/csh.keywords
 share/xvile/vile/cweb.keywords
 share/xvile/vile/dcl.keywords
+share/xvile/vile/def.keywords
 share/xvile/vile/diff.keywords
+share/xvile/vile/ecl.keywords
 share/xvile/vile/esql.keywords
 share/xvile/vile/fdl.keywords
 share/xvile/vile/html.keywords
@@ -116,6 +126,7 @@ share/xvile/vile/nr.keywords
 share/xvile/vile/perl.keywords
 share/xvile/vile/py.keywords
 share/xvile/vile/pot.keywords
+share/xvile/vile/rc.keywords
 share/xvile/vile/rcs.keywords
 share/xvile/vile/rexx.keywords
 share/xvile/vile/sccs.keywords
diff --git a/editors/xvile/pkg-plist.perl+filt b/editors/xvile/pkg-plist.perl+filt
new file mode 100644
index 000000000000..a9464312e5f3
--- /dev/null
+++ b/editors/xvile/pkg-plist.perl+filt
@@ -0,0 +1,112 @@
+bin/xvile
+bin/xvile-pager
+bin/xshell.sh
+lib/xvile/vile-crypt
+lib/xvile/vile-manfilt
+@dirrm lib/xvile
+share/doc/xvile/Vileserv.doc
+share/doc/xvile/config.doc
+share/doc/xvile/dir.doc
+share/doc/xvile/filters.doc
+share/doc/xvile/macros.doc
+share/doc/xvile/menus.doc
+share/doc/xvile/modes.doc
+share/doc/xvile/oleauto.doc
+share/doc/xvile/perl.doc
+share/doc/xvile/visvile.doc
+share/doc/xvile/w32modes.doc
+share/doc/xvile/vile-perl-api.doc
+@dirrm share/doc/xvile
+share/xvile/vile/perl/Vile/Exporter.pm
+share/xvile/vile/perl/Vile/Manual.pm
+share/xvile/vile/perl/Glob2re.pm
+share/xvile/vile/perl/Vile.pm
+share/xvile/vile/perl/Vileserv.pm
+share/xvile/vile/perl/Visit.pm
+share/xvile/vile/perl/capture.pm
+share/xvile/vile/perl/directory.pm
+share/xvile/vile/perl/dirlist.pm
+share/xvile/vile/perl/gdb.pm
+share/xvile/vile/perl/hgrep.pm
+share/xvile/vile/perl/lock.pm
+share/xvile/vile/perl/mime.pl
+share/xvile/vile/perl/plugins.pl
+share/xvile/vile/perl/search.pm
+share/xvile/vile/perl/shell.pm
+share/xvile/vile/perl/spell.pm
+share/xvile/vile/perl/winops.pm
+@unexec rm -f %D/share/xvile/vile/.vilemenu
+share/xvile/vile/color-ls.rc
+share/xvile/vile/digraphs.rc
+share/xvile/vile/manpage.rc
+share/xvile/vile/palettes.rc
+share/xvile/vile/pictmode.rc
+share/xvile/vile/shifts.rc
+share/xvile/vile/vileinit.rc
+share/xvile/vile/vileperl.rc
+share/xvile/vile/vile.hlp
+share/xvile/vile/basic.keywords
+share/xvile/vile/c.keywords
+share/xvile/vile/cpp.keywords
+share/xvile/vile/filters.rc
+share/xvile/vile/pas.keywords
+share/xvile/vile/pc.keywords
+share/xvile/vile/vb.keywords
+share/xvile/vile/vile.keywords
+share/xvile/vile/vim.keywords
+share/xvile/vile/vlog.keywords
+share/xvile/vile/ada.keywords
+share/xvile/vile/awk.keywords
+share/xvile/vile/bat.keywords
+share/xvile/vile/csh.keywords
+share/xvile/vile/cweb.keywords
+share/xvile/vile/dcl.keywords
+share/xvile/vile/def.keywords
+share/xvile/vile/diff.keywords
+share/xvile/vile/ecl.keywords
+share/xvile/vile/esql.keywords
+share/xvile/vile/fdl.keywords
+share/xvile/vile/html.keywords
+share/xvile/vile/imake.keywords
+share/xvile/vile/java.keywords
+share/xvile/vile/js.keywords
+share/xvile/vile/latex.keywords
+share/xvile/vile/lex.keywords
+share/xvile/vile/m4.keywords
+share/xvile/vile/mail.keywords
+share/xvile/vile/make.keywords
+share/xvile/vile/nr.keywords
+share/xvile/vile/perl.keywords
+share/xvile/vile/py.keywords
+share/xvile/vile/pot.keywords
+share/xvile/vile/rc.keywords
+share/xvile/vile/rcs.keywords
+share/xvile/vile/rexx.keywords
+share/xvile/vile/sccs.keywords
+share/xvile/vile/sh.keywords
+share/xvile/vile/sml.keywords
+share/xvile/vile/spell.rc
+share/xvile/vile/sql.keywords
+share/xvile/vile/tags.keywords
+share/xvile/vile/tbl.keywords
+share/xvile/vile/tc.keywords
+share/xvile/vile/tcl.keywords
+share/xvile/vile/ti.keywords
+share/xvile/vile/xres.keywords
+share/xvile/vile/xs.keywords
+share/xvile/macros/color-ls.rc
+share/xvile/macros/digraphs.rc
+share/xvile/macros/manpage.rc
+share/xvile/macros/palettes.rc
+share/xvile/macros/pictmode.rc
+share/xvile/macros/shifts.rc
+share/xvile/macros/vileinit.rc
+share/xvile/macros/vilemenu.rc
+share/xvile/macros/vileperl.rc
+share/xvile/macros/vile-pager
+share/xvile/vile/yacc.keywords
+@dirrm share/xvile/vile/perl/Vile
+@dirrm share/xvile/vile/perl
+@dirrm share/xvile/macros
+@dirrm share/xvile/vile
+@dirrm share/xvile