Update the xvile package from version 9.0 to 9.3. A large number of

bugs have been fixed over the 3 years since 9.0 was released, and some
major portability improvements have been made.

5 files changed, 84 insertions, 39 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index fcd3db4e789..736052df770 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2002/10/08 13:37:17 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/11/27 11:03:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
-DISTNAME=		vile-9.0
-PKGNAME=		xvile-9.0
+DISTNAME=		vile-9.3
+PKGNAME=		xvile-9.3
 CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.clark.net/pub/dickey/vile/ \
-			ftp://ftp.phred.org/pub/vile/
+MASTER_SITES=		ftp://dickey.his.com/vile/ \
+			ftp://invisible-island.net/vile/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
diff --git a/editors/xvile/PLIST b/editors/xvile/PLIST
index fbed9944f85..deea371c595 100644
--- a/editors/xvile/PLIST
+++ b/editors/xvile/PLIST
@@ -1,19 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:24:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/27 11:03:31 agc Exp $
 bin/xshell.sh
 bin/xvile
 bin/xvile-pager
 bin/xvileget
 libexec/xvile/vile-ada-filt
 libexec/xvile/vile-awk-filt
+libexec/xvile/vile-basic-filt
 libexec/xvile/vile-bat-filt
 libexec/xvile/vile-c-filt
+libexec/xvile/vile-cfg-filt
 libexec/xvile/vile-crypt
+libexec/xvile/vile-cweb-filt
 libexec/xvile/vile-dcl-filt
+libexec/xvile/vile-def-filt
 libexec/xvile/vile-diff-filt
+libexec/xvile/vile-ecl-filt
+libexec/xvile/vile-esql-filt
 libexec/xvile/vile-fdl-filt
 libexec/xvile/vile-html-filt
+libexec/xvile/vile-imake-filt
+libexec/xvile/vile-key-filt
 libexec/xvile/vile-latex-filt
 libexec/xvile/vile-lex-filt
+libexec/xvile/vile-lisp-filt
 libexec/xvile/vile-m4-filt
 libexec/xvile/vile-mail-filt
 libexec/xvile/vile-make-filt
@@ -22,18 +31,26 @@ libexec/xvile/vile-mms-filt
 libexec/xvile/vile-nr-filt
 libexec/xvile/vile-pas-filt
 libexec/xvile/vile-perl-filt
+libexec/xvile/vile-pl-filt
 libexec/xvile/vile-py-filt
+libexec/xvile/vile-rc-filt
 libexec/xvile/vile-rcs-filt
+libexec/xvile/vile-rexx-filt
 libexec/xvile/vile-sccs-filt
+libexec/xvile/vile-sed-filt
 libexec/xvile/vile-sh-filt
+libexec/xvile/vile-sml-filt
 libexec/xvile/vile-spell-filt
 libexec/xvile/vile-sql-filt
+libexec/xvile/vile-tags-filt
 libexec/xvile/vile-tbl-filt
 libexec/xvile/vile-tc-filt
 libexec/xvile/vile-tcl-filt
 libexec/xvile/vile-ti-filt
 libexec/xvile/vile-txt-filt
 libexec/xvile/vile-vile-filt
+libexec/xvile/vile-vlog-filt
+libexec/xvile/vile-xres-filt
 libexec/xvile/vile-xs-filt
 libexec/xvile/vile-yacc-filt
 man/man1/xvile.1
@@ -43,15 +60,22 @@ share/examples/xvile/manpage.rc
 share/examples/xvile/pictmode.rc
 share/examples/xvile/spell.rc
 share/examples/xvile/visvile.rc
-share/xvile/.vilemenu
 share/xvile/ada.keywords
 share/xvile/awk.keywords
+share/xvile/basic.keywords
 share/xvile/bat.keywords
 share/xvile/c.keywords
+share/xvile/color-ls.rc
+share/xvile/cpp.keywords
 share/xvile/csh.keywords
