Update to version 9.7y.

7 files changed, 46 insertions, 22 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 82c7a4aac88f..dc9fb45a34de 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xvile
-PORTVERSION=	9.7t
+PORTVERSION=	9.7y
 CATEGORIES=	editors
 MASTER_SITES=	ftp://invisible-island.net/vile/ \
 		ftp://dickey.his.com/vile/ \
@@ -34,7 +34,12 @@ PATCHFILES=	vile-9.7a.patch.gz \
 		vile-9.7q.patch.gz \
 		vile-9.7r.patch.gz \
 		vile-9.7s.patch.gz \
-		vile-9.7t.patch.gz
+		vile-9.7t.patch.gz \
+		vile-9.7u.patch.gz \
+		vile-9.7v.patch.gz \
+		vile-9.7w.patch.gz \
+		vile-9.7x.patch.gz \
+		vile-9.7y.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 d4d1348791d8..7ce3371c5a3c 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -61,3 +61,18 @@ SIZE (vile-9.7s.patch.gz) = 18208
 MD5 (vile-9.7t.patch.gz) = 79ecc34876efaab976c1c58e88b2cd2a
 SHA256 (vile-9.7t.patch.gz) = f55b5c8ae7548509c3d57f9e5a9029d1e3156e6f2d8a9a1e705e643a0bef7f7d
 SIZE (vile-9.7t.patch.gz) = 5381
+MD5 (vile-9.7u.patch.gz) = 402d997104bcd4faab44cadb4af0168a
+SHA256 (vile-9.7u.patch.gz) = cb07d232c0d96beb6647590a7551c9fa96442b8d40378baf46d66a77a13bf065
+SIZE (vile-9.7u.patch.gz) = 87365
+MD5 (vile-9.7v.patch.gz) = 83b26150303f5730cfff45ec2a1c1749
+SHA256 (vile-9.7v.patch.gz) = 301272262f4a11080f1738788044a123e2bccbbaa845cb81f29b5c2314aef267
+SIZE (vile-9.7v.patch.gz) = 102195
+MD5 (vile-9.7w.patch.gz) = c0505d721edc16375eecc00f46eb7cec
+SHA256 (vile-9.7w.patch.gz) = 78e1ed71aabd3e092f837582278db3a7983fd74a647945e83e91681c9b949e6c
+SIZE (vile-9.7w.patch.gz) = 70670
+MD5 (vile-9.7x.patch.gz) = 9fb52a221ecf346f9eb5d2a926f8fc8b
+SHA256 (vile-9.7x.patch.gz) = 4cbb535bc024a73608ccd4dc075ec95bb2dfe35a6c1a20540841d604be2652f5
+SIZE (vile-9.7x.patch.gz) = 278840
+MD5 (vile-9.7y.patch.gz) = 61b5b747c70070f7ac6a694f80290e2d
+SHA256 (vile-9.7y.patch.gz) = 6322f133a75211d0b1f99a963de9a18afe25d606c80616c91f23bca6b9ecbfa0
+SIZE (vile-9.7y.patch.gz) = 245332
diff --git a/editors/xvile/files/patch-ac b/editors/xvile/files/patch-ac
deleted file mode 100644
index 99a511507602..000000000000
--- a/editors/xvile/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- makefile.in.orig	2009-01-05 13:21:04.000000000 +0100
-+++ makefile.in	2009-01-05 13:24:59.000000000 +0100
-@@ -54,7 +54,7 @@
- AWK		= @AWK@
- PERL		= @PERL@
- PERLLIB		= @PERLLIB@
--INSTALL_SCRIPT	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
-+INSTALL_SCRIPT	= $(INSTALL) -m 555
- INSTALL_MODULE	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
- 
- prefix		= @prefix@
-@@ -672,7 +672,7 @@
- 	$(INSTALL_PROGRAM)	$(TARGET) $@
- 
- $(BINDIR)/xshell.sh:		$(srcdir)/xshell.sh
--	$(INSTALL_PROGRAM)	$(srcdir)/xshell.sh $@
-+	$(INSTALL_SCRIPT)	$(srcdir)/xshell.sh $@
- $(BINDIR)/vileget:		$(srcdir)/perl/vileget
- 	$(INSTALL_SCRIPT)	$(srcdir)/perl/vileget $@
- 
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index f9a7ab4d2a96..77cb672b470a 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -1,6 +1,9 @@
+bin/uxvile
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/X11/app-defaults/UXVile
+lib/X11/app-defaults/XVile
 lib/xvile/atr2ansi
 lib/xvile/atr2html
 lib/xvile/atr2text
@@ -75,6 +78,7 @@ lib/xvile/vile-vile-filt
 lib/xvile/vile-vlog-filt
 lib/xvile/vile-wbt-filt
 lib/xvile/vile-xml-filt
+lib/xvile/vile-xq-filt
 lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
 lib/xvile/vile-yacc-filt
@@ -91,6 +95,7 @@ lib/xvile/vile-yacc-filt
 %%PORTDOCS%%share/doc/xvile/visvile.doc
 @dirrmtry share/doc/xvile
 @unexec rm -f %D/share/xvile/vile/vilemenu.rc
+share/pixmaps/vile.xbm
 share/xvile/vile/color-ls.rc
 share/xvile/vile/dates.rc
 share/xvile/vile/digraphs.rc
@@ -189,6 +194,7 @@ share/xvile/vile/vbs.keywords
 share/xvile/vile/vlog.keywords
 share/xvile/vile/wbt.keywords
 share/xvile/vile/xml.keywords
