Update to version 5.2

While here update my email address.

List of changes for version 5.2:
* Portability fixes [HP-UX, Solaris, VMS, OS/2].
* Made code compilable by a C++ compiler.
* Changed reading of option files to ignore blank lines.
* Changed and enhanced interface to readtags library (see readtags.h).
* Changed from using addLanguageRegex() to addTagRegex() in regex-based
  parsers.
* Added support for Lua language, submitted by Max Ischenko.
* Added instructions to man page on using tags with NEdit.
* Added setargv.obj to link for wildcard expansion [MSVC].
* Added capability to have regex invoke a callback in a regex parser.
* Fixed regex tag problem which left newlines in back-references.
* Fixed missing class-qualified tags [Eiffel].
* Fixed spurious tags for entries in final indexing clause [Eiffel].
* Fixed problem with invalid filenames in preprocessor line directives.
* Fixed bug parsing scoped variables (e.g. "b:variable") [Vim, Bug #487608].
* Fixed problem compiling readtags.c on some hosts.
* Fixed memory overwrite problem in readtags library.

3 files changed, 72 insertions, 59 deletions

diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index a800b236a10..c3ddc27d62f 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2001/11/13 15:23:23 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/23 11:48:29 seb Exp $
 #
 
-DISTNAME=	ctags-5.1
+DISTNAME=	ctags-5.2
 PKGNAME=	ex${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctags/}
 
-MAINTAINER=	seb@pbox.org
+MAINTAINER=	seb@netbsd.org
 HOMEPAGE=	http://ctags.sourceforge.net/
 COMMENT=	Exuberant (feature-filled) tagfile generator for vi, emacs and clones
 
diff --git a/devel/exctags/distinfo b/devel/exctags/distinfo
index 35f9c3ade99..25d677d8553 100644
--- a/devel/exctags/distinfo
+++ b/devel/exctags/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/11/13 15:23:24 seb Exp $
+$NetBSD: distinfo,v 1.3 2002/01/23 11:48:29 seb Exp $
 
-SHA1 (ctags-5.1.tar.gz) = a3a58b324e8faee1a2a8a998fc196eff411e09ce
-Size (ctags-5.1.tar.gz) = 215187 bytes
+SHA1 (ctags-5.2.tar.gz) = 63da625a97775d172b77d08573b1255085a279de
+Size (ctags-5.2.tar.gz) = 220888 bytes
 SHA1 (patch-aa) = bc41ca1e2fe101c1f5f4335578bde4b3c06a7543
-SHA1 (patch-ab) = 1afe5f8425111b6b95b9e3dd72a193d4100063bf
+SHA1 (patch-ab) = 1f4ffad9dff721636c6fcd74f05a5649b156da83
diff --git a/devel/exctags/patches/patch-ab b/devel/exctags/patches/patch-ab
index 0f45ec07103..27166bf23c4 100644
--- a/devel/exctags/patches/patch-ab
+++ b/devel/exctags/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/23 11:48:30 seb Exp $
 
---- ctags.1.orig	Wed Nov  7 05:43:05 2001
+--- ctags.1.orig	Mon Dec 24 00:53:18 2001
 +++ ctags.1
 @@ -1,27 +1,27 @@
--.TH CTAGS 1 "Version 5.1" "Darren Hiebert"
-+.TH EXCTAGS 1 "Version 5.1" "Darren Hiebert"
+-.TH CTAGS 1 "Version 5.2" "Darren Hiebert"
++.TH EXCTAGS 1 "Version 5.2" "Darren Hiebert"
  
  
  .SH "NAME"
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  different languages. For a complete list of supported languages, the names
  by which they are recognized, and the kinds of tags which are generated for
  each, see \fBTAG KINDS\fP, below.
-@@ -136,8 +136,8 @@
+@@ -139,8 +139,8 @@
  .RE
  
  By default, all other files names are ignored. This permits running
@@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  files whose names are mapped to languages will be scanned.
  
  The reason that .h extensions are mapped to C++ files rather than C files
-@@ -147,8 +147,8 @@
+@@ -150,8 +150,8 @@
  
  .SH "OPTIONS"
  
@@ -68,7 +68,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  which will create a tag file in the current directory for all recognized
  source files. The options described below are provided merely to allow custom
  tailoring to meet special needs.
-@@ -184,7 +184,7 @@
+@@ -187,7 +187,7 @@
  .TP 5
  .B \-e
  Enable etags mode, which will create a tag file for use with the Emacs editor.
@@ -77,7 +77,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  "etags" (either by renaming, or creating a link to, the executable), etags
  mode will be enabled. This option must appear before the first file name.
  
-@@ -192,10 +192,10 @@
+@@ -195,10 +195,10 @@
  .BI \-f " tagfile"
  Use the name specified by \fItagfile\fP for the tag file (default is "tags",
  or "TAGS" when running in etags mode). If \fItagfile\fP is specified as
@@ -90,7 +90,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  first C file with the tags generated by the rest! It will also refuse to
  accept a multicharacter file name which begins with a '-' (dash) character,
  since this most likely means that you left out the tag file name and this
-@@ -236,7 +236,7 @@
+@@ -239,7 +239,7 @@
  and C++ source files. This option is specifically provided to handle special
  cases arising through the use of preprocessor macros. When the tokens listed
  are simple tokens, these tokens will be ignored during parsing of the source
@@ -99,7 +99,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  ignore any parenthesis-enclosed argument list which may immediately follow the
  token in the source files. If two tokens are separated with the '=' character,
  the first token is replaced by the second token for parsing purposes. The list
-@@ -346,9 +346,9 @@
+@@ -349,9 +349,9 @@
  source line (with extra white space condensed) of the file which defines the
  tag. No tag file is written and all options affecting tag file output will be
  ignored. Example applications for this feature are generating a listing of all
@@ -111,24 +111,24 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  \fB--file-scope\fP=\fIno file\fP). This option must appear before the first
  file name.
  