+share/xvile/cweb.keywords
+share/xvile/dates.rc
 share/xvile/dcl.keywords
+share/xvile/def.keywords
 share/xvile/diff.keywords
 share/xvile/digraphs.rc
+share/xvile/ecl.keywords
+share/xvile/esql.keywords
 share/xvile/fdl.keywords
 share/xvile/filters.rc
 share/xvile/html.keywords
@@ -67,41 +91,60 @@ share/xvile/manpage.rc
 share/xvile/nr.keywords
 share/xvile/palettes.rc
 share/xvile/pas.keywords
+share/xvile/pc.keywords
 share/xvile/perl.keywords
+share/xvile/perl/Breadcrumbs.pm
+share/xvile/perl/CaptHook.pm
+share/xvile/perl/Glob2re.pm
+share/xvile/perl/Help.pm
 share/xvile/perl/Vile.pm
+share/xvile/perl/Vile/Exporter.pm
+share/xvile/perl/Vile/Manual.pm
 share/xvile/perl/Vileserv.pm
-share/xvile/perl/dir.pl
-share/xvile/perl/glob2re.pl
-share/xvile/perl/hgrep.pl
-share/xvile/perl/hilite.pl
-share/xvile/perl/lock.pl
-share/xvile/perl/manfilt.pl
+share/xvile/perl/Visit.pm
+share/xvile/perl/capture.pm
+share/xvile/perl/dict.pm
+share/xvile/perl/directory.pm
+share/xvile/perl/dirlist.pm
+share/xvile/perl/gdb.pm
+share/xvile/perl/hgrep.pm
+share/xvile/perl/lock.pm
+share/xvile/perl/man.pm
 share/xvile/perl/mime.pl
 share/xvile/perl/plugins.pl
-share/xvile/perl/search.pl
-share/xvile/perl/shell.pl
-share/xvile/perl/spell.pl
-share/xvile/perl/syntax.pl
-share/xvile/perl/tailf.pl
-share/xvile/perl/visit.pl
+share/xvile/perl/search.pm
+share/xvile/perl/shell.pm
+share/xvile/perl/spell.pm
+share/xvile/perl/winops.pm
 share/xvile/pictmode.rc
 share/xvile/pot.keywords
 share/xvile/py.keywords
+share/xvile/rc.keywords
 share/xvile/rcs.keywords
+share/xvile/rexx.keywords
 share/xvile/sccs.keywords
 share/xvile/sh.keywords
+share/xvile/shifts.rc
+share/xvile/sml.keywords
 share/xvile/spell.rc
 share/xvile/sql.keywords
+share/xvile/tags.keywords
 share/xvile/tbl.keywords
 share/xvile/tc.keywords
 share/xvile/tcl.keywords
 share/xvile/ti.keywords
+share/xvile/vb.keywords
 share/xvile/vile.hlp
 share/xvile/vile.keywords
 share/xvile/vileinit.rc
+share/xvile/vilemenu.rc
 share/xvile/vileperl.rc
+share/xvile/vim.keywords
+share/xvile/vlog.keywords
+share/xvile/xres.keywords
 share/xvile/xs.keywords
 share/xvile/yacc.keywords
+@dirrm share/xvile/perl/Vile
 @dirrm share/xvile/perl
 @dirrm share/xvile
 @dirrm share/examples/xvile
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index 69237e5d051..6d52daf8d88 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/11/27 11:03:31 agc Exp $
 
