Update global to 3.55

Fixes pkg/9668 by nagae@tk.airnet.ne.jp

What's New since 3.54
	The -g and -s option are optimized.
	Above serious bug is fixed.
What's New since 3.5
	Ported to Cygwin tools for WIN32 environment.
	(You need Cygwin tools Release B20.1)
	Gozilla ported to WIN32 environment.(You need Borland C compiler)
	Gtags.el was improved.
	Ported to Solaris.
What's New since 3.44
	C++ supported.
	XEmacs supported.
	Ported to WIN32 environment.(You need Borland C++ compiler 4.5 or 5.0)

10 files changed, 84 insertions, 40 deletions

diff --git a/devel/global/Makefile b/devel/global/Makefile
index d77d2bf2bcd..885b51a5109 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 1999/08/24 12:24:30 hwr Exp $
+# $NetBSD: Makefile,v 1.4 2000/04/21 06:46:11 sakamoto Exp $
 #
 
-DISTNAME=	global-3.42
+DISTNAME=	global-3.55
 CATEGORIES=	devel
-MASTER_SITES=   http://wafu.netgate.net/tama/unix/
+MASTER_SITES=   http://www.tamacom.com/unix/
 
 MAINTAINER=	abs@netbsd.org
 HOMEPAGE=	http://www.tamacom.com/global/
 
-PERL5=		yes
+USE_PERL5=	yes
 
-LDFLAGS+=	-L../lib
+LDFLAGS+=	-L../libutil
 MAKE_ENV+=      LIBDIR="${PREFIX}/lib"
 MAKE_ENV+=      MANDIR="${PREFIX}/man"
 MAKE_ENV+=      LINTLIBDIR="${PREFIX}/libdata/lint"
diff --git a/devel/global/files/md5 b/devel/global/files/md5
index 0358f75bb75..425fc7cf618 100644
--- a/devel/global/files/md5
+++ b/devel/global/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1999/01/09 04:17:00 abs Exp $
+$NetBSD: md5,v 1.2 2000/04/21 06:46:12 sakamoto Exp $
 
-MD5 (global-3.42.tar.gz) = 90529256e97f9180ef417224735a42fb
+MD5 (global-3.55.tar.gz) = 7d70e8543f50be33172239fe69958c49
diff --git a/devel/global/files/patch-sum b/devel/global/files/patch-sum
index 166ce8de038..6c8131602a9 100644
--- a/devel/global/files/patch-sum
+++ b/devel/global/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:35 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/21 06:46:12 sakamoto Exp $
 
-MD5 (patch-aa) = d45656fb16597f151f01d1572f2098de
-MD5 (patch-ab) = 3fa1b8f192a1209967414679ed9abe0f
-MD5 (patch-ac) = f365e4bb0dfaae250b040b06a655e24e
+MD5 (patch-ab) = 2f7523143a210005f0e07eb4438de3f5
+MD5 (patch-ad) = accc2f336781aac950919c289e45376a
+MD5 (patch-ae) = 017926d41b47acb52f2145b86614daf4
+MD5 (patch-af) = 92d7819dee02267f3da86f0e60a1b74e
diff --git a/devel/global/patches/patch-aa b/devel/global/patches/patch-aa
deleted file mode 100644
index 18caa000f6a..00000000000
--- a/devel/global/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/01/09 04:17:00 abs Exp $
-
---- htags/htags.pl.orig	Fri Jan  8 19:51:30 1999
-+++ htags/htags.pl	Fri Jan  8 19:52:45 1999
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- #
- # Copyright (c) 1996, 1997, 1998 Shigio Yamaguchi. All rights reserved.
- #
diff --git a/devel/global/patches/patch-ab b/devel/global/patches/patch-ab
index 801e00fa24c..4839210e4ed 100644
--- a/devel/global/patches/patch-ab
+++ b/devel/global/patches/patch-ab
@@ -1,11 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1999/04/26 18:34:42 garbled Exp $
---- lib/mgets.c.orig	Mon Apr 26 10:57:56 1999
-+++ lib/mgets.c	Mon Apr 26 10:58:24 1999
-@@ -34,6 +34,7 @@
- #include <ctype.h>
+--- libutil/mgets.c.orig	Wed Aug 18 11:02:42 1999
++++ libutil/mgets.c	Fri Apr 21 15:14:23 2000
+@@ -39,4 +39,5 @@
  #include <stdio.h>
  #include <stdlib.h>
 +#include <string.h>
  
  #include "die.h"
- #include "mgets.h"
diff --git a/devel/global/patches/patch-ac b/devel/global/patches/patch-ac
deleted file mode 100644
index b590eeba443..00000000000
--- a/devel/global/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/04/26 18:34:42 garbled Exp $
---- lib/getdbpath.c.orig	Mon Apr 26 11:02:00 1999
-+++ lib/getdbpath.c	Mon Apr 26 11:02:21 1999
-@@ -37,6 +37,7 @@
- 
- #include <unistd.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "die.h"
- #include "getdbpath.h"
diff --git a/devel/global/patches/patch-ad b/devel/global/patches/patch-ad
new file mode 100644
index 00000000000..362977f1bd4
--- /dev/null
+++ b/devel/global/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2000/04/21 06:46:12 sakamoto Exp $
+
+--- Makefile.inc.orig	Sat Sep 18 15:42:34 1999
++++ Makefile.inc	Fri Apr 21 14:35:11 2000
+@@ -3,10 +3,10 @@
+ GLOBAL_MAKEFILE_INC_BEEN_HERE=yes
+ BINDIR?=	/usr/bin
+-LDDESTDIR=	-L${.OBJDIR}/../libutil \
++LDFLAGS+=	-L${.OBJDIR}/../libutil \
+ 		-L${.OBJDIR}/../libdb
+ LDADD=		-lgloutil -lglodb
+ DPADD=		${.OBJDIR}/../libutil/libgloutil.a \
+ 		${.OBJDIR}/../libdb/libglodb.a
+-CFLAGS+=	-I${.CURDIR} \
++CPPFLAGS+=	-I${.CURDIR} \
+ 		-I${.CURDIR}/../libutil \
+ 		-I${.CURDIR}/../libdb \
diff --git a/devel/global/patches/patch-ae b/devel/global/patches/patch-ae
new file mode 100644
index 00000000000..2f02d1a3218
--- /dev/null
+++ b/devel/global/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.1 2000/04/21 06:46:12 sakamoto Exp $
+
+--- global/global.1.orig	Tue Jan 25 17:52:23 2000
++++ global/global.1	Fri Mar 24 05:14:26 2000
+@@ -109,6 +109,7 @@
+ print the locations of specified symbol other than function names.
+ You need GSYMS tags file. See
+ .Xr gtags 1 .
++.El
+ .Sh OPTIONS
+ The following options are available:
+ .Bl -tag -width Ds
+@@ -131,6 +132,7 @@
+ .It Fl x
+ In addition to the default output, produce the line number and
+ the line contents.
++.El
+ .Sh FILES
+ .Bl -tag -width tags -compact
+ .It Pa GTAGS
+@@ -155,6 +157,7 @@
+ If this variable is set, its value is used as the path to search for library
+ functions. If specified function is not found in a source tree,
+ global search in these path too.
++.El
+ .Sh DIAGNOSTICS
+ .Nm Global
+ exits with a non 0 value if an error occurred, 0 otherwise.
diff --git a/devel/global/patches/patch-af b/devel/global/patches/patch-af
new file mode 100644
index 00000000000..16927bfbf3a
--- /dev/null
+++ b/devel/global/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2000/04/21 06:46:13 sakamoto Exp $
+
+--- htags/htags.1.orig	Fri Aug 27 17:16:30 1999
++++ htags/htags.1	Fri Mar 24 05:18:25 2000
+@@ -103,6 +103,7 @@
+ .It Ar dir
+ The directory in which hypertext is generated. The default is the current
+ directory.
++.El
+ .Sh EXAMPLES
+   % cd /usr/src/sys
+   # gtags
+@@ -124,6 +125,7 @@
+ .It Ev TMPDIR
+ If this variable is set, its value is used as the directory to make temporary files.
+ The default is /tmp.
++.El
+ .Sh DIAGNOSTICS
+ .Nm Htags
+ exits with a non 0 value if an error occurred, 0 otherwise.
diff --git a/devel/global/pkg/PLIST b/devel/global/pkg/PLIST
index 002c7a63623..9bb92c44709 100644
--- a/devel/global/pkg/PLIST
+++ b/devel/global/pkg/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 1999/01/09 04:17:01 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/04/21 06:46:13 sakamoto Exp $
 bin/btreeop
 bin/gctags
 bin/global
 bin/gtags
 bin/htags
-bin/systags
+lib/libglodb.a
+lib/libglodb_pic.a
 lib/libgloutil.a
 lib/libgloutil_pic.a
+libdata/lint/llib-lglodb.ln
 libdata/lint/llib-lgloutil.ln
 man/cat1/btreeop.0
 man/cat1/gctags.0