Update groonga to 1.2.3.

Release 1.2.3 - 2011/06/29
--------------------------

Improvements
^^^^^^^^^^^^

* Added invalid table name check. #912
* Added groonga-query-log-analyzer that analyze query log.
* groonga command shows failed command on error.
* groonga command shows file name and line no on error.
* Improved error message of :doc:`commands/column_create`. #952
* Added GRN_OBJ_TABLE_DAT_KEY, double array trie, table. (experimental)

Fixes
^^^^^

* fix get command crash. (Reported by OBATA Akio)
* fix elapsed time overflow in query log. #944

6 files changed, 70 insertions, 13 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 01296f5e197..4ee404e25e0 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2011/05/30 12:01:40 obache Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/11 08:32:38 obache Exp $
 #
 
-DISTNAME=	groonga-1.2.2
+DISTNAME=	groonga-1.2.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
@@ -12,7 +12,11 @@ LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "../../lang/ruby/rubyversion.mk"
+DEPENDS+=	${RUBY_BASE}>=${RUBY_REQD}:../../lang/${RUBY_BASE}
+
 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 # for long file name
@@ -22,6 +26,7 @@ EXTRACT_USING=	bsdtar
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-ruby=${RUBY}
 
 PKGCONFIG_OVERRIDE+=	groonga.pc.in
 
