From 0defeb45e65b937c425c83d40830b1686afbdc4f Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Fri, 12 Dec 2014 01:13:40 +0000
Subject: Use gmake unconditionally.

---
 textproc/groonga/Makefile                                   |  4 ++--
 textproc/groonga/distinfo                                   |  3 +--
 textproc/groonga/options.mk                                 |  3 +--
 .../groonga/patches/patch-vendor_onigmo-source_Makefile.in  | 13 -------------
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 textproc/groonga/patches/patch-vendor_onigmo-source_Makefile.in

diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 591b3bd3f79..74ce4732045 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2014/12/03 08:47:11 obache Exp $
+# $NetBSD: Makefile,v 1.49 2014/12/12 01:13:40 obache Exp $
 #
 
 DISTNAME=	groonga-4.0.8
@@ -17,7 +17,7 @@ DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	gmake pkg-config
 # for long file name
 EXTRACT_USING=	bsdtar
 
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index 71828eee9ab..faa9cdb7c9d 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.34 2014/12/11 22:16:00 joerg Exp $
+$NetBSD: distinfo,v 1.35 2014/12/12 01:13:40 obache Exp $
 
 SHA1 (groonga-4.0.8.tar.gz) = 894bf426c79aaab6e3b1f19811db4634aecdc4c2
 RMD160 (groonga-4.0.8.tar.gz) = ec9317049a5ef468ac66a2da93f2352ba6a20e8e
 Size (groonga-4.0.8.tar.gz) = 11343571 bytes
 SHA1 (patch-lib_grn.h) = 8d1c150fa96dd19fe9092d61ce9e82b425049251
-SHA1 (patch-vendor_onigmo-source_Makefile.in) = 4e1304cd351c8c656d3bd5baa21ce0478e4c74a3
diff --git a/textproc/groonga/options.mk b/textproc/groonga/options.mk
index 74a51449662..365771c262a 100644
--- a/textproc/groonga/options.mk
+++ b/textproc/groonga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2014/12/03 08:47:11 obache Exp $
+# $NetBSD: options.mk,v 1.16 2014/12/12 01:13:40 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groonga
@@ -21,7 +21,6 @@ CONFIGURE_ARGS+=	--without-mecab
 
 .if !empty(PKG_OPTIONS:Mtests)
 CONFIGURE_ARGS+=	--with-cutter
-USE_TOOLS+=		gmake
 TEST_TARGET=		check
 BUILDLINK_API_DEPENDS.cutter+=		cutter>=1.1.6
 .include "../../devel/cutter/buildlink3.mk"
diff --git a/textproc/groonga/patches/patch-vendor_onigmo-source_Makefile.in b/textproc/groonga/patches/patch-vendor_onigmo-source_Makefile.in
deleted file mode 100644
index 22f57d416ed..00000000000
--- a/textproc/groonga/patches/patch-vendor_onigmo-source_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-vendor_onigmo-source_Makefile.in,v 1.1 2014/12/11 22:16:00 joerg Exp $
-
---- vendor/onigmo-source/Makefile.in.orig	2014-12-11 20:49:27.000000000 +0000
-+++ vendor/onigmo-source/Makefile.in
-@@ -1428,7 +1428,7 @@ uninstall-am: uninstall-binSCRIPTS unins
- onig-config: onig-config.in
- 
- oniguruma.pc: $(srcdir)/oniguruma.pc.in Makefile
--	$(do_subst) < $(<) > $(@)
-+	$(do_subst) < $(srcdir)/oniguruma.pc.in > $(@)
- 
- dll:
- 	$(CXX) -shared -Wl,--output-def,libonig.def -o libonig.dll *.o \
-- 
cgit v1.2.3