- Update to 6.3.3

- Add LICENSE
- Strip shared library
- Sort USES
- Use PORTDOCS
- Remove x-generate-plist:
- Take maintainership

Changes:	http://www.gnu.org/software/global/whatsnew.html

5 files changed, 68 insertions, 48 deletions

diff --git a/devel/global/Makefile b/devel/global/Makefile
index f61f22f5e7e9..7e41b6069185 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -2,32 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	global
-PORTVERSION=	6.2.8
-PORTREVISION=	1
+PORTVERSION=	6.3.3
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Source code tag system
 
+LICENSE=	GPLv3
+
+OPTIONS_DEFINE=	DOCS
+
 GNU_CONFIGURE=	yes
-USES=		perl5 libtool
+INSTALL_TARGET=	install-strip
+USES=		libtool perl5
 
 INFO=		global
-
-DOCS=		AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README THANKS
+PORTDOCS=	AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README THANKS
 
 post-patch:
-	${REINPLACE_CMD} -E 's,^(gtags_DATA = )AUTHORS .* THANKS( \\$$),\1\2,' ${WRKSRC}/Makefile.in
-
-OPTIONS_DEFINE=	DOCS
+	@${REINPLACE_CMD} -e '/^gtags_DATA = / s|AUTHOR.*THANKS||' ${WRKSRC}/Makefile.in
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
-# This target is only meant to be used by the port maintainer.
-x-generate-plist:
-	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,;s,(@dirrm )share/doc/global,%%PORTDOCS%%\1%%DOCSDIR%%,;s,share/doc/global,%%PORTDOCS%%%%DOCSDIR%%,;s,^info/.+,,'|${TR} -s '\n') > temp-pkg-plist
+regression-test test: build
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/devel/global/distinfo b/devel/global/distinfo
index 4b2767e7938c..f329403ad9b1 100644
--- a/devel/global/distinfo
+++ b/devel/global/distinfo
@@ -1,2 +1,2 @@
-SHA256 (global-6.2.8.tar.gz) = c1ed3b2500e00d3fb5dbf23d7e7e6b4feb1af45c12015ef9030114e76628cfd0
-SIZE (global-6.2.8.tar.gz) = 1313627
+SHA256 (global-6.3.3.tar.gz) = dd05090c0ab1e41cb79f60796b760a81ca33af4486b3707a3ec749265e430249
+SIZE (global-6.3.3.tar.gz) = 2901056
diff --git a/devel/global/files/patch-gozilla-Makefile.in b/devel/global/files/patch-gozilla-Makefile.in
new file mode 100644
index 000000000000..aef157e0b20a
--- /dev/null
+++ b/devel/global/files/patch-gozilla-Makefile.in
@@ -0,0 +1,13 @@
+--- gozilla/Makefile.in.orig	2014-11-26 10:49:49.000000000 +0800
++++ gozilla/Makefile.in	2014-12-15 16:39:41.504317802 +0800
+@@ -734,8 +734,8 @@
+ 	uninstall-man1
+ 
+ install-data-hook:
+-	mkdir -p ${gtagsdir}
+-	chmod 777 ${gtagsdir}
++	mkdir -p $(DESTDIR)$(gtagsdir)
++	chmod 777 $(DESTDIR)$(gtagsdir)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/global/pkg-descr b/devel/global/pkg-descr
index 99e061cde67e..3ab03b40c991 100644
--- a/devel/global/pkg-descr
+++ b/devel/global/pkg-descr
@@ -1,7 +1,13 @@
-GLOBAL is a source code tag system that works the same way across diverse
-environments.  Supported languages are C, C++, Yacc, Java, PHP and Assembly.
-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.
+GNU GLOBAL is a source code tagging system that works the same way across
+diverse environments, such as Emacs editor, Vi editor, Less viewer, Bash shell,
+various web browsers, etc.
+
+You can locate various objects, such as functions, macros, structs, classes, in
+your source files and move there easily. It is useful for hacking a large
+projects which contain many sub-directories, many #ifdef and many main()
+functions. It is similar to ctags or etags, but is different from them in the
+following two points:
+- Independence of any editor
+- Capability to treat definition and reference
 
 WWW: http://www.gnu.org/software/global/
diff --git a/devel/global/pkg-plist b/devel/global/pkg-plist
index 08a58b364462..7c4bedbf4b79 100644
--- a/devel/global/pkg-plist
+++ b/devel/global/pkg-plist
@@ -4,17 +4,11 @@ bin/gozilla
 bin/gtags
 bin/gtags-cscope
 bin/htags
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
+bin/htags-server
 lib/gtags/exuberant-ctags.a
 lib/gtags/exuberant-ctags.so