-@@ -368,14 +368,14 @@
- .TP 5
+@@ -372,14 +372,14 @@
  \fB--exclude\fP=[\fIpattern\fP]
- Add \fIpattern\fP to a list of excluded files and directories. For each file
--name considered by \fBctags\fP, \fIpattern\fP will be compared against both
-+name considered by \fBexctags\fP, \fIpattern\fP will be compared against both
- the complete path (e.g. some/path/base.ext) and the base name (e.g. base.ext)
- of the file, thus allowing patterns which match a given file name irrespective
- of its path, or match only a specific path. If appropriate support is
- available from the runtime library of your C compiler, then \fIpattern\fP may
- contain the usual shell wildcards common on Unix (be sure to quote the option
- parameter to protect the wildcards from being expanded by the shell before
--being passed to \fBctags\fP; also be aware that wildcards can match the slash
-+being passed to \fBexctags\fP; also be aware that wildcards can match the slash
- character, '/'). You can determine if shell wildcards are available on your
- platfom by examining the output of the \fB--version\fP option, which will
- include "+wildcards" in the compiled feature list; otherwise, \fIpattern\fP
-@@ -538,7 +538,7 @@
+ Add \fIpattern\fP to a list of excluded files and directories. This option
+ may be specified as many times as desired. For each file name considered by
+-\fBctags\fP, each \fIpattern\fP specified using this option will be compared
++\fBexctags\fP, each \fIpattern\fP specified using this option will be compared
+ against both the complete path (e.g. some/path/base.ext) and the base name
+ (e.g. base.ext) of the file, thus allowing patterns which match a given file
+ name irrespective of its path, or match only a specific path. If appropriate
+ support is available from the runtime library of your C compiler, then
+ \fIpattern\fP may contain the usual shell wildcards (not regular expressions)
+ common on Unix (be sure to quote the option parameter to protect the wildcards
+-from being expanded by the shell before being passed to \fBctags\fP; also be
++from being expanded by the shell before being passed to \fBexctags\fP; also be
+ aware that wildcards can match the slash character, '/'). You can determine if
+ shell wildcards are available on your platfom by examining the output of the
+ \fB--version\fP option, which will include "+wildcards" in the compiled
+@@ -543,7 +543,7 @@
  
  .TP 5
  \fB--filter\fP[=\fIyes\fP|\fIno\fP]
@@ -137,7 +137,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  standard input and printing their tags to standard output on a file-by-file
  basis. If \fB--sorted\fP is enabled, tags are sorted only within the source
  file in which they are defined. File names are read from standard output in
-@@ -552,7 +552,7 @@
+@@ -557,7 +557,7 @@
  \fB--filter-terminator\fP=\fIstring\fP
  Specifies a string to print to standard output following the tags for each
  file name parsed when the \fB--filter\fP option is enabled. This may permit an
@@ -146,7 +146,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  file is finished. Note that if the file name read is a directory and
  \fB--recurse\fP is enabled, this string will be printed only one once at the
  end of all tags found for by descending the directory. This string will always
