Update the vile 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, some
major portability improvements have been made, and remove pkgsrc
patch-ac

"+ work around NetBSD 1.5's use of MK symbol in curses.h (reported by
 Matthias Buelow)."

6 files changed, 82 insertions, 50 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index dfde390d6f2..e8d3cd1d9ea 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2002/10/25 17:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2002/11/27 10:45:04 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 
-DISTNAME=		vile-9.0
+DISTNAME=		vile-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/vile/PLIST b/editors/vile/PLIST
index ccab780aea6..d8c87472b21 100644
--- a/editors/vile/PLIST
+++ b/editors/vile/PLIST
@@ -1,18 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:24:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/27 10:45:04 agc Exp $
 bin/vile
 bin/vile-pager
 bin/vileget
 libexec/vile/vile-ada-filt
 libexec/vile/vile-awk-filt
+libexec/vile/vile-basic-filt
 libexec/vile/vile-bat-filt
 libexec/vile/vile-c-filt
+libexec/vile/vile-cfg-filt
 libexec/vile/vile-crypt
+libexec/vile/vile-cweb-filt
 libexec/vile/vile-dcl-filt
+libexec/vile/vile-def-filt
 libexec/vile/vile-diff-filt
+libexec/vile/vile-ecl-filt
+libexec/vile/vile-esql-filt
 libexec/vile/vile-fdl-filt
 libexec/vile/vile-html-filt
+libexec/vile/vile-imake-filt
+libexec/vile/vile-key-filt
 libexec/vile/vile-latex-filt
 libexec/vile/vile-lex-filt
+libexec/vile/vile-lisp-filt
 libexec/vile/vile-m4-filt
 libexec/vile/vile-mail-filt
 libexec/vile/vile-make-filt
@@ -21,18 +30,26 @@ libexec/vile/vile-mms-filt
 libexec/vile/vile-nr-filt
 libexec/vile/vile-pas-filt
 libexec/vile/vile-perl-filt
+libexec/vile/vile-pl-filt
 libexec/vile/vile-py-filt
+libexec/vile/vile-rc-filt
 libexec/vile/vile-rcs-filt
+libexec/vile/vile-rexx-filt
 libexec/vile/vile-sccs-filt
+libexec/vile/vile-sed-filt
 libexec/vile/vile-sh-filt
+libexec/vile/vile-sml-filt
 libexec/vile/vile-spell-filt
 libexec/vile/vile-sql-filt
+libexec/vile/vile-tags-filt
 libexec/vile/vile-tbl-filt
 libexec/vile/vile-tc-filt
 libexec/vile/vile-tcl-filt
 libexec/vile/vile-ti-filt
 libexec/vile/vile-txt-filt
 libexec/vile/vile-vile-filt
+libexec/vile/vile-vlog-filt
+libexec/vile/vile-xres-filt
 libexec/vile/vile-xs-filt
 libexec/vile/vile-yacc-filt
 man/man1/vile.1
@@ -44,12 +61,20 @@ share/examples/vile/spell.rc
 share/examples/vile/visvile.rc
 share/vile/ada.keywords
 share/vile/awk.keywords
+share/vile/basic.keywords
 share/vile/bat.keywords
 share/vile/c.keywords
+share/vile/color-ls.rc
+share/vile/cpp.keywords
 share/vile/csh.keywords
+share/vile/cweb.keywords
+share/vile/dates.rc
 share/vile/dcl.keywords
+share/vile/def.keywords
 share/vile/diff.keywords
 share/vile/digraphs.rc
+share/vile/ecl.keywords
+share/vile/esql.keywords
 share/vile/fdl.keywords
 share/vile/filters.rc
 share/vile/html.keywords
@@ -65,41 +90,59 @@ share/vile/manpage.rc
 share/vile/nr.keywords
 share/vile/palettes.rc
 share/vile/pas.keywords
+share/vile/pc.keywords
 share/vile/perl.keywords
+share/vile/perl/Breadcrumbs.pm
+share/vile/perl/CaptHook.pm
+share/vile/perl/Glob2re.pm
+share/vile/perl/Help.pm
 share/vile/perl/Vile.pm
