Update vile from 9.5r to 9.6.

Changes from the previous version:

Changes for vile 9.6 (released Thu Dec 27 2007)

	> Tom Dickey:
	+ update makefile.blc, adding charsets.c, eightbit.c and wcwidth.c
	+ build-fix for OS/2 IBM CSet (define a delay function for catnap).
	+ minor build-fixes for VMS:
	  + modify vmsbuild.com to simplify workaround for broken MMS 3.8
	  + provide dummy variables for xvile to reflect modularization changes
	    with respect to vmsvt.c
	+ documentation updates.
	+ minor fix to manfilt.c to pass-through UTF-8 codes by testing with
	  both iswprint() and isprint().

 20071224 (u)
	> Tom Dickey:
	+ separate vile's ttputc from termcap prototype to pass integer param
	  rather than just a char on Solaris.
	+ fix computation of columns needed to show UTF-8 codes in POSIX
	  locale.
	+ modify manfilt.c to provide UTF-8 output in a UTF-8 locale.
	+ minor fix to CF_FUNC_ICONV to link iconv on cygwin (noting that
	  cygwin has no useful locale support, it may someday).

 20071202 (t)
	> Tom Dickey:
	+ modify filters makefile "clean" rule to accommodate OSF/1 4.0D
	  whose make program leaves intermediate ".c" files for each lexer.
	+ change order of restore-flags and switch-buffer in
	  restore_buffer_state, avoiding an unnecessary prompt to discard
	  changes when attempting to read a buffer that cannot be read.
	+ increase a few table sizes to work with AIX 5.1 lex.
	+ modify check for lex version to avoid hanging on older platforms
	  where it would try to read from standard input even if it does not
	  recognize the option.

 20071125 (s)
	> Tom Dickey:
	+ several changes to provide usable Unicode support:
	  + add mode percent-utf8 to set a threshold for file-encoding mode
	    "auto" detection of UTF-16/UTF-32 files.
	  + file-encoding mode can be set to "auto", to detect UTF-16 files,
	    which are loaded as UTF-8.
	  + UTF-8 files are detected based on the file-encoding mode as well.
	  + Unicode values are displayed (where no locale controls) as "\uXXXX"
	    in 4 hexadecimal digits.
	  + add unicode-as-hex mode to override locale, forcing Unicode values
	    to display as "\uXXXX".
	  + for buffers with UTF-8 encoding, show illegal bytes as "\?XX".
	  + Unicode values can be inserted into buffers using ^VuXXXX form.
	  Limitations:
	  + terminal drivers support Unicode display in varying degrees:
	    + winvile - multicolumn characters, depends on font selection
	    + termcap/terminfo - relies on terminal emulator, knows about
	      multicolumn characters
	    + xvile - displays only single-column characters
	    + curses - depends on the curses library, e.g., ncursesw
	    + win32 console - not yet implemented
	  + combining characters are not combined.
	  + registers hold byte data, will show the UTF-8 encoding for data
	    rather than a \uXXXX (unless the file-encoding for [Registers]
	    is changed).
	  + some "characters" such as the report for yanked text is still
	    really a byte-count.
	  + inserting a \uXXXX into the minibuffer will display the UTF-8
	    encoding.
	  + regular expressions are not wide-character aware.
	  + UTF-16 and UTF-32 files are detected based on BOM and/or the
	    contents of the first line of the file.
	  + external syntax filters do not handle BOM or UTF-16, UTF-32.
	+ improve name-completion by saving/restoring the original window and
	  buffer when [Completions] closes, rather than the closest window.
	+ add output from rcshist to diffmode.
	+ add ".vbp" files to inimode.
	+ modify configure script to omit lex-filt.l from build if lex is not
	  really flex, since the tables are too large for the older program.
	+ modify spell.pm to use a temporary file to work with newer Perl's
	  that do not handle tied variables exactly as filehandles.
	+ update Kevin Buettner's email address.
	+ add -class option to xvile.
	+ remove a redundant XtDestroyWidget() from x_close() to quiet a
	  warning from XtRemoveGrab() when doing a ":q" from Xm-vile
	  (report by Chris Green).
	+ use va_copy() in dofmt() to work with Linux on powerpc
	  (report by Paul van Tilburg).
	+ add docbookmode
	+ improve 9.5m/9.5q check for file ownership, adding a warning message
	  for files which are ignored (report by Chris Green).
	+ change default for --with-locale configure option to mesh with
	  --disable-extensions.
	+ improve paste-performance in winvile by passing whole-line chunks
	  to the insert-function.
	+ improved cppmode's identifier-expr (report by Gerry Fredette).
	+ correct order of evaluation from 9.4w when setting record-separator,
	  which was setting "crlf" ending temporarily when computing the buffer
	  size, even when "lf" was intended.  That would cause an immediate
	  write from winvile (without change) for a buffer to write too many
	  characters.
	+ add syntax filter conffilt.l, for "ordinary" config-files.
	+ add "rectangle-insert-mode".
	+ fill in several omitted items in init_mode_value().
	+ add "describe-&functions" and "describe-$variables" commands.
	  (The latter is a stub for later).
	+ improve repainting in winvile while processing external command.
	  also modify keyboard handling to provide type-ahead while processing
	  external command.
	+ remove obsolete $tpause variable.
	+ modify majormode inferencing to check preamble for [Standard Input]
	  and [Output] buffers.
	+ add "&gtmotion" function for scripts.
	+ improve handling of enumerated values by forcing all to lowercase,
	  e.g., to eliminate the need for the special case in 9.1x to handle
	  "TRUE" and "true".
	+ revise lstrinsert() and associated logic which implements changes
	  to rectangles, e.g., with c^Aq, to ensure that it pads the change
	  with blanks rather than nulls (report by Paul van Tilburg).
	+ improve modeline support by ignoring strict "vi" modeline options
	  that are not recognized by vile, rather than reporting an error.
	+ use new module blist (binary search of lists) to reduce linear
	  searches in the places where btree is not already used.
	+ change rename-other-buffer command to other-buffer-rename, to avoid
	  name-completion conflict with rename-command (feedback from Steve
	  Lembark).
	+ remove obsolete check for ANSI qsort.
	+ improve vilefilt.l, highlighting mode names and displaying error
	  for unknown mode, function and state variables.
	+ fix typo in manpage.rc which broke use of pod2man in 9.5m
	+ add &pquote in manpage.rc, to allow it to format html output when
	  vile-manfilt, etc., reside in directories containing spaces in their
	  name.
	+ add ".reg" filetypes to inimode.
	+ add several package-related suffixes to sqlmode.
	+ add xpmmode

