Update to 9.4 (that version works with perl-5.8).

Changes:
Highlights since 9.3:

    + Bug fixes, lots.  See the CHANGES file for details.

General changes
===============

    + regular expressions and searches allow null characters.

    + minibuffer editing commands are more complete, implementing all of the
      inline cursor search- and motion-commands.

    + implement new editing commands in the minibuffer:  r, ~, x, X.

    + use insert-mode bindings when mini-edit mode is active.  Use insert-key
      to toggle, rather than set mini-edit mode.

    + modify buffer- and filename-completion on Unix to escape backslashes
      which are stored in the [Completions] buffer.  Doing this allows one
      to complete a buffer or filename containing a backslash.

    + improve history-editing by quoting tokens which contain embedded blanks
      or other special characters, using that to retrieve tokens from the
      history buffer unambiguously.

    + save/restore window modes such as linewrap when rereading a file,
      or when executing a shell command.

    + use realpath() if it is available, and "$VILE_PWD" environment variable
      rather than "." as parameter to getcwd() if it is valid, to speed up
      operation on quasi-filesystems such as ClearCase.

    + add configure option --with-screen=XawPlus for XawPlus library.

    + add configure option --with-screen=ncursesw to allow building the
      curses driver using the wide-character version of ncurses.

    + add check in tcap.c for terminfo kmous capability like xterm, in case
      we are running in screen, which also supports xterm mouse protocol.

    + modify support for "^X-e" to make it use the whole line if the current
      buffer is a directory.


Locale Improvements
===================

    + change default for --with-locale option to yes.  Note that this
      option is only tested if locale support is found, and it is becoming
      less common to encounter systems with broken locale support.

    + add "locale" to the "$cfgopts" variable if vile is compiled with
      locale support.

    + modify vile-manfilt to decode UTF-8 emitted by groff 1.18

    + in UTF-8 locale, adjust termcap driver to use UTF-8 to display codes
      in the 160-255 range, setting vile's locale to non-UTF-8 locale.
      (yes, this is a short-term fix).

    + add configure check for wctype functions, to work around defect in
      glibc's ctype functions: in UTF-8 locale, the latter return useless
      information on character classes.  This works on Solaris.

    + move upper/lower case-conversion into tables so that locale support can
      augment the built-in translation.


New Commands
============

    + "which-keywords" macro shows the location of files containing keywords
      for the given majormode.

    + "edit-buffer" simplifies "which-keywords" and similar macros.

    + "encode-attributes-til" and "write-encoded-til" convert the syntax
      highlighting in a region back to control/A sequences, or write the
      corresponding data to a file.  There is a corresponding alias
      "decode-attributes-til" for "attribute-cntl_a-sequences-til".

    + "substitute-all-til" implements the "^X-s" binding.


New Modes
=========

    + add "overlap-matches" mode, to control whether highlighting for the
      visual-matches mode should skip to the next character, or past the
      current match when checking.

    + add "percent-crlf" mode, which controls the threshold at which the
      whole file will be considered DOS-format (CRLF record separators)
      if the given percentage already ends with CR/LF.

    + "yankmotion" mode controls whether the cursor should be moved as in vi
      after yanking text.

    + add "xterm-title" mode.

    + add logmode majormode, to distinguish some makefiles from logfiles.

    + add "texmode" majormode, as a variation of latexmode.


New Variables and Functions
===========================

    + add several short-named relational operators "&geq", "&gt", "&leq",
      "&lt", "&neq", "&sgeq", "&sgt", "&sleq", "&slt", "&sneq" to reduce
      the need for "&not".

    + add "$pathname-separator" variable.


Syntax Filters
==============

    + add Ruby syntax filter.

    + add syntax filter for rpm ".spec" files.

    + add syntax filter for PostScript ".ps" files.

    + add syntax filter for enscript ".st" files.

    + add xml-filter based on html-filter.

    + add pot-filt.l, to highlight ".po" files.  Using sh-filt.l was
      not satisfactory since the quoting rules were not close enough.

    + add syntax filters and corresponding modes for assembler (GNU and M$),
      info and texinfo.

    + add -j option to c-filt.c, to implement some java-specific features
      such as "$" as part of an identifier, and \u escapes.

    + add un-filters (atr2ansi, atr2html, atr2text) which convert encoded
      control/A text to different forms.

    + modify spell.rc, spellflt.l and select.c to allow spell filter to
      work as a built-in filter.

    + modify built-in spell filter to work with encrypted files.

    + add a -t option to filters, to pass tabstop value.  Use this in
      makefilt.l to provide better highlighting of problems with leading
      whitespace.

    + modify manpage.rc to check if the current buffer is perl, and if so,
      to render contents using pod2man or pod2text.

    + set "vilemode" for [History] buffer.

    + reorder lex-based filters to allow building with flex 2.5.31, which
      introduces several incompatibilities with respect to flex 2.5.4
      and lex.

    + add configure check/warning for flex 2.5.31, which has broken support
      for the "-P" option used for built-in filters.

