Update groonga to 1.2.4.

Release 1.2.4 - 2011/07/29
--------------------------

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

* Re-supported *BSD. (Reported by OBATA Akio)
* Improved sed related portability. (Suggested by OBATA Akio)
* Re-supported Visual C++ 2008.
* Supported :doc:`commands/check` for hash table.
* Ignored invalid _score in --sortby of :doc:`commands/select`
  for convenience. #1030
* Added document about :doc:`log`.
* Supported ~/.editrc.
* Supported ~/.groonga-history.

Fixes
^^^^^

* Fixed broken libedit support. (Reported by Daiki Ueno)
* Fixed source URL in *.spec (Reported by Daiki Ueno)
* Fixed patricia trie cursor returns wrong records.
* Added missing database lock clear for grn_obj_clear_lock()
  for database.
* Fixed wrong record's column values deletion possible on
  record deletion.

5 files changed, 32 insertions, 80 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 4ee404e25e0..7f5bd6933ca 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/07/11 08:32:38 obache Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/29 12:30:36 obache Exp $
 #
 
-DISTNAME=	groonga-1.2.3
+DISTNAME=	groonga-1.2.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST
index c0f3bf1c390..7d53d131937 100644
--- a/textproc/groonga/PLIST
+++ b/textproc/groonga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/07/11 08:32:38 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/07/29 12:30:36 obache Exp $
 bin/grntest
 bin/groonga
 bin/groonga-query-log-analyzer
@@ -51,7 +51,11 @@ share/doc/groonga/en/html/_sources/contribution/documentation.txt
 share/doc/groonga/en/html/_sources/contribution/documentation/c-api.txt
 share/doc/groonga/en/html/_sources/contribution/documentation/i18n.txt
 share/doc/groonga/en/html/_sources/contribution/report.txt
-share/doc/groonga/en/html/_sources/execfile.txt
+share/doc/groonga/en/html/_sources/executables.txt
+share/doc/groonga/en/html/_sources/executables/grnslap.txt
+share/doc/groonga/en/html/_sources/executables/grntest.txt
+share/doc/groonga/en/html/_sources/executables/groonga.txt
+share/doc/groonga/en/html/_sources/executables/http.txt
 share/doc/groonga/en/html/_sources/expr.txt
 share/doc/groonga/en/html/_sources/functions.txt
 share/doc/groonga/en/html/_sources/functions/edit_distance.txt
@@ -60,9 +64,6 @@ share/doc/groonga/en/html/_sources/functions/geo_in_circle.txt
 share/doc/groonga/en/html/_sources/functions/geo_in_rectangle.txt
 share/doc/groonga/en/html/_sources/functions/now.txt
 share/doc/groonga/en/html/_sources/functions/rand.txt
-share/doc/groonga/en/html/_sources/grnslap.txt
-share/doc/groonga/en/html/_sources/grntest.txt
-share/doc/groonga/en/html/_sources/http.txt
 share/doc/groonga/en/html/_sources/index.txt
 share/doc/groonga/en/html/_sources/install.txt
 share/doc/groonga/en/html/_sources/limitations.txt
@@ -70,7 +71,6 @@ share/doc/groonga/en/html/_sources/news.txt
 share/doc/groonga/en/html/_sources/news/0.x.txt
 share/doc/groonga/en/html/_sources/news/1.0.x.txt
 share/doc/groonga/en/html/_sources/news/1.1.x.txt
-share/doc/groonga/en/html/_sources/process.txt
 share/doc/groonga/en/html/_sources/pseudo_column.txt
 share/doc/groonga/en/html/_sources/reference.txt
 share/doc/groonga/en/html/_sources/spec.txt
@@ -155,7 +155,11 @@ share/doc/groonga/en/html/contribution/documentation.html
 share/doc/groonga/en/html/contribution/documentation/c-api.html
 share/doc/groonga/en/html/contribution/documentation/i18n.html
 share/doc/groonga/en/html/contribution/report.html
