3 files changed, 72 insertions, 88 deletions

diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index d0db5cf052f9..1564f006fa89 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ctags
-PORTVERSION=	3.5.2
+PORTVERSION=	4.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE}\
 		http://fly.hiwaay.net/~darren/archives/ \
diff --git a/devel/ctags/distinfo b/devel/ctags/distinfo
index d151c187271a..faea96054edb 100644
--- a/devel/ctags/distinfo
+++ b/devel/ctags/distinfo
@@ -1 +1 @@
-MD5 (ctags-3.5.2.tar.gz) = 58d8bf2d4df5965853eddab6ebdd7a93
+MD5 (ctags-4.0.2.tar.gz) = 6f5acb5dd493df9614b14e50c7ea088a
diff --git a/devel/ctags/files/patch-aa b/devel/ctags/files/patch-aa
index 1b21aca1706d..81d913ab580d 100644
--- a/devel/ctags/files/patch-aa
+++ b/devel/ctags/files/patch-aa
@@ -1,11 +1,11 @@
---- ctags.1--	Tue Apr 25 03:42:01 2000
-+++ ctags.1	Wed Apr 26 13:08:00 2000
-@@ -1,20 +1,19 @@
--.TH CTAGS 1 "Version 3.5.2" "Darren Hiebert"
-+.TH EXCTAGS 1 "Version 3.5.2" "Darren Hiebert"
+--- ctags.1.orig	Mon Jul 10 02:10:28 2000
++++ ctags.1	Sun Jul 30 15:21:04 2000
+@@ -1,20 +1,17 @@
+-.TH CTAGS 1 "Version 4.0.2" "Darren Hiebert"
++.TH EXCTAGS 1 "Version 4.0.2" "Darren Hiebert"
  
  
- .SH NAME
+ .SH "NAME"
 -ctags \- Generate tag files for source code
 +exctags \- Generate tag files for source code
  
@@ -13,19 +13,19 @@
  .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]
  
  
- .SH DESCRIPTION
+ .SH "DESCRIPTION"
 -The \fBctags\fP and \fBetags\fP programs (hereinafter collectively referred to
 -as \fBctags\fP, except where distinguished) generate an index (or "tag") file
 +The \fBexctags\fP program generates an index (or "tag") file
- for C, C++, Eiffel, Fortran, and Java language objects found in \fIfile(s)\fP.
+ for a variety of language objects found in \fIfile(s)\fP.
  This tag file allows these items to be quickly and easily located by a text
  editor or other utility. A "tag" signifies a language object for which an
-@@ -22,7 +21,7 @@
+@@ -22,7 +19,7 @@
  object).
  
  .PP
@@ -34,16 +34,16 @@
  human readable form, information about the various source objects found in a
  set of language files.
  
-@@ -52,7 +51,7 @@
+@@ -52,7 +49,7 @@
  .RE
  
  .PP
--\fBCtags\fP is capable of generating tags for all of the following language
-+\fBexctags\fP is capable of generating tags for all of the following language
- constructs:
+-\fBCtags\fP is capable of generating tags for indicated contructs of the
++\fBexctags\fP is capable of generating tags for indicated contructs of the
+ following languages:
  
  .PP
-@@ -161,9 +160,9 @@
+@@ -283,9 +280,9 @@
  
  .PP
  By default, all other files extensions are ignored. This permits running
@@ -56,9 +56,9 @@
  
  .PP
  The reason that .h extensions are mapped to C++ files rather than C files
-@@ -174,8 +173,8 @@
+@@ -296,8 +293,8 @@
  
- .SH OPTIONS
+ .SH "OPTIONS"
  
 -Despite the wealth of available options, defaults are set so that \fBctags\fP
 -is most commonly executed without any options (e.g. "ctags *"), which will
@@ -67,7 +67,7 @@
  create a tag file in the current directory for all known source files. The
  options described below are provided merely to allow custom tailoring to meet
  special needs.