4 files changed, 50 insertions, 25 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index a574e5e067a..cea5c10b0a8 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2004/01/28 15:55:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.39 2004/03/22 11:48:39 wiz Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
-DISTNAME=		vile-9.3
-PKGNAME=		xvile-9.3
-PKGREVISION=		1
+DISTNAME=		vile-9.4
+PKGNAME=		xvile-9.4
 CATEGORIES=		editors
 MASTER_SITES=		ftp://dickey.his.com/vile/ \
 			ftp://invisible-island.net/vile/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://dickey.his.com/vile/vile.html
 COMMENT=		VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
 
 USE_BUILDLINK2=		# defined
@@ -21,10 +21,6 @@ CONFIGURE_ARGS+=	--with-perl
 CONFIGURE_ARGS+=	--datadir=${DATADIR}
 CONFIGURE_ARGS+=	--with-libdir-path=${FILTERDIR}
 
-# Until the source catches up to the current Perl API, we need PERL_POLLUTE
-# to look like an older perl.
-CPPFLAGS+=		-DPERL_POLLUTE=1
-
 MAKEFILE=		makefile
 INSTALL_TARGET=		install install-perl
 
diff --git a/editors/xvile/PLIST b/editors/xvile/PLIST
index deea371c595..cdf7ea6f14b 100644
--- a/editors/xvile/PLIST
+++ b/editors/xvile/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/27 11:03:31 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/22 11:48:39 wiz Exp $
 bin/xshell.sh
 bin/xvile
 bin/xvile-pager
 bin/xvileget
+libexec/xvile/atr2ansi
+libexec/xvile/atr2html
+libexec/xvile/atr2text
 libexec/xvile/vile-ada-filt
+libexec/xvile/vile-as-filt
+libexec/xvile/vile-asm-filt
 libexec/xvile/vile-awk-filt
 libexec/xvile/vile-basic-filt
 libexec/xvile/vile-bat-filt
@@ -16,9 +21,11 @@ libexec/xvile/vile-def-filt
 libexec/xvile/vile-diff-filt
 libexec/xvile/vile-ecl-filt
 libexec/xvile/vile-esql-filt
+libexec/xvile/vile-est-filt
 libexec/xvile/vile-fdl-filt
 libexec/xvile/vile-html-filt
 libexec/xvile/vile-imake-filt
+libexec/xvile/vile-info-filt
 libexec/xvile/vile-key-filt
 libexec/xvile/vile-latex-filt
 libexec/xvile/vile-lex-filt
@@ -32,10 +39,15 @@ libexec/xvile/vile-nr-filt
 libexec/xvile/vile-pas-filt
 libexec/xvile/vile-perl-filt
 libexec/xvile/vile-pl-filt
+libexec/xvile/vile-pot-filt
+libexec/xvile/vile-ps-filt
 libexec/xvile/vile-py-filt
+libexec/xvile/vile-rb-filt
 libexec/xvile/vile-rc-filt
 libexec/xvile/vile-rcs-filt
 libexec/xvile/vile-rexx-filt
+libexec/xvile/vile-rpm-filt
+libexec/xvile/vile-ruby-filt
 libexec/xvile/vile-sccs-filt
 libexec/xvile/vile-sed-filt
 libexec/xvile/vile-sh-filt
@@ -46,10 +58,12 @@ libexec/xvile/vile-tags-filt
 libexec/xvile/vile-tbl-filt
 libexec/xvile/vile-tc-filt
 libexec/xvile/vile-tcl-filt
+libexec/xvile/vile-texi-filt
 libexec/xvile/vile-ti-filt
 libexec/xvile/vile-txt-filt
 libexec/xvile/vile-vile-filt
 libexec/xvile/vile-vlog-filt
+libexec/xvile/vile-xml-filt
 libexec/xvile/vile-xres-filt
 libexec/xvile/vile-xs-filt
 libexec/xvile/vile-yacc-filt
@@ -61,6 +75,9 @@ share/examples/xvile/pictmode.rc
 share/examples/xvile/spell.rc
 share/examples/xvile/visvile.rc
 share/xvile/ada.keywords
+share/xvile/as.keywords
+share/xvile/as386.keywords
+share/xvile/asm.keywords
 share/xvile/awk.keywords
 share/xvile/basic.keywords
 share/xvile/bat.keywords
@@ -76,14 +93,17 @@ share/xvile/diff.keywords
 share/xvile/digraphs.rc
 share/xvile/ecl.keywords
 share/xvile/esql.keywords
+share/xvile/est.keywords
 share/xvile/fdl.keywords
 share/xvile/filters.rc
+share/xvile/gnugpg.rc
 share/xvile/html.keywords
 share/xvile/imake.keywords
 share/xvile/java.keywords
 share/xvile/js.keywords
 share/xvile/latex.keywords
 share/xvile/lex.keywords
+share/xvile/loaderrs.rc
 share/xvile/m4.keywords
 share/xvile/mail.keywords
 share/xvile/make.keywords
