Update to version 5.4.

Changes since last packaged version:

ctags-5.4 (Thu Oct 17 2002)
* Improved ability for tagsOpen() in readtags library to report failure to
  open tag file, adding new fields to tagFileInfo structure.
* Improved Cobol support to include data, files, groups, and sections [Cobol].
* Added '$' a valid character for C identifier [VMS].
* Added support for recording routine argument declarations for C-like
  languages. See the --fields option and man page section TAG FILE FORMAT for
  more information [C, C++, Java].
* Added class and method support to TCL parser [TCL].
* Added support for PL/SQL language.
* Added support for Vera language, inspired by Dave Eggum [Vera].
* Fixed problem terminating Perl POD block [Perl, Bug #612621].
* Fixed problem re whitespace preceding subprogram name [Pascal, Bug #612019].
* Fixed problem with leading spaces before instruction [TCL, Bug #615928].
* Fixed problem with double precision functions [Fortran, Bug #620288].
* Fixed inverted test causing TMPDIR to be used for temporary files when
  ctags is setuid instead of when not setuid [Bug #623713].

ctags-5.3.1 (Thu Sep 12 2002)
* Renamed tagsSetSorted() to tagsSetSortType() and "sorted" member of
  tagFileInfo structure of readtags library to "sort".
* Added new function, tagsFirst() to readtags library.
* Fixed incorrect tag kinds [Verilog].
* Fixed null tags for unnamed BLOCK DATA statements [Fortran].
* Fixed missing tags for function preceded by "<SID>" [Vim].
* Fixed missing tags for equate statements not in column 1 [Asm, Bug #538629].
* Fixed Ruby parser (why didn't the compiler report my screw-up?) [Ruby].

ctags-5.3 (Wed Jul 17 2002)
* Allowed --etags-include option without input files.
* Changed Asm parser to back to C-based parser to remove redundant tags,
  and extending its support for more variants [Asm].
* Changed to using _tempnam() to create temporary files on Windows, allowing
  "TMP" environment variable to set temporary directory.
* Changed the -x output to match that of traditional ctags when the --format=1
  option is supplied. The new format was also changed slightly to conform more
  closely to the original format, with the addition of the extra tag type field.
* Added support for Verilog language, submitted by Nam SungHyun.
* Added support for RISC OS platform, contributed by Andrew Wingate.
* Added support for "#pragma weak", generating macro tags for weak symbols [C].
* Added support for mixins and class methods to Ruby parser, submitted by
  Matthias Veit [Ruby].
* Added support to ctags and readtags library for case-folded sorting of tag
  files, submitted by Flemming Madsen.
* Added identification of class methods [Python].
* Fixed portability problems [Bugs #541997, #571240].
* Fixed bug in configure script [Solaris, Bug #542966].
* Fixed invalid package name tags [Perl, Bug #535068].
* Fixed failure to output relative paths into etags TAGS files on Win32
  [Bug #568365].
* Fixed incorrect line address in cases of line continuation [Fortran].
* Fixed missing tags for certain cases of invalid syntax [C].
* Fixed missing tags in Fortran with HPF extensions [Fortran, Bug #565813].
* Fixed spurious tag for clients portion of feature clause when following
  an empty feature clause [Eiffel].

3 files changed, 61 insertions, 66 deletions

diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 092ac4e556e..3a7b47fdd85 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/11/14 23:47:33 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/01 23:57:05 seb Exp $
 #
 
-DISTNAME=	ctags-5.2.3
+DISTNAME=	ctags-5.4
 PKGNAME=	ex${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctags/}
diff --git a/devel/exctags/distinfo b/devel/exctags/distinfo
index 0dbd5bb1e58..d0909bc9685 100644
--- a/devel/exctags/distinfo
+++ b/devel/exctags/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/03/06 16:45:01 seb Exp $
+$NetBSD: distinfo,v 1.5 2002/12/01 23:57:06 seb Exp $
 
-SHA1 (ctags-5.2.3.tar.gz) = eae9b46674d915ddc64d4c1ab971f32a72e5d473
-Size (ctags-5.2.3.tar.gz) = 218701 bytes
+SHA1 (ctags-5.4.tar.gz) = 695bb4c1af11b605963402e6bd71ba588dc2e6d6
+Size (ctags-5.4.tar.gz) = 234277 bytes
 SHA1 (patch-aa) = 7a482534cd0c560df436f45ae3b697f6b07ef534
-SHA1 (patch-ab) = 0c09d98a934597221fca824bda9f8d9197a28d51
+SHA1 (patch-ab) = 993fc2d59dac47d0c6340a5abbb3fe00464b5ae6
diff --git a/devel/exctags/patches/patch-ab b/devel/exctags/patches/patch-ab
index 40ed1c5dcb1..afee2714808 100644
--- a/devel/exctags/patches/patch-ab
+++ b/devel/exctags/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
+$NetBSD: patch-ab,v 1.5 2002/12/01 23:57:06 seb Exp $
 
---- ctags.1.orig	Mon Feb 25 05:51:46 2002
+--- ctags.1.orig	Thu Oct 17 21:18:55 2002
 +++ ctags.1
 @@ -1,27 +1,27 @@
--.TH CTAGS 1 "Version 5.2.3" "Darren Hiebert"
-+.TH EXCTAGS 1 "Version 5.2.3" "Darren Hiebert"
+-.TH CTAGS 1 "Version 5.4" "Darren Hiebert"
++.TH EXCTAGS 1 "Version 5.4" "Darren Hiebert"
  
  
  .SH "NAME"
@@ -37,16 +37,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  human readable form, information about the various source objects found in a
  set of language files.
  
-@@ -42,7 +42,7 @@
- \fBZeus\fP
- .RE
- 
--\fBCtags\fP is capable of generating different kinds of tags for each of many
-+\fBExctags\fP is capable of generating different kinds of tags for each of many
- 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.
-@@ -139,8 +139,8 @@
+@@ -148,8 +148,8 @@ names are mapped to languages according 
  .RE
  
  By default, all other files names are ignored. This permits running
@@ -57,7 +48,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -150,8 +150,8 @@
+@@ -159,8 +159,8 @@ treating them as C++ files.
  
  .SH "OPTIONS"
  
@@ -68,7 +59,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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.
-@@ -187,7 +187,7 @@
+@@ -196,7 +196,7 @@ Use backward searching patterns (e.g. ?p
  .TP 5
  .B \-e
  Enable etags mode, which will create a tag file for use with the Emacs editor.
@@ -77,12 +68,8 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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.
  
-@@ -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
--"-", then the tag file is written to standard output instead. \fBCtags\fP
-+"-", then the tag file is written to standard output instead. \fBExctags\fP
+@@ -207,7 +207,7 @@ or "TAGS" when running in etags mode). I
+ "-", then the tag file is written to standard output instead. \fBCtags\fP
  will stubbornly refuse to take orders if \fItagfile\fP exists and its first
  line contains something other than a valid tags line. This will save your neck
 -if you mistakenly type "ctags -f *.c", which would otherwise overwrite your
@@ -90,7 +77,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -239,7 +239,7 @@
+@@ -248,7 +248,7 @@ Specifies a list of tokens which are to 
  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 +86,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -349,9 +349,9 @@
+@@ -358,9 +358,9 @@ includes: the tag name; the kind of tag;
  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,7 +98,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  \fB--file-scope\fP=\fIno file\fP). This option must appear before the first
  file name.
  
-@@ -372,14 +372,14 @@
+@@ -380,14 +380,14 @@ tag file which "includes" other tag file
  \fB--exclude\fP=[\fIpattern\fP]
  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
@@ -128,7 +115,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  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
-@@ -544,7 +544,7 @@
+@@ -555,7 +555,7 @@ is enabled by default.
  
  .TP 5
  \fB--filter\fP[=\fIyes\fP|\fIno\fP]
@@ -137,7 +124,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -558,7 +558,7 @@
+@@ -569,7 +569,7 @@ by default. This option must appear befo
  \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 +133,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -629,7 +629,7 @@
+@@ -640,7 +640,7 @@ enclosing the pattern in parentheses (e.
  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 +142,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -656,7 +656,7 @@
+@@ -667,7 +667,7 @@ file name patterns when inferring the la
  
  .TP 5
  \fB--language-force\fP=\fIlanguage\fP
@@ -164,7 +151,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -692,7 +692,7 @@
+@@ -703,7 +703,7 @@ Prints a summary of the software license
  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 +160,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -703,7 +703,7 @@
+@@ -714,7 +714,7 @@ absolute path). This option is off by de
  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 +169,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  
  .TP 5
  \fB--links\fP[=\fIyes\fP|\fIno\fP]
-@@ -720,7 +720,7 @@
+@@ -731,7 +731,7 @@ Recurse into directories encountered in 
  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 +178,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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.
-@@ -770,13 +770,13 @@
+@@ -781,13 +781,13 @@ The regular expression is to be applied 
  .RE
  
  .RS 5
@@ -203,11 +190,20 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  compiled feature list.
  
 -For more information on the regular expressionss used by \fBctags\fP, see
-+For more information on the regular expressions used by \fBexctags\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
-@@ -800,14 +800,14 @@
+@@ -798,7 +798,7 @@ Indicates whether the tag file should be
+ \fIyes\fP). Note that the original \fBvi\fP(1) required sorted tags. 
+ The \fIfoldcase\fP value specifies case insensitive (or case-folded) sorting.
+ Fast binary searches of tag files sorted with case-folding will require
+-special support from tools using tag files, such as that found in the ctags
++special support from tools using tag files, such as that found in the exctags
+ readtags library, or Vim version 6.2 or higher (using "set ignorecase"). This
+ option must appear before the first file name. [Ignored in etags mode]
+ 
+@@ -814,14 +814,14 @@ option), \fIno\fP otherwise.
  .TP 5
  \fB--totals\fP[=\fIyes\fP|\fIno\fP]
  Prints statistics about the source files read and the tag file written during
@@ -224,7 +220,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -815,7 +815,7 @@
+@@ -829,7 +829,7 @@ are read from these sources. The default
  
  .TP 5
  \fB--version\fP
@@ -233,7 +229,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  guaranteed to always contain the string "Exuberant Ctags".
  
  
-@@ -825,7 +825,7 @@
+@@ -839,7 +839,7 @@ one-letter flag, which is also used to f
  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
@@ -242,7 +238,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  \fB--regex-<LANG>\fP option). Kinds are enabled by default
  except where noted (with "[off]").
  
-@@ -1233,7 +1233,7 @@
+@@ -1382,7 +1382,7 @@ labels
  
  .SH "OPERATIONAL DETAILS"
  
@@ -251,7 +247,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -1249,9 +1249,9 @@
+@@ -1398,9 +1398,9 @@ code as do legacy implementations. Older
  rely upon certain formatting assumptions in order to help it resolve coding
  dilemmas caused by preprocessor conditionals.
  
@@ -263,7 +259,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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:
-@@ -1274,17 +1274,17 @@
+@@ -1423,12 +1423,12 @@ long b;
  }
  .RE
  
@@ -278,13 +274,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  selectively follow conditional preprocessor branches, but instead falls back
  to relying upon a closing brace ("}") in column 1 as indicating the end of a
  block once any brace imbalance results from following a #if conditional branch.
- 
--\fBCtags\fP will also try to specially handle arguments lists enclosed in
-+\fBExctags\fP will also try to specially handle arguments lists enclosed in
- double sets of parentheses in order to accept the following conditional
- construct:
- 
-@@ -1445,12 +1445,12 @@
+@@ -1602,12 +1602,12 @@ to automatically load that tag file at s
  
  
  .SH "CAVEATS"
@@ -301,7 +291,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -1459,7 +1459,7 @@
+@@ -1616,7 +1616,7 @@ using the \fB--filter\fP option). Theref
  supply file names or other options containing embedded white space (spaces,
  etc.) through these options.
  
@@ -310,12 +300,8 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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:
-@@ -1488,10 +1488,10 @@
- 
- 
- .SH "BUGS"
--\fBCtags\fP has more options than \fBls\fP(1).
-+\fBExctags\fP has more options than \fBls\fP(1).
+@@ -1648,7 +1648,7 @@ by use of the \fB--excmd\fP=\fIn\fP opti
+ \fBCtags\fP has more options than \fBls\fP(1).
  
  When parsing a C++ member function definition (e.g. "className::function"),
 -\fBctags\fP cannot determine whether the scope specifier is a class name or a
@@ -323,7 +309,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -1506,7 +1506,7 @@
+@@ -1663,7 +1663,7 @@ No qualified tags are generated for lang
  .TP 8
  .B CTAGS
  If this environment variable exists, it will be expected to contain a set of
@@ -332,7 +318,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -1517,7 +1517,7 @@
+@@ -1674,7 +1674,7 @@ embedded space. If this is a problem, us
  .TP 8
  .B ETAGS
  Similar to the \fBCTAGS\fP variable above, this variable, if found, will be
@@ -341,7 +327,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  try to use \fBCTAGS\fP instead.
  
  .TP 8
-@@ -1526,12 +1526,12 @@
+@@ -1683,12 +1683,12 @@ On Unix-like hosts where mkstemp() is av
  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.
@@ -356,7 +342,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  ignored.
  
  
-@@ -1548,10 +1548,10 @@
+@@ -1705,10 +1705,10 @@ ignored.
  .I .ctags (ctags.cnf on MSDOS, MSWindows)
  .IP
  If any of these configuration files exist, each will be expected to contain a
@@ -369,7 +355,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 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
-@@ -1565,10 +1565,10 @@
+@@ -1722,10 +1722,10 @@ lines to indicate separate command-line 
  
  .TP
  .I tags
@@ -382,7 +368,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  
  .SH "SEE ALSO"
  The official Exuberant Ctags web site at:
-@@ -1578,7 +1578,7 @@
+@@ -1735,7 +1735,7 @@ http://ctags.sourceforge.net
  .RE
  
  Also \fBex\fP(1), \fBvi\fP(1), \fBelvis\fP, or, better yet, \fBvim\fP, the
@@ -391,3 +377,12 @@ $NetBSD: patch-ab,v 1.4 2002/03/06 16:45:02 seb Exp $
  Pages web site at:
  
  .RS
+@@ -1763,7 +1763,7 @@ to humanity."
+ 
+ 
+ .SH "CREDITS"
+-This version of \fBctags\fP was originally derived from and inspired by the
++This version of \fBexctags\fP was originally derived from and inspired by the
+ ctags program by Steve Kirkendall <kirkenda@cs.pdx.edu> that comes with the
+ Elvis vi clone (though virtually none of the original code remains).
+