Update to version 9.7.

While I'm here, fix handling of the NOPORTSDOCS case.

6 files changed, 56 insertions, 80 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 18371e2994bd..96a4da5cf728 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -6,20 +6,15 @@
 #
 
 PORTNAME=	vile
-PORTVERSION=	9.6e
+PORTVERSION=	9.7
 CATEGORIES=	editors
 MASTER_SITES=	ftp://dickey.his.com/vile/ \
 		ftp://invisible-island.net/vile/ \
 		ftp://ftp.phred.org/pub/vile/
-DISTNAME=	vile-9.6
+DISTNAME=	vile-9.7
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=	${MASTER_SITES:S,vile/,vile/patches/,g}
-PATCHFILES=	vile-9.6a.patch.gz \
-		vile-9.6b.patch.gz \
-		vile-9.6c.patch.gz \
-		vile-9.6d.patch.gz \
-		vile-9.6e.patch.gz
 
 MAINTAINER=	gj@FreeBSD.org
 COMMENT=	VI Like Emacs.  a vi "workalike", with many additional features
@@ -57,15 +52,15 @@ PLIST=		${PKGDIR}/pkg-plist.perl+filt
 .endif
 
 pre-configure:
-.if ! defined(WITH_ICONV)
+.if !defined(WITH_ICONV)
 	@${ECHO_MSG} "Choose the option ICONV if you want to make a vile which includes"
 	@${ECHO_MSG} "ICONV functionality"
 .endif
-.if ! defined(WITH_PERL)
+.if !defined(WITH_PERL)
 	@${ECHO_MSG} "Choose the option PERL if you want to make a vile which includes"
 	@${ECHO_MSG} "PERL functionality"
 .endif
-.if ! defined(WITH_FILTERS)
+.if !defined(WITH_FILTERS)
 	@${ECHO_MSG} "Choose the option FILTERS if you want to make a vile which will"
 	@${ECHO_MSG} "dynamically load filters as needed."
 .endif
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index 989d5e23c8f2..08a09d0ab7ab 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,18 +1,3 @@
-MD5 (vile-9.6.tgz) = 3695e234f4e7e9038450876f44832613
-SHA256 (vile-9.6.tgz) = cf0b2784519e0be24a4d8fcb1ccb5aa4887d5a2e11ceb5d760d5753feeb1bd4a
-SIZE (vile-9.6.tgz) = 1773866
-MD5 (vile-9.6a.patch.gz) = b980b3172502572a74e708885ef81856
-SHA256 (vile-9.6a.patch.gz) = 67baa105327a55fd577a84bfab1354db5271211a53ac68e18b717a9dffae7f62
-SIZE (vile-9.6a.patch.gz) = 5075
-MD5 (vile-9.6b.patch.gz) = 0dcaa0413c59952578b1a58a05c3cda0
-SHA256 (vile-9.6b.patch.gz) = 9e2e041ab7e3423aef7d4e7111eb49092cdb4a0305b95d6a0319525d8f5058d8
-SIZE (vile-9.6b.patch.gz) = 3494
-MD5 (vile-9.6c.patch.gz) = 239a7ed19c5bd0fba3163d32e17d4645
-SHA256 (vile-9.6c.patch.gz) = 821bd70330c495e619b07ad91450161924f22af311be549a1ed0cc2660012f28
-SIZE (vile-9.6c.patch.gz) = 86144
-MD5 (vile-9.6d.patch.gz) = 634d5f3b5c0bd1f2ffd4fc218a60329c
-SHA256 (vile-9.6d.patch.gz) = 712848c80cb6313be3eef4fc855a571e9a468604c624d9a9191861d192cdf531
-SIZE (vile-9.6d.patch.gz) = 22094
-MD5 (vile-9.6e.patch.gz) = 00c175f8eaf1d5bd71bc148349c25c8f
-SHA256 (vile-9.6e.patch.gz) = ff2ab5613401585ab2b4d5c91ef63a4062ceefc9615d6fd28d54265a010dac20
-SIZE (vile-9.6e.patch.gz) = 5420
+MD5 (vile-9.7.tgz) = 3ef25a8b4778d4790defb24729c60ce2
+SHA256 (vile-9.7.tgz) = 14c14b29d6f03311c325351cf633b823917c0c3b4a9e580fb3d3e228a7b917dd
+SIZE (vile-9.7.tgz) = 1796227
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index 884a455bee0a..f660eb5514be 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -45,11 +45,9 @@ lib/vile/vile-nr-filt
 lib/vile/vile-pas-filt
 lib/vile/vile-perl-filt
 lib/vile/vile-php-filt
