Update groonga to 4.0.4.

Release 4.0.4 - 2014/07/29
--------------------------

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

* [httpd] Updated bundled nginx version to the latest mainline (1.7.3).
* Supported weight in vector column.
* [ :doc:`/reference/executables/groonga-benchmark` ] Added missing description about HTTP.
* [ :doc:`/tutorial` ] Updated English tutorial documentation.
* [example] Supported Ruby 1.9 or later for edict2grn.rb.
* [http][admin] Updated to use English as default language. [GitHub#182]

Fixes
^^^^^

* Fixed to show right syntax error location in response.
* [httpd] Fixed build error on Clang. [GitHub clear-code/rurema-search#11] [Reported by niku]

Thanks
^^^^^^

* niku

4 files changed, 15 insertions, 12 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 663665cd7d0..ce98f073b07 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2014/07/07 13:05:35 obache Exp $
+# $NetBSD: Makefile,v 1.44 2014/07/29 10:00:22 obache Exp $
 #
 
-DISTNAME=	groonga-4.0.3
-PKGREVISION=	1
+DISTNAME=	groonga-4.0.4
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
diff --git a/textproc/groonga/PLIST b/textproc/groonga/PLIST
index c3f3d93e80c..bee72ff4aa4 100644
--- a/textproc/groonga/PLIST
+++ b/textproc/groonga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/07/02 12:42:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.23 2014/07/29 10:00:22 obache Exp $
 bin/groonga
 bin/groonga-benchmark
 bin/groonga-suggest-create-dataset
@@ -787,8 +787,8 @@ share/groonga/examples/dictionary/html/css/smoothness/images/ui-icons_cd0a0a_256
 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.6.0.min.js
-share/groonga/examples/dictionary/html/js/jquery-ui-1.8.12.min.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/init-db.sh
 share/groonga/examples/dictionary/jmdict/jmdict.rb
 share/groonga/examples/dictionary/readme.txt
@@ -816,6 +816,8 @@ share/groonga/html/admin/images/groonga.png
 share/groonga/html/admin/images/groonga.svg
 share/groonga/html/admin/images/loading.gif
 share/groonga/html/admin/index.html
+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
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index 6d755cd3fe9..eea95013463 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.29 2014/07/02 12:42:34 obache Exp $
+$NetBSD: distinfo,v 1.30 2014/07/29 10:00:22 obache Exp $
 
-SHA1 (groonga-4.0.3.tar.gz) = f5ed68228e82585903f672f3387785b3b7e24dea
-RMD160 (groonga-4.0.3.tar.gz) = f5d623bb9e8a407c1a76bf74d528740a3db93ac5
-Size (groonga-4.0.3.tar.gz) = 9958449 bytes
+SHA1 (groonga-4.0.4.tar.gz) = 47c874beb84fcb1c5420a5cb1d1da1441464dcbb
+RMD160 (groonga-4.0.4.tar.gz) = 6460d9a4d090f43dc20405f1ed76268fd8836e2a
+Size (groonga-4.0.4.tar.gz) = 10029443 bytes
diff --git a/textproc/groonga/options.mk b/textproc/groonga/options.mk
index c93979b2331..d5fdf76d97d 100644
--- a/textproc/groonga/options.mk
+++ b/textproc/groonga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2014/04/05 08:09:35 obache Exp $
+# $NetBSD: options.mk,v 1.11 2014/07/29 10:00:22 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groonga
@@ -72,6 +72,8 @@ CONFIGURE_ARGS+=	--enable-groonga-httpd
 PLIST.httpd=	yes
 OWN_DIRS+=	${PKG_SYSCONFDIR}/httpd/html
 OWN_DIRS+=	${PKG_SYSCONFDIR}/httpd
+OWN_DIRS+=	${VARBASE}/run/${PKGBASE}
+OWN_DIRS+=	${VARBASE}/log/${PKGBASE}/httpd
 
 CONF_FILES+=	share/examples/${PKGBASE}/httpd/fastcgi.conf \
 		${PKG_SYSCONFDIR}/httpd/fastcgi.conf
@@ -98,7 +100,7 @@ CONF_FILES+=	share/examples/${PKGBASE}/httpd/win-utf \
 
 SUBST_CLASSES+=		confpath
 SUBST_STAGE.confpath=	post-configure
-SUBST_FILES.confpath=	vendor/nginx-1.4.7/objs/Makefile
+SUBST_FILES.confpath=	vendor/nginx-1.7.3/objs/Makefile
 SUBST_SED.confpath=	-e 's,\$$(DESTDIR)${PKG_SYSCONFDIR}/httpd,\$$(DESTDIR)${PREFIX}/share/examples/${PKGBASE}/httpd,g'
 .else
 CONFIGURE_ARGS+=	--disable-groonga-httpd