-SHA1 (vile-9.0.tgz) = b3f5f73770e0da6abe02406cb37407b5a5122dc9
-Size (vile-9.0.tgz) = 1192412 bytes
-SHA1 (patch-aa) = 684c7f6476f1d15fef2ef0858f0a59a59e9d588e
-SHA1 (patch-ab) = 4ea9130185a572acbe7374a35d87f6809997ced5
+SHA1 (vile-9.3.tgz) = 581efa183badd5c0abe68e118953229e2bb8403c
+Size (vile-9.3.tgz) = 1474140 bytes
+SHA1 (patch-aa) = a43641ec017b96c6d5999c5ad768e08f622b77e1
+SHA1 (patch-ab) = 6ec9232a2b42e95f5a2b5c724deb3323d0a63cf3
diff --git a/editors/xvile/patches/patch-aa b/editors/xvile/patches/patch-aa
index 9c81925b0ea..01e76c9cd58 100644
--- a/editors/xvile/patches/patch-aa
+++ b/editors/xvile/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.6 2000/09/06 08:16:16 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/11/27 11:03:32 agc Exp $
 
 --- makefile.in.orig	Wed Nov 10 21:04:17 1999
 +++ makefile.in	Wed Sep  6 03:50:28 2000
-@@ -50,7 +50,7 @@
- 
+@@ -51,8 +51,8 @@
+ AWK		= @AWK@
  PERL		= @PERL@
  PERLLIB		= @perl_lib_path@
 -INSTALL_SCRIPT	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
+-INSTALL_MODULE	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
 +INSTALL_SCRIPT	= ${BSD_INSTALL_SCRIPT}
- 
++INSTALL_MODULE	= ${BSD_INSTALL_DATA}
  
  prefix		= @prefix@
-@@ -59,7 +59,7 @@
+ exec_prefix	= @exec_prefix@
+@@ -60,7 +60,7 @@
  manext		= 1
  libdir		= @libdir@
  bindir		= @bindir@
@@ -20,15 +22,15 @@ $NetBSD: patch-aa,v 1.6 2000/09/06 08:16:16 jlam Exp $
  perldir		= $(datadir)/perl
  mandir		= @mandir@/man$(manext)
  
-@@ -316,7 +316,6 @@
+@@ -351,7 +351,6 @@
  
- INSTALL_PERL_DIRS = $(PERLDIR)
+ INSTALL_PERL_DIRS = $(PERLDIR) $(PERLDIR)/Vile
  INSTALL_PERL_FILES = \
 -	$(BINDIR)/vileget \
- 	$(PERLDIR)/Vile.pm \
- 	$(PERLDIR)/Vileserv.pm \
- 	$(PERLDIR)/dir.pl \
-@@ -607,7 +606,7 @@
+ 	$(PERLDIR)/Breadcrumbs.pm \
+ 	$(PERLDIR)/CaptHook.pm \
+ 	$(PERLDIR)/Glob2re.pm \
+@@ -623,7 +622,7 @@
  	$(INSTALL_PROGRAM)	$(TARGET) $@
  
  $(BINDIR)/xshell.sh:		$(srcdir)/xshell.sh
@@ -37,7 +39,7 @@ $NetBSD: patch-aa,v 1.6 2000/09/06 08:16:16 jlam Exp $
  $(BINDIR)/vileget:		$(srcdir)/perl/vileget
  	$(INSTALL_SCRIPT)	$(srcdir)/perl/vileget $@
  
-@@ -674,6 +673,9 @@
+@@ -710,6 +709,9 @@
  
  $(INSTALL_DIRS):
  	$(SHELL) ${srcdir}/mkdirs.sh $@
diff --git a/editors/xvile/patches/patch-ab b/editors/xvile/patches/patch-ab
index a53bdbae484..8963ed23666 100644
--- a/editors/xvile/patches/patch-ab
+++ b/editors/xvile/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2000/09/06 08:16:16 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2002/11/27 11:03:32 agc Exp $
 
 --- filters/makefile.in.orig	Sun Oct 10 21:06:52 1999
 +++ filters/makefile.in	Wed Sep  6 03:52:09 2000
-@@ -34,7 +34,7 @@
+@@ -38,7 +38,7 @@
  
  libdir		= @libdir@
- bindir		= @VILE_LIBDIR_PATH@
+ bindir		= @filters_bindir@
 -datadir		= @datadir@/vile
 +datadir		= @datadir@