-lib/vile/vile-pl-filt
 lib/vile/vile-pot-filt
 lib/vile/vile-ps-filt
 lib/vile/vile-py-filt
-lib/vile/vile-rb-filt
 lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
 lib/vile/vile-rexx-filt
@@ -76,16 +74,16 @@ lib/vile/vile-xml-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
-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
+%%PORTDOCS%%share/doc/vile/Vileserv.doc
+%%PORTDOCS%%share/doc/vile/config.doc
+%%PORTDOCS%%share/doc/vile/dir.doc
+%%PORTDOCS%%share/doc/vile/filters.doc
+%%PORTDOCS%%share/doc/vile/macros.doc
+%%PORTDOCS%%share/doc/vile/menus.doc
+%%PORTDOCS%%share/doc/vile/modes.doc
+%%PORTDOCS%%share/doc/vile/oleauto.doc
+%%PORTDOCS%%share/doc/vile/perl.doc
+%%PORTDOCS%%share/doc/vile/visvile.doc
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -167,6 +165,7 @@ share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/rtf.keywords
 share/vile/sccs.keywords
+share/vile/scheme.keywords
 share/vile/search.rc
 share/vile/sh.keywords
 share/vile/shifts.rc
@@ -198,5 +197,5 @@ share/vile/yacc.keywords
 @dirrm share/vile/doc
 @dirrm share/vile/macros
 @dirrm share/vile
-@dirrm share/doc/vile
+@dirrmtry share/doc/vile
 @dirrm lib/vile
diff --git a/editors/vile/pkg-plist.filt b/editors/vile/pkg-plist.filt
index f538f11c83ad..808ce311c57e 100644
--- a/editors/vile/pkg-plist.filt
+++ b/editors/vile/pkg-plist.filt
@@ -45,11 +45,9 @@ lib/vile/vile-nr-filt.so
 lib/vile/vile-pas-filt.so
 lib/vile/vile-perl-filt.so
 lib/vile/vile-php-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
@@ -76,16 +74,16 @@ lib/vile/vile-xml-filt.so
 lib/vile/vile-xres-filt.so
 lib/vile/vile-xs-filt.so
 lib/vile/vile-yacc-filt.so
-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
+%%PORTDOCS%%share/doc/vile/Vileserv.doc
+%%PORTDOCS%%share/doc/vile/config.doc
+%%PORTDOCS%%share/doc/vile/dir.doc
+%%PORTDOCS%%share/doc/vile/filters.doc
+%%PORTDOCS%%share/doc/vile/macros.doc
+%%PORTDOCS%%share/doc/vile/menus.doc
+%%PORTDOCS%%share/doc/vile/modes.doc
+%%PORTDOCS%%share/doc/vile/oleauto.doc
+%%PORTDOCS%%share/doc/vile/perl.doc
+%%PORTDOCS%%share/doc/vile/visvile.doc
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -167,6 +165,7 @@ share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/rtf.keywords
 share/vile/sccs.keywords
+share/vile/scheme.keywords
 share/vile/search.rc
 share/vile/sh.keywords
 share/vile/shifts.rc
@@ -198,5 +197,5 @@ share/vile/yacc.keywords
 @dirrm share/vile/doc
 @dirrm share/vile/macros
 @dirrm share/vile
-@dirrm share/doc/vile
+@dirrmtry share/doc/vile
 @dirrm lib/vile