-share/doc/groonga/en/html/execfile.html
+share/doc/groonga/en/html/executables.html
+share/doc/groonga/en/html/executables/grnslap.html
+share/doc/groonga/en/html/executables/grntest.html
+share/doc/groonga/en/html/executables/groonga.html
+share/doc/groonga/en/html/executables/http.html
 share/doc/groonga/en/html/expr.html
 share/doc/groonga/en/html/functions.html
 share/doc/groonga/en/html/functions/edit_distance.html
@@ -165,9 +169,6 @@ share/doc/groonga/en/html/functions/geo_in_rectangle.html
 share/doc/groonga/en/html/functions/now.html
 share/doc/groonga/en/html/functions/rand.html
 share/doc/groonga/en/html/genindex.html
-share/doc/groonga/en/html/grnslap.html
-share/doc/groonga/en/html/grntest.html
-share/doc/groonga/en/html/http.html
 share/doc/groonga/en/html/index.html
 share/doc/groonga/en/html/install.html
 share/doc/groonga/en/html/limitations.html
@@ -176,7 +177,6 @@ share/doc/groonga/en/html/news/0.x.html
 share/doc/groonga/en/html/news/1.0.x.html
 share/doc/groonga/en/html/news/1.1.x.html
 share/doc/groonga/en/html/objects.inv
-share/doc/groonga/en/html/process.html
 share/doc/groonga/en/html/pseudo_column.html
 share/doc/groonga/en/html/reference.html
 share/doc/groonga/en/html/search.html
@@ -235,7 +235,11 @@ share/doc/groonga/ja/html/_sources/contribution/documentation.txt
 share/doc/groonga/ja/html/_sources/contribution/documentation/c-api.txt
 share/doc/groonga/ja/html/_sources/contribution/documentation/i18n.txt
 share/doc/groonga/ja/html/_sources/contribution/report.txt
-share/doc/groonga/ja/html/_sources/execfile.txt
+share/doc/groonga/ja/html/_sources/executables.txt
+share/doc/groonga/ja/html/_sources/executables/grnslap.txt
+share/doc/groonga/ja/html/_sources/executables/grntest.txt
+share/doc/groonga/ja/html/_sources/executables/groonga.txt
+share/doc/groonga/ja/html/_sources/executables/http.txt
 share/doc/groonga/ja/html/_sources/expr.txt
 share/doc/groonga/ja/html/_sources/functions.txt
 share/doc/groonga/ja/html/_sources/functions/edit_distance.txt
@@ -244,9 +248,6 @@ share/doc/groonga/ja/html/_sources/functions/geo_in_circle.txt
 share/doc/groonga/ja/html/_sources/functions/geo_in_rectangle.txt
 share/doc/groonga/ja/html/_sources/functions/now.txt
 share/doc/groonga/ja/html/_sources/functions/rand.txt
-share/doc/groonga/ja/html/_sources/grnslap.txt
-share/doc/groonga/ja/html/_sources/grntest.txt
-share/doc/groonga/ja/html/_sources/http.txt
 share/doc/groonga/ja/html/_sources/index.txt
 share/doc/groonga/ja/html/_sources/install.txt
 share/doc/groonga/ja/html/_sources/limitations.txt
@@ -254,7 +255,6 @@ share/doc/groonga/ja/html/_sources/news.txt
 share/doc/groonga/ja/html/_sources/news/0.x.txt
 share/doc/groonga/ja/html/_sources/news/1.0.x.txt
 share/doc/groonga/ja/html/_sources/news/1.1.x.txt
-share/doc/groonga/ja/html/_sources/process.txt
 share/doc/groonga/ja/html/_sources/pseudo_column.txt
 share/doc/groonga/ja/html/_sources/reference.txt
 share/doc/groonga/ja/html/_sources/spec.txt
@@ -339,7 +339,11 @@ share/doc/groonga/ja/html/contribution/documentation.html
 share/doc/groonga/ja/html/contribution/documentation/c-api.html
 share/doc/groonga/ja/html/contribution/documentation/i18n.html
 share/doc/groonga/ja/html/contribution/report.html