-@@ -623,7 +623,7 @@
+@@ -628,7 +628,7 @@
  support is available from the runtime library of your C compiler, then the
  file name pattern may contain the usual shell wildcards common on Unix (be
  sure to quote the option parameter to protect the wildcards from being
@@ -155,7 +155,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  if shell wildcards are available on your platfom by examining the output of
  the \fB--version\fP option, which will include "+wildcards" in the compiled
  feature list; otherwise, the file name patterns are matched against file names
-@@ -650,7 +650,7 @@
+@@ -655,7 +655,7 @@
  
  .TP 5
  \fB--language-force\fP=\fIlanguage\fP
@@ -164,7 +164,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  ignoring those files whose language cannot be determined (see
  \fBSOURCE FILES\fP, above). This option forces the specified \fIlanguage\fP
  (either built-in or user-defined) to be used for every supplied file instead
-@@ -686,7 +686,7 @@
+@@ -691,7 +691,7 @@
  Specifies whether "#line" directives should be recognized. These are present
  in the output of preprocessors and contain the line number, and possibly the
  file name, of the original source file(s) from which the preprocessor output
@@ -173,7 +173,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  generate tag entries marked with the file names and line numbers of their
  locations original source file(s), instead of their actual locations in the
  preprocessor output. The actual file names placed into the tag file will have
-@@ -697,7 +697,7 @@
+@@ -702,7 +702,7 @@
  generally only useful when used together with the \fB--excmd\fP=\fInumber\fP
  (\fB-n\fP) option. Also, you may have to use either the \fB--langmap\fP or
  \fB--language-force\fP option if the extension of the preprocessor output file
@@ -182,7 +182,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  
  .TP 5
  \fB--links\fP[=\fIyes\fP|\fIno\fP]
-@@ -714,7 +714,7 @@
+@@ -719,7 +719,7 @@
  list of supplied files is empty and no file list is specified with the
  \fB-L\fP option, then the current directory (i.e. ".") is assumed. Symbolic
  links are followed. If you don't like these behaviors, either explicitly
@@ -191,7 +191,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  instead. \fBNote:\fP This option is not supported on all platforms at present.
  It is available if the output of the \fB--help\fP option includes this option.
  See, also, the \fB--exclude\fP to limit recursion.
-@@ -764,7 +764,7 @@
+@@ -769,13 +769,13 @@
  .RE
  
  .RS 5
@@ -200,7 +200,14 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  support for regular expressions, which depends upon your platform. You can
  determine if support for regular expressions is compiled in by examining the
  output of the \fB--version\fP option, which will include "+regex" in the
-@@ -790,14 +790,14 @@
+ compiled feature list.
+ 
+-For more information on the regular expressionss used by \fBctags\fP, see
++For more information on the regular expressionss used by \fBexctags\fP, see
+ either the \fBregex(5,7)\fP man page, or the GNU info documentation for regex
+ (e.g. "info regex").
+ .RE
+@@ -799,14 +799,14 @@
  .TP 5
  \fB--totals\fP[=\fIyes\fP|\fIno\fP]
  Prints statistics about the source files read and the tag file written during
@@ -217,7 +224,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  until after options are read from the configuration files (see \fBFILES\fP,
  below) and the \fBCTAGS\fP environment variable. However, if this option is
  the first argument on the command line, it will take effect before any options
-@@ -805,7 +805,7 @@
+@@ -814,7 +814,7 @@
  
  .TP 5
  \fB--version\fP
@@ -226,7 +233,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  guaranteed to always contain the string "Exuberant Ctags".
  
  
-@@ -815,7 +815,7 @@
+@@ -824,7 +824,7 @@
  through use of the \fB--<LANG>-type\fP option. The flags corresponding to each
  tag kind for each langauge are described below. Note that some languages
  and/or tag kinds may be implemented using regular expressions and may not be
@@ -235,7 +242,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  \fB--regex-<LANG>\fP option). Kinds are enabled by default
  except where noted (with "[off]").
  
-@@ -1209,7 +1209,7 @@
+@@ -1229,7 +1229,7 @@
  
  .SH "OPERATIONAL DETAILS"
  
@@ -244,7 +251,13 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  language of the file by applying the following three tests in order: if the
  file extension has been mapped to a language, if the file name matches a shell
  pattern mapped to a language, and finally if the file is executable and its
