Update devel/global to 5.2. Based on patch provided by Ryo HAYASAKA in PR 34570

and by Murray Armfield in PR 34636.

Version 5.2 - August 8 2006, by Shigio YAMAGUCHI

* htags: Added new options:
  - -h(--func-header) option.
  - -I(--icon) option.
  - -T(table-flist[=fields]) option.
  Suggested options:
        $ htags -vsanohIT
* htags: Changed the default color of braces from blue to red to make them stand out.
* htags: Always enable 'Grep pattern' form when the -f(--form) option specified.
  Removed config variable 'enable_grep' since it became meaningless. Instead, added
  a new variable 'disable_grep'.
* htags: Removed config variable 'enable_grep' since it is meaningless.
  Instead, added a new variable 'disable_grep'.
* htags: Added more profitable tips in file browser.
  - File        size of bytes
  - Directory   number of files in the directory.

Version 5.1 - June 10 2006, by Shigio YAMAGUCHI

[INCOMPATIBLE CHANGES]
* Changed the priority about the --result option to make the format
  specification easy. The --result option is given to priority more
  than the -t and -x option. (This option appeared in version 5.0.)

[OTHER CHANGES]
* Added new program 'gtags-cscope'.
  Gtags-cscope is a pseudo cscope which implements the line-oriented
  interface. You can use this command for various clients instead of
  true cscope.
* Added new format 'cscope' to the argument of --result=<format>.

Version 5.0 - April 21 2006, by Shigio YAMAGUCHI

