diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index b1cc16b6fbf7..28686dabf1f2 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 $
 #
 
-DISTNAME=	groonga-6.0.8
+DISTNAME=	groonga-7.0.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
@@ -31,12 +31,14 @@ 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
+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}
diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST
index 349f988bad82..8e7bf2e30256 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$
 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,22 @@ 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/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 +113,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 +207,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 +238,15 @@ 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/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 +256,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 +286,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
@@ -372,6 +385,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 +480,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 +511,15 @@ 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/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 +529,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 +559,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
@@ -617,6 +638,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 +732,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 +763,15 @@ 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/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 +781,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 +811,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
@@ -881,6 +910,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 +1005,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 +1036,15 @@ 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/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 +1054,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 +1084,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
@@ -1080,18 +1117,7 @@ share/doc/groonga/ja/html/tutorial/patricia_trie.html
 share/doc/groonga/ja/html/tutorial/query_expansion.html
 share/doc/groonga/ja/html/tutorial/search.html
 share/examples/groonga/groonga.conf
-${PLIST.httpd}share/examples/groonga/httpd/fastcgi.conf
-${PLIST.httpd}share/examples/groonga/httpd/fastcgi_params
-share/examples/groonga/httpd/groonga-httpd.conf
-${PLIST.httpd}share/examples/groonga/httpd/html/50x.html
-${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
+${PLIST.httpd}share/examples/groonga/httpd/groonga-httpd.conf
 share/examples/groonga/synonyms.tsv
 share/groonga/examples/dictionary/edict/edict-import.sh
 share/groonga/examples/dictionary/edict/edict2grn.rb
@@ -1152,53 +1178,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 000000000000..4a264803cceb
--- /dev/null
+++ b/textproc/groonga/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+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"
+.endif	# GROONGA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-groonga
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index a2a95cde87b2..beac6e7869d4 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.42 2016/09/11 16:06:53 taca 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.4.tar.gz) = 80848570d91dc7a4481aa9c6b505f5eff0208daf
+RMD160 (groonga-7.0.4.tar.gz) = fcb25437c92529917baf2ebf3576f6fc63a9cdea
+SHA512 (groonga-7.0.4.tar.gz) = bf8cc95402bdc5709e5aad452a76564c873d486eaf59603897d665c696229ee3d4c7fc65bb62c4206dfaade40d46d8ea4f4504f9a8aec78886e97c7411e8d8d7
+Size (groonga-7.0.4.tar.gz) = 14424905 bytes
+SHA1 (patch-vendor_nginx-1.11.3_auto_install) = bebe918125f35246ae352456355e7b135277f4c0
diff --git a/textproc/groonga/options.mk b/textproc/groonga/options.mk
index 7deefa90b51a..834086cb46f3 100644
--- a/textproc/groonga/options.mk
+++ b/textproc/groonga/options.mk
@@ -66,34 +66,32 @@ 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-1.13.1/objs/Makefile
 SUBST_SED.confpath=	-e 's,\$$(DESTDIR)${PKG_SYSCONFDIR}/httpd,\$$(DESTDIR)${PREFIX}/share/examples/${PKGBASE}/httpd,g'
 
 .else
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 328a96300f72..000000000000
--- 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
index b3d5461f7b47..d0dcb37aa6bc 100644
--- a/textproc/groonga/patches/patch-vendor_nginx-1.11.3_auto_install
+++ b/textproc/groonga/patches/patch-vendor_nginx-1.11.3_auto_install
@@ -2,9 +2,9 @@ $NetBSD: patch-vendor_nginx-1.11.3_auto_install,v 1.1 2016/09/11 16:07:55 taca E
 
 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
+--- vendor/nginx-1.13.1/auto/install.orig	2017-06-23 17:48:52.000000000 +0200
++++ vendor/nginx-1.13.1/auto/install	2017-07-27 10:37:44.063303480 +0200
+@@ -123,30 +123,21 @@
  
  	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \\
  		|| cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
@@ -30,9 +30,9 @@ Don't create "*.default".
 -		'\$(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_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"`'
+