@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/11/15 02:13:19 obache Exp $
+# $NetBSD: Makefile,v 1.48 2014/12/03 08:47:11 obache Exp $
#
-DISTNAME= groonga-4.0.7
-PKGREVISION= 1
+DISTNAME= groonga-4.0.8
CATEGORIES= textproc
MASTER_SITES= http://packages.groonga.org/source/groonga/
@@ -26,7 +25,7 @@
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --with-ruby19=${RUBY}
+CONFIGURE_ARGS+= --with-ruby=${RUBY}
PKGCONFIG_OVERRIDE+= groonga.pc.in
@@ -38,6 +37,8 @@
CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \
${PKG_SYSCONFDIR}/groonga.conf
+CONF_FILES+= share/examples/groonga/synonyms.tsv \
+ ${PKG_SYSCONFDIR}/synonyms.tsv
OWN_DIRS+= ${VARBASE}/log/${PKGBASE}
@@ -1,15 +1,20 @@
-@comment $NetBSD: PLIST,v 1.25 2014/11/04 11:40:20 obache Exp $
+@comment $NetBSD: PLIST,v 1.26 2014/12/03 08:47:11 obache Exp $
bin/groonga
bin/groonga-benchmark
bin/groonga-suggest-create-dataset
${PLIST.learner}bin/groonga-suggest-httpd
${PLIST.learner}bin/groonga-suggest-learner
include/groonga/groonga.h
+include/groonga/groonga/expr.h
+include/groonga/groonga/groonga.h
+include/groonga/groonga/ii.h
include/groonga/groonga/nfkc.h
include/groonga/groonga/normalizer.h
include/groonga/groonga/plugin.h
+include/groonga/groonga/token.h
include/groonga/groonga/token_filter.h
include/groonga/groonga/tokenizer.h
+include/groonga/groonga/util.h
lib/groonga/plugins/query_expanders/tsv.la
lib/groonga/plugins/suggest/suggest.la
lib/groonga/plugins/table/table.la
@@ -67,6 +72,7 @@
share/doc/groonga/en/html/_sources/reference/api/grn_cache.txt
share/doc/groonga/en/html/_sources/reference/api/grn_column.txt
share/doc/groonga/en/html/_sources/reference/api/grn_command_version.txt
+share/doc/groonga/en/html/_sources/reference/api/grn_content_type.txt
share/doc/groonga/en/html/_sources/reference/api/grn_ctx.txt
share/doc/groonga/en/html/_sources/reference/api/grn_db.txt
share/doc/groonga/en/html/_sources/reference/api/grn_encoding.txt
@@ -111,6 +117,7 @@
share/doc/groonga/en/html/_sources/reference/commands/normalize.txt
share/doc/groonga/en/html/_sources/reference/commands/normalizer_list.txt
share/doc/groonga/en/html/_sources/reference/commands/quit.txt
+share/doc/groonga/en/html/_sources/reference/commands/range_filter.txt
share/doc/groonga/en/html/_sources/reference/commands/register.txt
share/doc/groonga/en/html/_sources/reference/commands/ruby_eval.txt
share/doc/groonga/en/html/_sources/reference/commands/ruby_load.txt
@@ -121,6 +128,7 @@
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
+share/doc/groonga/en/html/_sources/reference/commands/table_tokenize.txt
share/doc/groonga/en/html/_sources/reference/commands/tokenize.txt
share/doc/groonga/en/html/_sources/reference/commands/tokenizer_list.txt
share/doc/groonga/en/html/_sources/reference/commands/truncate.txt
@@ -142,6 +150,7 @@
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_values.txt
share/doc/groonga/en/html/_sources/reference/functions/now.txt
share/doc/groonga/en/html/_sources/reference/functions/query.txt
share/doc/groonga/en/html/_sources/reference/functions/rand.txt
@@ -164,6 +173,7 @@
share/doc/groonga/en/html/_sources/reference/suggest/introduction.txt
share/doc/groonga/en/html/_sources/reference/suggest/suggestion.txt
share/doc/groonga/en/html/_sources/reference/tables.txt
+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
@@ -205,6 +215,7 @@
share/doc/groonga/en/html/_static/groonga.css
share/doc/groonga/en/html/_static/header-background.png
share/doc/groonga/en/html/_static/jp.png
+share/doc/groonga/en/html/_static/jquery-1.11.1.js
share/doc/groonga/en/html/_static/jquery.js
share/doc/groonga/en/html/_static/logo.png
share/doc/groonga/en/html/_static/minus.png
@@ -212,6 +223,7 @@
share/doc/groonga/en/html/_static/plus.png
share/doc/groonga/en/html/_static/pygments.css
share/doc/groonga/en/html/_static/searchtools.js
+share/doc/groonga/en/html/_static/underscore-1.3.1.js
share/doc/groonga/en/html/_static/underscore.js
share/doc/groonga/en/html/_static/up-pressed.png
share/doc/groonga/en/html/_static/up.png
@@ -263,6 +275,7 @@
share/doc/groonga/en/html/reference/api/grn_cache.html
share/doc/groonga/en/html/reference/api/grn_column.html
share/doc/groonga/en/html/reference/api/grn_command_version.html
+share/doc/groonga/en/html/reference/api/grn_content_type.html
share/doc/groonga/en/html/reference/api/grn_ctx.html
share/doc/groonga/en/html/reference/api/grn_db.html
share/doc/groonga/en/html/reference/api/grn_encoding.html
@@ -307,6 +320,7 @@
share/doc/groonga/en/html/reference/commands/normalize.html
share/doc/groonga/en/html/reference/commands/normalizer_list.html
share/doc/groonga/en/html/reference/commands/quit.html
+share/doc/groonga/en/html/reference/commands/range_filter.html
share/doc/groonga/en/html/reference/commands/register.html
share/doc/groonga/en/html/reference/commands/ruby_eval.html
share/doc/groonga/en/html/reference/commands/ruby_load.html
@@ -317,6 +331,7 @@
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
+share/doc/groonga/en/html/reference/commands/table_tokenize.html
share/doc/groonga/en/html/reference/commands/tokenize.html
share/doc/groonga/en/html/reference/commands/tokenizer_list.html
share/doc/groonga/en/html/reference/commands/truncate.html
@@ -338,6 +353,7 @@
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_values.html
share/doc/groonga/en/html/reference/functions/now.html
share/doc/groonga/en/html/reference/functions/query.html
share/doc/groonga/en/html/reference/functions/rand.html
@@ -360,6 +376,7 @@
share/doc/groonga/en/html/reference/suggest/introduction.html
share/doc/groonga/en/html/reference/suggest/suggestion.html
share/doc/groonga/en/html/reference/tables.html
+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
@@ -436,6 +453,7 @@
share/doc/groonga/ja/html/_sources/reference/api/grn_cache.txt
share/doc/groonga/ja/html/_sources/reference/api/grn_column.txt
share/doc/groonga/ja/html/_sources/reference/api/grn_command_version.txt
+share/doc/groonga/ja/html/_sources/reference/api/grn_content_type.txt
share/doc/groonga/ja/html/_sources/reference/api/grn_ctx.txt
share/doc/groonga/ja/html/_sources/reference/api/grn_db.txt
share/doc/groonga/ja/html/_sources/reference/api/grn_encoding.txt
@@ -480,6 +498,7 @@
share/doc/groonga/ja/html/_sources/reference/commands/normalize.txt
share/doc/groonga/ja/html/_sources/reference/commands/normalizer_list.txt
share/doc/groonga/ja/html/_sources/reference/commands/quit.txt
+share/doc/groonga/ja/html/_sources/reference/commands/range_filter.txt
share/doc/groonga/ja/html/_sources/reference/commands/register.txt
share/doc/groonga/ja/html/_sources/reference/commands/ruby_eval.txt
share/doc/groonga/ja/html/_sources/reference/commands/ruby_load.txt
@@ -490,6 +509,7 @@
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
+share/doc/groonga/ja/html/_sources/reference/commands/table_tokenize.txt
share/doc/groonga/ja/html/_sources/reference/commands/tokenize.txt
share/doc/groonga/ja/html/_sources/reference/commands/tokenizer_list.txt
share/doc/groonga/ja/html/_sources/reference/commands/truncate.txt
@@ -511,6 +531,7 @@
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_values.txt
share/doc/groonga/ja/html/_sources/reference/functions/now.txt
share/doc/groonga/ja/html/_sources/reference/functions/query.txt
share/doc/groonga/ja/html/_sources/reference/functions/rand.txt
@@ -533,6 +554,7 @@
share/doc/groonga/ja/html/_sources/reference/suggest/introduction.txt
share/doc/groonga/ja/html/_sources/reference/suggest/suggestion.txt
share/doc/groonga/ja/html/_sources/reference/tables.txt
+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
@@ -574,6 +596,7 @@
share/doc/groonga/ja/html/_static/groonga.css
share/doc/groonga/ja/html/_static/header-background.png
share/doc/groonga/ja/html/_static/jp.png
+share/doc/groonga/ja/html/_static/jquery-1.11.1.js
share/doc/groonga/ja/html/_static/jquery.js
share/doc/groonga/ja/html/_static/logo.png
share/doc/groonga/ja/html/_static/minus.png
@@ -581,6 +604,7 @@
share/doc/groonga/ja/html/_static/plus.png
share/doc/groonga/ja/html/_static/pygments.css
share/doc/groonga/ja/html/_static/searchtools.js
+share/doc/groonga/ja/html/_static/underscore-1.3.1.js
share/doc/groonga/ja/html/_static/underscore.js
share/doc/groonga/ja/html/_static/up-pressed.png
share/doc/groonga/ja/html/_static/up.png
@@ -632,6 +656,7 @@
share/doc/groonga/ja/html/reference/api/grn_cache.html
share/doc/groonga/ja/html/reference/api/grn_column.html
share/doc/groonga/ja/html/reference/api/grn_command_version.html
+share/doc/groonga/ja/html/reference/api/grn_content_type.html
share/doc/groonga/ja/html/reference/api/grn_ctx.html
share/doc/groonga/ja/html/reference/api/grn_db.html
share/doc/groonga/ja/html/reference/api/grn_encoding.html
@@ -676,6 +701,7 @@
share/doc/groonga/ja/html/reference/commands/normalize.html
share/doc/groonga/ja/html/reference/commands/normalizer_list.html
share/doc/groonga/ja/html/reference/commands/quit.html
+share/doc/groonga/ja/html/reference/commands/range_filter.html
share/doc/groonga/ja/html/reference/commands/register.html
share/doc/groonga/ja/html/reference/commands/ruby_eval.html
share/doc/groonga/ja/html/reference/commands/ruby_load.html
@@ -686,6 +712,7 @@
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
+share/doc/groonga/ja/html/reference/commands/table_tokenize.html
share/doc/groonga/ja/html/reference/commands/tokenize.html
share/doc/groonga/ja/html/reference/commands/tokenizer_list.html
share/doc/groonga/ja/html/reference/commands/truncate.html
@@ -707,6 +734,7 @@
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_values.html
share/doc/groonga/ja/html/reference/functions/now.html
share/doc/groonga/ja/html/reference/functions/query.html
share/doc/groonga/ja/html/reference/functions/rand.html
@@ -729,6 +757,7 @@
share/doc/groonga/ja/html/reference/suggest/introduction.html
share/doc/groonga/ja/html/reference/suggest/suggestion.html
share/doc/groonga/ja/html/reference/tables.html
+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
@@ -801,8 +830,8 @@
share/groonga/examples/dictionary/html/css/smoothness/jquery-ui-1.8.12.custom.css
share/groonga/examples/dictionary/html/index.html
share/groonga/examples/dictionary/html/js/dictionary.js
-share/groonga/examples/dictionary/html/js/jquery-1.7.2.min.js
-share/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.min.js
+share/groonga/examples/dictionary/html/js/jquery-1.7.2.js
+share/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js
share/groonga/examples/dictionary/init-db.sh
share/groonga/examples/dictionary/jmdict/jmdict.rb
share/groonga/examples/dictionary/readme.txt
@@ -833,9 +862,9 @@
share/groonga/html/admin/index.ja.html
share/groonga/html/admin/js/groonga-admin.ja.js
share/groonga/html/admin/js/groonga-admin.js
-share/groonga/html/admin/js/jquery-1.7.2.min.js
-share/groonga/html/admin/js/jquery-ui-1.8.18.custom.min.js
-share/groonga/html/admin/js/jquery.flot-0.7.min.js
+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.7.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
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.32 2014/11/04 11:40:20 obache Exp $
+$NetBSD: distinfo,v 1.33 2014/12/03 08:47:11 obache Exp $
-SHA1 (groonga-4.0.7.tar.gz) = b00c56c6d7318fe1a87f6f55366182ace4014a2a
+SHA1 (groonga-4.0.8.tar.gz) = 894bf426c79aaab6e3b1f19811db4634aecdc4c2
-RMD160 (groonga-4.0.7.tar.gz) = 9254e7651161b196f5ed57987cb5cdb8195d8e1b
+RMD160 (groonga-4.0.8.tar.gz) = ec9317049a5ef468ac66a2da93f2352ba6a20e8e
-Size (groonga-4.0.7.tar.gz) = 10990151 bytes
+Size (groonga-4.0.8.tar.gz) = 11343571 bytes
+SHA1 (patch-lib_grn.h) = 8d1c150fa96dd19fe9092d61ce9e82b425049251
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2014/11/08 11:24:28 obache Exp $
+# $NetBSD: options.mk,v 1.15 2014/12/03 08:47:11 obache Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.groonga
@@ -23,17 +23,8 @@
CONFIGURE_ARGS+= --with-cutter
USE_TOOLS+= gmake
TEST_TARGET= check
-TEST_ENV+= RUBYOPT="-Ku"
-.include "../../lang/ruby/buildlink3.mk"
BUILDLINK_API_DEPENDS.cutter+= cutter>=1.1.6
.include "../../devel/cutter/buildlink3.mk"
-RUBY_JSON_REQD= 1.8.0:build
-BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-bundler-[0-9]*:../../misc/ruby-bundler
-BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-msgpack>=0.5.6:../../devel/ruby-msgpack
-BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-test-unit>=2.5.5:../../devel/ruby-test-unit
-BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-test-unit-notify>=1.0.1:../../devel/ruby-test-unit-notify
-RUBY_JSON_REQD= 0:build
-.include "../../lang/ruby/json.mk"
.else
CONFIGURE_ARGS+= --without-cutter
.endif
@@ -101,7 +92,7 @@
SUBST_CLASSES+= confpath
SUBST_STAGE.confpath= post-configure
-SUBST_FILES.confpath= vendor/nginx-1.7.6/objs/Makefile
+SUBST_FILES.confpath= vendor/nginx-1.7.7/objs/Makefile
SUBST_SED.confpath= -e 's,\$$(DESTDIR)${PKG_SYSCONFDIR}/httpd,\$$(DESTDIR)${PREFIX}/share/examples/${PKGBASE}/httpd,g'
.else
CONFIGURE_ARGS+= --disable-groonga-httpd