>Number:         9668
>Category:       pkg
>Synopsis:       Please update devel/global to 3.55
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager (NetBSD software packages system bug manager)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Mar 23 13:18:00 2000
>Last-Modified:
>Originator:     Nagae Hidetake
>Organization:
>Release:        Thu Mar 23 2000
>Environment:
	
System: NetBSD dixie.nag.notwork.org 1.4T NetBSD 1.4T (DIXIE) #0: Sun Feb 27 19:25:47 JST 2000 nagae@johnny.nag.notwork.org:/usr/src/sys/arch/i386/compile/DIXIE i386


>Description:
	
global-3.55 has been released.
It supports C++ and Java sources.
>How-To-Repeat:
>Fix:

diff -uPr /usr/pkgsrc/devel/global/Makefile global/Makefile
--- /usr/pkgsrc/devel/global/Makefile	Wed Aug 25 21:44:11 1999
+++ global/Makefile	Fri Mar 24 05:24:37 2000
@@ -1,22 +1,16 @@
 # $NetBSD: Makefile,v 1.3 1999/08/24 12:24:30 hwr 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
 
-LDFLAGS+=	-L../lib
-MAKE_ENV+=      LIBDIR="${PREFIX}/lib"
-MAKE_ENV+=      MANDIR="${PREFIX}/man"
-MAKE_ENV+=      LINTLIBDIR="${PREFIX}/libdata/lint"
-MAKE_ENV+=      BINDIR="${PREFIX}/bin"
-
-pre-install:
-	@if [ ! -d ${PREFIX}/libdata/lint ];then ${MKDIR} ${PREFIX}/libdata/lint;fi
+pre-build:
+	cd ${WRKSRC}; ${MAKE} -f Makefile.generic gen
 
 .include "../../mk/bsd.pkg.mk"
diff -uPr /usr/pkgsrc/devel/global/files/md5 global/files/md5
--- /usr/pkgsrc/devel/global/files/md5	Sat Jan  9 13:17:00 1999
+++ global/files/md5	Fri Mar 24 04:04:38 2000
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1999/01/09 04:17:00 abs Exp $
+$NetBSD$
 
-MD5 (global-3.42.tar.gz) = 90529256e97f9180ef417224735a42fb
+MD5 (global-3.55.tar.gz) = 7d70e8543f50be33172239fe69958c49
diff -uPr /usr/pkgsrc/devel/global/files/patch-sum global/files/patch-sum
--- /usr/pkgsrc/devel/global/files/patch-sum	Fri Jul  9 22:50:35 1999
+++ global/files/patch-sum	Fri Mar 24 05:19:24 2000
@@ -1,5 +1,7 @@
 $NetBSD: patch-sum,v 1.1 1999/07/09 13:50:35 agc Exp $
 
 MD5 (patch-aa) = d45656fb16597f151f01d1572f2098de
-MD5 (patch-ab) = 3fa1b8f192a1209967414679ed9abe0f
-MD5 (patch-ac) = f365e4bb0dfaae250b040b06a655e24e
+MD5 (patch-ab) = 012791c465bf5da9effe2b02ae2cdaaa
+MD5 (patch-ad) = 62772adffd11047901291a41a13a4991
+MD5 (patch-ae) = 3603a35db31c913e3cf4f1f542339fc1
+MD5 (patch-af) = afefd002e94b4e7a7eb502e829414446
diff -uPr /usr/pkgsrc/devel/global/patches/patch-ab global/patches/patch-ab
--- /usr/pkgsrc/devel/global/patches/patch-ab	Tue Apr 27 03:34:42 1999
+++ global/patches/patch-ab	Fri Mar 24 04:00:46 2000
@@ -1,6 +1,6 @@
 $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
+--- libutil/mgets.c.orig	Mon Apr 26 10:57:56 1999
++++ libutil/mgets.c	Mon Apr 26 10:58:24 1999
 @@ -34,6 +34,7 @@
  #include <ctype.h>
  #include <stdio.h>
Only in /usr/pkgsrc/devel/global/patches: patch-ac
diff -uPr /usr/pkgsrc/devel/global/patches/patch-ad global/patches/patch-ad
--- /usr/pkgsrc/devel/global/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ global/patches/patch-ad	Fri Mar 24 04:42:37 2000
@@ -0,0 +1,13 @@
+--- Makefile.generic.orig	Tue Aug 24 22:06:01 1999
++++ Makefile.generic	Fri Mar 24 04:42:06 2000
+@@ -1,8 +1,6 @@
+ ##### EDIT THESE PARAMETERS ###############################################
+-CC     = gcc
+-DESTDIR = /usr
+-BINDIR = $(DESTDIR)/bin
+-MANDIR = $(DESTDIR)/man
++BINDIR = ${PREFIX}/bin
++MANDIR = ${PREFIX}/man
+ ###########################################################################
+ 
+ SUBDIR = libregex libdb libutil global gtags gctags btreeop htags
diff -uPr /usr/pkgsrc/devel/global/patches/patch-ae global/patches/patch-ae
--- /usr/pkgsrc/devel/global/patches/patch-ae	Thu Jan  1 09:00:00 1970
+++ global/patches/patch-ae	Fri Mar 24 05:16:23 2000
@@ -0,0 +1,26 @@
+--- 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 -uPr /usr/pkgsrc/devel/global/patches/patch-af global/patches/patch-af
--- /usr/pkgsrc/devel/global/patches/patch-af	Thu Jan  1 09:00:00 1970
+++ global/patches/patch-af	Fri Mar 24 05:19:11 2000
@@ -0,0 +1,18 @@
+--- 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 -uPr /usr/pkgsrc/devel/global/pkg/PLIST global/pkg/PLIST
--- /usr/pkgsrc/devel/global/pkg/PLIST	Sat Jan  9 13:17:01 1999
+++ global/pkg/PLIST	Fri Mar 24 05:04:01 2000
@@ -4,15 +4,8 @@
 bin/global
 bin/gtags
 bin/htags
-bin/systags
-lib/libgloutil.a
-lib/libgloutil_pic.a
-libdata/lint/llib-lgloutil.ln
-man/cat1/btreeop.0
-man/cat1/gctags.0
-man/cat1/global.0
-man/cat1/gtags.0
 man/man1/btreeop.1
 man/man1/gctags.1
 man/man1/global.1
 man/man1/gtags.1
+man/man1/htags.1
>Audit-Trail:
>Unformatted: