4 files changed, 23 insertions, 35 deletions

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index f615a5264b38..796265e0e253 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	groonga
-PORTVERSION=	4.0.6.1
+PORTVERSION=	5.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open-source fulltext search engine and column store
 
 LICENSE=	LGPL21
@@ -30,8 +30,6 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PKGDEINSTALL=	${PKGINSTALL}
-
 BROKEN_ia64=	does not compile on ia64
 BROKEN_powerpc=	does not compile on powerpc
 BROKEN_sparc64=	does not compile on sparc64
@@ -56,10 +54,6 @@ SUGGEST_CONFIGURE_OFF=	--without-libevent \
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == i386
-USE_GCC=	any
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|lib/$${PACKAGE}/db/db|db/$${PACKAGE}/db| ; \
@@ -68,9 +62,11 @@ 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.7.6/auto/install
+		${WRKSRC}/vendor/nginx-1.7.9/auto/install
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/groonga-httpd
+	@${MKDIR} ${STAGEDIR}/var/log/groonga/httpd
+	@${MKDIR} ${STAGEDIR}/var/run/groonga
 
 .include <bsd.port.mk>
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index d4251f3cece3..20ee4867ec24 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (groonga-4.0.6.1.tar.gz) = 4b63383c593fbfb7b019238edb50a756eb5bdfad1d99465aa0fb6ddbc91eec69
-SIZE (groonga-4.0.6.1.tar.gz) = 10940699
+SHA256 (groonga-5.0.0.tar.gz) = c7a1a5b11021491539b2d03895b87229836f6f6efe299c0dc352da526bc5a5bf
+SIZE (groonga-5.0.0.tar.gz) = 11596918
diff --git a/textproc/groonga/pkg-install b/textproc/groonga/pkg-install
deleted file mode 100644
index 40053a93e4ee..000000000000
--- a/textproc/groonga/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "INSTALL" ]; then
-   if [ ! -d /var/log/groonga ]; then
-      mkdir -p /var/log/groonga
-   fi
-   if [ ! -d /var/log/groonga/httpd ]; then
-      mkdir -p /var/log/groonga/httpd
-   fi
-   if [ ! -d /var/run/groonga ]; then
-       mkdir -p /var/run/groonga
-   fi
-fi
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-   rmdir /var/run/groonga 2>/dev/null || true
-   rmdir /var/log/groonga/httpd 2>/dev/null || true
-   rmdir /var/log/groonga 2>/dev/null || true
-fi
diff --git a/textproc/groonga/pkg-plist b/textproc/groonga/pkg-plist
index 28114c20e2e6..5f27cf893bf3 100644
--- a/textproc/groonga/pkg-plist
+++ b/textproc/groonga/pkg-plist
@@ -23,11 +23,19 @@ bin/groonga-benchmark
 %%ETCDIR%%/httpd/win-utf
 %%ETCDIR%%/synonyms.tsv
 include/groonga/groonga.h
+include/groonga/groonga/command.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/output.h
 include/groonga/groonga/plugin.h
+include/groonga/groonga/request_canceler.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.a
 lib/groonga/plugins/query_expanders/tsv.so
 lib/groonga/plugins/suggest/suggest.a
@@ -68,8 +76,8 @@ sbin/groonga-httpd-restart
 %%DATADIR%%/examples/dictionary/html/css/smoothness/jquery-ui-1.8.12.custom.css
 %%DATADIR%%/examples/dictionary/html/index.html
 %%DATADIR%%/examples/dictionary/html/js/dictionary.js
-%%DATADIR%%/examples/dictionary/html/js/jquery-1.7.2.min.js
-%%DATADIR%%/examples/dictionary/html/js/jquery-ui-1.8.18.custom.min.js
+%%DATADIR%%/examples/dictionary/html/js/jquery-1.7.2.js
+%%DATADIR%%/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js
 %%DATADIR%%/examples/dictionary/init-db.sh
 %%DATADIR%%/examples/dictionary/jmdict/jmdict.rb
 %%DATADIR%%/examples/dictionary/readme.txt
@@ -100,9 +108,9 @@ sbin/groonga-httpd-restart
 %%DATADIR%%/html/admin/index.ja.html
 %%DATADIR%%/html/admin/js/groonga-admin.js
 %%DATADIR%%/html/admin/js/groonga-admin.ja.js
-%%DATADIR%%/html/admin/js/jquery-1.7.2.min.js
-%%DATADIR%%/html/admin/js/jquery-ui-1.8.18.custom.min.js
-%%DATADIR%%/html/admin/js/jquery.flot-0.7.min.js
+%%DATADIR%%/html/admin/js/jquery-1.7.2.js
+%%DATADIR%%/html/admin/js/jquery-ui-1.8.18.custom.js
+%%DATADIR%%/html/admin/js/jquery.flot-0.7.js
 %%DATADIR%%/html/admin/js/jquery.flot.license.txt
 %%DATADIR%%/images/logo/groonga-icon-foreground-white.png
 %%DATADIR%%/images/logo/groonga-icon-foreground-white.svg
@@ -162,3 +170,6 @@ sbin/groonga-httpd-restart
 %%DATADIR%%/munin/plugins/groonga_query_performance_
 %%DATADIR%%/munin/plugins/groonga_status_
 %%DATADIR%%/munin/plugins/groonga_throughput_
+@dir /var/log/groonga/httpd
+@dir /var/log/groonga
+@dir /var/run/groonga