+share/xvile/vile/xq.keywords
 share/xvile/vile/xres.keywords
 share/xvile/vile/xs.keywords
 share/xvile/vile/xsl.keywords
diff --git a/editors/xvile/pkg-plist.filt b/editors/xvile/pkg-plist.filt
index ecc2d9c8b257..ca3e12b5e1c9 100644
--- a/editors/xvile/pkg-plist.filt
+++ b/editors/xvile/pkg-plist.filt
@@ -1,6 +1,9 @@
+bin/uxvile
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/X11/app-defaults/UXVile
+lib/X11/app-defaults/XVile
 lib/xvile/atr2ansi
 lib/xvile/atr2html
 lib/xvile/atr2text
@@ -75,6 +78,7 @@ lib/xvile/vile-vile-filt.so
 lib/xvile/vile-vlog-filt.so
 lib/xvile/vile-wbt-filt.so
 lib/xvile/vile-xml-filt.so
+lib/xvile/vile-xq-filt.so
 lib/xvile/vile-xres-filt.so
 lib/xvile/vile-xs-filt.so
 lib/xvile/vile-yacc-filt.so
@@ -91,6 +95,7 @@ lib/xvile/vile-yacc-filt.so
 %%PORTDOCS%%share/doc/xvile/visvile.doc
 @dirrmtry share/doc/xvile
 @unexec rm -f %D/share/xvile/vile/vilemenu.rc
+share/pixmaps/vile.xbm
 share/xvile/vile/color-ls.rc
 share/xvile/vile/dates.rc
 share/xvile/vile/digraphs.rc
@@ -189,6 +194,7 @@ share/xvile/vile/texi.keywords
 share/xvile/vile/ti.keywords
 share/xvile/vile/wbt.keywords
 share/xvile/vile/xml.keywords
+share/xvile/vile/xq.keywords
 share/xvile/vile/xres.keywords
 share/xvile/vile/xs.keywords
 share/xvile/vile/xsl.keywords
diff --git a/editors/xvile/pkg-plist.perl b/editors/xvile/pkg-plist.perl
index 77c9c4088ae3..9bdf51aeb1d5 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -1,7 +1,10 @@
+bin/uxvile
 bin/vileget
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/X11/app-defaults/UXVile
+lib/X11/app-defaults/XVile
 lib/xvile/atr2ansi
 lib/xvile/atr2html
 lib/xvile/atr2text
@@ -76,6 +79,7 @@ lib/xvile/vile-vlog-filt
 lib/xvile/vile-vile-filt
 lib/xvile/vile-wbt-filt
 lib/xvile/vile-xml-filt
+lib/xvile/vile-xq-filt
 lib/xvile/vile-xres-filt
 lib/xvile/vile-xs-filt
 lib/xvile/vile-yacc-filt
@@ -91,6 +95,7 @@ lib/xvile/vile-yacc-filt
 %%PORTDOCS%%share/doc/xvile/perl.doc
 %%PORTDOCS%%share/doc/xvile/visvile.doc
 @dirrmtry share/doc/xvile
+share/pixmaps/vile.xbm
 share/xvile/vile/perl/Vile/Exporter.pm
 share/xvile/vile/perl/Vile/Manual.pm
 share/xvile/vile/perl/Breadcrumbs.pm
@@ -213,6 +218,7 @@ share/xvile/vile/texi.keywords
 share/xvile/vile/ti.keywords
 share/xvile/vile/wbt.keywords
 share/xvile/vile/xml.keywords
+share/xvile/vile/xq.keywords
 share/xvile/vile/xres.keywords
 share/xvile/vile/xs.keywords
 share/xvile/vile/xsl.keywords
diff --git a/editors/xvile/pkg-plist.perl+filt b/editors/xvile/pkg-plist.perl+filt
index 842f8f14fcb5..ee230061d785 100644
--- a/editors/xvile/pkg-plist.perl+filt
+++ b/editors/xvile/pkg-plist.perl+filt
@@ -1,7 +1,10 @@
+bin/uxvile
 bin/vileget
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
+lib/X11/app-defaults/UXVile
+lib/X11/app-defaults/XVile
 lib/xvile/atr2ansi
 lib/xvile/atr2html
 lib/xvile/atr2text
@@ -76,6 +79,7 @@ lib/xvile/vile-vile-filt.so
 lib/xvile/vile-vlog-filt.so
 lib/xvile/vile-wbt-filt.so
 lib/xvile/vile-xml-filt.so
+lib/xvile/vile-xq-filt.so
 lib/xvile/vile-xres-filt.so
 lib/xvile/vile-xs-filt.so
 lib/xvile/vile-yacc-filt.so
@@ -91,6 +95,7 @@ lib/xvile/vile-yacc-filt.so
 %%PORTDOCS%%share/doc/xvile/perl.doc
 %%PORTDOCS%%share/doc/xvile/visvile.doc
 @dirrmtry share/doc/xvile
+share/pixmaps/vile.xbm
 share/xvile/vile/perl/Vile/Exporter.pm
 share/xvile/vile/perl/Vile/Manual.pm
 share/xvile/vile/perl/Breadcrumbs.pm
@@ -213,6 +218,7 @@ share/xvile/vile/texi.keywords
 share/xvile/vile/ti.keywords
 share/xvile/vile/wbt.keywords
 share/xvile/vile/xml.keywords
+share/xvile/vile/xq.keywords
 share/xvile/vile/xres.keywords
 share/xvile/vile/xs.keywords
 share/xvile/vile/xsl.keywords