@@ -38,8 +43,13 @@ OWN_DIRS+=		${VARBASE}/log/${PKGBASE}
 
 CHECK_WRKREF_SKIP+=	bin/groonga
 CHECK_INTERPRETER_SKIP+=	share/groonga/examples/*
-# XXX: should be in separate package.
-CHECK_INTERPRETER_SKIP+=	share/groonga/munin/plugins/*
+
+REPLACE_RUBY+=	data/munin/groonga_cpu_time
+REPLACE_RUBY+=	data/munin/groonga_disk
+REPLACE_RUBY+=	data/munin/groonga_n_records
+REPLACE_RUBY+=	data/munin/groonga_query_performance
+REPLACE_RUBY+=	data/munin/groonga_status
+.include "../../lang/ruby/replace.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST
index fecfcb82415..c0f3bf1c390 100644
--- a/textproc/groonga/PLIST
+++ b/textproc/groonga/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2011/05/30 12:01:40 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/07/11 08:32:38 obache Exp $
 bin/grntest
 bin/groonga
+bin/groonga-query-log-analyzer
 bin/groonga-suggest-create-dataset
 ${PLIST.learner}bin/groonga-suggest-httpd
 ${PLIST.learner}bin/groonga-suggest-learner
@@ -470,6 +471,7 @@ share/doc/groonga/source/example/tutorial07-2.log
 share/doc/groonga/source/example/tutorial07-3.log
 share/doc/groonga/source/example/tutorial07-4.log
 share/doc/groonga/source/example/tutorial08-1.log
+share/doc/groonga/source/example/tutorial08-2.log
 share/doc/groonga/source/example/tutorial10-1.log
 share/doc/groonga/source/example/tutorial10-10.log
 share/doc/groonga/source/example/tutorial10-2.log
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index 19c69b76595..b2ec698c9f1 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2011/05/30 12:01:40 obache Exp $
+$NetBSD: distinfo,v 1.4 2011/07/11 08:32:38 obache Exp $
 
-SHA1 (groonga-1.2.2.tar.gz) = ce1a3761f9b5c4b265469ab13c42716abf57f2db
-RMD160 (groonga-1.2.2.tar.gz) = e5ff19956d503bdbd01c6dd5e262632b357d539e
-Size (groonga-1.2.2.tar.gz) = 2681211 bytes
+SHA1 (groonga-1.2.3.tar.gz) = 2d381a812cc0bd2980508493db6945fb10f1e91b
+RMD160 (groonga-1.2.3.tar.gz) = 3a030f3efbf34c5e190fcd1bdbc36a1954a5e615
+Size (groonga-1.2.3.tar.gz) = 2754482 bytes
+SHA1 (patch-lib_dat_trie.cpp) = 4423783d494ab97683ab883b9f8959e74746f554
+SHA1 (patch-tools_Makefile.in) = be6de8fc65c0b4c734233a26a2da9b97983cfab9
diff --git a/textproc/groonga/options.mk b/textproc/groonga/options.mk
index 602bc214bf7..32cc4a5439e 100644
--- a/textproc/groonga/options.mk
+++ b/textproc/groonga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/04/06 13:17:04 obache Exp $
+# $NetBSD: options.mk,v 1.2 2011/07/11 08:32:38 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groonga
@@ -19,16 +19,13 @@ CONFIGURE_ARGS+=	--without-mecab
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-CONFIGURE_ARGS+=	--with-ruby=${RUBY}
 CONFIGURE_ARGS+=	--with-cutter
 USE_TOOLS+=		gmake
 TEST_TARGET=		check
-BUILDLINK_DEPMETHOD.${RUBY_BASE}+=	build
 .include "../../lang/ruby/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cutter+=		cutter>=1.1.6
 .include "../../devel/cutter/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-ruby
 CONFIGURE_ARGS+=	--without-cutter
 .endif
 
diff --git a/textproc/groonga/patches/patch-lib_dat_trie.cpp b/textproc/groonga/patches/patch-lib_dat_trie.cpp
new file mode 100644
index 00000000000..7c472c4a4b0
--- /dev/null
+++ b/textproc/groonga/patches/patch-lib_dat_trie.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_dat_trie.cpp,v 1.1 2011/07/11 08:32:38 obache Exp $
+
+* *BSD have MAP_ANONY not MAP_ANONYMOUS.
+  https://github.com/groonga/groonga/commit/6a6362a00df314c734dfdd40d59671b1b64e53df
+
+--- lib/dat/trie.cpp.orig	2011-06-28 12:51:56.000000000 +0000
++++ lib/dat/trie.cpp
+@@ -9,6 +9,10 @@
+ #include <algorithm>
+ #include <cstring>
+ 
++#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
++#define MAP_ANONYMOUS MAP_ANON
++#endif
++
+ namespace grn {
+ namespace dat {
+ 
diff --git a/textproc/groonga/patches/patch-tools_Makefile.in b/textproc/groonga/patches/patch-tools_Makefile.in
new file mode 100644
index 00000000000..a031915e664
--- /dev/null
+++ b/textproc/groonga/patches/patch-tools_Makefile.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-tools_Makefile.in,v 1.1 2011/07/11 08:32:38 obache Exp $
+
+* don't use sed -i.
+  https://github.com/groonga/groonga/commit/41985893bbe4ac48d789bde8f9fdae8d2e9fc26a
+
+--- tools/Makefile.in.orig	2011-06-28 12:52:10.000000000 +0000
++++ tools/Makefile.in
+@@ -260,7 +260,6 @@ EXTRA_DIST = \
+ 	$(install_ruby_scripts)			\
+ 	$(noinstall_ruby_scripts)
+ 
+-@WITH_RUBY_TRUE@bin_SCRIPTS = $(install_ruby_scripts)
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -488,9 +487,9 @@ uninstall-am: uninstall-binSCRIPTS
+ 
+ @WITH_RUBY_TRUE@install-exec-hook:
+ @WITH_RUBY_TRUE@	for script in $(install_ruby_scripts); do	\
+-@WITH_RUBY_TRUE@	  sed -i''					\
+-@WITH_RUBY_TRUE@	    -e '1s,#!.*,#!$(RUBY),'			\
+-@WITH_RUBY_TRUE@	    $(DESTDIR)$(bindir)/$${script};		\
++@WITH_RUBY_TRUE@	  sed -e '1s,#!.*,#!$(RUBY),'		\
++@WITH_RUBY_TRUE@	    $${script} > $(DESTDIR)$(bindir)/$${script};	\
++@WITH_RUBY_TRUE@	  chmod +x $(DESTDIR)/$(bindir)/$${script};	\
+ @WITH_RUBY_TRUE@	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.