Upgrade to version 5.1.

While here added the support of Exuberant etags (exetags in this package).

List of changes for version 5.1:
* Changed name of option configuration files for MSDOS, MSWindows, and OS/2.
* Changed regex support to enforce REG_NEWLINE. This fixes problem where the
  newline character was explicity being matched by user patterns [Bug #431477].
* Added new public domain library for reading tag files (see readtags.h).
* Added support for variables and namespaces, provided by Jay Glanville [Vim].
* Added report of non-options in option configuration files and CTAGS
  environment variable.
* Added support for YACC language, submitted by Nick Hibma [YACC].
* Added support for Perl packages, submitted by Nick Hibma [Perl].
* Added '$' as valid identifier character for DEC C compiler [VMS, Bug #425147].
* Added compilation date and time to --version output.
* Added configure check for HP-UX to determine if ANSI options needed [HP-UX].
* Removed tags for forward class/struct declarations [C/C++, Bug #432563].
* Eliminated ;" separator from end of tag line when no extension fields are
  present.
* Fixed segmentation violation for some Lisp files [Lisp].
* Fixed segmentation violation occurring when file referenced in #line
  directive was from an unknown language.
* Fixed loss of sync when parsing bit fields named with C++ reserved word [C].
* Fixed compilation problem on gcc-2.7.2.
* Fixed problem parsing verbatim strings [Eiffel].
* Fixed problem with PHP references [PHP].
* Fixed handling of Perl __DATA__ sections [Perl].
* Fixed problem resulting from white space in tag name due to regex name
  specifier.
* Fixed double reading of $HOME/.ctags when current directory is $HOME.
* Fixed problem reading option configuration files using CR-LF newlines.
* Fixed problem preventing output control over tag kinds of regex patterns
  [Bug #429869]

6 files changed, 144 insertions, 61 deletions

diff --git a/devel/exctags/DESCR b/devel/exctags/DESCR
index 42819c0f995..cc31104662c 100644
--- a/devel/exctags/DESCR
+++ b/devel/exctags/DESCR
@@ -6,6 +6,6 @@ Alternatively, it can generate a cross reference file which lists,
 in human-readable form, information about the various objects found
 in a set of source code files.
 
-Supported languages include: Assembler, AWK, ASP, BETA, Bourne/Korn/Zsh 
-Shell, C, C++, COBOL, Eiffel, Fortran, Java, Lisp, Make, Pascal, Perl, 
-PHP, Python, REXX, Ruby, S-Lang, Scheme, Tcl, and Vim.
+Supported languages include: Assembler, ASP, Awk, C, C++, BETA, COBOL, Eiffel,
+Fortran, Java, Lisp, Make, Pascal, Perl, PHP, Python, REXX, Ruby, Scheme,
+Shell scripts (Bourne/Korn/Z), S-Lang, Tcl, Vim  and YACC/Bison.
diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 3b98da1ec2d..a800b236a10 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/30 10:26:10 seb Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/13 15:23:23 seb Exp $
 #
 
-DISTNAME=	ctags-5.0.1
+DISTNAME=	ctags-5.1
 PKGNAME=	ex${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctags/}
@@ -10,8 +10,11 @@ MAINTAINER=	seb@pbox.org
 HOMEPAGE=	http://ctags.sourceforge.net/
 COMMENT=	Exuberant (feature-filled) tagfile generator for vi, emacs and clones
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
+USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--enable-macro-patterns
-CONFIGURE_ARGS+=	--disable-etags
+CONFIGURE_ARGS+=	--with-readlib
+
+CPPFLAGS+=		-DETAGS='\"exetags\"'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/exctags/PLIST b/devel/exctags/PLIST
index 55c96994f97..eee5e5e3cfb 100644
--- a/devel/exctags/PLIST
+++ b/devel/exctags/PLIST
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/13 15:23:24 seb Exp $
 bin/exctags
+bin/exetags
+include/readtags.h
+lib/readtags.o
 man/man1/exctags.1
+man/man1/exetags.1
diff --git a/devel/exctags/distinfo b/devel/exctags/distinfo
index ce6675d141b..35f9c3ade99 100644
--- a/devel/exctags/distinfo
+++ b/devel/exctags/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/09/30 10:26:10 seb Exp $
+$NetBSD: distinfo,v 1.2 2001/11/13 15:23:24 seb Exp $
 
-SHA1 (ctags-5.0.1.tar.gz) = 1da6ccad75b9738dec7f5a451bb1006884dc3ea5
-Size (ctags-5.0.1.tar.gz) = 186179 bytes
-SHA1 (patch-aa) = b3532fd217a8e4fc95ccc831356128fb0f7732f3
-SHA1 (patch-ab) = 2f01921edea7e2938dc98d31d2242b95efb84f00
+SHA1 (ctags-5.1.tar.gz) = a3a58b324e8faee1a2a8a998fc196eff411e09ce
+Size (ctags-5.1.tar.gz) = 215187 bytes
+SHA1 (patch-aa) = bc41ca1e2fe101c1f5f4335578bde4b3c06a7543
+SHA1 (patch-ab) = 1afe5f8425111b6b95b9e3dd72a193d4100063bf
diff --git a/devel/exctags/patches/patch-aa b/devel/exctags/patches/patch-aa
index 5e3322f023f..c7211fd11c5 100644
--- a/devel/exctags/patches/patch-aa
+++ b/devel/exctags/patches/patch-aa
@@ -1,30 +1,50 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/09/30 10:26:10 seb Exp $
+$NetBSD: patch-aa,v 1.2 2001/11/13 15:23:25 seb Exp $
 
---- Makefile.in.orig	Wed Apr 11 07:14:18 2001
+--- Makefile.in.orig	Fri Nov  2 06:24:11 2001
 +++ Makefile.in
-@@ -6,7 +6,7 @@
+@@ -6,8 +6,8 @@
  # These are the names of the installed programs, in case you wish to change
  # them.
  #
 -CTAGS_PROG = ctags
+-ETAGS_PROG = etags
 +CTAGS_PROG = exctags
- ETAGS_PROG = etags
++ETAGS_PROG = exetags
  
  # Set this to the path to your shell (must run Bourne shell commands).
-@@ -58,9 +58,8 @@
+ #
+@@ -28,6 +28,7 @@
+ CC	= @CC@
+ DEFS	= @DEFS@
+ CFLAGS	= @CFLAGS@
++CPPFLAGS= @CPPFLAGS@
+ LDFLAGS	= @LDFLAGS@
+ LIBS	= @LIBS@
+ EXEEXT	= @EXEEXT@
+@@ -59,9 +60,9 @@
  
  VPATH	= $(srcdir)
  
 -INSTALL		= cp
 -INSTALL_PROG	= $(INSTALL)
 -INSTALL_DATA	= $(INSTALL)
-+INSTALL_PROGRAM		= $(BSD_INSTALL_PROGRAM)
-+INSTALL_MAN		= $(BSD_INSTALL_MAN)
++INSTALL_PROGRAM	= $(BSD_INSTALL_PROGRAM)
++INSTALL_MAN	= $(BSD_INSTALL_MAN)
++INSTALL_DATA	= $(BSD_INSTALL_DATA)
+ 
+ READ_LIB = readtags.$(OBJEXT)
+ READ_INC = readtags.h
+@@ -103,7 +104,7 @@
+ 	$(CC) -I. -I$(srcdir) $(DEFS) -DDEBUG -g $(LDFLAGS) -o $@ debug.c $(SOURCES)
+ 
+ readtags: readtags.c readtags.h
+-	$(CC) -I. -I$(srcdir) -DREADTAGS_MAIN $(DEFS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) -I. -I$(srcdir) -DREADTAGS_MAIN $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
  
- MANPAGE	= ctags.1
+ $(OBJECTS): $(HEADERS) config.h
  
-@@ -121,8 +120,7 @@
- install-ebin: $(DEST_ETAGS)
+@@ -131,8 +132,7 @@
+ install-lib: $(DEST_READ_LIB) $(DEST_READ_INC)
  
  $(DEST_CTAGS): $(CTAGS_EXEC) $(bindir) FORCE
 -	$(INSTALL_PROG) $(CTAGS_EXEC) $@  &&  chmod 755 $@
@@ -33,7 +53,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/09/30 10:26:10 seb Exp $
  
  $(DEST_ETAGS):
  	- if [ -x $(DEST_CTAGS) ]; then \
-@@ -137,7 +135,7 @@
+@@ -147,7 +147,7 @@
  install-eman: $(DEST_EMAN)
  
  $(DEST_CMAN): $(man1dir) $(MANPAGE) FORCE
@@ -42,3 +62,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/09/30 10:26:10 seb Exp $
  
  $(DEST_EMAN):
  	- if [ -f $(DEST_CMAN) ]; then \
+@@ -158,10 +158,10 @@
+ # install the library
+ #
+ $(DEST_READ_LIB): $(READ_LIB) $(libdir) FORCE
+-	$(INSTALL_PROG) $(READ_LIB) $@  &&  chmod 644 $@
++	$(INSTALL_DATA) $(READ_LIB) $@
+ 
+ $(DEST_READ_INC): $(READ_INC) $(incdir) FORCE
+-	$(INSTALL_PROG) $(READ_INC) $@  &&  chmod 644 $@
++	$(INSTALL_DATA) $(READ_INC) $@
+ 
+ 
+ #
+@@ -208,6 +208,6 @@
+ # implicit rules
+ #
+ .c.$(OBJEXT):
+-	$(CC) -I. -I$(srcdir) $(DEFS) $(CFLAGS) -c $<
++	$(CC) -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
+ 
+ # vi:set tabstop=8:
diff --git a/devel/exctags/patches/patch-ab b/devel/exctags/patches/patch-ab
index 78aec5deddb..0f45ec07103 100644
--- a/devel/exctags/patches/patch-ab
+++ b/devel/exctags/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
+$NetBSD: patch-ab,v 1.2 2001/11/13 15:23:26 seb Exp $
 
---- ctags.1.orig	Sun Apr 15 19:18:22 2001
+--- ctags.1.orig	Wed Nov  7 05:43:05 2001
 +++ ctags.1
-@@ -1,27 +1,26 @@
--.TH CTAGS 1 "Version 5.0.1" "Darren Hiebert"
-+.TH EXCTAGS 1 "Version 5.0.1" "Darren Hiebert"
+@@ -1,27 +1,27 @@
+-.TH CTAGS 1 "Version 5.1" "Darren Hiebert"
++.TH EXCTAGS 1 "Version 5.1" "Darren Hiebert"
  
  
  .SH "NAME"
@@ -15,9 +15,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  .SH SYNOPSIS
  .TP 6
 -\fBctags\fP [\fBoptions\fP] [\fIfile(s)\fP]
--.TP 6
--\fBetags\fP [\fBoptions\fP] [\fIfile(s)\fP]
 +\fBexctags\fP [\fBoptions\fP] [\fIfile(s)\fP]
+ .TP 6
+-\fBetags\fP [\fBoptions\fP] [\fIfile(s)\fP]
 +\fBexetags\fP [\fBoptions\fP] [\fIfile(s)\fP]
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  human readable form, information about the various source objects found in a
  set of language files.
  
-@@ -42,7 +41,7 @@
+@@ -42,7 +42,7 @@
  \fBZeus\fP
  .RE
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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.
-@@ -133,8 +132,8 @@
+@@ -136,8 +136,8 @@
  .RE
  
  By default, all other files names are ignored. This permits running
@@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -144,8 +143,8 @@
+@@ -147,8 +147,8 @@
  
  .SH "OPTIONS"
  
@@ -68,7 +68,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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.
-@@ -181,7 +180,7 @@
+@@ -184,7 +184,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.1.1.1 2001/09/30 10:26:11 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.
  
-@@ -189,10 +188,10 @@
+@@ -192,10 +192,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.1.1.1 2001/09/30 10:26:11 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
-@@ -233,7 +232,7 @@
+@@ -236,7 +236,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.1.1.1 2001/09/30 10:26:11 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
-@@ -343,9 +342,9 @@
+@@ -346,9 +346,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,7 +111,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  \fB--file-scope\fP=\fIno file\fP). This option must appear before the first
  file name.
  
-@@ -365,14 +364,14 @@
+@@ -368,14 +368,14 @@
  .TP 5
  \fB--exclude\fP=[\fIpattern\fP]
  Add \fIpattern\fP to a list of excluded files and directories. For each file
@@ -128,7 +128,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  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
-@@ -535,7 +534,7 @@
+@@ -538,7 +538,7 @@
  
  .TP 5
  \fB--filter\fP[=\fIyes\fP|\fIno\fP]
@@ -137,7 +137,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -549,7 +548,7 @@
+@@ -552,7 +552,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.1.1.1 2001/09/30 10:26:11 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
-@@ -620,7 +619,7 @@
+@@ -623,7 +623,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.1.1.1 2001/09/30 10:26:11 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
-@@ -647,7 +646,7 @@
+@@ -650,7 +650,7 @@
  
  .TP 5
  \fB--language-force\fP=\fIlanguage\fP
@@ -164,7 +164,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -683,7 +682,7 @@
+@@ -686,7 +686,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.1.1.1 2001/09/30 10:26:11 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
-@@ -694,7 +693,7 @@
+@@ -697,7 +697,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.1.1.1 2001/09/30 10:26:11 seb Exp $
  
  .TP 5
  \fB--links\fP[=\fIyes\fP|\fIno\fP]
-@@ -711,7 +710,7 @@
+@@ -714,7 +714,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.1.1.1 2001/09/30 10:26:11 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.
-@@ -761,7 +760,7 @@
+@@ -764,7 +764,7 @@
  .RE
  
  .RS 5
@@ -200,7 +200,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -787,14 +786,14 @@
+@@ -790,14 +790,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 +217,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -802,7 +801,7 @@
+@@ -805,7 +805,7 @@
  
  .TP 5
  \fB--version\fP
@@ -226,7 +226,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  guaranteed to always contain the string "Exuberant Ctags".
  
  
-@@ -812,7 +811,7 @@
+@@ -815,7 +815,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 +235,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  \fB--regex-<LANG>\fP option). Kinds are enabled by default
  except where noted (with "[off]").
  
-@@ -1192,7 +1191,7 @@
+@@ -1209,7 +1209,7 @@
  
  .SH "OPERATIONAL DETAILS"
  
@@ -244,7 +244,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -1208,9 +1207,9 @@
+@@ -1225,9 +1225,9 @@
  rely upon certain formatting assumptions in order to help it resolve coding
  dilemmas caused by preprocessor conditionals.
  
@@ -256,7 +256,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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:
-@@ -1233,17 +1232,17 @@
+@@ -1250,17 +1250,17 @@
  }
  .RE
  
@@ -277,7 +277,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  double sets of parentheses in order to accept the following conditional
  construct:
  
-@@ -1392,12 +1391,12 @@
+@@ -1412,12 +1412,12 @@
  
  
  .SH "CAVEATS"
@@ -294,7 +294,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -1406,7 +1405,7 @@
+@@ -1426,7 +1426,7 @@
  supply file names or other options containing embedded white space (spaces,
  etc.) through these options.
  
@@ -303,7 +303,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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:
-@@ -1435,10 +1434,10 @@
+@@ -1455,10 +1455,10 @@
  
  
  .SH "BUGS"
@@ -316,7 +316,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 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
-@@ -1453,7 +1452,7 @@
+@@ -1473,7 +1473,7 @@
  .TP 8
  .B CTAGS
  If this environment variable exists, it will be expected to contain a set of
@@ -324,8 +324,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
 +default options which are read when \fBexctags\fP starts, after the
  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 file. Only options will be read from this
-@@ -1473,12 +1472,12 @@
+ override options specified in this variable. Only options will be read from
+@@ -1484,7 +1484,7 @@
+ .TP 8
+ .B ETAGS
+ Similar to the \fBCTAGS\fP variable above, this variable, if found, will be
+-read when \fBetags\fP starts. If this variable is not found, \fBetags\fP will
++read when \fBexetags\fP starts. If this variable is not found, \fBexetags\fP will
+ try to use \fBCTAGS\fP instead.
+ 
+ .TP 8
+@@ -1493,12 +1493,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.
@@ -340,7 +349,33 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  ignored.
  
  
-@@ -1523,7 +1522,7 @@
+@@ -1515,10 +1515,10 @@
+ .I .ctags (ctags.cnf on MSDOS, MSWindows, OS/2)
+ .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
++set of default options which are read in the order listed when \fBexctags\fP
+ starts, but before the \fBCTAGS\fP environment variable is read or any command
+ line options are read. This makes it possible to set up site-wide, personal
+-or project-level defaults. It is possible to compile \fBctags\fP to read an
++or project-level defaults. It is possible to compile \fBexctags\fP to read an
+ 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 @@
+ 
+ .TP
+ .I tags
+-The default tag file created by \fBctags\fP.
++The default tag file created by \fBexctags\fP.
+ .TP
+ .I TAGS
+-The default tag file created by \fBetags\fP.
++The default tag file created by \fBexetags\fP.
+ 
+ .SH "SEE ALSO"
+ The official Exuberant Ctags web site at:
+@@ -1545,7 +1545,7 @@
  .RE
  
  Also \fBex\fP(1), \fBvi\fP(1), \fBelvis\fP, or, better yet, \fBvim\fP, the
@@ -349,7 +384,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/30 10:26:11 seb Exp $
  Pages web site at:
  
  .RS
-@@ -1551,7 +1550,7 @@
+@@ -1573,7 +1573,7 @@
  
  
  .SH "CREDITS"