Bumped Groonga to version 7.0.4 and added buildlink support to package.

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}

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

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

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

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"`'
+