-@@ -193,7 +192,7 @@
+@@ -315,7 +312,7 @@
  and "=\fIoff\fP" are considered synonyms for "=\fIno\fP".
  
  Some options are either ignored, or only useful, when used together with
@@ -76,7 +76,16 @@
  option. These options will be noted.
  
  Most options may appear anywhere on the command line, affecting only those
-@@ -218,10 +217,10 @@
+@@ -333,17 +330,18 @@
+ .TP 5
+ .B \-e
+ Output a tag file for use with Emacs. If this program is executed by the name
+-\fBetags\fP, this option is enabled by default. This option must appear before
++\fBetags\fP, or, equivalently, when \fBexctags\fP is run with the \fI-e\fP
++option; this option is enabled by default. This option must appear before
+ the first file name.
+ 
+ .TP 5
  .BI \-f " tagfile"
  Use the name specified by \fItagfile\fP for the tag file (default is "tags",
  or "TAGS" when using the \fB-e\fP option). If \fItagfile\fP is specified as
@@ -89,7 +98,7 @@
  first C file with the tags generated by the rest! This option must appear
  before the first file name. If this option is specified more than once, only
  the last will apply.
-@@ -272,7 +271,7 @@
+@@ -400,7 +398,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
@@ -98,7 +107,7 @@
  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
-@@ -399,9 +398,9 @@
+@@ -533,9 +531,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
@@ -110,16 +119,7 @@
  \fB--file-scope\fP=\fIno file\fP). This option must appear before the first
  file name.
  
-@@ -599,7 +598,7 @@
- .I mixed
- In this mode, patterns are generally used with a few exceptions. For C, line
- numbers are used for macro definition tags. This was the default format
--generated by the original \fBctags\fP and is, therefore, retained as the
-+generated by the original \fBexctags\fP and is, therefore, retained as the
- default for this option. For Fortran, line numbers are used for common blocks
- because their corresponding source lines are generally identical, making
- pattern searches useless for finding all matches.
-@@ -619,7 +618,7 @@
+@@ -779,7 +777,7 @@
  
  .TP 5
  \fB--filter\fP=\fIyes\fP|\fIno\fP
@@ -128,7 +128,7 @@
  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
-@@ -633,7 +632,7 @@
+@@ -793,7 +791,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
@@ -137,19 +137,16 @@
  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
-@@ -777,9 +776,9 @@
+@@ -937,7 +935,7 @@
  
  .TP 5
- \fB--lang\fP=\fIauto\fP|\fIc\fP|\fIc++\fP|\fIeiffel\fP|\fIfortran\fP|\fIjava\fP
--By default, \fBctags\fP automatically selects the language of a source file
-+By default, \fBexctags\fP automatically selects the language of a source file
- according to its file name extension, ignoring those files whose extensions
--are unrecognized by \fBctags\fP. This option forces the specified language to
-+are unrecognized by \fBexctags\fP. This option forces the specified language to
- be used for every supplied file instead of automatically selecting the
- language based upon its extension. The default is \fIauto\fP.
- 
-@@ -806,7 +805,7 @@
+ \fB--lang[uage]\fP=\fIlanguage\fP
+-By default, \fBctags\fP automatically selects the language of a source file,
++By default, \fBexctags\fP automatically selects the language of a source file,
+ ignoring those files whose language cannot be determined (see
+ \fBSOURCE FILES\fP, above). This option forces the specified language to be
+ used for every supplied file instead of automatically selecting the language
+@@ -990,7 +988,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
@@ -158,7 +155,7 @@
  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
-@@ -817,7 +816,7 @@
+@@ -1001,7 +999,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--lang\fP or
  \fB--langmap\fP option if the extension of the preprocessor output file is not
@@ -167,7 +164,7 @@
  
  .TP 5
  \fB--links\fP=\fIyes\fP|\fIno\fP
-@@ -834,7 +833,7 @@
+@@ -1022,7 +1020,7 @@
  which they relate. Directories named "EIFGEN" are skipped, because these
  contain Eiffel compiler-generated C files. Also on Unix, symbolic links are
  followed. If you don't like these behaviors, either explicitly specify the