diff --git a/editors/vile/pkg-plist.perl b/editors/vile/pkg-plist.perl
index 5b7ac07199a9..f9fc78986114 100644
--- a/editors/vile/pkg-plist.perl
+++ b/editors/vile/pkg-plist.perl
@@ -46,11 +46,9 @@ lib/vile/vile-nr-filt
 lib/vile/vile-pas-filt
 lib/vile/vile-perl-filt
 lib/vile/vile-php-filt
-lib/vile/vile-pl-filt
 lib/vile/vile-pot-filt
 lib/vile/vile-ps-filt
 lib/vile/vile-py-filt
-lib/vile/vile-rb-filt
 lib/vile/vile-rc-filt
 lib/vile/vile-rcs-filt
 lib/vile/vile-rexx-filt
@@ -77,16 +75,16 @@ lib/vile/vile-xml-filt
 lib/vile/vile-xres-filt
 lib/vile/vile-xs-filt
 lib/vile/vile-yacc-filt
-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
+%%PORTDOCS%%share/doc/vile/Vileserv.doc
+%%PORTDOCS%%share/doc/vile/config.doc
+%%PORTDOCS%%share/doc/vile/dir.doc
+%%PORTDOCS%%share/doc/vile/filters.doc
+%%PORTDOCS%%share/doc/vile/macros.doc
+%%PORTDOCS%%share/doc/vile/menus.doc
+%%PORTDOCS%%share/doc/vile/modes.doc
+%%PORTDOCS%%share/doc/vile/oleauto.doc
+%%PORTDOCS%%share/doc/vile/perl.doc
+%%PORTDOCS%%share/doc/vile/visvile.doc
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -191,6 +189,7 @@ share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/rtf.keywords
 share/vile/sccs.keywords
+share/vile/scheme.keywords
 share/vile/search.rc
 share/vile/sh.keywords
 share/vile/shifts.rc
@@ -224,5 +223,5 @@ share/vile/yacc.keywords
 @dirrm share/vile/perl
 @dirrm share/vile/macros
 @dirrm share/vile
-@dirrm share/doc/vile
+@dirrmtry share/doc/vile
 @dirrm lib/vile
diff --git a/editors/vile/pkg-plist.perl+filt b/editors/vile/pkg-plist.perl+filt
index da10fbc7b90a..0d0489c505c4 100644
--- a/editors/vile/pkg-plist.perl+filt
+++ b/editors/vile/pkg-plist.perl+filt
@@ -46,11 +46,9 @@ lib/vile/vile-nr-filt.so
 lib/vile/vile-pas-filt.so
 lib/vile/vile-perl-filt.so
 lib/vile/vile-php-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
@@ -77,16 +75,16 @@ lib/vile/vile-xml-filt.so
 lib/vile/vile-xres-filt.so
 lib/vile/vile-xs-filt.so
 lib/vile/vile-yacc-filt.so
-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
+%%PORTDOCS%%share/doc/vile/Vileserv.doc
+%%PORTDOCS%%share/doc/vile/config.doc
+%%PORTDOCS%%share/doc/vile/dir.doc
+%%PORTDOCS%%share/doc/vile/filters.doc
+%%PORTDOCS%%share/doc/vile/macros.doc
+%%PORTDOCS%%share/doc/vile/menus.doc
+%%PORTDOCS%%share/doc/vile/modes.doc
+%%PORTDOCS%%share/doc/vile/oleauto.doc
+%%PORTDOCS%%share/doc/vile/perl.doc
+%%PORTDOCS%%share/doc/vile/visvile.doc
 share/vile/ada.keywords
 share/vile/as.keywords
 share/vile/as386.keywords
@@ -156,6 +154,7 @@ share/vile/palettes.rc
 share/vile/pas.keywords
 share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/scheme.keywords
 share/vile/perl/Breadcrumbs.pm
 share/vile/perl/CaptHook.pm
 share/vile/perl/Glob2re.pm
@@ -224,5 +223,5 @@ share/vile/yacc.keywords
 @dirrm share/vile/perl
 @dirrm share/vile/macros
 @dirrm share/vile
-@dirrm share/doc/vile
+@dirrmtry share/doc/vile
 @dirrm lib/vile