Update textproc/groonga to 7.0.5. Add bl3.

Based on a PR by @siepkes (https://github.com/joyent/pkgsrc/pull/7).

Groonga 7.0.5
- [dump] --sort_hash_table option has been supported
- math_abs() function has been supported
- Ubuntu 16.10 (Yakkety Yak) support has been dropped

Groonga 7.0.4
- Supported Debian 9 (stretch)
- Added grndb log options
- Improved query performance

Groonga 7.0.3
- [select] Add document about Full text search with specific index name
- [load][dump] Supported Apache Arrow

Groonga 7.0.2
- Fixed a bug that data is lost by reindex
- Supported Ubuntu 17.04 (Zesty Zapus)
- Supported persistent cache
- Added function to use an existing table as condition patterns.

Groonga 7.0.1
- Dropped CentOS 5 support
- Fixed a problem about dynamically updated index size
- [experimental] Supported GRN_ORDER_BY_ESTIMATED_SIZE_ENABLE

Groonga 7.0.0
- Removed needless metadata updates on DB. It reduces the case that
  database lock remains even though select command is executed.
- lock_clear Changed to clear metadata lock by lock_clear against DB.
- Supported groonga-token-filter-stem package which provides stemming
  feature by TokenFilterStem token filter on CentOS 7.
- load Supported --output_errors yes option. If you specify "yes", you
  can get errors for each load failed record.

Groonga 6.1.5
- This release fixes an index search bug that index search may not
  return records that should be matched.

Groonga 6.1.4
- This release fixes an index search bug that index search may not
  return records that should be matched.

Groonga 6.1.3
- Reverted "Improved performance of updating inverted indexes in the
  worst case".

Groonga 6.1.2
- [load] Supported to show {"n_loaded_records": N} in response
- [load] Supported --output_ids yes parameter

Groonga 6.1.1
- Supported column value compression with Zstandard
- Changed to stop compressing small data

Groonga 6.1.0
- Supported to sort load table names by key instead of ID to make output
  stable
- Added document about index columns

Groonga 6.0.9
- Fixed index search bug
- Supported regular expression in location directive for groonga-httpd

7 files changed, 122 insertions, 144 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index b1cc16b6fbf..c146c2c1803 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2017/07/11 19:41:20 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2017/08/29 12:54:47 fhajny Exp $
 #
 
-DISTNAME=	groonga-6.0.8
+DISTNAME=	groonga-7.0.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
@@ -31,17 +31,19 @@ PKG_SYSCONFSUBDIR=	${PKGBASE}
 
 BUILD_DEFS+=		VARBASE
 
+EXAMPLE_CONF_DIR=	${PREFIX}/share/examples/groonga
+
 INSTALL_DIRS=		${BUILD_DIRS} vendor/onigmo-source
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
-CONF_FILES+=		share/examples/${PKGBASE}/groonga.conf \
+CONF_FILES+=		${EXAMPLE_CONF_DIR}/groonga.conf \
 			${PKG_SYSCONFDIR}/groonga.conf
-CONF_FILES+=		share/examples/groonga/synonyms.tsv \
+CONF_FILES+=		${EXAMPLE_CONF_DIR}/synonyms.tsv \
 			${PKG_SYSCONFDIR}/synonyms.tsv
 
 OWN_DIRS+=		${VARBASE}/log/${PKGBASE}
 
-CHECK_WRKREF_SKIP+=	bin/groonga
+CHECK_WRKREF_SKIP+=		bin/groonga
 CHECK_INTERPRETER_SKIP+=	share/groonga/examples/*
 
 REPLACE_RUBY+=	data/munin/groonga_cpu_time_
diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST
index 349f988bad8..c9dcd978fda 100644
--- a/textproc/groonga/PLIST
+++ b/textproc/groonga/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.30 2016/09/11 16:06:53 taca Exp $
+@comment $NetBSD: PLIST,v 1.31 2017/08/29 12:54:47 fhajny Exp $
 bin/groonga
 bin/groonga-benchmark
 bin/groonga-suggest-create-dataset
 ${PLIST.learner}bin/groonga-suggest-httpd
 ${PLIST.learner}bin/groonga-suggest-learner
-bin/onig-config
+bin/onigmo-config
 include/groonga/groonga.h
+include/groonga/groonga.hpp
+include/groonga/groonga/accessor.h
 include/groonga/groonga/array.h
+include/groonga/groonga/arrow.h
+include/groonga/groonga/arrow.hpp
+include/groonga/groonga/cache.h
 include/groonga/groonga/column.h
 include/groonga/groonga/command.h
 include/groonga/groonga/config.h
@@ -43,22 +48,23 @@ include/groonga/groonga/util.h
 include/groonga/groonga/window_function.h
 include/groonga/groonga/windows.h
 include/groonga/groonga/windows_event_logger.h
-include/oniggnu.h
-include/onigposix.h
-include/oniguruma.h
+include/onigmo.h
+include/onigmognu.h
+include/onigmoposix.h
+lib/groonga/plugins/functions/index_column.la
+lib/groonga/plugins/functions/math.la
 lib/groonga/plugins/functions/number.la
 lib/groonga/plugins/functions/string.la
 lib/groonga/plugins/functions/time.la
 lib/groonga/plugins/functions/vector.la
 lib/groonga/plugins/query_expanders/tsv.la
 lib/groonga/plugins/suggest/suggest.la
-lib/groonga/plugins/table/table.la
 lib/groonga/plugins/token_filters/stop_word.la
 ${PLIST.mecab}lib/groonga/plugins/tokenizers/mecab.la
 lib/libgroonga.la
-lib/libonig.la
+lib/libonigmo.la
 lib/pkgconfig/groonga.pc
-lib/pkgconfig/oniguruma.pc
+lib/pkgconfig/onigmo.pc
 ${PLIST.httpd}sbin/groonga-httpd
 ${PLIST.httpd}sbin/groonga-httpd-restart
 share/doc/groonga/en/html/.buildinfo
@@ -108,6 +114,7 @@ share/doc/groonga/en/html/_sources/news/2.x.txt
 share/doc/groonga/en/html/_sources/news/3.x.txt
 share/doc/groonga/en/html/_sources/news/4.x.txt
 share/doc/groonga/en/html/_sources/news/5.x.txt
+share/doc/groonga/en/html/_sources/news/6.x.txt
 share/doc/groonga/en/html/_sources/news/senna.txt
 share/doc/groonga/en/html/_sources/reference.txt
 share/doc/groonga/en/html/_sources/reference/alias.txt
@@ -201,6 +208,7 @@ share/doc/groonga/en/html/_sources/reference/commands/select.txt
 share/doc/groonga/en/html/_sources/reference/commands/shutdown.txt
 share/doc/groonga/en/html/_sources/reference/commands/status.txt
 share/doc/groonga/en/html/_sources/reference/commands/suggest.txt
+share/doc/groonga/en/html/_sources/reference/commands/table_copy.txt
 share/doc/groonga/en/html/_sources/reference/commands/table_create.txt
 share/doc/groonga/en/html/_sources/reference/commands/table_list.txt
 share/doc/groonga/en/html/_sources/reference/commands/table_remove.txt
@@ -231,14 +239,16 @@ share/doc/groonga/en/html/_sources/reference/functions/geo_in_rectangle.txt
 share/doc/groonga/en/html/_sources/reference/functions/highlight_full.txt
 share/doc/groonga/en/html/_sources/reference/functions/highlight_html.txt
 share/doc/groonga/en/html/_sources/reference/functions/html_untag.txt
+share/doc/groonga/en/html/_sources/reference/functions/in_records.txt
 share/doc/groonga/en/html/_sources/reference/functions/in_values.txt
+share/doc/groonga/en/html/_sources/reference/functions/math_abs.txt
 share/doc/groonga/en/html/_sources/reference/functions/now.txt
 share/doc/groonga/en/html/_sources/reference/functions/number_classify.txt
 share/doc/groonga/en/html/_sources/reference/functions/prefix_rk_search.txt
 share/doc/groonga/en/html/_sources/reference/functions/query.txt
 share/doc/groonga/en/html/_sources/reference/functions/rand.txt
-share/doc/groonga/en/html/_sources/reference/functions/record_number.txt
 share/doc/groonga/en/html/_sources/reference/functions/snippet_html.txt
+share/doc/groonga/en/html/_sources/reference/functions/string_length.txt
 share/doc/groonga/en/html/_sources/reference/functions/string_substring.txt
 share/doc/groonga/en/html/_sources/reference/functions/sub_filter.txt
 share/doc/groonga/en/html/_sources/reference/functions/time_classify_day.txt
@@ -248,6 +258,7 @@ share/doc/groonga/en/html/_sources/reference/functions/time_classify_month.txt
 share/doc/groonga/en/html/_sources/reference/functions/time_classify_second.txt
 share/doc/groonga/en/html/_sources/reference/functions/time_classify_week.txt
 share/doc/groonga/en/html/_sources/reference/functions/time_classify_year.txt
+share/doc/groonga/en/html/_sources/reference/functions/vector_new.txt
 share/doc/groonga/en/html/_sources/reference/functions/vector_size.txt
 share/doc/groonga/en/html/_sources/reference/functions/vector_slice.txt
 share/doc/groonga/en/html/_sources/reference/grn_expr.txt
@@ -277,6 +288,10 @@ share/doc/groonga/en/html/_sources/reference/token_filters.txt
 share/doc/groonga/en/html/_sources/reference/tokenizers.txt
 share/doc/groonga/en/html/_sources/reference/tuning.txt
 share/doc/groonga/en/html/_sources/reference/types.txt
+share/doc/groonga/en/html/_sources/reference/window_function.txt
+share/doc/groonga/en/html/_sources/reference/window_functions/record_number.txt
+share/doc/groonga/en/html/_sources/reference/window_functions/window_record_number.txt
+share/doc/groonga/en/html/_sources/reference/window_functions/window_sum.txt
 share/doc/groonga/en/html/_sources/server.txt
 share/doc/groonga/en/html/_sources/server/gqtp.txt
 share/doc/groonga/en/html/_sources/server/http.txt
@@ -290,6 +305,7 @@ share/doc/groonga/en/html/_sources/spec/gqtp.txt
 share/doc/groonga/en/html/_sources/spec/search.txt
 share/doc/groonga/en/html/_sources/troubleshooting.txt
 share/doc/groonga/en/html/_sources/troubleshooting/different_results_with_the_same_keyword.txt
+share/doc/groonga/en/html/_sources/troubleshooting/how_to_analyze_error_message.txt
 share/doc/groonga/en/html/_sources/troubleshooting/mmap_cannot_allocate_memory.txt
 share/doc/groonga/en/html/_sources/tutorial.txt
 share/doc/groonga/en/html/_sources/tutorial/data.txt
@@ -372,6 +388,7 @@ share/doc/groonga/en/html/news/2.x.html
 share/doc/groonga/en/html/news/3.x.html
 share/doc/groonga/en/html/news/4.x.html
 share/doc/groonga/en/html/news/5.x.html
+share/doc/groonga/en/html/news/6.x.html
 share/doc/groonga/en/html/news/senna.html
 share/doc/groonga/en/html/objects.inv
 share/doc/groonga/en/html/reference.html
@@ -466,6 +483,7 @@ share/doc/groonga/en/html/reference/commands/select.html
 share/doc/groonga/en/html/reference/commands/shutdown.html
 share/doc/groonga/en/html/reference/commands/status.html
 share/doc/groonga/en/html/reference/commands/suggest.html
+share/doc/groonga/en/html/reference/commands/table_copy.html
 share/doc/groonga/en/html/reference/commands/table_create.html
 share/doc/groonga/en/html/reference/commands/table_list.html
 share/doc/groonga/en/html/reference/commands/table_remove.html
@@ -496,14 +514,16 @@ share/doc/groonga/en/html/reference/functions/geo_in_rectangle.html
 share/doc/groonga/en/html/reference/functions/highlight_full.html
 share/doc/groonga/en/html/reference/functions/highlight_html.html
 share/doc/groonga/en/html/reference/functions/html_untag.html
+share/doc/groonga/en/html/reference/functions/in_records.html
 share/doc/groonga/en/html/reference/functions/in_values.html
+share/doc/groonga/en/html/reference/functions/math_abs.html
 share/doc/groonga/en/html/reference/functions/now.html
 share/doc/groonga/en/html/reference/functions/number_classify.html
 share/doc/groonga/en/html/reference/functions/prefix_rk_search.html
 share/doc/groonga/en/html/reference/functions/query.html
 share/doc/groonga/en/html/reference/functions/rand.html
-share/doc/groonga/en/html/reference/functions/record_number.html
 share/doc/groonga/en/html/reference/functions/snippet_html.html
+share/doc/groonga/en/html/reference/functions/string_length.html
 share/doc/groonga/en/html/reference/functions/string_substring.html
 share/doc/groonga/en/html/reference/functions/sub_filter.html
 share/doc/groonga/en/html/reference/functions/time_classify_day.html
@@ -513,6 +533,7 @@ share/doc/groonga/en/html/reference/functions/time_classify_month.html
 share/doc/groonga/en/html/reference/functions/time_classify_second.html
 share/doc/groonga/en/html/reference/functions/time_classify_week.html
 share/doc/groonga/en/html/reference/functions/time_classify_year.html
+share/doc/groonga/en/html/reference/functions/vector_new.html
 share/doc/groonga/en/html/reference/functions/vector_size.html
 share/doc/groonga/en/html/reference/functions/vector_slice.html
 share/doc/groonga/en/html/reference/grn_expr.html
@@ -542,6 +563,10 @@ share/doc/groonga/en/html/reference/token_filters.html
 share/doc/groonga/en/html/reference/tokenizers.html
 share/doc/groonga/en/html/reference/tuning.html
 share/doc/groonga/en/html/reference/types.html
+share/doc/groonga/en/html/reference/window_function.html
+share/doc/groonga/en/html/reference/window_functions/record_number.html
+share/doc/groonga/en/html/reference/window_functions/window_record_number.html
+share/doc/groonga/en/html/reference/window_functions/window_sum.html
 share/doc/groonga/en/html/search.html
 share/doc/groonga/en/html/searchindex.js
 share/doc/groonga/en/html/server.html
@@ -557,6 +582,7 @@ share/doc/groonga/en/html/spec/gqtp.html
 share/doc/groonga/en/html/spec/search.html
 share/doc/groonga/en/html/troubleshooting.html
 share/doc/groonga/en/html/troubleshooting/different_results_with_the_same_keyword.html
+share/doc/groonga/en/html/troubleshooting/how_to_analyze_error_message.html
 share/doc/groonga/en/html/troubleshooting/mmap_cannot_allocate_memory.html
 share/doc/groonga/en/html/tutorial.html
 share/doc/groonga/en/html/tutorial/data.html
@@ -617,6 +643,7 @@ share/doc/groonga/ja/html/_sources/news/2.x.txt
 share/doc/groonga/ja/html/_sources/news/3.x.txt
 share/doc/groonga/ja/html/_sources/news/4.x.txt
 share/doc/groonga/ja/html/_sources/news/5.x.txt
+share/doc/groonga/ja/html/_sources/news/6.x.txt
 share/doc/groonga/ja/html/_sources/news/senna.txt
 share/doc/groonga/ja/html/_sources/reference.txt
 share/doc/groonga/ja/html/_sources/reference/alias.txt
@@ -710,6 +737,7 @@ share/doc/groonga/ja/html/_sources/reference/commands/select.txt
 share/doc/groonga/ja/html/_sources/reference/commands/shutdown.txt
 share/doc/groonga/ja/html/_sources/reference/commands/status.txt
 share/doc/groonga/ja/html/_sources/reference/commands/suggest.txt
+share/doc/groonga/ja/html/_sources/reference/commands/table_copy.txt
 share/doc/groonga/ja/html/_sources/reference/commands/table_create.txt
 share/doc/groonga/ja/html/_sources/reference/commands/table_list.txt
 share/doc/groonga/ja/html/_sources/reference/commands/table_remove.txt
@@ -740,14 +768,16 @@ share/doc/groonga/ja/html/_sources/reference/functions/geo_in_rectangle.txt
 share/doc/groonga/ja/html/_sources/reference/functions/highlight_full.txt
 share/doc/groonga/ja/html/_sources/reference/functions/highlight_html.txt
 share/doc/groonga/ja/html/_sources/reference/functions/html_untag.txt
+share/doc/groonga/ja/html/_sources/reference/functions/in_records.txt
 share/doc/groonga/ja/html/_sources/reference/functions/in_values.txt
+share/doc/groonga/ja/html/_sources/reference/functions/math_abs.txt
 share/doc/groonga/ja/html/_sources/reference/functions/now.txt
 share/doc/groonga/ja/html/_sources/reference/functions/number_classify.txt
 share/doc/groonga/ja/html/_sources/reference/functions/prefix_rk_search.txt
 share/doc/groonga/ja/html/_sources/reference/functions/query.txt
 share/doc/groonga/ja/html/_sources/reference/functions/rand.txt
-share/doc/groonga/ja/html/_sources/reference/functions/record_number.txt
 share/doc/groonga/ja/html/_sources/reference/functions/snippet_html.txt
+share/doc/groonga/ja/html/_sources/reference/functions/string_length.txt
 share/doc/groonga/ja/html/_sources/reference/functions/string_substring.txt
 share/doc/groonga/ja/html/_sources/reference/functions/sub_filter.txt
 share/doc/groonga/ja/html/_sources/reference/functions/time_classify_day.txt
@@ -757,6 +787,7 @@ share/doc/groonga/ja/html/_sources/reference/functions/time_classify_month.txt
 share/doc/groonga/ja/html/_sources/reference/functions/time_classify_second.txt
 share/doc/groonga/ja/html/_sources/reference/functions/time_classify_week.txt
 share/doc/groonga/ja/html/_sources/reference/functions/time_classify_year.txt
+share/doc/groonga/ja/html/_sources/reference/functions/vector_new.txt
 share/doc/groonga/ja/html/_sources/reference/functions/vector_size.txt
 share/doc/groonga/ja/html/_sources/reference/functions/vector_slice.txt
 share/doc/groonga/ja/html/_sources/reference/grn_expr.txt
@@ -786,6 +817,10 @@ share/doc/groonga/ja/html/_sources/reference/token_filters.txt
 share/doc/groonga/ja/html/_sources/reference/tokenizers.txt
 share/doc/groonga/ja/html/_sources/reference/tuning.txt
 share/doc/groonga/ja/html/_sources/reference/types.txt
+share/doc/groonga/ja/html/_sources/reference/window_function.txt
+share/doc/groonga/ja/html/_sources/reference/window_functions/record_number.txt
+share/doc/groonga/ja/html/_sources/reference/window_functions/window_record_number.txt
+share/doc/groonga/ja/html/_sources/reference/window_functions/window_sum.txt
 share/doc/groonga/ja/html/_sources/server.txt
 share/doc/groonga/ja/html/_sources/server/gqtp.txt
 share/doc/groonga/ja/html/_sources/server/http.txt
@@ -799,6 +834,7 @@ share/doc/groonga/ja/html/_sources/spec/gqtp.txt
 share/doc/groonga/ja/html/_sources/spec/search.txt
 share/doc/groonga/ja/html/_sources/troubleshooting.txt
 share/doc/groonga/ja/html/_sources/troubleshooting/different_results_with_the_same_keyword.txt
+share/doc/groonga/ja/html/_sources/troubleshooting/how_to_analyze_error_message.txt
 share/doc/groonga/ja/html/_sources/troubleshooting/mmap_cannot_allocate_memory.txt
 share/doc/groonga/ja/html/_sources/tutorial.txt
 share/doc/groonga/ja/html/_sources/tutorial/data.txt
@@ -881,6 +917,7 @@ share/doc/groonga/ja/html/news/2.x.html
 share/doc/groonga/ja/html/news/3.x.html
 share/doc/groonga/ja/html/news/4.x.html
 share/doc/groonga/ja/html/news/5.x.html
+share/doc/groonga/ja/html/news/6.x.html
 share/doc/groonga/ja/html/news/senna.html
 share/doc/groonga/ja/html/objects.inv
 share/doc/groonga/ja/html/reference.html
@@ -975,6 +1012,7 @@ share/doc/groonga/ja/html/reference/commands/select.html
 share/doc/groonga/ja/html/reference/commands/shutdown.html
 share/doc/groonga/ja/html/reference/commands/status.html
 share/doc/groonga/ja/html/reference/commands/suggest.html
+share/doc/groonga/ja/html/reference/commands/table_copy.html
 share/doc/groonga/ja/html/reference/commands/table_create.html
 share/doc/groonga/ja/html/reference/commands/table_list.html
 share/doc/groonga/ja/html/reference/commands/table_remove.html
@@ -1005,14 +1043,16 @@ share/doc/groonga/ja/html/reference/functions/geo_in_rectangle.html
 share/doc/groonga/ja/html/reference/functions/highlight_full.html
 share/doc/groonga/ja/html/reference/functions/highlight_html.html
 share/doc/groonga/ja/html/reference/functions/html_untag.html
+share/doc/groonga/ja/html/reference/functions/in_records.html
 share/doc/groonga/ja/html/reference/functions/in_values.html
+share/doc/groonga/ja/html/reference/functions/math_abs.html
 share/doc/groonga/ja/html/reference/functions/now.html
 share/doc/groonga/ja/html/reference/functions/number_classify.html
 share/doc/groonga/ja/html/reference/functions/prefix_rk_search.html
 share/doc/groonga/ja/html/reference/functions/query.html
 share/doc/groonga/ja/html/reference/functions/rand.html
-share/doc/groonga/ja/html/reference/functions/record_number.html
 share/doc/groonga/ja/html/reference/functions/snippet_html.html
+share/doc/groonga/ja/html/reference/functions/string_length.html
 share/doc/groonga/ja/html/reference/functions/string_substring.html
 share/doc/groonga/ja/html/reference/functions/sub_filter.html
 share/doc/groonga/ja/html/reference/functions/time_classify_day.html
@@ -1022,6 +1062,7 @@ share/doc/groonga/ja/html/reference/functions/time_classify_month.html
 share/doc/groonga/ja/html/reference/functions/time_classify_second.html
 share/doc/groonga/ja/html/reference/functions/time_classify_week.html
 share/doc/groonga/ja/html/reference/functions/time_classify_year.html
+share/doc/groonga/ja/html/reference/functions/vector_new.html
 share/doc/groonga/ja/html/reference/functions/vector_size.html
 share/doc/groonga/ja/html/reference/functions/vector_slice.html
 share/doc/groonga/ja/html/reference/grn_expr.html
@@ -1051,6 +1092,10 @@ share/doc/groonga/ja/html/reference/token_filters.html
 share/doc/groonga/ja/html/reference/tokenizers.html
 share/doc/groonga/ja/html/reference/tuning.html
 share/doc/groonga/ja/html/reference/types.html
+share/doc/groonga/ja/html/reference/window_function.html
+share/doc/groonga/ja/html/reference/window_functions/record_number.html
+share/doc/groonga/ja/html/reference/window_functions/window_record_number.html
+share/doc/groonga/ja/html/reference/window_functions/window_sum.html
 share/doc/groonga/ja/html/search.html
 share/doc/groonga/ja/html/searchindex.js
 share/doc/groonga/ja/html/server.html
@@ -1066,6 +1111,7 @@ share/doc/groonga/ja/html/spec/gqtp.html
 share/doc/groonga/ja/html/spec/search.html
 share/doc/groonga/ja/html/troubleshooting.html
 share/doc/groonga/ja/html/troubleshooting/different_results_with_the_same_keyword.html
+share/doc/groonga/ja/html/troubleshooting/how_to_analyze_error_message.html
 share/doc/groonga/ja/html/troubleshooting/mmap_cannot_allocate_memory.html
 share/doc/groonga/ja/html/tutorial.html
 share/doc/groonga/ja/html/tutorial/data.html
@@ -1088,7 +1134,6 @@ ${PLIST.httpd}share/examples/groonga/httpd/html/index.html
 ${PLIST.httpd}share/examples/groonga/httpd/koi-utf
 ${PLIST.httpd}share/examples/groonga/httpd/koi-win
 ${PLIST.httpd}share/examples/groonga/httpd/mime.types
-${PLIST.httpd}share/examples/groonga/httpd/nginx.conf
 ${PLIST.httpd}share/examples/groonga/httpd/scgi_params
 ${PLIST.httpd}share/examples/groonga/httpd/uwsgi_params
 ${PLIST.httpd}share/examples/groonga/httpd/win-utf
@@ -1152,53 +1197,3 @@ share/groonga/html/admin/js/jquery-1.7.2.js
 share/groonga/html/admin/js/jquery-ui-1.8.18.custom.js
 share/groonga/html/admin/js/jquery.flot-0.8.3.js
 share/groonga/html/admin/js/jquery.flot.license.txt
-share/groonga/images/logo/groonga-icon-foreground-white.png
-share/groonga/images/logo/groonga-icon-foreground-white.svg
-share/groonga/images/logo/groonga-icon-full-size.png
-share/groonga/images/logo/groonga-icon-full-size.svg
-share/groonga/images/logo/groonga-icon.png
-share/groonga/images/logo/groonga-icon.svg
-share/groonga/images/logo/groonga-logo-foreground-white.png
-share/groonga/images/logo/groonga-logo-foreground-white.svg
-share/groonga/images/logo/groonga-logo.png
-share/groonga/images/logo/groonga-logo.svg
-share/groonga/images/logo/groonga-powered-by-banner-bar-foreground-white.png
-share/groonga/images/logo/groonga-powered-by-banner-bar-foreground-white.svg
-share/groonga/images/logo/groonga-powered-by-banner-bar.png
-share/groonga/images/logo/groonga-powered-by-banner-bar.svg
-share/groonga/images/logo/groonga-powered-by-banner-foreground-white.png
-share/groonga/images/logo/groonga-powered-by-banner-foreground-white.svg
-share/groonga/images/logo/groonga-powered-by-banner-large.png
-share/groonga/images/logo/groonga-powered-by-banner-large.svg
-share/groonga/images/logo/groonga-powered-by-banner.png
-share/groonga/images/logo/groonga-powered-by-banner.svg
-share/groonga/images/logo/mroonga-icon-foreground-white.png
-share/groonga/images/logo/mroonga-icon-foreground-white.svg
-share/groonga/images/logo/mroonga-icon-full-size.png
-share/groonga/images/logo/mroonga-icon-full-size.svg
-share/groonga/images/logo/mroonga-icon.png
-share/groonga/images/logo/mroonga-icon.svg
-share/groonga/images/logo/mroonga-logo-foreground-white.png
-share/groonga/images/logo/mroonga-logo-foreground-white.svg
-share/groonga/images/logo/mroonga-logo.png
-share/groonga/images/logo/mroonga-logo.svg
-share/groonga/images/logo/nroonga-icon-foreground-white.png
-share/groonga/images/logo/nroonga-icon-foreground-white.svg
-share/groonga/images/logo/nroonga-icon-full-size.png
-share/groonga/images/logo/nroonga-icon-full-size.svg
-share/groonga/images/logo/nroonga-icon.png
-share/groonga/images/logo/nroonga-icon.svg
-share/groonga/images/logo/nroonga-logo-foreground-white.png
-share/groonga/images/logo/nroonga-logo-foreground-white.svg
-share/groonga/images/logo/nroonga-logo.png
-share/groonga/images/logo/nroonga-logo.svg
-share/groonga/images/logo/rroonga-icon-foreground-white.png
-share/groonga/images/logo/rroonga-icon-foreground-white.svg
-share/groonga/images/logo/rroonga-icon-full-size.png
-share/groonga/images/logo/rroonga-icon-full-size.svg
-share/groonga/images/logo/rroonga-icon.png
-share/groonga/images/logo/rroonga-icon.svg
-share/groonga/images/logo/rroonga-logo-foreground-white.png
-share/groonga/images/logo/rroonga-logo-foreground-white.svg
-share/groonga/images/logo/rroonga-logo.png
-share/groonga/images/logo/rroonga-logo.svg
diff --git a/textproc/groonga/buildlink3.mk b/textproc/groonga/buildlink3.mk
new file mode 100644
index 00000000000..c2161f864d4
--- /dev/null
+++ b/textproc/groonga/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2017/08/29 12:54:47 fhajny Exp $
+
+BUILDLINK_TREE+=	groonga
+
+.if !defined(GROONGA_BUILDLINK3_MK)
+GROONGA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.groonga+=	groonga>=7.0.4
+BUILDLINK_PKGSRCDIR.groonga?=	../../textproc/groonga
+BUILDLINK_INCDIRS.groonga+=	include/groonga
+
+.include "../../devel/editline/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+pkgbase := groonga
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_OPTIONS:Mgroonga-suggest-learner)
+.include "../../devel/msgpack/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mlz4)
+.include "../../archivers/lz4/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmecab)
+.include "../../textproc/mecab/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mzlib)
+.include "../../devel/zlib/buildlink3.mk"
+.endif
+
+.endif	# GROONGA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-groonga
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index a2a95cde87b..54cfaf5ff3c 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.42 2016/09/11 16:06:53 taca Exp $
+$NetBSD: distinfo,v 1.43 2017/08/29 12:54:47 fhajny Exp $
 
-SHA1 (groonga-6.0.8.tar.gz) = e00954641ac1e8594f37853e6f9d2aab59496061
-RMD160 (groonga-6.0.8.tar.gz) = 18ffe56b547204f0a5cf891f2ffae83016f46324
-SHA512 (groonga-6.0.8.tar.gz) = 1f4effe375f58a2604851f5af58e004e5da098898a488a14a9da0e0806efb00ef01d0cbfae3312535241133e84707b2824dd88593d4ff29580ca22f7247ea7ec
-Size (groonga-6.0.8.tar.gz) = 13704493 bytes
-SHA1 (patch-data_scripts_Makefile.in) = 3ad802186af2d4a95286322546d29d33a1505928
-SHA1 (patch-vendor_nginx-1.11.3_auto_install) = bc3c0557e18dd41dad20ab36933e160f3c557c78
+SHA1 (groonga-7.0.5.tar.gz) = e47df917bfe9120f063d5206a05b354ac6da3d53
+RMD160 (groonga-7.0.5.tar.gz) = eb7d818b4eef91774cfa64585c8bb927c7283726
+SHA512 (groonga-7.0.5.tar.gz) = d5db9617fc6e799f14c687a435c1de46b4d30f77def60712531a3f4a76e9d67c836f07c91e7252d63eeb79629b47f73e612143139ff12226344315d35ac5e9ec
+Size (groonga-7.0.5.tar.gz) = 14463662 bytes
diff --git a/textproc/groonga/options.mk b/textproc/groonga/options.mk
index 7deefa90b51..ec358e28a42 100644
--- a/textproc/groonga/options.mk
+++ b/textproc/groonga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2016/09/11 16:06:53 taca Exp $
+# $NetBSD: options.mk,v 1.18 2017/08/29 12:54:47 fhajny Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groonga
@@ -66,36 +66,37 @@ OWN_DIRS+=	${VARBASE}/run/${PKGBASE}
 OWN_DIRS+=	${VARBASE}/log/${PKGBASE}/httpd
 BUILD_DEFS+=	VARBASE
 
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/fastcgi.conf \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/fastcgi.conf \
 		${PKG_SYSCONFDIR}/httpd/fastcgi.conf
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/fastcgi_params \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/fastcgi_params \
 		${PKG_SYSCONFDIR}/httpd/fastcgi_params
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/groonga-httpd.conf \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/groonga-httpd.conf \
 		${PKG_SYSCONFDIR}/httpd/groonga-httpd.conf
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/html/50x.html \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/html/50x.html \
 		${PKG_SYSCONFDIR}/httpd/html/50x.html
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/html/index.html \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/html/index.html \
 		${PKG_SYSCONFDIR}/httpd/html/index.html
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/koi-utf \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/koi-utf \
 		${PKG_SYSCONFDIR}/httpd/koi-utf
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/koi-win \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/koi-win \
 		${PKG_SYSCONFDIR}/httpd/koi-win
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/mime.types \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/mime.types \
 		${PKG_SYSCONFDIR}/httpd/mime.types
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/nginx.conf \
-		${PKG_SYSCONFDIR}/httpd/nginx.conf
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/scgi_params \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/scgi_params \
 		${PKG_SYSCONFDIR}/httpd/scgi_params
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/uwsgi_params \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/uwsgi_params \
 		${PKG_SYSCONFDIR}/httpd/uwsgi_params
-CONF_FILES+=	share/examples/${PKGBASE}/httpd/win-utf \
+CONF_FILES+=	${EXAMPLE_CONF_DIR}/httpd/win-utf \
 		${PKG_SYSCONFDIR}/httpd/win-utf
 
 SUBST_CLASSES+=		confpath
 SUBST_STAGE.confpath=	pre-build
-SUBST_FILES.confpath=	vendor/nginx-1.11.3/objs/Makefile
+SUBST_FILES.confpath=	vendor/nginx-*/objs/Makefile
 SUBST_SED.confpath=	-e 's,\$$(DESTDIR)${PKG_SYSCONFDIR}/httpd,\$$(DESTDIR)${PREFIX}/share/examples/${PKGBASE}/httpd,g'
 
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/share/examples/groonga/httpd/*.default
+
 .else
 CONFIGURE_ARGS+=	--disable-groonga-httpd
 .endif
diff --git a/textproc/groonga/patches/patch-data_scripts_Makefile.in b/textproc/groonga/patches/patch-data_scripts_Makefile.in
deleted file mode 100644
index 328a96300f7..00000000000
--- a/textproc/groonga/patches/patch-data_scripts_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-data_scripts_Makefile.in,v 1.1 2016/09/11 16:07:55 taca Exp $
-
-Build and install groonga-httpd-restart when groonga-httpd PKG_OPTION is
-enabled.
-
---- data/scripts/Makefile.in.orig	2016-08-28 17:54:32.000000000 +0000
-+++ data/scripts/Makefile.in
-@@ -410,7 +410,7 @@ tokenizer_pluginsdir = @tokenizer_plugin
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--dist_sbin_SCRIPTS = groonga-httpd-restart
-+@WITH_GROONGA_HTTPD_TRUE@dist_sbin_SCRIPTS = groonga-httpd-restart
- all: all-am
- 
- .SUFFIXES:
diff --git a/textproc/groonga/patches/patch-vendor_nginx-1.11.3_auto_install b/textproc/groonga/patches/patch-vendor_nginx-1.11.3_auto_install
deleted file mode 100644
index b3d5461f7b4..00000000000
--- a/textproc/groonga/patches/patch-vendor_nginx-1.11.3_auto_install
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-vendor_nginx-1.11.3_auto_install,v 1.1 2016/09/11 16:07:55 taca Exp $
-
-Don't create "*.default".
-
---- vendor/nginx-1.11.3/auto/install.orig	2016-07-27 04:07:48.000000000 +0000
-+++ vendor/nginx-1.11.3/auto/install
-@@ -123,30 +123,21 @@ install:	build $NGX_INSTALL_PERL_MODULES
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \\
- 		|| cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \\
- 		|| cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/fastcgi_params \\
--		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \\
- 		|| cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \\
- 		|| cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/uwsgi_params \\
--		'\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \\
- 		|| cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/scgi_params \\
--		'\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PATH' \\
--		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
--	cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
-+		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
- 
- 	test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
- 		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'