Update to 6.4:

Version 6.4 - March 24 2015

[CHANGES]
New facilities:
o gtags: Now --sqlite3 option is supported formally. This option uses
  SQLite3 API instead of BSD/DB API for making tag files.
  To use this option, you need to invoke configure script with
  --with-sqlite3 in the build phase.

        [configuration phase]
        $ ./configure --with-sqlite3    # use sqlite3 API

        [execution phase]
        $ gtags --sqlite3               # make sqlite3 tag files

o gtags: --single-update option supports deletion of a file.
  Now the next command line works well.

	$ rm test.c
	$ gtags --single-update=test.c

o gtags: New --explain option. This option explains handling files.
  You can know the following information:
  - Skipped reason for each skipped files.
  - Used parser and its library path for each source file.

[FIXED BUGS]
o global: global(1) could not pick up source code from source files
  in library projects (GTAGSLLIBPATH) if their tag files are compact
  format. Now it works.

[INCOMPATIBLE CHANGES]
The following features of htags(1) were removed.
o The -c (--compact) option.
o The --system-cgi option.
o The --overwrite-key option.
o The -x (--xhtml[=version]) option.
  All files are 1.0.
o The following configuration variables:
  colorize-warned-line (substitute: --colorize-warned-line)
  gzipped_suffix (substitute: not available)
  htags_options (substitute: HTAGS_OPTIONS)
  ncol (substitute: -n, --line-number [n])
  normal_suffix (will be always '.html')
  no_order_list (substitute: --no-order-list)
  script_alias (substitute: not available)
  tabs (substitute: --tabs n)
  xhtml_version (will be always 1.0)

5 files changed, 27 insertions, 28 deletions

diff --git a/devel/global/Makefile b/devel/global/Makefile
index 631e6676411..81b892dd854 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2015/02/08 16:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/04/02 22:39:45 wiz Exp $
 
-DISTNAME=	global-6.3.4
+DISTNAME=	global-6.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=global/}
 
@@ -21,5 +21,7 @@ CONF_FILES=	${PREFIX}/share/gtags/gtags.conf ${PKG_SYSCONFDIR}/gtags.conf
 
 REPLACE_PYTHON+=	plugin-factory/pygments_parser.py
 
+.include "options.mk"
+
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/global/PLIST b/devel/global/PLIST
index 432697ac37a..9841039a8f4 100644
--- a/devel/global/PLIST
+++ b/devel/global/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2014/12/01 10:08:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2015/04/02 22:39:45 wiz Exp $
 bin/global
 bin/globash
 bin/gozilla
@@ -35,13 +35,11 @@ share/gtags/README
 share/gtags/README.PATCHES
 share/gtags/SERVERSIDE_HOWTO
 share/gtags/THANKS
-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
 share/gtags/gtags-cscope.vim
@@ -98,4 +96,4 @@ share/gtags/script/less-global
 share/gtags/script/pygments_parser.py
 share/gtags/style.css.tmpl
 share/gtags/vim74-gtags-cscope.patch
-@pkgdir var/gtags/sitekeys
+@pkgdir var/gtags
diff --git a/devel/global/distinfo b/devel/global/distinfo
index 412900482f3..382b08e20ae 100644
--- a/devel/global/distinfo
+++ b/devel/global/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.23 2015/02/08 16:11:27 wiz Exp $
+$NetBSD: distinfo,v 1.24 2015/04/02 22:39:45 wiz Exp $
 
-SHA1 (global-6.3.4.tar.gz) = 6b73c0b3c7eea025c8004f8d82d836f2021d0c9e
-RMD160 (global-6.3.4.tar.gz) = bdba3f6cc120ef9609ecc1238eb4054196856e98
-Size (global-6.3.4.tar.gz) = 2903088 bytes
-SHA1 (patch-gozilla_Makefile.in) = e769975f79bd1f0501eca00ffcefa5d5ee2e2db3
+SHA1 (global-6.4.tar.gz) = 5d5c27ba3263aef764a922b46cc453f1de0752fa
+RMD160 (global-6.4.tar.gz) = e886c8c29909ea4527d71dfac184e200b9837cfd
+Size (global-6.4.tar.gz) = 2897074 bytes
diff --git a/devel/global/options.mk b/devel/global/options.mk
new file mode 100644
index 00000000000..ea42ecf8793
--- /dev/null
+++ b/devel/global/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2015/04/02 22:39:45 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.global
+PKG_OPTIONS_REQUIRED_GROUPS=	db
+PKG_OPTIONS_GROUP.db=	bdb sqlite3
+PKG_SUGGESTED_OPTIONS=	sqlite3
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbdb)
+.include "../../mk/bdb.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+CONFIGURE_ARGS+=	 --with-sqlite3
+.include "../../databases/sqlite3/buildlink3.mk"
+.endif
diff --git a/devel/global/patches/patch-gozilla_Makefile.in b/devel/global/patches/patch-gozilla_Makefile.in
deleted file mode 100644
index 32be9d80860..00000000000
--- a/devel/global/patches/patch-gozilla_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gozilla_Makefile.in,v 1.1 2014/12/01 10:08:27 wiz Exp $
-
-Add DESTDIR support.
-
---- gozilla/Makefile.in.orig	2014-11-26 02:49:49.000000000 +0000
-+++ gozilla/Makefile.in
-@@ -734,8 +734,8 @@ uninstall-man: uninstall-man1
- 	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.