[INCOMPATIBLE CHANGES]
* Moved to new tag format. (GTAGS, GRTAGS, GSYMS, GPATH)
  The purpose is as follows:
  o Allows path name including blanks, at least in tag files.
    (GLOBAL still doesn't support path name which contains blanks.)
  o Decrease disk space used.
  o Make tag format simpler.
  o Realize stable performance.

  Hereafter, older tag format is not supported.
  Compact format was progressively canceled with the adoption of
  the new tag format. The -c(--compact) option of gtags(1) was removed.

  The following error messages are displayed in a wrong combination:
  - older global and new tag file
    $ global -x main
    GTAGS seems new format. Please install the latest GLOBAL.
  - new global and older tag file
    $ global -x main
    GTAGS seems older format. Please remake tag files.

  Known problem:
  - older global and new tag file
    Global(1) with the -g or -P command will always work as if invoked
    with the -o option. There is no way to avoid this problem.

New requirement:
* Added new requirement of plug-in parser
  Plug-in parser must process arguments in the order they are given
  in the command line. In each file, any order is acceptable.
  Exuberant Ctags with the -xu option meets this requirement.
  (See global.info for the detail.)

Removed options:
* gtags(1): The -c(--compact) option was removed.
  Compact format was progressively canceled with the adoption of the new
  tag format.
* gtags(1): The -o(--omit-gsyms) option was removed.
  This option was necessary in the past to use the program in a incompetent
  machine with a small hard disk. Since most recent machines has powerful
  CPU and mass hard disk. This options might already be unnecessary.
* htags(1): The --style-sheet option was removed.
  This is a really halfway option, and now nobody might need it because
  the --xhtml option became available.

[OTHER CHANGES]
New options:
* global: Added --result=<format> option. Grep format is newly supported.

  <format>: path,ctags,ctags-x,grep

  conventional option | newly added option
  --------------------+---------------------
  (none)              | --result=path
  -t                  | --result=ctags
  -x                  | --result=ctags-x
                      | --result=grep

  The -t and -x option are given to priority more than the --result
  option.

Version 4.8.7 - September 30 2005, by Shigio YAMAGUCHI

New options:
* gtags: New --file file-list option added.
  Gtags(1) accept a file list specified by --file option.

        % find . -type f -print >/tmp/list
        % gtags --file=/tmp/list
        or
        % find . -type f -print | gtags --file=-

* gtags: New --max-args option added.

Improvement of efficiency:
* Gtags was improved of performance by changing algorithm of
  incremental updating. Along with it, the verbose message was
  greatly changed.
* Gtags was improved of performance by decreasing the frequency
  of the parser invoking.
  Under the influence of it, the verbose message is not necessarily
  real-time. If you dislike this behavior, use the --max-args
  option of gtags. You can control the frequency of the invoking
  with the option. With --max-args=1, the program does the same
  behavior as older version.
* Htags was improved of performance by decreasing the frequency
  of the parser invoking.
* Htags was improved of performance by omiting flushing temporary
  files to the disk.

Fixed bugs:
* Htags didn't treat here document of PHP source code correctly.
  (<<<WORD)
* Htags didn't treat HTML part of PHP source code correctly.

Other facilities:
* Added 'Htags Hyper-text Reference Kit'.
  The hyper-text generated by htags(1) is available from external
  programs. This kit helps you to convert the path of the source
  file into the URL in the hyper-text.

* doc/global.txi: Added the usage of Doxygen using GLOBAL.

Version 4.8.6 - May 12 2005, by Shigio YAMAGUCHI

[INCOMPATIBLE CHANGES]
* htags: Changed the value of id attribute and name attribute of
  line number anchor from line number itself to 'L' + line number
  like this.
        <a name='100'> => <a name='L100'>
  It is because XHTML prohibit the id attribute which starts
  with a digit. If you refer these anchors from outer system,
  please rewrite it.

[OTHER CHANGES]
* htags: New option --insert-header and --insert-footer added.

Version 4.8.5 - April 19 2005, by Shigio YAMAGUCHI

* htags: XHTML support(--xhtml) added.
  If the --frame option is specified then generate XHTML-1.0 Frameset,
  else if config variable 'xhtml_version' is set to 1.1 then generate
  XHTML-1.1 else XHTML 1.0 Transitional.
  You can customize the appearance using style sheet file 'style.css'.
* htags: Added config variable 'xhtml_version'.
* htags: Added 'html/' to the fault skip list of htags(1).
  It is the output directory of doxygen document.
* gtags-parser: Added yacc directives introduced in bison-2.0.
  %default-prec(%default_prec)
  %expect-rr(%expect_rr)
  %initial-action
  %no-default-prec(%no_default_prec,%no_default-prec,%no-default_prec)
  %nondeterministic-parser

Version 4.8.4 - March 4 2005, by Shigio YAMAGUCHI

Fixed bugs:
* gtags-parser: C and C++ parser was broken.
* gnusort: Compile error in Solaris environment.

Version 4.8.3 - February 26 2005, by Shigio YAMAGUCHI

[INCOMPATIBLE CHANGES]
* DOS and Windows 32 support ended.
  But it doesn't mean the deletion of the code for DOS and Windows 32.
  We leave the support to outside projects and accept the code
  from them as is. Therefore, anything has not changed substantially
  up to now.
* Command gctags(1) was renamed to gtags-parser(1) because some systems
  have another 'gctags' which is not GLOBAL's.
* About gtags-parser(1), language type of source file is decided
  only by the suffix. In older version, *.h file was considered
  to be C++ source file if it includes token 'class'. But the new version
  considers it always C source file. If you want to consider it C++
  then you must redefine new config variable 'langmap'.

[OTHER CHANGES]
Fixed bugs:
* htags: The --gtagsconf and --gtagslabel option didn't work correctly.
* htags: Buffer overflow occurred in dupindex.c:makedupindex().
* htags: Could not ignore path name which includes blank correctly.
New features:
* gtags,htags: New config variable 'langmap' added.
  This variable is used for customizing the mapping of languages and the
  parsers, and it includes the function of obsoleted 'suffixes' variable.
  If you use 'suffixes' then it is effective else GLOBAL internally
  generates the value of 'suffixes' from the 'langmap'.
  The reason to continue 'suffixes' is that it is needed for plug-in parser.
  If you don't use plug-in parser then you should use 'langmap' instead.
* htags: New config variable 'copy_files' added.
  If the -f option is used then htags makes links of tag files in 'cgi-bin'
  directory by default. With this variable, htags copy tag files instead of
  linking.

Version 4.8.2 - November 11 2004, by Shigio YAMAGUCHI

[INCOMPATIBLE CHANGES]
* Postgres support ended.
* Htags.pl (perl version of htags) was removed completely.
* Config variable sed_command and sort_command were removed.
  The sed(1) and sort(1) are not necessary any longer.

[OTHER CHANGES]
Fixed bugs:
* Wrong output of 'global -Po' was fixed.

New features:
* gctags(assembly language):
  - In addition to `call', `jsr' is recognized as call instruction.
    Although various call instructions exist like `bl' or `calls',
    only `call' and `jsr' are used widely.
  - Macros like ENTRY or EXT are taken up as reference,
    when definitions exist in somewhere else.
  - Warning is displayed when a comment is not closed.
  - C_SYMBOL_NAME and C_ENTRY are recognized as a macro
    which shows the start of a function.
  - The string which is not closed finishes at the end of line.
    This behavior is the same as GNU C preprocessor.
  - The check of correspondence of "#if" and "#endif" was deleted.
    This did not exist in version 4.8.
* New directory '.snprj/' was added to the DEFAULTSKIP list.
  This is the tag directory of Source-Navigator.

Version 4.8.1 - October 6 2004, by Shigio YAMAGUCHI

Fixed bugs:
* htags: The -d option of htags didn't work.
* htags: didn't recognize continued line and null directive(#).

New features:
* htags: make suffix list of include file configurable.
  (See man htags(1). config variables: include_file_suffixes)
* htags: try TMP if TMPDIR doesn't exist.(only DJGPP)
* htags: Warn about unknown preprocessing directive. As the exception,
  when unknown preprocessing directive appeared in assembly source,
  it will be recognized as the start of a shell comment.
* htags: Add all yacc directives understood by bison-1.875.

4 files changed, 49 insertions, 38 deletions

diff --git a/devel/global/DESCR b/devel/global/DESCR
index 2014c900b24..7fb5c80cb98 100644
--- a/devel/global/DESCR
+++ b/devel/global/DESCR
@@ -1,15 +1,14 @@
-GLOBAL is a source code tag system that works the same way across
-diverse environments. Currently, it supports the following:
+GNU GLOBAL is a source code tag system that works the same way across
+diverse environments.  GNU GLOBAL has following features:
 
-    Shell command line
-    nvi editor
-    Web browser
-    emacs editor
-    elvis editor
-
-Supported languages are C, Yacc and Java.  You can locate a specified
-function in the source files and move there easily.  It is useful for
-hacking a large project containing many subdirectories, many '#ifdef'
-and many main() functions, like MH, X or BSD kernel.  GLOBAL consists
-of global(1), gtags(1), btreeop(1), gctags(1), htags(1), extended
-vi(1), gtags.el and gozilla(1).
+    * support C, C++, Yacc, Java and PHP4.
+    * work the same way across diverse environments. Currently, support
+      followings:
+          o Generic shell command line
+          o Bash shell
+          o Vi clone editor (nvi, elvis, vim)
+          o Emacs editor (emacs, mule, xemacs)
+          o Glimmer editor
+          o Less viewer
+          o Web browser (See UNIX kernel source tour!.)
+          o Doxygen documentation system
diff --git a/devel/global/Makefile b/devel/global/Makefile
index db5a6cc7848..a9c306612cc 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,26 +1,18 @@
-# $NetBSD: Makefile,v 1.22 2006/03/30 03:44:43 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/14 14:14:52 obache Exp $
 #
 
-DISTNAME=	global-4.8
+DISTNAME=	global-5.2
 CATEGORIES=	devel
-MASTER_SITES=   http://www.tamacom.com/global/
+MASTER_SITES=	${MASTER_SITE_GNU:=global/} \
+		http://tamacom.com/global/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.tamacom.com/global/
+HOMEPAGE=	http://www.gnu.org/software/global/
 COMMENT=	Source code tag system including web browser output
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
+INFO_FILES=		YES
 USE_TOOLS+=		perl:run
-INFO_FILES=		# PLIST
-
-LDFLAGS+=	-L../libutil
-MAKE_ENV+=      LIBDIR="${PREFIX}/lib"
-MAKE_ENV+=      MANDIR="${PREFIX}/man"
-MAKE_ENV+=      LINTLIBDIR="${PREFIX}/libdata/lint"
-MAKE_ENV+=      BINDIR="${PREFIX}/bin"
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/lint
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/global/PLIST b/devel/global/PLIST
index 1877bcface3..986bf947c48 100644
--- a/devel/global/PLIST
+++ b/devel/global/PLIST
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:43 jlam Exp $
-bin/gctags
+@comment $NetBSD: PLIST,v 1.11 2006/11/14 14:14:52 obache Exp $
 bin/global
 bin/gozilla
 bin/gtags
+bin/gtags-cscope
+bin/gtags-parser
 bin/htags
-bin/htags.pl
 info/global.info
-man/man1/gctags.1
 man/man1/global.1
 man/man1/gozilla.1
+man/man1/gtags-cscope.1
+man/man1/gtags-parser.1
 man/man1/gtags.1
 man/man1/htags.1
 share/gtags/AUTHORS
@@ -27,7 +28,26 @@ share/gtags/gtags.conf
 share/gtags/gtags.el
 share/gtags/gtags.pl
 share/gtags/gtags.vim
+share/gtags/icons/back.png
+share/gtags/icons/bottom.png
+share/gtags/icons/c.png
+share/gtags/icons/dir.png
+share/gtags/icons/first.png
+share/gtags/icons/help.png
+share/gtags/icons/index.png
+share/gtags/icons/last.png
+share/gtags/icons/left.png
+share/gtags/icons/n_bottom.png
+share/gtags/icons/n_first.png
+share/gtags/icons/n_last.png
+share/gtags/icons/n_left.png
+share/gtags/icons/n_right.png
+share/gtags/icons/n_top.png
+share/gtags/icons/pglobe.png
+share/gtags/icons/right.png
+share/gtags/icons/text.png
+share/gtags/icons/top.png
 share/gtags/nvi-1.79-gtags.diff
+share/gtags/style.css
+@dirrm share/gtags/icons
 @dirrm share/gtags
-@exec ${MKDIR} %D/libdata/lint
-@dirrm libdata/lint
diff --git a/devel/global/distinfo b/devel/global/distinfo
index 3bd0ae3280f..01784a5a3df 100644
--- a/devel/global/distinfo
+++ b/devel/global/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 22:24:15 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/11/14 14:14:52 obache Exp $
 
-SHA1 (global-4.8.tar.gz) = 4117c62cdb26c65bd5c8d115a02dd4e1dfaca54a
-RMD160 (global-4.8.tar.gz) = 84d41886e29c9dd10fc378691b0e168b5632b3a9
-Size (global-4.8.tar.gz) = 591811 bytes
+SHA1 (global-5.2.tar.gz) = 6e83c9eaa9d454fd3f2d8aaf6d9f27ad96d58a32
+RMD160 (global-5.2.tar.gz) = 064bbbd82bdcc41e8361a4ce54ee12e557dc6e74
+Size (global-5.2.tar.gz) = 717473 bytes