+lib/gtags/pygments-parser.a
+lib/gtags/pygments-parser.so
 lib/gtags/user-custom.a
 lib/gtags/user-custom.so
 man/man1/global.1.gz
@@ -22,15 +16,22 @@ man/man1/globash.1.gz
 man/man1/gozilla.1.gz
 man/man1/gtags-cscope.1.gz
 man/man1/gtags.1.gz
+man/man1/htags-server.1.gz
 man/man1/htags.1.gz
 share/gtags/BOKIN_MODEL
 share/gtags/BOKIN_MODEL_FAQ
 share/gtags/BUILD_TOOLS
 share/gtags/DONORS
+share/gtags/PLUGIN_HOWTO
+share/gtags/PLUGIN_HOWTO.pygments
+share/gtags/README.PATCHES
+share/gtags/SERVERSIDE_HOWTO
 share/gtags/bless.sh.tmpl
 share/gtags/completion.cgi.tmpl
+share/gtags/ctags-5.8.patch
 share/gtags/elvis-2.2_0.patch
 share/gtags/elvis.rc
+share/gtags/geco.rc
 share/gtags/ghtml.cgi.tmpl
 share/gtags/global.cgi.tmpl
 share/gtags/globash.rc
@@ -39,7 +40,6 @@ share/gtags/gtags.conf
 share/gtags/gtags.el
 share/gtags/gtags.pl
 share/gtags/gtags.vim
-share/gtags/head.in
 share/gtags/icons/back.png
 share/gtags/icons/bottom.png
 share/gtags/icons/c.png
@@ -59,21 +59,21 @@ share/gtags/icons/pglobe.png
 share/gtags/icons/right.png
 share/gtags/icons/text.png
 share/gtags/icons/top.png
-share/gtags/jquery/images/file.gif
-share/gtags/jquery/images/folder-closed.gif
-share/gtags/jquery/images/folder.gif
-share/gtags/jquery/images/minus.gif
-share/gtags/jquery/images/plus.gif
-share/gtags/jquery/images/treeview-black-line.gif
-share/gtags/jquery/images/treeview-black.gif
-share/gtags/jquery/images/treeview-default-line.gif
-share/gtags/jquery/images/treeview-default.gif
-share/gtags/jquery/images/treeview-famfamfam-line.gif
-share/gtags/jquery/images/treeview-famfamfam.gif
-share/gtags/jquery/images/treeview-gray-line.gif
-share/gtags/jquery/images/treeview-gray.gif
-share/gtags/jquery/images/treeview-red-line.gif
-share/gtags/jquery/images/treeview-red.gif
+share/gtags/jquery/images/file.png
+share/gtags/jquery/images/folder-closed.png
+share/gtags/jquery/images/folder.png
+share/gtags/jquery/images/minus.png
+share/gtags/jquery/images/plus.png
+share/gtags/jquery/images/treeview-black-line.png
+share/gtags/jquery/images/treeview-black.png
+share/gtags/jquery/images/treeview-default-line.png
+share/gtags/jquery/images/treeview-default.png
+share/gtags/jquery/images/treeview-famfamfam-line.png
+share/gtags/jquery/images/treeview-famfamfam.png
+share/gtags/jquery/images/treeview-gray-line.png
+share/gtags/jquery/images/treeview-gray.png
+share/gtags/jquery/images/treeview-red-line.png
+share/gtags/jquery/images/treeview-red.png
 share/gtags/jquery/jquery.js
 share/gtags/jquery/jquery.suggest.css
 share/gtags/jquery/jquery.suggest.js
@@ -81,11 +81,12 @@ share/gtags/jquery/jquery.treeview.css
 share/gtags/jquery/jquery.treeview.js
 share/gtags/jscode_suggest.tmpl
 share/gtags/jscode_treeview.tmpl
-share/gtags/mainpage.dox
-share/gtags/script/README
 share/gtags/script/elvis-global
 share/gtags/script/global-client
 share/gtags/script/gtags-client
 share/gtags/script/htags-client
 share/gtags/script/less-global
+share/gtags/script/pygments_parser.py
 share/gtags/style.css.tmpl
+share/gtags/vim74-gtags-cscope.patch
+@dir var/gtags/sitekeys