diff -ruN Makefile.orig Makefile
--- Makefile.orig	Tue Apr 12 03:25:09 2005
+++ Makefile	Sun Nov  6 11:08:33 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	global
-PORTVERSION=	4.8.2
+PORTVERSION=	4.8.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@
 USE_REINPLACE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=		gctags.1 global.1 gozilla.1 gtags.1 htags.1
+MAN1=		gtags-parser.1 global.1 gozilla.1 gtags.1 htags.1
 INFO=		global
 
 post-patch:
diff -ruN distinfo.orig distinfo
--- distinfo.orig	Wed Jan 12 04:39:24 2005
+++ distinfo	Sun Nov  6 11:08:33 2005
@@ -1,2 +1,2 @@
-MD5 (global-4.8.2.tar.gz) = ec0b03ea8042ed84b6d9f607e24f6360
-SIZE (global-4.8.2.tar.gz) = 641674
+MD5 (global-4.8.7.tar.gz) = 35eec852b398f07e99cee08e9f6dd3c1
+SIZE (global-4.8.7.tar.gz) = 693894
diff -ruN files/patch-gnusort::memcoll.c.orig files/patch-gnusort::memcoll.c
--- files/patch-gnusort::memcoll.c.orig	Thu Jan  1 00:00:00 1970
+++ files/patch-gnusort::memcoll.c	Sun Nov  6 11:08:33 2005
@@ -0,0 +1,13 @@
+--- gnusort/memcoll.c.orig	Thu Sep 29 23:56:43 2005
++++ gnusort/memcoll.c	Sun Nov  6 10:22:40 2005
+@@ -21,6 +21,10 @@
+ # include <config.h>
+ #endif
+ 
++# ifdef HAVE_ALLOCA
++#  include <stdlib.h>
++# endif
++
+ /* #ifndef __GNUC__ */
+ # ifdef HAVE_ALLOCA_H
+ #  include <alloca.h>
diff -ruN files/patch-gozilla::gozilla.c.orig files/patch-gozilla::gozilla.c
--- files/patch-gozilla::gozilla.c.orig	Thu Jan  1 00:00:00 1970
+++ files/patch-gozilla::gozilla.c	Sun Nov  6 11:32:18 2005
@@ -0,0 +1,11 @@
+--- gozilla/gozilla.c.orig	Thu Sep 29 23:56:43 2005
++++ gozilla/gozilla.c	Sun Nov  6 11:30:38 2005
+@@ -423,7 +423,7 @@
+ #endif
+ 		strbuf_sprintf(URL, "file://%s", p);
+ 		if (linenumber)
+-			strbuf_sprintf(URL, "#%d", linenumber);
++			strbuf_sprintf(URL, "#L%d", linenumber);
+ 		strbuf_close(sb);
+ 	} else {
+ 		/*
diff -ruN pkg-plist.orig pkg-plist
--- pkg-plist.orig	Wed Jan 12 04:39:24 2005
+++ pkg-plist	Sun Nov  6 11:08:33 2005
@@ -1,4 +1,4 @@
-bin/gctags
+bin/gtags-parser
 bin/global
 bin/gnusort
 bin/gozilla
@@ -21,5 +21,6 @@
 share/gtags/gtags.pl
 share/gtags/gtags.vim
 share/gtags/nvi-1.79-gtags.diff
+share/gtags/style.css
 @dirrm share/gtags
 %%PORTDOCS%%@dirrm %%DOCSDIR%%