3 files changed, 9 insertions, 72 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index b5c8e9ee711..da88d32cd50 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,22 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2007/10/14 06:26:16 obache Exp $
+# $NetBSD: Makefile,v 1.51 2008/01/05 14:58:42 agc Exp $
 
-DISTNAME=		vile-9.5
-PKGNAME=		${DISTNAME}r
+DISTNAME=		vile-9.6
 CATEGORIES=		editors
 MASTER_SITES=		ftp://invisible-island.net/vile/ \
 			ftp://ftp.phred.org/pub/vile/
-DIST_SUBDIR=		vile
 EXTRACT_SUFX=		.tgz
 
-PATCH_SITES=		${MASTER_SITES:=patches/}
-PATCHFILES+=		vile-9.5a.patch.gz vile-9.5b.patch.gz vile-9.5c.patch.gz
-PATCHFILES+=		vile-9.5d.patch.gz vile-9.5e.patch.gz vile-9.5f.patch.gz
-PATCHFILES+=		vile-9.5g.patch.gz vile-9.5h.patch.gz vile-9.5i.patch.gz
-PATCHFILES+=		vile-9.5j.patch.gz vile-9.5k.patch.gz vile-9.5l.patch.gz
-PATCHFILES+=		vile-9.5m.patch.gz vile-9.5n.patch.gz vile-9.5o.patch.gz
-PATCHFILES+=		vile-9.5p.patch.gz vile-9.5q.patch.gz vile-9.5r.patch.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://invisible-island.net/vile/
 COMMENT=		VI Like Emacs.  a vi "workalike", with many additional features
diff --git a/editors/vile/PLIST b/editors/vile/PLIST
index 334b1a75a5e..e16287f8d3d 100644
--- a/editors/vile/PLIST
+++ b/editors/vile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/10/14 06:26:16 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/01/05 14:58:42 agc Exp $
 bin/vile
 bin/vile-pager
 bin/vileget
@@ -15,6 +15,7 @@ libexec/vile/vile-bat-filt
 libexec/vile/vile-bnf-filt
 libexec/vile/vile-c-filt
 libexec/vile/vile-cfg-filt
+libexec/vile/vile-conf-filt
 libexec/vile/vile-crypt
 libexec/vile/vile-css-filt
 libexec/vile/vile-cweb-filt
@@ -115,6 +116,7 @@ share/vile/doc/modes.doc
 share/vile/doc/oleauto.doc
 share/vile/doc/perl.doc
 share/vile/doc/visvile.doc
+share/vile/docbook.keywords
 share/vile/ecl.keywords
 share/vile/esql.keywords
 share/vile/est.keywords
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index a7e1d6b7be9..34bc5950937 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,61 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/10/14 04:53:35 obache Exp $
+$NetBSD: distinfo,v 1.9 2008/01/05 14:58:42 agc Exp $
 
-SHA1 (vile/vile-9.5.tgz) = 3862bf082ccb4afca4d08bc6a26448556200b483
-RMD160 (vile/vile-9.5.tgz) = 3e7f0dd9eb75782c2fb32a92debfb63ae741ae49
-Size (vile/vile-9.5.tgz) = 1656429 bytes
-SHA1 (vile/vile-9.5a.patch.gz) = a0fbc470a054fa8066d111592c9366d85df1ae92
-RMD160 (vile/vile-9.5a.patch.gz) = d6e10a70fd8128ff60c304b0b9dc786dbafda3ae
-Size (vile/vile-9.5a.patch.gz) = 89872 bytes
-SHA1 (vile/vile-9.5b.patch.gz) = 5230aed00906644fa902c64202dc12dfb37a52b1
-RMD160 (vile/vile-9.5b.patch.gz) = c9b3c7814608f17f1cd82fb7596674f8127fb0c8
-Size (vile/vile-9.5b.patch.gz) = 12662 bytes
-SHA1 (vile/vile-9.5c.patch.gz) = 8c69ed6552fd760f6a259605ef103a34af35f1d5
-RMD160 (vile/vile-9.5c.patch.gz) = 16858d91b9b395a3ce0c72af310d910f091f7431
-Size (vile/vile-9.5c.patch.gz) = 40916 bytes
-SHA1 (vile/vile-9.5d.patch.gz) = a56b0034b314f280fc6fb77982dca4d66f43fd18
-RMD160 (vile/vile-9.5d.patch.gz) = ac798eba061ccd477ff2149982a9b07d8641ce82
-Size (vile/vile-9.5d.patch.gz) = 10843 bytes
-SHA1 (vile/vile-9.5e.patch.gz) = c7a8f35f5d60eafaae9fd6167bdbae446c415801
-RMD160 (vile/vile-9.5e.patch.gz) = c2df18bce6ee02ba7891a95d08bd07a96153b1c9
-Size (vile/vile-9.5e.patch.gz) = 20892 bytes
-SHA1 (vile/vile-9.5f.patch.gz) = a492c9d1af69c35ae54e88985399ccc85bc7ab20
-RMD160 (vile/vile-9.5f.patch.gz) = 8e583a464046ef2ace5112f599bab036e4d29bb5
-Size (vile/vile-9.5f.patch.gz) = 38678 bytes
-SHA1 (vile/vile-9.5g.patch.gz) = 155108c319c38a72b100d05e4a3081a074348724
-RMD160 (vile/vile-9.5g.patch.gz) = f38cf6a5763caee2212c8ff03730afd98e625a8a
-Size (vile/vile-9.5g.patch.gz) = 5986 bytes
-SHA1 (vile/vile-9.5h.patch.gz) = 4da6908efd8026edd0d2906fb4e3f2a56386ef67
-RMD160 (vile/vile-9.5h.patch.gz) = 468555c218132a6b36fe1106ad203db24a581c1d
-Size (vile/vile-9.5h.patch.gz) = 106810 bytes
-SHA1 (vile/vile-9.5i.patch.gz) = 630bee24995d67ac0132cb2dd8fc62888b9db356
-RMD160 (vile/vile-9.5i.patch.gz) = a672c8d95e5e2252882103b695c63a85989dd430
-Size (vile/vile-9.5i.patch.gz) = 6280 bytes
-SHA1 (vile/vile-9.5j.patch.gz) = 80142b5839cc6a730060b5209aceb330f5ab4645
-RMD160 (vile/vile-9.5j.patch.gz) = ac799e5c70ebed964a980eba1ff24bb0ef52b201
-Size (vile/vile-9.5j.patch.gz) = 51371 bytes
-SHA1 (vile/vile-9.5k.patch.gz) = fb63f363474dabc0839d60e3871257285cf840a4
-RMD160 (vile/vile-9.5k.patch.gz) = 10a25334f6343e690f95fbf973e1599648093db1
-Size (vile/vile-9.5k.patch.gz) = 54579 bytes
-SHA1 (vile/vile-9.5l.patch.gz) = 9cad74b03d4fbd57226c357db399482d7b17fefb
-RMD160 (vile/vile-9.5l.patch.gz) = 81960469fae9223fb3511f065a6e7b7c10f58bd6
-Size (vile/vile-9.5l.patch.gz) = 72311 bytes
-SHA1 (vile/vile-9.5m.patch.gz) = 06324852077d2ea6882d7922a0c6f95e0c03a4f2
-RMD160 (vile/vile-9.5m.patch.gz) = 29bc68d609098d8514594890e3d755835cf093a8
-Size (vile/vile-9.5m.patch.gz) = 68864 bytes
-SHA1 (vile/vile-9.5n.patch.gz) = 374a9993f9654b8de2d1d55f41f39031ddb78791
-RMD160 (vile/vile-9.5n.patch.gz) = 216270c6f1791387cbe713b34c4b75c3ef05cbc6
-Size (vile/vile-9.5n.patch.gz) = 72458 bytes
-SHA1 (vile/vile-9.5o.patch.gz) = f82189aa639993756667f301ade369d71ebaf55b
-RMD160 (vile/vile-9.5o.patch.gz) = eef08c4a6a99add003822d9fb539a3a2c817c246
-Size (vile/vile-9.5o.patch.gz) = 18113 bytes
-SHA1 (vile/vile-9.5p.patch.gz) = 713a45a39c75026b2bd5657eb1de30502decb55b
-RMD160 (vile/vile-9.5p.patch.gz) = d5cfbd0005080bcbed58173b9f76b2d7b07f49bd
-Size (vile/vile-9.5p.patch.gz) = 10993 bytes
-SHA1 (vile/vile-9.5q.patch.gz) = c1ec7753396d4b3cb4c5e06e9120246f93b1172e
-RMD160 (vile/vile-9.5q.patch.gz) = c38a2cbd91cda25065c346c7da3706b0a73186f3
-Size (vile/vile-9.5q.patch.gz) = 107182 bytes
-SHA1 (vile/vile-9.5r.patch.gz) = 0cd770452ef074cfcf6fa7e6320d7cb7ad6a7e9e
-RMD160 (vile/vile-9.5r.patch.gz) = 23b6fdb05c000b617ad52f0e440389e9d2e84421
-Size (vile/vile-9.5r.patch.gz) = 61798 bytes
+SHA1 (vile-9.6.tgz) = b588582e5fc6516453b4b47e1e2b693336d36d2f
+RMD160 (vile-9.6.tgz) = 1577ab756c1018b7c0aca9c6120707e6e165f9c6
+Size (vile-9.6.tgz) = 1773866 bytes
 SHA1 (patch-aa) = 90ea8d0e9cdde45c1708562a54009e2064c4886d
 SHA1 (patch-ab) = 795c377290028995d0909148c3584dd821102b8a