@@ -176,7 +173,7 @@
  \fBNote:\fP This option is not supported on all platforms at present.
  
  .TP 5
-@@ -847,14 +846,14 @@
+@@ -1035,14 +1033,14 @@
  .TP 5
  \fB--totals\fP=\fIyes\fP|\fIno\fP
  Prints statistics about the source files read and the tag file written during
@@ -193,7 +190,7 @@
  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
-@@ -862,13 +861,13 @@
+@@ -1050,13 +1048,13 @@
  
  .TP 5
  \fB--version\fP
@@ -209,13 +206,7 @@
  looking like this in the most general case:
  
  .PP
-@@ -923,14 +922,14 @@
- be recorded in that same manner in the tag file.
- 
- .PP
--This version of \fBctags\fP imposes no formatting requirements. Other versions
-+This version of \fBexctags\fP imposes no formatting requirements. Other versions
- of ctags tended to rely upon certain formatting assumptions in order to help
+@@ -1116,9 +1114,9 @@
  it resolve coding dilemmas caused by preprocessor conditionals.
  
  .PP
@@ -227,7 +218,7 @@
  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:
-@@ -955,19 +954,19 @@
+@@ -1143,19 +1141,19 @@
  .RE
  
  .PP
@@ -250,7 +241,7 @@
  double sets of parentheses in order to accept the following conditional
  construct:
  
-@@ -994,7 +993,7 @@
+@@ -1182,7 +1180,7 @@
  Note that the path recorded for filenames in the tag file and utilized by
  the editor to search for tags are identical to the paths specified for
  \fIfile(s)\fP on the command line. This means the if you want the paths for
@@ -259,7 +250,7 @@
  same pathnames for \fIfile(s)\fP (this can be overridden with \fB-p\fP).
  
  
-@@ -1070,7 +1069,7 @@
+@@ -1258,7 +1256,7 @@
  .TP 8
  .B CTAGS
  If this enviroment variable exists, it will be expected to contain a set of
@@ -268,7 +259,17 @@
  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
-@@ -1088,12 +1087,12 @@
+@@ -1267,7 +1265,8 @@
+ .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 \fBexctags\fP  is run with the \fI-e\fP option.
++If this variable is not found, \fBexctags\fP will
+ try to use \fBCTAGS\fP instead.
+ 
+ .TP 8
+@@ -1276,12 +1275,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.
@@ -283,7 +284,7 @@
  ignored.
  
  .SH "HOW TO USE WITH VI"
-@@ -1137,20 +1136,20 @@
+@@ -1325,20 +1324,20 @@
  
  
  .SH "BUGS (CAVEATS)"
@@ -310,7 +311,7 @@
  namespace specifier and always lists it as a class name in the scope portion
  of the extension flags.
  
-@@ -1168,7 +1167,7 @@
+@@ -1356,7 +1355,7 @@
  use the \fB--lang\fP option.
  
  .PP
@@ -319,20 +320,7 @@
  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:
-@@ -1211,10 +1210,10 @@
- .br
- .PD 1
- 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 enviroment 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 immediately before $HOME/.ctags, 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 enviroment
-@@ -1223,7 +1222,7 @@
+@@ -1411,10 +1410,11 @@
  
  .TP 10
  .I tags
@@ -340,8 +328,13 @@
 +The default tag file created by \fBexctags\fP.
  .TP 10
  .I TAGS
- The default tag file created by \fBetags\fP.
-@@ -1238,7 +1237,7 @@
+-The default tag file created by \fBetags\fP.
++The default tag file created by \fBexctags\fP run with \fI-e\fP.
++option.
+ 
+ .SH "SEE ALSO"
+ The official Exuberant Ctags web site at:
+@@ -1426,7 +1426,7 @@
  
  .PP
  Also \fBex\fP(1), \fBvi\fP(1), \fBelvis\fP, or, better yet, \fBvim\fP, the
@@ -350,12 +343,3 @@
  Pages web site at:
  
  .PP
-@@ -1268,7 +1267,7 @@
- 
- 
- .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).
-