Update to version 9.7.

Correctly handle the NOPORTSDOCS case.

6 files changed, 53 insertions, 78 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 9a9ea2fe6242..7b02fff7447b 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -6,21 +6,15 @@
 #
 
 PORTNAME=	xvile
-PORTVERSION=	9.6e
-PORTREVISION=	1
+PORTVERSION=	9.7
 CATEGORIES=	editors
 MASTER_SITES=	ftp://invisible-island.net/vile/ \
 		ftp://dickey.his.com/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, X11 version -- a fully "X aware" vi work-alike
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index 989d5e23c8f2..08a09d0ab7ab 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/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/xvile/pkg-plist b/editors/xvile/pkg-plist
index 0f3a9715647b..10f557266414 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -46,11 +46,9 @@ lib/xvile/vile-mms-filt
 lib/xvile/vile-nr-filt
 lib/xvile/vile-perl-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
@@ -78,17 +76,17 @@ lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
 lib/xvile/vile-yacc-filt
 @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
-@dirrm share/doc/xvile
+%%PORTDOCS%%share/doc/xvile/Vileserv.doc
+%%PORTDOCS%%share/doc/xvile/config.doc
+%%PORTDOCS%%share/doc/xvile/dir.doc
+%%PORTDOCS%%share/doc/xvile/filters.doc
+%%PORTDOCS%%share/doc/xvile/macros.doc
+%%PORTDOCS%%share/doc/xvile/menus.doc
+%%PORTDOCS%%share/doc/xvile/modes.doc
+%%PORTDOCS%%share/doc/xvile/oleauto.doc
+%%PORTDOCS%%share/doc/xvile/perl.doc
+%%PORTDOCS%%share/doc/xvile/visvile.doc
+@dirrmtry share/doc/xvile
 @unexec rm -f %D/share/xvile/vile/vilemenu.rc
 share/xvile/vile/color-ls.rc
 share/xvile/vile/dates.rc
@@ -163,6 +161,7 @@ share/xvile/vile/rexx.keywords
 share/xvile/vile/rpm.keywords
 share/xvile/vile/rtf.keywords
 share/xvile/vile/sccs.keywords
+share/xvile/vile/scheme.keywords
 share/xvile/vile/sh.keywords
 share/xvile/vile/sml.keywords
 share/xvile/vile/syntax.keywords
diff --git a/editors/xvile/pkg-plist.filt b/editors/xvile/pkg-plist.filt
index 56f8446bb36c..4cdc9b58ee57 100644
--- a/editors/xvile/pkg-plist.filt
+++ b/editors/xvile/pkg-plist.filt
@@ -49,11 +49,9 @@ 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
@@ -78,17 +76,17 @@ 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
-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
-@dirrm share/doc/xvile
+%%PORTDOCS%%share/doc/xvile/Vileserv.doc
+%%PORTDOCS%%share/doc/xvile/config.doc
+%%PORTDOCS%%share/doc/xvile/dir.doc
+%%PORTDOCS%%share/doc/xvile/filters.doc
+%%PORTDOCS%%share/doc/xvile/macros.doc
+%%PORTDOCS%%share/doc/xvile/menus.doc
+%%PORTDOCS%%share/doc/xvile/modes.doc
+%%PORTDOCS%%share/doc/xvile/oleauto.doc
+%%PORTDOCS%%share/doc/xvile/perl.doc
+%%PORTDOCS%%share/doc/xvile/visvile.doc
+@dirrmtry share/doc/xvile
 @unexec rm -f %D/share/xvile/vile/vilemenu.rc
 share/xvile/vile/color-ls.rc
 share/xvile/vile/dates.rc
@@ -165,6 +163,7 @@ share/xvile/vile/rexx.keywords
 share/xvile/vile/rpm.keywords
 share/xvile/vile/rtf.keywords
 share/xvile/vile/sccs.keywords
+share/xvile/vile/scheme.keywords
 share/xvile/vile/sh.keywords
 share/xvile/vile/sml.keywords
 share/xvile/vile/spell.rc
diff --git a/editors/xvile/pkg-plist.perl b/editors/xvile/pkg-plist.perl
index ab2330a4007b..b6829d6b159c 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -47,11 +47,9 @@ lib/xvile/vile-mms-filt
 lib/xvile/vile-nr-filt
 lib/xvile/vile-perl-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
@@ -79,17 +77,17 @@ lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
 lib/xvile/vile-yacc-filt
 @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
-@dirrm share/doc/xvile
+%%PORTDOCS%%share/doc/xvile/Vileserv.doc
+%%PORTDOCS%%share/doc/xvile/config.doc
+%%PORTDOCS%%share/doc/xvile/dir.doc
+%%PORTDOCS%%share/doc/xvile/filters.doc
+%%PORTDOCS%%share/doc/xvile/macros.doc
+%%PORTDOCS%%share/doc/xvile/menus.doc
+%%PORTDOCS%%share/doc/xvile/modes.doc
+%%PORTDOCS%%share/doc/xvile/oleauto.doc
+%%PORTDOCS%%share/doc/xvile/perl.doc
+%%PORTDOCS%%share/doc/xvile/visvile.doc
+@dirrmtry share/doc/xvile
 share/xvile/vile/perl/Vile/Exporter.pm
 share/xvile/vile/perl/Vile/Manual.pm
 share/xvile/vile/perl/Breadcrumbs.pm
@@ -189,6 +187,7 @@ share/xvile/vile/rexx.keywords
 share/xvile/vile/rpm.keywords
 share/xvile/vile/rtf.keywords
 share/xvile/vile/sccs.keywords
+share/xvile/vile/scheme.keywords
 share/xvile/vile/sh.keywords
 share/xvile/vile/sml.keywords
 share/xvile/vile/spell.rc
diff --git a/editors/xvile/pkg-plist.perl+filt b/editors/xvile/pkg-plist.perl+filt
index ca4dfe8ad9b5..b36b8e2d725b 100644
--- a/editors/xvile/pkg-plist.perl+filt
+++ b/editors/xvile/pkg-plist.perl+filt
@@ -50,11 +50,9 @@ 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
@@ -79,17 +77,17 @@ 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
-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
-@dirrm share/doc/xvile
+%%PORTDOCS%%share/doc/xvile/Vileserv.doc
+%%PORTDOCS%%share/doc/xvile/config.doc
+%%PORTDOCS%%share/doc/xvile/dir.doc
+%%PORTDOCS%%share/doc/xvile/filters.doc
+%%PORTDOCS%%share/doc/xvile/macros.doc
+%%PORTDOCS%%share/doc/xvile/menus.doc
+%%PORTDOCS%%share/doc/xvile/modes.doc
+%%PORTDOCS%%share/doc/xvile/oleauto.doc
+%%PORTDOCS%%share/doc/xvile/perl.doc
+%%PORTDOCS%%share/doc/xvile/visvile.doc
+@dirrmtry share/doc/xvile
 share/xvile/vile/perl/Vile/Exporter.pm
 share/xvile/vile/perl/Vile/Manual.pm
 share/xvile/vile/perl/Breadcrumbs.pm
@@ -189,6 +187,7 @@ share/xvile/vile/rexx.keywords
 share/xvile/vile/rpm.keywords
 share/xvile/vile/rtf.keywords
 share/xvile/vile/sccs.keywords
+share/xvile/vile/scheme.keywords
 share/xvile/vile/sh.keywords
 share/xvile/vile/sml.keywords
 share/xvile/vile/spell.rc