From owner-freebsd-ports Sun Apr 23 14:30:24 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id E405837BA68 for ; Sun, 23 Apr 2000 14:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA46079; Sun, 23 Apr 2000 14:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from heidegger.uol.com.br (heidegger.uol.com.br [200.230.198.88]) by hub.freebsd.org (Postfix) with ESMTP id BC05137BA38 for ; Sun, 23 Apr 2000 14:20:24 -0700 (PDT) (envelope-from lioux-alias-ppp-FreeBSD-gnats-submit=freebsd.org@uol.com.br) Received: from bsa-1-as01-7-a51.gd.uol.com.br (bsa-1-as01-7-a51.gd.uol.com.br [200.197.118.51]) by heidegger.uol.com.br (8.9.1/8.9.1) with ESMTP id SAA16071 for ; Sun, 23 Apr 2000 18:20:10 -0300 (BRT) Received: (qmail 8990 invoked by uid 1001); 23 Apr 2000 21:17:45 -0000 Message-Id: <20000423211745.8989.qmail@Fedaykin.here> Date: 23 Apr 2000 21:17:45 -0000 From: lioux@uol.com.br Reply-To: lioux@uol.com.br To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/18179: Update port devel/ctags to version 3.5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18179 >Category: ports >Synopsis: Update port devel/ctags to version 3.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 23 14:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 4.0-STABLE i386 >Organization: >Environment: I suppose any FBSD version. >Description: +Added File: + patches/patch-ab Just a simple update from version 3.4 to 3.5. >How-To-Repeat: n/a >Fix: diff -urN /usr/ports/devel/ctags/Makefile ./Makefile --- /usr/ports/devel/ctags/Makefile Wed Apr 12 00:37:47 2000 +++ ./Makefile Thu Apr 20 05:24:17 2000 @@ -6,10 +6,10 @@ # PORTNAME= ctags -PORTVERSION= 3.4 +PORTVERSION= 3.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SUNSITE}\ - http://fly.hiwaay.net/~darren/archives/ \ + http://home.hiwaay.net/~darren/archives/\ http://people.FreeBSD.org/~jkoshy/PORTS/ MAINTAINER= jkoshy@FreeBSD.org diff -urN /usr/ports/devel/ctags/files/md5 ./files/md5 --- /usr/ports/devel/ctags/files/md5 Sat Feb 19 14:32:21 2000 +++ ./files/md5 Sun Apr 23 17:03:01 2000 @@ -1 +1 @@ -MD5 (ctags-3.4.tar.gz) = 7222da9ea111cf9ef6f20ea112f00ff9 +MD5 (ctags-3.5.tar.gz) = b2ba1367db1b302cc6785dcc515ef2e3 diff -urN /usr/ports/devel/ctags/patches/patch-aa ./patches/patch-aa --- /usr/ports/devel/ctags/patches/patch-aa Sat Nov 6 11:09:50 1999 +++ ./patches/patch-aa Sun Apr 23 18:01:58 2000 @@ -1,11 +1,13 @@ ---- ctags.1.ORIG Sat Nov 6 12:45:02 1999 -+++ ctags.1 Sat Nov 6 13:05:29 1999 -@@ -2,27 +2,24 @@ +--- ctags.1.ORIG Sun Apr 23 17:04:36 2000 ++++ ctags.1 Sun Apr 23 18:01:42 2000 +@@ -1,20 +1,18 @@ +-.TH CTAGS 1 "Version 3.5" "Darren Hiebert" ++.TH EXCTAGS 1 "Version 3.5" "Darren Hiebert" .SH NAME -ctags \- Generate tag files for source code -+exctags \- Generate tag files for source code (ctags and etags alike) ++exctags \- Generate tag files for source code .SH SYNOPSIS @@ -19,12 +21,12 @@ .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 --for C, C++, Eiffel, Fortran, and Java language objects found in \fIfile(s)\fP. -+The \fBexctags\fP program (supplied as a replacement for \fBctags\fP and \fBetags\fP) -+generate an index (or "tag") file for C, C++, Eiffel, Fortran, and Java language objects found in \fIfile(s)\fP. ++The \fBexctags\fP program (supplied as a replacement for \fBctags\fP and ++\fBetags\fP) generate an index (or "tag") file + for C, C++, Eiffel, Fortran, and Java 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 - index entry is available (or, alternatively, the index entry created for that +@@ -22,7 +20,7 @@ object). .PP @@ -33,16 +35,16 @@ human readable form, information about the various source objects found in a set of language files. -@@ -52,7 +49,7 @@ +@@ -52,7 +50,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 ++\fBEXCtags\fP is capable of generating tags for all of the following language constructs: .PP -@@ -161,9 +158,9 @@ +@@ -161,9 +159,9 @@ .PP By default, all other files extensions are ignored. This permits running @@ -55,7 +57,7 @@ .PP The reason that .h extensions are mapped to C++ files rather than C files -@@ -174,8 +171,8 @@ +@@ -174,8 +172,8 @@ .SH OPTIONS @@ -66,7 +68,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. -@@ -192,9 +189,8 @@ +@@ -192,9 +190,9 @@ "=\fIon\fP" are considered synonyms for "=\fIyes\fP", and that "=\fI0\fP" and "=\fIoff\fP" are considered synonyms for "=\fIno\fP". @@ -74,27 +76,27 @@ -\fBetags\fP or, equivalently, when \fBctags\fP is run with the \fI-e\fP -option. These options will be noted. +Some options are either ignored, or only useful, when \fBexctags\fP is run -+with the \fI-e\fP option emulating the behavior of \fBetags\fP. These options will be noted. ++with the \fI-e\fP option emulating the behavior of \fBetags\fP. These options ++will be noted. Most options may appear anywhere on the command line, affecting only those files which follow the option. A few options, however, must appear before the -@@ -210,18 +206,18 @@ +@@ -210,18 +208,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 --the first file name. -+Output a tag file for use with Emacs. If this program is executed with the -+option \fI-e\fP (etags like behavior), this option is enabled by default. -+This option must appear before the first file name. ++Output a tag file for use with Emacs. If this program is executed with the option ++\fI-e\fP (\fBetags\fP like behavior) 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 -"-", then the tag file is written to standard output instead. \fBCtags\fP -+"-", then the tag file is written to standard output instead. \fBExCtags\fP ++"-", then the tag file is written to standard output instead. \fBEXCtags\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 @@ -102,7 +104,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 +268,7 @@ +@@ -272,7 +270,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 @@ -111,7 +113,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 -@@ -395,9 +391,9 @@ +@@ -399,9 +397,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 @@ -123,16 +125,25 @@ \fB--file-scope\fP=\fIno file\fP). This option must appear before the first file name. -@@ -595,7 +591,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. -@@ -749,9 +745,9 @@ +@@ -619,7 +617,7 @@ + + .TP 5 + \fB--filter\fP=\fIyes\fP|\fIno\fP +-Causes \fBctags\fP to behave as a filter, reading source file names from ++Causes \fBexctags\fP to behave as a filter, reading source file names from + 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 +631,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 +-application reading the output of ctags to determine when the output for each ++application reading the output of exctags to determine when the output for each + 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 +775,9 @@ .TP 5 \fB--lang\fP=\fIauto\fP|\fIc\fP|\fIc++\fP|\fIeiffel\fP|\fIfortran\fP|\fIjava\fP @@ -144,7 +155,7 @@ be used for every supplied file instead of automatically selecting the language based upon its extension. The default is \fIauto\fP. -@@ -778,7 +774,7 @@ +@@ -806,7 +804,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 @@ -153,7 +164,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 -@@ -789,7 +785,7 @@ +@@ -817,7 +815,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 @@ -162,25 +173,7 @@ .TP 5 \fB--links\fP=\fIyes\fP|\fIno\fP -@@ -798,7 +794,7 @@ - - .TP 5 - \fB--filter\fP=\fIyes\fP|\fIno\fP --Causes \fBctags\fP to behave as a filter, reading source file names from -+Causes \fBexctags\fP to behave as a filter, reading source file names from - 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. Files are read from standard output only after -@@ -811,7 +807,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 --application reading the output of ctags to determine when the output for each -+application reading the output of exctags to determine when the output for each - 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 -@@ -829,7 +825,7 @@ +@@ -834,7 +832,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 @@ -189,7 +182,7 @@ \fBNote:\fP This option is not supported on all platforms at present. .TP 5 -@@ -842,14 +838,14 @@ +@@ -847,14 +845,14 @@ .TP 5 \fB--totals\fP=\fIyes\fP|\fIno\fP Prints statistics about the source files read and the tag file written during @@ -206,7 +199,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 -@@ -857,13 +853,13 @@ +@@ -862,13 +860,13 @@ .TP 5 \fB--version\fP @@ -222,25 +215,24 @@ looking like this in the most general case: .PP -@@ -908,8 +904,8 @@ +@@ -913,8 +911,8 @@ being overwritten rather than a source file. .PP -When this program is invoked by the name \fBetags\fP, or with the \fB-e\fP -option, the output file is in a different format that is used by \fBemacs\fP(1). -+When this program is invoked with the \fB-e\fP option, the output file is in -+a different format that is used by \fBemacs\fP(1). ++When this program is invoked with the \fB-e\fP option, the output file is ++in a different format that is used by \fBemacs\fP(1). .PP Note that the name of each source file will be recorded in the tag file -@@ -918,14 +914,14 @@ +@@ -923,14 +921,14 @@ be recorded in that same manner in the tag file. .PP -This version of \fBctags\fP imposes no formatting requirements. Other versions --of ctags tended to rely upon certain formatting assumptions in order to help -+This version of \fBexctags\fP imposes no formatting requirements. Other versions -+of exctags tended to rely upon certain formatting assumptions in order to help ++This version of \fBctags\fP (i.e., \fBexctags\fP) imposes no formatting requirements. Other versions + of ctags tended to rely upon certain formatting assumptions in order to help it resolve coding dilemmas caused by preprocessor conditionals. .PP @@ -252,7 +244,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: -@@ -950,19 +946,19 @@ +@@ -955,19 +953,19 @@ .RE .PP @@ -271,11 +263,11 @@ .PP -\fBCtags\fP will also try to specially handle arguments lists enclosed in -+\fBExCtags\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: -@@ -989,7 +985,7 @@ +@@ -994,7 +992,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 @@ -284,7 +276,7 @@ same pathnames for \fIfile(s)\fP (this can be overridden with \fB-p\fP). -@@ -1064,7 +1060,7 @@ +@@ -1070,7 +1068,7 @@ .TP 8 .B CTAGS If this enviroment variable exists, it will be expected to contain a set of @@ -293,28 +285,36 @@ 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 -@@ -1073,8 +1069,8 @@ +@@ -1079,7 +1077,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 --try to use \fBCTAGS\fP instead. -+read when \fBexctags\fP starts with \fI-e\fP option. If this variable is not -+found, \fBexctags\fP will try to use \fBCTAGS\fP instead. ++read when \fBexctags\fP starts with option \fI-e\fP. If this variable is not found, \fBexctags\fP will + try to use \fBCTAGS\fP instead. + + .TP 8 +@@ -1088,12 +1086,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 + 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 + utility of the operating system is being used, it will generally observe this +-variable also. Note that if \fBctags\fP is setuid, the value of TMPDIR will be ++variable also. Note that if \fBexctags\fP is setuid, the value of TMPDIR will be + ignored. .SH "HOW TO USE WITH VI" - Vi will, by default, expect a tag file by the name "tags" in the current -@@ -1117,7 +1113,7 @@ +@@ -1137,20 +1135,20 @@ .SH "BUGS (CAVEATS)" -\fBCtags\fP has as many options as \fBls\fP(1). -+\fBExCtags\fP has as many options as \fBls\fP(1). - - .PP - White space is treated as a separator for file names and options read from -@@ -1127,12 +1123,12 @@ - etc.) through these options. ++\fBEXCtags\fP has as many options as \fBls\fP(1). .PP -Because \fBctags\fP is neither a preprocessor nor a compiler, use of @@ -330,7 +330,13 @@ such problems by using the \fB-I\fP option. .PP -@@ -1142,7 +1138,7 @@ + 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 ++\fBexctags\fP cannot determine whether the scope specifier is a class name or a + namespace specifier and always lists it as a class name in the scope portion + of the extension flags. + +@@ -1168,7 +1166,7 @@ use the \fB--lang\fP option. .PP @@ -339,7 +345,21 @@ 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: -@@ -1185,10 +1181,10 @@ +@@ -1201,21 +1199,21 @@ + .SH "FILES" + .PD 0 + .TP 10 +-.I /etc/ctags.conf ++.I /etc/exctags.conf + .TP 10 +-.I /usr/local/etc/ctags.conf ++.I /usr/local/etc/exctags.conf + .TP 10 +-.I $HOME/.ctags ++.I $HOME/.exctags + .TP 10 +-.I .ctags ++.I .exctags .br .PD 1 If any of these configuration files exist, each will be expected to contain a @@ -348,11 +368,13 @@ 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 +-additional configuration file immediately before $HOME/.ctags, which will be +or project-level defaults. It is possible to compile \fBexctags\fP to read an - additional configuration file immediately before $HOME/.ctags, which will be ++additional configuration file immediately before $HOME/.exctags, 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 -@@ -1197,10 +1193,10 @@ + variable or on the command line will override options specified in these +@@ -1223,10 +1221,10 @@ .TP 10 .I tags @@ -361,11 +383,11 @@ .TP 10 .I TAGS -The default tag file created by \fBetags\fP. -+The default tag file created by \fBextags\fP with option \fI-e\fP emulating etags. ++The default tag file created by \fBexctags\fP run with \fI-e\fP option. .SH "SEE ALSO" The official Exuberant Ctags web site at: -@@ -1212,7 +1208,7 @@ +@@ -1238,7 +1236,7 @@ .PP Also \fBex\fP(1), \fBvi\fP(1), \fBelvis\fP, or, better yet, \fBvim\fP, the @@ -374,7 +396,7 @@ Pages web site at: .PP -@@ -1242,7 +1238,7 @@ +@@ -1268,7 +1266,7 @@ .SH "CREDITS" diff -urN /usr/ports/devel/ctags/patches/patch-ab ./patches/patch-ab --- /usr/ports/devel/ctags/patches/patch-ab Wed Dec 31 21:00:00 1969 +++ ./patches/patch-ab Sun Apr 23 17:59:51 2000 @@ -0,0 +1,25 @@ +--- options.c.ORIG Sun Apr 23 17:58:22 2000 ++++ options.c Sun Apr 23 17:59:44 2000 +@@ -1642,18 +1642,18 @@ + static void parseConfigurationFileOptions() + { + const char* const home = getenv("HOME"); +- parseFileOptions("/etc/ctags.conf"); +- parseFileOptions("/usr/local/etc/ctags.conf"); ++ parseFileOptions("/etc/exctags.conf"); ++ parseFileOptions("/usr/local/etc/exctags.conf"); + #ifdef CUSTOM_CONFIGURATION_FILE + parseFileOptions(CUSTOM_CONFIGURATION_FILE); + #endif + if (home != NULL) + { +- vString* const dotFile = combinePathAndFile(home, ".ctags"); ++ vString* const dotFile = combinePathAndFile(home, ".exctags"); + parseFileOptions(vStringValue(dotFile)); + vStringDelete(dotFile); + } +- parseFileOptions(".ctags"); ++ parseFileOptions(".exctags"); + } + + static void parseEnvironmentOptions() >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message