@@ -118,20 +138,27 @@ share/xvile/perl/spell.pm
 share/xvile/perl/winops.pm
 share/xvile/pictmode.rc
 share/xvile/pot.keywords
+share/xvile/ps.keywords
 share/xvile/py.keywords
+share/xvile/rb.keywords
 share/xvile/rc.keywords
 share/xvile/rcs.keywords
 share/xvile/rexx.keywords
+share/xvile/rpm.keywords
 share/xvile/sccs.keywords
+share/xvile/search.rc
 share/xvile/sh.keywords
 share/xvile/shifts.rc
 share/xvile/sml.keywords
 share/xvile/spell.rc
 share/xvile/sql.keywords
+share/xvile/syntax.keywords
 share/xvile/tags.keywords
 share/xvile/tbl.keywords
 share/xvile/tc.keywords
 share/xvile/tcl.keywords
+share/xvile/tex.keywords
+share/xvile/texi.keywords
 share/xvile/ti.keywords
 share/xvile/vb.keywords
 share/xvile/vile.hlp
@@ -141,6 +168,8 @@ share/xvile/vilemenu.rc
 share/xvile/vileperl.rc
 share/xvile/vim.keywords
 share/xvile/vlog.keywords
+share/xvile/which.rc
+share/xvile/xml.keywords
 share/xvile/xres.keywords
 share/xvile/xs.keywords
 share/xvile/yacc.keywords
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index 6d52daf8d88..5528165a4b8 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/11/27 11:03:31 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/03/22 11:48:39 wiz Exp $
 
-SHA1 (vile-9.3.tgz) = 581efa183badd5c0abe68e118953229e2bb8403c
-Size (vile-9.3.tgz) = 1474140 bytes
-SHA1 (patch-aa) = a43641ec017b96c6d5999c5ad768e08f622b77e1
+SHA1 (vile-9.4.tgz) = 5b7f58a16799e8e021ffddb4e8e237023fab696b
+Size (vile-9.4.tgz) = 1549606 bytes
+SHA1 (patch-aa) = cfbefb53eb64535fd0fb6500ec7d84cf9f4c9762
 SHA1 (patch-ab) = 6ec9232a2b42e95f5a2b5c724deb3323d0a63cf3
diff --git a/editors/xvile/patches/patch-aa b/editors/xvile/patches/patch-aa
index 01e76c9cd58..9e20c393a73 100644
--- a/editors/xvile/patches/patch-aa
+++ b/editors/xvile/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2002/11/27 11:03:32 agc Exp $
+$NetBSD: patch-aa,v 1.8 2004/03/22 11:48:39 wiz Exp $
 
---- makefile.in.orig	Wed Nov 10 21:04:17 1999
-+++ makefile.in	Wed Sep  6 03:50:28 2000
-@@ -51,8 +51,8 @@
+--- makefile.in.orig	Sun May 25 21:34:47 2003
++++ makefile.in
+@@ -52,8 +52,8 @@ TARGET		= @TARGET@$x
  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}
+-INSTALL_SCRIPT	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
+-INSTALL_MODULE	= $(SHELL) $(srcdir)/sinstall.sh $(PERL) $(INSTALL_DATA)
++INSTALL_SCRIPT	= $(BSD_INSTALL_SCRIPT)
++INSTALL_MODULE	= $(BSD_INSTALL_DATA)
  
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@ exec_prefix	= @exec_prefix@
  manext		= 1
  libdir		= @libdir@
  bindir		= @bindir@
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.7 2002/11/27 11:03:32 agc Exp $
  perldir		= $(datadir)/perl
  mandir		= @mandir@/man$(manext)
  
-@@ -351,7 +351,6 @@
+@@ -356,7 +356,6 @@ INSTALL_MACRO_FILES = \
  
  INSTALL_PERL_DIRS = $(PERLDIR) $(PERLDIR)/Vile
  INSTALL_PERL_FILES = \
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.7 2002/11/27 11:03:32 agc Exp $
  	$(PERLDIR)/Breadcrumbs.pm \
  	$(PERLDIR)/CaptHook.pm \
  	$(PERLDIR)/Glob2re.pm \
-@@ -623,7 +622,7 @@
+@@ -635,7 +634,7 @@ $(BINDIR)/$(TARGET):		$(TARGET)
  	$(INSTALL_PROGRAM)	$(TARGET) $@
  
  $(BINDIR)/xshell.sh:		$(srcdir)/xshell.sh
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.7 2002/11/27 11:03:32 agc Exp $
  $(BINDIR)/vileget:		$(srcdir)/perl/vileget
  	$(INSTALL_SCRIPT)	$(srcdir)/perl/vileget $@
  
-@@ -710,6 +709,9 @@
+@@ -730,6 +729,9 @@ $(PERLDIR)/winops.pm:		$(srcdir)/perl/wi
  
  $(INSTALL_DIRS):
  	$(SHELL) ${srcdir}/mkdirs.sh $@