-share/doc/groonga/ja/html/execfile.html
+share/doc/groonga/ja/html/executables.html
+share/doc/groonga/ja/html/executables/grnslap.html
+share/doc/groonga/ja/html/executables/grntest.html
+share/doc/groonga/ja/html/executables/groonga.html
+share/doc/groonga/ja/html/executables/http.html
 share/doc/groonga/ja/html/expr.html
 share/doc/groonga/ja/html/functions.html
 share/doc/groonga/ja/html/functions/edit_distance.html
@@ -349,9 +353,6 @@ share/doc/groonga/ja/html/functions/geo_in_rectangle.html
 share/doc/groonga/ja/html/functions/now.html
 share/doc/groonga/ja/html/functions/rand.html
 share/doc/groonga/ja/html/genindex.html
-share/doc/groonga/ja/html/grnslap.html
-share/doc/groonga/ja/html/grntest.html
-share/doc/groonga/ja/html/http.html
 share/doc/groonga/ja/html/index.html
 share/doc/groonga/ja/html/install.html
 share/doc/groonga/ja/html/limitations.html
@@ -360,7 +361,6 @@ share/doc/groonga/ja/html/news/0.x.html
 share/doc/groonga/ja/html/news/1.0.x.html
 share/doc/groonga/ja/html/news/1.1.x.html
 share/doc/groonga/ja/html/objects.inv
-share/doc/groonga/ja/html/process.html
 share/doc/groonga/ja/html/pseudo_column.html
 share/doc/groonga/ja/html/reference.html
 share/doc/groonga/ja/html/search.html
@@ -482,7 +482,11 @@ share/doc/groonga/source/example/tutorial10-6.log
 share/doc/groonga/source/example/tutorial10-7.log
 share/doc/groonga/source/example/tutorial10-8.log
 share/doc/groonga/source/example/tutorial10-9.log
-share/doc/groonga/source/execfile.txt
+share/doc/groonga/source/executables.txt
+share/doc/groonga/source/executables/grnslap.txt
+share/doc/groonga/source/executables/grntest.txt
+share/doc/groonga/source/executables/groonga.txt
+share/doc/groonga/source/executables/http.txt
 share/doc/groonga/source/expr.txt
 share/doc/groonga/source/functions.txt
 share/doc/groonga/source/functions/edit_distance.txt
@@ -491,9 +495,6 @@ share/doc/groonga/source/functions/geo_in_circle.txt
 share/doc/groonga/source/functions/geo_in_rectangle.txt
 share/doc/groonga/source/functions/now.txt
 share/doc/groonga/source/functions/rand.txt
-share/doc/groonga/source/grnslap.txt
-share/doc/groonga/source/grntest.txt
-share/doc/groonga/source/http.txt
 share/doc/groonga/source/index.txt
 share/doc/groonga/source/install.txt
 share/doc/groonga/source/limitations.txt
@@ -501,7 +502,6 @@ share/doc/groonga/source/news.txt
 share/doc/groonga/source/news/0.x.txt
 share/doc/groonga/source/news/1.0.x.txt
 share/doc/groonga/source/news/1.1.x.txt
-share/doc/groonga/source/process.txt
 share/doc/groonga/source/pseudo_column.txt
 share/doc/groonga/source/rdoc.py
 share/doc/groonga/source/reference.txt
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index b2ec698c9f1..85499b88e2e 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/07/11 08:32:38 obache Exp $
+$NetBSD: distinfo,v 1.5 2011/07/29 12:30:36 obache Exp $
 
-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
+SHA1 (groonga-1.2.4.tar.gz) = 672a1eb816cafc810a452640ef8e7845c06c167b
+RMD160 (groonga-1.2.4.tar.gz) = 9873b6e3293bfa8ecffcc3d097b5e43afec7d98d
+Size (groonga-1.2.4.tar.gz) = 2778350 bytes
diff --git a/textproc/groonga/patches/patch-lib_dat_trie.cpp b/textproc/groonga/patches/patch-lib_dat_trie.cpp
deleted file mode 100644
index 7c472c4a4b0..00000000000
--- a/textproc/groonga/patches/patch-lib_dat_trie.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index a031915e664..00000000000
--- a/textproc/groonga/patches/patch-tools_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-$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.