+share/vile/perl/Vile/Exporter.pm
+share/vile/perl/Vile/Manual.pm
 share/vile/perl/Vileserv.pm
-share/vile/perl/dir.pl
-share/vile/perl/glob2re.pl
-share/vile/perl/hgrep.pl
-share/vile/perl/hilite.pl
-share/vile/perl/lock.pl
-share/vile/perl/manfilt.pl
+share/vile/perl/Visit.pm
+share/vile/perl/capture.pm
+share/vile/perl/dict.pm
+share/vile/perl/directory.pm
+share/vile/perl/dirlist.pm
+share/vile/perl/gdb.pm
+share/vile/perl/hgrep.pm
+share/vile/perl/lock.pm
+share/vile/perl/man.pm
 share/vile/perl/mime.pl
 share/vile/perl/plugins.pl
-share/vile/perl/search.pl
-share/vile/perl/shell.pl
-share/vile/perl/spell.pl
-share/vile/perl/syntax.pl
-share/vile/perl/tailf.pl
-share/vile/perl/visit.pl
+share/vile/perl/search.pm
+share/vile/perl/shell.pm
+share/vile/perl/spell.pm
+share/vile/perl/winops.pm
 share/vile/pictmode.rc
 share/vile/pot.keywords
 share/vile/py.keywords
+share/vile/rc.keywords
 share/vile/rcs.keywords
+share/vile/rexx.keywords
 share/vile/sccs.keywords
 share/vile/sh.keywords
+share/vile/shifts.rc
+share/vile/sml.keywords
 share/vile/spell.rc
 share/vile/sql.keywords
+share/vile/tags.keywords
 share/vile/tbl.keywords
 share/vile/tc.keywords
 share/vile/tcl.keywords
 share/vile/ti.keywords
+share/vile/vb.keywords
 share/vile/vile.hlp
 share/vile/vile.keywords
 share/vile/vileinit.rc
 share/vile/vileperl.rc
+share/vile/vim.keywords
+share/vile/vlog.keywords
+share/vile/xres.keywords
 share/vile/xs.keywords
 share/vile/yacc.keywords
+@dirrm share/vile/perl/Vile
 @dirrm share/vile/perl
 @dirrm share/vile
 @dirrm share/examples/vile
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index b66d5d847a9..7f0ffb27c4a 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/11/27 10:45:04 agc Exp $
 
-SHA1 (vile-9.0.tgz) = b3f5f73770e0da6abe02406cb37407b5a5122dc9
-Size (vile-9.0.tgz) = 1192412 bytes
-SHA1 (patch-aa) = 684c7f6476f1d15fef2ef0858f0a59a59e9d588e
-SHA1 (patch-ab) = 4ea9130185a572acbe7374a35d87f6809997ced5
-SHA1 (patch-ac) = 480dbadad6aa4dc01745118d5d295b24957c2846
+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/vile/patches/patch-aa b/editors/vile/patches/patch-aa
index 7f25f55660e..674a4315a9c 100644
--- a/editors/vile/patches/patch-aa
+++ b/editors/vile/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2000/09/06 08:16:15 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2002/11/27 10:45:04 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.5 2000/09/06 08:16:15 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.5 2000/09/06 08:16:15 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/vile/patches/patch-ab b/editors/vile/patches/patch-ab
index 8369b096036..b7f8aa646ab 100644
--- a/editors/vile/patches/patch-ab
+++ b/editors/vile/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2000/09/06 08:16:15 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/11/27 10:45:04 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@
  
diff --git a/editors/vile/patches/patch-ac b/editors/vile/patches/patch-ac
deleted file mode 100644
index c1bf3068f2c..00000000000
--- a/editors/vile/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/01/23 15:36:28 wiz Exp $
-
---- tcap.h.orig	Mon Feb 23 06:27:56 1998
-+++ tcap.h
-@@ -14,6 +14,7 @@
- #undef TRUE
- #undef FALSE
- #undef WINDOW		/* avoid conflict with <curses.h> or <term.h> */
-+#undef MK		/* avoid conflict with <curses.h> */
- 
- #if NEED_CURSES_H
- #  if HAVE_NCURSES_H