3 files changed, 23 insertions, 9 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 1984b2434d5e..89fe316a26e6 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	groonga
-PORTVERSION=	6.0.1
-PORTREVISION=	1
+PORTVERSION=	6.0.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
@@ -59,7 +58,7 @@ post-patch:
 		'/NGX_PID_PATH/s|mkdir|${TRUE}| ; \
 		 /NGX_HTTP_LOG_PATH/s|mkdir|${TRUE}| ; \
 		 /NGX_ERROR_LOG_PATH/s|mkdir|${TRUE}|' \
-		${WRKSRC}/vendor/nginx-1.9.12/auto/install
+		${WRKSRC}/vendor/nginx-1.11.0/auto/install
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/groonga-httpd
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index 8d6c59d960b5..1227f0a1b503 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,2 +1,3 @@
-SHA256 (groonga-6.0.1.tar.gz) = 16297c1e4c7cb12c4fca515a28b5cb1e9ef0db0867ff4ad3d8d5436c0e175b6d
-SIZE (groonga-6.0.1.tar.gz) = 13914843
+TIMESTAMP = 1465556857
+SHA256 (groonga-6.0.4.tar.gz) = 2c6ebe7e5b1065b777cbc5c6696a47a2b7da510b4c3e785f45437a56ad65ad58
+SIZE (groonga-6.0.4.tar.gz) = 13687702
diff --git a/textproc/groonga/pkg-plist b/textproc/groonga/pkg-plist
index 4ad44070d0f3..e495cda82177 100644
--- a/textproc/groonga/pkg-plist
+++ b/textproc/groonga/pkg-plist
@@ -28,6 +28,7 @@ include/groonga/groonga/array.h
 include/groonga/groonga/command.h
 include/groonga/groonga/config.h
 include/groonga/groonga/dat.h
+include/groonga/groonga/db.h
 include/groonga/groonga/dump.h
 include/groonga/groonga/expr.h
 include/groonga/groonga/file_reader.h
@@ -38,13 +39,17 @@ include/groonga/groonga/ii.h
 include/groonga/groonga/nfkc.h
 include/groonga/groonga/normalizer.h
 include/groonga/groonga/obj.h
+include/groonga/groonga/operator.h
 include/groonga/groonga/output.h
 include/groonga/groonga/pat.h
 include/groonga/groonga/plugin.h
 include/groonga/groonga/portability.h
 include/groonga/groonga/request_canceler.h
+include/groonga/groonga/request_timer.h
 include/groonga/groonga/scorer.h
+include/groonga/groonga/table.h
 include/groonga/groonga/thread.h
+include/groonga/groonga/time.h
 include/groonga/groonga/token.h
 include/groonga/groonga/token_filter.h
 include/groonga/groonga/tokenizer.h
@@ -52,17 +57,19 @@ include/groonga/groonga/type.h
 include/groonga/groonga/util.h
 include/groonga/groonga/windows.h
 include/groonga/groonga/windows_event_logger.h
+include/groonga/groonga/window_function.h
 %%RUBY%%lib/groonga/plugins/expression_rewriters/optimizer.rb
+lib/groonga/plugins/functions/number.a
+lib/groonga/plugins/functions/number.so
 lib/groonga/plugins/functions/string.a
 lib/groonga/plugins/functions/string.so
 lib/groonga/plugins/functions/vector.a
+lib/groonga/plugins/functions/time.a
+lib/groonga/plugins/functions/time.so
 lib/groonga/plugins/functions/vector.so
 lib/groonga/plugins/query_expanders/tsv.a
 lib/groonga/plugins/query_expanders/tsv.so
-%%RUBY%%lib/groonga/plugins/ruby/eval.a
-%%RUBY%%lib/groonga/plugins/ruby/eval.so
-%%RUBY%%lib/groonga/plugins/ruby/load.a
-%%RUBY%%lib/groonga/plugins/ruby/load.so
+%%RUBY%%lib/groonga/plugins/ruby/eval.rb
 %%RUBY%%lib/groonga/plugins/sharding.rb
 %%RUBY%%lib/groonga/plugins/sharding/logical_count.rb
 %%RUBY%%lib/groonga/plugins/sharding/logical_enumerator.rb
@@ -88,6 +95,13 @@ lib/groonga/plugins/query_expanders/tsv.so
 %%RUBY%%lib/groonga/scripts/ruby/expression_rewriter.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_rewriters.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_size_estimator.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/binary_operation.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/constant.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/function_call.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/logical_operation.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/variable.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree_builder.rb
 %%RUBY%%lib/groonga/scripts/ruby/fixed_size_column.rb
 %%RUBY%%lib/groonga/scripts/ruby/id.rb
 %%RUBY%%lib/groonga/scripts/ruby/index_column.rb