-@@ -1225,9 +1225,9 @@
+@@ -1240,14 +1240,14 @@
+ the tag file for each language object it is written to handle. See
+ \fBTAG FILE FORMAT\fP, below, for details on these entries.
+ 
+-This implementation of \fBctags\fP imposes no formatting requirements on C
++This implementation of \fBexctags\fP imposes no formatting requirements on C
+ code as do legacy implementations. Older implementations of ctags tended to
  rely upon certain formatting assumptions in order to help it resolve coding
  dilemmas caused by preprocessor conditionals.
  
@@ -256,7 +269,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  conditional (except in the special case of "#if 0", in which case it follows
  only the last branch). The reason for this is that failing to pursue only one
  branch can result in ambiguous syntax, as in the following example:
-@@ -1250,17 +1250,17 @@
+@@ -1270,17 +1270,17 @@
  }
  .RE
  
@@ -277,7 +290,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  double sets of parentheses in order to accept the following conditional
  construct:
  
-@@ -1412,12 +1412,12 @@
+@@ -1441,12 +1441,12 @@
  
  
  .SH "CAVEATS"
@@ -294,7 +307,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  such problems by using the \fB-I\fP option.
  
  White space is treated as a separator for file names and options read from
-@@ -1426,7 +1426,7 @@
+@@ -1455,7 +1455,7 @@
  supply file names or other options containing embedded white space (spaces,
  etc.) through these options.
  
@@ -303,7 +316,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  the \fB--excmd\fP option), it is entirely possible that the wrong line may be
  found by your editor if there exists another source line which is identical to
  the line containing the tag. The following example demonstrates this condition:
-@@ -1455,10 +1455,10 @@
+@@ -1484,10 +1484,10 @@
  
  
  .SH "BUGS"
@@ -316,7 +329,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  namespace specifier and always lists it as a class name in the scope portion
  of the extension fields. Also, if the function defintion is located in a
  separate file from than where the class is defined (the usual case), the
-@@ -1473,7 +1473,7 @@
+@@ -1502,7 +1502,7 @@
  .TP 8
  .B CTAGS
  If this environment variable exists, it will be expected to contain a set of
@@ -325,7 +338,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  configuration files listed in \fBFILES\fP, below, are read, but before any
  command line options are read. Options appearing on the command line will
  override options specified in this variable. Only options will be read from
-@@ -1484,7 +1484,7 @@
+@@ -1513,7 +1513,7 @@
  .TP 8
  .B ETAGS
  Similar to the \fBCTAGS\fP variable above, this variable, if found, will be
@@ -334,12 +347,12 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  try to use \fBCTAGS\fP instead.
  
  .TP 8
-@@ -1493,12 +1493,12 @@
+@@ -1522,12 +1522,12 @@
  specifies the directory in which to place temporary files. This can be useful
  if the size of a temporary file becomes too large to fit on the partition
  holding the default temporary directory defined at compilation time.
 -\fBctags\fP creates temporary files only if either (1) an emacs-style tag file
-+\fBexctags\fP creates temporary files only if either (1) an emacs-style tag file
++\fBExctags\fP creates temporary files only if either (1) an emacs-style tag file
  is being generated, (2) the tag file is being sent to standard output, or (3)
  the program was compiled to use an internal sort algorithm to sort the tag
  files instead of the the sort utility of the operating system. If the sort
@@ -349,8 +362,8 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  ignored.
  
  
-@@ -1515,10 +1515,10 @@
- .I .ctags (ctags.cnf on MSDOS, MSWindows, OS/2)
+@@ -1544,10 +1544,10 @@
+ .I .ctags (ctags.cnf on MSDOS, MSWindows)
  .IP
  If any of these configuration files exist, each will be expected to contain a
 -set of default options which are read in the order listed when \fBctags\fP
@@ -362,7 +375,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  additional configuration file before any of those shown above, which will be
  indicated if the output produced by the \fB--version\fP option lists the
  "custom-conf" feature. Options appearing in the \fBCTAGS\fP environment
-@@ -1532,10 +1532,10 @@
+@@ -1561,10 +1561,10 @@
  
  .TP
  .I tags
@@ -375,7 +388,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  
  .SH "SEE ALSO"
  The official Exuberant Ctags web site at:
-@@ -1545,7 +1545,7 @@
+@@ -1574,7 +1574,7 @@
  .RE
  
  Also \fBex\fP(1), \fBvi\fP(1), \fBelvis\fP, or, better yet, \fBvim\fP, the
@@ -384,7 +397,7 @@ $NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
  Pages web site at:
  
  .RS
-@@ -1573,7 +1573,7 @@
+@@ -1602,7 +1602,7 @@
  
  
  .SH "CREDITS"